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

Timestamp:

Nov 10, 2004, 10:37:57 PM (20 years ago)

Author:

simon

Message:

in branches/sound: made a tester, which is not finished yet

File:

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

orxonox/branches/sound/src/sound_control.cc

@@ -14 +14 @@
 */
 
-#include "Sound_control.h"
+#include "sound_control.h"
 #include <string.h> 
 #include "SDL_mixer.h" 
@@ -29 +29 @@
 */ 
 SoundControl::SoundControl () { 
-  
+ 
   //setup parameters 
   int audio_rate = MIX_DEFAULT_FREQUENCY, audio_channels = MIX_DEFAULT_CHANNELS, audio_buffers = 8192, bits = 0; 
@@ -37 +37 @@
   //initializing sound and calling Mix_OpenAudio 
   if(SDL_Init(SDL_INIT_AUDIO)<0){ 
-    printf("SDL_Init:\n"); 
+    printf("SDL_Init: \n"); 
     exit(1); 
   } 
 
   if(Mix_OpenAudio(audio_rate, audio_format, audio_channels, audio_buffers)){ 
-    printf("Mix_OpenAudio:\n"); 
+    printf("Mix_OpenAudio: \n"); 
     exit(1); 
   } 
@@ -49 +49 @@
 }
 
+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();
+}
+
 
 /** 
@@ -54 +75 @@
 */ 
 SoundControl::~SoundControl () { 
-}
+  SoundControl* SoundControl::singleton = NULL;
+}
+
+SoundControl* SoundControl::singleton = NULL;
 
 
@@ -65 +89 @@
   Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels); 
   bits=audio_format&0xFF; 
-  printf("Opened audio at %d Hz %d bit %s, %d bytes audio buffer\n", audio_rate, 
-         bits, audio_channels > 1 ? "stereo" : "mono", audio_buffers ); 
+  printf("Opened audio at %d Hz %d bit %s, %d bytes audio buffer\n", audio_rate, bits, audio_channels > 1 ? "stereo" : "mono", audio_buffers ); 
   
   int volume = SDL_MIX_MAXVOLUME;
@@ -72 +95 @@
   int track_number = 1;
   int done = 0;
-  int free = 1;
-} 
-
-
-/** 
-    \brief Returns false if a sound_control object has been made
-*/ 
-void SoundControl::isFree () { 
-  return free;
-}
+} 
 
 
@@ -96 +110 @@
     \param filename: self-explanatory 
 */ 
-void SoundControl::playMod (char* fileName) {
-
-}
-
-
-/** 
-    \brief May be called from any WorldEntity to play a .wav file 
-    \param filename: self-explanatory 
-*/ 
-void SoundControl::playWav (char* fileName) {
+int SoundControl::playMod (char* fileName) {
   Mix_Chunk* chunk = NULL; 
   chunk = Mix_LoadWAV(fileName); 
@@ -111 +116 @@
     printf("Mix_PlayChannel: %s\n", Mix_GetError());
   }
+}
+
+
+/** 
+    \brief May be called from any WorldEntity to play a .wav file 
+    \param filename: self-explanatory 
+*/ 
+int SoundControl::playWav (char* fileName) {
+  Mix_Chunk* chunk = NULL; 
+  chunk = Mix_LoadWAV(fileName); 
+  if(Mix_PlayChannel(-1, chunk, 0) == -1) {
+    printf("Mix_PlayChannel: %s\n", Mix_GetError());
+  }
 } 
 
@@ -118 +136 @@
     \param filename: self-explanatory 
 */ 
-void SoundControl::playOgg (char* fileName) {
+int SoundControl::playOgg (char* fileName) {
   Mix_Music* music = NULL;
   music = Mix_LoadMUS(fileName);
@@ -212 +230 @@
 
 /** 
-    \brief Called by playOgg 
+    \brief Hooked by playOgg at end of .ogg playback
 */ 
 void SoundControl::musicDone () {
   track_number++; 
-} 
-
+  Mix_HaltMusic();
+  Mix_FreeMusic(music);
+  music = NULL;
+}