Text formatting.

4 files changed, 52 insertions, 52 deletions

diff --git a/opl/opl_sdl.c b/opl/opl_sdl.c
index 0621995f..1334ac07 100644
--- a/opl/opl_sdl.c
+++ b/opl/opl_sdl.c
@@ -71,7 +71,7 @@ static uint64_t pause_offset;
 // OPL software emulator structure.
 
 static Chip opl_chip;
-static int opl_new;
+static int opl_opl3mode;
 
 // Temporary mixing buffer used by the mixing callback.
 
@@ -165,7 +165,7 @@ static void FillBuffer(int16_t *buffer, unsigned int nsamples)
 
     assert(nsamples < mixing_freq);
 
-    if (opl_new)
+    if (opl_opl3mode)
     {
         Chip__GenerateBlock3(&opl_chip, nsamples, mix_buffer);
 
@@ -374,7 +374,7 @@ static int OPL_SDL_Init(unsigned int port_base)
     DBOPL_InitTables();
     Chip__Chip(&opl_chip);
     Chip__Setup(&opl_chip, mixing_freq);
-    opl_new = 0;
+    opl_opl3mode = 0;
 
     callback_mutex = SDL_CreateMutex();
     callback_queue_mutex = SDL_CreateMutex();
@@ -462,7 +462,7 @@ static void WriteRegister(unsigned int reg_num, unsigned int value)
             break;
 
         case OPL_REG_NEW:
-            opl_new = value & 0x01;
+            opl_opl3mode = value & 0x01;
 
         default:
             Chip__WriteReg(&opl_chip, reg_num, value);
diff --git a/src/i_oplmusic.c b/src/i_oplmusic.c
index dff9480c..cbdbc329 100644
--- a/src/i_oplmusic.c
+++ b/src/i_oplmusic.c
@@ -326,8 +326,8 @@ static opl_voice_t voices[OPL_NUM_VOICES * 2];
 static opl_voice_t *voice_free_list;
 static opl_voice_t *voice_alloced_list;
 static int voice_alloced_num;
-static int opl_new;
-static int opl_voice_num;
+static int opl_opl3mode;
+static int num_opl_voices;
 
 // Track data for playing tracks:
 
@@ -581,7 +581,8 @@ static void SetVoiceVolume(opl_voice_t *voice, unsigned int volume)
     {
         voice->reg_volume = car_volume | (opl_voice->carrier.scale & 0xc0);
 
-        OPL_WriteRegister((OPL_REGS_LEVEL + voice->op2) | voice->array, voice->reg_volume);
+        OPL_WriteRegister((OPL_REGS_LEVEL + voice->op2) | voice->array,
+                          voice->reg_volume);
 
         // If we are using non-modulated feedback mode, we must set the
         // volume for both voices.
@@ -624,7 +625,7 @@ static void InitVoices(void)
 
     // Initialize each voice.
 
-    for (i = 0; i < opl_voice_num; ++i)
+    for (i = 0; i < num_opl_voices; ++i)
     {
         voices[i].index = i % OPL_NUM_VOICES;
         voices[i].op1 = voice_operators[0][i % OPL_NUM_VOICES];
@@ -650,7 +651,7 @@ static void I_OPL_SetMusicVolume(int volume)
 
     // Update the volume of all voices.
 
-    for (i = 0; i < opl_voice_num; ++i)
+    for (i = 0; i < num_opl_voices; ++i)
     {
         if (voices[i].channel != NULL)
         {
@@ -661,7 +662,8 @@ static void I_OPL_SetMusicVolume(int volume)
 
 static void VoiceKeyOff(opl_voice_t *voice)
 {
-    OPL_WriteRegister((OPL_REGS_FREQ_2 + voice->index) | voice->array, voice->freq >> 8);
+    OPL_WriteRegister((OPL_REGS_FREQ_2 + voice->index) | voice->array,
+                      voice->freq >> 8);
 }
 
 static opl_channel_data_t *TrackChannelForEvent(opl_track_data_t *track,
@@ -894,8 +896,10 @@ static void UpdateVoiceFrequency(opl_voice_t *voice)
 
     if (voice->freq != freq)
     {
-        OPL_WriteRegister((OPL_REGS_FREQ_1 + voice->index) | voice->array, freq & 0xff);
-        OPL_WriteRegister((OPL_REGS_FREQ_2 + voice->index) | voice->array, (freq >> 8) | 0x20);
+        OPL_WriteRegister((OPL_REGS_FREQ_1 + voice->index) | voice->array,
+                          freq & 0xff);
+        OPL_WriteRegister((OPL_REGS_FREQ_2 + voice->index) | voice->array,
+                          (freq >> 8) | 0x20);
 
         voice->freq = freq;
     }
@@ -1007,11 +1011,11 @@ static void KeyOnEvent(opl_track_data_t *track, midi_event_t *event)
 
     if (opl_drv_ver == opl_v_old)
     {
-        if (voice_alloced_num == OPL_NUM_VOICES)
+        if (voice_alloced_num == num_opl_voices)
         {
             ReplaceExistingVoiceOld(channel);
         }
-        if (voice_alloced_num == OPL_NUM_VOICES - 1 && double_voice)
+        if (voice_alloced_num == num_opl_voices - 1 && double_voice)
         {
             ReplaceExistingVoiceOld(channel);
         }
@@ -1068,7 +1072,7 @@ static void SetChannelVolume(opl_channel_data_t *channel, unsigned int volume)
 
     // Update all voices that this channel is using.
 
-    for (i = 0; i < opl_voice_num; ++i)
+    for (i = 0; i < num_opl_voices; ++i)
     {
         if (voices[i].channel == channel)
         {
@@ -1082,7 +1086,7 @@ static void SetChannelPan(opl_channel_data_t *channel, unsigned int pan)
     unsigned int reg_pan;
     unsigned int i;
 
-    if (opl_new)
+    if (opl_opl3mode)
     {
         if (pan >= 96)
         {
@@ -1099,7 +1103,7 @@ static void SetChannelPan(opl_channel_data_t *channel, unsigned int pan)
         if (channel->pan != reg_pan)
         {
             channel->pan = reg_pan;
-            for (i = 0; i < opl_voice_num; i++)
+            for (i = 0; i < num_opl_voices; i++)
             {
                 if (voices[i].channel == channel)
                 {
@@ -1199,7 +1203,7 @@ static void PitchBendEvent(opl_track_data_t *track, midi_event_t *event)
 
     // Update all voices for this channel.
 
-    for (i = 0; i < opl_voice_num; ++i)
+    for (i = 0; i < num_opl_voices; ++i)
     {
         if (voices[i].channel == channel)
         {
@@ -1462,7 +1466,7 @@ static void I_OPL_PauseSong(void)
     // Turn off all main instrument voices (not percussion).
     // This is what Vanilla does.
 
-    for (i = 0; i < opl_voice_num; ++i)
+    for (i = 0; i < num_opl_voices; ++i)
     {
         if (voices[i].channel != NULL
          && voices[i].current_instr < percussion_instrs)
@@ -1499,7 +1503,7 @@ static void I_OPL_StopSong(void)
 
     // Free all voices.
 
-    for (i = 0; i < opl_voice_num; ++i)
+    for (i = 0; i < num_opl_voices; ++i)
     {
         if (voices[i].channel != NULL)
         {
@@ -1659,18 +1663,18 @@ static boolean I_OPL_InitMusic(void)
 
     if (opl_chip_type == 2 && opl_type)
     {
-        opl_new = 1;
-        opl_voice_num = OPL_NUM_VOICES * 2;
+        opl_opl3mode = 1;
+        num_opl_voices = OPL_NUM_VOICES * 2;
     }
     else
     {
-        opl_new = 0;
-        opl_voice_num = OPL_NUM_VOICES;
+        opl_opl3mode = 0;
+        num_opl_voices = OPL_NUM_VOICES;
     }
 
     // Initialize all registers.
 
-    OPL_InitRegisters(opl_new);
+    OPL_InitRegisters(opl_opl3mode);
 
     // Load instruments from GENMIDI lump:
 
diff --git a/src/m_config.c b/src/m_config.c
index 3d898705..3ec0b633 100644
--- a/src/m_config.c
+++ b/src/m_config.c
@@ -825,7 +825,7 @@ static default_t extra_defaults_list[] =
 
     //!
     // OPL chip type.
-	//
+    //
     CONFIG_VARIABLE_INT(opl_type),
 
     //!
diff --git a/src/setup/sound.c b/src/setup/sound.c
index bc2bdf33..092a5dd8 100644
--- a/src/setup/sound.c
+++ b/src/setup/sound.c
@@ -146,40 +146,36 @@ static void UpdateExtraTable(TXT_UNCAST_ARG(widget),
 {
     TXT_CAST_ARG(txt_table_t, extra_table);
 
-    // Rebuild the GUS table. Start by emptying it, then only add the
-    // GUS control widget if we are in GUS music mode.
-
-    if (snd_musicmode == MUSICMODE_OPL)
+    switch (snd_musicmode)
     {
+    case MUSICMODE_OPL:
         TXT_InitTable(extra_table, 2);
         TXT_SetColumnWidths(extra_table, 19, 4);
         TXT_AddWidgets(extra_table,
                         TXT_NewLabel("OPL type"),
                         TXT_NewDropdownList(&opl_type, opltype_strings, 2),
                         NULL);
-	}
-	else
-	{
-		TXT_InitTable(extra_table, 1);
-        if (snd_musicmode == MUSICMODE_GUS)
-        {
-            TXT_AddWidgets(extra_table,
-                           TXT_NewLabel("GUS patch path:"),
-                           TXT_NewFileSelector(&gus_patch_path, 30,
-                                               "Select path to GUS patches",
-                                               TXT_DIRECTORY),
-                           NULL);
-        }
+        break;
 
-        if (snd_musicmode == MUSICMODE_NATIVE)
-        {
-            TXT_AddWidgets(extra_table,
-                           TXT_NewLabel("Timidity configuration file:"),
-                           TXT_NewFileSelector(&timidity_cfg_path, 30,
-                                               "Select Timidity config file",
-                                               cfg_extension),
-                           NULL);
-        }
+    case MUSICMODE_GUS:
+        TXT_InitTable(extra_table, 1);
+        TXT_AddWidgets(extra_table,
+                        TXT_NewLabel("GUS patch path:"),
+                        TXT_NewFileSelector(&gus_patch_path, 30,
+                                            "Select path to GUS patches",
+                                            TXT_DIRECTORY),
+                        NULL);
+        break;
+
+    case MUSICMODE_NATIVE:
+        TXT_InitTable(extra_table, 1);
+        TXT_AddWidgets(extra_table,
+                        TXT_NewLabel("Timidity configuration file:"),
+                        TXT_NewFileSelector(&timidity_cfg_path, 30,
+                                            "Select Timidity config file",
+                                            cfg_extension),
+                        NULL);
+        break;
     }
 }