fix bug in saving global params, looping is forced off at startup

vizicist · Dec 12, 2024 · ffaa1ff · ffaa1ff
1 parent 6a3e626
commit ffaa1ff
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 115 deletions.
diff --git a/build/windows/build_all_mmtt_versions.bat b/build/windows/build_all_mmtt_versions.bat
@@ -13,3 +13,4 @@ call clean.bat
 call build.bat
 
 set PALETTE_MMTT=%save_PALETTE_MMTT%
+set save_PALETTE_MMTT=
diff --git a/build/windows/build_data.bat b/build/windows/build_data.bat
@@ -17,11 +17,12 @@ if not "%PALETTE_SOURCE%" == "" goto keepgoing1
 :keepgoing1
 
 set ship=%PALETTE_SOURCE%\build\windows\ship
+set datadir=data_%data%
 
+rm -fr %PALETTE_SOURCE%\%datadir%\logs
 rm -fr %ship% > nul 2>&1
 mkdir %ship%
 
-set datadir=data_%data%
 echo ================ Copying %datadir%
 mkdir %ship%\%datadir%
 xcopy /e /y %PALETTE_SOURCE%\%datadir%\* %ship%\%datadir% >nul

diff --git a/build/windows/clean.bat b/build/windows/clean.bat
@@ -16,5 +16,7 @@ rm -fr %PALETTE_SOURCE%\depthlib\build\.vs
 rm -fr %PALETTE_SOURCE%\depthlib\build\x64
 rm -fr %PALETTE_SOURCE%\depthlib\build\*.dir
 del /s %PALETTE_SOURCE%\mmtt_kinect\build\windows\*.obj >nul 2>nul
+del /s %PALETTE_SOURCE%\data_sfmoma\logs\*.log >nul 2>nul
+del /s %PALETTE_SOURCE%\data_omnisphere\logs\*.log >nul 2>nul
 
 :getout
diff --git a/data_omnisphere/config/paramdefs.json b/data_omnisphere/config/paramdefs.json
@@ -187,8 +187,8 @@
 "global.keykitoutput": {"valuetype":"string", "min":"", "max":"", "init":"Microsoft GS Wavetable Synth", "comment":"#" },
 "global.keykitallow": {"valuetype":"string", "min":"", "max":"", "init":"127.0.0.1", "comment":"#" },
 "global.log": {"valuetype":"string", "min":"log", "max":"log", "init":"", "comment":"# log type" },
-"global.looping_override": {"valuetype":"bool", "min":"false", "max":"true", "init":"false", "comment":"#" },
-"global.looping_fade": {"valuetype": "float", "min": "0.0", "max": "1.0",  "init": "0.5",	"comment": "# default fade factor" },
+"global.looping_override": {"valuetype":"bool", "min":"false", "max":"true", "init":"true", "comment":"#" },
+"global.looping_fade": {"valuetype": "float", "min": "0.0", "max": "1.0",  "init": "0.0",	"comment": "# default fade factor" },
 "global.looping_fadethreshold": {"valuetype": "float", "min": "0.001", "max": "0.5",  "init": "0.01",	"comment": "# " },
 "global.looping_beats": {"valuetype":"int", "min":"1", "max":"128", "init":"8", "comment":"# Loop length in beats" },
 "global.emailto": {"valuetype":"string", "min":"", "max":"", "init":"", "comment":"#" },

diff --git a/data_omnisphere/saved/global/Ambient.json b/data_omnisphere/saved/global/Ambient.json
@@ -33,7 +33,7 @@
         "global.looping_beats":"8",
         "global.looping_fade":"1.000000",
         "global.looping_fadethreshold":"0.500000",
-        "global.looping_override":"false",
+        "global.looping_override":"true",
         "global.midiinput":"",
         "global.midisetexternalscale":"false",
         "global.midithru":"false",

diff --git a/data_omnisphere/saved/global/Looping_Off.json b/data_omnisphere/saved/global/Looping_Off.json
@@ -1,5 +1,6 @@
 {
     "params": {
-        "global.looping_override":"false"
+        "global.looping_override":"true",
+        "global.looping_fade":"0.000000"
     }
 }
