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

Timestamp:

Nov 11, 2004, 6:16:00 PM (20 years ago)

Author:

simon

Message:

branches/sound: made SoundControl singleton. Must be built via getObject()

File:

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

orxonox/branches/sound/src/sound_control.cc

@@ -24 +24 @@
     \brief standard constructor 
     
-    This constructor builds a SoundControl Object, which waits for callers 
-    calling its functions to output sound. All sound output is handles by this  
-    object, which must only be constructed once. 
+    This constructor builds a SoundControl Object, which waits for callers.
+    All sound output is handled by this singleton object.
 */ 
 SoundControl::SoundControl () { 
@@ -40 +39 @@
     exit(1); 
   } 
-
+  
   if(Mix_OpenAudio(audio_rate, audio_format, audio_channels, audio_buffers)){ 
     printf("Mix_OpenAudio: \n"); 
     exit(1); 
   } 
-
-  postConstruction();
-}
-
-SoundControl::SoundControl (int audio_rate audiorate, Uint16 audio_format audioformat, int audio_channels audiochannels, int audio_buffers audiobuffers) { 
-  
-  //setup parameters 
-  int audio_rate = audiorate, audio_channels = audiochannels, audio_buffers = audiobuffers, bits = 0; 
-  Uint16 audio_format = audioformat; 
-  Mix_Music* music = NULL; 
-  
-  //initializing sound and calling Mix_OpenAudio 
-  if(SDL_Init(SDL_INIT_AUDIO)<0){ 
-    printf("SDL_Init: \n"); 
-    exit(1); 
-  } 
-
-  if(Mix_OpenAudio(audio_rate, audio_format, audio_channels, audio_buffers)){ 
-    printf("Mix_OpenAudio: \n"); 
-    exit(1); 
-  } 
-
-  postConstruction();
-}
-
-
-/** 
-    \brief standard destructor 
+  
+  initialise();
+}
+
+
+/** 
+    \brief Destructor for the singleton instance 
 */ 
 SoundControl::~SoundControl () { 
-  SoundControl* SoundControl::singleton = NULL;
-}
-
-SoundControl* SoundControl::singleton = NULL;
+  instance = NULL;
+}
+
+/**
+   \brief Returns a reference to the singleton
+*/
+SoundControl* SoundControl::getObject(){
+  static SoundControl instance;
+  return &instance;
+}
 
 
@@ -84 +68 @@
     \brief Is called by SoundControl object to initiate all values 
 */ 
-void SoundControl::postConstruction () { 
+void SoundControl::initialise() { 
   
   // Print some info 
@@ -99 +83 @@
 
 /** 
-    \brief Sets the number of output Channels
+    \brief Sets the number of output Channels (should not be used)
 */ 
 void SoundControl::setNumberOfChannels (int number_of_channels) { 
@@ -220 +204 @@
     break; 
   case 4: 
-    music = Mix_LoadMUS("luke_grey_and aquarius_orxonox.ogg"); 
+    music = Mix_LoadMUS("luke_grey_and_aquarius_orxonox.ogg"); 
     break; 
   case 5: 
     music = Mix_LoadMUS("nomenes_orxonox.ogg"); 
     break; 
+  case 6:
+    music = Mix_LoadMUS("nomenes_funkadudu.ogg");
+    break;
   } 
 }