Fixed build with one of ADLMIDI or OPNMIDI use

WohlSoft · Jan 9, 2019 · 6c6f382250d4a0ea20a227ffd8eef46bf1c82ce5 · 6c6f382
1 parent daed0c2
commit 6c6f382250d4a0ea20a227ffd8eef46bf1c82ce5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/codecs/music_midi_opn.c b/src/codecs/music_midi_opn.c
@@ -77,7 +77,7 @@ void SDLCALLCC Mix_OPNMIDI_setVolumeModel(int vm)
 
 int SDLCALLCC Mix_OPNMIDI_getFullRangeBrightness()
 {
-    #ifdef MUSIC_MID_ADLMIDI
+    #ifdef MUSIC_MID_OPNMIDI
     return opnmidi_setup.full_brightness_range;
     #else
     return -1;
@@ -95,7 +95,7 @@ void SDLCALLCC Mix_OPNMIDI_setFullRangeBrightness(int frb)
 
 int SDLCALLCC Mix_OPNMIDI_getFullPanStereo()
 {
-    #ifdef MUSIC_MID_ADLMIDI
+    #ifdef MUSIC_MID_OPNMIDI
     return opnmidi_setup.soft_pan;
     #else
     return -1;
@@ -113,7 +113,7 @@ void SDLCALLCC Mix_OPNMIDI_setFullPanStereo(int fp)
 
 int SDLCALLCC Mix_OPNMIDI_getEmulator()
 {
-    #ifdef MUSIC_MID_ADLMIDI
+    #ifdef MUSIC_MID_OPNMIDI
     return opnmidi_setup.emulator;
     #else
     return -1;

diff --git a/src/music.c b/src/music.c
@@ -645,8 +645,12 @@ static Mix_MusicType xmi_compatible_midi_player()
     if((mididevice_current != MIDI_ADLMIDI) && (mididevice_current != MIDI_OPNMIDI))
         return MUS_ADLMIDI;
     else
+#elif defined(MUSIC_MID_OPNMIDI)
+    if (mididevice_current != MIDI_OPNMIDI)
+        return MIDI_OPNMIDI;
+    else
 #elif defined(MUSIC_MID_ADLMIDI)
-    if (mididevice_next != MIDI_ADLMIDI)
+    if (mididevice_current != MIDI_ADLMIDI)
         return MUS_ADLMIDI;
     else
 #endif