Browse Source

fall back to settings_default.json when settings.json does not exist, yet

pull/1639/head
bsp2 6 years ago
parent
commit
0cf549b2f7
4 changed files with 6 additions and 4 deletions
  1. +1
    -1
      include/settings.hpp
  2. +2
    -1
      src/main.cpp
  3. +3
    -2
      src/settings.cpp
  4. +0
    -0
      vst2_bin/settings_default.json

+ 1
- 1
include/settings.hpp View File

@@ -10,7 +10,7 @@ extern bool gSkipAutosaveOnLaunch;
extern bool b_touchkeyboard_enable; extern bool b_touchkeyboard_enable;


void settingsSave(std::string filename); void settingsSave(std::string filename);
void settingsLoad(std::string filename, bool bWindowSizeOnly);
bool settingsLoad(std::string filename, bool bWindowSizeOnly);




} // namespace rack } // namespace rack

+ 2
- 1
src/main.cpp View File

@@ -91,7 +91,8 @@ int vst2_init(int argc, char* argv[], bool _bFX) {
printf("xxx vst2_init: 9\n"); printf("xxx vst2_init: 9\n");
appInit(devMode); appInit(devMode);
printf("xxx vst2_init: 10\n"); printf("xxx vst2_init: 10\n");
settingsLoad(assetLocal("settings.json"), false/*bWindowSizeOnly*/);
if(!settingsLoad(assetLocal("settings.json"), false/*bWindowSizeOnly*/))
settingsLoad(assetLocal("settings_default.json"), false/*bWindowSizeOnly*/);
printf("xxx vst2_init: 11\n"); printf("xxx vst2_init: 11\n");


#if 0 #if 0


+ 3
- 2
src/settings.cpp View File

@@ -471,11 +471,11 @@ void settingsSave(std::string filename) {
} }
} }


void settingsLoad(std::string filename, bool bWindowSizeOnly) {
bool settingsLoad(std::string filename, bool bWindowSizeOnly) {
info("Loading settings %s", filename.c_str()); info("Loading settings %s", filename.c_str());
FILE *file = fopen(filename.c_str(), "r"); FILE *file = fopen(filename.c_str(), "r");
if (!file) if (!file)
return;
return false;


json_error_t error; json_error_t error;
json_t *rootJ = json_loadf(file, 0, &error); json_t *rootJ = json_loadf(file, 0, &error);
@@ -488,6 +488,7 @@ void settingsLoad(std::string filename, bool bWindowSizeOnly) {
} }


fclose(file); fclose(file);
return true;
} }






vst2_bin/settings.json → vst2_bin/settings_default.json View File


Loading…
Cancel
Save