Mercurial > hg > tweakathon2ios
diff MessageOrganiser.mm @ 32:75202498bee9
perform mode (no guides at all)
author | Robert Tubb <rt300@eecs.qmul.ac.uk> |
---|---|
date | Tue, 25 Nov 2014 17:03:33 +0000 |
parents | a677c027e3a0 |
children | 93317878abef |
line wrap: on
line diff
--- a/MessageOrganiser.mm Fri Nov 21 17:07:56 2014 +0000 +++ b/MessageOrganiser.mm Tue Nov 25 17:03:33 2014 +0000 @@ -66,7 +66,24 @@ instructionPanel->show(); } - +void MessageOrganiser::setSeqNumPanel(TextPanel * snp){ + seqNumPanel = snp; +} +void MessageOrganiser::showSeqNum(int num){ + stringstream s; + s << num; + seqNumPanel->setText(s.str()); + seqNumPanel->show(); +} +void MessageOrganiser::setScoreNumPanel(TextPanel * snp){ + scoreNumPanel = snp; +} +void MessageOrganiser::showScoreNum(int num){ + stringstream s; + s << "SCORE: " << num; + scoreNumPanel->setText(s.str()); + scoreNumPanel->show(); +} //----------------------------------------------------------------------------- void MessageOrganiser::hideMyPanels(){ presetIconPanel->hide(); @@ -217,8 +234,9 @@ // this will actually show sliders with target vals - for "memorisation" purposes mwa heh heh // get target values // set ui + cout << "set slid to targ" << endl; vector<int> vals = targetSynth.getAllParamValues(); - for(int i=1; i < vals.size(); i++){ + for(int i=0; i < vals.size(); i++){ setUIToParam(i, vals[i]); } } @@ -232,7 +250,7 @@ // } } void MessageOrganiser::setSlidersToDefault(){ - for(int i=1; i < candidateSynth.getNumParams(); i++){ + for(int i=0; i < candidateSynth.getNumParams(); i++){ setUIToParam(i, 0); } @@ -247,4 +265,32 @@ setAllSlidersToValues(rands); candidateSynth.setAllParams(rands); +} + + +void MessageOrganiser::midiFromLeap(int ctl_num, int ctl_val){ + + + if (!okToGetMidi){ + return; + } + vector<int> mids = candidateSynth.getAllMappingIDs(); + if (ctl_num >= mids.size() || ctl_num < 0) return; + + if(onlyChangeCandidateOnTrigger){ + + candidateSynth.paramChangeCallback(mids[ctl_num], ctl_val, false); + }else{ + candidateSynth.paramChangeCallback(mids[ctl_num], ctl_val, true); + } + + + setUIToParam(ctl_num, ctl_val); + + vector<int> evtData; + evtData.push_back(mids[ctl_num]); // or just index? + evtData.push_back(ctl_val); + + eventLogger.logEvent(CANDIDATE_PARAM_ADJUSTED, evtData); + } \ No newline at end of file