diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-08-31 03:55:14 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-08-31 03:55:14 +0300 |
| commit | d8b894af640bd1e2b1115bd69c29b4654b3c6973 (patch) | |
| tree | 6d5d28788bd719e6439976cd4716673bc74bc654 /src/adlmidi_opl3.cpp | |
| parent | c7b3199669a7b7e0ba11eb0d94d4e143a5fdd633 (diff) | |
| parent | cf121066a365286bd1427f54064b487799623ec9 (diff) | |
| download | libADLMIDI-d8b894af640bd1e2b1115bd69c29b4654b3c6973.tar.gz libADLMIDI-d8b894af640bd1e2b1115bd69c29b4654b3c6973.tar.bz2 libADLMIDI-d8b894af640bd1e2b1115bd69c29b4654b3c6973.zip | |
Merge branch 'master' of git@github.com:Wohlstand/libADLMIDI.git
# Conflicts:
# src/adlmidi_opl3.cpp
Diffstat (limited to 'src/adlmidi_opl3.cpp')
| -rw-r--r-- | src/adlmidi_opl3.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/adlmidi_opl3.cpp b/src/adlmidi_opl3.cpp index 7ec1fd6..60c173e 100644 --- a/src/adlmidi_opl3.cpp +++ b/src/adlmidi_opl3.cpp @@ -528,7 +528,7 @@ void OPL3::updateChannelCategories() for(size_t b = 0; b < 23; ++b) { m_channelCategory[a * 23 + b] = - (b >= 18) ? static_cast<int>(ChanCat_Rhythm_Bass + (b - 18)) : + (b >= 18) ? static_cast<ChanCat>(ChanCat_Rhythm_Bass + (b - 18)) : (b >= 6 && b < 9) ? ChanCat_Rhythm_Slave : ChanCat_Regular; } } |