Skip to content

[0.4.x] lv-tool: Fix broken --actor argument #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hartwork merged 2 commits into from
Jan 19, 2023
Merged

[0.4.x] lv-tool: Fix broken --actor argument #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe8d449
lv-tool: Fix broken --actor argument
hartwork Jan 18, 2023
23b79b6
libvisual: Sync translation
hartwork Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libvisual/po/de.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
Expand Down Expand Up @@ -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 ""

Expand Down
4 changes: 2 additions & 2 deletions libvisual/po/es_AR.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: <dprotti@users.sourceforge.net>\n"
"Language-Team: Spanish\n"
Expand Down Expand Up @@ -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 ""

Expand Down
4 changes: 2 additions & 2 deletions libvisual/po/es_ES.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: <dprotti@users.sourceforge.net>\n"
"Language-Team: Spanish\n"
Expand Down Expand Up @@ -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 ""

Expand Down
4 changes: 2 additions & 2 deletions libvisual/po/libvisual-0.4.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -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 ""
13 changes: 9 additions & 4 deletions libvisual/tools/lv-tool/lv-tool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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.
Expand Down