From fe8d44990a94a1ac557e99bcd1c18cb7791e81d8 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 18 Jan 2023 19:25:18 +0100 Subject: [PATCH 1/2] lv-tool: Fix broken --actor argument Regression from e4a6cf5b60771b8cffa90834c0dd967b006bd3b1 (related to master commit 65b833b205f84c910aec312a35c01965c752f623) --- libvisual/tools/lv-tool/lv-tool.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libvisual/tools/lv-tool/lv-tool.cpp b/libvisual/tools/lv-tool/lv-tool.cpp index 030a590a4..89c29b31c 100644 --- a/libvisual/tools/lv-tool/lv-tool.cpp +++ b/libvisual/tools/lv-tool/lv-tool.cpp @@ -139,7 +139,7 @@ namespace LV { namespace { - std::string actor_name = DEFAULT_ACTOR_NONGL; + std::string actor_name; std::string input_name = DEFAULT_INPUT; std::string exclude_actors; @@ -690,9 +690,14 @@ int main (int argc, char **argv) LV::Bin bin; bin.set_supported_depth(VISUAL_VIDEO_DEPTH_ALL); - // Upgrade to a more appealing OpenGL actor if available - if (bin.actor_available(DEFAULT_ACTOR_GL)) { - actor_name = DEFAULT_ACTOR_GL; + // Apply dynamic actor default, as needed + if (actor_name.empty()) { + actor_name = DEFAULT_ACTOR_NONGL; + + // Upgrade default to a more appealing OpenGL actor if available + if (bin.actor_available(DEFAULT_ACTOR_GL)) { + actor_name = DEFAULT_ACTOR_GL; + } } // Let the bin manage plugins. There's a bug otherwise. From 23b79b676f429687c5ab8e477e43dab2bcd72726 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 19 Jan 2023 17:25:04 +0100 Subject: [PATCH 2/2] libvisual: Sync translation --- libvisual/po/de.po | 4 ++-- libvisual/po/es_AR.po | 4 ++-- libvisual/po/es_ES.po | 4 ++-- libvisual/po/libvisual-0.4.pot | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libvisual/po/de.po b/libvisual/po/de.po index 60f4acfce..cfba33100 100644 --- a/libvisual/po/de.po +++ b/libvisual/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libvisual 0.4.0-2.2\n" "Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n" -"POT-Creation-Date: 2023-01-15 01:44+0100\n" +"POT-Creation-Date: 2023-01-19 17:24+0100\n" "PO-Revision-Date: 2017-08-10 18:46+GMT\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@ -900,7 +900,7 @@ msgstr "" msgid "Invalid depth passed to the scaler" msgstr "Ungültige Tiefe an Scaler übergeben" -#: tools/lv-tool/lv-tool.cpp:743 tools/lv-tool/lv-tool.cpp:840 +#: tools/lv-tool/lv-tool.cpp:748 tools/lv-tool/lv-tool.cpp:845 msgid "lv-tool" msgstr "" diff --git a/libvisual/po/es_AR.po b/libvisual/po/es_AR.po index 587b5d6ed..7819f809d 100644 --- a/libvisual/po/es_AR.po +++ b/libvisual/po/es_AR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Libvisual Library 0.4.0\n" "Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n" -"POT-Creation-Date: 2023-01-15 01:44+0100\n" +"POT-Creation-Date: 2023-01-19 17:24+0100\n" "PO-Revision-Date: 2005-03-20 17:09-0300\n" "Last-Translator: \n" "Language-Team: Spanish\n" @@ -918,7 +918,7 @@ msgstr "" msgid "Invalid depth passed to the scaler" msgstr "Profundidad pasada al escalador inválida" -#: tools/lv-tool/lv-tool.cpp:743 tools/lv-tool/lv-tool.cpp:840 +#: tools/lv-tool/lv-tool.cpp:748 tools/lv-tool/lv-tool.cpp:845 msgid "lv-tool" msgstr "" diff --git a/libvisual/po/es_ES.po b/libvisual/po/es_ES.po index 55e3f0f22..de51498df 100644 --- a/libvisual/po/es_ES.po +++ b/libvisual/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Libvisual Library 0.4.0\n" "Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n" -"POT-Creation-Date: 2023-01-15 01:44+0100\n" +"POT-Creation-Date: 2023-01-19 17:24+0100\n" "PO-Revision-Date: 2005-03-20 17:09-0300\n" "Last-Translator: \n" "Language-Team: Spanish\n" @@ -918,7 +918,7 @@ msgstr "" msgid "Invalid depth passed to the scaler" msgstr "Profundidad pasada al escalador inválida" -#: tools/lv-tool/lv-tool.cpp:743 tools/lv-tool/lv-tool.cpp:840 +#: tools/lv-tool/lv-tool.cpp:748 tools/lv-tool/lv-tool.cpp:845 msgid "lv-tool" msgstr "" diff --git a/libvisual/po/libvisual-0.4.pot b/libvisual/po/libvisual-0.4.pot index 2007894be..6cd5d94e2 100644 --- a/libvisual/po/libvisual-0.4.pot +++ b/libvisual/po/libvisual-0.4.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: libvisual 0.4.1\n" "Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n" -"POT-Creation-Date: 2023-01-15 01:44+0100\n" +"POT-Creation-Date: 2023-01-19 17:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -871,6 +871,6 @@ msgstr "" msgid "Invalid depth passed to the scaler" msgstr "" -#: tools/lv-tool/lv-tool.cpp:743 tools/lv-tool/lv-tool.cpp:840 +#: tools/lv-tool/lv-tool.cpp:748 tools/lv-tool/lv-tool.cpp:845 msgid "lv-tool" msgstr ""