Changeset 479Tweet

Timestamp:

Apr 17, 2011, 10:27:50 AM (11 years ago)

Author:

Sam Hocevar

Message:

sdlport: add music playback support through SDL_Mixer, courtesy of
Jochen Schleu.

Location:

abuse/trunk

Files:

• configure.ac (modified) (1 diff)
• src/sdlport/Makefile.am (modified) (1 diff)
• src/sdlport/hmi.cpp (added)
• src/sdlport/hmi.hpp (added)
• src/sdlport/sound.cpp (modified) (15 diffs)
• src/sdlport/sound.hpp (modified) (3 diffs)

abuse/trunk/configure.ac

@@ -46 +46 @@
 CFLAGS="$CFLAGS $SDL_CFLAGS"
 LIBS="$LIBS $SDL_LIBS $X_LIBS"
+
+# Add SDL_Mixer
+LIBS="$LIBS -lSDL_mixer"
+CFLAGS="${CFLAGS} -DUSE_SDL_MIXER"
+CPPFLAGS="${CPPFLAGS} -DUSE_SDL_MIXER"
 
 if test "${enable_debug}" = "yes"; then

abuse/trunk/src/sdlport/Makefile.am

@@ -13 +13 @@
     joystick.cpp joy.hpp \
     setup.cpp setup.h \
+    hmi.cpp hmi.h \
     $(NULL)
 libsdlport_a_LIBADD =

abuse/trunk/src/sdlport/sound.cpp

@@ -23 +23 @@
 
 #include <SDL.h>
+#ifdef USE_SDL_MIXER
+#include <SDL/SDL_mixer.h>
+#include "hmi.hpp"
+#endif
 
 #include "sound.hpp"
@@ -77 +81 @@
 void mix_audio(void *udata, Uint8 *stream, int len)
 {
+#ifndef USE_SDL_MIXER
     effect_handle *handle = fx_list;
 
@@ -106 +111 @@
         }
     }
+#endif
 }
 
@@ -138 +144 @@
     free( sfxdir );
 
+#ifdef USE_SDL_MIXER
+    if (Mix_OpenAudio(11025, AUDIO_U8, 2, 128) < 0)
+    {
+        printf( "Sound : Unable to open audio - %s\nSound : Disabled (error)\n", SDL_GetError() );
+        return 0;
+    }
+
+    Mix_AllocateChannels(50);
+
+    int tempChannels = 0;
+    Mix_QuerySpec(&audioObtained.freq, &audioObtained.format, &tempChannels);
+    audioObtained.channels = tempChannels & 0xFF;
+
+    sound_enabled = SFX_INITIALIZED | MUSIC_INITIALIZED;
+#else
     audioWanted.freq = 11025;
     audioWanted.format = AUDIO_U8;
@@ -152 +173 @@
     }
 
-    sound_enabled = 1;
+    SDL_PauseAudio( 0 );
+
+    sound_enabled = SFX_INITIALIZED;
+#endif
+
     printf( "Sound : Enabled\n" );
-
-    SDL_PauseAudio( 0 );
 
     // It's all good
@@ -170 +193 @@
     if( sound_enabled )
     {
+#ifdef USE_SDL_MIXER
+        Mix_CloseAudio();
+#else
         SDL_PauseAudio( 1 );
         while( fx_list )
@@ -178 +204 @@
         }
         SDL_CloseAudio();
+#endif
     }
 }
@@ -191 +218 @@
     {
         long sample_speed;
+
+#ifdef USE_SDL_MIXER
+        void* temp_data = (void *)read_wav( filename, sample_speed, size );
+
+        SDL_AudioCVT audiocvt;
+    
+        SDL_BuildAudioCVT( &audiocvt, AUDIO_U8, 1, 11025, audioObtained.format, audioObtained.channels, audioObtained.freq );
+        data = malloc( size * audiocvt.len_mult );
+
+        memcpy( data, temp_data, size );
+        audiocvt.buf = (Uint8*)data;
+        audiocvt.len = size;
+        SDL_ConvertAudio( &audiocvt );
+        size = (Uint32)((double)size * audiocvt.len_ratio);
+
+        free(temp_data);
+
+        this->chunk = Mix_QuickLoad_RAW((Uint8*)data, size);
+#else
         data = (void *)read_wav( filename, sample_speed, size );
+#endif
     }
 }
