diff options
| author | Wohlstand <admin@wohlnet.ru> | 2016-12-06 20:24:20 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2016-12-06 20:24:20 +0300 |
| commit | 4dc60cf03a09e55c75971aa5cfe976fc30957f1b (patch) | |
| tree | 5d58c3d9987af4abc0e2e5fc996ac1dea79ecbb7 /src/adlmidi.cpp | |
| parent | abee80062051164aa4931527a54c07046dbc1394 (diff) | |
| download | libADLMIDI-4dc60cf03a09e55c75971aa5cfe976fc30957f1b.tar.gz libADLMIDI-4dc60cf03a09e55c75971aa5cfe976fc30957f1b.tar.bz2 libADLMIDI-4dc60cf03a09e55c75971aa5cfe976fc30957f1b.zip | |
Fixed Android build
Diffstat (limited to 'src/adlmidi.cpp')
| -rw-r--r-- | src/adlmidi.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/adlmidi.cpp b/src/adlmidi.cpp index 0f4a91c..61b6daa 100644 --- a/src/adlmidi.cpp +++ b/src/adlmidi.cpp @@ -57,6 +57,7 @@ #include "dbopl.h" #else #include "nukedopl3.h" +#include <limits> #endif #include "adldata.hh" @@ -152,7 +153,7 @@ struct OPL3 std::vector<adlinsdata> dynamic_metainstruments; // Replaces adlins[] when CMF file std::vector<adldata> dynamic_instruments; // Replaces adl[] when CMF file - const unsigned DynamicInstrumentTag = 0x8000u, DynamicMetaInstrumentTag = 0x4000000u; + const unsigned DynamicInstrumentTag /* = 0x8000u*/, DynamicMetaInstrumentTag /* = 0x4000000u*/; const adlinsdata &GetAdlMetaIns(unsigned n) { return (n & DynamicMetaInstrumentTag) ? @@ -182,6 +183,8 @@ struct OPL3 bool ScaleModulators; bool LogarithmicVolumes; OPL3() : + DynamicInstrumentTag(0x8000u), + DynamicMetaInstrumentTag(0x4000000u), NumCards(1), AdlBank(0), NumFourOps(0), @@ -709,7 +712,7 @@ class MIDIplay private: std::vector<AdlChannel> ch; - std::vector<std::vector<uint8_t>> TrackData; + std::vector<std::vector<uint8_t> > TrackData; public: MIDIplay(): cmf_percussion_mode(false), |