diff --git a/screensaver.shadertoy/addon.xml.in b/screensaver.shadertoy/addon.xml.in index 2d5a610..56c0868 100644 --- a/screensaver.shadertoy/addon.xml.in +++ b/screensaver.shadertoy/addon.xml.in @@ -1,7 +1,7 @@  @ADDON_DEPENDS@ @@ -26,8 +26,10 @@ resources/screenshot-09.jpg resources/screenshot-10.jpg + Tilfældige pauseskærme fra Shadertoy Zufällige Bildschirmschoner von Shadertoy Random screensavers from Shadertoy + Brug de bedste shaders i verden med Shadertoy og tilføj dem, hvis du har lyst. Verwenden Sie mit Shadertoy die besten Shader der Welt und fügen Sie sie hinzu, wenn Sie möchten. Use the best shaders in the world with Shadertoy and add them if you want. diff --git a/screensaver.shadertoy/resources/language/resource.language.da_dk/strings.po b/screensaver.shadertoy/resources/language/resource.language.da_dk/strings.po index 891971a..65099f7 100644 --- a/screensaver.shadertoy/resources/language/resource.language.da_dk/strings.po +++ b/screensaver.shadertoy/resources/language/resource.language.da_dk/strings.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: XBMC Addons\n" "Report-Msgid-Bugs-To: translations@kodi.tv\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2021-08-24 17:29+0000\n" +"PO-Revision-Date: 2021-11-23 14:48+0000\n" "Last-Translator: Christian Gade \n" "Language-Team: Danish \n" "Language: da_dk\n" @@ -15,27 +15,27 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.8\n" +"X-Generator: Weblate 4.9\n" msgctxt "Addon Summary" msgid "Random screensavers from Shadertoy" -msgstr "" +msgstr "Tilfældige pauseskærme fra Shadertoy" msgctxt "Addon Description" msgid "Use the best shaders in the world with Shadertoy and add them if you want." -msgstr "" +msgstr "Brug de bedste shaders i verden med Shadertoy og tilføj dem, hvis du har lyst." msgctxt "#30000" msgid "ShaderToy" -msgstr "" +msgstr "ShaderToy" msgctxt "#30001" msgid "Ball" -msgstr "" +msgstr "Bold" msgctxt "#30002" msgid "Ball Of Fire" -msgstr "" +msgstr "Ball Of Fire" msgctxt "#30003" msgid "Bleepy Blocks" diff --git a/src/main.cpp b/src/main.cpp index acd3edc..d2a188e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -153,21 +153,21 @@ void main(void) CScreensaverShadertoy::CScreensaverShadertoy() { - m_settingsUseOwnshader = kodi::GetSettingBoolean("ownshader"); + m_settingsUseOwnshader = kodi::addon::GetSettingBoolean("ownshader"); if (m_settingsUseOwnshader) { m_currentPreset = -1; - std::string str = kodi::GetSettingString("shader"); + std::string str = kodi::addon::GetSettingString("shader"); if (!kodi::vfs::FileExists(str)) { - kodi::QueueNotification(QUEUE_ERROR, "", kodi::GetLocalizedString(30104)); + kodi::QueueNotification(QUEUE_ERROR, "", kodi::addon::GetLocalizedString(30104)); m_settingsUseOwnshader = false; } } if (!m_settingsUseOwnshader) { - int c = kodi::GetSettingInt("preset"); + int c = kodi::addon::GetSettingInt("preset"); if (c < 0) c = 0; else if (c > g_presets.size()) @@ -318,21 +318,21 @@ void CScreensaverShadertoy::Launch(int preset) if (preset < 0) { - m_usedShaderFile = kodi::GetSettingString("shader"); - m_shaderTextures[0] = kodi::GetSettingString("texture0"); - m_shaderTextures[1] = kodi::GetSettingString("texture1"); - m_shaderTextures[2] = kodi::GetSettingString("texture2"); - m_shaderTextures[3] = kodi::GetSettingString("texture3"); + m_usedShaderFile = kodi::addon::GetSettingString("shader"); + m_shaderTextures[0] = kodi::addon::GetSettingString("texture0"); + m_shaderTextures[1] = kodi::addon::GetSettingString("texture1"); + m_shaderTextures[2] = kodi::addon::GetSettingString("texture2"); + m_shaderTextures[3] = kodi::addon::GetSettingString("texture3"); } else { - m_usedShaderFile = kodi::GetAddonPath("resources/shaders/" + g_presets[preset].file); + m_usedShaderFile = kodi::addon::GetAddonPath("resources/shaders/" + g_presets[preset].file); - m_usedShaderFile = kodi::GetAddonPath("resources/shaders/" + g_presets[m_currentPreset].file); - m_shaderTextures[0] = !g_presets[m_currentPreset].channel[0].empty() ? kodi::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[0]) : ""; - m_shaderTextures[1] = !g_presets[m_currentPreset].channel[1].empty() ? kodi::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[1]) : ""; - m_shaderTextures[2] = !g_presets[m_currentPreset].channel[2].empty() ? kodi::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[2]) : ""; - m_shaderTextures[3] = !g_presets[m_currentPreset].channel[3].empty() ? kodi::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[3]) : ""; + m_usedShaderFile = kodi::addon::GetAddonPath("resources/shaders/" + g_presets[m_currentPreset].file); + m_shaderTextures[0] = !g_presets[m_currentPreset].channel[0].empty() ? kodi::addon::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[0]) : ""; + m_shaderTextures[1] = !g_presets[m_currentPreset].channel[1].empty() ? kodi::addon::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[1]) : ""; + m_shaderTextures[2] = !g_presets[m_currentPreset].channel[2].empty() ? kodi::addon::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[2]) : ""; + m_shaderTextures[3] = !g_presets[m_currentPreset].channel[3].empty() ? kodi::addon::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[3]) : ""; } for (int i = 0; i < 4; i++) @@ -386,7 +386,7 @@ void CScreensaverShadertoy::UnloadTextures() void CScreensaverShadertoy::LoadPreset(const std::string& shaderPath) { UnloadPreset(); - std::string vertShadertoyShader = kodi::GetAddonPath("resources/shaders/main_shadertoy_" GL_TYPE_STRING ".vert.glsl"); + std::string vertShadertoyShader = kodi::addon::GetAddonPath("resources/shaders/main_shadertoy_" GL_TYPE_STRING ".vert.glsl"); if (!m_shadertoyShader.LoadShaderFiles(vertShadertoyShader, shaderPath) || !m_shadertoyShader.CompileAndLink("", "", fsHeader, fsFooter)) { @@ -411,8 +411,8 @@ void CScreensaverShadertoy::LoadPreset(const std::string& shaderPath) m_state.uScale = glGetUniformLocation(shadertoyShader, "uScale"); m_state.attr_vertex_e = glGetAttribLocation(shadertoyShader, "vertex"); - std::string vertShader = kodi::GetAddonPath("resources/shaders/main_display_" GL_TYPE_STRING ".vert.glsl"); - std::string fraqShader = kodi::GetAddonPath("resources/shaders/main_display_" GL_TYPE_STRING ".frag.glsl"); + std::string vertShader = kodi::addon::GetAddonPath("resources/shaders/main_display_" GL_TYPE_STRING ".vert.glsl"); + std::string fraqShader = kodi::addon::GetAddonPath("resources/shaders/main_display_" GL_TYPE_STRING ".frag.glsl"); if (!m_displayShader.LoadShaderFiles(vertShader, fraqShader) || !m_displayShader.CompileAndLink()) { @@ -516,7 +516,7 @@ GLuint CScreensaverShadertoy::CreateTexture(const std::string& file, GLint inter int CScreensaverShadertoy::DetermineBitsPrecision() { m_state.fbwidth = 32, m_state.fbheight = 26*10; - LoadPreset(kodi::GetAddonPath("resources/shaders/main_test.frag.glsl")); + LoadPreset(kodi::addon::GetAddonPath("resources/shaders/main_test.frag.glsl")); RenderTo(m_shadertoyShader.ProgramHandle(), m_state.effect_fb); glFinish(); diff --git a/src/main.h b/src/main.h index 99e1d65..49abca6 100644 --- a/src/main.h +++ b/src/main.h @@ -20,7 +20,7 @@ struct Preset std::string channel[4]; }; -class ATTRIBUTE_HIDDEN CScreensaverShadertoy +class ATTR_DLL_LOCAL CScreensaverShadertoy : public kodi::addon::CAddonBase , public kodi::addon::CInstanceScreensaver {