@@ -204 +251 @@
     if( sound_enabled )
     {
+#ifdef USE_SDL_MIXER
+        // Sound effect deletion only happens on level load, so there
+        // is no problem in stopping everything. But the original playing
+        // code handles the sound effects and the "playlist" differently.
+        // Therefore with SDL_mixer, a sound that has not finished playing
+        // on a level load will cut off in the middle. This is most noticable
+        // for the button sound of the load savegame dialog.
+        Mix_FadeOutGroup(-1, 100);
+        while (Mix_Playing(-1))
+            SDL_Delay(10);
+        Mix_FreeChunk(this->chunk);
+#endif
+
         if( data )
         {
@@ -225 +285 @@
     if( sound_enabled )
     {
+#ifdef USE_SDL_MIXER
+        int channel = Mix_PlayChannel(-1, this->chunk, 0);
+        if (channel > -1)
+        {
+            Mix_Volume(channel, volume);
+            Mix_SetPanning(channel, panpot, 255 - panpot);
+        }
+#else
         SDL_LockAudio();
 
@@ -285 +353 @@
         }
         SDL_UnlockAudio();
-    }
-}
-
-
-//
-// We don't handle songs.  These are just stubs to basically do nothing.
-// I tried using SDL_mixer to do this, but with no success.
-//
+#endif
+    }
+}
+
+
+// Play music using SDL_Mixer
 
 song::song( char const * filename )
@@ -299 +365 @@
     Name = strdup(filename);
     song_id = 0;
+    
+#ifdef USE_SDL_MIXER
+    rw = NULL;
+    music = NULL;
+
+    char realname[255];
+    strcpy(realname, get_filename_prefix());
+    strcat(realname, filename);
+
+    unsigned int data_size;
+    data = load_hmi(realname, data_size);
+
+    if (data)
+    {
+        rw = SDL_RWFromMem(data, data_size);
+        music = Mix_LoadMUS_RW(rw);
+    }
+#endif
 }
 
@@ -312 +396 @@
     }
     free( Name );
+
+#ifdef USE_SDL_MIXER
+    Mix_FreeMusic(this->music);
+    SDL_FreeRW(this->rw);
+#endif
 }
 
@@ -317 +406 @@
 {
     song_id = 1;
+
+#ifdef USE_SDL_MIXER
+    Mix_PlayMusic(this->music, 0);
+    Mix_VolumeMusic(volume);
+#endif
 }
 
@@ -322 +416 @@
 {
     song_id = 0;
+
+#ifdef USE_SDL_MIXER
+    Mix_FadeOutMusic(100);
+#endif
 }
 
 int song::playing()
 {
+#ifdef USE_SDL_MIXER
+    return Mix_PlayingMusic();
+#else
     return song_id;
+#endif
 }
 
 void song::set_volume( int volume )
 {
-//    do nothing...
-}
+#ifdef USE_SDL_MIXER
+    Mix_VolumeMusic(volume);
+#else
+    // do nothing...
+#endif
+}

abuse/trunk/src/sdlport/sound.hpp

@@ -10 +10 @@
 #ifndef __SOUND_HPP_
 #define __SOUND_HPP_
+
+#ifdef USE_SDL_MIXER
+#include <SDL/SDL_mixer.h>
+#endif
 
 /* options are passed via command line */
@@ -24 +28 @@
   long size;
   void *data;
+#ifdef USE_SDL_MIXER
+  Mix_Chunk* chunk;
+#endif
 public :
   sound_effect(char *filename);
@@ -36 +43 @@
   unsigned char *data;
   unsigned long song_id;
+#ifdef USE_SDL_MIXER
+  Mix_Music* music;
+  SDL_RWops* rw;
+#endif
 public :
   char const *name() { return Name; }