From bb8eec88464209870d05eb8b4a5515812bffd275 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Tue, 24 Sep 2019 23:38:10 +0100 Subject: [PATCH] change settings.xml to new style --- src/MilkdropXBMC.cpp | 24 +-- visualization.milkdrop/resources/settings.xml | 144 ++++++++++++++++-- 2 files changed, 140 insertions(+), 28 deletions(-) diff --git a/src/MilkdropXBMC.cpp b/src/MilkdropXBMC.cpp index 77e1950..143fd27 100644 --- a/src/MilkdropXBMC.cpp +++ b/src/MilkdropXBMC.cpp @@ -148,13 +148,13 @@ ADDON_STATUS CVisualizationMilkdrop::Create() g_plugin->PluginPreInitialize(0, 0); } - g_plugin->m_fBlendTimeAuto = kodi::GetSettingFloat("Automatic Blend Time") + 1; - g_plugin->m_fTimeBetweenPresets = kodi::GetSettingFloat("Time Between Presets") * 5 + 5; - g_plugin->m_fTimeBetweenPresetsRand = kodi::GetSettingFloat("Additional Random Time") * 5 + 5; + g_plugin->m_fBlendTimeAuto = kodi::GetSettingFloat("Automatic Blend Time"); + g_plugin->m_fTimeBetweenPresets = kodi::GetSettingFloat("Time Between Presets"); + g_plugin->m_fTimeBetweenPresetsRand = kodi::GetSettingFloat("Additional Random Time"); g_plugin->m_bHardCutsDisabled = !kodi::GetSettingBoolean("Enable Hard Cuts"); - g_plugin->m_fHardCutLoudnessThresh = kodi::GetSettingFloat("Loudness Threshold For Hard Cuts") / 5.0f + 1.25f; - g_plugin->m_fHardCutHalflife = kodi::GetSettingFloat("Average Time Between Hard Cuts") * 5 + 5; - g_plugin->m_max_fps_fs = kodi::GetSettingFloat("Maximum Refresh Rate") * 5 + 20; + g_plugin->m_fHardCutLoudnessThresh = kodi::GetSettingFloat("Loudness Threshold For Hard Cuts"); + g_plugin->m_fHardCutHalflife = kodi::GetSettingFloat("Average Time Between Hard Cuts"); + g_plugin->m_max_fps_fs = kodi::GetSettingFloat("Maximum Refresh Rate"); g_plugin->m_bAlways3D = kodi::GetSettingBoolean("Enable Stereo 3d"); lastLockedStatus = kodi::GetSettingBoolean("lastlockedstatus"); lastPresetIndx = kodi::GetSettingInt("lastpresetidx"); @@ -311,19 +311,19 @@ ADDON_STATUS CVisualizationMilkdrop::SetSetting(const std::string& settingName, return ADDON_STATUS_UNKNOWN; if (settingName == "Automatic Blend Time") - g_plugin->m_fBlendTimeAuto = (float)(settingValue.GetInt() + 1); + g_plugin->m_fBlendTimeAuto = settingValue.GetFloat(); else if (settingName == "Time Between Presets") - g_plugin->m_fTimeBetweenPresets = (float)(settingValue.GetInt() * 5 + 5); + g_plugin->m_fTimeBetweenPresets = settingValue.GetFloat(); else if (settingName == "Additional Random Time") - g_plugin->m_fTimeBetweenPresetsRand = (float)(settingValue.GetInt() * 5 + 5); + g_plugin->m_fTimeBetweenPresetsRand = settingValue.GetFloat(); else if (settingName == "Enable Hard Cuts") g_plugin->m_bHardCutsDisabled = !settingValue.GetBoolean(); else if (settingName == "Loudness Threshold For Hard Cuts") - g_plugin->m_fHardCutLoudnessThresh = (float)(settingValue.GetInt() / 5.0f + 1.25f); + g_plugin->m_fHardCutLoudnessThresh = settingValue.GetFloat(); else if (settingName == "Average Time Between Hard Cuts") - g_plugin->m_fHardCutHalflife = (float)settingValue.GetInt() * 5 + 5; + g_plugin->m_fHardCutHalflife = settingValue.GetFloat(); else if (settingName == "Maximum Refresh Rate") - g_plugin->m_max_fps_fs = settingValue.GetInt() * 5 + 20; + g_plugin->m_max_fps_fs = settingValue.GetInt(); else if (settingName == "Enable Stereo 3d") g_plugin->m_bAlways3D = settingValue.GetBoolean(); else if (settingName == "lastlockedstatus") diff --git a/visualization.milkdrop/resources/settings.xml b/visualization.milkdrop/resources/settings.xml index 2e688d6..4c5a241 100644 --- a/visualization.milkdrop/resources/settings.xml +++ b/visualization.milkdrop/resources/settings.xml @@ -1,17 +1,129 @@ - - - - - - - - - - - - - - - - + + +
+ + + + false + + + + false + 0 + + + false + false + + + 0 + + + + + + + + + + + + + + + + 2 + + + true + + + + + true + + + + 1.0 + + 1.0 + 1.0 + 10.0 + + + 30050 + + + + 5.0 + + 5.0 + 0.5 + 10.0 + + + 30050 + + + + 5.0 + + 5.0 + 0.5 + 10.0 + + + 30050 + + + + false + + + + 0.0 + + 0.0 + 10.0 + 100.0 + + + true + + + 30051 + + + + 0.0 + + 5.0 + 5.0 + 120.0 + + + true + + + 30050 + + + + 30.0 + + 20.0 + 5.0 + 60.0 + + + 30052 + + + + false + + + + +