Changeset 551Tweet

Timestamp:

Apr 29, 2011, 1:15:05 AM (12 years ago)

Author:

Sam Hocevar

Message:

sdlport: make SDL_mixer mandatory. I'm not going to maintain legacy code
that cannot even play music.

Location:

abuse/trunk

Files:

• configure.ac (modified) (1 diff)
• src/sdlport/sound.cpp (modified) (16 diffs)
• src/sdlport/sound.h (modified) (3 diffs)

abuse/trunk/configure.ac

@@ -51 +51 @@
 save_CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS="${CPPFLAGS} ${SDL_CFLAGS}"
-AC_CHECK_HEADERS(SDL/SDL_mixer.h, [ac_cv_my_have_sdl="yes"])
+AC_CHECK_HEADERS(SDL/SDL_mixer.h, [ac_cv_my_have_sdl_mixer="yes"])
 CPPFLAGS="${save_CPPFLAGS}"
-if test "${ac_cv_my_have_sdl}" != "no"; then
-  AC_DEFINE(USE_SDL_MIXER, 1, Define to 1 to use SDL_Mixer)
-  LIBS="$LIBS -lSDL_mixer"
+if test "${ac_cv_my_have_sdl_mixer}" = "no"; then
+  AC_MSG_ERROR([*** SDL_mixer not found!])
 fi
+LIBS="$LIBS -lSDL_mixer"
 
 if test "${enable_debug}" = "yes"; then

abuse/trunk/src/sdlport/sound.cpp

@@ -21 +21 @@
 #include "config.h"
 
-#include <string.h>
+#include <cstring>
 
 #include <SDL.h>
-#ifdef USE_SDL_MIXER
 #include <SDL/SDL_mixer.h>
+
+#include "sound.h"
 #include "hmi.h"
-#endif
-
-#include "sound.h"
 #include "readwav.h"
 #include "specs.h"
 #include "setup.h"
 
-class effect_handle
-{
-public:
-    effect_handle    *prev;        // Handle to the previous effect
-    effect_handle    *next;        // Handle to the next effect
-    Uint8            *data;        // Audio data
-    Uint8            *pos;        // current playing position in the data
-    Uint32            length;        // Length of the data
-    Uint32            volume;        // Volume for this effect.
-
-    effect_handle( effect_handle *Next )
-    {
-        next = Next;
-        if( next )
-        {
-            next->prev = this;
-        }
-        prev = NULL;
-        data = NULL;
-        pos = NULL;
-    }
-
-    ~effect_handle()
-    {
-        if( next )
-        {
-            next->prev = prev;
-        }
-        if( prev )
-        {
-            prev->next = next;
-        }
-    }
-};
-
-#ifndef USE_SDL_MIXER
-static effect_handle * fx_list = NULL;
-#endif
 extern flags_struct flags;
 static int sound_enabled = 0;
 static SDL_AudioSpec audioObtained;
-
-//
-// mix_audio
-//
-// Do the actual playing of the audio by looping through our effects list
-// and mixing each sample.
-//
-void mix_audio(void *udata, Uint8 *stream, int len)
-{
-#ifndef USE_SDL_MIXER
-    effect_handle *handle = fx_list;
-
-    while( handle )
-    {
-        if( handle->length > 0 && handle->pos )
-        {
-            len = ( len > (int)handle->length ? handle->length : len );
-            SDL_MixAudio( stream, handle->pos, len, handle->volume );
-            handle->pos += len;
-            handle->length -= len;
-            handle = handle->next;
-        }
-        else
-        {
-            // update the list pointer if we're deleting the first node
-            if( fx_list == handle )
-            {
-                fx_list = handle->next;
-            }
-            effect_handle *tmp = handle->next;
-            if( !flags.mono )
-            {
-                // delete the audio buffer
-                free( handle->data );
-            }
-            delete handle;
-            handle = tmp;
-        }
-    }
-#endif
-}
 
 //
@@ -146 +65 @@
     free( sfxdir );
 
