Changeset 2854 in orxonox.OLD for orxonox/branches/sound/src/sound_control.cc

Timestamp:

Nov 14, 2004, 4:44:31 PM (20 years ago)

Author:

simon

Message:

/branches/sound: finally a running version. To test, you can switch the parameters in the test class sound_test. A .ogg file named music.ogg from the directory . is played. The test class is really ugly, I know.

File:

• orxonox/branches/sound/src/sound_control.cc (modified) (11 diffs)

orxonox/branches/sound/src/sound_control.cc

@@ -15 +15 @@
 
 #include "sound_control.h"
-#include <string.h> 
-#include "SDL_mixer.h" 
 
 using namespace std;
 
 // global variables
-
-SoundControl* SoundControl::instance = 0; // singleton reference
-int volume = SDL_MIX_MAXVOLUME; // volume
-int done = 0; // 
+SoundControl* SoundControl::instance = NULL; // singleton reference
+int volume = SDL_MIX_MAXVOLUME;
+int done = 0;
 int track_number = 1;
-Mix_Music* music = NULL; 
+static Mix_Music* music = NULL;
+int audio_rate = MIX_DEFAULT_FREQUENCY, audio_channels = MIX_DEFAULT_CHANNELS, audio_buffers = 16384, bits = 0; 
+Uint16 audio_format = MIX_DEFAULT_FORMAT;
+
 
 /** 
@@ -35 +35 @@
 */ 
 SoundControl::SoundControl () { 
- 
-  //setup parameters 
-  int audio_rate = MIX_DEFAULT_FREQUENCY, audio_channels = MIX_DEFAULT_CHANNELS, audio_buffers = 8192, bits = 0; 
-  Uint16 audio_format = MIX_DEFAULT_FORMAT; 
-
-  //initializing sound and calling Mix_OpenAudio 
+
+  /*
+  initializing sound and calling Mix_OpenAudio 
   if(SDL_Init(SDL_INIT_AUDIO)<0){ 
-    printf("SDL_Init: \n"); 
-    exit(1); 
+    printf("SDL_Init: INIT_AUDIO error.\n"); 
   } 
+  */
   
   if(Mix_OpenAudio(audio_rate, audio_format, audio_channels, audio_buffers)){ 
-    printf("Mix_OpenAudio: \n"); 
-    exit(1); 
+    printf("Mix_OpenAudio: Failed to open audio!\n"); 
   } 
   
@@ -56 +52 @@
 
 /** 
-    \brief Destructor for the singleton instance 
+    \brief Default destructor 
 */ 
 SoundControl::~SoundControl () { 
-  delete instance;
-  instance = 0;
 }
 
@@ -67 +61 @@
 */
 SoundControl* SoundControl::getInstance() {
-  if (instance == 0) {
+  if (instance == NULL) {
     instance = new SoundControl;
   }
@@ -74 +68 @@
 
 void SoundControl::deleteInstance() {
-  ~SoundControl();
+  delete instance;
+  instance = NULL;
 }
 
@@ -186 +181 @@
 */ 
 void SoundControl::pauseMusic () {
-  Mix_PauseMusic()
+  Mix_PauseMusic();
 } 
 
@@ -194 +189 @@
 */ 
 void SoundControl::resumeMusic () {
-  Mix_ResumeMusic()
+  Mix_ResumeMusic();
 } 
 
@@ -200 +195 @@
     \brief Selects the track of all orxonox tracks 
 */
-void SoundControl::trackSelect () { 
+void SoundControl::trackSelect() { 
   switch (track_number) { 
   case 1:
@@ -219 +214 @@
     music = Mix_LoadMUS("luke_grey_orxonox3.ogg"); 
     if(Mix_PlayMusic(music, 1) == -1){
-    printf("Mix_PlayMusic: %s\n",Mix_GetError());
-  }
-  Mix_HookMusicFinished(musicDone);    
-  break; 
+      printf("Mix_PlayMusic: %s\n",Mix_GetError());
+    }
+    Mix_HookMusicFinished(musicDone);    
+    break; 
   case 4: 
     music = Mix_LoadMUS("luke_grey_and_aquarius_orxonox.ogg"); 
@@ -239 +234 @@
   case 6:
     music = Mix_LoadMUS("nomenes_funkadudu.ogg");
-  if(Mix_PlayMusic(music, 1) == -1){
-    printf("Mix_PlayMusic: %s\n",Mix_GetError());
-  }
-  Mix_HookMusicFinished(musicDone);    
-break;
+    if(Mix_PlayMusic(music, 1) == -1){
+      printf("Mix_PlayMusic: %s\n",Mix_GetError());
+    }
+    Mix_HookMusicFinished(musicDone);
+    break;
   } 
 }
@@ -251 +246 @@
     \brief Hooked by playOgg at end of .ogg playback
 */ 
-void SoundControl::musicDone () {
-  track_number++; 
+void SoundControl::musicDone() {
   Mix_HaltMusic();
   Mix_FreeMusic(music);