Changeset 6871 in orxonox.OLD for trunk/src/lib

Timestamp:

Jan 30, 2006, 9:39:58 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: small fixes (cleanup)

Location:

trunk/src/lib

Files:

• graphics/importer/texture.cc (modified) (1 diff)
• sound/ogg_player.h (modified) (1 diff)

trunk/src/lib/graphics/importer/texture.cc

@@ -284 +284 @@
                GL_UNSIGNED_BYTE,
                surface->pixels);
-  printf("%s, w:%d h:%d, 0x%x\n", this->getName(), surface->w, surface->h, target);
+  //  printf("%s, w:%d h:%d, 0x%x\n", this->getName(), surface->w, surface->h, target);
 
   // build the MipMaps automaticaly

trunk/src/lib/sound/ogg_player.h

@@ -20 +20 @@
 
 
-#define BUFFER_SIZE (4096 * 4)
+#define BUFFER_SIZE (8096 * 4)
 
 
 // the definition of a Ogg-Player
 class OggPlayer : public BaseObject
-  {
-  public:
-    OggPlayer(const char* fileName = NULL);
+{
+public:
+  OggPlayer(const char* fileName = NULL);
 
-    bool open(const char* fileName);
-    void release();
-    void debug();
-    bool playback();
-    bool playing();
-    bool update();
+  bool open(const char* fileName);
+  void release();
+  void debug();
+  bool playback();
+  bool playing();
+  bool update();
 
-  protected:
+protected:
 
-    bool stream(ALuint buffer);
-    void empty();
-    void check();
-    const char* errorString(int code);
+  bool stream(ALuint buffer);
+  void empty();
+  void check();
+  const char* errorString(int code);
 
-  private:
+private:
 
-    FILE*               oggFile;              //!< general file-handler, to open the sound-file
-    OggVorbis_File      oggStream;            //!< The stream this Ogg-player is playing back
-    vorbis_info*        vorbisInfo;           //!< The information held in the opened ogg-file
-    vorbis_comment*     vorbisComment;        //!< Comments about the ogg-file
+  FILE*               oggFile;              //!< general file-handler, to open the sound-file
+  OggVorbis_File      oggStream;            //!< The stream this Ogg-player is playing back
+  vorbis_info*        vorbisInfo;           //!< The information held in the opened ogg-file
+  vorbis_comment*     vorbisComment;        //!< Comments about the ogg-file
 
-    ALuint              buffers[2];           //!< buffers that handle sequentially buffering of the audio
-    ALuint              source;               //!< The source we play back on
-    ALenum              format;               //!< The format we play back
-    bool                trackLoaded;          //!< If a Track has been loaded.
-  };
+  ALuint              buffers[2];           //!< buffers that handle sequentially buffering of the audio
+  ALuint              source;               //!< The source we play back on
+  ALenum              format;               //!< The format we play back
+  bool                trackLoaded;          //!< If a Track has been loaded.
+};