Changeset 722 for abuse/branches/lol/src/sdlport/sound.hTweet

Timestamp:

Sep 26, 2013, 1:18:31 AM (10 years ago)

Author:

Sam Hocevar

Message:

audio: only activate the "song" class if SDL_mixer is present.

File:

• abuse/branches/lol/src/sdlport/sound.h (modified) (4 diffs)

abuse/branches/lol/src/sdlport/sound.h

@@ -12 +12 @@
 #define __SOUND_H__
 
-#if !defined __CELLOS_LV2__
-#   include <SDL/SDL_mixer.h>
+#if defined USE_SDL_MIXER
+#   if defined HAVE_SDL_SDL_H
+#      include <SDL/SDL.h>
+#   else
+#      include <SDL.h>
+#   endif
+#   if defined HAVE_SDL_SDL_MIXER_H
+#      include <SDL/SDL_mixer.h>
+#   else
+#      include <SDL_mixer.h>
+#   endif
 #endif
 
@@ -34 +43 @@
 
 private:
-#if !defined __CELLOS_LV2__
+#if defined USE_SDL_MIXER
     Mix_Chunk* m_chunk;
 #endif
@@ -42 +51 @@
 {
 public:
-#if !defined __CELLOS_LV2__
-    char const *name() { return Name; }
-#endif
-    song(char const *filename);
+    String const &name() { return m_name; }
+    song(String const &filename);
     void play(unsigned char volume=127);
     void stop(long fadeout_time=0); // time in ms
@@ -53 +60 @@
 
 private:
-#if !defined __CELLOS_LV2__
-    char *Name;
-    unsigned char *data;
+    String m_name;
+#if defined USE_SDL_MIXER
+    uint8_t *data;
     unsigned long song_id;
     Mix_Music* music;