Changeset 6872 in orxonox.OLD

Timestamp:

Jan 30, 2006, 9:56:40 PM (18 years ago)

Author:

bensch

Message:

trunk: oggPlayer

Location:

trunk/src/lib/sound

Files:

• ogg_player.cc (modified) (7 diffs)
• ogg_player.h (modified) (2 diffs)

trunk/src/lib/sound/ogg_player.cc

@@ -47 +47 @@
 }
 
+OggPlayer::~ OggPlayer()
+{
+  this->release();
+}
+
 /**
  * opens a file for playback
@@ -64 +69 @@
     return false;
   }
-  printf("OK\n");
 
   int result;
 
   if(!(oggFile = fopen(fileName, "rb")))
+  {
     PRINTF(2)("Could not open Ogg file.");
+    return false;
+  }
 
   if((result = ov_open(oggFile, &oggStream, NULL, 0)) < 0)
@@ -76 +83 @@
 
     PRINTF(2)("Could not open Ogg stream. %s", errorString(result));
+    fclose(oggFile);
+    return false;
   }
 
@@ -102 +111 @@
 void OggPlayer::release()
 {
+  if (!this->trackLoaded)
+    return;
   alSourceStop(source);
   empty();
@@ -162 +173 @@
 bool OggPlayer::update()
 {
-  if (!this->trackLoaded)
+  if (unlikely(!this->trackLoaded))
     return false;
 
@@ -238 +249 @@
   }
 }
-
-/**
- * checks for errors
- */
-void OggPlayer::check()
-{
-  int error = alGetError();
-
-  if(error != AL_NO_ERROR)
-    PRINTF(2)("OpenAL error was raised.");
-}
-
 
 
@@ -274 +273 @@
 }
 
+/**
+ * checks for errors
+ */
+void OggPlayer::check()
+{
+  int error = alGetError();
+  if(error != AL_NO_ERROR)
+    PRINTF(2)("OpenAL error was raised.");
+}
 
 /**

trunk/src/lib/sound/ogg_player.h

@@ -28 +28 @@
 public:
   OggPlayer(const char* fileName = NULL);
+  ~OggPlayer();
 
   bool open(const char* fileName);
@@ -44 +45 @@
 
 private:
-
   FILE*               oggFile;              //!< general file-handler, to open the sound-file
   OggVorbis_File      oggStream;            //!< The stream this Ogg-player is playing back