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

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.h (modified) (4 diffs)

orxonox/branches/sound/src/sound_control.h

@@ -2 +2 @@
 #define SOUNDCONTROL_CLASS_H
 
-#include "data_tank.h"
+#include "SDL/SDL.h"
+#include "SDL/SDL_mixer.h"
+#include <stdio.h>
 
 class SoundControl {
@@ -9 +11 @@
   static SoundControl* getInstance();
   static void deleteInstance();
-  void setNumberOfChannels(int number_of channels);
+  void setNumberOfChannels(int number_of_channels);
   int playMod(char* filename);
   int playWav(char* filename);
@@ -21 +23 @@
   void resumeMusic();
   void trackSelect();
+  static void musicDone();
 
 protected:
@@ -29 +32 @@
 private:
   static SoundControl* instance;
-
-}
+};
 
 #endif