Mercurial > hg > tweakathon2ios
diff presetManager.mm @ 13:ab3e0e980c82
Sequence conrtollrer FINALLY works.
| author | Robert Tubb <rt300@eecs.qmul.ac.uk> |
|---|---|
| date | Mon, 20 Oct 2014 19:36:39 +0100 |
| parents | af71bf84660f |
| children | f83635861187 |
line wrap: on
line diff
--- a/presetManager.mm Mon Oct 20 14:12:23 2014 +0100 +++ b/presetManager.mm Mon Oct 20 19:36:39 2014 +0100 @@ -12,6 +12,20 @@ extern EventLogger eventLogger; +template <typename T> +vector<T> makeVector8(T a1, T a2,T a3,T a4,T a5,T a6, T a7, T a8){ + + vector<T> vec; + vec.push_back(a1); + vec.push_back(a2); + vec.push_back(a3); + vec.push_back(a4); + vec.push_back(a5); + vec.push_back(a6); + vec.push_back(a7); + vec.push_back(a8); + return vec; +} //--------------------------------------------------------------------------- Json::Value Preset::presetToJson(){ @@ -145,7 +159,7 @@ } //----------------------------------------------------------------------------- void PresetManager::generatePresetSlot(const string name, const string imagefn){ - vector<int> values; // empty + vector<int> values = makeVector8(0,0,0,0,45,0,0,0); // empty thePresets.push_back(new Preset(values, name, nextID, eventLogger.userName, eventLogger.deviceID, imagefn)); }