ref: 299e1c5abf804e2e249c4f77b82fb7949a3f9d7b
parent: 14bcdd1008db070bc4a12be73e3f692c1990966e
author: Simon Howard <[email protected]>
date: Sat Oct 31 12:47:49 EDT 2009
When replacing an existing voice, discard voices that are the second voice of a two voice instrument. Don't discard instruments from lower numbered MIDI channels for higher numbered MIDI channels. Subversion-branch: /branches/opl-branch Subversion-revision: 1727
--- a/OPL-TODO
+++ b/OPL-TODO
@@ -9,7 +9,6 @@
Bad MIDIs:
* doom2.wad MAP01
- * deca.wad MAP01
* gothicdm MAP05
* tnt.wad MAP30
* Alien Vendetta (title screen, MAP01, etc)
--- a/src/i_oplmusic.c
+++ b/src/i_oplmusic.c
@@ -631,6 +631,16 @@
}
}
+// Compare the priorities of channels, returning either -1, 0 or 1.
+
+static int CompareChannelPriorities(opl_channel_data_t *chan1,
+ opl_channel_data_t *chan2)
+{+ // TODO ...
+
+ return 1;
+}
+
// When all voices are in use, we must discard an existing voice to
// play a new note. Find and free an existing voice. The channel
// passed to the function is the channel for the new note to be
@@ -643,13 +653,19 @@
// Check the allocated voices, if we find an instrument that is
// of a lower priority to the new instrument, discard it.
- // Priority is determined by MIDI instrument number; old
+ // If a voice is being used to play the second voice of an instrument,
+ // use that, as second voices are non-essential.
+ // Lower numbered MIDI channels implicitly have a higher priority
+ // than higher-numbered channels, eg. MIDI channel 1 is never
+ // discarded for MIDI channel 2.
result = NULL;
for (rover = voice_alloced_list; rover != NULL; rover = rover->next)
{- if (rover->current_instr > channel->instrument)
+ if (rover->current_instr_voice != 0
+ || (rover->channel > channel
+ && CompareChannelPriorities(channel, rover->channel) > 0))
{result = rover;
break;