diff --git a/VERSION b/VERSION index d1b10db7..c34d6988 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.96 +7.97 diff --git a/build/windows/all_build.bat b/build/windows/all_build.bat new file mode 100644 index 00000000..20e8384f --- /dev/null +++ b/build/windows/all_build.bat @@ -0,0 +1,4 @@ +call bin_build +call bin_install +call data_build +call data_install diff --git a/build/windows/build.bat b/build/windows/bin_build.bat similarity index 72% rename from build/windows/build.bat rename to build/windows/bin_build.bat index 931b2db9..e2fe8229 100644 --- a/build/windows/build.bat +++ b/build/windows/bin_build.bat @@ -67,8 +67,9 @@ pushd %PALETTE_SOURCE%\python rm -fr dist rm -fr build\palette_gui rm -fr build -pyinstaller -i ..\data\config\palette.ico palette_gui.py > pyinstaller_gui.out 2>&1 +pyinstaller -i palette.ico palette_gui.py > pyinstaller_gui.out 2>&1 move dist\palette_gui dist\pyinstalled >nul +copy palette.ico dist\pyinstalled >nul move dist\pyinstalled %bin% >nul popd @@ -113,35 +114,10 @@ copy palette_killall.bat %bin% >nul copy palette_onboot.bat %bin% >nul copy delay.bat %bin% >nul copy cdlogs.bat %bin% >nul +copy tv_on.bat %bin% >nul +copy tv_off.bat %bin% >nul popd -echo ================ Copying data -mkdir %ship%\data\config -mkdir %ship%\data\midifiles -mkdir %ship%\data\saved -rem mkdir %ship%\data\keykit -rem mkdir %ship%\data\keykit\liblocal -mkdir %ship%\data\html -copy %PALETTE_SOURCE%\data\config\homepage.json %ship%\data\config >nul -copy %PALETTE_SOURCE%\data\config\ffgl.json %ship%\data\config >nul -copy %PALETTE_SOURCE%\data\config\param*.json %ship%\data\config >nul -copy %PALETTE_SOURCE%\data\config\resolume.json %ship%\data\config >nul -copy %PALETTE_SOURCE%\data\config\settings.json %ship%\data\config >nul -rem copy %PALETTE_SOURCE%\data\config\mmtt_*.json %ship%\data\config >nul -copy %PALETTE_SOURCE%\data\config\synths.json %ship%\data\config >nul -copy %PALETTE_SOURCE%\data\config\morphs.json %ship%\data\config >nul -copy %PALETTE_SOURCE%\data\config\Palette*.avc %ship%\data\config >nul -copy %PALETTE_SOURCE%\data\config\EraeTouchLayout.emk %ship%\data\config >nul -copy %PALETTE_SOURCE%\data\config\*.png %ship%\data\config >nul -copy %PALETTE_SOURCE%\data\config\consola.ttf %ship%\data\config >nul -copy %PALETTE_SOURCE%\data\config\OpenSans-Regular.ttf %ship%\data\config >nul -copy %PALETTE_SOURCE%\data\config\palette.ico %ship%\data\config >nul -copy %PALETTE_SOURCE%\data\config\*.bidule %ship%\data\config >nul -copy %PALETTE_SOURCE%\data\midifiles\*.* %ship%\data\midifiles >nul -xcopy /e /y %PALETTE_SOURCE%\data\saved %ship%\data\saved >nul -rem xcopy /e /y %PALETTE_SOURCE%\data\keykit\liblocal %ship%\data\keykit\liblocal >nul -xcopy /e /y %PALETTE_SOURCE%\data\html %ship%\data\html >nul - echo ================ Copying windows-specific things copy %PALETTE_SOURCE%\SenselLib\x64\LibSensel.dll %bin% >nul copy %PALETTE_SOURCE%\SenselLib\x64\LibSenselDecompress.dll %bin% >nul @@ -155,6 +131,24 @@ copy "%USERPROFILE%\mingw64\bin\libstdc++-6.dll" %bin% >nul echo ================ Removing unused things rm -fr %bin%\pyinstalled\tcl\tzdata -call buildinstaller.bat +copy %PALETTE_SOURCE%\VERSION %ship% >nul +set /p version=<../../VERSION + +echo ================ Creating installer for VERSION %version% + +sed -e "s/SUBSTITUTE_VERSION_HERE/%version%/" < palette_win_setup.iss > tmp.iss +"c:\Program Files (x86)\Inno Setup 6\ISCC.exe" /Q tmp.iss + +if not "%PALETTE_MMTT%" == "kinect" goto no_kinect +move Output\palette_%version%_win_setup.exe %PALETTE_SOURCE%\release\palette_%version%_win_setup_with_kinect.exe >nul +goto finish + +:no_kinect +move Output\palette_%version%_win_setup.exe %PALETTE_SOURCE%\release >nul + +:finish + +rmdir Output +rm tmp.iss :getout diff --git a/build/windows/installnow.bat b/build/windows/bin_install.bat similarity index 74% rename from build/windows/installnow.bat rename to build/windows/bin_install.bat index 6efeb3c3..e31cda14 100644 --- a/build/windows/installnow.bat +++ b/build/windows/bin_install.bat @@ -6,7 +6,12 @@ del /q hostname.txt echo .................................................... echo Installing Palette version %version% echo .................................................... +if not "%PALETTE_MMTT%" == "kinect" goto no_mmtt_kinect +..\..\release\palette_%version%_win_setup_with_kinect.exe /SILENT +goto done +:no_mmtt_kinect ..\..\release\palette_%version%_win_setup.exe /SILENT +:done echo .................................................... echo Done! echo .................................................... diff --git a/build/windows/buildinstall.bat b/build/windows/buildinstall.bat deleted file mode 100644 index 205e8358..00000000 --- a/build/windows/buildinstall.bat +++ /dev/null @@ -1,2 +0,0 @@ -call build.bat -call installpause.bat diff --git a/build/windows/buildinstaller.bat b/build/windows/buildinstaller.bat deleted file mode 100644 index 9eccd662..00000000 --- a/build/windows/buildinstaller.bat +++ /dev/null @@ -1,21 +0,0 @@ -@echo off - -copy %PALETTE_SOURCE%\VERSION %ship% >nul -set /p version=<../../VERSION - -echo ================ Creating installer for VERSION %version% - -sed -e "s/SUBSTITUTE_VERSION_HERE/%version%/" < palette_win_setup.iss > tmp.iss -"c:\Program Files (x86)\Inno Setup 6\ISCC.exe" /Q tmp.iss - -if not "%PALETTE_MMTT%" == "kinect" goto no_kinect -move Output\palette_%version%_win_setup.exe %PALETTE_SOURCE%\release\palette_%version%_win_setup_with_kinect.exe >nul -goto finish - -:no_kinect -move Output\palette_%version%_win_setup.exe %PALETTE_SOURCE%\release >nul - -:finish - -rmdir Output -rm tmp.iss diff --git a/build/windows/buildinstallnow.bat b/build/windows/buildinstallnow.bat deleted file mode 100644 index 6749ca94..00000000 --- a/build/windows/buildinstallnow.bat +++ /dev/null @@ -1,2 +0,0 @@ -call build.bat -call installnow.bat diff --git a/build/windows/data_build.bat b/build/windows/data_build.bat new file mode 100644 index 00000000..bbd8c685 --- /dev/null +++ b/build/windows/data_build.bat @@ -0,0 +1,32 @@ +@echo off + +set datadir=data_omnisphere + +if not "%PALETTE_SOURCE%" == "" goto keepgoing1 + echo You must set the PALETTE_SOURCE environment variable. + goto getout +:keepgoing1 + +set ship=%PALETTE_SOURCE%\build\windows\ship + +rm -fr %ship% > nul 2>&1 +mkdir %ship% + +echo ================ Copying %datadir% +mkdir %ship%\%datadir% +xcopy /e /y %PALETTE_SOURCE%\%datadir%\* %ship%\%datadir% >nul + +echo ================ Creating installer for %datadir% + +set /p version=<../../VERSION +sed -e "s/SUBSTITUTE_DATADIR_HERE/%datadir%/" < %datadir%.iss > tmp.iss +sed -e "s/SUBSTITUTE_VERSION_HERE/%version%/" < tmp.iss > tmp2.iss +"c:\Program Files (x86)\Inno Setup 6\ISCC.exe" /Q tmp2.iss + +set filename=%datadir%_%version% +move Output\%filename%.exe %PALETTE_SOURCE%\release >nul + +rem rm -fr Output > nul 2>&1 +rem rm tmp.iss tmp2.iss + +:getout diff --git a/build/windows/data_install.bat b/build/windows/data_install.bat new file mode 100644 index 00000000..277ccb17 --- /dev/null +++ b/build/windows/data_install.bat @@ -0,0 +1,14 @@ +@echo off + +set datadir=data_omnisphere + +set /p version=<../../VERSION +echo .................................................... +echo Installing %datadir%_%version% +echo .................................................... + +..\..\release\%datadir%_%version%.exe /SILENT + +echo .................................................... +echo Done! +echo .................................................... diff --git a/build/windows/data_omnisphere.iss b/build/windows/data_omnisphere.iss new file mode 100644 index 00000000..497415a4 --- /dev/null +++ b/build/windows/data_omnisphere.iss @@ -0,0 +1,52 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#include "environment.iss" + +#define MyAppName "SUBSTITUTE_DATADIR_HERE" +#define MyAppVersion "SUBSTITUTE_VERSION_HERE" +#define MyAppPublisher "Nosuch Media" +#define MyAppURL "https://github.com/vizicist/palette" +#define DataDir "data_omnisphere" +#define DataPath "{commoncf64}/Palette/SUBSTITUTE_DATADIR_HERE" + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{443296B2-FB07-4F76-992A-A100D5E51ADF} +AppVersion={#MyAppVersion} +AppName={#MyAppName} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={#DataPath} +DefaultGroupName={#MyAppName} +; Uncomment the following line to run in non administrative install mode (install for current user only.) +;PrivilegesRequired=lowest +OutputBaseFilename={#DataDir}_{#MyAppVersion} +; Compression=none +Compression=lzma +SolidCompression=yes +LZMAUseSeparateProcess=yes +LZMANumBlockThreads=6 +WizardStyle=modern +ArchitecturesAllowed=x64 +ChangesEnvironment=yes + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +; Things in %CommonProgramFiles%\Palette are made writable by anyone, for local changes and config +[Dirs] +Name: "{commoncf64}\{#MyAppName}"; Permissions: users-modify + +[Files] +Source: "ship\{#DataDir}\*"; DestDir: "{#DataPath}"; Flags: comparetimestamp ignoreversion recursesubdirs createallsubdirs + +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Registry] +Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; \ + ValueType: expandsz; ValueName: "PALETTE_DATA_PATH"; ValueData: "{#DataPath}"; Flags: preservestringtype + diff --git a/build/windows/palette_win_setup.iss b/build/windows/palette_win_setup.iss index 49b3266e..bd9fe409 100644 --- a/build/windows/palette_win_setup.iss +++ b/build/windows/palette_win_setup.iss @@ -7,7 +7,6 @@ #define MyAppVersion "SUBSTITUTE_VERSION_HERE" #define MyAppPublisher "Nosuch Media" #define MyAppURL "https://github.com/vizicist/palette" -#define DataPath "{commoncf64}/Palette/data" [Setup] ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. @@ -53,11 +52,6 @@ Source: "ship\bin\mmtt_kinect\*"; DestDir: "{app}\bin\mmtt_kinect"; Flags: ignor Source: "ship\ffgl\*"; DestDir: "{app}\ffgl"; Flags: ignoreversion recursesubdirs createallsubdirs ; Source: "ship\keykit\*"; DestDir: "{app}\keykit"; Flags: ignoreversion recursesubdirs createallsubdirs -; NOTE - all data_* files go in CommonProgramFiles\Palette -Source: "ship\data\*"; DestDir: "{#DataPath}"; Flags: comparetimestamp ignoreversion recursesubdirs createallsubdirs -Source: "logs_readme.txt"; DestDir: "{#DataPath}\logs"; DestName: "readme.txt"; Flags: ignoreversion -; NOTE: Don't use "Flags: ignoreversion" on any shared system files - ; This specifies the Visual C++ Windows Runtime Redistributable to install, it's put in {app}\bin to help debug things. [Files] Source: "vc15\bin\VC_redist.x64.exe"; DestDir: {app}\bin @@ -76,8 +70,6 @@ Name: "{group}\Stop Palette"; Filename: "{app}\bin\palette.exe"; Parameters: "st [Registry] Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; \ ValueType: expandsz; ValueName: "PALETTE"; ValueData: "{app}"; Flags: preservestringtype -Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; \ - ValueType: expandsz; ValueName: "PALETTE_DATA_PATH"; ValueData: "{commoncf64}\Palette\data"; Flags: preservestringtype [Code] procedure CurStepChanged(CurStep: TSetupStep); diff --git a/build/windows/tmp.iss b/build/windows/tmp.iss new file mode 100644 index 00000000..c09b547c --- /dev/null +++ b/build/windows/tmp.iss @@ -0,0 +1,52 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#include "environment.iss" + +#define MyAppName "data_omnisphere" +#define MyAppVersion "SUBSTITUTE_VERSION_HERE" +#define MyAppPublisher "Nosuch Media" +#define MyAppURL "https://github.com/vizicist/palette" +#define DataDir "data_omnisphere" +#define DataPath "{commoncf64}/Palette/data_omnisphere" + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{443296B2-FB07-4F76-992A-A100D5E51ADF} +AppVersion={#MyAppVersion} +AppName={#MyAppName} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={#DataPath} +DefaultGroupName={#MyAppName} +; Uncomment the following line to run in non administrative install mode (install for current user only.) +;PrivilegesRequired=lowest +OutputBaseFilename={#DataDir}_{#MyAppVersion} +; Compression=none +Compression=lzma +SolidCompression=yes +LZMAUseSeparateProcess=yes +LZMANumBlockThreads=6 +WizardStyle=modern +ArchitecturesAllowed=x64 +ChangesEnvironment=yes + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +; Things in %CommonProgramFiles%\Palette are made writable by anyone, for local changes and config +[Dirs] +Name: "{commoncf64}\{#MyAppName}"; Permissions: users-modify + +[Files] +Source: "ship\{#DataDir}\*"; DestDir: "{#DataPath}"; Flags: comparetimestamp ignoreversion recursesubdirs createallsubdirs + +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Registry] +Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; \ + ValueType: expandsz; ValueName: "PALETTE_DATA_PATH"; ValueData: "{#DataPath}"; Flags: preservestringtype + diff --git a/build/windows/tmp2.iss b/build/windows/tmp2.iss new file mode 100644 index 00000000..f72e93b0 --- /dev/null +++ b/build/windows/tmp2.iss @@ -0,0 +1,52 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#include "environment.iss" + +#define MyAppName "data_omnisphere" +#define MyAppVersion "7.97" +#define MyAppPublisher "Nosuch Media" +#define MyAppURL "https://github.com/vizicist/palette" +#define DataDir "data_omnisphere" +#define DataPath "{commoncf64}/Palette/data_omnisphere" + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{443296B2-FB07-4F76-992A-A100D5E51ADF} +AppVersion={#MyAppVersion} +AppName={#MyAppName} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={#DataPath} +DefaultGroupName={#MyAppName} +; Uncomment the following line to run in non administrative install mode (install for current user only.) +;PrivilegesRequired=lowest +OutputBaseFilename={#DataDir}_{#MyAppVersion} +; Compression=none +Compression=lzma +SolidCompression=yes +LZMAUseSeparateProcess=yes +LZMANumBlockThreads=6 +WizardStyle=modern +ArchitecturesAllowed=x64 +ChangesEnvironment=yes + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +; Things in %CommonProgramFiles%\Palette are made writable by anyone, for local changes and config +[Dirs] +Name: "{commoncf64}\{#MyAppName}"; Permissions: users-modify + +[Files] +Source: "ship\{#DataDir}\*"; DestDir: "{#DataPath}"; Flags: comparetimestamp ignoreversion recursesubdirs createallsubdirs + +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Registry] +Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; \ + ValueType: expandsz; ValueName: "PALETTE_DATA_PATH"; ValueData: "{#DataPath}"; Flags: preservestringtype + diff --git a/build/windows/x b/build/windows/x new file mode 100644 index 00000000..9c1fd442 --- /dev/null +++ b/build/windows/x @@ -0,0 +1,2 @@ +sed -e "s/SUBSTITUTE_VERSION_HERE/%version%/" < palette_win_setup.iss > tmp.iss +"c:\Program Files (x86)\Inno Setup 6\ISCC.exe" /Q tmp.iss diff --git a/data/config/updateconfig.bat b/data/config/updateconfig.bat deleted file mode 100644 index b0cab9f0..00000000 --- a/data/config/updateconfig.bat +++ /dev/null @@ -1,8 +0,0 @@ -rem This is used when you want to update the parameters -rem without doing a full build/install -copy paramdefs.json "%CommonProgramFiles%\Palette\config" -copy paramenums.json "%CommonProgramFiles%\Palette\config" -copy resolume.json "%CommonProgramFiles%\Palette\config" -copy ffgl.json "%CommonProgramFiles%\Palette\config" -copy morphs.json "%CommonProgramFiles%\Palette\config" -copy Synths.json "%CommonProgramFiles%\Palette\config" diff --git a/data/config/EraeTouchLayout.emk b/data_omnisphere/config/EraeTouchLayout.emk similarity index 100% rename from data/config/EraeTouchLayout.emk rename to data_omnisphere/config/EraeTouchLayout.emk diff --git a/data/config/OpenSans-Regular.ttf b/data_omnisphere/config/OpenSans-Regular.ttf similarity index 100% rename from data/config/OpenSans-Regular.ttf rename to data_omnisphere/config/OpenSans-Regular.ttf diff --git a/data/config/PaletteDefault.avc b/data_omnisphere/config/PaletteDefault.avc similarity index 100% rename from data/config/PaletteDefault.avc rename to data_omnisphere/config/PaletteDefault.avc diff --git a/data/config/PaletteDefaultSP.avc b/data_omnisphere/config/PaletteDefaultSP.avc similarity index 100% rename from data/config/PaletteDefaultSP.avc rename to data_omnisphere/config/PaletteDefaultSP.avc diff --git a/data/config/PaletteKora.avc b/data_omnisphere/config/PaletteKora.avc similarity index 100% rename from data/config/PaletteKora.avc rename to data_omnisphere/config/PaletteKora.avc diff --git a/data/config/Synths.json b/data_omnisphere/config/Synths.json similarity index 100% rename from data/config/Synths.json rename to data_omnisphere/config/Synths.json diff --git a/data/config/arial.ttf b/data_omnisphere/config/arial.ttf similarity index 100% rename from data/config/arial.ttf rename to data_omnisphere/config/arial.ttf diff --git a/data/config/buttons.json b/data_omnisphere/config/buttons.json similarity index 100% rename from data/config/buttons.json rename to data_omnisphere/config/buttons.json diff --git a/data/config/consola.ttf b/data_omnisphere/config/consola.ttf similarity index 100% rename from data/config/consola.ttf rename to data_omnisphere/config/consola.ttf diff --git a/data/config/default.bidule b/data_omnisphere/config/default.bidule similarity index 100% rename from data/config/default.bidule rename to data_omnisphere/config/default.bidule diff --git a/data/config/default.bidule.palette11 b/data_omnisphere/config/default.bidule.palette11 similarity index 100% rename from data/config/default.bidule.palette11 rename to data_omnisphere/config/default.bidule.palette11 diff --git a/data/config/default.bidule.palette9 b/data_omnisphere/config/default.bidule.palette9 similarity index 100% rename from data/config/default.bidule.palette9 rename to data_omnisphere/config/default.bidule.palette9 diff --git a/data/config/default.bidule.vizdell.before_2voice b/data_omnisphere/config/default.bidule.vizdell.before_2voice similarity index 100% rename from data/config/default.bidule.vizdell.before_2voice rename to data_omnisphere/config/default.bidule.vizdell.before_2voice diff --git a/data/config/default.bidule.vizlite b/data_omnisphere/config/default.bidule.vizlite similarity index 100% rename from data/config/default.bidule.vizlite rename to data_omnisphere/config/default.bidule.vizlite diff --git a/data/config/entypo.ttf b/data_omnisphere/config/entypo.ttf similarity index 100% rename from data/config/entypo.ttf rename to data_omnisphere/config/entypo.ttf diff --git a/data/config/ffgl.json b/data_omnisphere/config/ffgl.json similarity index 100% rename from data/config/ffgl.json rename to data_omnisphere/config/ffgl.json diff --git a/data/config/lucon.ttf b/data_omnisphere/config/lucon.ttf similarity index 100% rename from data/config/lucon.ttf rename to data_omnisphere/config/lucon.ttf diff --git a/data/config/mmtt_kinect.json b/data_omnisphere/config/mmtt_kinect.json similarity index 100% rename from data/config/mmtt_kinect.json rename to data_omnisphere/config/mmtt_kinect.json diff --git a/data/config/mmtt_kinect_orig.json b/data_omnisphere/config/mmtt_kinect_orig.json similarity index 100% rename from data/config/mmtt_kinect_orig.json rename to data_omnisphere/config/mmtt_kinect_orig.json diff --git a/data/config/moldover.bidule b/data_omnisphere/config/moldover.bidule similarity index 100% rename from data/config/moldover.bidule rename to data_omnisphere/config/moldover.bidule diff --git a/data/config/morphs.json b/data_omnisphere/config/morphs.json similarity index 100% rename from data/config/morphs.json rename to data_omnisphere/config/morphs.json diff --git a/data/config/natsalone.conf b/data_omnisphere/config/natsalone.conf similarity index 100% rename from data/config/natsalone.conf rename to data_omnisphere/config/natsalone.conf diff --git a/data/config/natsleaf.conf b/data_omnisphere/config/natsleaf.conf similarity index 100% rename from data/config/natsleaf.conf rename to data_omnisphere/config/natsleaf.conf diff --git a/data/config/nuid.json b/data_omnisphere/config/nuid.json similarity index 100% rename from data/config/nuid.json rename to data_omnisphere/config/nuid.json diff --git a/data/config/obs_mask_for_palette.png b/data_omnisphere/config/obs_mask_for_palette.png similarity index 100% rename from data/config/obs_mask_for_palette.png rename to data_omnisphere/config/obs_mask_for_palette.png diff --git a/data/config/omnisphere.bidule b/data_omnisphere/config/omnisphere.bidule similarity index 100% rename from data/config/omnisphere.bidule rename to data_omnisphere/config/omnisphere.bidule diff --git a/data/config/omnisphere/Multis/Factory/Omnisphere Library.db b/data_omnisphere/config/omnisphere/Multis/Factory/Omnisphere Library.db similarity index 100% rename from data/config/omnisphere/Multis/Factory/Omnisphere Library.db rename to data_omnisphere/config/omnisphere/Multis/Factory/Omnisphere Library.db diff --git a/data/config/omnisphere/Multis/User/SPPro/fourgo_1.mlt_omn b/data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_1.mlt_omn similarity index 100% rename from data/config/omnisphere/Multis/User/SPPro/fourgo_1.mlt_omn rename to data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_1.mlt_omn diff --git a/data/config/omnisphere/Multis/User/SPPro/fourgo_10.mlt_omn b/data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_10.mlt_omn similarity index 100% rename from data/config/omnisphere/Multis/User/SPPro/fourgo_10.mlt_omn rename to data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_10.mlt_omn diff --git a/data/config/omnisphere/Multis/User/SPPro/fourgo_11.mlt_omn b/data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_11.mlt_omn similarity index 100% rename from data/config/omnisphere/Multis/User/SPPro/fourgo_11.mlt_omn rename to data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_11.mlt_omn diff --git a/data/config/omnisphere/Multis/User/SPPro/fourgo_12.mlt_omn b/data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_12.mlt_omn similarity index 100% rename from data/config/omnisphere/Multis/User/SPPro/fourgo_12.mlt_omn rename to data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_12.mlt_omn diff --git a/data/config/omnisphere/Multis/User/SPPro/fourgo_2.mlt_omn b/data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_2.mlt_omn similarity index 100% rename from data/config/omnisphere/Multis/User/SPPro/fourgo_2.mlt_omn rename to data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_2.mlt_omn diff --git a/data/config/omnisphere/Multis/User/SPPro/fourgo_3.mlt_omn b/data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_3.mlt_omn similarity index 100% rename from data/config/omnisphere/Multis/User/SPPro/fourgo_3.mlt_omn rename to data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_3.mlt_omn diff --git a/data/config/omnisphere/Multis/User/SPPro/fourgo_4.mlt_omn b/data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_4.mlt_omn similarity index 100% rename from data/config/omnisphere/Multis/User/SPPro/fourgo_4.mlt_omn rename to data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_4.mlt_omn diff --git a/data/config/omnisphere/Multis/User/SPPro/fourgo_5.mlt_omn b/data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_5.mlt_omn similarity index 100% rename from data/config/omnisphere/Multis/User/SPPro/fourgo_5.mlt_omn rename to data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_5.mlt_omn diff --git a/data/config/omnisphere/Multis/User/SPPro/fourgo_6.mlt_omn b/data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_6.mlt_omn similarity index 100% rename from data/config/omnisphere/Multis/User/SPPro/fourgo_6.mlt_omn rename to data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_6.mlt_omn diff --git a/data/config/omnisphere/Multis/User/SPPro/fourgo_7.mlt_omn b/data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_7.mlt_omn similarity index 100% rename from data/config/omnisphere/Multis/User/SPPro/fourgo_7.mlt_omn rename to data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_7.mlt_omn diff --git a/data/config/omnisphere/Multis/User/SPPro/fourgo_8.mlt_omn b/data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_8.mlt_omn similarity index 100% rename from data/config/omnisphere/Multis/User/SPPro/fourgo_8.mlt_omn rename to data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_8.mlt_omn diff --git a/data/config/omnisphere/Multis/User/SPPro/fourgo_9.mlt_omn b/data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_9.mlt_omn similarity index 100% rename from data/config/omnisphere/Multis/User/SPPro/fourgo_9.mlt_omn rename to data_omnisphere/config/omnisphere/Multis/User/SPPro/fourgo_9.mlt_omn diff --git a/data/config/omnisphere/Multis/User/mlt_omn.index b/data_omnisphere/config/omnisphere/Multis/User/mlt_omn.index similarity index 100% rename from data/config/omnisphere/Multis/User/mlt_omn.index rename to data_omnisphere/config/omnisphere/Multis/User/mlt_omn.index diff --git a/data/config/omnisphere/SPPro.omnisphere b/data_omnisphere/config/omnisphere/SPPro.omnisphere similarity index 100% rename from data/config/omnisphere/SPPro.omnisphere rename to data_omnisphere/config/omnisphere/SPPro.omnisphere diff --git a/data/config/omnisphere/copy_to_omnisphere.bat b/data_omnisphere/config/omnisphere/copy_to_omnisphere.bat similarity index 100% rename from data/config/omnisphere/copy_to_omnisphere.bat rename to data_omnisphere/config/omnisphere/copy_to_omnisphere.bat diff --git a/data/config/paramdefs.json b/data_omnisphere/config/paramdefs.json similarity index 100% rename from data/config/paramdefs.json rename to data_omnisphere/config/paramdefs.json diff --git a/data/config/paramenums.json b/data_omnisphere/config/paramenums.json similarity index 100% rename from data/config/paramenums.json rename to data_omnisphere/config/paramenums.json diff --git a/data/config/paramoverrides.json b/data_omnisphere/config/paramoverrides.json similarity index 100% rename from data/config/paramoverrides.json rename to data_omnisphere/config/paramoverrides.json diff --git a/data/config/pullresolume.bat b/data_omnisphere/config/pullresolume.bat similarity index 100% rename from data/config/pullresolume.bat rename to data_omnisphere/config/pullresolume.bat diff --git a/data/config/resolume.json b/data_omnisphere/config/resolume.json similarity index 100% rename from data/config/resolume.json rename to data_omnisphere/config/resolume.json diff --git a/data/config/settings_fnf.json b/data_omnisphere/config/settings_fnf.json similarity index 100% rename from data/config/settings_fnf.json rename to data_omnisphere/config/settings_fnf.json diff --git a/data/config/settings_vizdesk.json b/data_omnisphere/config/settings_vizdesk.json similarity index 100% rename from data/config/settings_vizdesk.json rename to data_omnisphere/config/settings_vizdesk.json diff --git a/data/config/sp_attractscreen.afphoto b/data_omnisphere/config/sp_attractscreen.afphoto similarity index 100% rename from data/config/sp_attractscreen.afphoto rename to data_omnisphere/config/sp_attractscreen.afphoto diff --git a/data/config/sp_attractscreen.png b/data_omnisphere/config/sp_attractscreen.png similarity index 100% rename from data/config/sp_attractscreen.png rename to data_omnisphere/config/sp_attractscreen.png diff --git a/data/config/sp_helpscreen.afphoto b/data_omnisphere/config/sp_helpscreen.afphoto similarity index 100% rename from data/config/sp_helpscreen.afphoto rename to data_omnisphere/config/sp_helpscreen.afphoto diff --git a/data/config/sp_helpscreen.png b/data_omnisphere/config/sp_helpscreen.png similarity index 100% rename from data/config/sp_helpscreen.png rename to data_omnisphere/config/sp_helpscreen.png diff --git a/data/config/sp_realigning.afphoto b/data_omnisphere/config/sp_realigning.afphoto similarity index 100% rename from data/config/sp_realigning.afphoto rename to data_omnisphere/config/sp_realigning.afphoto diff --git a/data/config/sp_realigning.png b/data_omnisphere/config/sp_realigning.png similarity index 100% rename from data/config/sp_realigning.png rename to data_omnisphere/config/sp_realigning.png diff --git a/data/config/sp_rebooting.afphoto b/data_omnisphere/config/sp_rebooting.afphoto similarity index 100% rename from data/config/sp_rebooting.afphoto rename to data_omnisphere/config/sp_rebooting.afphoto diff --git a/data/config/sp_rebooting.png b/data_omnisphere/config/sp_rebooting.png similarity index 100% rename from data/config/sp_rebooting.png rename to data_omnisphere/config/sp_rebooting.png diff --git a/data/config/sp_restarting.afphoto b/data_omnisphere/config/sp_restarting.afphoto similarity index 100% rename from data/config/sp_restarting.afphoto rename to data_omnisphere/config/sp_restarting.afphoto diff --git a/data/config/sp_restarting.png b/data_omnisphere/config/sp_restarting.png similarity index 100% rename from data/config/sp_restarting.png rename to data_omnisphere/config/sp_restarting.png diff --git a/data/config/sp_startingup.afphoto b/data_omnisphere/config/sp_startingup.afphoto similarity index 100% rename from data/config/sp_startingup.afphoto rename to data_omnisphere/config/sp_startingup.afphoto diff --git a/data/config/sp_startingup.png b/data_omnisphere/config/sp_startingup.png similarity index 100% rename from data/config/sp_startingup.png rename to data_omnisphere/config/sp_startingup.png diff --git a/data/config/sppro_attractscreen.afphoto b/data_omnisphere/config/sppro_attractscreen.afphoto similarity index 100% rename from data/config/sppro_attractscreen.afphoto rename to data_omnisphere/config/sppro_attractscreen.afphoto diff --git a/data/config/sppro_attractscreen.png b/data_omnisphere/config/sppro_attractscreen.png similarity index 100% rename from data/config/sppro_attractscreen.png rename to data_omnisphere/config/sppro_attractscreen.png diff --git a/data/config/sppro_helpscreen.afphoto b/data_omnisphere/config/sppro_helpscreen.afphoto similarity index 100% rename from data/config/sppro_helpscreen.afphoto rename to data_omnisphere/config/sppro_helpscreen.afphoto diff --git a/data/config/sppro_helpscreen.png b/data_omnisphere/config/sppro_helpscreen.png similarity index 100% rename from data/config/sppro_helpscreen.png rename to data_omnisphere/config/sppro_helpscreen.png diff --git a/data/config/sppro_rebooting.afphoto b/data_omnisphere/config/sppro_rebooting.afphoto similarity index 100% rename from data/config/sppro_rebooting.afphoto rename to data_omnisphere/config/sppro_rebooting.afphoto diff --git a/data/config/sppro_rebooting.png b/data_omnisphere/config/sppro_rebooting.png similarity index 100% rename from data/config/sppro_rebooting.png rename to data_omnisphere/config/sppro_rebooting.png diff --git a/data/config/sppro_restarting.afphoto b/data_omnisphere/config/sppro_restarting.afphoto similarity index 100% rename from data/config/sppro_restarting.afphoto rename to data_omnisphere/config/sppro_restarting.afphoto diff --git a/data/config/sppro_restarting.png b/data_omnisphere/config/sppro_restarting.png similarity index 100% rename from data/config/sppro_restarting.png rename to data_omnisphere/config/sppro_restarting.png diff --git a/data/config/sppro_startingup.afphoto b/data_omnisphere/config/sppro_startingup.afphoto similarity index 100% rename from data/config/sppro_startingup.afphoto rename to data_omnisphere/config/sppro_startingup.afphoto diff --git a/data/config/sppro_startingup.png b/data_omnisphere/config/sppro_startingup.png similarity index 100% rename from data/config/sppro_startingup.png rename to data_omnisphere/config/sppro_startingup.png diff --git a/data/config/stylusrmx/SPPro_1.kit_rmx b/data_omnisphere/config/stylusrmx/SPPro_1.kit_rmx similarity index 100% rename from data/config/stylusrmx/SPPro_1.kit_rmx rename to data_omnisphere/config/stylusrmx/SPPro_1.kit_rmx diff --git a/data/config/stylusrmx/SPPro_10.kit_rmx b/data_omnisphere/config/stylusrmx/SPPro_10.kit_rmx similarity index 100% rename from data/config/stylusrmx/SPPro_10.kit_rmx rename to data_omnisphere/config/stylusrmx/SPPro_10.kit_rmx diff --git a/data/config/stylusrmx/SPPro_11.kit_rmx b/data_omnisphere/config/stylusrmx/SPPro_11.kit_rmx similarity index 100% rename from data/config/stylusrmx/SPPro_11.kit_rmx rename to data_omnisphere/config/stylusrmx/SPPro_11.kit_rmx diff --git a/data/config/stylusrmx/SPPro_12.kit_rmx b/data_omnisphere/config/stylusrmx/SPPro_12.kit_rmx similarity index 100% rename from data/config/stylusrmx/SPPro_12.kit_rmx rename to data_omnisphere/config/stylusrmx/SPPro_12.kit_rmx diff --git a/data/config/stylusrmx/SPPro_2.kit_rmx b/data_omnisphere/config/stylusrmx/SPPro_2.kit_rmx similarity index 100% rename from data/config/stylusrmx/SPPro_2.kit_rmx rename to data_omnisphere/config/stylusrmx/SPPro_2.kit_rmx diff --git a/data/config/stylusrmx/SPPro_3.kit_rmx b/data_omnisphere/config/stylusrmx/SPPro_3.kit_rmx similarity index 100% rename from data/config/stylusrmx/SPPro_3.kit_rmx rename to data_omnisphere/config/stylusrmx/SPPro_3.kit_rmx diff --git a/data/config/stylusrmx/SPPro_4.kit_rmx b/data_omnisphere/config/stylusrmx/SPPro_4.kit_rmx similarity index 100% rename from data/config/stylusrmx/SPPro_4.kit_rmx rename to data_omnisphere/config/stylusrmx/SPPro_4.kit_rmx diff --git a/data/config/stylusrmx/SPPro_5.kit_rmx b/data_omnisphere/config/stylusrmx/SPPro_5.kit_rmx similarity index 100% rename from data/config/stylusrmx/SPPro_5.kit_rmx rename to data_omnisphere/config/stylusrmx/SPPro_5.kit_rmx diff --git a/data/config/stylusrmx/SPPro_6.kit_rmx b/data_omnisphere/config/stylusrmx/SPPro_6.kit_rmx similarity index 100% rename from data/config/stylusrmx/SPPro_6.kit_rmx rename to data_omnisphere/config/stylusrmx/SPPro_6.kit_rmx diff --git a/data/config/stylusrmx/SPPro_7.kit_rmx b/data_omnisphere/config/stylusrmx/SPPro_7.kit_rmx similarity index 100% rename from data/config/stylusrmx/SPPro_7.kit_rmx rename to data_omnisphere/config/stylusrmx/SPPro_7.kit_rmx diff --git a/data/config/stylusrmx/SPPro_8.kit_rmx b/data_omnisphere/config/stylusrmx/SPPro_8.kit_rmx similarity index 100% rename from data/config/stylusrmx/SPPro_8.kit_rmx rename to data_omnisphere/config/stylusrmx/SPPro_8.kit_rmx diff --git a/data/config/stylusrmx/SPPro_9.kit_rmx b/data_omnisphere/config/stylusrmx/SPPro_9.kit_rmx similarity index 100% rename from data/config/stylusrmx/SPPro_9.kit_rmx rename to data_omnisphere/config/stylusrmx/SPPro_9.kit_rmx diff --git a/data/config/test1.bidule.previous b/data_omnisphere/config/test1.bidule.previous similarity index 100% rename from data/config/test1.bidule.previous rename to data_omnisphere/config/test1.bidule.previous diff --git a/data/config/times.ttf b/data_omnisphere/config/times.ttf similarity index 100% rename from data/config/times.ttf rename to data_omnisphere/config/times.ttf diff --git a/data/html/index.html b/data_omnisphere/html/index.html similarity index 100% rename from data/html/index.html rename to data_omnisphere/html/index.html diff --git a/data/html/mmtt/advanced.html b/data_omnisphere/html/mmtt/advanced.html similarity index 100% rename from data/html/mmtt/advanced.html rename to data_omnisphere/html/mmtt/advanced.html diff --git a/data/html/mmtt/calibration.html b/data_omnisphere/html/mmtt/calibration.html similarity index 100% rename from data/html/mmtt/calibration.html rename to data_omnisphere/html/mmtt/calibration.html diff --git a/data/html/mmtt/colors.html b/data_omnisphere/html/mmtt/colors.html similarity index 100% rename from data/html/mmtt/colors.html rename to data_omnisphere/html/mmtt/colors.html diff --git a/data/html/mmtt/dojo/LICENSE b/data_omnisphere/html/mmtt/dojo/LICENSE similarity index 100% rename from data/html/mmtt/dojo/LICENSE rename to data_omnisphere/html/mmtt/dojo/LICENSE diff --git a/data/html/mmtt/dojo/dojo.js b/data_omnisphere/html/mmtt/dojo/dojo.js similarity index 100% rename from data/html/mmtt/dojo/dojo.js rename to data_omnisphere/html/mmtt/dojo/dojo.js diff --git a/data/html/mmtt/draw.html b/data_omnisphere/html/mmtt/draw.html similarity index 100% rename from data/html/mmtt/draw.html rename to data_omnisphere/html/mmtt/draw.html diff --git a/data/html/mmtt/drawfade.js b/data_omnisphere/html/mmtt/drawfade.js similarity index 100% rename from data/html/mmtt/drawfade.js rename to data_omnisphere/html/mmtt/drawfade.js diff --git a/data/html/mmtt/index.html b/data_omnisphere/html/mmtt/index.html similarity index 100% rename from data/html/mmtt/index.html rename to data_omnisphere/html/mmtt/index.html diff --git a/data/html/mmtt/old_draw.html b/data_omnisphere/html/mmtt/old_draw.html similarity index 100% rename from data/html/mmtt/old_draw.html rename to data_omnisphere/html/mmtt/old_draw.html diff --git a/data/html/mmtt/olddraw.html b/data_omnisphere/html/mmtt/olddraw.html similarity index 100% rename from data/html/mmtt/olddraw.html rename to data_omnisphere/html/mmtt/olddraw.html diff --git a/data/html/palette/buttons.html b/data_omnisphere/html/palette/buttons.html similarity index 100% rename from data/html/palette/buttons.html rename to data_omnisphere/html/palette/buttons.html diff --git a/data/html/palette/dojo/LICENSE b/data_omnisphere/html/palette/dojo/LICENSE similarity index 100% rename from data/html/palette/dojo/LICENSE rename to data_omnisphere/html/palette/dojo/LICENSE diff --git a/data/html/palette/dojo/dojo.js b/data_omnisphere/html/palette/dojo/dojo.js similarity index 100% rename from data/html/palette/dojo/dojo.js rename to data_omnisphere/html/palette/dojo/dojo.js diff --git a/data/html/palette/goodindex.html b/data_omnisphere/html/palette/goodindex.html similarity index 100% rename from data/html/palette/goodindex.html rename to data_omnisphere/html/palette/goodindex.html diff --git a/data/html/palette/index.html b/data_omnisphere/html/palette/index.html similarity index 100% rename from data/html/palette/index.html rename to data_omnisphere/html/palette/index.html diff --git a/data/html/palette/index_premidi.html b/data_omnisphere/html/palette/index_premidi.html similarity index 100% rename from data/html/palette/index_premidi.html rename to data_omnisphere/html/palette/index_premidi.html diff --git a/data/html/palette/index_save1.html b/data_omnisphere/html/palette/index_save1.html similarity index 100% rename from data/html/palette/index_save1.html rename to data_omnisphere/html/palette/index_save1.html diff --git a/data/html/palette/new_index.html b/data_omnisphere/html/palette/new_index.html similarity index 100% rename from data/html/palette/new_index.html rename to data_omnisphere/html/palette/new_index.html diff --git a/data/html/palette/orig_index.html b/data_omnisphere/html/palette/orig_index.html similarity index 100% rename from data/html/palette/orig_index.html rename to data_omnisphere/html/palette/orig_index.html diff --git a/data/html/palette/pads.html b/data_omnisphere/html/palette/pads.html similarity index 100% rename from data/html/palette/pads.html rename to data_omnisphere/html/palette/pads.html diff --git a/data/html/palette/readme.html b/data_omnisphere/html/palette/readme.html similarity index 100% rename from data/html/palette/readme.html rename to data_omnisphere/html/palette/readme.html diff --git a/data/html/palette/try_good_index.html b/data_omnisphere/html/palette/try_good_index.html similarity index 100% rename from data/html/palette/try_good_index.html rename to data_omnisphere/html/palette/try_good_index.html diff --git a/data/html/palette/try_index.html b/data_omnisphere/html/palette/try_index.html similarity index 100% rename from data/html/palette/try_index.html rename to data_omnisphere/html/palette/try_index.html diff --git a/data/html/palette/wide_index.html b/data_omnisphere/html/palette/wide_index.html similarity index 100% rename from data/html/palette/wide_index.html rename to data_omnisphere/html/palette/wide_index.html diff --git a/data/keykit/liblocal/keylib.k b/data_omnisphere/keykit/liblocal/keylib.k similarity index 100% rename from data/keykit/liblocal/keylib.k rename to data_omnisphere/keykit/liblocal/keylib.k diff --git a/data/keykit/liblocal/keylocal.k b/data_omnisphere/keykit/liblocal/keylocal.k similarity index 100% rename from data/keykit/liblocal/keylocal.k rename to data_omnisphere/keykit/liblocal/keylocal.k diff --git a/data/keykit/liblocal/palette.k b/data_omnisphere/keykit/liblocal/palette.k similarity index 100% rename from data/keykit/liblocal/palette.k rename to data_omnisphere/keykit/liblocal/palette.k diff --git a/data/keykit/liblocal/palette_persistent.kp b/data_omnisphere/keykit/liblocal/palette_persistent.kp similarity index 100% rename from data/keykit/liblocal/palette_persistent.kp rename to data_omnisphere/keykit/liblocal/palette_persistent.kp diff --git a/data_omnisphere/logs/engine.log b/data_omnisphere/logs/engine.log new file mode 100644 index 00000000..e31084d1 --- /dev/null +++ b/data_omnisphere/logs/engine.log @@ -0,0 +1,91 @@ +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-05-24","logname":"engine","click":0,"loglevel":"info"} +{"uptime":"0.036550","msg":"global name","name":"global.cursorscalex","click":0,"loglevel":"info"} +{"uptime":"0.036550","msg":"global name","name":"global.attractplaysound","click":0,"loglevel":"info"} +{"uptime":"0.036550","msg":"global name","name":"global.process.mmtt","click":0,"loglevel":"info"} +{"uptime":"0.036550","msg":"KillExecutable","executable":"mmtt_kinect.exe","exe":"mmtt_kinect.exe","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.emailpassword","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.cursorscaley","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.testgestureinterval","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.midithrusynth","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.cursoroffsetx","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.bidulefile","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.mmtt_zexpand","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.attractenabled","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.looping_override","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.attractgestureduration","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.keykitpath","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.looping_beats","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.testgestureduration","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.looping_fadethreshold","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.guidefaultlevel","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.log","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.helpimage","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.attractpresetchangeinterval","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.resolumetextlayer","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.midisetexternalscale","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.bidulepath","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.midiinput","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.attractguiimage","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.autotranspose","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.midithru","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.autotransposebeats","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.keykitallow","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.attractgestureminlength","click":0,"loglevel":"info"} +{"uptime":"0.108841","msg":"global name","name":"global.process.resolume","click":0,"loglevel":"info"} +{"uptime":"0.273047","msg":"global name","name":"global.testgesturentimes","click":0,"loglevel":"info"} +{"uptime":"0.273047","msg":"global name","name":"global.nats","click":0,"loglevel":"info"} +{"uptime":"0.273047","msg":"global name","name":"global.notifygui","click":0,"loglevel":"info"} +{"uptime":"0.273047","msg":"global name","name":"global.attractidlesecs","click":0,"loglevel":"info"} +{"uptime":"0.273047","msg":"global.attractidlesecs is too low, forcing to 15","click":0,"loglevel":"warn"} +{"uptime":"0.273047","msg":"global name","name":"global.cursoroffsety","click":0,"loglevel":"info"} +{"uptime":"0.273047","msg":"global name","name":"global.attractgesturezmax","click":0,"loglevel":"info"} +{"uptime":"0.273047","msg":"global name","name":"global.obspath","click":0,"loglevel":"info"} +{"uptime":"0.273047","msg":"global name","name":"global.attractgesturezmin","click":0,"loglevel":"info"} +{"uptime":"0.273047","msg":"global name","name":"global.process.gui","click":0,"loglevel":"info"} +{"uptime":"0.457744","msg":"global name","name":"global.testgesturenumsteps","click":0,"loglevel":"info"} +{"uptime":"0.457744","msg":"global name","name":"global.process.bidule","click":0,"loglevel":"info"} +{"uptime":"0.653851","msg":"global name","name":"global.transpose","click":0,"loglevel":"info"} +{"uptime":"0.653851","msg":"global name","name":"global.guishowall","click":0,"loglevel":"info"} +{"uptime":"0.653851","msg":"global name","name":"global.gui","click":0,"loglevel":"info"} +{"uptime":"0.653851","msg":"global name","name":"global.resolumepath","click":0,"loglevel":"info"} +{"uptime":"0.653851","msg":"global name","name":"global.attractgesturenumsteps","click":0,"loglevel":"info"} +{"uptime":"0.653851","msg":"global name","name":"global.process.chat","click":0,"loglevel":"info"} +{"uptime":"0.653851","msg":"KillExecutable","executable":"palette_chat.exe","exe":"palette_chat.exe","click":0,"loglevel":"info"} +{"uptime":"0.734898","msg":"global name","name":"global.keykitroot","click":0,"loglevel":"info"} +{"uptime":"0.734898","msg":"global name","name":"global.attractgestureinterval","click":0,"loglevel":"info"} +{"uptime":"0.734898","msg":"global name","name":"global.timefret_high","click":0,"loglevel":"info"} +{"uptime":"0.734898","msg":"global name","name":"global.timefret_low","click":0,"loglevel":"info"} +{"uptime":"0.734898","msg":"global name","name":"global.mmtt_yexpand","click":0,"loglevel":"info"} +{"uptime":"0.734898","msg":"global name","name":"global.obsstream","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.timefret_mid","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.guisize","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.title","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.keykitrun","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.looping_fade","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.twinsys","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.winsize","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.keykitoutput","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.emaillogin","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.attractallowgui","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.scale","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.emailto","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.attractgesturemaxlength","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.tempdir","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.mmtt_xexpand","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.oscoutput","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"global name","name":"global.process.obs","click":0,"loglevel":"info"} +{"uptime":"0.740249","msg":"KillExecutable","executable":"obs64.exe","exe":"obs64.exe","click":0,"loglevel":"info"} +{"uptime":"0.821559","msg":"Engine.Start","click":0,"loglevel":"info"} +{"uptime":"0.821559","msg":"Initialized MIDI","numoutports":24,"click":0,"loglevel":"info"} +{"uptime":"0.821559","msg":"InitSynths called","click":0,"loglevel":"info"} +{"uptime":"0.822088","msg":"Synths loaded","len":193,"click":0,"loglevel":"info"} +{"uptime":"0.823088","msg":"Quad.Load","category":"quad","filename":"_Current","click":0,"loglevel":"info"} +{"uptime":"0.878423","msg":"Scheduler begins","click":0,"loglevel":"info"} +{"uptime":"0.878423","msg":"No MIDI input port has been selected","click":0,"loglevel":"warn"} +{"uptime":"2.590866","msg":"Morph serial# isn't in morphs.json","serialnum":"SM01174915413","morphtype":"A","click":497,"loglevel":"info"} +{"uptime":"2.590866","msg":"Morph Opened and Started","idx":0,"serial":"SM01174915413","firmware":"0.19.42","morphtype":"A","click":497,"loglevel":"info"} +{"uptime":"3.298207","msg":"CheckAutorestartProcesses: Restarting","process":"bidule","click":633,"loglevel":"info"} +{"uptime":"3.815038","msg":"ExecutableOutput","exe":"gui","output":"iconbitmap for palette.ico failed\r\n","click":732,"loglevel":"info"} +{"uptime":"63.256076","msg":"CheckAutorestartProcesses: Restarting","process":"bidule","click":12145,"loglevel":"info"} +{"uptime":"102.516242","msg":"Quad.ExecuteApi test start","ntimes":40,"interval":0.300000011,"click":19683,"loglevel":"info"} +{"uptime":"114.536718","msg":"Quad.ExecuteApi test end","ntimes":40,"interval":0.300000011,"click":21991,"loglevel":"info"} diff --git a/data_omnisphere/logs/ffgl.log b/data_omnisphere/logs/ffgl.log new file mode 100644 index 00000000..e97c68fd --- /dev/null +++ b/data_omnisphere/logs/ffgl.log @@ -0,0 +1,40 @@ +[0.000,0] NosuchDebugInit: Level=0 Cursor=0 Param=0 API=0 +[0.000,0] NosuchDebugInit: Level=0 Cursor=0 Param=0 API=0 +[0.000,0] Using configfile=C:\Users\tjt\Github\palette\data_omnisphere\config\ffgl.json +[0.000,0] Loading config=C:\Users\tjt\Github\palette\data_omnisphere\config\ffgl.json +[0.000,0] LoadPaletteConfig start +[0.001,0] NosuchDebugLevel = 0 +[0.000,0] NosuchDebugInit: Level=0 Cursor=0 Param=0 API=0 +[0.000,0] NosuchDebugInit: Level=0 Cursor=0 Param=0 API=0 +[0.000,0] Using configfile=C:\Users\tjt\Github\palette\data_omnisphere\config\ffgl.json +[0.000,0] Loading config=C:\Users\tjt\Github\palette\data_omnisphere\config\ffgl.json +[0.000,0] LoadPaletteConfig start +[0.000,0] NosuchDebugLevel = 0 +[1.105,0] NosuchDebugInit: Level=0 Cursor=1 Param=1 API=1 +[1.106,0] Using configfile=C:\Users\tjt\Github\palette\data_omnisphere\config\ffgl.json +[1.106,0] Loading config=C:\Users\tjt\Github\palette\data_omnisphere\config\ffgl.json +[1.106,0] LoadPaletteConfig start +[1.106,0] NosuchDebugLevel = 0 +[1.108,0] Palette.InitGL: x,y=0,0 w,h=1920,1080 +[1.109,0] PaletteHost::SetOscPort: PaletteDaemon is listening on port=3334 +[1.111,0] NosuchDebugInit: Level=0 Cursor=1 Param=1 API=1 +[1.111,0] Using configfile=C:\Users\tjt\Github\palette\data_omnisphere\config\ffgl.json +[1.111,0] Loading config=C:\Users\tjt\Github\palette\data_omnisphere\config\ffgl.json +[1.112,0] LoadPaletteConfig start +[1.112,0] NosuchDebugLevel = 0 +[1.112,0] Palette.InitGL: x,y=0,0 w,h=1920,1080 +[1.112,0] PaletteHost::SetOscPort: PaletteDaemon is listening on port=3335 +[1.114,0] NosuchDebugInit: Level=0 Cursor=1 Param=1 API=1 +[1.114,0] Using configfile=C:\Users\tjt\Github\palette\data_omnisphere\config\ffgl.json +[1.114,0] Loading config=C:\Users\tjt\Github\palette\data_omnisphere\config\ffgl.json +[1.115,0] LoadPaletteConfig start +[1.115,0] NosuchDebugLevel = 0 +[1.115,0] Palette.InitGL: x,y=0,0 w,h=1920,1080 +[1.115,0] PaletteHost::SetOscPort: PaletteDaemon is listening on port=3336 +[1.116,0] NosuchDebugInit: Level=0 Cursor=1 Param=1 API=1 +[1.116,0] Using configfile=C:\Users\tjt\Github\palette\data_omnisphere\config\ffgl.json +[1.117,0] Loading config=C:\Users\tjt\Github\palette\data_omnisphere\config\ffgl.json +[1.117,0] LoadPaletteConfig start +[1.117,0] NosuchDebugLevel = 0 +[1.117,0] Palette.InitGL: x,y=0,0 w,h=1920,1080 +[1.117,0] PaletteHost::SetOscPort: PaletteDaemon is listening on port=3337 diff --git a/data_omnisphere/logs/monitor.log b/data_omnisphere/logs/monitor.log new file mode 100644 index 00000000..f6e5a642 --- /dev/null +++ b/data_omnisphere/logs/monitor.log @@ -0,0 +1,16 @@ +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-05-23","logname":"monitor","click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"monitor is checking the engine.","click":0,"loglevel":"info"} +{"uptime":"0.040500","msg":"LogError","port":"Logidy UMI3","err":"can't find MIDI input port Logidy UMI3","click":0,"loglevel":"error"} +{"uptime":"0.048724","msg":"joystick check","j":0,"name":"Microsoft PC-joystick driver","buttoncount":16,"click":0,"loglevel":"info"} +{"uptime":"0.050500","msg":"joystick check","j":1,"name":"Microsoft PC-joystick driver","buttoncount":0,"click":0,"loglevel":"info"} +{"uptime":"0.050500","msg":"LogError","err":"joystickMonitor: disabled, unable to find joystick with 8 buttons","click":0,"loglevel":"error"} +{"uptime":"0.177056","msg":"checkEngine: engine is not running, killing everything, monitor should restart engine.","click":0,"loglevel":"info"} +{"uptime":"0.177056","msg":"KillAll","click":0,"loglevel":"info"} +{"uptime":"0.177056","msg":"KillExecutable","executable":"mmtt_kinect.exe","exe":"mmtt_kinect.exe","click":0,"loglevel":"info"} +{"uptime":"0.249235","msg":"KillExecutable","executable":"bidule.exe","exe":"bidule.exe","click":0,"loglevel":"info"} +{"uptime":"0.322041","msg":"KillExecutable","executable":"avenue.exe","exe":"avenue.exe","click":0,"loglevel":"info"} +{"uptime":"0.395202","msg":"KillExecutable","executable":"palette_gui.exe","exe":"palette_gui.exe","click":0,"loglevel":"info"} +{"uptime":"0.468739","msg":"KillExecutable","executable":"palette_engine.exe","exe":"palette_engine.exe","click":0,"loglevel":"info"} +{"uptime":"0.540801","msg":"KillExecutable","executable":"obs64.exe","exe":"obs64.exe","click":0,"loglevel":"info"} +{"uptime":"0.609334","msg":"KillExecutable","executable":"palette_chat.exe","exe":"palette_chat.exe","click":0,"loglevel":"info"} +{"uptime":"0.686556","msg":"checkEngine: restarting engine","click":0,"loglevel":"info"} diff --git a/data_omnisphere/logs/palette.log b/data_omnisphere/logs/palette.log new file mode 100644 index 00000000..14522c8b --- /dev/null +++ b/data_omnisphere/logs/palette.log @@ -0,0 +1,47 @@ +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-05-23","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001000","msg":"Palette InitLog","args":["start"],"click":0,"loglevel":"info"} +{"uptime":"0.182265","msg":"palette: starting monitor","MonitorExe":"palette_monitor.exe","click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-05-30","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.000996","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-05-34","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001001","msg":"Palette InitLog","args":["start","bidule"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-05-38","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.000999","msg":"Palette InitLog","args":["start","bidule"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-05-45","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001001","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-06-00","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001501","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-06-15","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001003","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-06-30","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001000","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-06-45","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001000","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-07-00","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.000999","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-07-07","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.000998","msg":"Palette InitLog","args":["test"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-07-15","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001000","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-07-30","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001001","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-07-45","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001000","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-08-00","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001000","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-08-15","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001000","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-08-30","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001000","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-08-45","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.000999","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-09-00","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001000","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-09-15","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001000","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-09-30","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001501","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-09-45","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001500","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} +{"uptime":"0.000000","msg":"InitLog ==============================","date":"2024-06-04-19-10-00","logname":"palette","click":0,"loglevel":"info"} +{"uptime":"0.001500","msg":"Palette InitLog","args":["status"],"click":0,"loglevel":"info"} diff --git a/data/saved/README.txt b/data_omnisphere/saved/README.txt similarity index 100% rename from data/saved/README.txt rename to data_omnisphere/saved/README.txt diff --git a/data/saved/archive/README.txt b/data_omnisphere/saved/archive/README.txt similarity index 100% rename from data/saved/archive/README.txt rename to data_omnisphere/saved/archive/README.txt diff --git a/data/saved/archive/palette7_logs_2023_12_17_17_55_20.zip b/data_omnisphere/saved/archive/palette7_logs_2023_12_17_17_55_20.zip similarity index 100% rename from data/saved/archive/palette7_logs_2023_12_17_17_55_20.zip rename to data_omnisphere/saved/archive/palette7_logs_2023_12_17_17_55_20.zip diff --git a/data/saved/archive/palette7_logs_2023_12_17_18_51_15.zip b/data_omnisphere/saved/archive/palette7_logs_2023_12_17_18_51_15.zip similarity index 100% rename from data/saved/archive/palette7_logs_2023_12_17_18_51_15.zip rename to data_omnisphere/saved/archive/palette7_logs_2023_12_17_18_51_15.zip diff --git a/data/saved/archive/palette7_logs_2024_01_11_15_53_07.zip b/data_omnisphere/saved/archive/palette7_logs_2024_01_11_15_53_07.zip similarity index 100% rename from data/saved/archive/palette7_logs_2024_01_11_15_53_07.zip rename to data_omnisphere/saved/archive/palette7_logs_2024_01_11_15_53_07.zip diff --git a/data/saved/archive/vizcloud_logs_2023_12_17_18_07_35.zip b/data_omnisphere/saved/archive/vizcloud_logs_2023_12_17_18_07_35.zip similarity index 100% rename from data/saved/archive/vizcloud_logs_2023_12_17_18_07_35.zip rename to data_omnisphere/saved/archive/vizcloud_logs_2023_12_17_18_07_35.zip diff --git a/data_omnisphere/saved/archive/vizdesk_logs_2023_07_13_21_17_29.zip b/data_omnisphere/saved/archive/vizdesk_logs_2023_07_13_21_17_29.zip new file mode 100644 index 00000000..dfc0a5a6 Binary files /dev/null and b/data_omnisphere/saved/archive/vizdesk_logs_2023_07_13_21_17_29.zip differ diff --git a/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_14_50_13.zip b/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_14_50_13.zip new file mode 100644 index 00000000..30dcfa5a Binary files /dev/null and b/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_14_50_13.zip differ diff --git a/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_15_04_33.zip b/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_15_04_33.zip new file mode 100644 index 00000000..2849308a Binary files /dev/null and b/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_15_04_33.zip differ diff --git a/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_15_06_50.zip b/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_15_06_50.zip new file mode 100644 index 00000000..2849308a Binary files /dev/null and b/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_15_06_50.zip differ diff --git a/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_15_12_16.zip b/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_15_12_16.zip new file mode 100644 index 00000000..e04f29a4 Binary files /dev/null and b/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_15_12_16.zip differ diff --git a/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_15_29_57.zip b/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_15_29_57.zip new file mode 100644 index 00000000..15cb0ecb Binary files /dev/null and b/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_15_29_57.zip differ diff --git a/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_15_38_08.zip b/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_15_38_08.zip new file mode 100644 index 00000000..8d2ea28a Binary files /dev/null and b/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_15_38_08.zip differ diff --git a/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_16_29_14.zip b/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_16_29_14.zip new file mode 100644 index 00000000..44c70bb6 Binary files /dev/null and b/data_omnisphere/saved/archive/vizdesk_logs_2023_11_18_16_29_14.zip differ diff --git a/data_omnisphere/saved/archive/vizdesk_logs_2023_12_15_09_30_35.zip b/data_omnisphere/saved/archive/vizdesk_logs_2023_12_15_09_30_35.zip new file mode 100644 index 00000000..2be58fdf Binary files /dev/null and b/data_omnisphere/saved/archive/vizdesk_logs_2023_12_15_09_30_35.zip differ diff --git a/data/saved/effect/!!Faded_Growth.json b/data_omnisphere/saved/effect/!!Faded_Growth.json similarity index 100% rename from data/saved/effect/!!Faded_Growth.json rename to data_omnisphere/saved/effect/!!Faded_Growth.json diff --git a/data/saved/effect/!!Faded_Rings.json b/data_omnisphere/saved/effect/!!Faded_Rings.json similarity index 100% rename from data/saved/effect/!!Faded_Rings.json rename to data_omnisphere/saved/effect/!!Faded_Rings.json diff --git a/data/saved/effect/!!Geo_Elevations.json b/data_omnisphere/saved/effect/!!Geo_Elevations.json similarity index 100% rename from data/saved/effect/!!Geo_Elevations.json rename to data_omnisphere/saved/effect/!!Geo_Elevations.json diff --git a/data/saved/effect/!!Psycho_Wave.json b/data_omnisphere/saved/effect/!!Psycho_Wave.json similarity index 100% rename from data/saved/effect/!!Psycho_Wave.json rename to data_omnisphere/saved/effect/!!Psycho_Wave.json diff --git a/data/saved/effect/!!Smooth_Sweet.json b/data_omnisphere/saved/effect/!!Smooth_Sweet.json similarity index 100% rename from data/saved/effect/!!Smooth_Sweet.json rename to data_omnisphere/saved/effect/!!Smooth_Sweet.json diff --git a/data/saved/effect/!!Traces_Of Smoke.json b/data_omnisphere/saved/effect/!!Traces_Of Smoke.json similarity index 100% rename from data/saved/effect/!!Traces_Of Smoke.json rename to data_omnisphere/saved/effect/!!Traces_Of Smoke.json diff --git a/data/saved/effect/!!Wild_Growth.json b/data_omnisphere/saved/effect/!!Wild_Growth.json similarity index 100% rename from data/saved/effect/!!Wild_Growth.json rename to data_omnisphere/saved/effect/!!Wild_Growth.json diff --git a/data/saved/effect/Aurora_Borealis.json b/data_omnisphere/saved/effect/Aurora_Borealis.json similarity index 100% rename from data/saved/effect/Aurora_Borealis.json rename to data_omnisphere/saved/effect/Aurora_Borealis.json diff --git a/data/saved/effect/Blowout_Blur.json b/data_omnisphere/saved/effect/Blowout_Blur.json similarity index 100% rename from data/saved/effect/Blowout_Blur.json rename to data_omnisphere/saved/effect/Blowout_Blur.json diff --git a/data/saved/effect/Blurriest_Quality.json b/data_omnisphere/saved/effect/Blurriest_Quality.json similarity index 100% rename from data/saved/effect/Blurriest_Quality.json rename to data_omnisphere/saved/effect/Blurriest_Quality.json diff --git a/data/saved/effect/Border_Only.json b/data_omnisphere/saved/effect/Border_Only.json similarity index 100% rename from data/saved/effect/Border_Only.json rename to data_omnisphere/saved/effect/Border_Only.json diff --git a/data/saved/effect/CleanWarp_Kaleid4.json b/data_omnisphere/saved/effect/CleanWarp_Kaleid4.json similarity index 100% rename from data/saved/effect/CleanWarp_Kaleid4.json rename to data_omnisphere/saved/effect/CleanWarp_Kaleid4.json diff --git a/data/saved/effect/Clean_SuperKaleid.json b/data_omnisphere/saved/effect/Clean_SuperKaleid.json similarity index 100% rename from data/saved/effect/Clean_SuperKaleid.json rename to data_omnisphere/saved/effect/Clean_SuperKaleid.json diff --git a/data/saved/effect/Detailed_Kaleid7.json b/data_omnisphere/saved/effect/Detailed_Kaleid7.json similarity index 100% rename from data/saved/effect/Detailed_Kaleid7.json rename to data_omnisphere/saved/effect/Detailed_Kaleid7.json diff --git a/data/saved/effect/Diagonal_Mirror.json b/data_omnisphere/saved/effect/Diagonal_Mirror.json similarity index 100% rename from data/saved/effect/Diagonal_Mirror.json rename to data_omnisphere/saved/effect/Diagonal_Mirror.json diff --git a/data/saved/effect/Ecliptic_Shadow.json b/data_omnisphere/saved/effect/Ecliptic_Shadow.json similarity index 100% rename from data/saved/effect/Ecliptic_Shadow.json rename to data_omnisphere/saved/effect/Ecliptic_Shadow.json diff --git a/data/saved/effect/Extreme_Twirl.json b/data_omnisphere/saved/effect/Extreme_Twirl.json similarity index 100% rename from data/saved/effect/Extreme_Twirl.json rename to data_omnisphere/saved/effect/Extreme_Twirl.json diff --git a/data/saved/effect/Fragmented_Shards.json b/data_omnisphere/saved/effect/Fragmented_Shards.json similarity index 100% rename from data/saved/effect/Fragmented_Shards.json rename to data_omnisphere/saved/effect/Fragmented_Shards.json diff --git a/data/saved/effect/Fragmented_Waves.json b/data_omnisphere/saved/effect/Fragmented_Waves.json similarity index 100% rename from data/saved/effect/Fragmented_Waves.json rename to data_omnisphere/saved/effect/Fragmented_Waves.json diff --git a/data/saved/effect/GentleGrain_Kaleid3.json b/data_omnisphere/saved/effect/GentleGrain_Kaleid3.json similarity index 100% rename from data/saved/effect/GentleGrain_Kaleid3.json rename to data_omnisphere/saved/effect/GentleGrain_Kaleid3.json diff --git a/data/saved/effect/GoodGhostly_Fading.json b/data_omnisphere/saved/effect/GoodGhostly_Fading.json similarity index 100% rename from data/saved/effect/GoodGhostly_Fading.json rename to data_omnisphere/saved/effect/GoodGhostly_Fading.json diff --git a/data/saved/effect/Grainy_Growth.json b/data_omnisphere/saved/effect/Grainy_Growth.json similarity index 100% rename from data/saved/effect/Grainy_Growth.json rename to data_omnisphere/saved/effect/Grainy_Growth.json diff --git a/data/saved/effect/Interesting_Posterize.json b/data_omnisphere/saved/effect/Interesting_Posterize.json similarity index 100% rename from data/saved/effect/Interesting_Posterize.json rename to data_omnisphere/saved/effect/Interesting_Posterize.json diff --git a/data/saved/effect/Jigsaw_Puzzle.json b/data_omnisphere/saved/effect/Jigsaw_Puzzle.json similarity index 100% rename from data/saved/effect/Jigsaw_Puzzle.json rename to data_omnisphere/saved/effect/Jigsaw_Puzzle.json diff --git a/data/saved/effect/LotsOf_Copies.json b/data_omnisphere/saved/effect/LotsOf_Copies.json similarity index 100% rename from data/saved/effect/LotsOf_Copies.json rename to data_omnisphere/saved/effect/LotsOf_Copies.json diff --git a/data/saved/effect/None.json b/data_omnisphere/saved/effect/None.json similarity index 100% rename from data/saved/effect/None.json rename to data_omnisphere/saved/effect/None.json diff --git a/data/saved/effect/Oozing_Goo.json b/data_omnisphere/saved/effect/Oozing_Goo.json similarity index 100% rename from data/saved/effect/Oozing_Goo.json rename to data_omnisphere/saved/effect/Oozing_Goo.json diff --git a/data/saved/effect/Rumpled_Fabric.json b/data_omnisphere/saved/effect/Rumpled_Fabric.json similarity index 100% rename from data/saved/effect/Rumpled_Fabric.json rename to data_omnisphere/saved/effect/Rumpled_Fabric.json diff --git a/data/saved/effect/Rumpled_Sherbert.json b/data_omnisphere/saved/effect/Rumpled_Sherbert.json similarity index 100% rename from data/saved/effect/Rumpled_Sherbert.json rename to data_omnisphere/saved/effect/Rumpled_Sherbert.json diff --git a/data/saved/effect/Smoke Rings.json b/data_omnisphere/saved/effect/Smoke Rings.json similarity index 100% rename from data/saved/effect/Smoke Rings.json rename to data_omnisphere/saved/effect/Smoke Rings.json diff --git a/data/saved/effect/Wavey_Waves.json b/data_omnisphere/saved/effect/Wavey_Waves.json similarity index 100% rename from data/saved/effect/Wavey_Waves.json rename to data_omnisphere/saved/effect/Wavey_Waves.json diff --git a/data/saved/effect/Weird_One.json b/data_omnisphere/saved/effect/Weird_One.json similarity index 100% rename from data/saved/effect/Weird_One.json rename to data_omnisphere/saved/effect/Weird_One.json diff --git a/data/saved/global/Ambient.json b/data_omnisphere/saved/global/Ambient.json similarity index 100% rename from data/saved/global/Ambient.json rename to data_omnisphere/saved/global/Ambient.json diff --git a/data/saved/global/Attract_Off.json b/data_omnisphere/saved/global/Attract_Off.json similarity index 100% rename from data/saved/global/Attract_Off.json rename to data_omnisphere/saved/global/Attract_Off.json diff --git a/data/saved/global/Attract_On.json b/data_omnisphere/saved/global/Attract_On.json similarity index 100% rename from data/saved/global/Attract_On.json rename to data_omnisphere/saved/global/Attract_On.json diff --git a/data/saved/global/Looping_0.0.json b/data_omnisphere/saved/global/Looping_0.0.json similarity index 100% rename from data/saved/global/Looping_0.0.json rename to data_omnisphere/saved/global/Looping_0.0.json diff --git a/data/saved/global/Looping_0.1.json b/data_omnisphere/saved/global/Looping_0.1.json similarity index 100% rename from data/saved/global/Looping_0.1.json rename to data_omnisphere/saved/global/Looping_0.1.json diff --git a/data/saved/global/Looping_0.5.json b/data_omnisphere/saved/global/Looping_0.5.json similarity index 100% rename from data/saved/global/Looping_0.5.json rename to data_omnisphere/saved/global/Looping_0.5.json diff --git a/data/saved/global/Looping_0.9.json b/data_omnisphere/saved/global/Looping_0.9.json similarity index 100% rename from data/saved/global/Looping_0.9.json rename to data_omnisphere/saved/global/Looping_0.9.json diff --git a/data/saved/global/Looping_Infinite.json b/data_omnisphere/saved/global/Looping_Infinite.json similarity index 100% rename from data/saved/global/Looping_Infinite.json rename to data_omnisphere/saved/global/Looping_Infinite.json diff --git a/data/saved/global/Looping_Off.json b/data_omnisphere/saved/global/Looping_Off.json similarity index 100% rename from data/saved/global/Looping_Off.json rename to data_omnisphere/saved/global/Looping_Off.json diff --git a/data/saved/global/Looping_On.json b/data_omnisphere/saved/global/Looping_On.json similarity index 100% rename from data/saved/global/Looping_On.json rename to data_omnisphere/saved/global/Looping_On.json diff --git a/data/saved/global/Scale_Arabian.json b/data_omnisphere/saved/global/Scale_Arabian.json similarity index 100% rename from data/saved/global/Scale_Arabian.json rename to data_omnisphere/saved/global/Scale_Arabian.json diff --git a/data/saved/global/Scale_Chromatic.json b/data_omnisphere/saved/global/Scale_Chromatic.json similarity index 100% rename from data/saved/global/Scale_Chromatic.json rename to data_omnisphere/saved/global/Scale_Chromatic.json diff --git a/data/saved/global/Scale_Dorian.json b/data_omnisphere/saved/global/Scale_Dorian.json similarity index 100% rename from data/saved/global/Scale_Dorian.json rename to data_omnisphere/saved/global/Scale_Dorian.json diff --git a/data/saved/global/Scale_External.json b/data_omnisphere/saved/global/Scale_External.json similarity index 100% rename from data/saved/global/Scale_External.json rename to data_omnisphere/saved/global/Scale_External.json diff --git a/data/saved/global/Scale_Ionian.json b/data_omnisphere/saved/global/Scale_Ionian.json similarity index 100% rename from data/saved/global/Scale_Ionian.json rename to data_omnisphere/saved/global/Scale_Ionian.json diff --git a/data/saved/global/Scale_Newage.json b/data_omnisphere/saved/global/Scale_Newage.json similarity index 100% rename from data/saved/global/Scale_Newage.json rename to data_omnisphere/saved/global/Scale_Newage.json diff --git a/data/saved/global/Thru_Compression.json b/data_omnisphere/saved/global/Thru_Compression.json similarity index 100% rename from data/saved/global/Thru_Compression.json rename to data_omnisphere/saved/global/Thru_Compression.json diff --git a/data/saved/global/Thru_Darkness.json b/data_omnisphere/saved/global/Thru_Darkness.json similarity index 100% rename from data/saved/global/Thru_Darkness.json rename to data_omnisphere/saved/global/Thru_Darkness.json diff --git a/data/saved/global/Thru_Drive.json b/data_omnisphere/saved/global/Thru_Drive.json similarity index 100% rename from data/saved/global/Thru_Drive.json rename to data_omnisphere/saved/global/Thru_Drive.json diff --git a/data/saved/global/Thru_Flutes.json b/data_omnisphere/saved/global/Thru_Flutes.json similarity index 100% rename from data/saved/global/Thru_Flutes.json rename to data_omnisphere/saved/global/Thru_Flutes.json diff --git a/data/saved/global/Thru_Glass.json b/data_omnisphere/saved/global/Thru_Glass.json similarity index 100% rename from data/saved/global/Thru_Glass.json rename to data_omnisphere/saved/global/Thru_Glass.json diff --git a/data/saved/global/Thru_Moog.json b/data_omnisphere/saved/global/Thru_Moog.json similarity index 100% rename from data/saved/global/Thru_Moog.json rename to data_omnisphere/saved/global/Thru_Moog.json diff --git a/data/saved/global/Thru_Off.json b/data_omnisphere/saved/global/Thru_Off.json similarity index 100% rename from data/saved/global/Thru_Off.json rename to data_omnisphere/saved/global/Thru_Off.json diff --git a/data/saved/global/Thru_On.json b/data_omnisphere/saved/global/Thru_On.json similarity index 100% rename from data/saved/global/Thru_On.json rename to data_omnisphere/saved/global/Thru_On.json diff --git a/data/saved/global/Thru_Picking.json b/data_omnisphere/saved/global/Thru_Picking.json similarity index 100% rename from data/saved/global/Thru_Picking.json rename to data_omnisphere/saved/global/Thru_Picking.json diff --git a/data/saved/global/Thru_Polylead.json b/data_omnisphere/saved/global/Thru_Polylead.json similarity index 100% rename from data/saved/global/Thru_Polylead.json rename to data_omnisphere/saved/global/Thru_Polylead.json diff --git a/data/saved/global/Thru_RezBass.json b/data_omnisphere/saved/global/Thru_RezBass.json similarity index 100% rename from data/saved/global/Thru_RezBass.json rename to data_omnisphere/saved/global/Thru_RezBass.json diff --git a/data/saved/global/Thru_Rhodes.json b/data_omnisphere/saved/global/Thru_Rhodes.json similarity index 100% rename from data/saved/global/Thru_Rhodes.json rename to data_omnisphere/saved/global/Thru_Rhodes.json diff --git a/data/saved/global/Thru_Simple.json b/data_omnisphere/saved/global/Thru_Simple.json similarity index 100% rename from data/saved/global/Thru_Simple.json rename to data_omnisphere/saved/global/Thru_Simple.json diff --git a/data/saved/global/Thru_SquareLead.json b/data_omnisphere/saved/global/Thru_SquareLead.json similarity index 100% rename from data/saved/global/Thru_SquareLead.json rename to data_omnisphere/saved/global/Thru_SquareLead.json diff --git a/data/saved/global/Thru_Theremin.json b/data_omnisphere/saved/global/Thru_Theremin.json similarity index 100% rename from data/saved/global/Thru_Theremin.json rename to data_omnisphere/saved/global/Thru_Theremin.json diff --git a/data/saved/global/Thru_TriangleLead.json b/data_omnisphere/saved/global/Thru_TriangleLead.json similarity index 100% rename from data/saved/global/Thru_TriangleLead.json rename to data_omnisphere/saved/global/Thru_TriangleLead.json diff --git a/data/saved/global/ZZZ Sonic Runway_Scaled.json b/data_omnisphere/saved/global/ZZZ Sonic Runway_Scaled.json similarity index 100% rename from data/saved/global/ZZZ Sonic Runway_Scaled.json rename to data_omnisphere/saved/global/ZZZ Sonic Runway_Scaled.json diff --git a/data/saved/global/ZZZ Sonic Runway_Unscaled.json b/data_omnisphere/saved/global/ZZZ Sonic Runway_Unscaled.json similarity index 100% rename from data/saved/global/ZZZ Sonic Runway_Unscaled.json rename to data_omnisphere/saved/global/ZZZ Sonic Runway_Unscaled.json diff --git a/data/saved/global/default.json b/data_omnisphere/saved/global/default.json similarity index 100% rename from data/saved/global/default.json rename to data_omnisphere/saved/global/default.json diff --git a/data/saved/misc/Loop_Fade0.1.json b/data_omnisphere/saved/misc/Loop_Fade0.1.json similarity index 100% rename from data/saved/misc/Loop_Fade0.1.json rename to data_omnisphere/saved/misc/Loop_Fade0.1.json diff --git a/data/saved/misc/Loop_Fade0.3.json b/data_omnisphere/saved/misc/Loop_Fade0.3.json similarity index 100% rename from data/saved/misc/Loop_Fade0.3.json rename to data_omnisphere/saved/misc/Loop_Fade0.3.json diff --git a/data/saved/misc/Loop_Fade0.5.json b/data_omnisphere/saved/misc/Loop_Fade0.5.json similarity index 100% rename from data/saved/misc/Loop_Fade0.5.json rename to data_omnisphere/saved/misc/Loop_Fade0.5.json diff --git a/data/saved/misc/Loop_Fade0.8.json b/data_omnisphere/saved/misc/Loop_Fade0.8.json similarity index 100% rename from data/saved/misc/Loop_Fade0.8.json rename to data_omnisphere/saved/misc/Loop_Fade0.8.json diff --git a/data/saved/misc/Loop_Infinite.json b/data_omnisphere/saved/misc/Loop_Infinite.json similarity index 100% rename from data/saved/misc/Loop_Infinite.json rename to data_omnisphere/saved/misc/Loop_Infinite.json diff --git a/data/saved/misc/Loop_Off.json b/data_omnisphere/saved/misc/Loop_Off.json similarity index 100% rename from data/saved/misc/Loop_Off.json rename to data_omnisphere/saved/misc/Loop_Off.json diff --git a/data/saved/misc/No_Sound.json b/data_omnisphere/saved/misc/No_Sound.json similarity index 100% rename from data/saved/misc/No_Sound.json rename to data_omnisphere/saved/misc/No_Sound.json diff --git a/data/saved/misc/default.json b/data_omnisphere/saved/misc/default.json similarity index 100% rename from data/saved/misc/default.json rename to data_omnisphere/saved/misc/default.json diff --git a/data/saved/patch/!!Aqua Space_Time Tunnel.json b/data_omnisphere/saved/patch/!!Aqua Space_Time Tunnel.json similarity index 100% rename from data/saved/patch/!!Aqua Space_Time Tunnel.json rename to data_omnisphere/saved/patch/!!Aqua Space_Time Tunnel.json diff --git a/data/saved/patch/!!Background_Radiation.json b/data_omnisphere/saved/patch/!!Background_Radiation.json similarity index 100% rename from data/saved/patch/!!Background_Radiation.json rename to data_omnisphere/saved/patch/!!Background_Radiation.json diff --git a/data/saved/patch/!!Blueish_Sea Of Triangles.json b/data_omnisphere/saved/patch/!!Blueish_Sea Of Triangles.json similarity index 100% rename from data/saved/patch/!!Blueish_Sea Of Triangles.json rename to data_omnisphere/saved/patch/!!Blueish_Sea Of Triangles.json diff --git a/data/saved/patch/!!Growing_Triangle Layers.json b/data_omnisphere/saved/patch/!!Growing_Triangle Layers.json similarity index 100% rename from data/saved/patch/!!Growing_Triangle Layers.json rename to data_omnisphere/saved/patch/!!Growing_Triangle Layers.json diff --git a/data/saved/patch/!!Indian_Diagonal.json b/data_omnisphere/saved/patch/!!Indian_Diagonal.json similarity index 100% rename from data/saved/patch/!!Indian_Diagonal.json rename to data_omnisphere/saved/patch/!!Indian_Diagonal.json diff --git a/data/saved/patch/!!Landscape_Traces.json b/data_omnisphere/saved/patch/!!Landscape_Traces.json similarity index 100% rename from data/saved/patch/!!Landscape_Traces.json rename to data_omnisphere/saved/patch/!!Landscape_Traces.json diff --git a/data/saved/patch/!!Orange Fire_Smoke Traces.json b/data_omnisphere/saved/patch/!!Orange Fire_Smoke Traces.json similarity index 100% rename from data/saved/patch/!!Orange Fire_Smoke Traces.json rename to data_omnisphere/saved/patch/!!Orange Fire_Smoke Traces.json diff --git a/data/saved/patch/!!Orange_Psycho Trails.json b/data_omnisphere/saved/patch/!!Orange_Psycho Trails.json similarity index 100% rename from data/saved/patch/!!Orange_Psycho Trails.json rename to data_omnisphere/saved/patch/!!Orange_Psycho Trails.json diff --git a/data/saved/patch/!!Perky Blue_Time Tunnel.json b/data_omnisphere/saved/patch/!!Perky Blue_Time Tunnel.json similarity index 100% rename from data/saved/patch/!!Perky Blue_Time Tunnel.json rename to data_omnisphere/saved/patch/!!Perky Blue_Time Tunnel.json diff --git a/data/saved/patch/!!Planetary_Bubbles.json b/data_omnisphere/saved/patch/!!Planetary_Bubbles.json similarity index 100% rename from data/saved/patch/!!Planetary_Bubbles.json rename to data_omnisphere/saved/patch/!!Planetary_Bubbles.json diff --git a/data/saved/patch/!!Purple_Four Eyes.json b/data_omnisphere/saved/patch/!!Purple_Four Eyes.json similarity index 100% rename from data/saved/patch/!!Purple_Four Eyes.json rename to data_omnisphere/saved/patch/!!Purple_Four Eyes.json diff --git a/data/saved/patch/!!Purple_Jigsaw Pulse.json b/data_omnisphere/saved/patch/!!Purple_Jigsaw Pulse.json similarity index 100% rename from data/saved/patch/!!Purple_Jigsaw Pulse.json rename to data_omnisphere/saved/patch/!!Purple_Jigsaw Pulse.json diff --git a/data/saved/patch/!!Rainbow Perk_Goo Squares.json b/data_omnisphere/saved/patch/!!Rainbow Perk_Goo Squares.json similarity index 100% rename from data/saved/patch/!!Rainbow Perk_Goo Squares.json rename to data_omnisphere/saved/patch/!!Rainbow Perk_Goo Squares.json diff --git a/data/saved/patch/!!Rect_Color Shadow.json b/data_omnisphere/saved/patch/!!Rect_Color Shadow.json similarity index 100% rename from data/saved/patch/!!Rect_Color Shadow.json rename to data_omnisphere/saved/patch/!!Rect_Color Shadow.json diff --git a/data/saved/patch/!!Red Resonant_Gooey Path.json b/data_omnisphere/saved/patch/!!Red Resonant_Gooey Path.json similarity index 100% rename from data/saved/patch/!!Red Resonant_Gooey Path.json rename to data_omnisphere/saved/patch/!!Red Resonant_Gooey Path.json diff --git a/data/saved/patch/!!River_Pathways.json b/data_omnisphere/saved/patch/!!River_Pathways.json similarity index 100% rename from data/saved/patch/!!River_Pathways.json rename to data_omnisphere/saved/patch/!!River_Pathways.json diff --git a/data/saved/patch/!!Smooth Sweet_Squared.json b/data_omnisphere/saved/patch/!!Smooth Sweet_Squared.json similarity index 100% rename from data/saved/patch/!!Smooth Sweet_Squared.json rename to data_omnisphere/saved/patch/!!Smooth Sweet_Squared.json diff --git a/data/saved/patch/!!Smooth_Tri Kaleid.json b/data_omnisphere/saved/patch/!!Smooth_Tri Kaleid.json similarity index 100% rename from data/saved/patch/!!Smooth_Tri Kaleid.json rename to data_omnisphere/saved/patch/!!Smooth_Tri Kaleid.json diff --git a/data/saved/patch/!!Teal Fire_Smoke Traces.json b/data_omnisphere/saved/patch/!!Teal Fire_Smoke Traces.json similarity index 100% rename from data/saved/patch/!!Teal Fire_Smoke Traces.json rename to data_omnisphere/saved/patch/!!Teal Fire_Smoke Traces.json diff --git a/data/saved/patch/!!Triangles_On Acid.json b/data_omnisphere/saved/patch/!!Triangles_On Acid.json similarity index 100% rename from data/saved/patch/!!Triangles_On Acid.json rename to data_omnisphere/saved/patch/!!Triangles_On Acid.json diff --git a/data/saved/patch/!!Vertical_Rainbow.json b/data_omnisphere/saved/patch/!!Vertical_Rainbow.json similarity index 100% rename from data/saved/patch/!!Vertical_Rainbow.json rename to data_omnisphere/saved/patch/!!Vertical_Rainbow.json diff --git a/data/saved/patch/!!Whisling_Sherbert.json b/data_omnisphere/saved/patch/!!Whisling_Sherbert.json similarity index 100% rename from data/saved/patch/!!Whisling_Sherbert.json rename to data_omnisphere/saved/patch/!!Whisling_Sherbert.json diff --git a/data/saved/patch/!!Yellow_Rect Blob.json b/data_omnisphere/saved/patch/!!Yellow_Rect Blob.json similarity index 100% rename from data/saved/patch/!!Yellow_Rect Blob.json rename to data_omnisphere/saved/patch/!!Yellow_Rect Blob.json diff --git a/data/saved/patch/(!) Adagio_Ripples.json b/data_omnisphere/saved/patch/(!) Adagio_Ripples.json similarity index 100% rename from data/saved/patch/(!) Adagio_Ripples.json rename to data_omnisphere/saved/patch/(!) Adagio_Ripples.json diff --git a/data/saved/patch/(!) Age of Ill_Bass Orbits.json b/data_omnisphere/saved/patch/(!) Age of Ill_Bass Orbits.json similarity index 100% rename from data/saved/patch/(!) Age of Ill_Bass Orbits.json rename to data_omnisphere/saved/patch/(!) Age of Ill_Bass Orbits.json diff --git a/data/saved/patch/(!) Analog Shape_Kaleido.json b/data_omnisphere/saved/patch/(!) Analog Shape_Kaleido.json similarity index 100% rename from data/saved/patch/(!) Analog Shape_Kaleido.json rename to data_omnisphere/saved/patch/(!) Analog Shape_Kaleido.json diff --git a/data/saved/patch/(!) Ant Energy_Oval Aurora.json b/data_omnisphere/saved/patch/(!) Ant Energy_Oval Aurora.json similarity index 100% rename from data/saved/patch/(!) Ant Energy_Oval Aurora.json rename to data_omnisphere/saved/patch/(!) Ant Energy_Oval Aurora.json diff --git a/data/saved/patch/(!) Beads of E_Purp Circ.json b/data_omnisphere/saved/patch/(!) Beads of E_Purp Circ.json similarity index 100% rename from data/saved/patch/(!) Beads of E_Purp Circ.json rename to data_omnisphere/saved/patch/(!) Beads of E_Purp Circ.json diff --git a/data/saved/patch/(!) Bells_Rectangular.json b/data_omnisphere/saved/patch/(!) Bells_Rectangular.json similarity index 100% rename from data/saved/patch/(!) Bells_Rectangular.json rename to data_omnisphere/saved/patch/(!) Bells_Rectangular.json diff --git a/data/saved/patch/(!) Bellzo_SunSquare.json b/data_omnisphere/saved/patch/(!) Bellzo_SunSquare.json similarity index 100% rename from data/saved/patch/(!) Bellzo_SunSquare.json rename to data_omnisphere/saved/patch/(!) Bellzo_SunSquare.json diff --git a/data/saved/patch/(!) Bouncing Metal_Lines Spin.json b/data_omnisphere/saved/patch/(!) Bouncing Metal_Lines Spin.json similarity index 100% rename from data/saved/patch/(!) Bouncing Metal_Lines Spin.json rename to data_omnisphere/saved/patch/(!) Bouncing Metal_Lines Spin.json diff --git a/data/saved/patch/(!) Breathing_Smoke Blue.json b/data_omnisphere/saved/patch/(!) Breathing_Smoke Blue.json similarity index 100% rename from data/saved/patch/(!) Breathing_Smoke Blue.json rename to data_omnisphere/saved/patch/(!) Breathing_Smoke Blue.json diff --git a/data/saved/patch/(!) Broken OSCar_Yellow Squares.json b/data_omnisphere/saved/patch/(!) Broken OSCar_Yellow Squares.json similarity index 100% rename from data/saved/patch/(!) Broken OSCar_Yellow Squares.json rename to data_omnisphere/saved/patch/(!) Broken OSCar_Yellow Squares.json diff --git a/data/saved/patch/(!) Bum Like You_Triangles.json b/data_omnisphere/saved/patch/(!) Bum Like You_Triangles.json similarity index 100% rename from data/saved/patch/(!) Bum Like You_Triangles.json rename to data_omnisphere/saved/patch/(!) Bum Like You_Triangles.json diff --git a/data/saved/patch/(!) Cascading_Filter Square.json b/data_omnisphere/saved/patch/(!) Cascading_Filter Square.json similarity index 100% rename from data/saved/patch/(!) Cascading_Filter Square.json rename to data_omnisphere/saved/patch/(!) Cascading_Filter Square.json diff --git a/data/saved/patch/(!) Cathedral Blue_Line Kaleido.json b/data_omnisphere/saved/patch/(!) Cathedral Blue_Line Kaleido.json similarity index 100% rename from data/saved/patch/(!) Cathedral Blue_Line Kaleido.json rename to data_omnisphere/saved/patch/(!) Cathedral Blue_Line Kaleido.json diff --git a/data/saved/patch/(!) Cavaquinho_Square Gradient.json b/data_omnisphere/saved/patch/(!) Cavaquinho_Square Gradient.json similarity index 100% rename from data/saved/patch/(!) Cavaquinho_Square Gradient.json rename to data_omnisphere/saved/patch/(!) Cavaquinho_Square Gradient.json diff --git a/data/saved/patch/(!) Cedar Space_Square Trails.json b/data_omnisphere/saved/patch/(!) Cedar Space_Square Trails.json similarity index 100% rename from data/saved/patch/(!) Cedar Space_Square Trails.json rename to data_omnisphere/saved/patch/(!) Cedar Space_Square Trails.json diff --git a/data/saved/patch/(!) Chink In_Triangle Inv.json b/data_omnisphere/saved/patch/(!) Chink In_Triangle Inv.json similarity index 100% rename from data/saved/patch/(!) Chink In_Triangle Inv.json rename to data_omnisphere/saved/patch/(!) Chink In_Triangle Inv.json diff --git a/data/saved/patch/(!) Christmas_Squares.json b/data_omnisphere/saved/patch/(!) Christmas_Squares.json similarity index 100% rename from data/saved/patch/(!) Christmas_Squares.json rename to data_omnisphere/saved/patch/(!) Christmas_Squares.json diff --git a/data/saved/patch/(!) Coldstone_Square Outline.json b/data_omnisphere/saved/patch/(!) Coldstone_Square Outline.json similarity index 100% rename from data/saved/patch/(!) Coldstone_Square Outline.json rename to data_omnisphere/saved/patch/(!) Coldstone_Square Outline.json diff --git a/data/saved/patch/(!) Crush Keys_Purple Fade.json b/data_omnisphere/saved/patch/(!) Crush Keys_Purple Fade.json similarity index 100% rename from data/saved/patch/(!) Crush Keys_Purple Fade.json rename to data_omnisphere/saved/patch/(!) Crush Keys_Purple Fade.json diff --git a/data/saved/patch/(!) Cryo_Inversions.json b/data_omnisphere/saved/patch/(!) Cryo_Inversions.json similarity index 100% rename from data/saved/patch/(!) Cryo_Inversions.json rename to data_omnisphere/saved/patch/(!) Cryo_Inversions.json diff --git a/data/saved/patch/(!) Crystal Pipes_Lines.json b/data_omnisphere/saved/patch/(!) Crystal Pipes_Lines.json similarity index 100% rename from data/saved/patch/(!) Crystal Pipes_Lines.json rename to data_omnisphere/saved/patch/(!) Crystal Pipes_Lines.json diff --git a/data/saved/patch/(!) Cumbus Rings_Fragmented.json b/data_omnisphere/saved/patch/(!) Cumbus Rings_Fragmented.json similarity index 100% rename from data/saved/patch/(!) Cumbus Rings_Fragmented.json rename to data_omnisphere/saved/patch/(!) Cumbus Rings_Fragmented.json diff --git a/data/saved/patch/(!) Dark Space_Plucks Ovals.json b/data_omnisphere/saved/patch/(!) Dark Space_Plucks Ovals.json similarity index 100% rename from data/saved/patch/(!) Dark Space_Plucks Ovals.json rename to data_omnisphere/saved/patch/(!) Dark Space_Plucks Ovals.json diff --git a/data/saved/patch/(!) Deep Mallet_Grey Square.json b/data_omnisphere/saved/patch/(!) Deep Mallet_Grey Square.json similarity index 100% rename from data/saved/patch/(!) Deep Mallet_Grey Square.json rename to data_omnisphere/saved/patch/(!) Deep Mallet_Grey Square.json diff --git a/data/saved/patch/(!) Dream Mystic_Square Trails.json b/data_omnisphere/saved/patch/(!) Dream Mystic_Square Trails.json similarity index 100% rename from data/saved/patch/(!) Dream Mystic_Square Trails.json rename to data_omnisphere/saved/patch/(!) Dream Mystic_Square Trails.json diff --git a/data/saved/patch/(!) Dream Search_Green Ooze.json b/data_omnisphere/saved/patch/(!) Dream Search_Green Ooze.json similarity index 100% rename from data/saved/patch/(!) Dream Search_Green Ooze.json rename to data_omnisphere/saved/patch/(!) Dream Search_Green Ooze.json diff --git a/data/saved/patch/(!) Drops of_Tri Blue.json b/data_omnisphere/saved/patch/(!) Drops of_Tri Blue.json similarity index 100% rename from data/saved/patch/(!) Drops of_Tri Blue.json rename to data_omnisphere/saved/patch/(!) Drops of_Tri Blue.json diff --git a/data/saved/patch/(!) Drumwerk_Circle Grow.json b/data_omnisphere/saved/patch/(!) Drumwerk_Circle Grow.json similarity index 100% rename from data/saved/patch/(!) Drumwerk_Circle Grow.json rename to data_omnisphere/saved/patch/(!) Drumwerk_Circle Grow.json diff --git a/data/saved/patch/(!) Ebony_Inverted.json b/data_omnisphere/saved/patch/(!) Ebony_Inverted.json similarity index 100% rename from data/saved/patch/(!) Ebony_Inverted.json rename to data_omnisphere/saved/patch/(!) Ebony_Inverted.json diff --git a/data/saved/patch/(!) FM Bottle_Crush Mirror.json b/data_omnisphere/saved/patch/(!) FM Bottle_Crush Mirror.json similarity index 100% rename from data/saved/patch/(!) FM Bottle_Crush Mirror.json rename to data_omnisphere/saved/patch/(!) FM Bottle_Crush Mirror.json diff --git a/data/saved/patch/(!) Fantasia_Grains_Aurora.json b/data_omnisphere/saved/patch/(!) Fantasia_Grains_Aurora.json similarity index 100% rename from data/saved/patch/(!) Fantasia_Grains_Aurora.json rename to data_omnisphere/saved/patch/(!) Fantasia_Grains_Aurora.json diff --git a/data/saved/patch/(!) Glass Harmonic_Twirl.json b/data_omnisphere/saved/patch/(!) Glass Harmonic_Twirl.json similarity index 100% rename from data/saved/patch/(!) Glass Harmonic_Twirl.json rename to data_omnisphere/saved/patch/(!) Glass Harmonic_Twirl.json diff --git a/data/saved/patch/(!) Glass Spark_Line Bubbles.json b/data_omnisphere/saved/patch/(!) Glass Spark_Line Bubbles.json similarity index 100% rename from data/saved/patch/(!) Glass Spark_Line Bubbles.json rename to data_omnisphere/saved/patch/(!) Glass Spark_Line Bubbles.json diff --git a/data/saved/patch/(!) Hang Drum_Circle Blur.json b/data_omnisphere/saved/patch/(!) Hang Drum_Circle Blur.json similarity index 100% rename from data/saved/patch/(!) Hang Drum_Circle Blur.json rename to data_omnisphere/saved/patch/(!) Hang Drum_Circle Blur.json diff --git a/data/saved/patch/(!) Highpass Red_Kaleido.json b/data_omnisphere/saved/patch/(!) Highpass Red_Kaleido.json similarity index 100% rename from data/saved/patch/(!) Highpass Red_Kaleido.json rename to data_omnisphere/saved/patch/(!) Highpass Red_Kaleido.json diff --git a/data/saved/patch/(!) In Memorium_Grey Rects.json b/data_omnisphere/saved/patch/(!) In Memorium_Grey Rects.json similarity index 100% rename from data/saved/patch/(!) In Memorium_Grey Rects.json rename to data_omnisphere/saved/patch/(!) In Memorium_Grey Rects.json diff --git a/data/saved/patch/(!) Konichiwa_Square Borders.json b/data_omnisphere/saved/patch/(!) Konichiwa_Square Borders.json similarity index 100% rename from data/saved/patch/(!) Konichiwa_Square Borders.json rename to data_omnisphere/saved/patch/(!) Konichiwa_Square Borders.json diff --git a/data/saved/patch/(!) MKS80Pluck_Rainbows.json b/data_omnisphere/saved/patch/(!) MKS80Pluck_Rainbows.json similarity index 100% rename from data/saved/patch/(!) MKS80Pluck_Rainbows.json rename to data_omnisphere/saved/patch/(!) MKS80Pluck_Rainbows.json diff --git a/data/saved/patch/(!) Maldives_Horizontal.json b/data_omnisphere/saved/patch/(!) Maldives_Horizontal.json similarity index 100% rename from data/saved/patch/(!) Maldives_Horizontal.json rename to data_omnisphere/saved/patch/(!) Maldives_Horizontal.json diff --git a/data/saved/patch/(!) Nature Music_Aurora.json b/data_omnisphere/saved/patch/(!) Nature Music_Aurora.json similarity index 100% rename from data/saved/patch/(!) Nature Music_Aurora.json rename to data_omnisphere/saved/patch/(!) Nature Music_Aurora.json diff --git a/data/saved/patch/(!) Phased_Hammond Lines.json b/data_omnisphere/saved/patch/(!) Phased_Hammond Lines.json similarity index 100% rename from data/saved/patch/(!) Phased_Hammond Lines.json rename to data_omnisphere/saved/patch/(!) Phased_Hammond Lines.json diff --git a/data/saved/patch/(!) PopRox_Circles.json b/data_omnisphere/saved/patch/(!) PopRox_Circles.json similarity index 100% rename from data/saved/patch/(!) PopRox_Circles.json rename to data_omnisphere/saved/patch/(!) PopRox_Circles.json diff --git a/data/saved/patch/(!) PreparedSaz_Lines Fade.json b/data_omnisphere/saved/patch/(!) PreparedSaz_Lines Fade.json similarity index 100% rename from data/saved/patch/(!) PreparedSaz_Lines Fade.json rename to data_omnisphere/saved/patch/(!) PreparedSaz_Lines Fade.json diff --git a/data/saved/patch/(!) Purest Sines_Kaleido.json b/data_omnisphere/saved/patch/(!) Purest Sines_Kaleido.json similarity index 100% rename from data/saved/patch/(!) Purest Sines_Kaleido.json rename to data_omnisphere/saved/patch/(!) Purest Sines_Kaleido.json diff --git a/data/saved/patch/(!) Shooting Sines_Ripples.json b/data_omnisphere/saved/patch/(!) Shooting Sines_Ripples.json similarity index 100% rename from data/saved/patch/(!) Shooting Sines_Ripples.json rename to data_omnisphere/saved/patch/(!) Shooting Sines_Ripples.json diff --git a/data/saved/patch/(!) Theremin_Swipe.json b/data_omnisphere/saved/patch/(!) Theremin_Swipe.json similarity index 100% rename from data/saved/patch/(!) Theremin_Swipe.json rename to data_omnisphere/saved/patch/(!) Theremin_Swipe.json diff --git a/data/saved/patch/(!) Water Lilies_Circles.json b/data_omnisphere/saved/patch/(!) Water Lilies_Circles.json similarity index 100% rename from data/saved/patch/(!) Water Lilies_Circles.json rename to data_omnisphere/saved/patch/(!) Water Lilies_Circles.json diff --git a/data/saved/patch/(!) Watery_Gamelan Weird.json b/data_omnisphere/saved/patch/(!) Watery_Gamelan Weird.json similarity index 100% rename from data/saved/patch/(!) Watery_Gamelan Weird.json rename to data_omnisphere/saved/patch/(!) Watery_Gamelan Weird.json diff --git a/data/saved/patch/Angle_Waves.json b/data_omnisphere/saved/patch/Angle_Waves.json similarity index 100% rename from data/saved/patch/Angle_Waves.json rename to data_omnisphere/saved/patch/Angle_Waves.json diff --git a/data/saved/patch/Aqua Hollow_Circle Trails.json b/data_omnisphere/saved/patch/Aqua Hollow_Circle Trails.json similarity index 100% rename from data/saved/patch/Aqua Hollow_Circle Trails.json rename to data_omnisphere/saved/patch/Aqua Hollow_Circle Trails.json diff --git a/data/saved/patch/Aqua_Ghosts.json b/data_omnisphere/saved/patch/Aqua_Ghosts.json similarity index 100% rename from data/saved/patch/Aqua_Ghosts.json rename to data_omnisphere/saved/patch/Aqua_Ghosts.json diff --git a/data/saved/patch/Aqua_Squiggle.json b/data_omnisphere/saved/patch/Aqua_Squiggle.json similarity index 100% rename from data/saved/patch/Aqua_Squiggle.json rename to data_omnisphere/saved/patch/Aqua_Squiggle.json diff --git a/data/saved/patch/Aqua_Worm.json b/data_omnisphere/saved/patch/Aqua_Worm.json similarity index 100% rename from data/saved/patch/Aqua_Worm.json rename to data_omnisphere/saved/patch/Aqua_Worm.json diff --git a/data/saved/patch/Aurora_Borealis.json b/data_omnisphere/saved/patch/Aurora_Borealis.json similarity index 100% rename from data/saved/patch/Aurora_Borealis.json rename to data_omnisphere/saved/patch/Aurora_Borealis.json diff --git a/data/saved/patch/Aurora_Orange.json b/data_omnisphere/saved/patch/Aurora_Orange.json similarity index 100% rename from data/saved/patch/Aurora_Orange.json rename to data_omnisphere/saved/patch/Aurora_Orange.json diff --git a/data/saved/patch/Baby Blue_Floaters.json b/data_omnisphere/saved/patch/Baby Blue_Floaters.json similarity index 100% rename from data/saved/patch/Baby Blue_Floaters.json rename to data_omnisphere/saved/patch/Baby Blue_Floaters.json diff --git a/data/saved/patch/Bass Kaleid_Moire.json b/data_omnisphere/saved/patch/Bass Kaleid_Moire.json similarity index 100% rename from data/saved/patch/Bass Kaleid_Moire.json rename to data_omnisphere/saved/patch/Bass Kaleid_Moire.json diff --git a/data/saved/patch/Big Block_Kaleid.json b/data_omnisphere/saved/patch/Big Block_Kaleid.json similarity index 100% rename from data/saved/patch/Big Block_Kaleid.json rename to data_omnisphere/saved/patch/Big Block_Kaleid.json diff --git a/data/saved/patch/Blue Dream_Kaleidoscope.json b/data_omnisphere/saved/patch/Blue Dream_Kaleidoscope.json similarity index 100% rename from data/saved/patch/Blue Dream_Kaleidoscope.json rename to data_omnisphere/saved/patch/Blue Dream_Kaleidoscope.json diff --git a/data/saved/patch/Blue Floating_Rectangles.json b/data_omnisphere/saved/patch/Blue Floating_Rectangles.json similarity index 100% rename from data/saved/patch/Blue Floating_Rectangles.json rename to data_omnisphere/saved/patch/Blue Floating_Rectangles.json diff --git a/data/saved/patch/Blue Green_Line Clouds.json b/data_omnisphere/saved/patch/Blue Green_Line Clouds.json similarity index 100% rename from data/saved/patch/Blue Green_Line Clouds.json rename to data_omnisphere/saved/patch/Blue Green_Line Clouds.json diff --git a/data/saved/patch/BlueLine_TriKaleid.json b/data_omnisphere/saved/patch/BlueLine_TriKaleid.json similarity index 100% rename from data/saved/patch/BlueLine_TriKaleid.json rename to data_omnisphere/saved/patch/BlueLine_TriKaleid.json diff --git a/data/saved/patch/Burn Floating_Rectangles.json b/data_omnisphere/saved/patch/Burn Floating_Rectangles.json similarity index 100% rename from data/saved/patch/Burn Floating_Rectangles.json rename to data_omnisphere/saved/patch/Burn Floating_Rectangles.json diff --git a/data/saved/patch/Burn_Barrels.json b/data_omnisphere/saved/patch/Burn_Barrels.json similarity index 100% rename from data/saved/patch/Burn_Barrels.json rename to data_omnisphere/saved/patch/Burn_Barrels.json diff --git a/data/saved/patch/Burning_Blue Candles.json b/data_omnisphere/saved/patch/Burning_Blue Candles.json similarity index 100% rename from data/saved/patch/Burning_Blue Candles.json rename to data_omnisphere/saved/patch/Burning_Blue Candles.json diff --git a/data/saved/patch/Burning_Candles.json b/data_omnisphere/saved/patch/Burning_Candles.json similarity index 100% rename from data/saved/patch/Burning_Candles.json rename to data_omnisphere/saved/patch/Burning_Candles.json diff --git a/data/saved/patch/Burning_Diag Quilt.json b/data_omnisphere/saved/patch/Burning_Diag Quilt.json similarity index 100% rename from data/saved/patch/Burning_Diag Quilt.json rename to data_omnisphere/saved/patch/Burning_Diag Quilt.json diff --git a/data/saved/patch/Burning_Flower.json b/data_omnisphere/saved/patch/Burning_Flower.json similarity index 100% rename from data/saved/patch/Burning_Flower.json rename to data_omnisphere/saved/patch/Burning_Flower.json diff --git a/data/saved/patch/Burning_LR Bars.json b/data_omnisphere/saved/patch/Burning_LR Bars.json similarity index 100% rename from data/saved/patch/Burning_LR Bars.json rename to data_omnisphere/saved/patch/Burning_LR Bars.json diff --git a/data/saved/patch/Burning_LR Color Bars.json b/data_omnisphere/saved/patch/Burning_LR Color Bars.json similarity index 100% rename from data/saved/patch/Burning_LR Color Bars.json rename to data_omnisphere/saved/patch/Burning_LR Color Bars.json diff --git a/data/saved/patch/Burning_Lined Clouds.json b/data_omnisphere/saved/patch/Burning_Lined Clouds.json similarity index 100% rename from data/saved/patch/Burning_Lined Clouds.json rename to data_omnisphere/saved/patch/Burning_Lined Clouds.json diff --git a/data/saved/patch/Cartoon_Clouds.json b/data_omnisphere/saved/patch/Cartoon_Clouds.json similarity index 100% rename from data/saved/patch/Cartoon_Clouds.json rename to data_omnisphere/saved/patch/Cartoon_Clouds.json diff --git a/data/saved/patch/Circular_Inversions.json b/data_omnisphere/saved/patch/Circular_Inversions.json similarity index 100% rename from data/saved/patch/Circular_Inversions.json rename to data_omnisphere/saved/patch/Circular_Inversions.json diff --git a/data/saved/patch/Circular_Moire.json b/data_omnisphere/saved/patch/Circular_Moire.json similarity index 100% rename from data/saved/patch/Circular_Moire.json rename to data_omnisphere/saved/patch/Circular_Moire.json diff --git a/data/saved/patch/CleanFloating_Squares.json b/data_omnisphere/saved/patch/CleanFloating_Squares.json similarity index 100% rename from data/saved/patch/CleanFloating_Squares.json rename to data_omnisphere/saved/patch/CleanFloating_Squares.json diff --git a/data/saved/patch/Colorful_Circle Circus.json b/data_omnisphere/saved/patch/Colorful_Circle Circus.json similarity index 100% rename from data/saved/patch/Colorful_Circle Circus.json rename to data_omnisphere/saved/patch/Colorful_Circle Circus.json diff --git a/data/saved/patch/Concentric_Squares.json b/data_omnisphere/saved/patch/Concentric_Squares.json similarity index 100% rename from data/saved/patch/Concentric_Squares.json rename to data_omnisphere/saved/patch/Concentric_Squares.json diff --git a/data/saved/patch/Crisp Red_Amoebas.json b/data_omnisphere/saved/patch/Crisp Red_Amoebas.json similarity index 100% rename from data/saved/patch/Crisp Red_Amoebas.json rename to data_omnisphere/saved/patch/Crisp Red_Amoebas.json diff --git a/data/saved/patch/Dancing Lines_Persistent.json b/data_omnisphere/saved/patch/Dancing Lines_Persistent.json similarity index 100% rename from data/saved/patch/Dancing Lines_Persistent.json rename to data_omnisphere/saved/patch/Dancing Lines_Persistent.json diff --git a/data/saved/patch/Dancing_Aqua Lines.json b/data_omnisphere/saved/patch/Dancing_Aqua Lines.json similarity index 100% rename from data/saved/patch/Dancing_Aqua Lines.json rename to data_omnisphere/saved/patch/Dancing_Aqua Lines.json diff --git a/data/saved/patch/Dancing_Purple Lines.json b/data_omnisphere/saved/patch/Dancing_Purple Lines.json similarity index 100% rename from data/saved/patch/Dancing_Purple Lines.json rename to data_omnisphere/saved/patch/Dancing_Purple Lines.json diff --git a/data/saved/patch/Dancing_Solo Line.json b/data_omnisphere/saved/patch/Dancing_Solo Line.json similarity index 100% rename from data/saved/patch/Dancing_Solo Line.json rename to data_omnisphere/saved/patch/Dancing_Solo Line.json diff --git a/data/saved/patch/Decimated Square_Outlines.json b/data_omnisphere/saved/patch/Decimated Square_Outlines.json similarity index 100% rename from data/saved/patch/Decimated Square_Outlines.json rename to data_omnisphere/saved/patch/Decimated Square_Outlines.json diff --git a/data/saved/patch/Diagonal_Glow.json b/data_omnisphere/saved/patch/Diagonal_Glow.json similarity index 100% rename from data/saved/patch/Diagonal_Glow.json rename to data_omnisphere/saved/patch/Diagonal_Glow.json diff --git a/data/saved/patch/Diagonal_Mirror.json b/data_omnisphere/saved/patch/Diagonal_Mirror.json similarity index 100% rename from data/saved/patch/Diagonal_Mirror.json rename to data_omnisphere/saved/patch/Diagonal_Mirror.json diff --git a/data/saved/patch/Diagonal_Moire.json b/data_omnisphere/saved/patch/Diagonal_Moire.json similarity index 100% rename from data/saved/patch/Diagonal_Moire.json rename to data_omnisphere/saved/patch/Diagonal_Moire.json diff --git a/data/saved/patch/Eclipse_Explosions.json b/data_omnisphere/saved/patch/Eclipse_Explosions.json similarity index 100% rename from data/saved/patch/Eclipse_Explosions.json rename to data_omnisphere/saved/patch/Eclipse_Explosions.json diff --git a/data/saved/patch/ElectricBlue_Puddles.json b/data_omnisphere/saved/patch/ElectricBlue_Puddles.json similarity index 100% rename from data/saved/patch/ElectricBlue_Puddles.json rename to data_omnisphere/saved/patch/ElectricBlue_Puddles.json diff --git a/data/saved/patch/ElectricLog_Explosion.json b/data_omnisphere/saved/patch/ElectricLog_Explosion.json similarity index 100% rename from data/saved/patch/ElectricLog_Explosion.json rename to data_omnisphere/saved/patch/ElectricLog_Explosion.json diff --git a/data/saved/patch/Elevation_Bars.json b/data_omnisphere/saved/patch/Elevation_Bars.json similarity index 100% rename from data/saved/patch/Elevation_Bars.json rename to data_omnisphere/saved/patch/Elevation_Bars.json diff --git a/data/saved/patch/Extreme Purple_Kaleidoscope.json b/data_omnisphere/saved/patch/Extreme Purple_Kaleidoscope.json similarity index 100% rename from data/saved/patch/Extreme Purple_Kaleidoscope.json rename to data_omnisphere/saved/patch/Extreme Purple_Kaleidoscope.json diff --git a/data/saved/patch/FFF.json b/data_omnisphere/saved/patch/FFF.json similarity index 100% rename from data/saved/patch/FFF.json rename to data_omnisphere/saved/patch/FFF.json diff --git a/data/saved/patch/Falling_Burn Squares.json b/data_omnisphere/saved/patch/Falling_Burn Squares.json similarity index 100% rename from data/saved/patch/Falling_Burn Squares.json rename to data_omnisphere/saved/patch/Falling_Burn Squares.json diff --git a/data/saved/patch/Falling_Triangles.json b/data_omnisphere/saved/patch/Falling_Triangles.json similarity index 100% rename from data/saved/patch/Falling_Triangles.json rename to data_omnisphere/saved/patch/Falling_Triangles.json diff --git a/data/saved/patch/Fire_Borealis.json b/data_omnisphere/saved/patch/Fire_Borealis.json similarity index 100% rename from data/saved/patch/Fire_Borealis.json rename to data_omnisphere/saved/patch/Fire_Borealis.json diff --git a/data/saved/patch/Floating_Elevations.json b/data_omnisphere/saved/patch/Floating_Elevations.json similarity index 100% rename from data/saved/patch/Floating_Elevations.json rename to data_omnisphere/saved/patch/Floating_Elevations.json diff --git a/data/saved/patch/Floating_GuitarSquares.json b/data_omnisphere/saved/patch/Floating_GuitarSquares.json similarity index 100% rename from data/saved/patch/Floating_GuitarSquares.json rename to data_omnisphere/saved/patch/Floating_GuitarSquares.json diff --git a/data/saved/patch/Floating_Rectangles.json b/data_omnisphere/saved/patch/Floating_Rectangles.json similarity index 100% rename from data/saved/patch/Floating_Rectangles.json rename to data_omnisphere/saved/patch/Floating_Rectangles.json diff --git a/data/saved/patch/Floating_WideTriangles.json b/data_omnisphere/saved/patch/Floating_WideTriangles.json similarity index 100% rename from data/saved/patch/Floating_WideTriangles.json rename to data_omnisphere/saved/patch/Floating_WideTriangles.json diff --git a/data/saved/patch/FourSided_LayerCake.json b/data_omnisphere/saved/patch/FourSided_LayerCake.json similarity index 100% rename from data/saved/patch/FourSided_LayerCake.json rename to data_omnisphere/saved/patch/FourSided_LayerCake.json diff --git a/data/saved/patch/Fractured_Elevations.json b/data_omnisphere/saved/patch/Fractured_Elevations.json similarity index 100% rename from data/saved/patch/Fractured_Elevations.json rename to data_omnisphere/saved/patch/Fractured_Elevations.json diff --git a/data/saved/patch/Frantic_Triangles.json b/data_omnisphere/saved/patch/Frantic_Triangles.json similarity index 100% rename from data/saved/patch/Frantic_Triangles.json rename to data_omnisphere/saved/patch/Frantic_Triangles.json diff --git a/data/saved/patch/Geographic_Elevations.json b/data_omnisphere/saved/patch/Geographic_Elevations.json similarity index 100% rename from data/saved/patch/Geographic_Elevations.json rename to data_omnisphere/saved/patch/Geographic_Elevations.json diff --git a/data/saved/patch/Ghost_Shape.json b/data_omnisphere/saved/patch/Ghost_Shape.json similarity index 100% rename from data/saved/patch/Ghost_Shape.json rename to data_omnisphere/saved/patch/Ghost_Shape.json diff --git a/data/saved/patch/Glowing_Diamond.json b/data_omnisphere/saved/patch/Glowing_Diamond.json similarity index 100% rename from data/saved/patch/Glowing_Diamond.json rename to data_omnisphere/saved/patch/Glowing_Diamond.json diff --git a/data/saved/patch/Glowy_Triangles.json b/data_omnisphere/saved/patch/Glowy_Triangles.json similarity index 100% rename from data/saved/patch/Glowy_Triangles.json rename to data_omnisphere/saved/patch/Glowy_Triangles.json diff --git a/data/saved/patch/Graceful_Growers.json b/data_omnisphere/saved/patch/Graceful_Growers.json similarity index 100% rename from data/saved/patch/Graceful_Growers.json rename to data_omnisphere/saved/patch/Graceful_Growers.json diff --git a/data/saved/patch/Gradient_Triangles.json b/data_omnisphere/saved/patch/Gradient_Triangles.json similarity index 100% rename from data/saved/patch/Gradient_Triangles.json rename to data_omnisphere/saved/patch/Gradient_Triangles.json diff --git a/data/saved/patch/Grainy_Elevation.json b/data_omnisphere/saved/patch/Grainy_Elevation.json similarity index 100% rename from data/saved/patch/Grainy_Elevation.json rename to data_omnisphere/saved/patch/Grainy_Elevation.json diff --git a/data/saved/patch/Green Kaleid_Tunnel Vision.json b/data_omnisphere/saved/patch/Green Kaleid_Tunnel Vision.json similarity index 100% rename from data/saved/patch/Green Kaleid_Tunnel Vision.json rename to data_omnisphere/saved/patch/Green Kaleid_Tunnel Vision.json diff --git a/data/saved/patch/Green Line_Quad Kaleid.json b/data_omnisphere/saved/patch/Green Line_Quad Kaleid.json similarity index 100% rename from data/saved/patch/Green Line_Quad Kaleid.json rename to data_omnisphere/saved/patch/Green Line_Quad Kaleid.json diff --git a/data/saved/patch/Green Magic_Kaleidoscope.json b/data_omnisphere/saved/patch/Green Magic_Kaleidoscope.json similarity index 100% rename from data/saved/patch/Green Magic_Kaleidoscope.json rename to data_omnisphere/saved/patch/Green Magic_Kaleidoscope.json diff --git a/data/saved/patch/GreenGlobule_Shadows.json b/data_omnisphere/saved/patch/GreenGlobule_Shadows.json similarity index 100% rename from data/saved/patch/GreenGlobule_Shadows.json rename to data_omnisphere/saved/patch/GreenGlobule_Shadows.json diff --git a/data/saved/patch/Green_Hang Drum.json b/data_omnisphere/saved/patch/Green_Hang Drum.json similarity index 100% rename from data/saved/patch/Green_Hang Drum.json rename to data_omnisphere/saved/patch/Green_Hang Drum.json diff --git a/data/saved/patch/Hang Drum_Squares.json b/data_omnisphere/saved/patch/Hang Drum_Squares.json similarity index 100% rename from data/saved/patch/Hang Drum_Squares.json rename to data_omnisphere/saved/patch/Hang Drum_Squares.json diff --git a/data/saved/patch/Heart Shaped_Moire.json b/data_omnisphere/saved/patch/Heart Shaped_Moire.json similarity index 100% rename from data/saved/patch/Heart Shaped_Moire.json rename to data_omnisphere/saved/patch/Heart Shaped_Moire.json diff --git a/data/saved/patch/Horizontal_Shadow Clouds.json b/data_omnisphere/saved/patch/Horizontal_Shadow Clouds.json similarity index 100% rename from data/saved/patch/Horizontal_Shadow Clouds.json rename to data_omnisphere/saved/patch/Horizontal_Shadow Clouds.json diff --git a/data/saved/patch/Intricate_GreenWaves.json b/data_omnisphere/saved/patch/Intricate_GreenWaves.json similarity index 100% rename from data/saved/patch/Intricate_GreenWaves.json rename to data_omnisphere/saved/patch/Intricate_GreenWaves.json diff --git a/data/saved/patch/Layered Swirl_Lines.json b/data_omnisphere/saved/patch/Layered Swirl_Lines.json similarity index 100% rename from data/saved/patch/Layered Swirl_Lines.json rename to data_omnisphere/saved/patch/Layered Swirl_Lines.json diff --git a/data/saved/patch/Layered Swirl_Space.json b/data_omnisphere/saved/patch/Layered Swirl_Space.json similarity index 100% rename from data/saved/patch/Layered Swirl_Space.json rename to data_omnisphere/saved/patch/Layered Swirl_Space.json diff --git a/data/saved/patch/Layered Swirl_Space2.json b/data_omnisphere/saved/patch/Layered Swirl_Space2.json similarity index 100% rename from data/saved/patch/Layered Swirl_Space2.json rename to data_omnisphere/saved/patch/Layered Swirl_Space2.json diff --git a/data/saved/patch/Layered_Diamonds.json b/data_omnisphere/saved/patch/Layered_Diamonds.json similarity index 100% rename from data/saved/patch/Layered_Diamonds.json rename to data_omnisphere/saved/patch/Layered_Diamonds.json diff --git a/data/saved/patch/Lifelike_Lines.json b/data_omnisphere/saved/patch/Lifelike_Lines.json similarity index 100% rename from data/saved/patch/Lifelike_Lines.json rename to data_omnisphere/saved/patch/Lifelike_Lines.json diff --git a/data/saved/patch/Melted Orange_Full Kaleid.json b/data_omnisphere/saved/patch/Melted Orange_Full Kaleid.json similarity index 100% rename from data/saved/patch/Melted Orange_Full Kaleid.json rename to data_omnisphere/saved/patch/Melted Orange_Full Kaleid.json diff --git a/data/saved/patch/Moire_QuadLines.json b/data_omnisphere/saved/patch/Moire_QuadLines.json similarity index 100% rename from data/saved/patch/Moire_QuadLines.json rename to data_omnisphere/saved/patch/Moire_QuadLines.json diff --git a/data/saved/patch/Mysterious_Lines.json b/data_omnisphere/saved/patch/Mysterious_Lines.json similarity index 100% rename from data/saved/patch/Mysterious_Lines.json rename to data_omnisphere/saved/patch/Mysterious_Lines.json diff --git a/data/saved/patch/Orange_Ripple.json b/data_omnisphere/saved/patch/Orange_Ripple.json similarity index 100% rename from data/saved/patch/Orange_Ripple.json rename to data_omnisphere/saved/patch/Orange_Ripple.json diff --git a/data/saved/patch/Orbiting_Orange.json b/data_omnisphere/saved/patch/Orbiting_Orange.json similarity index 100% rename from data/saved/patch/Orbiting_Orange.json rename to data_omnisphere/saved/patch/Orbiting_Orange.json diff --git a/data/saved/patch/Pastel Bursts_Melting Away.json b/data_omnisphere/saved/patch/Pastel Bursts_Melting Away.json similarity index 100% rename from data/saved/patch/Pastel Bursts_Melting Away.json rename to data_omnisphere/saved/patch/Pastel Bursts_Melting Away.json diff --git a/data/saved/patch/Pixelated_Burn Squares.json b/data_omnisphere/saved/patch/Pixelated_Burn Squares.json similarity index 100% rename from data/saved/patch/Pixelated_Burn Squares.json rename to data_omnisphere/saved/patch/Pixelated_Burn Squares.json diff --git a/data/saved/patch/Psychedelic_GraniteLayers.json b/data_omnisphere/saved/patch/Psychedelic_GraniteLayers.json similarity index 100% rename from data/saved/patch/Psychedelic_GraniteLayers.json rename to data_omnisphere/saved/patch/Psychedelic_GraniteLayers.json diff --git a/data/saved/patch/Psycho_Plaid.json b/data_omnisphere/saved/patch/Psycho_Plaid.json similarity index 100% rename from data/saved/patch/Psycho_Plaid.json rename to data_omnisphere/saved/patch/Psycho_Plaid.json diff --git a/data/saved/patch/Pure White_Bursts.json b/data_omnisphere/saved/patch/Pure White_Bursts.json similarity index 100% rename from data/saved/patch/Pure White_Bursts.json rename to data_omnisphere/saved/patch/Pure White_Bursts.json diff --git a/data/saved/patch/Purple Amoeba_Explosions.json b/data_omnisphere/saved/patch/Purple Amoeba_Explosions.json similarity index 100% rename from data/saved/patch/Purple Amoeba_Explosions.json rename to data_omnisphere/saved/patch/Purple Amoeba_Explosions.json diff --git a/data/saved/patch/Puzzle_Shapes.json b/data_omnisphere/saved/patch/Puzzle_Shapes.json similarity index 100% rename from data/saved/patch/Puzzle_Shapes.json rename to data_omnisphere/saved/patch/Puzzle_Shapes.json diff --git a/data/saved/patch/Quad Lines_Collapsing.json b/data_omnisphere/saved/patch/Quad Lines_Collapsing.json similarity index 100% rename from data/saved/patch/Quad Lines_Collapsing.json rename to data_omnisphere/saved/patch/Quad Lines_Collapsing.json diff --git a/data/saved/patch/Quad_Spirograph.json b/data_omnisphere/saved/patch/Quad_Spirograph.json similarity index 100% rename from data/saved/patch/Quad_Spirograph.json rename to data_omnisphere/saved/patch/Quad_Spirograph.json diff --git a/data/saved/patch/Quadrants_Of Orange.json b/data_omnisphere/saved/patch/Quadrants_Of Orange.json similarity index 100% rename from data/saved/patch/Quadrants_Of Orange.json rename to data_omnisphere/saved/patch/Quadrants_Of Orange.json diff --git a/data/saved/patch/Quadro_WebMotion.json b/data_omnisphere/saved/patch/Quadro_WebMotion.json similarity index 100% rename from data/saved/patch/Quadro_WebMotion.json rename to data_omnisphere/saved/patch/Quadro_WebMotion.json diff --git a/data/saved/patch/Quadrophonic_Orange.json b/data_omnisphere/saved/patch/Quadrophonic_Orange.json similarity index 100% rename from data/saved/patch/Quadrophonic_Orange.json rename to data_omnisphere/saved/patch/Quadrophonic_Orange.json diff --git a/data/saved/patch/Quick Scat_Circles.json b/data_omnisphere/saved/patch/Quick Scat_Circles.json similarity index 100% rename from data/saved/patch/Quick Scat_Circles.json rename to data_omnisphere/saved/patch/Quick Scat_Circles.json diff --git a/data/saved/patch/Quick Scat_Purple.json b/data_omnisphere/saved/patch/Quick Scat_Purple.json similarity index 100% rename from data/saved/patch/Quick Scat_Purple.json rename to data_omnisphere/saved/patch/Quick Scat_Purple.json diff --git a/data/saved/patch/Rainbow_AmoebaLayers.json b/data_omnisphere/saved/patch/Rainbow_AmoebaLayers.json similarity index 100% rename from data/saved/patch/Rainbow_AmoebaLayers.json rename to data_omnisphere/saved/patch/Rainbow_AmoebaLayers.json diff --git a/data/saved/patch/Rainbow_Fuzz Balls.json b/data_omnisphere/saved/patch/Rainbow_Fuzz Balls.json similarity index 100% rename from data/saved/patch/Rainbow_Fuzz Balls.json rename to data_omnisphere/saved/patch/Rainbow_Fuzz Balls.json diff --git a/data/saved/patch/Rectangular_Blur.json b/data_omnisphere/saved/patch/Rectangular_Blur.json similarity index 100% rename from data/saved/patch/Rectangular_Blur.json rename to data_omnisphere/saved/patch/Rectangular_Blur.json diff --git a/data/saved/patch/Rectangular_Color Trails.json b/data_omnisphere/saved/patch/Rectangular_Color Trails.json similarity index 100% rename from data/saved/patch/Rectangular_Color Trails.json rename to data_omnisphere/saved/patch/Rectangular_Color Trails.json diff --git a/data/saved/patch/Rectangular_Inversions.json b/data_omnisphere/saved/patch/Rectangular_Inversions.json similarity index 100% rename from data/saved/patch/Rectangular_Inversions.json rename to data_omnisphere/saved/patch/Rectangular_Inversions.json diff --git a/data/saved/patch/Rectangular_Rain.json b/data_omnisphere/saved/patch/Rectangular_Rain.json similarity index 100% rename from data/saved/patch/Rectangular_Rain.json rename to data_omnisphere/saved/patch/Rectangular_Rain.json diff --git a/data/saved/patch/Red Network_Of Neurons.json b/data_omnisphere/saved/patch/Red Network_Of Neurons.json similarity index 100% rename from data/saved/patch/Red Network_Of Neurons.json rename to data_omnisphere/saved/patch/Red Network_Of Neurons.json diff --git a/data/saved/patch/Red Outline_Amoebas.json b/data_omnisphere/saved/patch/Red Outline_Amoebas.json similarity index 100% rename from data/saved/patch/Red Outline_Amoebas.json rename to data_omnisphere/saved/patch/Red Outline_Amoebas.json diff --git a/data/saved/patch/Red Purple_Amoeba Chirps.json b/data_omnisphere/saved/patch/Red Purple_Amoeba Chirps.json similarity index 100% rename from data/saved/patch/Red Purple_Amoeba Chirps.json rename to data_omnisphere/saved/patch/Red Purple_Amoeba Chirps.json diff --git a/data/saved/patch/Shifty_Fire Lines.json b/data_omnisphere/saved/patch/Shifty_Fire Lines.json similarity index 100% rename from data/saved/patch/Shifty_Fire Lines.json rename to data_omnisphere/saved/patch/Shifty_Fire Lines.json diff --git a/data/saved/patch/Sideways_Inversions.json b/data_omnisphere/saved/patch/Sideways_Inversions.json similarity index 100% rename from data/saved/patch/Sideways_Inversions.json rename to data_omnisphere/saved/patch/Sideways_Inversions.json diff --git a/data/saved/patch/Simply_Circles.json b/data_omnisphere/saved/patch/Simply_Circles.json similarity index 100% rename from data/saved/patch/Simply_Circles.json rename to data_omnisphere/saved/patch/Simply_Circles.json diff --git a/data/saved/patch/SoftPulse_SmallCircles.json b/data_omnisphere/saved/patch/SoftPulse_SmallCircles.json similarity index 100% rename from data/saved/patch/SoftPulse_SmallCircles.json rename to data_omnisphere/saved/patch/SoftPulse_SmallCircles.json diff --git a/data/saved/patch/Speckled_Floaters.json b/data_omnisphere/saved/patch/Speckled_Floaters.json similarity index 100% rename from data/saved/patch/Speckled_Floaters.json rename to data_omnisphere/saved/patch/Speckled_Floaters.json diff --git a/data/saved/patch/Square_Elevations.json b/data_omnisphere/saved/patch/Square_Elevations.json similarity index 100% rename from data/saved/patch/Square_Elevations.json rename to data_omnisphere/saved/patch/Square_Elevations.json diff --git a/data/saved/patch/Square_Mallets.json b/data_omnisphere/saved/patch/Square_Mallets.json similarity index 100% rename from data/saved/patch/Square_Mallets.json rename to data_omnisphere/saved/patch/Square_Mallets.json diff --git a/data/saved/patch/Square_Moire.json b/data_omnisphere/saved/patch/Square_Moire.json similarity index 100% rename from data/saved/patch/Square_Moire.json rename to data_omnisphere/saved/patch/Square_Moire.json diff --git a/data/saved/patch/Swimming_In Ovals.json b/data_omnisphere/saved/patch/Swimming_In Ovals.json similarity index 100% rename from data/saved/patch/Swimming_In Ovals.json rename to data_omnisphere/saved/patch/Swimming_In Ovals.json diff --git a/data/saved/patch/Swirling Line_Shadows.json b/data_omnisphere/saved/patch/Swirling Line_Shadows.json similarity index 100% rename from data/saved/patch/Swirling Line_Shadows.json rename to data_omnisphere/saved/patch/Swirling Line_Shadows.json diff --git a/data/saved/patch/Swirly_Spirograph.json b/data_omnisphere/saved/patch/Swirly_Spirograph.json similarity index 100% rename from data/saved/patch/Swirly_Spirograph.json rename to data_omnisphere/saved/patch/Swirly_Spirograph.json diff --git a/data/saved/patch/Transient_Triangles.json b/data_omnisphere/saved/patch/Transient_Triangles.json similarity index 100% rename from data/saved/patch/Transient_Triangles.json rename to data_omnisphere/saved/patch/Transient_Triangles.json diff --git a/data/saved/patch/Triangular_Inversions.json b/data_omnisphere/saved/patch/Triangular_Inversions.json similarity index 100% rename from data/saved/patch/Triangular_Inversions.json rename to data_omnisphere/saved/patch/Triangular_Inversions.json diff --git a/data/saved/patch/Tridiagonal_Moire.json b/data_omnisphere/saved/patch/Tridiagonal_Moire.json similarity index 100% rename from data/saved/patch/Tridiagonal_Moire.json rename to data_omnisphere/saved/patch/Tridiagonal_Moire.json diff --git a/data/saved/patch/TwirlMatic_Floaters.json b/data_omnisphere/saved/patch/TwirlMatic_Floaters.json similarity index 100% rename from data/saved/patch/TwirlMatic_Floaters.json rename to data_omnisphere/saved/patch/TwirlMatic_Floaters.json diff --git a/data/saved/patch/Vertical_Color Curtain.json b/data_omnisphere/saved/patch/Vertical_Color Curtain.json similarity index 100% rename from data/saved/patch/Vertical_Color Curtain.json rename to data_omnisphere/saved/patch/Vertical_Color Curtain.json diff --git a/data/saved/patch/White Ghosts_Left Right.json b/data_omnisphere/saved/patch/White Ghosts_Left Right.json similarity index 100% rename from data/saved/patch/White Ghosts_Left Right.json rename to data_omnisphere/saved/patch/White Ghosts_Left Right.json diff --git a/data/saved/patch/WhiteBall_Cascade.json b/data_omnisphere/saved/patch/WhiteBall_Cascade.json similarity index 100% rename from data/saved/patch/WhiteBall_Cascade.json rename to data_omnisphere/saved/patch/WhiteBall_Cascade.json diff --git a/data/saved/patch/White_Ghosts.json b/data_omnisphere/saved/patch/White_Ghosts.json similarity index 100% rename from data/saved/patch/White_Ghosts.json rename to data_omnisphere/saved/patch/White_Ghosts.json diff --git a/data/saved/patch/White_GhostsUpDown.json b/data_omnisphere/saved/patch/White_GhostsUpDown.json similarity index 100% rename from data/saved/patch/White_GhostsUpDown.json rename to data_omnisphere/saved/patch/White_GhostsUpDown.json diff --git a/data/saved/patch/Wrightly_Red.json b/data_omnisphere/saved/patch/Wrightly_Red.json similarity index 100% rename from data/saved/patch/Wrightly_Red.json rename to data_omnisphere/saved/patch/Wrightly_Red.json diff --git a/data/saved/patch/Yellow Green_Bass Bursts.json b/data_omnisphere/saved/patch/Yellow Green_Bass Bursts.json similarity index 100% rename from data/saved/patch/Yellow Green_Bass Bursts.json rename to data_omnisphere/saved/patch/Yellow Green_Bass Bursts.json diff --git a/data/saved/patch/YellowGreen_PasDeDeux.json b/data_omnisphere/saved/patch/YellowGreen_PasDeDeux.json similarity index 100% rename from data/saved/patch/YellowGreen_PasDeDeux.json rename to data_omnisphere/saved/patch/YellowGreen_PasDeDeux.json diff --git a/data/saved/patch/e.bat b/data_omnisphere/saved/patch/e.bat similarity index 100% rename from data/saved/patch/e.bat rename to data_omnisphere/saved/patch/e.bat diff --git a/data/saved/patch/migrate.bat b/data_omnisphere/saved/patch/migrate.bat similarity index 100% rename from data/saved/patch/migrate.bat rename to data_omnisphere/saved/patch/migrate.bat diff --git a/data/saved/patch/migrateall.bat b/data_omnisphere/saved/patch/migrateall.bat similarity index 100% rename from data/saved/patch/migrateall.bat rename to data_omnisphere/saved/patch/migrateall.bat diff --git a/data/saved/quad/AAmbient1.json b/data_omnisphere/saved/quad/AAmbient1.json similarity index 100% rename from data/saved/quad/AAmbient1.json rename to data_omnisphere/saved/quad/AAmbient1.json diff --git a/data/saved/quad/AAmbient_Perk.json b/data_omnisphere/saved/quad/AAmbient_Perk.json similarity index 100% rename from data/saved/quad/AAmbient_Perk.json rename to data_omnisphere/saved/quad/AAmbient_Perk.json diff --git a/data/saved/quad/AAmbient_Sparse.json b/data_omnisphere/saved/quad/AAmbient_Sparse.json similarity index 100% rename from data/saved/quad/AAmbient_Sparse.json rename to data_omnisphere/saved/quad/AAmbient_Sparse.json diff --git a/data/saved/quad/All Out_Kaleid.json b/data_omnisphere/saved/quad/All Out_Kaleid.json similarity index 100% rename from data/saved/quad/All Out_Kaleid.json rename to data_omnisphere/saved/quad/All Out_Kaleid.json diff --git a/data/saved/quad/All Scat_Color Mix.json b/data_omnisphere/saved/quad/All Scat_Color Mix.json similarity index 100% rename from data/saved/quad/All Scat_Color Mix.json rename to data_omnisphere/saved/quad/All Scat_Color Mix.json diff --git a/data/saved/quad/All Scat_Color Trails.json b/data_omnisphere/saved/quad/All Scat_Color Trails.json similarity index 100% rename from data/saved/quad/All Scat_Color Trails.json rename to data_omnisphere/saved/quad/All Scat_Color Trails.json diff --git a/data/saved/quad/All_Moire.json b/data_omnisphere/saved/quad/All_Moire.json similarity index 100% rename from data/saved/quad/All_Moire.json rename to data_omnisphere/saved/quad/All_Moire.json diff --git a/data/saved/quad/Alternate_Dimensions.json b/data_omnisphere/saved/quad/Alternate_Dimensions.json similarity index 100% rename from data/saved/quad/Alternate_Dimensions.json rename to data_omnisphere/saved/quad/Alternate_Dimensions.json diff --git a/data/saved/quad/Blue Purple_Cartoon Clouds.json b/data_omnisphere/saved/quad/Blue Purple_Cartoon Clouds.json similarity index 100% rename from data/saved/quad/Blue Purple_Cartoon Clouds.json rename to data_omnisphere/saved/quad/Blue Purple_Cartoon Clouds.json diff --git a/data/saved/quad/Colored_Echoes.json b/data_omnisphere/saved/quad/Colored_Echoes.json similarity index 100% rename from data/saved/quad/Colored_Echoes.json rename to data_omnisphere/saved/quad/Colored_Echoes.json diff --git a/data/saved/quad/Diagonal_Fantasy.json b/data_omnisphere/saved/quad/Diagonal_Fantasy.json similarity index 100% rename from data/saved/quad/Diagonal_Fantasy.json rename to data_omnisphere/saved/quad/Diagonal_Fantasy.json diff --git a/data/saved/quad/Endless_Twirls.json b/data_omnisphere/saved/quad/Endless_Twirls.json similarity index 100% rename from data/saved/quad/Endless_Twirls.json rename to data_omnisphere/saved/quad/Endless_Twirls.json diff --git a/data/saved/quad/Filagree_Dance.json b/data_omnisphere/saved/quad/Filagree_Dance.json similarity index 100% rename from data/saved/quad/Filagree_Dance.json rename to data_omnisphere/saved/quad/Filagree_Dance.json diff --git a/data/saved/quad/Fluorescent_Borealis.json b/data_omnisphere/saved/quad/Fluorescent_Borealis.json similarity index 100% rename from data/saved/quad/Fluorescent_Borealis.json rename to data_omnisphere/saved/quad/Fluorescent_Borealis.json diff --git a/data/saved/quad/Ghost Note_All Drums.json b/data_omnisphere/saved/quad/Ghost Note_All Drums.json similarity index 100% rename from data/saved/quad/Ghost Note_All Drums.json rename to data_omnisphere/saved/quad/Ghost Note_All Drums.json diff --git a/data/saved/quad/Ghostly_Shapes.json b/data_omnisphere/saved/quad/Ghostly_Shapes.json similarity index 100% rename from data/saved/quad/Ghostly_Shapes.json rename to data_omnisphere/saved/quad/Ghostly_Shapes.json diff --git a/data/saved/quad/Infinite_Layers.json b/data_omnisphere/saved/quad/Infinite_Layers.json similarity index 100% rename from data/saved/quad/Infinite_Layers.json rename to data_omnisphere/saved/quad/Infinite_Layers.json diff --git a/data/saved/quad/Jigsaw_Puzzles.json b/data_omnisphere/saved/quad/Jigsaw_Puzzles.json similarity index 100% rename from data/saved/quad/Jigsaw_Puzzles.json rename to data_omnisphere/saved/quad/Jigsaw_Puzzles.json diff --git a/data/saved/quad/Kaleidoscopes_Forever.json b/data_omnisphere/saved/quad/Kaleidoscopes_Forever.json similarity index 100% rename from data/saved/quad/Kaleidoscopes_Forever.json rename to data_omnisphere/saved/quad/Kaleidoscopes_Forever.json diff --git a/data/saved/quad/Layered_Elevations.json b/data_omnisphere/saved/quad/Layered_Elevations.json similarity index 100% rename from data/saved/quad/Layered_Elevations.json rename to data_omnisphere/saved/quad/Layered_Elevations.json diff --git a/data/saved/quad/Linear_Dancing.json b/data_omnisphere/saved/quad/Linear_Dancing.json similarity index 100% rename from data/saved/quad/Linear_Dancing.json rename to data_omnisphere/saved/quad/Linear_Dancing.json diff --git a/data/saved/quad/Perky_Clouds.json b/data_omnisphere/saved/quad/Perky_Clouds.json similarity index 100% rename from data/saved/quad/Perky_Clouds.json rename to data_omnisphere/saved/quad/Perky_Clouds.json diff --git a/data/saved/quad/Perky_McPerkFace.json b/data_omnisphere/saved/quad/Perky_McPerkFace.json similarity index 100% rename from data/saved/quad/Perky_McPerkFace.json rename to data_omnisphere/saved/quad/Perky_McPerkFace.json diff --git a/data/saved/quad/Planetary_Layers.json b/data_omnisphere/saved/quad/Planetary_Layers.json similarity index 100% rename from data/saved/quad/Planetary_Layers.json rename to data_omnisphere/saved/quad/Planetary_Layers.json diff --git a/data/saved/quad/Pretty_Pulses.json b/data_omnisphere/saved/quad/Pretty_Pulses.json similarity index 100% rename from data/saved/quad/Pretty_Pulses.json rename to data_omnisphere/saved/quad/Pretty_Pulses.json diff --git a/data/saved/quad/Psychonaut_Outlines.json b/data_omnisphere/saved/quad/Psychonaut_Outlines.json similarity index 100% rename from data/saved/quad/Psychonaut_Outlines.json rename to data_omnisphere/saved/quad/Psychonaut_Outlines.json diff --git a/data/saved/quad/Psychonaut_Solids.json b/data_omnisphere/saved/quad/Psychonaut_Solids.json similarity index 100% rename from data/saved/quad/Psychonaut_Solids.json rename to data_omnisphere/saved/quad/Psychonaut_Solids.json diff --git a/data/saved/quad/Quick Scat_Circles.json b/data_omnisphere/saved/quad/Quick Scat_Circles.json similarity index 100% rename from data/saved/quad/Quick Scat_Circles.json rename to data_omnisphere/saved/quad/Quick Scat_Circles.json diff --git a/data/saved/quad/Smokey_Trails.json b/data_omnisphere/saved/quad/Smokey_Trails.json similarity index 100% rename from data/saved/quad/Smokey_Trails.json rename to data_omnisphere/saved/quad/Smokey_Trails.json diff --git a/data/saved/quad/Spiral Moire_Universe.json b/data_omnisphere/saved/quad/Spiral Moire_Universe.json similarity index 100% rename from data/saved/quad/Spiral Moire_Universe.json rename to data_omnisphere/saved/quad/Spiral Moire_Universe.json diff --git a/data/saved/quad/Too Many_Triangles.json b/data_omnisphere/saved/quad/Too Many_Triangles.json similarity index 100% rename from data/saved/quad/Too Many_Triangles.json rename to data_omnisphere/saved/quad/Too Many_Triangles.json diff --git a/data/saved/quad/Vocal_Linescape.json b/data_omnisphere/saved/quad/Vocal_Linescape.json similarity index 100% rename from data/saved/quad/Vocal_Linescape.json rename to data_omnisphere/saved/quad/Vocal_Linescape.json diff --git a/data/saved/quad/World Wide_Webs.json b/data_omnisphere/saved/quad/World Wide_Webs.json similarity index 100% rename from data/saved/quad/World Wide_Webs.json rename to data_omnisphere/saved/quad/World Wide_Webs.json diff --git a/data/saved/quad/{(!) Compliment_Tree Colors.json b/data_omnisphere/saved/quad/{(!) Compliment_Tree Colors.json similarity index 100% rename from data/saved/quad/{(!) Compliment_Tree Colors.json rename to data_omnisphere/saved/quad/{(!) Compliment_Tree Colors.json diff --git a/data/saved/quad/{(!) Cosmolgcl_Constant.json b/data_omnisphere/saved/quad/{(!) Cosmolgcl_Constant.json similarity index 100% rename from data/saved/quad/{(!) Cosmolgcl_Constant.json rename to data_omnisphere/saved/quad/{(!) Cosmolgcl_Constant.json diff --git a/data/saved/quad/{(!) East West_North South.json b/data_omnisphere/saved/quad/{(!) East West_North South.json similarity index 100% rename from data/saved/quad/{(!) East West_North South.json rename to data_omnisphere/saved/quad/{(!) East West_North South.json diff --git a/data/saved/quad/{(!) I Can See_Thru Time.json b/data_omnisphere/saved/quad/{(!) I Can See_Thru Time.json similarity index 100% rename from data/saved/quad/{(!) I Can See_Thru Time.json rename to data_omnisphere/saved/quad/{(!) I Can See_Thru Time.json diff --git a/data/saved/quad/{(!) Ready_Player Four.json b/data_omnisphere/saved/quad/{(!) Ready_Player Four.json similarity index 100% rename from data/saved/quad/{(!) Ready_Player Four.json rename to data_omnisphere/saved/quad/{(!) Ready_Player Four.json diff --git a/data/saved/quad/{(!) Simple_Things.json b/data_omnisphere/saved/quad/{(!) Simple_Things.json similarity index 100% rename from data/saved/quad/{(!) Simple_Things.json rename to data_omnisphere/saved/quad/{(!) Simple_Things.json diff --git a/data/saved/quad/{(!) Super_Natural.json b/data_omnisphere/saved/quad/{(!) Super_Natural.json similarity index 100% rename from data/saved/quad/{(!) Super_Natural.json rename to data_omnisphere/saved/quad/{(!) Super_Natural.json diff --git a/data/saved/quad/{(!) Traveling_WO Moving.json b/data_omnisphere/saved/quad/{(!) Traveling_WO Moving.json similarity index 100% rename from data/saved/quad/{(!) Traveling_WO Moving.json rename to data_omnisphere/saved/quad/{(!) Traveling_WO Moving.json diff --git a/data/saved/quad/{(!) Uncarved_Block.json b/data_omnisphere/saved/quad/{(!) Uncarved_Block.json similarity index 100% rename from data/saved/quad/{(!) Uncarved_Block.json rename to data_omnisphere/saved/quad/{(!) Uncarved_Block.json diff --git a/data/saved/quad/{(!) Unstable_Ability.json b/data_omnisphere/saved/quad/{(!) Unstable_Ability.json similarity index 100% rename from data/saved/quad/{(!) Unstable_Ability.json rename to data_omnisphere/saved/quad/{(!) Unstable_Ability.json diff --git a/data/saved/quad/{(!) Voltrons_Garage.json b/data_omnisphere/saved/quad/{(!) Voltrons_Garage.json similarity index 100% rename from data/saved/quad/{(!) Voltrons_Garage.json rename to data_omnisphere/saved/quad/{(!) Voltrons_Garage.json diff --git a/data/saved/quad/{(!) Worm_Hole.json b/data_omnisphere/saved/quad/{(!) Worm_Hole.json similarity index 100% rename from data/saved/quad/{(!) Worm_Hole.json rename to data_omnisphere/saved/quad/{(!) Worm_Hole.json diff --git a/data/saved/quad/{All Drums 2_Squares.json b/data_omnisphere/saved/quad/{All Drums 2_Squares.json similarity index 100% rename from data/saved/quad/{All Drums 2_Squares.json rename to data_omnisphere/saved/quad/{All Drums 2_Squares.json diff --git a/data/saved/quad/{All Drums_Squares.json b/data_omnisphere/saved/quad/{All Drums_Squares.json similarity index 100% rename from data/saved/quad/{All Drums_Squares.json rename to data_omnisphere/saved/quad/{All Drums_Squares.json diff --git a/data/saved/quad/{All Out_Kaleid.json b/data_omnisphere/saved/quad/{All Out_Kaleid.json similarity index 100% rename from data/saved/quad/{All Out_Kaleid.json rename to data_omnisphere/saved/quad/{All Out_Kaleid.json diff --git a/data/saved/quad/{All Scat_Squares.json b/data_omnisphere/saved/quad/{All Scat_Squares.json similarity index 100% rename from data/saved/quad/{All Scat_Squares.json rename to data_omnisphere/saved/quad/{All Scat_Squares.json diff --git a/data/saved/quad/{All_Moire.json b/data_omnisphere/saved/quad/{All_Moire.json similarity index 100% rename from data/saved/quad/{All_Moire.json rename to data_omnisphere/saved/quad/{All_Moire.json diff --git a/data/saved/quad/{Blue Purple_Cartoon Clouds.json b/data_omnisphere/saved/quad/{Blue Purple_Cartoon Clouds.json similarity index 100% rename from data/saved/quad/{Blue Purple_Cartoon Clouds.json rename to data_omnisphere/saved/quad/{Blue Purple_Cartoon Clouds.json diff --git a/data/saved/quad/{Cloudy_Elevations.json b/data_omnisphere/saved/quad/{Cloudy_Elevations.json similarity index 100% rename from data/saved/quad/{Cloudy_Elevations.json rename to data_omnisphere/saved/quad/{Cloudy_Elevations.json diff --git a/data/saved/quad/{Colored_Echoes.json b/data_omnisphere/saved/quad/{Colored_Echoes.json similarity index 100% rename from data/saved/quad/{Colored_Echoes.json rename to data_omnisphere/saved/quad/{Colored_Echoes.json diff --git a/data/saved/quad/{Colorful_Moire.json b/data_omnisphere/saved/quad/{Colorful_Moire.json similarity index 100% rename from data/saved/quad/{Colorful_Moire.json rename to data_omnisphere/saved/quad/{Colorful_Moire.json diff --git a/data/saved/quad/{Dancing Fields_Of Space.json b/data_omnisphere/saved/quad/{Dancing Fields_Of Space.json similarity index 100% rename from data/saved/quad/{Dancing Fields_Of Space.json rename to data_omnisphere/saved/quad/{Dancing Fields_Of Space.json diff --git a/data/saved/quad/{Dancing_With Lines.json b/data_omnisphere/saved/quad/{Dancing_With Lines.json similarity index 100% rename from data/saved/quad/{Dancing_With Lines.json rename to data_omnisphere/saved/quad/{Dancing_With Lines.json diff --git a/data/saved/quad/{Diagonal_Fantasy.json b/data_omnisphere/saved/quad/{Diagonal_Fantasy.json similarity index 100% rename from data/saved/quad/{Diagonal_Fantasy.json rename to data_omnisphere/saved/quad/{Diagonal_Fantasy.json diff --git a/data/saved/quad/{Endless_Twirls.json b/data_omnisphere/saved/quad/{Endless_Twirls.json similarity index 100% rename from data/saved/quad/{Endless_Twirls.json rename to data_omnisphere/saved/quad/{Endless_Twirls.json diff --git a/data/saved/quad/{Evolving_Elevations.json b/data_omnisphere/saved/quad/{Evolving_Elevations.json similarity index 100% rename from data/saved/quad/{Evolving_Elevations.json rename to data_omnisphere/saved/quad/{Evolving_Elevations.json diff --git a/data/saved/quad/{Floating_Grains.json b/data_omnisphere/saved/quad/{Floating_Grains.json similarity index 100% rename from data/saved/quad/{Floating_Grains.json rename to data_omnisphere/saved/quad/{Floating_Grains.json diff --git a/data/saved/quad/{Fluorescent_Borealis.json b/data_omnisphere/saved/quad/{Fluorescent_Borealis.json similarity index 100% rename from data/saved/quad/{Fluorescent_Borealis.json rename to data_omnisphere/saved/quad/{Fluorescent_Borealis.json diff --git a/data/saved/quad/{Full Bore_Borealis.json b/data_omnisphere/saved/quad/{Full Bore_Borealis.json similarity index 100% rename from data/saved/quad/{Full Bore_Borealis.json rename to data_omnisphere/saved/quad/{Full Bore_Borealis.json diff --git a/data/saved/quad/{Geographic_Travels.json b/data_omnisphere/saved/quad/{Geographic_Travels.json similarity index 100% rename from data/saved/quad/{Geographic_Travels.json rename to data_omnisphere/saved/quad/{Geographic_Travels.json diff --git a/data/saved/quad/{Ghostly_Shapes.json b/data_omnisphere/saved/quad/{Ghostly_Shapes.json similarity index 100% rename from data/saved/quad/{Ghostly_Shapes.json rename to data_omnisphere/saved/quad/{Ghostly_Shapes.json diff --git a/data/saved/quad/{Green_Variety.json b/data_omnisphere/saved/quad/{Green_Variety.json similarity index 100% rename from data/saved/quad/{Green_Variety.json rename to data_omnisphere/saved/quad/{Green_Variety.json diff --git a/data/saved/quad/{Infinite_Layers.json b/data_omnisphere/saved/quad/{Infinite_Layers.json similarity index 100% rename from data/saved/quad/{Infinite_Layers.json rename to data_omnisphere/saved/quad/{Infinite_Layers.json diff --git a/data/saved/quad/{Just_Wright.json b/data_omnisphere/saved/quad/{Just_Wright.json similarity index 100% rename from data/saved/quad/{Just_Wright.json rename to data_omnisphere/saved/quad/{Just_Wright.json diff --git a/data/saved/quad/{Kaleidoscopes_Forever.json b/data_omnisphere/saved/quad/{Kaleidoscopes_Forever.json similarity index 100% rename from data/saved/quad/{Kaleidoscopes_Forever.json rename to data_omnisphere/saved/quad/{Kaleidoscopes_Forever.json diff --git a/data/saved/quad/{Only_Orange.json b/data_omnisphere/saved/quad/{Only_Orange.json similarity index 100% rename from data/saved/quad/{Only_Orange.json rename to data_omnisphere/saved/quad/{Only_Orange.json diff --git a/data/saved/quad/{Organic_Linescape.json b/data_omnisphere/saved/quad/{Organic_Linescape.json similarity index 100% rename from data/saved/quad/{Organic_Linescape.json rename to data_omnisphere/saved/quad/{Organic_Linescape.json diff --git a/data/saved/quad/{Perky_Clouds.json b/data_omnisphere/saved/quad/{Perky_Clouds.json similarity index 100% rename from data/saved/quad/{Perky_Clouds.json rename to data_omnisphere/saved/quad/{Perky_Clouds.json diff --git a/data/saved/quad/{Playful_Plucks.json b/data_omnisphere/saved/quad/{Playful_Plucks.json similarity index 100% rename from data/saved/quad/{Playful_Plucks.json rename to data_omnisphere/saved/quad/{Playful_Plucks.json diff --git a/data/saved/quad/{Quick Scat_Circles.json b/data_omnisphere/saved/quad/{Quick Scat_Circles.json similarity index 100% rename from data/saved/quad/{Quick Scat_Circles.json rename to data_omnisphere/saved/quad/{Quick Scat_Circles.json diff --git a/data/saved/quad/{Runway_Horizontal.json b/data_omnisphere/saved/quad/{Runway_Horizontal.json similarity index 100% rename from data/saved/quad/{Runway_Horizontal.json rename to data_omnisphere/saved/quad/{Runway_Horizontal.json diff --git a/data/saved/quad/{Runway_Vertical.json b/data_omnisphere/saved/quad/{Runway_Vertical.json similarity index 100% rename from data/saved/quad/{Runway_Vertical.json rename to data_omnisphere/saved/quad/{Runway_Vertical.json diff --git a/data/saved/quad/{Shapely_Shadows.json b/data_omnisphere/saved/quad/{Shapely_Shadows.json similarity index 100% rename from data/saved/quad/{Shapely_Shadows.json rename to data_omnisphere/saved/quad/{Shapely_Shadows.json diff --git a/data/saved/quad/{Shattered_Shapes.json b/data_omnisphere/saved/quad/{Shattered_Shapes.json similarity index 100% rename from data/saved/quad/{Shattered_Shapes.json rename to data_omnisphere/saved/quad/{Shattered_Shapes.json diff --git a/data/saved/quad/{Simply_Mellow.json b/data_omnisphere/saved/quad/{Simply_Mellow.json similarity index 100% rename from data/saved/quad/{Simply_Mellow.json rename to data_omnisphere/saved/quad/{Simply_Mellow.json diff --git a/data/saved/quad/{Spiral Moire_Universe.json b/data_omnisphere/saved/quad/{Spiral Moire_Universe.json similarity index 100% rename from data/saved/quad/{Spiral Moire_Universe.json rename to data_omnisphere/saved/quad/{Spiral Moire_Universe.json diff --git a/data/saved/quad/{Square_Fantasia.json b/data_omnisphere/saved/quad/{Square_Fantasia.json similarity index 100% rename from data/saved/quad/{Square_Fantasia.json rename to data_omnisphere/saved/quad/{Square_Fantasia.json diff --git a/data/saved/quad/{Swimming In_Salmon Blue.json b/data_omnisphere/saved/quad/{Swimming In_Salmon Blue.json similarity index 100% rename from data/saved/quad/{Swimming In_Salmon Blue.json rename to data_omnisphere/saved/quad/{Swimming In_Salmon Blue.json diff --git a/data/saved/quad/{Vocal_Linescape.json b/data_omnisphere/saved/quad/{Vocal_Linescape.json similarity index 100% rename from data/saved/quad/{Vocal_Linescape.json rename to data_omnisphere/saved/quad/{Vocal_Linescape.json diff --git a/data/saved/quad/{World Wide_Webs.json b/data_omnisphere/saved/quad/{World Wide_Webs.json similarity index 100% rename from data/saved/quad/{World Wide_Webs.json rename to data_omnisphere/saved/quad/{World Wide_Webs.json diff --git a/data/saved/sound/(!!) Age of Ill_Bass.json b/data_omnisphere/saved/sound/(!!) Age of Ill_Bass.json similarity index 100% rename from data/saved/sound/(!!) Age of Ill_Bass.json rename to data_omnisphere/saved/sound/(!!) Age of Ill_Bass.json diff --git a/data/saved/sound/(!!) Ant of Energy_Pluck.json b/data_omnisphere/saved/sound/(!!) Ant of Energy_Pluck.json similarity index 100% rename from data/saved/sound/(!!) Ant of Energy_Pluck.json rename to data_omnisphere/saved/sound/(!!) Ant of Energy_Pluck.json diff --git a/data/saved/sound/(!!) Beads of_E Metal.json b/data_omnisphere/saved/sound/(!!) Beads of_E Metal.json similarity index 100% rename from data/saved/sound/(!!) Beads of_E Metal.json rename to data_omnisphere/saved/sound/(!!) Beads of_E Metal.json diff --git a/data/saved/sound/(!!) Bouncing_Metal.json b/data_omnisphere/saved/sound/(!!) Bouncing_Metal.json similarity index 100% rename from data/saved/sound/(!!) Bouncing_Metal.json rename to data_omnisphere/saved/sound/(!!) Bouncing_Metal.json diff --git a/data/saved/sound/(!!) Broken_OSCar Bass.json b/data_omnisphere/saved/sound/(!!) Broken_OSCar Bass.json similarity index 100% rename from data/saved/sound/(!!) Broken_OSCar Bass.json rename to data_omnisphere/saved/sound/(!!) Broken_OSCar Bass.json diff --git a/data/saved/sound/(!!) Bum Like_You Bing.json b/data_omnisphere/saved/sound/(!!) Bum Like_You Bing.json similarity index 100% rename from data/saved/sound/(!!) Bum Like_You Bing.json rename to data_omnisphere/saved/sound/(!!) Bum Like_You Bing.json diff --git a/data/saved/sound/(!!) Cavaquinho a.json b/data_omnisphere/saved/sound/(!!) Cavaquinho a.json similarity index 100% rename from data/saved/sound/(!!) Cavaquinho a.json rename to data_omnisphere/saved/sound/(!!) Cavaquinho a.json diff --git a/data/saved/sound/(!!) CrushTone_Keys.json b/data_omnisphere/saved/sound/(!!) CrushTone_Keys.json similarity index 100% rename from data/saved/sound/(!!) CrushTone_Keys.json rename to data_omnisphere/saved/sound/(!!) CrushTone_Keys.json diff --git a/data/saved/sound/(!!) Dark_Space Plucks.json b/data_omnisphere/saved/sound/(!!) Dark_Space Plucks.json similarity index 100% rename from data/saved/sound/(!!) Dark_Space Plucks.json rename to data_omnisphere/saved/sound/(!!) Dark_Space Plucks.json diff --git a/data/saved/sound/(!!) Dream_Search Glass.json b/data_omnisphere/saved/sound/(!!) Dream_Search Glass.json similarity index 100% rename from data/saved/sound/(!!) Dream_Search Glass.json rename to data_omnisphere/saved/sound/(!!) Dream_Search Glass.json diff --git a/data/saved/sound/(!!) Drumwerk.json b/data_omnisphere/saved/sound/(!!) Drumwerk.json similarity index 100% rename from data/saved/sound/(!!) Drumwerk.json rename to data_omnisphere/saved/sound/(!!) Drumwerk.json diff --git a/data/saved/sound/(!!) FM Bottle_Crush.json b/data_omnisphere/saved/sound/(!!) FM Bottle_Crush.json similarity index 100% rename from data/saved/sound/(!!) FM Bottle_Crush.json rename to data_omnisphere/saved/sound/(!!) FM Bottle_Crush.json diff --git a/data/saved/sound/(!!) HighPass_Resoline 2.json b/data_omnisphere/saved/sound/(!!) HighPass_Resoline 2.json similarity index 100% rename from data/saved/sound/(!!) HighPass_Resoline 2.json rename to data_omnisphere/saved/sound/(!!) HighPass_Resoline 2.json diff --git a/data/saved/sound/(!!) In Memorium.json b/data_omnisphere/saved/sound/(!!) In Memorium.json similarity index 100% rename from data/saved/sound/(!!) In Memorium.json rename to data_omnisphere/saved/sound/(!!) In Memorium.json diff --git a/data/saved/sound/(!!) Konichiwa_Ornament.json b/data_omnisphere/saved/sound/(!!) Konichiwa_Ornament.json similarity index 100% rename from data/saved/sound/(!!) Konichiwa_Ornament.json rename to data_omnisphere/saved/sound/(!!) Konichiwa_Ornament.json diff --git a/data/saved/sound/(!!) MKS80 Plucky_Squares.json b/data_omnisphere/saved/sound/(!!) MKS80 Plucky_Squares.json similarity index 100% rename from data/saved/sound/(!!) MKS80 Plucky_Squares.json rename to data_omnisphere/saved/sound/(!!) MKS80 Plucky_Squares.json diff --git a/data/saved/sound/(!!) Natures_Musical Mara.json b/data_omnisphere/saved/sound/(!!) Natures_Musical Mara.json similarity index 100% rename from data/saved/sound/(!!) Natures_Musical Mara.json rename to data_omnisphere/saved/sound/(!!) Natures_Musical Mara.json diff --git a/data/saved/sound/(!!) Phased_Hammond.json b/data_omnisphere/saved/sound/(!!) Phased_Hammond.json similarity index 100% rename from data/saved/sound/(!!) Phased_Hammond.json rename to data_omnisphere/saved/sound/(!!) Phased_Hammond.json diff --git a/data/saved/sound/(!!) Pop Rox_In Space.json b/data_omnisphere/saved/sound/(!!) Pop Rox_In Space.json similarity index 100% rename from data/saved/sound/(!!) Pop Rox_In Space.json rename to data_omnisphere/saved/sound/(!!) Pop Rox_In Space.json diff --git a/data/saved/sound/(!!) Prepared_Saz.json b/data_omnisphere/saved/sound/(!!) Prepared_Saz.json similarity index 100% rename from data/saved/sound/(!!) Prepared_Saz.json rename to data_omnisphere/saved/sound/(!!) Prepared_Saz.json diff --git a/data/saved/sound/(!!) Purest_Sines.json b/data_omnisphere/saved/sound/(!!) Purest_Sines.json similarity index 100% rename from data/saved/sound/(!!) Purest_Sines.json rename to data_omnisphere/saved/sound/(!!) Purest_Sines.json diff --git a/data/saved/sound/(!!) Theremins_Journey.json b/data_omnisphere/saved/sound/(!!) Theremins_Journey.json similarity index 100% rename from data/saved/sound/(!!) Theremins_Journey.json rename to data_omnisphere/saved/sound/(!!) Theremins_Journey.json diff --git a/data/saved/sound/(!!) Watery_Gamelan.json b/data_omnisphere/saved/sound/(!!) Watery_Gamelan.json similarity index 100% rename from data/saved/sound/(!!) Watery_Gamelan.json rename to data_omnisphere/saved/sound/(!!) Watery_Gamelan.json diff --git a/data/saved/sound/(!) Adagio_Singing Bell.json b/data_omnisphere/saved/sound/(!) Adagio_Singing Bell.json similarity index 100% rename from data/saved/sound/(!) Adagio_Singing Bell.json rename to data_omnisphere/saved/sound/(!) Adagio_Singing Bell.json diff --git a/data/saved/sound/(!) Analog_Shifting Pad.json b/data_omnisphere/saved/sound/(!) Analog_Shifting Pad.json similarity index 100% rename from data/saved/sound/(!) Analog_Shifting Pad.json rename to data_omnisphere/saved/sound/(!) Analog_Shifting Pad.json diff --git a/data/saved/sound/(!) BellsOf_StElmos.json b/data_omnisphere/saved/sound/(!) BellsOf_StElmos.json similarity index 100% rename from data/saved/sound/(!) BellsOf_StElmos.json rename to data_omnisphere/saved/sound/(!) BellsOf_StElmos.json diff --git a/data/saved/sound/(!) Bellzo_Pad.json b/data_omnisphere/saved/sound/(!) Bellzo_Pad.json similarity index 100% rename from data/saved/sound/(!) Bellzo_Pad.json rename to data_omnisphere/saved/sound/(!) Bellzo_Pad.json diff --git a/data/saved/sound/(!) Breathing_Smoke.json b/data_omnisphere/saved/sound/(!) Breathing_Smoke.json similarity index 100% rename from data/saved/sound/(!) Breathing_Smoke.json rename to data_omnisphere/saved/sound/(!) Breathing_Smoke.json diff --git a/data/saved/sound/(!) Cascading_Filters.json b/data_omnisphere/saved/sound/(!) Cascading_Filters.json similarity index 100% rename from data/saved/sound/(!) Cascading_Filters.json rename to data_omnisphere/saved/sound/(!) Cascading_Filters.json diff --git a/data/saved/sound/(!) Cathedral_Drops.json b/data_omnisphere/saved/sound/(!) Cathedral_Drops.json similarity index 100% rename from data/saved/sound/(!) Cathedral_Drops.json rename to data_omnisphere/saved/sound/(!) Cathedral_Drops.json diff --git a/data/saved/sound/(!) Cedar_Space.json b/data_omnisphere/saved/sound/(!) Cedar_Space.json similarity index 100% rename from data/saved/sound/(!) Cedar_Space.json rename to data_omnisphere/saved/sound/(!) Cedar_Space.json diff --git a/data/saved/sound/(!) ChinkInThe_Armour.json b/data_omnisphere/saved/sound/(!) ChinkInThe_Armour.json similarity index 100% rename from data/saved/sound/(!) ChinkInThe_Armour.json rename to data_omnisphere/saved/sound/(!) ChinkInThe_Armour.json diff --git a/data/saved/sound/(!) Christmas_Layers.json b/data_omnisphere/saved/sound/(!) Christmas_Layers.json similarity index 100% rename from data/saved/sound/(!) Christmas_Layers.json rename to data_omnisphere/saved/sound/(!) Christmas_Layers.json diff --git a/data/saved/sound/(!) Coldstones_Cold.json b/data_omnisphere/saved/sound/(!) Coldstones_Cold.json similarity index 100% rename from data/saved/sound/(!) Coldstones_Cold.json rename to data_omnisphere/saved/sound/(!) Coldstones_Cold.json diff --git a/data/saved/sound/(!) Cryogenic_Freeze.json b/data_omnisphere/saved/sound/(!) Cryogenic_Freeze.json similarity index 100% rename from data/saved/sound/(!) Cryogenic_Freeze.json rename to data_omnisphere/saved/sound/(!) Cryogenic_Freeze.json diff --git a/data/saved/sound/(!) Crystal_Pipes.json b/data_omnisphere/saved/sound/(!) Crystal_Pipes.json similarity index 100% rename from data/saved/sound/(!) Crystal_Pipes.json rename to data_omnisphere/saved/sound/(!) Crystal_Pipes.json diff --git a/data/saved/sound/(!) Cumbus_Rings.json b/data_omnisphere/saved/sound/(!) Cumbus_Rings.json similarity index 100% rename from data/saved/sound/(!) Cumbus_Rings.json rename to data_omnisphere/saved/sound/(!) Cumbus_Rings.json diff --git a/data/saved/sound/(!) Deep_Mallet.json b/data_omnisphere/saved/sound/(!) Deep_Mallet.json similarity index 100% rename from data/saved/sound/(!) Deep_Mallet.json rename to data_omnisphere/saved/sound/(!) Deep_Mallet.json diff --git a/data/saved/sound/(!) Dream_Mystic Rhodes.json b/data_omnisphere/saved/sound/(!) Dream_Mystic Rhodes.json similarity index 100% rename from data/saved/sound/(!) Dream_Mystic Rhodes.json rename to data_omnisphere/saved/sound/(!) Dream_Mystic Rhodes.json diff --git a/data/saved/sound/(!) DropsOf_Glass.json b/data_omnisphere/saved/sound/(!) DropsOf_Glass.json similarity index 100% rename from data/saved/sound/(!) DropsOf_Glass.json rename to data_omnisphere/saved/sound/(!) DropsOf_Glass.json diff --git a/data/saved/sound/(!) Ebony_AndWire.json b/data_omnisphere/saved/sound/(!) Ebony_AndWire.json similarity index 100% rename from data/saved/sound/(!) Ebony_AndWire.json rename to data_omnisphere/saved/sound/(!) Ebony_AndWire.json diff --git a/data/saved/sound/(!) Fantasia_Grains.json b/data_omnisphere/saved/sound/(!) Fantasia_Grains.json similarity index 100% rename from data/saved/sound/(!) Fantasia_Grains.json rename to data_omnisphere/saved/sound/(!) Fantasia_Grains.json diff --git a/data/saved/sound/(!) Glass_Harmonica.json b/data_omnisphere/saved/sound/(!) Glass_Harmonica.json similarity index 100% rename from data/saved/sound/(!) Glass_Harmonica.json rename to data_omnisphere/saved/sound/(!) Glass_Harmonica.json diff --git a/data/saved/sound/(!) Glass_SparkBubbles.json b/data_omnisphere/saved/sound/(!) Glass_SparkBubbles.json similarity index 100% rename from data/saved/sound/(!) Glass_SparkBubbles.json rename to data_omnisphere/saved/sound/(!) Glass_SparkBubbles.json diff --git a/data/saved/sound/(!) Hang_Drum.json b/data_omnisphere/saved/sound/(!) Hang_Drum.json similarity index 100% rename from data/saved/sound/(!) Hang_Drum.json rename to data_omnisphere/saved/sound/(!) Hang_Drum.json diff --git a/data/saved/sound/(!) Maldives_Islands.json b/data_omnisphere/saved/sound/(!) Maldives_Islands.json similarity index 100% rename from data/saved/sound/(!) Maldives_Islands.json rename to data_omnisphere/saved/sound/(!) Maldives_Islands.json diff --git a/data/saved/sound/(!) Shooting_Sines.json b/data_omnisphere/saved/sound/(!) Shooting_Sines.json similarity index 100% rename from data/saved/sound/(!) Shooting_Sines.json rename to data_omnisphere/saved/sound/(!) Shooting_Sines.json diff --git a/data/saved/sound/(!) Utility_Only.json b/data_omnisphere/saved/sound/(!) Utility_Only.json similarity index 100% rename from data/saved/sound/(!) Utility_Only.json rename to data_omnisphere/saved/sound/(!) Utility_Only.json diff --git a/data/saved/sound/(!) Water_Lillies.json b/data_omnisphere/saved/sound/(!) Water_Lillies.json similarity index 100% rename from data/saved/sound/(!) Water_Lillies.json rename to data_omnisphere/saved/sound/(!) Water_Lillies.json diff --git a/data/saved/sound/Adagio_Singing Bell.json b/data_omnisphere/saved/sound/Adagio_Singing Bell.json similarity index 100% rename from data/saved/sound/Adagio_Singing Bell.json rename to data_omnisphere/saved/sound/Adagio_Singing Bell.json diff --git a/data/saved/sound/Aesops_FingerDrum.json b/data_omnisphere/saved/sound/Aesops_FingerDrum.json similarity index 100% rename from data/saved/sound/Aesops_FingerDrum.json rename to data_omnisphere/saved/sound/Aesops_FingerDrum.json diff --git a/data/saved/sound/Aesops_FingerDrum2.json b/data_omnisphere/saved/sound/Aesops_FingerDrum2.json similarity index 100% rename from data/saved/sound/Aesops_FingerDrum2.json rename to data_omnisphere/saved/sound/Aesops_FingerDrum2.json diff --git a/data/saved/sound/Analog_BigAndTight.json b/data_omnisphere/saved/sound/Analog_BigAndTight.json similarity index 100% rename from data/saved/sound/Analog_BigAndTight.json rename to data_omnisphere/saved/sound/Analog_BigAndTight.json diff --git a/data/saved/sound/Analog_Shifting Pad.json b/data_omnisphere/saved/sound/Analog_Shifting Pad.json similarity index 100% rename from data/saved/sound/Analog_Shifting Pad.json rename to data_omnisphere/saved/sound/Analog_Shifting Pad.json diff --git a/data/saved/sound/Ashes_AndSnow.json b/data_omnisphere/saved/sound/Ashes_AndSnow.json similarity index 100% rename from data/saved/sound/Ashes_AndSnow.json rename to data_omnisphere/saved/sound/Ashes_AndSnow.json diff --git a/data/saved/sound/Backwards_MagneticFields.json b/data_omnisphere/saved/sound/Backwards_MagneticFields.json similarity index 100% rename from data/saved/sound/Backwards_MagneticFields.json rename to data_omnisphere/saved/sound/Backwards_MagneticFields.json diff --git a/data/saved/sound/Basic Dark_Pad Velo.json b/data_omnisphere/saved/sound/Basic Dark_Pad Velo.json similarity index 100% rename from data/saved/sound/Basic Dark_Pad Velo.json rename to data_omnisphere/saved/sound/Basic Dark_Pad Velo.json diff --git a/data/saved/sound/BellsOf_StElmos.json b/data_omnisphere/saved/sound/BellsOf_StElmos.json similarity index 100% rename from data/saved/sound/BellsOf_StElmos.json rename to data_omnisphere/saved/sound/BellsOf_StElmos.json diff --git a/data/saved/sound/Bellzo_Pad.json b/data_omnisphere/saved/sound/Bellzo_Pad.json similarity index 100% rename from data/saved/sound/Bellzo_Pad.json rename to data_omnisphere/saved/sound/Bellzo_Pad.json diff --git a/data/saved/sound/Bottlecap_Spork.json b/data_omnisphere/saved/sound/Bottlecap_Spork.json similarity index 100% rename from data/saved/sound/Bottlecap_Spork.json rename to data_omnisphere/saved/sound/Bottlecap_Spork.json diff --git a/data/saved/sound/Bouncy_Pluck.json b/data_omnisphere/saved/sound/Bouncy_Pluck.json similarity index 100% rename from data/saved/sound/Bouncy_Pluck.json rename to data_omnisphere/saved/sound/Bouncy_Pluck.json diff --git a/data/saved/sound/Breathing_Smoke.json b/data_omnisphere/saved/sound/Breathing_Smoke.json similarity index 100% rename from data/saved/sound/Breathing_Smoke.json rename to data_omnisphere/saved/sound/Breathing_Smoke.json diff --git a/data/saved/sound/Breathy_FlutePad.json b/data_omnisphere/saved/sound/Breathy_FlutePad.json similarity index 100% rename from data/saved/sound/Breathy_FlutePad.json rename to data_omnisphere/saved/sound/Breathy_FlutePad.json diff --git a/data/saved/sound/Breathy_Harmoniclouds.json b/data_omnisphere/saved/sound/Breathy_Harmoniclouds.json similarity index 100% rename from data/saved/sound/Breathy_Harmoniclouds.json rename to data_omnisphere/saved/sound/Breathy_Harmoniclouds.json diff --git a/data/saved/sound/Cascading_Filters.json b/data_omnisphere/saved/sound/Cascading_Filters.json similarity index 100% rename from data/saved/sound/Cascading_Filters.json rename to data_omnisphere/saved/sound/Cascading_Filters.json diff --git a/data/saved/sound/Cathedral_Drops.json b/data_omnisphere/saved/sound/Cathedral_Drops.json similarity index 100% rename from data/saved/sound/Cathedral_Drops.json rename to data_omnisphere/saved/sound/Cathedral_Drops.json diff --git a/data/saved/sound/Cave_Stalactites.json b/data_omnisphere/saved/sound/Cave_Stalactites.json similarity index 100% rename from data/saved/sound/Cave_Stalactites.json rename to data_omnisphere/saved/sound/Cave_Stalactites.json diff --git a/data/saved/sound/Cedar_Space.json b/data_omnisphere/saved/sound/Cedar_Space.json similarity index 100% rename from data/saved/sound/Cedar_Space.json rename to data_omnisphere/saved/sound/Cedar_Space.json diff --git a/data/saved/sound/ChinkInThe_Armour.json b/data_omnisphere/saved/sound/ChinkInThe_Armour.json similarity index 100% rename from data/saved/sound/ChinkInThe_Armour.json rename to data_omnisphere/saved/sound/ChinkInThe_Armour.json diff --git a/data/saved/sound/Christmas_Layers.json b/data_omnisphere/saved/sound/Christmas_Layers.json similarity index 100% rename from data/saved/sound/Christmas_Layers.json rename to data_omnisphere/saved/sound/Christmas_Layers.json diff --git a/data/saved/sound/Chroma_Brass.json b/data_omnisphere/saved/sound/Chroma_Brass.json similarity index 100% rename from data/saved/sound/Chroma_Brass.json rename to data_omnisphere/saved/sound/Chroma_Brass.json diff --git a/data/saved/sound/Classical_Soprano.json b/data_omnisphere/saved/sound/Classical_Soprano.json similarity index 100% rename from data/saved/sound/Classical_Soprano.json rename to data_omnisphere/saved/sound/Classical_Soprano.json diff --git a/data/saved/sound/Coldstones_Cold.json b/data_omnisphere/saved/sound/Coldstones_Cold.json similarity index 100% rename from data/saved/sound/Coldstones_Cold.json rename to data_omnisphere/saved/sound/Coldstones_Cold.json diff --git a/data/saved/sound/Compression_Energy.json b/data_omnisphere/saved/sound/Compression_Energy.json similarity index 100% rename from data/saved/sound/Compression_Energy.json rename to data_omnisphere/saved/sound/Compression_Energy.json diff --git a/data/saved/sound/Cryogenic_Freeze.json b/data_omnisphere/saved/sound/Cryogenic_Freeze.json similarity index 100% rename from data/saved/sound/Cryogenic_Freeze.json rename to data_omnisphere/saved/sound/Cryogenic_Freeze.json diff --git a/data/saved/sound/Crystal_Pipes.json b/data_omnisphere/saved/sound/Crystal_Pipes.json similarity index 100% rename from data/saved/sound/Crystal_Pipes.json rename to data_omnisphere/saved/sound/Crystal_Pipes.json diff --git a/data/saved/sound/Cumbus_Rings.json b/data_omnisphere/saved/sound/Cumbus_Rings.json similarity index 100% rename from data/saved/sound/Cumbus_Rings.json rename to data_omnisphere/saved/sound/Cumbus_Rings.json diff --git a/data/saved/sound/Cut Through_Beads.json b/data_omnisphere/saved/sound/Cut Through_Beads.json similarity index 100% rename from data/saved/sound/Cut Through_Beads.json rename to data_omnisphere/saved/sound/Cut Through_Beads.json diff --git a/data/saved/sound/Dark_GlassOrgan.json b/data_omnisphere/saved/sound/Dark_GlassOrgan.json similarity index 100% rename from data/saved/sound/Dark_GlassOrgan.json rename to data_omnisphere/saved/sound/Dark_GlassOrgan.json diff --git a/data/saved/sound/Deep_Mallet.json b/data_omnisphere/saved/sound/Deep_Mallet.json similarity index 100% rename from data/saved/sound/Deep_Mallet.json rename to data_omnisphere/saved/sound/Deep_Mallet.json diff --git a/data/saved/sound/Desert_Flutes.json b/data_omnisphere/saved/sound/Desert_Flutes.json similarity index 100% rename from data/saved/sound/Desert_Flutes.json rename to data_omnisphere/saved/sound/Desert_Flutes.json diff --git a/data/saved/sound/Dream_Mystic Rhodes.json b/data_omnisphere/saved/sound/Dream_Mystic Rhodes.json similarity index 100% rename from data/saved/sound/Dream_Mystic Rhodes.json rename to data_omnisphere/saved/sound/Dream_Mystic Rhodes.json diff --git a/data/saved/sound/Drive_MeDown.json b/data_omnisphere/saved/sound/Drive_MeDown.json similarity index 100% rename from data/saved/sound/Drive_MeDown.json rename to data_omnisphere/saved/sound/Drive_MeDown.json diff --git a/data/saved/sound/DropsOf_Glass.json b/data_omnisphere/saved/sound/DropsOf_Glass.json similarity index 100% rename from data/saved/sound/DropsOf_Glass.json rename to data_omnisphere/saved/sound/DropsOf_Glass.json diff --git a/data/saved/sound/Drums_Afterlife.json b/data_omnisphere/saved/sound/Drums_Afterlife.json similarity index 100% rename from data/saved/sound/Drums_Afterlife.json rename to data_omnisphere/saved/sound/Drums_Afterlife.json diff --git a/data/saved/sound/Drums_Agressive.json b/data_omnisphere/saved/sound/Drums_Agressive.json similarity index 100% rename from data/saved/sound/Drums_Agressive.json rename to data_omnisphere/saved/sound/Drums_Agressive.json diff --git a/data/saved/sound/Drums_Antiquity.json b/data_omnisphere/saved/sound/Drums_Antiquity.json similarity index 100% rename from data/saved/sound/Drums_Antiquity.json rename to data_omnisphere/saved/sound/Drums_Antiquity.json diff --git a/data/saved/sound/Drums_Bedroom.json b/data_omnisphere/saved/sound/Drums_Bedroom.json similarity index 100% rename from data/saved/sound/Drums_Bedroom.json rename to data_omnisphere/saved/sound/Drums_Bedroom.json diff --git a/data/saved/sound/Drums_Drop It.json b/data_omnisphere/saved/sound/Drums_Drop It.json similarity index 100% rename from data/saved/sound/Drums_Drop It.json rename to data_omnisphere/saved/sound/Drums_Drop It.json diff --git a/data/saved/sound/Drums_Electro.json b/data_omnisphere/saved/sound/Drums_Electro.json similarity index 100% rename from data/saved/sound/Drums_Electro.json rename to data_omnisphere/saved/sound/Drums_Electro.json diff --git a/data/saved/sound/Drums_Organamatic.json b/data_omnisphere/saved/sound/Drums_Organamatic.json similarity index 100% rename from data/saved/sound/Drums_Organamatic.json rename to data_omnisphere/saved/sound/Drums_Organamatic.json diff --git a/data/saved/sound/Drums_Perky.json b/data_omnisphere/saved/sound/Drums_Perky.json similarity index 100% rename from data/saved/sound/Drums_Perky.json rename to data_omnisphere/saved/sound/Drums_Perky.json diff --git a/data/saved/sound/Drums_Reverb.json b/data_omnisphere/saved/sound/Drums_Reverb.json similarity index 100% rename from data/saved/sound/Drums_Reverb.json rename to data_omnisphere/saved/sound/Drums_Reverb.json diff --git a/data/saved/sound/Drums_Three Stooges.json b/data_omnisphere/saved/sound/Drums_Three Stooges.json similarity index 100% rename from data/saved/sound/Drums_Three Stooges.json rename to data_omnisphere/saved/sound/Drums_Three Stooges.json diff --git a/data/saved/sound/Drums_Tiger Eye.json b/data_omnisphere/saved/sound/Drums_Tiger Eye.json similarity index 100% rename from data/saved/sound/Drums_Tiger Eye.json rename to data_omnisphere/saved/sound/Drums_Tiger Eye.json diff --git a/data/saved/sound/Drums_Tightly Wound.json b/data_omnisphere/saved/sound/Drums_Tightly Wound.json similarity index 100% rename from data/saved/sound/Drums_Tightly Wound.json rename to data_omnisphere/saved/sound/Drums_Tightly Wound.json diff --git a/data/saved/sound/Ebony_AndWire.json b/data_omnisphere/saved/sound/Ebony_AndWire.json similarity index 100% rename from data/saved/sound/Ebony_AndWire.json rename to data_omnisphere/saved/sound/Ebony_AndWire.json diff --git a/data/saved/sound/Eighties_PolyLead.json b/data_omnisphere/saved/sound/Eighties_PolyLead.json similarity index 100% rename from data/saved/sound/Eighties_PolyLead.json rename to data_omnisphere/saved/sound/Eighties_PolyLead.json diff --git a/data/saved/sound/Elegant_Picking.json b/data_omnisphere/saved/sound/Elegant_Picking.json similarity index 100% rename from data/saved/sound/Elegant_Picking.json rename to data_omnisphere/saved/sound/Elegant_Picking.json diff --git a/data/saved/sound/Elongated_Metal.json b/data_omnisphere/saved/sound/Elongated_Metal.json similarity index 100% rename from data/saved/sound/Elongated_Metal.json rename to data_omnisphere/saved/sound/Elongated_Metal.json diff --git a/data/saved/sound/FairSquare_Lead.json b/data_omnisphere/saved/sound/FairSquare_Lead.json similarity index 100% rename from data/saved/sound/FairSquare_Lead.json rename to data_omnisphere/saved/sound/FairSquare_Lead.json diff --git a/data/saved/sound/Fantasia_Grains.json b/data_omnisphere/saved/sound/Fantasia_Grains.json similarity index 100% rename from data/saved/sound/Fantasia_Grains.json rename to data_omnisphere/saved/sound/Fantasia_Grains.json diff --git a/data/saved/sound/Filaments_SonicWasher.json b/data_omnisphere/saved/sound/Filaments_SonicWasher.json similarity index 100% rename from data/saved/sound/Filaments_SonicWasher.json rename to data_omnisphere/saved/sound/Filaments_SonicWasher.json diff --git a/data/saved/sound/Fluff_Plucks.json b/data_omnisphere/saved/sound/Fluff_Plucks.json similarity index 100% rename from data/saved/sound/Fluff_Plucks.json rename to data_omnisphere/saved/sound/Fluff_Plucks.json diff --git a/data/saved/sound/Glass_Harmonica.json b/data_omnisphere/saved/sound/Glass_Harmonica.json similarity index 100% rename from data/saved/sound/Glass_Harmonica.json rename to data_omnisphere/saved/sound/Glass_Harmonica.json diff --git a/data/saved/sound/Glass_SparkBubbles.json b/data_omnisphere/saved/sound/Glass_SparkBubbles.json similarity index 100% rename from data/saved/sound/Glass_SparkBubbles.json rename to data_omnisphere/saved/sound/Glass_SparkBubbles.json diff --git a/data/saved/sound/Glassians.json b/data_omnisphere/saved/sound/Glassians.json similarity index 100% rename from data/saved/sound/Glassians.json rename to data_omnisphere/saved/sound/Glassians.json diff --git a/data/saved/sound/GlideySquare_Lead.json b/data_omnisphere/saved/sound/GlideySquare_Lead.json similarity index 100% rename from data/saved/sound/GlideySquare_Lead.json rename to data_omnisphere/saved/sound/GlideySquare_Lead.json diff --git a/data/saved/sound/Glorious_Guitars.json b/data_omnisphere/saved/sound/Glorious_Guitars.json similarity index 100% rename from data/saved/sound/Glorious_Guitars.json rename to data_omnisphere/saved/sound/Glorious_Guitars.json diff --git a/data/saved/sound/Goldsmith_Subotnik.json b/data_omnisphere/saved/sound/Goldsmith_Subotnik.json similarity index 100% rename from data/saved/sound/Goldsmith_Subotnik.json rename to data_omnisphere/saved/sound/Goldsmith_Subotnik.json diff --git a/data/saved/sound/Grabbing_Darkness.json b/data_omnisphere/saved/sound/Grabbing_Darkness.json similarity index 100% rename from data/saved/sound/Grabbing_Darkness.json rename to data_omnisphere/saved/sound/Grabbing_Darkness.json diff --git a/data/saved/sound/Grainy_PerkBell.json b/data_omnisphere/saved/sound/Grainy_PerkBell.json similarity index 100% rename from data/saved/sound/Grainy_PerkBell.json rename to data_omnisphere/saved/sound/Grainy_PerkBell.json diff --git a/data/saved/sound/Granular_Bells.json b/data_omnisphere/saved/sound/Granular_Bells.json similarity index 100% rename from data/saved/sound/Granular_Bells.json rename to data_omnisphere/saved/sound/Granular_Bells.json diff --git a/data/saved/sound/Granular_Vibrasines.json b/data_omnisphere/saved/sound/Granular_Vibrasines.json similarity index 100% rename from data/saved/sound/Granular_Vibrasines.json rename to data_omnisphere/saved/sound/Granular_Vibrasines.json diff --git a/data/saved/sound/Hang_Drum.json b/data_omnisphere/saved/sound/Hang_Drum.json similarity index 100% rename from data/saved/sound/Hang_Drum.json rename to data_omnisphere/saved/sound/Hang_Drum.json diff --git a/data/saved/sound/Harmonic_Rhodes.json b/data_omnisphere/saved/sound/Harmonic_Rhodes.json similarity index 100% rename from data/saved/sound/Harmonic_Rhodes.json rename to data_omnisphere/saved/sound/Harmonic_Rhodes.json diff --git a/data/saved/sound/HiWatt_Hammond.json b/data_omnisphere/saved/sound/HiWatt_Hammond.json similarity index 100% rename from data/saved/sound/HiWatt_Hammond.json rename to data_omnisphere/saved/sound/HiWatt_Hammond.json diff --git a/data/saved/sound/JP Seq_Bells.json b/data_omnisphere/saved/sound/JP Seq_Bells.json similarity index 100% rename from data/saved/sound/JP Seq_Bells.json rename to data_omnisphere/saved/sound/JP Seq_Bells.json diff --git a/data/saved/sound/JP Squares_Solo.json b/data_omnisphere/saved/sound/JP Squares_Solo.json similarity index 100% rename from data/saved/sound/JP Squares_Solo.json rename to data_omnisphere/saved/sound/JP Squares_Solo.json diff --git a/data/saved/sound/JazzScat_DooDah.json b/data_omnisphere/saved/sound/JazzScat_DooDah.json similarity index 100% rename from data/saved/sound/JazzScat_DooDah.json rename to data_omnisphere/saved/sound/JazzScat_DooDah.json diff --git a/data/saved/sound/JazzVoice_ShortDums.json b/data_omnisphere/saved/sound/JazzVoice_ShortDums.json similarity index 100% rename from data/saved/sound/JazzVoice_ShortDums.json rename to data_omnisphere/saved/sound/JazzVoice_ShortDums.json diff --git a/data/saved/sound/Joyous_Reunion Mellow.json b/data_omnisphere/saved/sound/Joyous_Reunion Mellow.json similarity index 100% rename from data/saved/sound/Joyous_Reunion Mellow.json rename to data_omnisphere/saved/sound/Joyous_Reunion Mellow.json diff --git a/data/saved/sound/Joyous_Reunion.json b/data_omnisphere/saved/sound/Joyous_Reunion.json similarity index 100% rename from data/saved/sound/Joyous_Reunion.json rename to data_omnisphere/saved/sound/Joyous_Reunion.json diff --git a/data/saved/sound/LapSteel_Sustain.json b/data_omnisphere/saved/sound/LapSteel_Sustain.json similarity index 100% rename from data/saved/sound/LapSteel_Sustain.json rename to data_omnisphere/saved/sound/LapSteel_Sustain.json diff --git a/data/saved/sound/Lateral_Motion.json b/data_omnisphere/saved/sound/Lateral_Motion.json similarity index 100% rename from data/saved/sound/Lateral_Motion.json rename to data_omnisphere/saved/sound/Lateral_Motion.json diff --git a/data/saved/sound/Living_MoogTriangles.json b/data_omnisphere/saved/sound/Living_MoogTriangles.json similarity index 100% rename from data/saved/sound/Living_MoogTriangles.json rename to data_omnisphere/saved/sound/Living_MoogTriangles.json diff --git a/data/saved/sound/Love_Bass.json b/data_omnisphere/saved/sound/Love_Bass.json similarity index 100% rename from data/saved/sound/Love_Bass.json rename to data_omnisphere/saved/sound/Love_Bass.json diff --git a/data/saved/sound/Lunar_Choirs.json b/data_omnisphere/saved/sound/Lunar_Choirs.json similarity index 100% rename from data/saved/sound/Lunar_Choirs.json rename to data_omnisphere/saved/sound/Lunar_Choirs.json diff --git a/data/saved/sound/Magnetic_Fields.json b/data_omnisphere/saved/sound/Magnetic_Fields.json similarity index 100% rename from data/saved/sound/Magnetic_Fields.json rename to data_omnisphere/saved/sound/Magnetic_Fields.json diff --git a/data/saved/sound/Magnetic_Resonance.json b/data_omnisphere/saved/sound/Magnetic_Resonance.json similarity index 100% rename from data/saved/sound/Magnetic_Resonance.json rename to data_omnisphere/saved/sound/Magnetic_Resonance.json diff --git a/data/saved/sound/Maldives_Islands.json b/data_omnisphere/saved/sound/Maldives_Islands.json similarity index 100% rename from data/saved/sound/Maldives_Islands.json rename to data_omnisphere/saved/sound/Maldives_Islands.json diff --git a/data/saved/sound/Mbira_bottlecap.json b/data_omnisphere/saved/sound/Mbira_bottlecap.json similarity index 100% rename from data/saved/sound/Mbira_bottlecap.json rename to data_omnisphere/saved/sound/Mbira_bottlecap.json diff --git a/data/saved/sound/Memorymoog_Swellee.json b/data_omnisphere/saved/sound/Memorymoog_Swellee.json similarity index 100% rename from data/saved/sound/Memorymoog_Swellee.json rename to data_omnisphere/saved/sound/Memorymoog_Swellee.json diff --git a/data/saved/sound/Metallic_Mallets.json b/data_omnisphere/saved/sound/Metallic_Mallets.json similarity index 100% rename from data/saved/sound/Metallic_Mallets.json rename to data_omnisphere/saved/sound/Metallic_Mallets.json diff --git a/data/saved/sound/Mondo_RondoBass.json b/data_omnisphere/saved/sound/Mondo_RondoBass.json similarity index 100% rename from data/saved/sound/Mondo_RondoBass.json rename to data_omnisphere/saved/sound/Mondo_RondoBass.json diff --git a/data/saved/sound/Moonlit_Night.json b/data_omnisphere/saved/sound/Moonlit_Night.json similarity index 100% rename from data/saved/sound/Moonlit_Night.json rename to data_omnisphere/saved/sound/Moonlit_Night.json diff --git a/data/saved/sound/Moving_Vowels.json b/data_omnisphere/saved/sound/Moving_Vowels.json similarity index 100% rename from data/saved/sound/Moving_Vowels.json rename to data_omnisphere/saved/sound/Moving_Vowels.json diff --git a/data/saved/sound/Mystical_Touch.json b/data_omnisphere/saved/sound/Mystical_Touch.json similarity index 100% rename from data/saved/sound/Mystical_Touch.json rename to data_omnisphere/saved/sound/Mystical_Touch.json diff --git a/data/saved/sound/Nasty_Bass.json b/data_omnisphere/saved/sound/Nasty_Bass.json similarity index 100% rename from data/saved/sound/Nasty_Bass.json rename to data_omnisphere/saved/sound/Nasty_Bass.json diff --git a/data/saved/sound/NiceDark_Pad.json b/data_omnisphere/saved/sound/NiceDark_Pad.json similarity index 100% rename from data/saved/sound/NiceDark_Pad.json rename to data_omnisphere/saved/sound/NiceDark_Pad.json diff --git a/data/saved/sound/Nylon_Guitar.json b/data_omnisphere/saved/sound/Nylon_Guitar.json similarity index 100% rename from data/saved/sound/Nylon_Guitar.json rename to data_omnisphere/saved/sound/Nylon_Guitar.json diff --git a/data/saved/sound/Octabass_Plucker.json b/data_omnisphere/saved/sound/Octabass_Plucker.json similarity index 100% rename from data/saved/sound/Octabass_Plucker.json rename to data_omnisphere/saved/sound/Octabass_Plucker.json diff --git a/data/saved/sound/Perky_Bellsy.json b/data_omnisphere/saved/sound/Perky_Bellsy.json similarity index 100% rename from data/saved/sound/Perky_Bellsy.json rename to data_omnisphere/saved/sound/Perky_Bellsy.json diff --git a/data/saved/sound/Phased_Hammond.json b/data_omnisphere/saved/sound/Phased_Hammond.json similarity index 100% rename from data/saved/sound/Phased_Hammond.json rename to data_omnisphere/saved/sound/Phased_Hammond.json diff --git a/data/saved/sound/Phoenix_Rising.json b/data_omnisphere/saved/sound/Phoenix_Rising.json similarity index 100% rename from data/saved/sound/Phoenix_Rising.json rename to data_omnisphere/saved/sound/Phoenix_Rising.json diff --git a/data/saved/sound/Poly Flanger.json b/data_omnisphere/saved/sound/Poly Flanger.json similarity index 100% rename from data/saved/sound/Poly Flanger.json rename to data_omnisphere/saved/sound/Poly Flanger.json diff --git a/data/saved/sound/PolySynth_Flanger.json b/data_omnisphere/saved/sound/PolySynth_Flanger.json similarity index 100% rename from data/saved/sound/PolySynth_Flanger.json rename to data_omnisphere/saved/sound/PolySynth_Flanger.json diff --git a/data/saved/sound/Pop Fem_Ohs Voice.json b/data_omnisphere/saved/sound/Pop Fem_Ohs Voice.json similarity index 100% rename from data/saved/sound/Pop Fem_Ohs Voice.json rename to data_omnisphere/saved/sound/Pop Fem_Ohs Voice.json diff --git a/data/saved/sound/Power_Poly.json b/data_omnisphere/saved/sound/Power_Poly.json similarity index 100% rename from data/saved/sound/Power_Poly.json rename to data_omnisphere/saved/sound/Power_Poly.json diff --git a/data/saved/sound/Pretty_LayerBells.json b/data_omnisphere/saved/sound/Pretty_LayerBells.json similarity index 100% rename from data/saved/sound/Pretty_LayerBells.json rename to data_omnisphere/saved/sound/Pretty_LayerBells.json diff --git a/data/saved/sound/Resonator_Scissors.json b/data_omnisphere/saved/sound/Resonator_Scissors.json similarity index 100% rename from data/saved/sound/Resonator_Scissors.json rename to data_omnisphere/saved/sound/Resonator_Scissors.json diff --git a/data/saved/sound/Rippling_Foils.json b/data_omnisphere/saved/sound/Rippling_Foils.json similarity index 100% rename from data/saved/sound/Rippling_Foils.json rename to data_omnisphere/saved/sound/Rippling_Foils.json diff --git a/data/saved/sound/SID_SolidBass.json b/data_omnisphere/saved/sound/SID_SolidBass.json similarity index 100% rename from data/saved/sound/SID_SolidBass.json rename to data_omnisphere/saved/sound/SID_SolidBass.json diff --git a/data/saved/sound/Seq_Bells.json b/data_omnisphere/saved/sound/Seq_Bells.json similarity index 100% rename from data/saved/sound/Seq_Bells.json rename to data_omnisphere/saved/sound/Seq_Bells.json diff --git a/data/saved/sound/Seventies_Harpsiverb.json b/data_omnisphere/saved/sound/Seventies_Harpsiverb.json similarity index 100% rename from data/saved/sound/Seventies_Harpsiverb.json rename to data_omnisphere/saved/sound/Seventies_Harpsiverb.json diff --git a/data/saved/sound/Shapeshifting_AnalogPad.json b/data_omnisphere/saved/sound/Shapeshifting_AnalogPad.json similarity index 100% rename from data/saved/sound/Shapeshifting_AnalogPad.json rename to data_omnisphere/saved/sound/Shapeshifting_AnalogPad.json diff --git a/data/saved/sound/Shards_GlassRhodes.json b/data_omnisphere/saved/sound/Shards_GlassRhodes.json similarity index 100% rename from data/saved/sound/Shards_GlassRhodes.json rename to data_omnisphere/saved/sound/Shards_GlassRhodes.json diff --git a/data/saved/sound/Shining_Voices.json b/data_omnisphere/saved/sound/Shining_Voices.json similarity index 100% rename from data/saved/sound/Shining_Voices.json rename to data_omnisphere/saved/sound/Shining_Voices.json diff --git a/data/saved/sound/Shooting_Sines.json b/data_omnisphere/saved/sound/Shooting_Sines.json similarity index 100% rename from data/saved/sound/Shooting_Sines.json rename to data_omnisphere/saved/sound/Shooting_Sines.json diff --git a/data/saved/sound/Short Trip_To Eternity.json b/data_omnisphere/saved/sound/Short Trip_To Eternity.json similarity index 100% rename from data/saved/sound/Short Trip_To Eternity.json rename to data_omnisphere/saved/sound/Short Trip_To Eternity.json diff --git a/data/saved/sound/Simple_Emotion.json b/data_omnisphere/saved/sound/Simple_Emotion.json similarity index 100% rename from data/saved/sound/Simple_Emotion.json rename to data_omnisphere/saved/sound/Simple_Emotion.json diff --git a/data/saved/sound/SingingBell_Harmonics.json b/data_omnisphere/saved/sound/SingingBell_Harmonics.json similarity index 100% rename from data/saved/sound/SingingBell_Harmonics.json rename to data_omnisphere/saved/sound/SingingBell_Harmonics.json diff --git a/data/saved/sound/Singing_BellHarmonics.json b/data_omnisphere/saved/sound/Singing_BellHarmonics.json similarity index 100% rename from data/saved/sound/Singing_BellHarmonics.json rename to data_omnisphere/saved/sound/Singing_BellHarmonics.json diff --git a/data/saved/sound/Snappy_SynthBlip.json b/data_omnisphere/saved/sound/Snappy_SynthBlip.json similarity index 100% rename from data/saved/sound/Snappy_SynthBlip.json rename to data_omnisphere/saved/sound/Snappy_SynthBlip.json diff --git a/data/saved/sound/Snappy_Virus.json b/data_omnisphere/saved/sound/Snappy_Virus.json similarity index 100% rename from data/saved/sound/Snappy_Virus.json rename to data_omnisphere/saved/sound/Snappy_Virus.json diff --git a/data/saved/sound/Sparkling_Aurora.json b/data_omnisphere/saved/sound/Sparkling_Aurora.json similarity index 100% rename from data/saved/sound/Sparkling_Aurora.json rename to data_omnisphere/saved/sound/Sparkling_Aurora.json diff --git a/data/saved/sound/Straight_Mallet.json b/data_omnisphere/saved/sound/Straight_Mallet.json similarity index 100% rename from data/saved/sound/Straight_Mallet.json rename to data_omnisphere/saved/sound/Straight_Mallet.json diff --git a/data/saved/sound/Strat_Muted.json b/data_omnisphere/saved/sound/Strat_Muted.json similarity index 100% rename from data/saved/sound/Strat_Muted.json rename to data_omnisphere/saved/sound/Strat_Muted.json diff --git a/data/saved/sound/Sublime_Reverence.json b/data_omnisphere/saved/sound/Sublime_Reverence.json similarity index 100% rename from data/saved/sound/Sublime_Reverence.json rename to data_omnisphere/saved/sound/Sublime_Reverence.json diff --git a/data/saved/sound/Subtly_Smooth.json b/data_omnisphere/saved/sound/Subtly_Smooth.json similarity index 100% rename from data/saved/sound/Subtly_Smooth.json rename to data_omnisphere/saved/sound/Subtly_Smooth.json diff --git a/data/saved/sound/Sweetness_Rhodes.json b/data_omnisphere/saved/sound/Sweetness_Rhodes.json similarity index 100% rename from data/saved/sound/Sweetness_Rhodes.json rename to data_omnisphere/saved/sound/Sweetness_Rhodes.json diff --git a/data/saved/sound/Swirling_Formation.json b/data_omnisphere/saved/sound/Swirling_Formation.json similarity index 100% rename from data/saved/sound/Swirling_Formation.json rename to data_omnisphere/saved/sound/Swirling_Formation.json diff --git a/data/saved/sound/Synth_Bass.json b/data_omnisphere/saved/sound/Synth_Bass.json similarity index 100% rename from data/saved/sound/Synth_Bass.json rename to data_omnisphere/saved/sound/Synth_Bass.json diff --git a/data/saved/sound/Tapping_Tines.json b/data_omnisphere/saved/sound/Tapping_Tines.json similarity index 100% rename from data/saved/sound/Tapping_Tines.json rename to data_omnisphere/saved/sound/Tapping_Tines.json diff --git a/data/saved/sound/TineSmith_Tiny.json b/data_omnisphere/saved/sound/TineSmith_Tiny.json similarity index 100% rename from data/saved/sound/TineSmith_Tiny.json rename to data_omnisphere/saved/sound/TineSmith_Tiny.json diff --git a/data/saved/sound/Tonal_Lightbulbs.json b/data_omnisphere/saved/sound/Tonal_Lightbulbs.json similarity index 100% rename from data/saved/sound/Tonal_Lightbulbs.json rename to data_omnisphere/saved/sound/Tonal_Lightbulbs.json diff --git a/data/saved/sound/Toy_Celeste.json b/data_omnisphere/saved/sound/Toy_Celeste.json similarity index 100% rename from data/saved/sound/Toy_Celeste.json rename to data_omnisphere/saved/sound/Toy_Celeste.json diff --git a/data/saved/sound/Tranquility_Bell.json b/data_omnisphere/saved/sound/Tranquility_Bell.json similarity index 100% rename from data/saved/sound/Tranquility_Bell.json rename to data_omnisphere/saved/sound/Tranquility_Bell.json diff --git a/data/saved/sound/Triangle_Lead.json b/data_omnisphere/saved/sound/Triangle_Lead.json similarity index 100% rename from data/saved/sound/Triangle_Lead.json rename to data_omnisphere/saved/sound/Triangle_Lead.json diff --git a/data/saved/sound/VoiceOoos_Female.json b/data_omnisphere/saved/sound/VoiceOoos_Female.json similarity index 100% rename from data/saved/sound/VoiceOoos_Female.json rename to data_omnisphere/saved/sound/VoiceOoos_Female.json diff --git a/data/saved/sound/Voice_Soprano.json b/data_omnisphere/saved/sound/Voice_Soprano.json similarity index 100% rename from data/saved/sound/Voice_Soprano.json rename to data_omnisphere/saved/sound/Voice_Soprano.json diff --git a/data/saved/sound/Voices_Female.json b/data_omnisphere/saved/sound/Voices_Female.json similarity index 100% rename from data/saved/sound/Voices_Female.json rename to data_omnisphere/saved/sound/Voices_Female.json diff --git a/data/saved/sound/Voxpad_Mellow.json b/data_omnisphere/saved/sound/Voxpad_Mellow.json similarity index 100% rename from data/saved/sound/Voxpad_Mellow.json rename to data_omnisphere/saved/sound/Voxpad_Mellow.json diff --git a/data/saved/sound/Water_Lillies.json b/data_omnisphere/saved/sound/Water_Lillies.json similarity index 100% rename from data/saved/sound/Water_Lillies.json rename to data_omnisphere/saved/sound/Water_Lillies.json diff --git a/data/saved/sound/Whistling_Metals.json b/data_omnisphere/saved/sound/Whistling_Metals.json similarity index 100% rename from data/saved/sound/Whistling_Metals.json rename to data_omnisphere/saved/sound/Whistling_Metals.json diff --git a/data/saved/sound/Zimbira_Scissors.json b/data_omnisphere/saved/sound/Zimbira_Scissors.json similarity index 100% rename from data/saved/sound/Zimbira_Scissors.json rename to data_omnisphere/saved/sound/Zimbira_Scissors.json diff --git a/data/saved/visual/!!Geographic_Elevations.json b/data_omnisphere/saved/visual/!!Geographic_Elevations.json similarity index 100% rename from data/saved/visual/!!Geographic_Elevations.json rename to data_omnisphere/saved/visual/!!Geographic_Elevations.json diff --git a/data/saved/visual/!!Runway Vertical_Aqua.json b/data_omnisphere/saved/visual/!!Runway Vertical_Aqua.json similarity index 100% rename from data/saved/visual/!!Runway Vertical_Aqua.json rename to data_omnisphere/saved/visual/!!Runway Vertical_Aqua.json diff --git a/data/saved/visual/!!Runway Vertical_Green.json b/data_omnisphere/saved/visual/!!Runway Vertical_Green.json similarity index 100% rename from data/saved/visual/!!Runway Vertical_Green.json rename to data_omnisphere/saved/visual/!!Runway Vertical_Green.json diff --git a/data/saved/visual/!!Runway Vertical_Orange.json b/data_omnisphere/saved/visual/!!Runway Vertical_Orange.json similarity index 100% rename from data/saved/visual/!!Runway Vertical_Orange.json rename to data_omnisphere/saved/visual/!!Runway Vertical_Orange.json diff --git a/data/saved/visual/!!Runway Vertical_Red.json b/data_omnisphere/saved/visual/!!Runway Vertical_Red.json similarity index 100% rename from data/saved/visual/!!Runway Vertical_Red.json rename to data_omnisphere/saved/visual/!!Runway Vertical_Red.json diff --git a/data/saved/visual/!!Teal_Smoke.json b/data_omnisphere/saved/visual/!!Teal_Smoke.json similarity index 100% rename from data/saved/visual/!!Teal_Smoke.json rename to data_omnisphere/saved/visual/!!Teal_Smoke.json diff --git a/data/saved/visual/CircleFill_WormTrails.json b/data_omnisphere/saved/visual/CircleFill_WormTrails.json similarity index 100% rename from data/saved/visual/CircleFill_WormTrails.json rename to data_omnisphere/saved/visual/CircleFill_WormTrails.json diff --git a/data/saved/visual/CircleFilled_BigRed.json b/data_omnisphere/saved/visual/CircleFilled_BigRed.json similarity index 100% rename from data/saved/visual/CircleFilled_BigRed.json rename to data_omnisphere/saved/visual/CircleFilled_BigRed.json diff --git a/data/saved/visual/CircleFilled_SimpleAqua.json b/data_omnisphere/saved/visual/CircleFilled_SimpleAqua.json similarity index 100% rename from data/saved/visual/CircleFilled_SimpleAqua.json rename to data_omnisphere/saved/visual/CircleFilled_SimpleAqua.json diff --git a/data/saved/visual/CircleGreen_SlowGrow.json b/data_omnisphere/saved/visual/CircleGreen_SlowGrow.json similarity index 100% rename from data/saved/visual/CircleGreen_SlowGrow.json rename to data_omnisphere/saved/visual/CircleGreen_SlowGrow.json diff --git a/data/saved/visual/CircleOutline_BigFloat.json b/data_omnisphere/saved/visual/CircleOutline_BigFloat.json similarity index 100% rename from data/saved/visual/CircleOutline_BigFloat.json rename to data_omnisphere/saved/visual/CircleOutline_BigFloat.json diff --git a/data/saved/visual/CircleYellow_Growing.json b/data_omnisphere/saved/visual/CircleYellow_Growing.json similarity index 100% rename from data/saved/visual/CircleYellow_Growing.json rename to data_omnisphere/saved/visual/CircleYellow_Growing.json diff --git a/data/saved/visual/Circle_Growing.json b/data_omnisphere/saved/visual/Circle_Growing.json similarity index 100% rename from data/saved/visual/Circle_Growing.json rename to data_omnisphere/saved/visual/Circle_Growing.json diff --git a/data/saved/visual/Circle_MustardGreen.json b/data_omnisphere/saved/visual/Circle_MustardGreen.json similarity index 100% rename from data/saved/visual/Circle_MustardGreen.json rename to data_omnisphere/saved/visual/Circle_MustardGreen.json diff --git a/data/saved/visual/Circle_Rainbows.json b/data_omnisphere/saved/visual/Circle_Rainbows.json similarity index 100% rename from data/saved/visual/Circle_Rainbows.json rename to data_omnisphere/saved/visual/Circle_Rainbows.json diff --git a/data/saved/visual/CirclesRed_Exploding.json b/data_omnisphere/saved/visual/CirclesRed_Exploding.json similarity index 100% rename from data/saved/visual/CirclesRed_Exploding.json rename to data_omnisphere/saved/visual/CirclesRed_Exploding.json diff --git a/data/saved/visual/Circles_Floating 90.json b/data_omnisphere/saved/visual/Circles_Floating 90.json similarity index 100% rename from data/saved/visual/Circles_Floating 90.json rename to data_omnisphere/saved/visual/Circles_Floating 90.json diff --git a/data/saved/visual/Floaty_Squares.json b/data_omnisphere/saved/visual/Floaty_Squares.json similarity index 100% rename from data/saved/visual/Floaty_Squares.json rename to data_omnisphere/saved/visual/Floaty_Squares.json diff --git a/data/saved/visual/Green_Quick Glowy.json b/data_omnisphere/saved/visual/Green_Quick Glowy.json similarity index 100% rename from data/saved/visual/Green_Quick Glowy.json rename to data_omnisphere/saved/visual/Green_Quick Glowy.json diff --git a/data/saved/visual/Growing_ColorCircles.json b/data_omnisphere/saved/visual/Growing_ColorCircles.json similarity index 100% rename from data/saved/visual/Growing_ColorCircles.json rename to data_omnisphere/saved/visual/Growing_ColorCircles.json diff --git a/data/saved/visual/LinesAqua_LongTrails.json b/data_omnisphere/saved/visual/LinesAqua_LongTrails.json similarity index 100% rename from data/saved/visual/LinesAqua_LongTrails.json rename to data_omnisphere/saved/visual/LinesAqua_LongTrails.json diff --git a/data/saved/visual/LinesBlue_HugeTrail.json b/data_omnisphere/saved/visual/LinesBlue_HugeTrail.json similarity index 100% rename from data/saved/visual/LinesBlue_HugeTrail.json rename to data_omnisphere/saved/visual/LinesBlue_HugeTrail.json diff --git a/data/saved/visual/LinesRed_LongFade.json b/data_omnisphere/saved/visual/LinesRed_LongFade.json similarity index 100% rename from data/saved/visual/LinesRed_LongFade.json rename to data_omnisphere/saved/visual/LinesRed_LongFade.json diff --git a/data/saved/visual/Lines_AutoRotate.json b/data_omnisphere/saved/visual/Lines_AutoRotate.json similarity index 100% rename from data/saved/visual/Lines_AutoRotate.json rename to data_omnisphere/saved/visual/Lines_AutoRotate.json diff --git a/data/saved/visual/Lines_FastTrails.json b/data_omnisphere/saved/visual/Lines_FastTrails.json similarity index 100% rename from data/saved/visual/Lines_FastTrails.json rename to data_omnisphere/saved/visual/Lines_FastTrails.json diff --git a/data/saved/visual/Lines_Horizontal.json b/data_omnisphere/saved/visual/Lines_Horizontal.json similarity index 100% rename from data/saved/visual/Lines_Horizontal.json rename to data_omnisphere/saved/visual/Lines_Horizontal.json diff --git a/data/saved/visual/Lines_SmoothRibbon.json b/data_omnisphere/saved/visual/Lines_SmoothRibbon.json similarity index 100% rename from data/saved/visual/Lines_SmoothRibbon.json rename to data_omnisphere/saved/visual/Lines_SmoothRibbon.json diff --git a/data/saved/visual/Melting_ColorKaleid.json b/data_omnisphere/saved/visual/Melting_ColorKaleid.json similarity index 100% rename from data/saved/visual/Melting_ColorKaleid.json rename to data_omnisphere/saved/visual/Melting_ColorKaleid.json diff --git a/data/saved/visual/Quick_Circles.json b/data_omnisphere/saved/visual/Quick_Circles.json similarity index 100% rename from data/saved/visual/Quick_Circles.json rename to data_omnisphere/saved/visual/Quick_Circles.json diff --git a/data/saved/visual/Runway Vertical_Aqua.json b/data_omnisphere/saved/visual/Runway Vertical_Aqua.json similarity index 100% rename from data/saved/visual/Runway Vertical_Aqua.json rename to data_omnisphere/saved/visual/Runway Vertical_Aqua.json diff --git a/data/saved/visual/Sherbert_Swirls.json b/data_omnisphere/saved/visual/Sherbert_Swirls.json similarity index 100% rename from data/saved/visual/Sherbert_Swirls.json rename to data_omnisphere/saved/visual/Sherbert_Swirls.json diff --git a/data/saved/visual/Simple Circle_Blue.json b/data_omnisphere/saved/visual/Simple Circle_Blue.json similarity index 100% rename from data/saved/visual/Simple Circle_Blue.json rename to data_omnisphere/saved/visual/Simple Circle_Blue.json diff --git a/data/saved/visual/Smoke Donut_Blue.json b/data_omnisphere/saved/visual/Smoke Donut_Blue.json similarity index 100% rename from data/saved/visual/Smoke Donut_Blue.json rename to data_omnisphere/saved/visual/Smoke Donut_Blue.json diff --git a/data/saved/visual/Smoke Donut_Purple.json b/data_omnisphere/saved/visual/Smoke Donut_Purple.json similarity index 100% rename from data/saved/visual/Smoke Donut_Purple.json rename to data_omnisphere/saved/visual/Smoke Donut_Purple.json diff --git a/data/saved/visual/Smoke Donut_Red.json b/data_omnisphere/saved/visual/Smoke Donut_Red.json similarity index 100% rename from data/saved/visual/Smoke Donut_Red.json rename to data_omnisphere/saved/visual/Smoke Donut_Red.json diff --git a/data/saved/visual/SquareFill_Trails.json b/data_omnisphere/saved/visual/SquareFill_Trails.json similarity index 100% rename from data/saved/visual/SquareFill_Trails.json rename to data_omnisphere/saved/visual/SquareFill_Trails.json diff --git a/data/saved/visual/SquareFilled_BlueRotate.json b/data_omnisphere/saved/visual/SquareFilled_BlueRotate.json similarity index 100% rename from data/saved/visual/SquareFilled_BlueRotate.json rename to data_omnisphere/saved/visual/SquareFilled_BlueRotate.json diff --git a/data/saved/visual/SquareFilled_JustGreen.json b/data_omnisphere/saved/visual/SquareFilled_JustGreen.json similarity index 100% rename from data/saved/visual/SquareFilled_JustGreen.json rename to data_omnisphere/saved/visual/SquareFilled_JustGreen.json diff --git a/data/saved/visual/SquareFilled_JustOrange.json b/data_omnisphere/saved/visual/SquareFilled_JustOrange.json similarity index 100% rename from data/saved/visual/SquareFilled_JustOrange.json rename to data_omnisphere/saved/visual/SquareFilled_JustOrange.json diff --git a/data/saved/visual/SquareGreys_muted.json b/data_omnisphere/saved/visual/SquareGreys_muted.json similarity index 100% rename from data/saved/visual/SquareGreys_muted.json rename to data_omnisphere/saved/visual/SquareGreys_muted.json diff --git a/data/saved/visual/SquareGrowth_Faster.json b/data_omnisphere/saved/visual/SquareGrowth_Faster.json similarity index 100% rename from data/saved/visual/SquareGrowth_Faster.json rename to data_omnisphere/saved/visual/SquareGrowth_Faster.json diff --git a/data/saved/visual/SquareTrails_Default.json b/data_omnisphere/saved/visual/SquareTrails_Default.json similarity index 100% rename from data/saved/visual/SquareTrails_Default.json rename to data_omnisphere/saved/visual/SquareTrails_Default.json diff --git a/data/saved/visual/SquareTrails_Turning.json b/data_omnisphere/saved/visual/SquareTrails_Turning.json similarity index 100% rename from data/saved/visual/SquareTrails_Turning.json rename to data_omnisphere/saved/visual/SquareTrails_Turning.json diff --git a/data/saved/visual/Square_Rotating.json b/data_omnisphere/saved/visual/Square_Rotating.json similarity index 100% rename from data/saved/visual/Square_Rotating.json rename to data_omnisphere/saved/visual/Square_Rotating.json diff --git a/data/saved/visual/SquaresFilled_NoisyVert.json b/data_omnisphere/saved/visual/SquaresFilled_NoisyVert.json similarity index 100% rename from data/saved/visual/SquaresFilled_NoisyVert.json rename to data_omnisphere/saved/visual/SquaresFilled_NoisyVert.json diff --git a/data/saved/visual/Squares_FastShrink.json b/data_omnisphere/saved/visual/Squares_FastShrink.json similarity index 100% rename from data/saved/visual/Squares_FastShrink.json rename to data_omnisphere/saved/visual/Squares_FastShrink.json diff --git a/data/saved/visual/TrapezoidRed_Explode.json b/data_omnisphere/saved/visual/TrapezoidRed_Explode.json similarity index 100% rename from data/saved/visual/TrapezoidRed_Explode.json rename to data_omnisphere/saved/visual/TrapezoidRed_Explode.json diff --git a/data/saved/visual/TriangleBlue_RotateTrails.json b/data_omnisphere/saved/visual/TriangleBlue_RotateTrails.json similarity index 100% rename from data/saved/visual/TriangleBlue_RotateTrails.json rename to data_omnisphere/saved/visual/TriangleBlue_RotateTrails.json diff --git a/data/saved/visual/TriangleFilled_SimpleRed.json b/data_omnisphere/saved/visual/TriangleFilled_SimpleRed.json similarity index 100% rename from data/saved/visual/TriangleFilled_SimpleRed.json rename to data_omnisphere/saved/visual/TriangleFilled_SimpleRed.json diff --git a/data/saved/visual/TriangleRainbow_Explode.json b/data_omnisphere/saved/visual/TriangleRainbow_Explode.json similarity index 100% rename from data/saved/visual/TriangleRainbow_Explode.json rename to data_omnisphere/saved/visual/TriangleRainbow_Explode.json diff --git a/data/saved/visual/TriangleRed_Exploding.json b/data_omnisphere/saved/visual/TriangleRed_Exploding.json similarity index 100% rename from data/saved/visual/TriangleRed_Exploding.json rename to data_omnisphere/saved/visual/TriangleRed_Exploding.json diff --git a/data/saved/visual/Triangle_Gradient.json b/data_omnisphere/saved/visual/Triangle_Gradient.json similarity index 100% rename from data/saved/visual/Triangle_Gradient.json rename to data_omnisphere/saved/visual/Triangle_Gradient.json diff --git a/data/saved/visual/Triangle_GreenTrails.json b/data_omnisphere/saved/visual/Triangle_GreenTrails.json similarity index 100% rename from data/saved/visual/Triangle_GreenTrails.json rename to data_omnisphere/saved/visual/Triangle_GreenTrails.json diff --git a/data/saved/visual/Triangles_Drifting.json b/data_omnisphere/saved/visual/Triangles_Drifting.json similarity index 100% rename from data/saved/visual/Triangles_Drifting.json rename to data_omnisphere/saved/visual/Triangles_Drifting.json diff --git a/doc/bringup.md b/doc/bringup.md new file mode 100644 index 00000000..f1cb7ad3 --- /dev/null +++ b/doc/bringup.md @@ -0,0 +1,41 @@ +- Edit BIOS/UEFI settings to turn off NumLock and Boot after a Power Loss + +- Create a spacepalette@gmail.com user, give administrator privileges + +- Install Chrome and Remote Desktop Connection extension, enable it + +- Enable networking and file sharing. + +- install password manager (Bitwarden) + +- Copy .../LATEST_Omnisphere 2 Installation and .../LATEST_Stylus_RMX Installation to c:\tmp + +- Install Resolume 7, license it, turn audio off, turn off exit confirmation + +- Install Bidule, license it + +- Create c:\Program Files\Common Files\VST2 and VST3 + +- Update Bidule to use those directories (VST3 first), and enable OSC + +- Install LoopBe30, license it, turn off shortcut detection, expand to 16 ports + +- install Omnisphere and Stylus RMX + +- Install Sensel app + +- Install latest Palette installer + +- Set Resolume ffgl folder to c:\program files\Palette\ffgl, enable OSC, open c:\program files\common files\Palette\data\config\PaletteDefault.avc + +- Pin Start Palette and Stop Palette to the taskbar + +- Add %PALETTE% + +- REBOOT + +- Authorize Omnisphere and Stylus RMX. + +- Load Multis into Omnisphere + +- Load presets in Stylus RMX diff --git a/ffgl/build/windows/updateffgl.bat b/ffgl/build/windows/updateffgl.bat index 5da0e4bf..e0301726 100644 --- a/ffgl/build/windows/updateffgl.bat +++ b/ffgl/build/windows/updateffgl.bat @@ -1,11 +1,12 @@ call ..\..\..\scripts\killresolume.bat call delay 3 +echo on set FFGL="c:\Program Files\Palette\ffgl" copy ..\..\source\lib\pthreads\Pre-built.2\dll\x64\pthreadVC2.dll %FFGL% rem copy ..\..\..\build\windows\msvcr100.dll %FFGL% copy ..\..\binaries\x64\Debug\Palette.dll %FFGL% copy ..\..\binaries\x64\Debug\Palette.pdb %FFGL% -copy ..\..\..\data_omnisphere\config\paramdefs.json "%CommonProgramFiles%\Palette\config\paramdefs.json" -copy ..\..\..\data_omnisphere\config\resolume.json "%CommonProgramFiles%\Palette\config\resolume.json" -copy ..\..\..\data_omnisphere\config\synths.json "%CommonProgramFiles%\Palette\config\synths.json" +copy ..\..\..\data_omnisphere\config\paramdefs.json "%CommonProgramFiles%\Palette\data_%PALETTE_DATA%\config\paramdefs.json" +copy ..\..\..\data_omnisphere\config\resolume.json "%CommonProgramFiles%\Palette\data_%PALETTE_DATA%\config\resolume.json" +copy ..\..\..\data_omnisphere\config\synths.json "%CommonProgramFiles%\Palette\data_%PALETTE_DATA%\config\synths.json" palette start resolume diff --git a/ffgl/build/windows/viconfig.bat b/ffgl/build/windows/viconfig.bat deleted file mode 100644 index a57bc350..00000000 --- a/ffgl/build/windows/viconfig.bat +++ /dev/null @@ -1 +0,0 @@ -vi "%PALETTE_DATA_PATH%\config\ffgl.json" diff --git a/ffgl/source/lib/nosuch/NosuchDebug.cpp b/ffgl/source/lib/nosuch/NosuchDebug.cpp index e72c6c82..890bfb74 100644 --- a/ffgl/source/lib/nosuch/NosuchDebug.cpp +++ b/ffgl/source/lib/nosuch/NosuchDebug.cpp @@ -113,46 +113,78 @@ NosuchDebugDumpLog() ReleaseMutex(dMutex); } +std::string +PaletteDataPath() +{ + + errno_t err; + char* palette = NULL; + char* source = NULL; + char *dataval = NULL; + char *value = NULL; + std::string sourcepath = ""; + std::string datapath; + size_t len; + + err = _dupenv_s( &palette, &len, "PALETTE" ); + if( err || palette == NULL ) + { + NosuchDebug( "No value for PALETTE environment variable!?\n" ); + return NULL; + } + + err = _dupenv_s( &dataval, &len, "PALETTE_DATA" ); + if ( err == 0 && dataval != NULL ) { + dataval = "omnisphere"; + } + + err = _dupenv_s( &value, &len, "PALETTE_SOURCE" ); + std::string parent; + if ( err == 0 && value != NULL ) { + parent = std::string(value); + } else { + parent = "c:\\Program Files\\Common Files\\Palette"; + } + datapath = std::string(parent) + "\\data_" + std::string( dataval ); + + NosuchDebug( "NosuchDebugInit: Level=%d Cursor=%d Param=%d API=%d\n", NosuchDebugLevel, NosuchDebugCursor , NosuchDebugParam, NosuchDebugAPI); + return datapath; +} + void RealNosuchDebugInit() { if ( DebugInitialized ) { return; } - dMutex = CreateMutex(NULL, FALSE, NULL); - DebugInitialized = TRUE; - NosuchDebugLogPath = "c:\\windows\\temp\\ffgl.log";// last resort - char* value; errno_t err; + char* palette = NULL; + char *value = NULL; size_t len; - err = _dupenv_s( &value, &len, "PALETTE_DATA_PATH" ); - if ( err == 0 && value != NULL ) { - NosuchDebugLogPath = std::string( value ) + "\\logs\\ffgl.log"; - free( value ); - } else { - // Otherwise it's in %CommonProgramFiles% - err = _dupenv_s( &value, &len, "CommonProgramFiles" ); - if( err == 0 && value != NULL ) { - // %CommonProgramFiles% is defined - NosuchDebugLogPath = std::string( value ) + "\\Palette\\data\\logs\\ffgl.log"; - } + err = _dupenv_s( &palette, &len, "PALETTE" ); + if( err || palette == NULL ) + { + NosuchDebug( "No value for PALETTE environment variable!?\n" ); + return; } + dMutex = CreateMutex(NULL, FALSE, NULL); + DebugInitialized = TRUE; + + std::string datapath = PaletteDataPath(); + NosuchDebugLogPath = datapath + "\\logs\\ffgl.log"; + NosuchDebug( "NosuchDebugInit: Level=%d Cursor=%d Param=%d API=%d\n", NosuchDebugLevel, NosuchDebugCursor , NosuchDebugParam, NosuchDebugAPI); - err = _dupenv_s( &value, &len, "PALETTE" ); - if( err || value == NULL ) - { - NosuchDebug( "No value for PALETTE environment variable!?\n" ); - } if (value != NULL) { free( value ); } - - + if (palette != NULL) { + free( palette ); + } } void diff --git a/ffgl/source/lib/nosuch/NosuchUtil.h b/ffgl/source/lib/nosuch/NosuchUtil.h index 2a66d9f4..1583d388 100644 --- a/ffgl/source/lib/nosuch/NosuchUtil.h +++ b/ffgl/source/lib/nosuch/NosuchUtil.h @@ -69,6 +69,7 @@ void NosuchPrintTime(const char *prefix); // std::string NosuchSnprintf(const char *fmt, ...); // void NosuchFree(std::string s); int NosuchNetworkInit(); +std::string PaletteDataPath(); std::vector NosuchSplitOnAnyChar(std::string s, std::string sepchars); std::vector NosuchSplitOnString(const std::string& s, const std::string& delim, const bool keep_empty); diff --git a/ffgl/source/lib/palette/PaletteHost.cpp b/ffgl/source/lib/palette/PaletteHost.cpp index f5666e84..21170027 100644 --- a/ffgl/source/lib/palette/PaletteHost.cpp +++ b/ffgl/source/lib/palette/PaletteHost.cpp @@ -244,22 +244,10 @@ PaletteHost::PaletteHost() std::string configfile; - char* datapathValue; - size_t len1; - errno_t datapathErr = _dupenv_s( &datapathValue, &len1, "PALETTE_DATA_PATH" ); - if ( !datapathErr && datapathValue != NULL ) { - configfile = NosuchSnprintf( "%s/config/ffgl.json", datapathValue ); - } else { - char* localValue; - size_t locallen; - errno_t localerr = _dupenv_s( &localValue, &locallen, "CommonProgramFiles" ); - if( !localerr && localValue != NULL ) { - configfile = std::string( localValue ) + "\\Palette\\config\\ffgl.json"; - free( localValue ); - } else { - configfile = "c:\\windows\\temp\\ffgl.json";// last resort - } - } + std::string datapath = PaletteDataPath(); + + configfile = datapath + "\\config\\ffgl.json"; + NosuchDebug( "Using configfile=%s\n", configfile.c_str() ); // NosuchDebugSetThreadName(pthread_self().p,"PaletteHost"); diff --git a/kit/misc.go b/kit/misc.go index 06312579..2d093eab 100644 --- a/kit/misc.go +++ b/kit/misc.go @@ -86,6 +86,21 @@ func GetPaletteVersion() string { return strings.TrimSuffix(string(bytes), "\n") } +func PaletteDataPath() (datapath string) { + + palette_data := os.Getenv("PALETTE_DATA") + if palette_data == "" { + palette_data = "omnisphere" + } + palette_source := os.Getenv("PALETTE_SOURCE") + if palette_source != "" { + datapath = filepath.Join(palette_source,"data_" + palette_data) + } else { + datapath = filepath.Join("C:\\Program Files\\Common Files\\Palette", "data_" + palette_data) + } + return datapath; +} + // MIDIFilePath xxx func MIDIFilePath(nm string) string { return filepath.Join(PaletteDataPath(), "midifiles", nm) @@ -109,27 +124,6 @@ func LocalPaletteDir() string { return filepath.Join(commonfilepath, "Palette") } -var DataDir = "data" // default, override with environment variable -var FullDataPath string - -func PaletteDataPath() string { - if FullDataPath != "" { - return FullDataPath - } - // Let environment variable override the compiled-in default of DataDir - dataPath := os.Getenv("PALETTE_DATA_PATH") - if dataPath != "" { - DataDir = dataPath - } - // The value can be either a full path or just the "data_..." part. - if filepath.IsAbs(DataDir) { - FullDataPath = DataDir - } else { - FullDataPath = filepath.Join(LocalPaletteDir(), DataDir) - } - return FullDataPath -} - func TwitchUser() (username string, authtoken string) { LogWarn("TwitchUser needs to be updated to use an environment variable") /* diff --git a/mmtt_kinect/src/nosuch/NosuchDebug.cpp b/mmtt_kinect/src/nosuch/NosuchDebug.cpp index bf414263..b3ee37be 100644 --- a/mmtt_kinect/src/nosuch/NosuchDebug.cpp +++ b/mmtt_kinect/src/nosuch/NosuchDebug.cpp @@ -244,33 +244,6 @@ NosuchErrorOutput(const char *fmt, ...) #endif } -std::string -NosuchDataPath(std::string filepath) -{ - char *data_path = getenv("PALETTE_DATA_PATH"); - if ( data_path == NULL ) { - if ( filepath == "." ) { - return NosuchLocalDir; - } - else { - return NosuchLocalDir + "/" + filepath; - } - } - return std::string(data_path) + "/" + filepath; -} - -#ifdef OLDSTUFF -std::string -NosuchPalettePath(std::string filepath) -{ - if ( filepath == "." ) { - return NosuchPaletteDir; - } else { - return NosuchPaletteDir + "/" + filepath; - } -} -#endif - std::string NosuchSnprintf(const char *fmt, ...) { diff --git a/palette.code-workspace b/palette.code-workspace index 0b92513c..7a5e81bd 100644 --- a/palette.code-workspace +++ b/palette.code-workspace @@ -9,7 +9,82 @@ "files.associations": { "system_error": "cpp", "xlocale": "cpp", - "vector": "cpp" + "vector": "cpp", + "algorithm": "cpp", + "array": "cpp", + "atomic": "cpp", + "cctype": "cpp", + "chrono": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "complex": "cpp", + "condition_variable": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "deque": "cpp", + "exception": "cpp", + "filesystem": "cpp", + "forward_list": "cpp", + "fstream": "cpp", + "functional": "cpp", + "future": "cpp", + "initializer_list": "cpp", + "iomanip": "cpp", + "ios": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "iterator": "cpp", + "limits": "cpp", + "list": "cpp", + "locale": "cpp", + "map": "cpp", + "memory": "cpp", + "mutex": "cpp", + "new": "cpp", + "numeric": "cpp", + "ostream": "cpp", + "queue": "cpp", + "random": "cpp", + "ratio": "cpp", + "set": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "streambuf": "cpp", + "string": "cpp", + "string_view": "cpp", + "strstream": "cpp", + "thread": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "typeindex": "cpp", + "typeinfo": "cpp", + "unordered_map": "cpp", + "unordered_set": "cpp", + "utility": "cpp", + "valarray": "cpp", + "xfacet": "cpp", + "xhash": "cpp", + "xiosbase": "cpp", + "xlocbuf": "cpp", + "xlocinfo": "cpp", + "xlocmes": "cpp", + "xlocmon": "cpp", + "xlocnum": "cpp", + "xloctime": "cpp", + "xmemory": "cpp", + "xmemory0": "cpp", + "xstddef": "cpp", + "xstring": "cpp", + "xtr1common": "cpp", + "xtree": "cpp", + "xutility": "cpp" } } } diff --git a/python/generateparams.py b/python/generateparams.py index 7d98dc8b..b68cae49 100644 --- a/python/generateparams.py +++ b/python/generateparams.py @@ -15,9 +15,9 @@ def openFile(dir,name): return open(os.path.join(dir,name),"w") -def generate(homedir, force, sourcedir, floatType): +def generate(datadir, force, sourcedir, floatType): - c = os.path.join(homedir,"data/config") + c = os.path.join(datadir,"config") ######################################### ## First process paramdefs.json @@ -166,17 +166,21 @@ def generate(homedir, force, sourcedir, floatType): if __name__ == "__main__": - homedir = os.getenv("PALETTE_SOURCE") + source = os.getenv("PALETTE_SOURCE") force = False - sourcedir = os.path.join(homedir,"ffgl/source/lib/palette") + sourcedir = os.path.join(source,"ffgl/source/lib/palette") ftype = "float" if len(sys.argv) > 1: for a in sys.argv[1:]: if a == "-f": force = True + data = os.getenv("PALETTE_DATA") + if data == "": + data = "omnisphere" + datadir = os.path.join(source,"data_"+data) print("Generateparams: checking source in: "+sourcedir) - generate(homedir,force,sourcedir,ftype) + generate(datadir,force,sourcedir,ftype) sys.exit(0) diff --git a/data/config/palette.ico b/python/palette.ico similarity index 100% rename from data/config/palette.ico rename to python/palette.ico diff --git a/python/palette.py b/python/palette.py index d3065b99..4ca5c27d 100644 --- a/python/palette.py +++ b/python/palette.py @@ -85,10 +85,10 @@ def palette_engine_get(name): return palette_api("global.get", "\"name\": \"" + name + "\"") def configFilePath(nm): - return os.path.join(localPaletteDir(),PaletteDataPath(),"config",nm) + return os.path.join(PaletteDataPath(),"config",nm) def savedPath(): - return os.path.join(localPaletteDir(),PaletteDataPath(),"saved") + return os.path.join(PaletteDataPath(),"saved") def localPaletteDir(): common = os.environ.get("CommonProgramFiles") @@ -102,25 +102,23 @@ def paletteSubDir(subdir): paletteDataPath = "" FullDataPath = "" -DataDir = "data" # This is the name of the data_* directory # containing config and saved. # This logic is identical to PaletteDataPath() in the Go code def PaletteDataPath(): global paletteDataPath - global FullDataPath + global FullDataPath # cache the full path + if FullDataPath != "": return FullDataPath - dataPath = os.environ.get("PALETTE_DATA_PATH","") - global DataDir - if dataPath != "": - DataDir = dataPath - if os.path.isabs(DataDir): - FullDataPath = DataDir + palette_data = os.environ.get("PALETTE_DATA","omnisphere") + palette_source = os.environ.get("PALETTE_SOURCE","") + if palette_source != "": + FullDataPath = os.path.join(palette_source, "data_" + palette_data) else: - FullDataPath = os.path.join(localPaletteDir(),DataDir) + FullDataPath = os.path.join(localPaletteDir(), "data_" + palette_data) return FullDataPath # Combine saved in the savedPath list diff --git a/python/palette_gui.py b/python/palette_gui.py index 5d06d1d9..1109052f 100644 --- a/python/palette_gui.py +++ b/python/palette_gui.py @@ -472,7 +472,12 @@ def popup(self,msg): # than the palette gui. win = tk.Toplevel(highlightbackground=ColorBg, highlightcolor=ColorAqua, highlightthickness=3, background=ColorBg) win.wm_title(windowName) - win.iconbitmap(palette.configFilePath("palette.ico")) + try: + win.iconbitmap("palette.ico") + log("iconbitmap for palette.ico succeeded") + except: + log("iconbitmap for palette.ico failed") + l = tk.Label(win, text=msg, background=ColorBg, foreground=ColorText) l.grid(row=0, column=0) @@ -2451,7 +2456,12 @@ def isTwoLine(text): return text.find(palette.LineSep) >= 0 or text.find("\n") >= 0 def initMain(app): - app.iconbitmap(palette.configFilePath("palette.ico")) + try: + app.iconbitmap("palette.ico") + log("iconbitmap for palette.ico succeeded") + except: + log("iconbitmap for palette.ico failed") + app.protocol("WM_DELETE_WINDOW", on_closing) app.mainLoop() diff --git a/release/data_omnisphere_7.97.exe b/release/data_omnisphere_7.97.exe new file mode 100644 index 00000000..261a840b Binary files /dev/null and b/release/data_omnisphere_7.97.exe differ diff --git a/release/palette_7.97_win_setup_with_kinect.exe b/release/palette_7.97_win_setup_with_kinect.exe new file mode 100644 index 00000000..867558f9 Binary files /dev/null and b/release/palette_7.97_win_setup_with_kinect.exe differ diff --git a/scripts/cdcommon.bat b/scripts/cdcommon.bat new file mode 100644 index 00000000..0abf4af0 --- /dev/null +++ b/scripts/cdcommon.bat @@ -0,0 +1,4 @@ +@echo off +cd c: +cd \Program Files\Common Files\Palette +cd diff --git a/scripts/cddata.bat b/scripts/cddata.bat new file mode 100644 index 00000000..c9687ea4 --- /dev/null +++ b/scripts/cddata.bat @@ -0,0 +1,13 @@ +@echo off + +set data="omnisphere" +if not "%PALETTE_DATA%" == "" set data=%PALETTE_DATA + +if "%PALETTE_SOURCE%" == "" goto usecommon +cd "%PALETTE_SOURCE%\\data_%PALETTE_DATA%" +goto out + +:usecommon +cd "C:\\Program Files\\Common Files\\Palette\\data_%PALETTE_DATA%" + +:out diff --git a/scripts/cdlogs.bat b/scripts/cdlogs.bat index 88901fc1..259a025b 100644 --- a/scripts/cdlogs.bat +++ b/scripts/cdlogs.bat @@ -1,4 +1,13 @@ @echo off -if exist "%CommonProgramFiles%\Palette\data\logs" cd "%CommonProgramFiles%\Palette\data\logs" -if exist "%PALETTE_DATA_PATH%\logs" cd "%PALETTE_DATA_PATH%\logs" -cd + +set data="omnisphere" +if not "%PALETTE_DATA%" == "" set data=%PALETTE_DATA + +if "%PALETTE_SOURCE%" == "" goto usecommon +cd "%PALETTE_SOURCE%\\data_%PALETTE_DATA%\logs" +goto out + +:usecommon +cd "C:\\Program Files\\Common Files\\Palette\\data_%PALETTE_DATA%\\logs" + +:out diff --git a/scripts/palette_onboot.bat b/scripts/palette_onboot.bat index d047c94c..7007990d 100644 --- a/scripts/palette_onboot.bat +++ b/scripts/palette_onboot.bat @@ -1,6 +1,12 @@ rem start /b palette_splash -image=sppro_rebooting.png -width=1920 -height=700 -if exist %PALETTE_DATA_PATH%\config\tv_on.bat call %PALETTE_DATA_PATH%\config\tv_on.bat +echo on + +call cddata.bat +echo on +cd +if exist config\tv_on.bat call config\tv_on.bat + rem bash checkmorphs.sh -palette start +rem palette start rem timeout /t 600 > nul rem taskkill /f /im palette_splash.exe diff --git a/data/config/tv_off.bat b/scripts/tv_off.bat similarity index 100% rename from data/config/tv_off.bat rename to scripts/tv_off.bat diff --git a/data/config/tv_on.bat b/scripts/tv_on.bat similarity index 100% rename from data/config/tv_on.bat rename to scripts/tv_on.bat diff --git a/twinsys/style.go b/twinsys/style.go index e1614fe5..b446b86f 100644 --- a/twinsys/style.go +++ b/twinsys/style.go @@ -49,12 +49,13 @@ func NewStyle(styleName string, fontHeight int) *StyleInfo { var f *truetype.Font var err error + var b []byte switch styleName { case "fixed": fontfile := kit.ConfigFilePath("consola.ttf") - b, err := os.ReadFile(fontfile) + b, err = os.ReadFile(fontfile) if err == nil { f, _ = truetype.Parse(b) } @@ -63,7 +64,7 @@ func NewStyle(styleName string, fontHeight int) *StyleInfo { // This font sucks // f, err = truetype.Parse(goregular.TTF) fontfile := kit.ConfigFilePath("times.ttf") - b, err := os.ReadFile(fontfile) + b, err = os.ReadFile(fontfile) if err == nil { f, _ = truetype.Parse(b) } diff --git a/twinsys/window.go b/twinsys/window.go index 4b50d56e..93b8389e 100644 --- a/twinsys/window.go +++ b/twinsys/window.go @@ -47,7 +47,8 @@ func NewWindowContext(parent Window) WinContext { var style string if parent == nil { kit.LogWarn("NewWindowContext: unexpected parent == nil?") - style = parent.Context().styleName + style = DefaultStyleName() + // style = parent.Context().styleName } return realNewWindowContext(parent, style) }