Mods play correctly. No mixing yet.

diff --git a/src/curses/ux_audio.c b/src/curses/ux_audio.c
index 851466f6607b453086a39f8016abef5d7f6cf9bc..4458ca03ff585791c9224a251ecff16df0a4ffbe 100644 (file)
--- a/src/curses/ux_audio.c
+++ b/src/curses/ux_audio.c
@@ -587,7 +587,7 @@ static void *playmod(EFFECT *raw_effect)
     settings.mResamplingMode = MODPLUG_RESAMPLE_FIR; /* RESAMP */
     settings.mChannels = 2;
     settings.mBits = 16;
-    settings.mFrequency = 44100;
+    settings.mFrequency = SAMPLERATE;
     settings.mStereoSeparation = 128;
     settings.mMaxMixChannels = 256;
 
@@ -618,9 +618,9 @@ static void *playmod(EFFECT *raw_effect)
        if (!music_playing) {
            break;
        }
-       musicsamples = ModPlug_Read(mod, shortbuffer, BUFFSIZE);
-       if (musicsamples == 0) break;
+       musicsamples = ModPlug_Read(mod, shortbuffer, BUFFSIZE) / 2;
        pcm16tofloat(musicbuffer, shortbuffer, musicsamples);
+       if (musicsamples == 0) break;
        pthread_mutex_unlock(&mutex);
        sem_post(&audio_full);
     }