From 42b1e52422f8edb4271d3898a73bc18d54e65def Mon Sep 17 00:00:00 2001 From: David Griffith Date: Sun, 9 Aug 2015 20:31:03 -0700 Subject: [PATCH] Mods play correctly. No mixing yet. --- src/curses/ux_audio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/curses/ux_audio.c b/src/curses/ux_audio.c index 851466f..4458ca0 100644 --- 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); } -- 2.34.1