Mercurial > hg > tweakathon2ios
diff presetManager.mm @ 6:92850a2b099c
set up preset slots from init file.
PD synth has metronome, recieves ticks but doesn't do anything with them.
author | Robert Tubb <rt300@eecs.qmul.ac.uk> |
---|---|
date | Fri, 17 Oct 2014 14:50:50 +0100 |
parents | 213df0baed47 |
children | af71bf84660f |
line wrap: on
line diff
--- a/presetManager.mm Thu Oct 16 15:52:53 2014 +0100 +++ b/presetManager.mm Fri Oct 17 14:50:50 2014 +0100 @@ -10,7 +10,6 @@ //--------------------------------------------------------------------------- -PresetManager presetManager; extern EventLogger eventLogger; //--------------------------------------------------------------------------- @@ -101,8 +100,7 @@ const Json::Value jpresets = root["presets"]; for ( int index = 0; index < jpresets.size(); ++index ) thePresets.push_back(new Preset(jpresets[index])); - - printAll(); + } //--------------------------------------------------------------------------- @@ -131,7 +129,7 @@ if ((*iter)->name == name){ cout << "WARNING Preset by that name exists, overwriting\n"; // overwrite it - (*iter)->CCValues = values; + (*iter)->setValues(values); updatePresetFile(); eventLogger.logEvent(SAVE_PRESET); // TODO need to log details? return; @@ -148,6 +146,12 @@ updatePresetFile(); } +//----------------------------------------------------------------------------- +void PresetManager::generatePresetSlot(const string name, const string imagefn){ + vector<int> values; // empty + thePresets.push_back(new Preset(values, name, nextID, eventLogger.userName, eventLogger.deviceID, imagefn)); + +} //----------------------------------------------cu----------------------------- vector<int> PresetManager::recallPreset(string name){ vector<Preset *>::iterator p; @@ -177,8 +181,7 @@ // stick all the stuff in a json value Json::Value root = allPresetsToJson(); - - cout << root; + presetFile << root; } //---------------------------------------------------------------------------