OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Revert "- don't let the Timidity++ player directly access the CVARs."

Browse source 
This reverts commit 8f7a503561.

# Conflicts:
#	src/sound/timiditypp/playmidi.cpp

Something in here wasn't working as intended, and since it needs better synchronization let's redo it entirely.
This commit is contained in:
Christoph Oelckers 2018-02-26 09:19:10 +01:00
commit 47dbbeb65a
7 changed files with 30 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/sound/timiditypp/effect.cpp
View file

@ -183,27 +183,27 @@ void Effect::effect_left_right_delay(int32_t *buff, int32_t count)
void Effect::do_effect(int32_t *buf, int32_t count)
{
int32_t nsamples = count * 2;
int reverb_level = (reverb->timidity_reverb < 0)
? -reverb->timidity_reverb & 0x7f : DEFAULT_REVERB_SEND_LEVEL;
int reverb_level = (timidity_reverb < 0)
? -timidity_reverb & 0x7f : DEFAULT_REVERB_SEND_LEVEL;
/* for static reverb / chorus level */
if (reverb->timidity_reverb == 2 || reverb->timidity_reverb == 4
|| (reverb->timidity_reverb < 0 && !(reverb->timidity_reverb & 0x80))
if (timidity_reverb == 2 || timidity_reverb == 4
|| (timidity_reverb < 0 && !(timidity_reverb & 0x80))
|| timidity_chorus < 0)
{
reverb->set_dry_signal(buf, nsamples);
/* chorus sounds horrible
* if applied globally on top of channel chorus
*/
if (reverb->timidity_reverb == 2 || reverb->timidity_reverb == 4
|| (reverb->timidity_reverb < 0 && !(reverb->timidity_reverb & 0x80)))
if (timidity_reverb == 2 || timidity_reverb == 4
|| (timidity_reverb < 0 && !(timidity_reverb & 0x80)))
reverb->set_ch_reverb(buf, nsamples, reverb_level);
reverb->mix_dry_signal(buf, nsamples);
/* chorus sounds horrible
* if applied globally on top of channel chorus
*/
if (reverb->timidity_reverb == 2 || reverb->timidity_reverb == 4
|| (reverb->timidity_reverb < 0 && !(reverb->timidity_reverb & 0x80)))
if (timidity_reverb == 2 || timidity_reverb == 4
|| (timidity_reverb < 0 && !(timidity_reverb & 0x80)))
reverb->do_ch_reverb(buf, nsamples);
}
/* L/R Delay */