Rename OPL2 to just OPL

kraflab · Oct 29, 2023 · 88ab2cb · 88ab2cb
1 parent 1ded4d0
commit 88ab2cb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/prboom2/src/MUSIC/oplplayer.c b/prboom2/src/MUSIC/oplplayer.c
@@ -1722,7 +1722,7 @@ int I_OPL_InitMusic(int samplerate)
 
 const char *I_OPL_SynthName (void)
 {
-  return "opl2 synth player";
+  return "opl synth player";
 }
 
 void I_OPL_RenderSamples (void *dest, unsigned nsamp)

diff --git a/prboom2/src/SDL/i_sound.c b/prboom2/src/SDL/i_sound.c
@@ -898,7 +898,7 @@ static int music_player_was_init[NUM_MUS_PLAYERS];
 #define PLAYER_MAD        "mad mp3 player"
 #define PLAYER_DUMB       "dumb tracker player"
 #define PLAYER_FLUIDSYNTH "fluidsynth midi player"
-#define PLAYER_OPL2       "opl2 synth player"
+#define PLAYER_OPL        "opl synth player"
 #define PLAYER_PORTMIDI   "portmidi midi player"
 
 // order in which players are to be tried
@@ -908,12 +908,12 @@ char music_player_order[NUM_MUS_PLAYERS][200] =
   PLAYER_MAD,
   PLAYER_DUMB,
   PLAYER_FLUIDSYNTH,
-  PLAYER_OPL2,
+  PLAYER_OPL,
   PLAYER_PORTMIDI,
 };
 
 const char *midiplayers[midi_player_last + 1] = {
-  "fluidsynth", "opl2", "portmidi", NULL };
+  "fluidsynth", "opl", "portmidi", NULL };
 
 static int current_player = -1;
 static const void *music_handle = NULL;
@@ -1339,20 +1339,20 @@ void M_ChangeMIDIPlayer(void)
   if (!strcasecmp(snd_midiplayer, midiplayers[midi_player_fluidsynth]))
   {
     strcpy(music_player_order[3], PLAYER_FLUIDSYNTH);
-    strcpy(music_player_order[4], PLAYER_OPL2);
+    strcpy(music_player_order[4], PLAYER_OPL);
     strcpy(music_player_order[5], PLAYER_PORTMIDI);
   }
-  else if (!strcasecmp(snd_midiplayer, midiplayers[midi_player_opl2]))
+  else if (!strcasecmp(snd_midiplayer, midiplayers[midi_player_opl]))
   {
-    strcpy(music_player_order[3], PLAYER_OPL2);
+    strcpy(music_player_order[3], PLAYER_OPL);
     strcpy(music_player_order[4], PLAYER_FLUIDSYNTH);
     strcpy(music_player_order[5], PLAYER_PORTMIDI);
   }
   else if (!strcasecmp(snd_midiplayer, midiplayers[midi_player_portmidi]))
   {
     strcpy(music_player_order[3], PLAYER_PORTMIDI);
     strcpy(music_player_order[4], PLAYER_FLUIDSYNTH);
-    strcpy(music_player_order[5], PLAYER_OPL2);
+    strcpy(music_player_order[5], PLAYER_OPL);
   }
 
   S_StopMusic();

diff --git a/prboom2/src/i_sound.h b/prboom2/src/i_sound.h
@@ -124,7 +124,7 @@ extern int snd_samplerate;
 typedef enum
 {
   midi_player_fluidsynth,
-  midi_player_opl2,
+  midi_player_opl,
   midi_player_portmidi,
 
   midi_player_last