Add DLS support

CMakeLists.txt

@@ -78,6 +78,7 @@ add_definitions(
  -DUSE_TWSYN_BRIDGE
  -DENABLE_SFZ
  -DTIMW32G_USE_NEW_CONSOLE
+ -DENABLE_DLS
 
 # TiMidity++ audio
  -DAU_W32

cfgforsf/CMakeLists.txt

@@ -8,6 +8,7 @@ add_executable(
  ../timidity/common.c
  ../timidity/controls.c
  ../timidity/decode.c
+ ../timidity/dls.cpp
  ../timidity/envelope.c
  ../timidity/filter.c
  ../timidity/freq.c
@@ -31,6 +32,7 @@ add_executable(
  ../timidity/common.h
  ../timidity/controls.h
  ../timidity/decode.h
+ ../timidity/dls.h
  ../timidity/envelope.h
  ../timidity/filter.h
  ../timidity/freq.h

interface/ncurs_c.c

@@ -697,7 +697,19 @@ static void init_trace_window_chan(int ch)
  wprintw(dftwin, "(%s)", prog->comment);
  }
 #endif
- }
+#ifdef ENABLE_DLS
+ else if (type == INST_DLS)
+ {
+ if (prog->name)
+ {
+ waddch(dftwin, ' ');
+ waddstr(dftwin, prog->name);
+ }
+ if (prog->comment != NULL)
+ wprintw(dftwin, "(%s)", prog->comment);
+ }
+#endif
+ }
  }
  }
 }

interface/w32g_pref.c

@@ -65,6 +65,7 @@
 #include "resample.h"
 #include "mix.h"
 #include "thread.h"
+#include "dls.h"
 #include "sfz.h"
 
 #include <tchar.h>
@@ -712,6 +713,9 @@ void PrefSettingApplyReally(void)
 #ifdef INT_SYNTH
  init_int_synth();
 #endif // INT_SYNTH
+#ifdef ENABLE_DLS
+ init_dls();
+#endif
 #ifdef ENABLE_SFZ
  init_sfz();
 #endif
@@ -794,6 +798,9 @@ static void PrefSettingApply(void)
 #ifdef INT_SYNTH
  init_int_synth();
 #endif // INT_SYNTH
+#ifdef ENABLE_DLS
+ init_dls();
+#endif
 #ifdef ENABLE_SFZ
  init_sfz();
 #endif
@@ -843,6 +850,9 @@ void reload_cfg(void)
 #ifdef ENABLE_SFZ
  free_sfz();
 #endif
+#ifdef ENABLE_DLS
+ free_dls();
+#endif
 #ifdef INT_SYNTH
  free_int_synth();
 #endif // INT_SYNTH

sf_view_gui/CMakeLists.txt

@@ -14,6 +14,7 @@ add_executable(
  ../timidity/common.c
  ../timidity/controls.c
  ../timidity/decode.c
+ ../timidity/dls.cpp
  ../timidity/envelope.c
  ../timidity/filter.c
  ../timidity/freq.c
@@ -40,6 +41,7 @@ add_executable(
  ../timidity/common.h
  ../timidity/controls.h
  ../timidity/decode.h
+ ../timidity/dls.h
  ../timidity/envelope.h
  ../timidity/filter.h
  ../timidity/instrum.h

timidity/CMakeLists.txt

@@ -67,6 +67,7 @@ add_library(
  audio_cnv.c
  common.c
  decode.c
+ dls.cpp
  effect.c
  envelope.c
  filter.c
@@ -126,6 +127,7 @@ add_library(
  audriv.h
  common.h
  decode.h
+ dls.h
  dlutils.h
  filter.h
  freq.h