Changeset 552 for abuseTweet

Timestamp:

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

Author:

Sam Hocevar

Message:

sdlport: use SDL_Mixer to read samples, and get rid of imlib's readwav.

Location:

abuse/trunk/src

Files:

• imlib/Makefile.am (modified) (1 diff)
• imlib/readwav.cpp (deleted)
• imlib/readwav.h (deleted)
• sdlport/sound.cpp (modified) (5 diffs)
• sdlport/sound.h (modified) (1 diff)

abuse/trunk/src/imlib/Makefile.am

@@ -18 +18 @@
     dprint.cpp dprint.h \
     status.cpp status.h \
-    readwav.cpp readwav.h \
     pmenu.cpp pmenu.h \
     scroller.cpp scroller.h \

abuse/trunk/src/sdlport/sound.cpp

@@ -28 +28 @@
 #include "sound.h"
 #include "hmi.h"
-#include "readwav.h"
 #include "specs.h"
 #include "setup.h"
@@ -92 +91 @@
 void sound_uninit()
 {
-    if (sound_enabled)
-    {
-        Mix_CloseAudio();
-    }
+    if (!sound_enabled)
+        return;
+
+    Mix_CloseAudio();
 }
 
@@ -103 +102 @@
 // Read in the requested .wav file.
 //
-sound_effect::sound_effect( char * filename )
-{
-    if( sound_enabled )
-    {
-        int sample_speed;
-
-        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);
-    }
+sound_effect::sound_effect(char const *filename)
+{
+    if (!sound_enabled)
+        return;
+
+    jFILE fp(filename, "rb");
+    if (fp.open_failure())
+        return;
+
+    void *temp_data = malloc(fp.file_size());
+    fp.read(temp_data, fp.file_size());
+    SDL_RWops *rw = SDL_RWFromMem(temp_data, fp.file_size());
+    m_chunk = Mix_LoadWAV_RW(rw, 1);
+    free(temp_data);
 }
 
@@ -135 +125 @@
 sound_effect::~sound_effect()
 {
-    if( sound_enabled )
-    {
-        // 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);
-
-        if( data )
-        {
-            free( data );
-        }
-    }
+    if(!sound_enabled)
+        return;
+
+    // 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(m_chunk);
 }
 
@@ -164 +149 @@
 //   255 - Completely to the left.
 //
-void sound_effect::play( int volume, int pitch, int panpot )
-{
-    if (sound_enabled)
-    {
-        int channel = Mix_PlayChannel(-1, this->chunk, 0);
-        if (channel > -1)
-        {
-            Mix_Volume(channel, volume);
-            Mix_SetPanning(channel, panpot, 255 - panpot);
-        }
+void sound_effect::play(int volume, int pitch, int panpot)
+{
+    if (!sound_enabled)
+        return;
+
+    int channel = Mix_PlayChannel(-1, m_chunk, 0);
+    if (channel > -1)
+    {
+        Mix_Volume(channel, volume);
+        Mix_SetPanning(channel, panpot, 255 - panpot);
     }
 }

abuse/trunk/src/sdlport/sound.h

@@ -26 +26 @@
 {
 public:
-    sound_effect(char *filename);
-    void play(int volume = 127, int pitch = 128, int panpot = 128);
+    sound_effect(char const *filename);
     ~sound_effect();
 
+    void play(int volume = 127, int pitch = 128, int panpot = 128);
+
 private:
-    void *data;
-    Mix_Chunk* chunk;
-    int size;
+    Mix_Chunk* m_chunk;
 };