diff --git a/data_sfmoma/config/paramdefs.json b/data_sfmoma/config/paramdefs.json
@@ -187,8 +187,8 @@
 "global.keykitoutput": {"valuetype":"string", "min":"", "max":"", "init":"Microsoft GS Wavetable Synth", "comment":"#" },
 "global.keykitallow": {"valuetype":"string", "min":"", "max":"", "init":"127.0.0.1", "comment":"#" },
 "global.log": {"valuetype":"string", "min":"log", "max":"log", "init":"", "comment":"# log type" },
-"global.looping_override": {"valuetype":"bool", "min":"false", "max":"true", "init":"false", "comment":"#" },
-"global.looping_fade": {"valuetype": "float", "min": "0.0", "max": "1.0",  "init": "0.5",	"comment": "# default fade factor" },
+"global.looping_override": {"valuetype":"bool", "min":"false", "max":"true", "init":"true", "comment":"#" },
+"global.looping_fade": {"valuetype": "float", "min": "0.0", "max": "1.0",  "init": "0.0",	"comment": "# default fade factor" },
 "global.looping_fadethreshold": {"valuetype": "float", "min": "0.001", "max": "0.5",  "init": "0.01",	"comment": "# " },
 "global.looping_beats": {"valuetype":"int", "min":"1", "max":"128", "init":"8", "comment":"# Loop length in beats" },
 "global.emailto": {"valuetype":"string", "min":"", "max":"", "init":"", "comment":"#" },

diff --git a/data_sfmoma/logs/palette.log b/data_sfmoma/logs/palette.log
diff --git a/data_sfmoma/saved/global/Looping_Off.json b/data_sfmoma/saved/global/Looping_Off.json
@@ -1,5 +1,6 @@
 {
     "params": {
-        "global.looping_override":"false"
+        "global.looping_override":"true",
+        "global.looping_fade":"0.000000"
     }
 }
diff --git a/data_surge_old.zip b/data_surge_old.zip
diff --git a/kit/engine.go b/kit/engine.go
@@ -78,10 +78,21 @@ func InitEngine() {
 
 	for name := range ParamDefs {
 		if strings.HasPrefix(name, "global.") {
-			LogInfo("global name","name",name)
+			// LogInfo("global name","name",name)
 			ActivateGlobalParam(name)
 		}
 	}
+
+	LogInfo("PaletteDataPath","path",PaletteDataPath())
+
+	// To avoid confusion, force looping off at startup
+	LogInfo("Looping is being forced off")
+	err := GlobalParams.SetParamWithString("global.looping_override", "true")
+	LogIfError(err)
+	err = GlobalParams.SetParamWithString("global.looping_fade", "0.00")
+	LogIfError(err)
+	err = SaveCurrentGlobalParams()
+	LogIfError(err)
 }
 
 func LocalEngineApi(api string, args ...string) (map[string]string, error) {
@@ -203,7 +214,10 @@ func LoadGlobalParamsFrom(filename string, activate bool) (err error) {
 			ActivateGlobalParam(nm)
 		}
 	}
-	return nil
+	if filename != "_Current" {
+		err = SaveCurrentGlobalParams()
+	}
+	return err
 }
 
 func (e *Engine) Start() {

diff --git a/release/palette_8.06_data_omnisphere.exe b/release/palette_8.06_data_omnisphere.exe
diff --git a/release/palette_8.06_data_sfmoma.exe b/release/palette_8.06_data_sfmoma.exe
diff --git a/release/palette_8.06_win_setup.exe b/release/palette_8.06_win_setup.exe
diff --git a/release/palette_8.06_win_setup_with_kinect.exe b/release/palette_8.06_win_setup_with_kinect.exe
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,4 @@ call clean.bat
		call build.bat

		set PALETTE_MMTT=%save_PALETTE_MMTT%
		set save_PALETTE_MMTT=