nikolay-vm-host/LightHost
1
0
Fork 0
Code Issues 51 Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Standardize stored keys

Browse Source
This commit is contained in:
Rolando Islas
2016-05-27 12:58:10 -07:00
parent 9b458273ed
commit 2a407bc741
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/IconMenu.cpp
+22 -17
View File
@@ -124,14 +124,13 @@ void IconMenu::loadActivePlugins()
PluginDescription plugin = getNextPluginOlderThanTime(pluginTime); PluginDescription plugin = getNextPluginOlderThanTime(pluginTime);
String errorMessage; String errorMessage;
AudioPluginInstance* instance = formatManager.createPluginInstance(plugin, graph.getSampleRate(), graph.getBlockSize(), errorMessage); AudioPluginInstance* instance = formatManager.createPluginInstance(plugin, graph.getSampleRate(), graph.getBlockSize(), errorMessage);
String pluginUid; String pluginUid = getKey("state", plugin);
pluginUid << "pluginState-" << i;
String savedPluginState = getAppProperties().getUserSettings()->getValue(pluginUid); String savedPluginState = getAppProperties().getUserSettings()->getValue(pluginUid);
MemoryBlock savedPluginBinary; MemoryBlock savedPluginBinary;
savedPluginBinary.fromBase64Encoding(savedPluginState); savedPluginBinary.fromBase64Encoding(savedPluginState);
instance->setStateInformation(savedPluginBinary.getData(), savedPluginBinary.getSize()); instance->setStateInformation(savedPluginBinary.getData(), savedPluginBinary.getSize());
graph.addNode(instance, i); graph.addNode(instance, i);
String key = "pluginBypass-" + plugin.descriptiveName + plugin.version + plugin.pluginFormatName; String key = getKey("bypass", plugin);
bool bypass = getAppProperties().getUserSettings()->getBoolValue(key, false); bool bypass = getAppProperties().getUserSettings()->getBoolValue(key, false);
// Input to plugin // Input to plugin
if ((!hasInputConnected) && (!bypass)) if ((!hasInputConnected) && (!bypass))
@@ -165,7 +164,7 @@ PluginDescription IconMenu::getNextPluginOlderThanTime(int &time)
for (int i = 0; i < activePluginList.getNumTypes(); i++) for (int i = 0; i < activePluginList.getNumTypes(); i++)
{ {
PluginDescription plugin = *activePluginList.getType(i); PluginDescription plugin = *activePluginList.getType(i);
String key = "pluginOrder-" + plugin.descriptiveName + plugin.version + plugin.pluginFormatName; String key = getKey("order", plugin);
String pluginTimeString = getAppProperties().getUserSettings()->getValue(key); String pluginTimeString = getAppProperties().getUserSettings()->getValue(key);
int pluginTime = atoi(pluginTimeString.toStdString().c_str()); int pluginTime = atoi(pluginTimeString.toStdString().c_str());
if (pluginTime > timeStatic && abs(timeStatic - pluginTime) < diff) if (pluginTime > timeStatic && abs(timeStatic - pluginTime) < diff)
@@ -232,7 +231,7 @@ void IconMenu::timerCallback()
PopupMenu options; PopupMenu options;
options.addItem(INDEX_EDIT + i, "Edit"); options.addItem(INDEX_EDIT + i, "Edit");
std::vector<PluginDescription> timeSorted = getTimeSortedList(); std::vector<PluginDescription> timeSorted = getTimeSortedList();
String key = "pluginBypass-" + timeSorted[i].descriptiveName + timeSorted[i].version + timeSorted[i].pluginFormatName; String key = getKey("bypass", timeSorted[i]);
bool bypass = getAppProperties().getUserSettings()->getBoolValue(key); bool bypass = getAppProperties().getUserSettings()->getBoolValue(key);
options.addItem(INDEX_BYPASS + i, "Bypass", true, bypass); options.addItem(INDEX_BYPASS + i, "Bypass", true, bypass);
options.addItem(INDEX_DELETE + i, "Delete"); options.addItem(INDEX_DELETE + i, "Delete");
@@ -303,12 +302,12 @@ void IconMenu::menuInvocationCallback(int id, IconMenu* im)
int index = id - im->INDEX_DELETE; int index = id - im->INDEX_DELETE;
std::vector<PluginDescription> timeSorted = im->getTimeSortedList(); std::vector<PluginDescription> timeSorted = im->getTimeSortedList();
String key = "pluginOrder-" + timeSorted[index].descriptiveName + timeSorted[index].version + timeSorted[index].pluginFormatName; String key = getKey("order", timeSorted[index]);
int unsortedIndex = 0; int unsortedIndex = 0;
for (int i = 0; im->activePluginList.getNumTypes(); i++) for (int i = 0; im->activePluginList.getNumTypes(); i++)
{ {
PluginDescription current = *im->activePluginList.getType(i); PluginDescription current = *im->activePluginList.getType(i);
if (key.equalsIgnoreCase("pluginOrder-" + current.descriptiveName + current.version + current.pluginFormatName)) if (key.equalsIgnoreCase(getKey("order", current)))
{ {
unsortedIndex = i; unsortedIndex = i;
break; break;
@@ -318,7 +317,7 @@ void IconMenu::menuInvocationCallback(int id, IconMenu* im)
// Remove plugin order // Remove plugin order
getAppProperties().getUserSettings()->removeValue(key); getAppProperties().getUserSettings()->removeValue(key);
// Remove bypass entry // Remove bypass entry
getAppProperties().getUserSettings()->removeValue(key.replace("Order", "Bypass")); getAppProperties().getUserSettings()->removeValue(getKey("bypass", timeSorted[index]));
getAppProperties().saveIfNeeded(); getAppProperties().saveIfNeeded();
// Remove plugin from list // Remove plugin from list
@@ -334,7 +333,7 @@ void IconMenu::menuInvocationCallback(int id, IconMenu* im)
im->deletePluginStates(); im->deletePluginStates();
PluginDescription plugin = *im->knownPluginList.getType(im->knownPluginList.getIndexChosenByMenu(id)); PluginDescription plugin = *im->knownPluginList.getType(im->knownPluginList.getIndexChosenByMenu(id));
String key = "pluginOrder-" + plugin.descriptiveName + plugin.version + plugin.pluginFormatName; String key = getKey("order", plugin);
int t = time(0); int t = time(0);
getAppProperties().getUserSettings()->setValue(key, t); getAppProperties().getUserSettings()->setValue(key, t);
getAppProperties().saveIfNeeded(); getAppProperties().saveIfNeeded();
@@ -350,7 +349,7 @@ void IconMenu::menuInvocationCallback(int id, IconMenu* im)
int index = id - im->INDEX_BYPASS; int index = id - im->INDEX_BYPASS;
std::vector<PluginDescription> timeSorted = im->getTimeSortedList(); std::vector<PluginDescription> timeSorted = im->getTimeSortedList();
String key = "pluginBypass-" + timeSorted[index].descriptiveName + timeSorted[index].version + timeSorted[index].pluginFormatName; String key = getKey("bypass", timeSorted[index]);
// Set bypass flag // Set bypass flag
bool bypassed = getAppProperties().getUserSettings()->getBoolValue(key); bool bypassed = getAppProperties().getUserSettings()->getBoolValue(key);
@@ -382,12 +381,18 @@ std::vector<PluginDescription> IconMenu::getTimeSortedList()
} }
String IconMenu::getKey(String type, PluginDescription plugin)
{
String key = "plugin-" + type.toLowerCase() + "-" + plugin.name + plugin.version + plugin.pluginFormatName;
return key;
}
void IconMenu::deletePluginStates() void IconMenu::deletePluginStates()
{ {
for (int i = 1; i <= activePluginList.getNumTypes(); i++) std::vector<PluginDescription> list = getTimeSortedList();
for (int i = 0; i < activePluginList.getNumTypes(); i++)
{ {
String pluginUid; String pluginUid = getKey("state", list[i]);
pluginUid << "pluginState-" << i;
getAppProperties().getUserSettings()->removeValue(pluginUid); getAppProperties().getUserSettings()->removeValue(pluginUid);
getAppProperties().saveIfNeeded(); getAppProperties().saveIfNeeded();
} }
@@ -395,14 +400,14 @@ void IconMenu::deletePluginStates()
void IconMenu::savePluginStates() void IconMenu::savePluginStates()
{ {
for (int i = 1; i <= activePluginList.getNumTypes(); i++) std::vector<PluginDescription> list = getTimeSortedList();
for (int i = 0; i < activePluginList.getNumTypes(); i++)
{ {
AudioProcessorGraph::Node* node = graph.getNodeForId(i); AudioProcessorGraph::Node* node = graph.getNodeForId(i + 1);
if (node == nullptr) if (node == nullptr)
break; break;
AudioProcessor& processor = *node->getProcessor(); AudioProcessor& processor = *node->getProcessor();
String pluginUid; String pluginUid = getKey("state", list[i]);
pluginUid << "pluginState-" << i;
MemoryBlock savedStateBinary; MemoryBlock savedStateBinary;
processor.getStateInformation(savedStateBinary); processor.getStateInformation(savedStateBinary);
getAppProperties().getUserSettings()->setValue(pluginUid, savedStateBinary.toBase64Encoding()); getAppProperties().getUserSettings()->setValue(pluginUid, savedStateBinary.toBase64Encoding());
Source/IconMenu.hpp
+1
View File
@@ -19,6 +19,7 @@ public:
void mouseDown(const MouseEvent&); void mouseDown(const MouseEvent&);
static void menuInvocationCallback(int id, IconMenu*); static void menuInvocationCallback(int id, IconMenu*);
void changeListenerCallback(ChangeBroadcaster* changed); void changeListenerCallback(ChangeBroadcaster* changed);
static String getKey(String type, PluginDescription plugin);
const int INDEX_EDIT, INDEX_BYPASS, INDEX_DELETE; const int INDEX_EDIT, INDEX_BYPASS, INDEX_DELETE;
private: private: