From 145666ac2204ce298a2a0f2492bee24b9439710d Mon Sep 17 00:00:00 2001 From: Eukara Date: Tue, 8 Aug 2017 07:04:38 +0000 Subject: [PATCH] .cin, .avi volume fix. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5136 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/m_mp3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/client/m_mp3.c b/engine/client/m_mp3.c index 44ce997bd..c0dabe970 100644 --- a/engine/client/m_mp3.c +++ b/engine/client/m_mp3.c @@ -1737,10 +1737,10 @@ static qboolean Media_WinAvi_DecodeFrame (cin_t *cin, qboolean nosound, qboolean qacmStreamConvert(cin->avi.audiodecoder, &strhdr, ACM_STREAMCONVERTF_BLOCKALIGN); qacmStreamUnprepareHeader(cin->avi.audiodecoder, &strhdr, 0); - S_RawAudio(-1, strhdr.pbDst, cin->avi.pWaveFormat->nSamplesPerSec, strhdr.cbDstLengthUsed/4, cin->avi.pWaveFormat->nChannels, 2, 1); + S_RawAudio(-1, strhdr.pbDst, cin->avi.pWaveFormat->nSamplesPerSec, strhdr.cbDstLengthUsed/4, cin->avi.pWaveFormat->nChannels, 2, volume.value); } else - S_RawAudio(-1, pBuffer, cin->avi.pWaveFormat->nSamplesPerSec, samples, cin->avi.pWaveFormat->nChannels, 2, 1); + S_RawAudio(-1, pBuffer, cin->avi.pWaveFormat->nSamplesPerSec, samples, cin->avi.pWaveFormat->nChannels, 2, volume.value); } return true; } @@ -2205,7 +2205,7 @@ static qboolean Media_Roq_DecodeFrame (cin_t *cin, qboolean nosound, qboolean fo while (cin->roq.roqfilm->audio_channels && S_HaveOutput() && cin->roq.roqfilm->aud_pos < cin->roq.roqfilm->vid_pos) { if (roq_read_audio(cin->roq.roqfilm)>0) - S_RawAudio(-1, cin->roq.roqfilm->audio, 22050, cin->roq.roqfilm->audio_size/cin->roq.roqfilm->audio_channels, cin->roq.roqfilm->audio_channels, 2, 1); + S_RawAudio(-1, cin->roq.roqfilm->audio, 22050, cin->roq.roqfilm->audio_size/cin->roq.roqfilm->audio_channels, cin->roq.roqfilm->audio_channels, 2, volume.value ); else break; }