Add midi decoder option

Author: oreo639

Diff for: src/GameSrc/wrapper.c

@@ -55,6 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "player.h"
 #include "popups.h"
 #include "olhext.h"
+#include "Xmi.h"
 #include "Prefs.h"
 
 #include "OpenGL.h"
@@ -361,11 +362,19 @@ uchar fv;
 #define REF_STR_Software 0x10000001
 #define REF_STR_OpenGL   0x10000002
 
+#define REF_STR_Seqer    0x20000000
+#define REF_STR_ADLMIDI  0x20000001
+#define REF_STR_FluidSyn 0x20000002
+
 static char *_get_temp_string(int num) {
     switch (num) {
         case REF_STR_Renderer: return "Renderer";
         case REF_STR_Software: return "Software";
         case REF_STR_OpenGL:   return "OpenGL";
+
+	case REF_STR_Seqer:   return "Midi Player";
+	case REF_STR_ADLMIDI:  return "ADLMIDI";
+	case REF_STR_FluidSyn: return "FluidSynth";
         default: return get_temp_string(num);
     }
 }
@@ -1402,6 +1411,10 @@ void digichan_dealfunc(short val) {
     // snd_set_digital_channels(cur_digi_channels);
 }
 
+static void seqer_dealfunc(bool use_sequencer) {
+    ReloadDecXMI(); // Reload Midi decoder
+}
+
 #pragma enable_message(202)
 
 #define SLIDER_OFFSET_3 0
@@ -1432,6 +1445,14 @@ void soundopt_screen_init() {
     i++;
 #endif
 
+#ifdef USE_FLUIDSYNTH
+    standard_button_rect(&r, i, 2, 2, 5);
+    multi_init(i, 'p', REF_STR_Seqer, REF_STR_ADLMIDI, ID_NULL,
+               sizeof(gShockPrefs.soMidiBackend), &gShockPrefs.soMidiBackend, 2, seqer_dealfunc, &r);
+
+    i++;
+#endif
+
     standard_button_rect(&r, 5, 2, 2, 5);
     retkey = tolower(get_temp_string(REF_STR_MusicText + 2)[0]);
     pushbutton_init(RETURN_BUTTON, retkey, REF_STR_MusicText + 2, wrapper_pushbutton_func, &r);

Diff for: src/MacSrc/Prefs.c

@@ -91,6 +91,7 @@ void SetDefaultPrefs(void) {
     gShockPrefs.prefPlayIntro = 1;      // First time through, play the intro
     gShockPrefs.goPopupLabels = true;
     gShockPrefs.soBackMusic = true;
+    gShockPrefs.soMidiBackend = true; // Use fluidsynth by default.
     gShockPrefs.soSoundFX = true;
     gShockPrefs.doUseQD = false;
 

Diff for: src/MacSrc/Prefs.h

@@ -46,6 +46,7 @@ typedef struct {
     short soMusicVolume;
     short soSfxVolume;
     short soAudioLogVolume;
+    Boolean soMidiBackend;
 
     // Display Options
     short doVideoMode;

Diff for: src/MacSrc/Xmi.c

@@ -2,6 +2,7 @@
 
 #include "Xmi.h"
 #include "MusicDevice.h"
+#include "Prefs.h"
 
 
 
@@ -605,19 +606,47 @@ void InitReadXMI(void)
   int channel, i;
   SDL_Thread *thread;
 
-  // Start the ADL Midi device
+  InitDecXMI();
+
+  MyMutex = SDL_CreateMutex();
+
+  for (channel=0; channel<16; channel++) ChannelThread[channel] = -1;
+
+  for (i=0; i<NUM_THREADS; i++)
+  {
+    SDL_AtomicSet(&ThreadPlaying[i], 0);
+    SDL_AtomicSet(&ThreadCommand[i], THREAD_INIT);
+  }
+
+  thread = SDL_CreateThread(MyThread, "MyThread", NULL);
+  SDL_DetachThread(thread); //thread will go away on its own upon completion
+
+  i = 0;
+  while (SDL_AtomicGet(&ThreadCommand[i]) == THREAD_INIT) SDL_Delay(1);
+
+  atexit(ShutdownReadXMI);
+}
+
+
+
+void InitDecXMI(void)
+{
+  // Start the Midi device
   MusicDevice *musicdev = NULL;
   int musicrate = 48000;
 
 #ifdef USE_FLUIDSYNTH
   if (!musicdev)
   {
-      INFO("try FluidSynth MIDI driver");
-      musicdev = CreateMusicDevice(Music_FluidSynth);
-      if (musicdev && musicdev->init(musicdev, musicrate) != 0)
+      if(gShockPrefs.soMidiBackend) 
       {
-          musicdev->destroy(musicdev);
-          musicdev = NULL;
+        INFO("try FluidSynth MIDI driver");
+        musicdev = CreateMusicDevice(Music_FluidSynth);
+        if (musicdev && musicdev->init(musicdev, musicrate) != 0)
+        {
+            musicdev->destroy(musicdev);
+            musicdev = NULL;
+        }
       }
   }
 #endif
@@ -641,24 +670,25 @@ void InitReadXMI(void)
   }
 
   MusicDev = musicdev;
+}
 
-  MyMutex = SDL_CreateMutex();
 
-  for (channel=0; channel<16; channel++) ChannelThread[channel] = -1;
+
+void ReloadDecXMI(void)
+{
+  int i;
+
+  SDL_LockMutex(MyMutex);
+  MusicDev->destroy(MusicDev);
+  MusicDev = NULL;
+  SDL_UnlockMutex(MyMutex);
 
   for (i=0; i<NUM_THREADS; i++)
   {
-    SDL_AtomicSet(&ThreadPlaying[i], 0);
-    SDL_AtomicSet(&ThreadCommand[i], THREAD_INIT);
+    StopTrack(i);
   }
 
-  thread = SDL_CreateThread(MyThread, "MyThread", NULL);
-  SDL_DetachThread(thread); //thread will go away on its own upon completion
-
-  i = 0;
-  while (SDL_AtomicGet(&ThreadCommand[i]) == THREAD_INIT) SDL_Delay(1);
-
-  atexit(ShutdownReadXMI);
+  InitDecXMI();
 }
 
 

Diff for: src/MacSrc/Xmi.h

@@ -20,6 +20,8 @@ void StopTrack(int i);
 void StopTheMusic(void);
 int IsPlaying(int i);
 void InitReadXMI(void);
+void InitDecXMI(void);
+void ReloadDecXMI(void);
 void ShutdownReadXMI(void);
 
 struct midi_event_struct