From 19c89fc7baa299e523e152a14066ebc8ce23af21 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Tue, 18 Jun 2019 00:51:29 +0800 Subject: Device initialization file implementation (part 1). Added UI for external device configuration. Instrument mapping portion of the device intialization file is now working. Fixed a few spots where return value of getChannelPreset() is ignored. Fixed layout of the preset selection dialog. --- core/qmpmidioutfluid.cpp | 3 ++- core/qmpmidioutfluid.hpp | 2 +- core/qmpmidioutrtmidi.cpp | 52 ++++++++++++++++++++++++++++++++++++++++++++++- core/qmpmidioutrtmidi.hpp | 5 ++++- 4 files changed, 58 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/qmpmidioutfluid.cpp b/core/qmpmidioutfluid.cpp index 414cb3a..ac6523f 100644 --- a/core/qmpmidioutfluid.cpp +++ b/core/qmpmidioutfluid.cpp @@ -123,7 +123,7 @@ std::vector> qmpMidiOutFluid::getBankList() { return bnk; } -std::vector> qmpMidiOutFluid::getPresets(int bank) +std::vector> qmpMidiOutFluid::getPresets(uint16_t bank) { std::vector> ret; if(pst.find(bank)==pst.end())return ret; @@ -137,6 +137,7 @@ std::vector> qmpMidiOutFluid::getPresets(int bank std::string qmpMidiOutFluid::getPresetName(uint16_t bank,uint8_t preset) { if(pst.find(bank)==pst.end())return ""; + //should consult fluidsynth instead? (4 bank mapping methods) return pst[bank][preset]; } bool qmpMidiOutFluid::getChannelPreset(int ch,uint16_t *bank,uint8_t *preset,std::string &presetname) diff --git a/core/qmpmidioutfluid.hpp b/core/qmpmidioutfluid.hpp index 72197e7..d6a62c9 100644 --- a/core/qmpmidioutfluid.hpp +++ b/core/qmpmidioutfluid.hpp @@ -41,7 +41,7 @@ class qmpMidiOutFluid:public qmpMidiOutDevice,public IFluidSettings void onMapped(uint8_t ch,int refcnt); void onUnmapped(uint8_t ch,int refcnt); std::vector> getBankList(); - std::vector> getPresets(int bank); + std::vector> getPresets(uint16_t bank); std::string getPresetName(uint16_t bank,uint8_t preset); bool getChannelPreset(int ch,uint16_t *bank,uint8_t *preset,std::string &presetname); uint8_t getInitialCCValue(uint8_t cc); diff --git a/core/qmpmidioutrtmidi.cpp b/core/qmpmidioutrtmidi.cpp index 0ff2c86..2cc9d5b 100644 --- a/core/qmpmidioutrtmidi.cpp +++ b/core/qmpmidioutrtmidi.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include RT_MIDI_H @@ -132,6 +133,27 @@ qmpDeviceInitializer* qmpDeviceInitializer::parse(const char* path) } } } + else if(st_inmapping) + { + if(b.front()=='['&&b.back()==']') + { + b=b.substr(1,b.length()-2); + split(b,':',tok); + if(tok.size()<3)err("invalid bank") + cmsb=strtol(tok[0].c_str(),nullptr,10); + clsb=strtol(tok[1].c_str(),nullptr,10); + ret->banks[cmsb<<7|clsb]=BankStore{{},tok[2]}; + } + else if(b.find('=')!=std::string::npos) + { + if(!~cmsb||!~clsb)err("inst outside a bank") + split(b,'=',tok); + if(tok.size()<2)err("invalid inst") + int p=strtol(tok[0].c_str(),nullptr,10); + ret->banks[cmsb<<7|clsb].presets[p]=tok[1]; + } + else err("invalid mapping line") + } } #undef err @@ -143,10 +165,12 @@ qmpMidiOutRtMidi::qmpMidiOutRtMidi(unsigned _portid) { portid=_portid; outport=nullptr; + devinit=nullptr; } qmpMidiOutRtMidi::~qmpMidiOutRtMidi() { if(!outport)return; + if(devinit){delete devinit;devinit=nullptr;} if(outport->isPortOpen())outport->closePort(); delete outport;outport=nullptr; } @@ -229,18 +253,44 @@ void qmpMidiOutRtMidi::onUnmapped(uint8_t ch,int refcnt) } std::vector> qmpMidiOutRtMidi::getBankList() { + if(!devinit)return{}; + std::vector> ret; + for(auto&i:devinit->banks) + ret.push_back({i.first,i.second.bankname}); + std::sort(ret.begin(),ret.end(),[](std::pair&a,std::pair&b){return a.first> qmpMidiOutRtMidi::getPresets(int bank) +std::vector> qmpMidiOutRtMidi::getPresets(uint16_t bank) { + if(!devinit)return{}; + if(devinit->banks.find(bank)==devinit->banks.end())return{}; + std::vector> ret; + for(auto&i:devinit->banks[bank].presets) + ret.push_back({i.first,i.second}); + std::sort(ret.begin(),ret.end(),[](std::pair&a,std::pair&b){return a.firstbanks.find(bank)!=devinit->banks.end()) + if(devinit->banks[bank].presets.find(preset)!=devinit->banks[bank].presets.end()) + return devinit->banks[bank].presets[preset]; + return""; } bool qmpMidiOutRtMidi::getChannelPreset(int ch,uint16_t *bank,uint8_t *preset,std::string &presetname) { + //This ain't a state-tracking device + return false; } uint8_t qmpMidiOutRtMidi::getInitialCCValue(uint8_t cc) { + if(!devinit)return 0;//Nope! +} +void qmpMidiOutRtMidi::setInitializerFile(const char* path) +{ + if(devinit)delete devinit; + devinit=qmpDeviceInitializer::parse(path); } RtMidiOut* qmpRtMidiManager::dummy=nullptr; diff --git a/core/qmpmidioutrtmidi.hpp b/core/qmpmidioutrtmidi.hpp index 23adec6..0c1843c 100644 --- a/core/qmpmidioutrtmidi.hpp +++ b/core/qmpmidioutrtmidi.hpp @@ -23,6 +23,7 @@ class qmpMidiOutRtMidi:public qmpMidiOutDevice private: unsigned portid; RtMidiOut* outport; + qmpDeviceInitializer* devinit; public: qmpMidiOutRtMidi(unsigned _portid); ~qmpMidiOutRtMidi(); @@ -37,10 +38,12 @@ public: void onMapped(uint8_t ch,int refcnt); void onUnmapped(uint8_t ch,int refcnt); std::vector> getBankList(); - std::vector> getPresets(int bank); + std::vector> getPresets(uint16_t bank); std::string getPresetName(uint16_t bank,uint8_t preset); bool getChannelPreset(int ch,uint16_t *bank,uint8_t *preset,std::string &presetname); uint8_t getInitialCCValue(uint8_t cc); + + void setInitializerFile(const char* path); }; class qmpRtMidiManager { -- cgit v1.2.3