diff options
author | Wohlstand <admin@wohlnet.ru> | 2017-12-01 03:15:44 +0300 |
---|---|---|
committer | Wohlstand <admin@wohlnet.ru> | 2017-12-01 03:15:44 +0300 |
commit | 3f8560af1584965706e2b4ec5614212f5653f34c (patch) | |
tree | 7126d33bc83d91fa90e6e7397b7423ab0f5910e0 /src/adlmidi_private.cpp | |
parent | af748761f0b9df54a5cc673ebc5704c60513e3db (diff) | |
parent | 1e4a04ac49c44e4014997ee4785b20a8a00cbdd0 (diff) | |
download | libADLMIDI-3f8560af1584965706e2b4ec5614212f5653f34c.tar.gz libADLMIDI-3f8560af1584965706e2b4ec5614212f5653f34c.tar.bz2 libADLMIDI-3f8560af1584965706e2b4ec5614212f5653f34c.zip |
Merge branch 'master' into get-rid-of-backup-buffer
Diffstat (limited to 'src/adlmidi_private.cpp')
-rw-r--r-- | src/adlmidi_private.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/adlmidi_private.cpp b/src/adlmidi_private.cpp index f06e30e..1fcf0b2 100644 --- a/src/adlmidi_private.cpp +++ b/src/adlmidi_private.cpp @@ -45,7 +45,7 @@ int adlRefreshNumCards(ADL_MIDIPlayer *device) play->m_setup.NumFourOps = (n_fourop[0] >= 128 * 7 / 8) ? play->m_setup.NumCards * 6 - : (n_fourop[0] < 128 * 1 / 8) ? 0 + : (n_fourop[0] < 128 * 1 / 8) ? (n_fourop[1] > 0 ? 4 : 0) : (play->m_setup.NumCards == 1 ? 1 : play->m_setup.NumCards * 4); } else |