Browse Source

Save lastPath in settings

tags/v0.5.0
Andrew Belt 7 years ago
parent
commit
7c31edd21f
2 changed files with 16 additions and 4 deletions
  1. +7
    -4
      src/main.cpp
  2. +9
    -0
      src/settings.cpp

+ 7
- 4
src/main.cpp View File

@@ -18,18 +18,21 @@ int main(int argc, char* argv[]) {
engineInit(); engineInit();
guiInit(); guiInit();
sceneInit(); sceneInit();
settingsLoad(assetLocal("settings.json"));
if (argc >= 2)
if (argc >= 2) {
// TODO Set gRackWidget->lastPath
gRackWidget->loadPatch(argv[1]); gRackWidget->loadPatch(argv[1]);
else
}
else {
gRackWidget->loadPatch(assetLocal("autosave.vcv")); gRackWidget->loadPatch(assetLocal("autosave.vcv"));
}
settingsLoad(assetLocal("settings.json"));


engineStart(); engineStart();
guiRun(); guiRun();
engineStop(); engineStop();


gRackWidget->savePatch(assetLocal("autosave.vcv"));
settingsSave(assetLocal("settings.json")); settingsSave(assetLocal("settings.json"));
gRackWidget->savePatch(assetLocal("autosave.vcv"));
sceneDestroy(); sceneDestroy();
guiDestroy(); guiDestroy();
engineDestroy(); engineDestroy();


+ 9
- 0
src/settings.cpp View File

@@ -39,6 +39,10 @@ static json_t *settingsToJson() {
json_t *plugLightJ = json_boolean(gToolbar->plugLightButton->value > 0.0); json_t *plugLightJ = json_boolean(gToolbar->plugLightButton->value > 0.0);
json_object_set_new(rootJ, "plugLight", plugLightJ); json_object_set_new(rootJ, "plugLight", plugLightJ);


// lastPath
json_t *lastPathJ = json_string(gRackWidget->lastPath.c_str());
json_object_set_new(rootJ, "lastPath", lastPathJ);

return rootJ; return rootJ;
} }


@@ -74,6 +78,11 @@ static void settingsFromJson(json_t *rootJ) {
json_t *plugLightJ = json_object_get(rootJ, "plugLight"); json_t *plugLightJ = json_object_get(rootJ, "plugLight");
if (plugLightJ) if (plugLightJ)
gToolbar->plugLightButton->setValue(json_is_true(plugLightJ) ? 1.0 : 0.0); gToolbar->plugLightButton->setValue(json_is_true(plugLightJ) ? 1.0 : 0.0);

// lastPath
json_t *lastPathJ = json_object_get(rootJ, "lastPath");
if (lastPathJ)
gRackWidget->lastPath = json_string_value(lastPathJ);
} }






Loading…
Cancel
Save