From 4dc60cf03a09e55c75971aa5cfe976fc30957f1b Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Tue, 6 Dec 2016 20:24:20 +0300 Subject: Fixed Android build --- src/adlmidi.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') 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 #endif #include "adldata.hh" @@ -152,7 +153,7 @@ struct OPL3 std::vector dynamic_metainstruments; // Replaces adlins[] when CMF file std::vector 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 ch; - std::vector> TrackData; + std::vector > TrackData; public: MIDIplay(): cmf_percussion_mode(false), -- cgit v1.2.3