aboutsummaryrefslogtreecommitdiff
path: root/src/adlmidi.cpp
diff options
context:
space:
mode:
authorVitaly Novichkov <admin@wohlnet.ru>2018-08-31 03:55:58 +0300
committerVitaly Novichkov <admin@wohlnet.ru>2018-08-31 03:55:58 +0300
commit6faa5b52cf5a0c41579f9720c947c8d3bbc9d08c (patch)
tree6d5d28788bd719e6439976cd4716673bc74bc654 /src/adlmidi.cpp
parent4c7f23f8999c7f5d71071d0b94fc18effeb0a9eb (diff)
parentd8b894af640bd1e2b1115bd69c29b4654b3c6973 (diff)
downloadlibADLMIDI-6faa5b52cf5a0c41579f9720c947c8d3bbc9d08c.tar.gz
libADLMIDI-6faa5b52cf5a0c41579f9720c947c8d3bbc9d08c.tar.bz2
libADLMIDI-6faa5b52cf5a0c41579f9720c947c8d3bbc9d08c.zip
Merge branch 'master' into stable
Diffstat (limited to 'src/adlmidi.cpp')
-rw-r--r--src/adlmidi.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/adlmidi.cpp b/src/adlmidi.cpp
index c7c5cf3..26a21e4 100644
--- a/src/adlmidi.cpp
+++ b/src/adlmidi.cpp
@@ -351,6 +351,10 @@ ADLMIDI_EXPORT int adl_setNumFourOpsChn(ADL_MIDIPlayer *device, int ops4)
{
if(!device)
return -1;
+
+ if(ops4 == -1)
+ return adlRefreshNumCards(device);
+
MidiPlayer *play = GET_MIDI_PLAYER(device);
if((unsigned int)ops4 > 6 * play->m_setup.numChips)
{
@@ -364,7 +368,7 @@ ADLMIDI_EXPORT int adl_setNumFourOpsChn(ADL_MIDIPlayer *device, int ops4)
play->m_synth.m_numFourOps = play->m_setup.numFourOps;
play->m_synth.updateChannelCategories();
- return 0; //adlRefreshNumCards(device);
+ return 0;
}
ADLMIDI_EXPORT int adl_getNumFourOpsChn(struct ADL_MIDIPlayer *device)