From 96b3e395830ace8ef0d2fe2536b95ac8d5efe938 Mon Sep 17 00:00:00 2001 From: Starg Date: Tue, 13 Mar 2018 23:42:18 +0900 Subject: [PATCH] Handle sfz instruments in mixing --- interface/ncurs_c.c | 12 ++++++++++++ timidity/mix.c | 3 +++ timidity/thread_mix.c | 3 +++ 3 files changed, 18 insertions(+) diff --git a/interface/ncurs_c.c b/interface/ncurs_c.c index fee22ace..42e6a99e 100644 --- a/interface/ncurs_c.c +++ b/interface/ncurs_c.c @@ -685,6 +685,18 @@ static void init_trace_window_chan(int ch) wprintw(dftwin, "(%s)", prog->comment); } #endif +#ifdef ENABLE_SFZ + else if(type == INST_SFZ) + { + if (prog->name) + { + waddch(dftwin, ' '); + waddstr(dftwin, prog->name); + } + if (prog->comment != NULL) + wprintw(dftwin, "(%s)", prog->comment); + } +#endif } } } diff --git a/timidity/mix.c b/timidity/mix.c index 7192027f..319ff115 100644 --- a/timidity/mix.c +++ b/timidity/mix.c @@ -559,6 +559,9 @@ void mix_voice(DATA_T *buf, int v, int32 c) case INST_SF2: case INST_MOD: case INST_PCM: +#ifdef ENABLE_SFZ + case INST_SFZ: +#endif if(opt_resample_over_sampling){ int32 c2 = c * opt_resample_over_sampling; resample_voice(v, sp, c2); diff --git a/timidity/thread_mix.c b/timidity/thread_mix.c index a41f587d..0a45a403 100644 --- a/timidity/thread_mix.c +++ b/timidity/thread_mix.c @@ -402,6 +402,9 @@ void mix_voice_thread(DATA_T *buf, int v, int32 c, int thread) case INST_SF2: case INST_MOD: case INST_PCM: +#ifdef ENABLE_SFZ + case INST_SFZ: +#endif if(opt_resample_over_sampling){ int32 c2 = c * opt_resample_over_sampling; resample_voice(v, sp, c2); -- 2.11.0