-#ifdef USE_SDL_MIXER
     if (Mix_OpenAudio(11025, AUDIO_U8, 2, 128) < 0)
     {
@@ -161 +79 @@
     sound_enabled = SFX_INITIALIZED | MUSIC_INITIALIZED;
 
-    printf( "Music: Enabled\n" );
-#else
-    SDL_AudioSpec audioWanted;
-    audioWanted.freq = 11025;
-    audioWanted.format = AUDIO_U8;
-    audioWanted.channels = 2 - flags.mono;
-    audioWanted.samples = 128;
-    audioWanted.callback = mix_audio;
-    audioWanted.userdata = NULL;
-
-    // Now open the audio device
-    if( SDL_OpenAudio( &audioWanted, &audioObtained ) < 0 )
-    {
-        printf( "Sound: Unable to open audio - %s\nSound: Disabled (error)\n", SDL_GetError() );
-        return 0;
-    }
-
-    SDL_PauseAudio( 0 );
-
-    sound_enabled = SFX_INITIALIZED;
-#endif
-
     printf( "Sound: Enabled\n" );
 
@@ -196 +92 @@
 void sound_uninit()
 {
+    if (sound_enabled)
+    {
+        Mix_CloseAudio();
+    }
+}
+
+//
+// sound_effect constructor
+//
+// Read in the requested .wav file.
+//
+sound_effect::sound_effect( char * filename )
+{
     if( sound_enabled )
     {
-#ifdef USE_SDL_MIXER
-        Mix_CloseAudio();
-#else
-        SDL_PauseAudio( 1 );
-        while( fx_list )
-        {
-            effect_handle *last = fx_list;
-            fx_list = fx_list->next;
-            free( last );
-        }
-        SDL_CloseAudio();
-#endif
-    }
-}
-
-//
-// sound_effect constructor
-//
-// Read in the requested .wav file.
-//
-sound_effect::sound_effect( char * filename )
-{
-    if( sound_enabled )
-    {
         int sample_speed;
 
-#ifdef USE_SDL_MIXER
         void* temp_data = (void *)read_wav( filename, sample_speed, size );
 
@@ -241 +125 @@
 
         this->chunk = Mix_QuickLoad_RAW((Uint8*)data, size);
-#else
-        data = (void *)read_wav( filename, sample_speed, size );
-#endif
     }
 }
@@ -256 +137 @@
     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
@@ -267 +147 @@
             SDL_Delay(10);
         Mix_FreeChunk(this->chunk);
-#endif
 
         if( data )
@@ -279 +158 @@
 // sound_effect::play
 //
-// Insert a new effect_handle into the list and modify the audio
-// if we're doing stereo.
+// Add a new sample for playing.
 // panpot defines the pan position for the sound effect.
 //   0   - Completely to the right.
@@ -288 +166 @@
 void sound_effect::play( int volume, int pitch, int panpot )
 {
-    if( sound_enabled )
-    {
-#ifdef USE_SDL_MIXER
+    if (sound_enabled)
+    {
         int channel = Mix_PlayChannel(-1, this->chunk, 0);
         if (channel > -1)
@@ -297 +174 @@
             Mix_SetPanning(channel, panpot, 255 - panpot);
         }
-#else
-        SDL_LockAudio();
-
-        fx_list = new effect_handle( fx_list );
-        if( fx_list == NULL )
-        {
-            printf( "Sound: ERROR - Failed to create new effect.\n" );
-            SDL_UnlockAudio();
-            return;
-        }
-
-        if( !flags.mono )
-        {
-            unsigned int i;
-            Uint32 cvtBufferSize;
-            SDL_AudioCVT audiocvt;
-
-            // Do some audio conversion
-            SDL_BuildAudioCVT( &audiocvt, AUDIO_U8, 1, 11025, audioObtained.format, audioObtained.channels, audioObtained.freq );
-            audiocvt.buf = (Uint8 *)malloc( size * audiocvt.len_mult );
-            audiocvt.len = size;
-            memcpy( audiocvt.buf, data, size );
-            SDL_ConvertAudio( &audiocvt );
-            cvtBufferSize = (Uint32)((double)size * audiocvt.len_ratio);
-
-            // Adjust for requested pan position
-            if( panpot != 128 )
-            {
-                if( panpot > 128 )
-                {
-                    // Pan to the left
-                    panpot = (panpot - 255) * -1;
-                    for( i = 1 ; i <= cvtBufferSize; i += 2 )
-                    {
-                        audiocvt.buf[i] = (((audiocvt.buf[i] - 128) * panpot) / 128) + 128;
-                    }
-                }
-                else
-                {
-                    // Pan to the right
-                    for( i = 0 ; i < cvtBufferSize; i += 2 )
-                    {
-                        audiocvt.buf[i] = (((audiocvt.buf[i] - 128) * panpot) / 128) + 128;
-                    }
-                }
-            }
-
-            fx_list->data = audiocvt.buf;
-            fx_list->pos = audiocvt.buf;
-            fx_list->length = cvtBufferSize;
-            fx_list->volume = volume;
-        }
-        else
-        {
-            // Only doing mono so don't mess with the audio data.
-            fx_list->data = (Uint8 *)data;
-            fx_list->pos = (Uint8 *)data;
-            fx_list->length = size;
-            fx_list->volume = volume;
-        }
-        SDL_UnlockAudio();
-#endif
     }
 }
@@ -371 +186 @@
     song_id = 0;
 
-#ifdef USE_SDL_MIXER
     rw = NULL;
     music = NULL;
@@ -384 +198 @@
     if (!data)
     {
-        printf("Music: ERROR - could not load %s\n", realname);
+        printf("Sound: ERROR - could not load %s\n", realname);
         return;
     }
@@ -393 +207 @@
     if (!music)
     {
-        printf("Music: ERROR - %s while loading %s\n",
+        printf("Sound: ERROR - %s while loading %s\n",
                Mix_GetError(), realname);
         return;
     }
-#endif
 }
 
@@ -407 +220 @@
     free(Name);
 
-#ifdef USE_SDL_MIXER
     Mix_FreeMusic(music);
     SDL_FreeRW(rw);
-#endif
 }
 
@@ -417 +228 @@
     song_id = 1;
 
-#ifdef USE_SDL_MIXER
     Mix_PlayMusic(this->music, 0);
     Mix_VolumeMusic(volume);
-#endif
 }
 
@@ -427 +236 @@
     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 )
 {
-#ifdef USE_SDL_MIXER
     Mix_VolumeMusic(volume);
-#else
-    // do nothing...
-#endif
-}
+}
+

abuse/trunk/src/sdlport/sound.h

@@ -12 +12 @@
 #define __SOUND_H__
 
-#ifdef USE_SDL_MIXER
-#   include <SDL/SDL_mixer.h>
-#endif
+#include <SDL/SDL_mixer.h>
 
 /* options are passed via command line */
@@ -34 +32 @@
 private:
     void *data;
-#ifdef USE_SDL_MIXER
     Mix_Chunk* chunk;
-#endif
     int size;
 };
@@ -55 +51 @@
     unsigned char *data;
     unsigned long song_id;
-#ifdef USE_SDL_MIXER
     Mix_Music* music;
     SDL_RWops* rw;
-#endif
 };