Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 14

bino.changes Changed

@@ -1,4 +1,27 @@
 -------------------------------------------------------------------
+Sun Jun 24 19:15:25 UTC 2012 - pascal.bleser@opensuse.org
+
+- update to 1.4.0:
+  * support for the new output mode "Left/right view alternating", also known
+    as "frame sequential". This is intended for 120Hz active stereo projectors
+    and displays when "OpenGL stereo" is not available.
+  * Better support for audio control. Volume, mute, and delay can be adjusted,
+    and the output device can be selected.
+  * Support for scripting via script files or named pipes.
+  * Much improved support for older graphics cards.
+  * Support for video output via SDI on NVIDIA Quadro cards.
+  * Automatic support for high precision color input and output (30 bits per
+    pixel).
+  * Single-frame stepping via the '.' key.
+  * An adjustable zoom mode for videos that are wider than the screen.
+  * Support for opening multiple input devices, and for requesting MJPEG data
+    from input devices.
+  * Support for the MPO, JPS, and PNS file formats for stereoscopic images.
+  * Support for DLP 3-D Ready Sync.
+  * Various user interface tweaks, including support for multimedia keyboards
+    and a "Recent Files" section in the File menu.
+
+-------------------------------------------------------------------
 Sun May 13 07:00:38 UTC 2012 - pascal.bleser@opensuse.org
 
 - update to 1.3.4:

bino.spec Changed

bino-1.3.4.tar.xz/po/cs.gmo Deleted

bino-1.3.4.tar.xz/po/cs.po Deleted

@@ -1,2365 +0,0 @@
-# Copyright (C) 2011 The Bino developers
-# This file is distributed under the same license as the Bino package.
-# Joe <cuchac@email.cz>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bino 0.9.2\n"
-"Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-05-12 12:23+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Joe <cuchac@email.cz>\n"
-"Language-Team: none\n"
-"Language: cs\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
-"X-Language: cs_CZ\n"
-"X-Source-Language: C\n"
-
-#: src/base/dbg.cpp:49
-#, c-format
-msgid "Caught signal %d (%s). Aborting."
-msgstr "Obdržn signál %d (%s). Ukončuji se."
-
-#: src/base/dbg.cpp:56
-msgid "Unexpected exception."
-msgstr "Neočekávaná výjimka."
-
-#. TRANSLATORS: %s will be a mail address.
-#: src/base/dbg.cpp:221
-#, c-format
-msgid "Report bugs to <%s>."
-msgstr "Chyby hlaste na <%s>."
-
-#: src/base/exc.cpp:52 src/base/exc.cpp:70 src/base/exc.cpp:104
-#, c-format
-msgid "Exception: %s"
-msgstr "Výjimka: %s"
-
-#: src/base/opt.cpp:168
-#, c-format
-msgid "Invalid option %s."
-msgstr "Neplatná operace %s."
-
-#: src/base/opt.cpp:172
-#, c-format
-msgid "Option --%s does not take an argument."
-msgstr "Volba --%s nepřijímá žádný argument."
-
-#: src/base/opt.cpp:177
-#, c-format
-msgid "Invalid option -%c."
-msgstr "Neplatná volba -%c."
-
-#: src/base/opt.cpp:186
-#, c-format
-msgid "Option --%s requires an argument."
-msgstr "Volba --%s vyžaduje argument."
-
-#: src/base/opt.cpp:191
-#, c-format
-msgid "Option -%c requires an argument."
-msgstr "Volba -%c vyžaduje argument."
-
-#: src/base/opt.cpp:212
-#, c-format
-msgid "Invalid argument for -%c."
-msgstr "Neplatný argument pro -%c."
-
-#: src/base/opt.cpp:216
-#, c-format
-msgid "Invalid argument for --%s."
-msgstr "Neplatný argument pro --%s."
-
-#: src/base/opt.cpp:239
-#, c-format
-msgid "Option --%s (-%c) is mandatory."
-msgstr "Volba --%s (-%c) je povinná."
-
-#: src/base/opt.cpp:243
-#, c-format
-msgid "Option --%s is mandatory."
-msgstr "Volba --%s je povinná."
-
-#: src/base/opt.cpp:257
-msgid "Too few arguments."
-msgstr "Příliš málo parametrů."
-
-#: src/base/opt.cpp:262
-msgid "Too many arguments."
-msgstr "Příliš mnoho parametrů."
-
-#: src/base/str.cpp:267
-#, c-format
-msgid "Cannot convert string to %s."
-msgstr "Nelze převést text do %s."
-
-#: src/base/str.cpp:515 src/base/str.cpp:533 src/base/str.cpp:543
-#: src/base/str.cpp:554 src/base/str.cpp:559
-#, c-format
-msgid "Cannot convert %s to %s."
-msgstr "Nelze převést %s to %s."
-
-#: src/base/thread.cpp:38 src/base/thread.cpp:48 src/base/thread.cpp:61
-#: src/base/thread.cpp:74 src/base/thread.cpp:85 src/base/thread.cpp:95
-#: src/base/thread.cpp:108 src/base/thread.cpp:116 src/base/thread.cpp:124
-#: src/base/thread.cpp:204 src/base/thread.cpp:211 src/base/thread.cpp:225
-#: src/base/thread.cpp:245
-msgid "System function failed: "
-msgstr ""
-
-#: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
-msgid "Cannot get time."
-msgstr "Nelze získat aktuální čas."
-
-#: src/audio_output.cpp:88
-msgid "No OpenAL device available."
-msgstr "Není k dispozici žádné OpenAL zařízení."
-
-#: src/audio_output.cpp:93 src/audio_output.cpp:99
-#, fuzzy, c-format
-msgid "OpenAL device '%s' is not available."
-msgstr "Není k dispozici žádné OpenAL zařízení."
-
-#: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
-#: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
-#: src/media_data.cpp:1260
-msgid "unknown"
-msgstr "neznámá"
-
-#: src/audio_output.cpp:106
-msgid "No OpenAL context available."
-msgstr "Není k dispozici žádný OpenAL kontext."
-
-#: src/audio_output.cpp:117
-msgid "Cannot create OpenAL buffers."
-msgstr "Nelze vytvořit OpenAL buffer."
-
-#: src/audio_output.cpp:126
-msgid "Cannot create OpenAL source."
-msgstr "Nelze vytvořit OpenAL zdroj."
-
-#: src/audio_output.cpp:139
-msgid "Cannot set OpenAL source parameters."
-msgstr "Nelze nastavit parametry OpenAL."
-
-#: src/audio_output.cpp:193
-msgid "Cannot check OpenAL source state."
-msgstr "Nelze ověřit stav OpenAL zdroje."
-
-#: src/audio_output.cpp:200
-msgid "Cannot restart OpenAL source playback."
-msgstr "Nelze znovu spustit přehrávání OpeanAL zdroje."
-
-#: src/audio_output.cpp:353
-#, c-format
-msgid "No OpenAL format available for audio data format %s."
-msgstr "Neexistuje vhodný OpenAL format pro daný audio formát %s."
-
-#: src/audio_output.cpp:369
-#, fuzzy
-msgid "Cannot set OpenAL audio volume."
-msgstr "Nelze vytvořit OpenAL zdroj."
-
-#: src/audio_output.cpp:395
-msgid "Cannot buffer initial OpenAL data."
-msgstr "Nelze načíst počáteční data OpenAL."
-
-#: src/audio_output.cpp:409
-msgid "Cannot buffer OpenAL data."
-msgstr "Nelze načíst OpenAL data."
-
-#: src/audio_output.cpp:434
-msgid "Cannot start OpenAL source playback."
-msgstr "Nelze začít přehrávat OpeanAL zdroj."
-
-#: src/audio_output.cpp:448
-msgid "Cannot pause OpenAL source playback."
-msgstr "Nelze přerušit přehrávání OpeanAL zdroje."
-
-#: src/audio_output.cpp:457
-msgid "Cannot unpause OpenAL source playback."
-msgstr "Nelze pokračovat v přehrávání OpeanAL zdroje."
-
-#: src/audio_output.cpp:466
-msgid "Cannot stop OpenAL source playback."
-msgstr "Nelze zastavit přehrávání OpeanAL zdroje."
-
-#: src/audio_output.cpp:477
-msgid "Cannot unqueue OpenAL source buffers."
-msgstr "Nelze odpojit buffery OpeanAL zdroje."
-
-#: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:363 src/media_object.cpp:825 src/media_object.cpp:1290
-#: src/video_output.cpp:416
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"

bino-1.3.4.tar.xz/po/pl.gmo Deleted

bino-1.3.4.tar.xz/po/pl.po Deleted

@@ -1,2375 +0,0 @@
-# Copyright (C) 2011 The Bino developers
-# This file is distributed under the same license as the Bino package.
-# Robert Pliszko <plesken@systems-design.eu>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bino 0.9.3\n"
-"Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-05-12 12:23+0200\n"
-"PO-Revision-Date: 2011-08-31 10:48+0100\n"
-"Last-Translator: Robert Pliszko <plesken@systems-design.eu>\n"
-"Language-Team: Bino Developers <bino-list@nongnu.org>\n"
-"Language: pl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
-"X-Language: pl_PL\n"
-"X-Source-Language: C\n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-Country: POLAND\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: src/base/dbg.cpp:49
-#, c-format
-msgid "Caught signal %d (%s). Aborting."
-msgstr "Niedozwolony sygnał %d (%s). Zatrzymywanie."
-
-#: src/base/dbg.cpp:56
-msgid "Unexpected exception."
-msgstr "Niespodziewany wyjątek."
-
-#. TRANSLATORS: %s will be a mail address.
-#: src/base/dbg.cpp:221
-#, c-format
-msgid "Report bugs to <%s>."
-msgstr "Raportuj błędy do <%s>."
-
-#: src/base/exc.cpp:52 src/base/exc.cpp:70 src/base/exc.cpp:104
-#, c-format
-msgid "Exception: %s"
-msgstr "Wyjątek: %s"
-
-#: src/base/opt.cpp:168
-#, c-format
-msgid "Invalid option %s."
-msgstr "Nieznana opcja %s."
-
-#: src/base/opt.cpp:172
-#, c-format
-msgid "Option --%s does not take an argument."
-msgstr "Opcja --%s nie przyjmuje żadnego argumentu."
-
-#: src/base/opt.cpp:177
-#, c-format
-msgid "Invalid option -%c."
-msgstr "Nieznana opcja -%c."
-
-#: src/base/opt.cpp:186
-#, c-format
-msgid "Option --%s requires an argument."
-msgstr "Opcja --%s wymaga argumentu."
-
-#: src/base/opt.cpp:191
-#, c-format
-msgid "Option -%c requires an argument."
-msgstr "Opcja -%c wymaga argumentu."
-
-#: src/base/opt.cpp:212
-#, c-format
-msgid "Invalid argument for -%c."
-msgstr "Nieznany argument dla -%c."
-
-#: src/base/opt.cpp:216
-#, c-format
-msgid "Invalid argument for --%s."
-msgstr "Nieznany argument dla --%s."
-
-#: src/base/opt.cpp:239
-#, c-format
-msgid "Option --%s (-%c) is mandatory."
-msgstr "Opcja --%s (-%c) jest wymagana."
-
-#: src/base/opt.cpp:243
-#, c-format
-msgid "Option --%s is mandatory."
-msgstr "Opcja --%s jest wymagana."
-
-#: src/base/opt.cpp:257
-msgid "Too few arguments."
-msgstr "Za mało parametrów."
-
-#: src/base/opt.cpp:262
-msgid "Too many arguments."
-msgstr "Za dużo parametrów."
-
-#: src/base/str.cpp:267
-#, c-format
-msgid "Cannot convert string to %s."
-msgstr "Nie można skonwertować tekstu do %s."
-
-#: src/base/str.cpp:515 src/base/str.cpp:533 src/base/str.cpp:543
-#: src/base/str.cpp:554 src/base/str.cpp:559
-#, c-format
-msgid "Cannot convert %s to %s."
-msgstr "Nie można skonwertować %s do %s."
-
-#: src/base/thread.cpp:38 src/base/thread.cpp:48 src/base/thread.cpp:61
-#: src/base/thread.cpp:74 src/base/thread.cpp:85 src/base/thread.cpp:95
-#: src/base/thread.cpp:108 src/base/thread.cpp:116 src/base/thread.cpp:124
-#: src/base/thread.cpp:204 src/base/thread.cpp:211 src/base/thread.cpp:225
-#: src/base/thread.cpp:245
-msgid "System function failed: "
-msgstr ""
-
-#: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
-msgid "Cannot get time."
-msgstr "Nie można pobrać czasu."
-
-#: src/audio_output.cpp:88
-msgid "No OpenAL device available."
-msgstr "Urządzenie OpenAL jest niedostępne."
-
-#: src/audio_output.cpp:93 src/audio_output.cpp:99
-#, fuzzy, c-format
-msgid "OpenAL device '%s' is not available."
-msgstr "Urządzenie OpenAL jest niedostępne."
-
-#: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
-#: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
-#: src/media_data.cpp:1260
-msgid "unknown"
-msgstr "nieznany"
-
-#: src/audio_output.cpp:106
-msgid "No OpenAL context available."
-msgstr "Brak kontekstu OpenAL."
-
-#: src/audio_output.cpp:117
-msgid "Cannot create OpenAL buffers."
-msgstr "Nie można stworzyć buforów dla OpenAL."
-
-#: src/audio_output.cpp:126
-msgid "Cannot create OpenAL source."
-msgstr "Nie można utworzyć źródła dla OpenAL."
-
-#: src/audio_output.cpp:139
-msgid "Cannot set OpenAL source parameters."
-msgstr "Nie można ustawić parametrów dla OpenAL."
-
-#: src/audio_output.cpp:193
-msgid "Cannot check OpenAL source state."
-msgstr "Nie można określić stanu OpenAL."
-
-#: src/audio_output.cpp:200
-msgid "Cannot restart OpenAL source playback."
-msgstr "Nie można zrestartować źródła odtwarzania OpenAL."
-
-#: src/audio_output.cpp:353
-#, c-format
-msgid "No OpenAL format available for audio data format %s."
-msgstr "Nie ma dostępnego formatu OpenAL dla danych audio %s."
-
-#: src/audio_output.cpp:369
-#, fuzzy
-msgid "Cannot set OpenAL audio volume."
-msgstr "Nie można utworzyć źródła dla OpenAL."
-
-#: src/audio_output.cpp:395
-msgid "Cannot buffer initial OpenAL data."
-msgstr "Nie można zainicjować buforów dla danych OpenAL."
-
-#: src/audio_output.cpp:409
-msgid "Cannot buffer OpenAL data."
-msgstr "Nie można buforować danych OpenAL."
-
-#: src/audio_output.cpp:434
-msgid "Cannot start OpenAL source playback."
-msgstr "Nie można uruchomić odtwarzania źródła OpenAL."
-
-#: src/audio_output.cpp:448
-msgid "Cannot pause OpenAL source playback."
-msgstr "Nie można wstrzymać odtwarzania źródła OpenAL."
-
-#: src/audio_output.cpp:457
-msgid "Cannot unpause OpenAL source playback."
-msgstr "Nie można ponownie uruchomić odtwarzania źródła OpenAL."
-
-#: src/audio_output.cpp:466
-msgid "Cannot stop OpenAL source playback."
-msgstr "Nie można zatrzymać odtwarzania źródła OpenAL."
-
-#: src/audio_output.cpp:477
-msgid "Cannot unqueue OpenAL source buffers."
-msgstr "Nie można odkolejkować źródła buforów OpenAL."
-
-#: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:363 src/media_object.cpp:825 src/media_object.cpp:1290
-#: src/video_output.cpp:416

bino-1.3.4.tar.xz/po/zh_cn.gmo Deleted

bino-1.3.4.tar.xz/po/zh_cn.po Deleted

@@ -1,1954 +0,0 @@
-# Copyright (C) 2011 The Bino developers
-# This file is distributed under the same license as the Bino package.
-# 玉堂白鹤 <squeeze@189.cn>\n
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bino 1.2.1\n"
-"Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-05-12 12:23+0200\n"
-"PO-Revision-Date: 2012-03-22 21:28+0800\n"
-"Last-Translator: 玉堂白鹤 <yjwork@189.cn>\n"
-"Language-Team: \n"
-"Language: zh_cn\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/base/dbg.cpp:49
-#, c-format
-msgid "Caught signal %d (%s). Aborting."
-msgstr "捕捉到信号 %d (%s)。中断。"
-
-#: src/base/dbg.cpp:56
-msgid "Unexpected exception."
-msgstr "未预料例外。"
-
-#. TRANSLATORS: %s will be a mail address.
-#: src/base/dbg.cpp:221
-#, c-format
-msgid "Report bugs to <%s>."
-msgstr "报告错误至 <%s>。"
-
-#: src/base/exc.cpp:52 src/base/exc.cpp:70 src/base/exc.cpp:104
-#, c-format
-msgid "Exception: %s"
-msgstr "例外: %s"
-
-#: src/base/opt.cpp:168
-#, c-format
-msgid "Invalid option %s."
-msgstr "无效选项 %s 。"
-
-#: src/base/opt.cpp:172
-#, c-format
-msgid "Option --%s does not take an argument."
-msgstr "选项  --%s 不附带参数。"
-
-#: src/base/opt.cpp:177
-#, c-format
-msgid "Invalid option -%c."
-msgstr "无效选项  -%c。"
-
-#: src/base/opt.cpp:186
-#, c-format
-msgid "Option --%s requires an argument."
-msgstr "选项  --%s 需要一个参数。"
-
-#: src/base/opt.cpp:191
-#, c-format
-msgid "Option -%c requires an argument."
-msgstr "选项  -%c 需要一个参数。"
-
-#: src/base/opt.cpp:212
-#, c-format
-msgid "Invalid argument for -%c."
-msgstr "无效参数 -%c 。"
-
-#: src/base/opt.cpp:216
-#, c-format
-msgid "Invalid argument for --%s."
-msgstr "无效参数 --%s 。"
-
-#: src/base/opt.cpp:239
-#, c-format
-msgid "Option --%s (-%c) is mandatory."
-msgstr ""
-
-#: src/base/opt.cpp:243
-#, c-format
-msgid "Option --%s is mandatory."
-msgstr ""
-
-#: src/base/opt.cpp:257
-msgid "Too few arguments."
-msgstr "参数太少。"
-
-#: src/base/opt.cpp:262
-msgid "Too many arguments."
-msgstr "参数太多。"
-
-#: src/base/str.cpp:267
-#, c-format
-msgid "Cannot convert string to %s."
-msgstr "不能转换字符串 %s 。"
-
-#: src/base/str.cpp:515 src/base/str.cpp:533 src/base/str.cpp:543
-#: src/base/str.cpp:554 src/base/str.cpp:559
-#, c-format
-msgid "Cannot convert %s to %s."
-msgstr "不能转换 %s 到 %s 。"
-
-#: src/base/thread.cpp:38 src/base/thread.cpp:48 src/base/thread.cpp:61
-#: src/base/thread.cpp:74 src/base/thread.cpp:85 src/base/thread.cpp:95
-#: src/base/thread.cpp:108 src/base/thread.cpp:116 src/base/thread.cpp:124
-#: src/base/thread.cpp:204 src/base/thread.cpp:211 src/base/thread.cpp:225
-#: src/base/thread.cpp:245
-msgid "System function failed: "
-msgstr ""
-
-#: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
-msgid "Cannot get time."
-msgstr "无法获取时间。"
-
-#: src/audio_output.cpp:88
-msgid "No OpenAL device available."
-msgstr "没有可用的OpenAL的设备。"
-
-#: src/audio_output.cpp:93 src/audio_output.cpp:99
-#, c-format
-msgid "OpenAL device '%s' is not available."
-msgstr "OpenAL 设备 '%s' 不可用。"
-
-#: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
-#: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
-#: src/media_data.cpp:1260
-msgid "unknown"
-msgstr "未知"
-
-#: src/audio_output.cpp:106
-msgid "No OpenAL context available."
-msgstr ""
-
-#: src/audio_output.cpp:117
-msgid "Cannot create OpenAL buffers."
-msgstr "不能创建 OpenAL 缓冲区。"
-
-#: src/audio_output.cpp:126
-msgid "Cannot create OpenAL source."
-msgstr "不能创建 OpenAL 源。"
-
-#: src/audio_output.cpp:139
-msgid "Cannot set OpenAL source parameters."
-msgstr "不能设置 OpenAL 源参数。"
-
-#: src/audio_output.cpp:193
-msgid "Cannot check OpenAL source state."
-msgstr "不能检查 OpenAL源状态。"
-
-#: src/audio_output.cpp:200
-msgid "Cannot restart OpenAL source playback."
-msgstr ""
-
-#: src/audio_output.cpp:353
-#, c-format
-msgid "No OpenAL format available for audio data format %s."
-msgstr "没有可用 OpenAL 音频数据格式 %s。"
-
-#: src/audio_output.cpp:369
-msgid "Cannot set OpenAL audio volume."
-msgstr "不能设置 OpenAL 音频音量。"
-
-#: src/audio_output.cpp:395
-msgid "Cannot buffer initial OpenAL data."
-msgstr ""
-
-#: src/audio_output.cpp:409
-msgid "Cannot buffer OpenAL data."
-msgstr ""
-
-#: src/audio_output.cpp:434
-msgid "Cannot start OpenAL source playback."
-msgstr ""
-
-#: src/audio_output.cpp:448
-msgid "Cannot pause OpenAL source playback."
-msgstr ""
-
-#: src/audio_output.cpp:457
-msgid "Cannot unpause OpenAL source playback."
-msgstr ""
-
-#: src/audio_output.cpp:466
-msgid "Cannot stop OpenAL source playback."
-msgstr ""
-
-#: src/audio_output.cpp:477
-msgid "Cannot unqueue OpenAL source buffers."
-msgstr ""
-
-#: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:363 src/media_object.cpp:825 src/media_object.cpp:1290
-#: src/video_output.cpp:416
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: src/command_file.cpp:174
-#, c-format
-msgid "%s: invalid command '%s'"

bino-1.3.4.tar.xz/AUTHORS -> bino-1.4.0.tar.xz/AUTHORS Changed

bino-1.3.4.tar.xz/ChangeLog -> bino-1.4.0.tar.xz/ChangeLog Changed

@@ -1,3 +1,331 @@
+commit 563db31e8e805e5322fc8adad5c8f560e5a112fd
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2012-06-24 11:21:57 +0200
+
+    Documentation: clarify manual license for media files.
+
+ doc/bino.texi |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 092219e8c2c52429da0e2af7d1b1dfda5f2071a0
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2012-06-24 11:17:38 +0200
+
+    Temporarily disable incomplete translations.
+
+ pkg/w32/bino.nsi |    8 ++++----
+ po/LINGUAS       |    6 +++---
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 61b1e135a7b62dd0c3e0ec59ea3ce2a531142ef3
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2012-06-23 17:32:18 +0200
+
+    Bump version to 1.4.0.
+
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 9fb28b1fdff8ab89dde4d9e5414608211b95c88e
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2012-06-23 12:56:19 +0200
+
+    Windows installer: do not create version-specific start menu entries.
+
+ pkg/w32/bino.nsi |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d3f77e475cb6440415649b4a2d9a7a4d5342fa66
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2012-06-23 12:55:57 +0200
+
+    Windows installer: install the complete documentation.
+
+ Makefile.am      |    2 +-
+ pkg/w32/bino.nsi |    6 +-----
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+commit 63741076c1a8172a50b87b1c499403754fbd5ab0
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2012-06-23 12:45:42 +0200
+
+    Windows installer: do not create different installations for each version.
+    
+    This avoids breaking a user setup when updating.
+    Reported by John M Clement in bug #36700 comment #4.
+
+ pkg/w32/bino.nsi |   21 +++++++++++----------
+ 1 file changed, 11 insertions(+), 10 deletions(-)
+
+commit 10c95bf3e3ca048f43a6780e035c3086d9931e07
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2012-06-23 12:40:10 +0200
+
+    Fix the pattern output modes again.
+    
+    We did not make sure that we have an even number of pixels in width/height in
+    all cases. This is fixed now and should finally fix bug #36700.
+
+ src/video_output.cpp |   39 ++++++++++++++++++---------------------
+ 1 file changed, 18 insertions(+), 21 deletions(-)
+
+commit de38f1d56f28eb27116e01a5b7453dbc25b4d14e
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2012-06-22 16:00:56 +0200
+
+    GUI: improve "Open device(s).." dialog.
+
+ src/gui.cpp |   14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+commit 119552daad5e5a2b6c91f8ee65ca2b8b93f03227
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2012-06-22 07:30:27 +0200
+
+    Fix the pattern output modes.
+    
+    Fix computation of the pixel row number, and make sure we have even numbers of
+    pixels.
+    
+    This should fix bug #36700.
+
+ src/video_output.cpp |   18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+
+commit 2042f9e9e2c3a3eb6c2d6fe6d5e004caf972d403
+Author: Alexey Osipov <simba@lerlan.ru>
+Date:   2012-06-18 20:02:08 +0200
+
+    Update ru.po.
+
+ po/ru.po |  438 ++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 226 insertions(+), 212 deletions(-)
+
+commit 101fdd6b29eafc6a6346fcf6a50511e2cd793c7f
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2012-06-18 19:59:28 +0200
+
+    Help output: consider the display width when lengthening strings.
+
+ src/main.cpp |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit dbfaa8cea3657a4c80857aa2d40d8297b3614188
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2012-06-18 19:59:07 +0200
+
+    Base modules: make display width functions public.
+
+ configure.ac     |    2 +-
+ src/base/msg.cpp |   56 ++++++------------------------------------------------
+ src/base/str.cpp |   30 +++++++++++++++++++++++++++++
+ src/base/str.h   |    5 +++++
+ 4 files changed, 42 insertions(+), 51 deletions(-)
+
+commit 30f60793b3097de49a2ec7b55542620df93c1506
+Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+Date:   2012-06-17 17:47:34 +0200
+
+    Update fr.po.
+
+ po/fr.po |  402 +++++++++++++++++++++++++++++---------------------------------
+ 1 file changed, 187 insertions(+), 215 deletions(-)
+
+commit 5c5bdd269b2d514cba2031e34d6c86197f08099d
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2012-06-17 16:43:32 +0200
+
+    Updated AUTHORS, NEWS for 1.4.0.
+
+ AUTHORS |    2 +-
+ NEWS    |   25 +++++++++++++------------
+ 2 files changed, 14 insertions(+), 13 deletions(-)
+
+commit 92a5adb2d7a03cc819324a7ad8b1a7f164b04571
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2012-06-17 16:24:23 +0200
+
+    GUI: close media input on quit.
+    
+    This makes sure that video settings are saved also when quitting while playing.
+    
+    Bug reported by Alexey Osipov.
+
+ src/gui.cpp |    3 +++
+ 1 file changed, 3 insertions(+)
+
+commit a2d3bf05d74fd8fbf1bfe09e907a4e80ffd6db01
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2012-06-17 16:04:49 +0200
+
+    Update de.po.
+
+ po/de.po |  404 +++++++++++++++++++++++++++++---------------------------------
+ 1 file changed, 188 insertions(+), 216 deletions(-)
+
+commit 9b1b5deeecd9c4573b53893051d3746803635ad2
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2012-06-17 16:03:02 +0200
+
+    Add keyboard key names to translatable strings.
+    
+    Suggested by Alexey Osipov.
+
+ src/gui.cpp  |   12 ++++++------
+ src/main.cpp |   23 ++++++++++++++++-------
+ 2 files changed, 22 insertions(+), 13 deletions(-)
+
+commit 006e56f43dfbb72d80f8ad1457d2bba750228343
+Author: Alexey Osipov <simba@lerlan.ru>
+Date:   2012-06-17 15:47:08 +0200
+
+    GUI: remove unnecessary duplication of translatable strings.
+
+ src/gui.cpp |   56 ++++++++++++++++++++++++++++----------------------------
+ 1 file changed, 28 insertions(+), 28 deletions(-)
+
+commit 91a33e981931f58d154d5a3a6f3da7b9dfc97909
+Author: Alexey Osipov <simba@lerlan.ru>
+Date:   2012-06-17 15:02:56 +0200
+
+    Remove dots from File->Quit since no dialog is shown.
+
+ po/de.po    |    4 ++--
+ po/fr.po    |    4 ++--
+ po/ru.po    |    4 ++--
+ src/gui.cpp |    2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 08e744f77765ab6489f96bbc7b4bc61292f18a9c

bino-1.3.4.tar.xz/Makefile.am -> bino-1.4.0.tar.xz/Makefile.am Changed

bino-1.3.4.tar.xz/Makefile.in -> bino-1.4.0.tar.xz/Makefile.in Changed

bino-1.3.4.tar.xz/NEWS -> bino-1.4.0.tar.xz/NEWS Changed

@@ -1,21 +1,22 @@
-New in the next stable version:
+New in version 1.4.0:
 - Support for the new output mode "Left/right view alternating", also known
-  as "frame sequential".
+  as "frame sequential". This is intended for 120Hz active stereo projectors
+  and displays when "OpenGL stereo" is not available.
 - Better support for audio control. Volume, mute, and delay can be adjusted,
   and the output device can be selected.
+- Support for scripting via script files or named pipes.
+- Much improved support for older graphics cards.
+- Support for video output via SDI on NVIDIA Quadro cards.
+- Automatic support for high precision color input and output (30 bits per
+  pixel).
+- Single-frame stepping via the '.' key.
 - An adjustable zoom mode for videos that are wider than the screen.
+- Support for opening multiple input devices, and for requesting MJPEG data
+  from input devices.
 - Support for the MPO, JPS, and PNS file formats for stereoscopic images.
-- Support for high precision color input and output (30 bits per pixel).
-- Support for single-frame stepping.
-- Support for multimedia keyboards.
-- Support for opening multiple input devices.
-- Support for requesting MJPEG data from input devices.
-- Support for video output via SDI on NVIDIA Quadro cards.
 - Support for DLP 3-D Ready Sync.
-- Support for a "Recent Files" section in the File menu.
-- Full support for scripting.
-- Better support for older graphics cards.
-- Various user interface tweaks.
+- Various user interface tweaks, including support for multimedia keyboards
+  and a "Recent Files" section in the File menu.
 
 New in version 1.2.0:
 - Flexible fullscreen mode with support for multiple screens.

bino-1.3.4.tar.xz/config.h.in -> bino-1.4.0.tar.xz/config.h.in Changed

bino-1.3.4.tar.xz/configure -> bino-1.4.0.tar.xz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Bino 1.3.4.
+# Generated by GNU Autoconf 2.68 for Bino 1.4.0.
 #
 # Report bugs to <bino-list@nongnu.org>.
 #
@@ -560,8 +560,8 @@
 # Identity of this package.
 PACKAGE_NAME='Bino'
 PACKAGE_TARNAME='bino'
-PACKAGE_VERSION='1.3.4'
-PACKAGE_STRING='Bino 1.3.4'
+PACKAGE_VERSION='1.4.0'
+PACKAGE_STRING='Bino 1.4.0'
 PACKAGE_BUGREPORT='bino-list@nongnu.org'
 PACKAGE_URL='http://bino3d.org/'
 
@@ -1377,7 +1377,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Bino 1.3.4 to adapt to many kinds of systems.
+\`configure' configures Bino 1.4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1448,7 +1448,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Bino 1.3.4:";;
+     short | recursive ) echo "Configuration of Bino 1.4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1612,7 +1612,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Bino configure 1.3.4
+Bino configure 1.4.0
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2312,7 +2312,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Bino $as_me 1.3.4, which was
+It was created by Bino $as_me 1.4.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -4791,7 +4791,7 @@
 
 # Define the identity of the package.
  PACKAGE='bino'
- VERSION='1.3.4'
+ VERSION='1.4.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6189,7 +6189,7 @@
 
 fi
 
-for ac_func in backtrace clock_gettime fdatasync fnmatch fseeko ftello getpwuid link mmap nl_langinfo posix_fadvise readdir_r sigaction symlink sysconf vasprintf wcwidth
+for ac_func in backtrace clock_gettime fdatasync fnmatch fseeko ftello getpwuid link mmap nl_langinfo posix_fadvise readdir_r sigaction symlink sysconf vasprintf wcswidth
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -10776,7 +10776,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Bino $as_me 1.3.4, which was
+This file was extended by Bino $as_me 1.4.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10843,7 +10843,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Bino config.status 1.3.4
+Bino config.status 1.4.0
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"

bino-1.3.4.tar.xz/configure.ac -> bino-1.4.0.tar.xz/configure.ac Changed

bino-1.3.4.tar.xz/doc/bino.1 -> bino-1.4.0.tar.xz/doc/bino.1 Changed

bino-1.3.4.tar.xz/doc/bino.html -> bino-1.4.0.tar.xz/doc/bino.html Changed

@@ -1,21 +1,21 @@
 <html lang="en">
 <head>
-<title>Bino 1.3.4</title>
+<title>Bino 1.4.0</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="Bino 1.3.4">
+<meta name="description" content="Bino 1.4.0">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 </style>
 </head>
 <body>
-<h1 class="settitle">Bino 1.3.4</h1>
+<h1 class="settitle">Bino 1.4.0</h1>
 <div class="node">
 <a name="Top"></a>
 <p><hr>
@@ -45,8 +45,8 @@
 
 <h2 class="unnumbered">Bino</h2>
 
-<p>This manual was last updated 12 May 2012 for version
-1.3.4 of Bino.
+<p>This manual was last updated 24 June 2012 for version
+1.4.0 of Bino.
 
    <p>Copyright &copy; 2011, 2012
 Martin Lambers (<a href="mailto:marlam@marlam.de">marlam@marlam.de</a>),
@@ -54,7 +54,7 @@
 Frédéric Devernay (<a href="mailto:Frederic.Devernay@inrialpes.fr">Frederic.Devernay@inrialpes.fr</a>)
 
    <blockquote>
-Copying and distribution of this file and the referenced media files, with or
+Copying and distribution of this file and the accompanying media files, with or
 without modification, are permitted in any medium without royalty provided the
 copyright notice and this notice are preserved. These files are offered as-is,
 without any warranty.

bino-1.3.4.tar.xz/doc/bino.info -> bino-1.4.0.tar.xz/doc/bino.info Changed

@@ -1,13 +1,13 @@
 This is ../../sources/bino/doc/bino.info, produced by makeinfo version
 4.13 from ../../sources/bino/doc/bino.texi.
 
-This manual was last updated 12 May 2012 for version 1.3.4 of Bino.
+This manual was last updated 24 June 2012 for version 1.4.0 of Bino.
 
    Copyright (C) 2011, 2012 Martin Lambers (<marlam@marlam.de>), Stefan
 Eilemann (<eile@eyescale.ch>), Frédéric Devernay
 (<Frederic.Devernay@inrialpes.fr>)
 
-     Copying and distribution of this file and the referenced media
+     Copying and distribution of this file and the accompanying media
      files, with or without modification, are permitted in any medium
      without royalty provided the copyright notice and this notice are
      preserved. These files are offered as-is, without any warranty.
@@ -23,13 +23,13 @@
 Bino
 ****
 
-This manual was last updated 12 May 2012 for version 1.3.4 of Bino.
+This manual was last updated 24 June 2012 for version 1.4.0 of Bino.
 
    Copyright (C) 2011, 2012 Martin Lambers (<marlam@marlam.de>), Stefan
 Eilemann (<eile@eyescale.ch>), Frédéric Devernay
 (<Frederic.Devernay@inrialpes.fr>)
 
-     Copying and distribution of this file and the referenced media
+     Copying and distribution of this file and the accompanying media
      files, with or without modification, are permitted in any medium
      without royalty provided the copyright notice and this notice are
      preserved. These files are offered as-is, without any warranty.
@@ -1427,23 +1427,23 @@
 
 &#x1f;
 Tag Table:
-Node: Top&#x7f;772
-Node: Introduction&#x7f;1550
-Node: Invocation&#x7f;2573
-Node: Input Layouts&#x7f;6819
-Ref: Supported Input Layouts&#x7f;7722
-Ref: File Name Conventions&#x7f;9804
-Node: Output Techniques&#x7f;10638
-Ref: Supported Output Techniques&#x7f;13362
-Ref: Crosstalk Ghostbusting&#x7f;17318
-Ref: Basic Multi Display Support&#x7f;19294
-Ref: Advanced Multi Display Support&#x7f;20425
-Node: Interactive Control&#x7f;31670
-Node: Scripting&#x7f;33595
-Ref: Script Commands&#x7f;35564
-Node: Camera Devices&#x7f;41596
-Node: Audio/Video Synchronization&#x7f;42548
-Node: Performance Tweaking&#x7f;43706
+Node: Top&#x7f;775
+Node: Introduction&#x7f;1556
+Node: Invocation&#x7f;2579
+Node: Input Layouts&#x7f;6825
+Ref: Supported Input Layouts&#x7f;7728
+Ref: File Name Conventions&#x7f;9810
+Node: Output Techniques&#x7f;10644
+Ref: Supported Output Techniques&#x7f;13368
+Ref: Crosstalk Ghostbusting&#x7f;17324
+Ref: Basic Multi Display Support&#x7f;19300
+Ref: Advanced Multi Display Support&#x7f;20431
+Node: Interactive Control&#x7f;31676
+Node: Scripting&#x7f;33601
+Ref: Script Commands&#x7f;35570
+Node: Camera Devices&#x7f;41602
+Node: Audio/Video Synchronization&#x7f;42554
+Node: Performance Tweaking&#x7f;43712
 &#x1f;
 End Tag Table

bino-1.3.4.tar.xz/doc/bino.texi -> bino-1.4.0.tar.xz/doc/bino.texi Changed

bino-1.3.4.tar.xz/doc/stamp-vti -> bino-1.4.0.tar.xz/doc/stamp-vti Changed

bino-1.3.4.tar.xz/doc/version.texi -> bino-1.4.0.tar.xz/doc/version.texi Changed

bino-1.3.4.tar.xz/pkg/w32/bino.nsi -> bino-1.4.0.tar.xz/pkg/w32/bino.nsi Changed

@@ -1,4 +1,5 @@
-; Copyright (C) 2011 Martin Lambers
+; Copyright (C) 2011, 2012
+; Martin Lambers <marlam@marlam.de>
 ;
 ; Copying and distribution of this file, with or without modification, are
 ; permitted in any medium without royalty provided the copyright notice and this
@@ -7,7 +8,7 @@
 !include "MUI.nsh"
 
 ; The name of the installer
-Name "Bino ${PACKAGE_VERSION}"
+Name "Bino"
 
 ; The file to write
 OutFile "bino-${PACKAGE_VERSION}-w32.exe"
@@ -16,11 +17,11 @@
 RequestExecutionLevel admin
 
 ; The default installation directory
-InstallDir "$PROGRAMFILES\Bino ${PACKAGE_VERSION}"
+InstallDir "$PROGRAMFILES\Bino"
 
 ; Registry key to check for directory (so if you install again, it will 
 ; overwrite the old one automatically)
-InstallDirRegKey HKLM "Software\Bino ${PACKAGE_VERSION}" "Install_Dir"
+InstallDirRegKey HKLM "Software\Bino" "Install_Dir"
 
 SetCompressor lzma
 ShowInstDetails show
@@ -40,7 +41,7 @@
   !insertmacro MUI_PAGE_DIRECTORY
   ;Start Menu Folder Page Configuration
   !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" 
-  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Bino ${PACKAGE_VERSION}"
+  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Bino"
   !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
   !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
   !insertmacro MUI_PAGE_INSTFILES
@@ -60,22 +61,18 @@
 Section "Bino Program" SecTools
   SetOutPath $INSTDIR\bin
   FILE bino.exe
-  SetOutPath $INSTDIR\locale\cs\LC_MESSAGES
-  FILE cs\LC_MESSAGES\bino.mo
+;  SetOutPath $INSTDIR\locale\cs\LC_MESSAGES
+;  FILE cs\LC_MESSAGES\bino.mo
   SetOutPath $INSTDIR\locale\de\LC_MESSAGES
   FILE de\LC_MESSAGES\bino.mo
   SetOutPath $INSTDIR\locale\fr\LC_MESSAGES
   FILE fr\LC_MESSAGES\bino.mo
   SetOutPath $INSTDIR\locale\pl\LC_MESSAGES
-  FILE pl\LC_MESSAGES\bino.mo
-  SetOutPath $INSTDIR\locale\ru\LC_MESSAGES
+;  FILE pl\LC_MESSAGES\bino.mo
+;  SetOutPath $INSTDIR\locale\ru\LC_MESSAGES
   FILE ru\LC_MESSAGES\bino.mo
   SetOutPath $INSTDIR\doc
-  FILE bino.html
-  FILE multi-display-vrlab.jpg
-  FILE multi-display-rotated.jpg
-  FILE gamma-pattern-tb.png
-  FILE crosstalk-pattern-tb.png
+  FILE doc\*.*
 SectionEnd
 
 ; Last section is a hidden one.
@@ -84,10 +81,10 @@
   SetShellVarContext all
   WriteUninstaller "$INSTDIR\uninstall.exe"
   ; Write the installation path into the registry
-  WriteRegStr HKLM "Software\Bino ${PACKAGE_VERSION}" "Install_Dir" "$INSTDIR"
+  WriteRegStr HKLM "Software\Bino" "Install_Dir" "$INSTDIR"
   ; Windows Add/Remove Programs support
-  StrCpy $MYTMP "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bino ${PACKAGE_VERSION}"
-  WriteRegStr       HKLM $MYTMP "DisplayName"     "Bino ${PACKAGE_VERSION}"
+  StrCpy $MYTMP "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bino"
+  WriteRegStr       HKLM $MYTMP "DisplayName"     "Bino"
   WriteRegExpandStr HKLM $MYTMP "UninstallString" '"$INSTDIR\uninstall.exe"'
   WriteRegExpandStr HKLM $MYTMP "InstallLocation" "$INSTDIR"
   WriteRegStr       HKLM $MYTMP "DisplayVersion"  "${PACKAGE_VERSION}"
@@ -111,9 +108,9 @@
 Section "Uninstall"
   SetShellVarContext all
   ; Remove registry keys
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bino ${PACKAGE_VERSION}"
-  DeleteRegKey HKLM "Software\Bino ${PACKAGE_VERSION}"
-  DeleteRegKey /ifempty HKCU "Software\Bino ${PACKAGE_VERSION}"
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bino"
+  DeleteRegKey HKLM "Software\Bino"
+  DeleteRegKey /ifempty HKCU "Software\Bino"
   ; Remove start menu entries
   !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
   RMDir /r "$SMPROGRAMS\$MUI_TEMP"

bino-1.3.4.tar.xz/po/LINGUAS -> bino-1.4.0.tar.xz/po/LINGUAS Changed

bino-1.3.4.tar.xz/po/bino.pot -> bino-1.4.0.tar.xz/po/bino.pot Changed

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: bino 1.3.4\n"
+"Project-Id-Version: bino 1.4.0\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-05-12 12:23+0200\n"
+"POT-Creation-Date: 2012-06-24 11:25+0200\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"
@@ -90,13 +90,13 @@
 msgid "Too many arguments."
 msgstr ""
 
-#: src/base/str.cpp:267
+#: src/base/str.cpp:268
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr ""
 
-#: src/base/str.cpp:515 src/base/str.cpp:533 src/base/str.cpp:543
-#: src/base/str.cpp:554 src/base/str.cpp:559
+#: src/base/str.cpp:516 src/base/str.cpp:534 src/base/str.cpp:544
+#: src/base/str.cpp:555 src/base/str.cpp:560
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr ""
@@ -190,8 +190,8 @@
 msgstr ""
 
 #: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:363 src/media_object.cpp:825 src/media_object.cpp:1290
-#: src/video_output.cpp:416
+#: src/main.cpp:373 src/media_object.cpp:847 src/media_object.cpp:1312
+#: src/video_output.cpp:419
 #, c-format
 msgid "%s: %s"
 msgstr ""
@@ -232,7 +232,7 @@
 msgid "Subtitle stream %d not found."
 msgstr ""
 
-#: src/dispatch.cpp:555 src/main.cpp:753
+#: src/dispatch.cpp:555 src/main.cpp:763
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr ""
 
@@ -268,63 +268,68 @@
 msgid "<p>Set the 3D layout of the video stream.</p>"
 msgstr ""
 
-#: src/gui.cpp:138
+#: src/gui.cpp:138 src/main.cpp:430
 msgid "2D"
 msgstr ""
 
-#: src/gui.cpp:139
+#: src/gui.cpp:139 src/main.cpp:431
 msgid "Separate streams, left first"
 msgstr ""
 
-#: src/gui.cpp:140
+#: src/gui.cpp:140 src/main.cpp:432
 msgid "Separate streams, right first"
 msgstr ""
 
-#: src/gui.cpp:141
+#: src/gui.cpp:141 src/main.cpp:433
 msgid "Alternating, left first"
 msgstr ""
 
-#: src/gui.cpp:142
+#: src/gui.cpp:142 src/main.cpp:434
 msgid "Alternating, right first"
 msgstr ""
 
 #: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2151 src/gui.cpp:2180
+#: src/main.cpp:435 src/main.cpp:450
 msgid "Top/bottom"
 msgstr ""
 
 #: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2152 src/gui.cpp:2181
+#: src/main.cpp:436 src/main.cpp:451
 msgid "Top/bottom, half height"
 msgstr ""
 
-#: src/gui.cpp:145
+#: src/gui.cpp:145 src/main.cpp:437
 msgid "Bottom/top"
 msgstr ""
 
-#: src/gui.cpp:146
+#: src/gui.cpp:146 src/main.cpp:438
 msgid "Bottom/top, half height"
 msgstr ""
 
 #: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2153 src/gui.cpp:2182
+#: src/main.cpp:439 src/main.cpp:452
 msgid "Left/right"
 msgstr ""
 
 #: src/gui.cpp:148 src/gui.cpp:170 src/gui.cpp:2154 src/gui.cpp:2183
+#: src/main.cpp:440 src/main.cpp:453
 msgid "Left/right, half width"
 msgstr ""
 
-#: src/gui.cpp:149
+#: src/gui.cpp:149 src/main.cpp:441
 msgid "Right/left"
 msgstr ""
 
-#: src/gui.cpp:150
+#: src/gui.cpp:150 src/main.cpp:442
 msgid "Right/left, half width"
 msgstr ""
 
 #: src/gui.cpp:151 src/gui.cpp:171 src/gui.cpp:2155 src/gui.cpp:2184
+#: src/main.cpp:443 src/main.cpp:454
 msgid "Even/odd rows"
 msgstr ""
 
-#: src/gui.cpp:152
+#: src/gui.cpp:152 src/main.cpp:444
 msgid "Odd/even rows"
 msgstr ""
 
@@ -336,88 +341,88 @@
 msgid "<p>Set the 3D output type for your display.</p>"
 msgstr ""
 
-#: src/gui.cpp:163 src/gui.cpp:2149 src/gui.cpp:2178
+#: src/gui.cpp:163 src/gui.cpp:2149 src/gui.cpp:2178 src/main.cpp:448
 msgid "Left view"
 msgstr ""
 
-#: src/gui.cpp:164 src/gui.cpp:2150 src/gui.cpp:2179
+#: src/gui.cpp:164 src/gui.cpp:2150 src/gui.cpp:2179 src/main.cpp:449
 msgid "Right view"
 msgstr ""
 
-#: src/gui.cpp:165
+#: src/gui.cpp:165 src/main.cpp:446
 msgid "OpenGL stereo"
 msgstr ""
 
-#: src/gui.cpp:166
-msgid "Left/right view alternating"
+#: src/gui.cpp:166 src/main.cpp:447
+msgid "Left/right alternating"
 msgstr ""
 
-#: src/gui.cpp:172 src/gui.cpp:2156 src/gui.cpp:2185
+#: src/gui.cpp:172 src/gui.cpp:2156 src/gui.cpp:2185 src/main.cpp:455
 msgid "Even/odd columns"
 msgstr ""
 
-#: src/gui.cpp:173 src/gui.cpp:2157 src/gui.cpp:2186
+#: src/gui.cpp:173 src/gui.cpp:2157 src/gui.cpp:2186 src/main.cpp:456
 msgid "Checkerboard pattern"
 msgstr ""
 
-#: src/gui.cpp:174
+#: src/gui.cpp:174 src/main.cpp:457
 msgid "HDMI frame packing mode"
 msgstr ""
 
-#: src/gui.cpp:175 src/gui.cpp:2158 src/gui.cpp:2187
-msgid "Red/cyan glasses, monochrome method"
+#: src/gui.cpp:175 src/gui.cpp:2158 src/gui.cpp:2187 src/main.cpp:458
+msgid "Red/cyan glasses, monochrome"
 msgstr ""
 
-#: src/gui.cpp:176 src/gui.cpp:2159 src/gui.cpp:2188
-msgid "Red/cyan glasses, half-color method"
+#: src/gui.cpp:176 src/gui.cpp:2159 src/gui.cpp:2188 src/main.cpp:459
+msgid "Red/cyan glasses, half color"
 msgstr ""
 
-#: src/gui.cpp:177 src/gui.cpp:2160 src/gui.cpp:2189
-msgid "Red/cyan glasses, full-color method"
+#: src/gui.cpp:177 src/gui.cpp:2160 src/gui.cpp:2189 src/main.cpp:460
+msgid "Red/cyan glasses, full color"
 msgstr ""
 
-#: src/gui.cpp:178 src/gui.cpp:2161 src/gui.cpp:2190
-msgid "Red/cyan glasses, high-quality Dubois method"
+#: src/gui.cpp:178 src/gui.cpp:2161 src/gui.cpp:2190 src/main.cpp:461
+msgid "Red/cyan glasses, Dubois"
 msgstr ""
 
-#: src/gui.cpp:179 src/gui.cpp:2162 src/gui.cpp:2191
-msgid "Green/magenta glasses, monochrome method"
+#: src/gui.cpp:179 src/gui.cpp:2162 src/gui.cpp:2191 src/main.cpp:462
+msgid "Green/magenta glasses, monochrome"
 msgstr ""
 
-#: src/gui.cpp:180 src/gui.cpp:2163 src/gui.cpp:2192
-msgid "Green/magenta glasses, half-color method"

bino-1.3.4.tar.xz/po/de.gmo -> bino-1.4.0.tar.xz/po/de.gmo Changed

bino-1.3.4.tar.xz/po/de.po -> bino-1.4.0.tar.xz/po/de.po Changed

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bino 1.1.1\n"
+"Project-Id-Version: bino 1.3.4\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-05-12 12:23+0200\n"
+"POT-Creation-Date: 2012-06-24 11:25+0200\n"
 "PO-Revision-Date: 2011-04-10 17:23+0200\n"
 "Last-Translator: Martin Lambers <marlam@marlam.de>\n"
 "Language-Team: none\n"
@@ -88,13 +88,13 @@
 msgid "Too many arguments."
 msgstr "Zu viele Argumente."
 
-#: src/base/str.cpp:267
+#: src/base/str.cpp:268
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Kann Zeichenkette nicht zu %s konvertieren."
 
-#: src/base/str.cpp:515 src/base/str.cpp:533 src/base/str.cpp:543
-#: src/base/str.cpp:554 src/base/str.cpp:559
+#: src/base/str.cpp:516 src/base/str.cpp:534 src/base/str.cpp:544
+#: src/base/str.cpp:555 src/base/str.cpp:560
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Kann %s nicht zu %s konvertieren."
@@ -105,7 +105,7 @@
 #: src/base/thread.cpp:204 src/base/thread.cpp:211 src/base/thread.cpp:225
 #: src/base/thread.cpp:245
 msgid "System function failed: "
-msgstr ""
+msgstr "Systemfunktion fehlgeschlagen: "
 
 #: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
 msgid "Cannot get time."
@@ -116,9 +116,9 @@
 msgstr "Kein OpenAL Gerät verfügbar."
 
 #: src/audio_output.cpp:93 src/audio_output.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "OpenAL device '%s' is not available."
-msgstr "Kein OpenAL Gerät verfügbar."
+msgstr "OpenAL Gerät '%s' ist nicht verfügbar."
 
 #: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
 #: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
@@ -156,9 +156,8 @@
 msgstr "Kein OpenAL Format vorhanden für das Audioformat %s."
 
 #: src/audio_output.cpp:369
-#, fuzzy
 msgid "Cannot set OpenAL audio volume."
-msgstr "Kann OpenAL Quelle nicht erzeugen."
+msgstr "Kann OpenAL Lautstärke nicht setzen."
 
 #: src/audio_output.cpp:395
 msgid "Cannot buffer initial OpenAL data."
@@ -189,16 +188,16 @@
 msgstr "Kann OpenAL Quellenpuffer nicht aus Warteschlange entfernen."
 
 #: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:363 src/media_object.cpp:825 src/media_object.cpp:1290
-#: src/video_output.cpp:416
+#: src/main.cpp:373 src/media_object.cpp:847 src/media_object.cpp:1312
+#: src/video_output.cpp:419
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
 #: src/command_file.cpp:174
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid command '%s'"
-msgstr "Ungültiges Kommando '%s' von LIRC erhalten."
+msgstr "%s: Ungültiges Kommando '%s'"
 
 #: src/dispatch.cpp:166
 msgid "Cannot connect to X server."
@@ -231,7 +230,7 @@
 msgid "Subtitle stream %d not found."
 msgstr "Untertitelkanal %d nicht gefunden."
 
-#: src/dispatch.cpp:555 src/main.cpp:753
+#: src/dispatch.cpp:555 src/main.cpp:763
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr ""
 "Diese Version von Bino wurde ohne Unterstützung für Equalizer erstellt."
@@ -268,65 +267,68 @@
 msgid "<p>Set the 3D layout of the video stream.</p>"
 msgstr "<p>Auswahl des Stereolayouts des Videokanals.</p>"
 
-#: src/gui.cpp:138
+#: src/gui.cpp:138 src/main.cpp:430
 msgid "2D"
 msgstr "2D"
 
-#: src/gui.cpp:139
+#: src/gui.cpp:139 src/main.cpp:431
 msgid "Separate streams, left first"
 msgstr "Getrennte Kanäle, links zuerst"
 
-#: src/gui.cpp:140
+#: src/gui.cpp:140 src/main.cpp:432
 msgid "Separate streams, right first"
 msgstr "Getrennte Kanäle, rechts zuerst"
 
-#: src/gui.cpp:141
-#, fuzzy
+#: src/gui.cpp:141 src/main.cpp:433
 msgid "Alternating, left first"
-msgstr "Getrennte Kanäle, links zuerst"
+msgstr "Abwechselnd, links zuerst."
 
-#: src/gui.cpp:142
-#, fuzzy
+#: src/gui.cpp:142 src/main.cpp:434
 msgid "Alternating, right first"
-msgstr "Getrennte Kanäle, rechts zuerst"
+msgstr "Abwechselnd, rechts zuerst."
 
 #: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2151 src/gui.cpp:2180
+#: src/main.cpp:435 src/main.cpp:450
 msgid "Top/bottom"
 msgstr "Oben/unten"
 
 #: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2152 src/gui.cpp:2181
+#: src/main.cpp:436 src/main.cpp:451
 msgid "Top/bottom, half height"
 msgstr "Oben/unten, halbe Höhe"
 
-#: src/gui.cpp:145
+#: src/gui.cpp:145 src/main.cpp:437
 msgid "Bottom/top"
 msgstr "Unten/oben"
 
-#: src/gui.cpp:146
+#: src/gui.cpp:146 src/main.cpp:438
 msgid "Bottom/top, half height"
 msgstr "Unten/oben, halbe Höhe"
 
 #: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2153 src/gui.cpp:2182
+#: src/main.cpp:439 src/main.cpp:452
 msgid "Left/right"
 msgstr "Links/rechts"
 
 #: src/gui.cpp:148 src/gui.cpp:170 src/gui.cpp:2154 src/gui.cpp:2183
+#: src/main.cpp:440 src/main.cpp:453
 msgid "Left/right, half width"
 msgstr "Links/rechts, halbe Breite"
 
-#: src/gui.cpp:149
+#: src/gui.cpp:149 src/main.cpp:441
 msgid "Right/left"
 msgstr "Rechts/links"
 
-#: src/gui.cpp:150
+#: src/gui.cpp:150 src/main.cpp:442
 msgid "Right/left, half width"
 msgstr "Rechts/links, halbe Breite"
 
 #: src/gui.cpp:151 src/gui.cpp:171 src/gui.cpp:2155 src/gui.cpp:2184
+#: src/main.cpp:443 src/main.cpp:454
 msgid "Even/odd rows"
 msgstr "Gerade/ungerade Zeilen"
 
-#: src/gui.cpp:152
+#: src/gui.cpp:152 src/main.cpp:444
 msgid "Odd/even rows"
 msgstr "Ungerade/gerade Zeilen"
 
@@ -338,89 +340,89 @@
 msgid "<p>Set the 3D output type for your display.</p>"
 msgstr "<p>Auswahl des 3D Ausgabetyps für das Ausgabegerät.</p>"
 
-#: src/gui.cpp:163 src/gui.cpp:2149 src/gui.cpp:2178
+#: src/gui.cpp:163 src/gui.cpp:2149 src/gui.cpp:2178 src/main.cpp:448
 msgid "Left view"
 msgstr "Linke Sicht"
 
-#: src/gui.cpp:164 src/gui.cpp:2150 src/gui.cpp:2179
+#: src/gui.cpp:164 src/gui.cpp:2150 src/gui.cpp:2179 src/main.cpp:449
 msgid "Right view"
 msgstr "Rechte Sicht"
 
-#: src/gui.cpp:165
+#: src/gui.cpp:165 src/main.cpp:446
 msgid "OpenGL stereo"
 msgstr "OpenGL Stereo"
 
-#: src/gui.cpp:166
-msgid "Left/right view alternating"
-msgstr ""
+#: src/gui.cpp:166 src/main.cpp:447
+msgid "Left/right alternating"
+msgstr "Links/rechts abwechselnd"

bino-1.3.4.tar.xz/po/fr.gmo -> bino-1.4.0.tar.xz/po/fr.gmo Changed

bino-1.3.4.tar.xz/po/fr.po -> bino-1.4.0.tar.xz/po/fr.po Changed

@@ -1,15 +1,15 @@
 # French translations for bino package
 # Traductions françaises du paquet bino.
-# Copyright (C) 2011 The Bino developers
+# Copyright (C) 2012 The Bino developers
 # This file is distributed under the same license as the bino package.
-# Frédéric Devernay <>, 2011.
+# Frédéric Devernay <frederic.devernay@m4x.org>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: bino 0.9.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-05-12 12:23+0200\n"
-"PO-Revision-Date: 2011-08-28 17:34+0200\n"
+"POT-Creation-Date: 2012-06-24 11:25+0200\n"
+"PO-Revision-Date: 2012-06-05 10:45+0200\n"
 "Last-Translator: Frédéric Devernay <>\n"
 "Language-Team: French\n"
 "Language: fr\n"
@@ -91,13 +91,13 @@
 msgid "Too many arguments."
 msgstr "Trop d'arguments."
 
-#: src/base/str.cpp:267
+#: src/base/str.cpp:268
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Impossible de convertir la chaîne de caractères en %s."
 
-#: src/base/str.cpp:515 src/base/str.cpp:533 src/base/str.cpp:543
-#: src/base/str.cpp:554 src/base/str.cpp:559
+#: src/base/str.cpp:516 src/base/str.cpp:534 src/base/str.cpp:544
+#: src/base/str.cpp:555 src/base/str.cpp:560
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Impossible de convertir %s en %s."
@@ -108,7 +108,7 @@
 #: src/base/thread.cpp:204 src/base/thread.cpp:211 src/base/thread.cpp:225
 #: src/base/thread.cpp:245
 msgid "System function failed: "
-msgstr ""
+msgstr "Échec d'une fonction système : "
 
 #: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
 msgid "Cannot get time."
@@ -119,9 +119,9 @@
 msgstr "Aucun périphérique OpenAL disponible."
 
 #: src/audio_output.cpp:93 src/audio_output.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "OpenAL device '%s' is not available."
-msgstr "Aucun périphérique OpenAL disponible."
+msgstr "Périphérique OpenAL '%s' non disponible."
 
 #: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
 #: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
@@ -159,9 +159,8 @@
 msgstr "Aucun format OpenAL disponible pour le format de données audio %s."
 
 #: src/audio_output.cpp:369
-#, fuzzy
 msgid "Cannot set OpenAL audio volume."
-msgstr "Impossible de créer la source OpenAL."
+msgstr "Impossible de régler le volume OpenAL."
 
 #: src/audio_output.cpp:395
 msgid "Cannot buffer initial OpenAL data."
@@ -192,16 +191,16 @@
 msgstr "Impossible de vider la queue de tampons de la source OpenAL."
 
 #: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:363 src/media_object.cpp:825 src/media_object.cpp:1290
-#: src/video_output.cpp:416
+#: src/main.cpp:373 src/media_object.cpp:847 src/media_object.cpp:1312
+#: src/video_output.cpp:419
 #, c-format
 msgid "%s: %s"
 msgstr "%s : %s"
 
 #: src/command_file.cpp:174
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid command '%s'"
-msgstr "Commande LIRC '%s' invalide."
+msgstr "%s: commande invalide '%s'"
 
 #: src/dispatch.cpp:166
 msgid "Cannot connect to X server."
@@ -234,7 +233,7 @@
 msgid "Subtitle stream %d not found."
 msgstr "Flux de sous-titres %d non trouvé."
 
-#: src/dispatch.cpp:555 src/main.cpp:753
+#: src/dispatch.cpp:555 src/main.cpp:763
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Cette version de Bino a été compilée sans le support Equalizer."
 
@@ -270,65 +269,68 @@
 msgid "<p>Set the 3D layout of the video stream.</p>"
 msgstr "<p>Choisir la disposition 3D du flux vidéo</p>"
 
-#: src/gui.cpp:138
+#: src/gui.cpp:138 src/main.cpp:430
 msgid "2D"
 msgstr "2D"
 
-#: src/gui.cpp:139
+#: src/gui.cpp:139 src/main.cpp:431
 msgid "Separate streams, left first"
 msgstr "Flux séparés, gauche d'abord"
 
-#: src/gui.cpp:140
+#: src/gui.cpp:140 src/main.cpp:432
 msgid "Separate streams, right first"
 msgstr "Flux séparés, droit d'abord"
 
-#: src/gui.cpp:141
-#, fuzzy
+#: src/gui.cpp:141 src/main.cpp:433
 msgid "Alternating, left first"
-msgstr "Flux séparés, gauche d'abord"
+msgstr "Alterné, gauche d'abord"
 
-#: src/gui.cpp:142
-#, fuzzy
+#: src/gui.cpp:142 src/main.cpp:434
 msgid "Alternating, right first"
-msgstr "Flux séparés, droit d'abord"
+msgstr "Alterné, droit d'abord"
 
 #: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2151 src/gui.cpp:2180
+#: src/main.cpp:435 src/main.cpp:450
 msgid "Top/bottom"
 msgstr "Haut/bas"
 
 #: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2152 src/gui.cpp:2181
+#: src/main.cpp:436 src/main.cpp:451
 msgid "Top/bottom, half height"
 msgstr "Haut/bas, demi-hauteur"
 
-#: src/gui.cpp:145
+#: src/gui.cpp:145 src/main.cpp:437
 msgid "Bottom/top"
 msgstr "Bas/haut"
 
-#: src/gui.cpp:146
+#: src/gui.cpp:146 src/main.cpp:438
 msgid "Bottom/top, half height"
 msgstr "Bas/haut, demi-hauteur"
 
 #: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2153 src/gui.cpp:2182
+#: src/main.cpp:439 src/main.cpp:452
 msgid "Left/right"
 msgstr "gauche/droite"
 
 #: src/gui.cpp:148 src/gui.cpp:170 src/gui.cpp:2154 src/gui.cpp:2183
+#: src/main.cpp:440 src/main.cpp:453
 msgid "Left/right, half width"
 msgstr "Gauche/droite, demi-largeur"
 
-#: src/gui.cpp:149
+#: src/gui.cpp:149 src/main.cpp:441
 msgid "Right/left"
 msgstr "Droite/gauche"
 
-#: src/gui.cpp:150
+#: src/gui.cpp:150 src/main.cpp:442
 msgid "Right/left, half width"
 msgstr "Droite/gauche, demi-largeur"
 
 #: src/gui.cpp:151 src/gui.cpp:171 src/gui.cpp:2155 src/gui.cpp:2184
+#: src/main.cpp:443 src/main.cpp:454
 msgid "Even/odd rows"
 msgstr "Lignes paires/impaires"
 
-#: src/gui.cpp:152
+#: src/gui.cpp:152 src/main.cpp:444
 msgid "Odd/even rows"
 msgstr "Lignes impaires/paires"
 
@@ -340,88 +342,88 @@
 msgid "<p>Set the 3D output type for your display.</p>"
 msgstr "Choisir le type de sortie 3D pour votre affichage."
 
-#: src/gui.cpp:163 src/gui.cpp:2149 src/gui.cpp:2178
+#: src/gui.cpp:163 src/gui.cpp:2149 src/gui.cpp:2178 src/main.cpp:448
 msgid "Left view"
 msgstr "Vue gauche"
 
-#: src/gui.cpp:164 src/gui.cpp:2150 src/gui.cpp:2179
+#: src/gui.cpp:164 src/gui.cpp:2150 src/gui.cpp:2179 src/main.cpp:449
 msgid "Right view"
 msgstr "Vue droite"
 
-#: src/gui.cpp:165
+#: src/gui.cpp:165 src/main.cpp:446
 msgid "OpenGL stereo"
 msgstr "Stéréo OpenGL"

bino-1.3.4.tar.xz/po/ru.gmo -> bino-1.4.0.tar.xz/po/ru.gmo Changed

bino-1.3.4.tar.xz/po/ru.po -> bino-1.4.0.tar.xz/po/ru.po Changed

@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-05-12 12:23+0200\n"
-"PO-Revision-Date: 2011-08-28 01:00+0600\n"
+"POT-Creation-Date: 2012-06-24 11:25+0200\n"
+"PO-Revision-Date: 2012-06-18 21:29+0600\n"
 "Last-Translator: Alexey Osipov <simba@lerlan.ru>\n"
 "Language-Team: \n"
 "Language: ru\n"
@@ -88,13 +88,13 @@
 msgid "Too many arguments."
 msgstr "Слишком много параметров."
 
-#: src/base/str.cpp:267
+#: src/base/str.cpp:268
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Невозможно преобразовать строку в %s."
 
-#: src/base/str.cpp:515 src/base/str.cpp:533 src/base/str.cpp:543
-#: src/base/str.cpp:554 src/base/str.cpp:559
+#: src/base/str.cpp:516 src/base/str.cpp:534 src/base/str.cpp:544
+#: src/base/str.cpp:555 src/base/str.cpp:560
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Невозможно преобразовать %s в %s."
@@ -105,7 +105,7 @@
 #: src/base/thread.cpp:204 src/base/thread.cpp:211 src/base/thread.cpp:225
 #: src/base/thread.cpp:245
 msgid "System function failed: "
-msgstr ""
+msgstr "Отказ системной функции:"
 
 #: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
 msgid "Cannot get time."
@@ -116,9 +116,9 @@
 msgstr "Устройства OpenAL не доступны."
 
 #: src/audio_output.cpp:93 src/audio_output.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "OpenAL device '%s' is not available."
-msgstr "Устройства OpenAL не доступны."
+msgstr "Устройство OpenAL '%s' не доступно."
 
 #: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
 #: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
@@ -156,9 +156,8 @@
 msgstr "Для формата аудио %s не найдено подходящих форматов OpenAL."
 
 #: src/audio_output.cpp:369
-#, fuzzy
 msgid "Cannot set OpenAL audio volume."
-msgstr "Невозможно создать источник OpenAL."
+msgstr "Невозможно установить громкость OpenAL."
 
 #: src/audio_output.cpp:395
 msgid "Cannot buffer initial OpenAL data."
@@ -189,16 +188,16 @@
 msgstr "Невозможно получить из очереди буферы источника OpenAL."
 
 #: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:363 src/media_object.cpp:825 src/media_object.cpp:1290
-#: src/video_output.cpp:416
+#: src/main.cpp:373 src/media_object.cpp:847 src/media_object.cpp:1312
+#: src/video_output.cpp:419
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
 #: src/command_file.cpp:174
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid command '%s'"
-msgstr "От LIRC получена некорректная команда '%s'."
+msgstr "%s: некорректная команда '%s'"
 
 #: src/dispatch.cpp:166
 msgid "Cannot connect to X server."
@@ -232,7 +231,7 @@
 msgid "Subtitle stream %d not found."
 msgstr "Дорожка субтитров %d не найдена."
 
-#: src/dispatch.cpp:555 src/main.cpp:753
+#: src/dispatch.cpp:555 src/main.cpp:763
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Эта версия Bino была собрана без поддержки Equalizer."
 
@@ -268,65 +267,68 @@
 msgid "<p>Set the 3D layout of the video stream.</p>"
 msgstr "<p>Укажите 3D раскладку исходного видеофайла.</p>"
 
-#: src/gui.cpp:138
+#: src/gui.cpp:138 src/main.cpp:430
 msgid "2D"
 msgstr "2D"
 
-#: src/gui.cpp:139
+#: src/gui.cpp:139 src/main.cpp:431
 msgid "Separate streams, left first"
 msgstr "Отдельные видеофайлы, сначала левый"
 
-#: src/gui.cpp:140
+#: src/gui.cpp:140 src/main.cpp:432
 msgid "Separate streams, right first"
 msgstr "Отдельные видеофайлы, сначала правый"
 
-#: src/gui.cpp:141
-#, fuzzy
+#: src/gui.cpp:141 src/main.cpp:433
 msgid "Alternating, left first"
-msgstr "Отдельные видеофайлы, сначала левый"
+msgstr "Чередование кадров, сначала левый"
 
-#: src/gui.cpp:142
-#, fuzzy
+#: src/gui.cpp:142 src/main.cpp:434
 msgid "Alternating, right first"
-msgstr "Отдельные видеофайлы, сначала правый"
+msgstr "Чередование кадров, сначала правый"
 
 #: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2151 src/gui.cpp:2180
+#: src/main.cpp:435 src/main.cpp:450
 msgid "Top/bottom"
 msgstr "Сверху/снизу"
 
 #: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2152 src/gui.cpp:2181
+#: src/main.cpp:436 src/main.cpp:451
 msgid "Top/bottom, half height"
 msgstr "Сверху/снизу, в половину высоты"
 
-#: src/gui.cpp:145
+#: src/gui.cpp:145 src/main.cpp:437
 msgid "Bottom/top"
 msgstr "Снизу/сверху"
 
-#: src/gui.cpp:146
+#: src/gui.cpp:146 src/main.cpp:438
 msgid "Bottom/top, half height"
 msgstr "Снизу/сверху, в половину высоты"
 
 #: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2153 src/gui.cpp:2182
+#: src/main.cpp:439 src/main.cpp:452
 msgid "Left/right"
 msgstr "Слева/справа"
 
 #: src/gui.cpp:148 src/gui.cpp:170 src/gui.cpp:2154 src/gui.cpp:2183
+#: src/main.cpp:440 src/main.cpp:453
 msgid "Left/right, half width"
 msgstr "Слева/справа, в половину ширины"
 
-#: src/gui.cpp:149
+#: src/gui.cpp:149 src/main.cpp:441
 msgid "Right/left"
 msgstr "Справа/слева"
 
-#: src/gui.cpp:150
+#: src/gui.cpp:150 src/main.cpp:442
 msgid "Right/left, half width"
 msgstr "Справа/слева, в половину ширины"
 
 #: src/gui.cpp:151 src/gui.cpp:171 src/gui.cpp:2155 src/gui.cpp:2184
+#: src/main.cpp:443 src/main.cpp:454
 msgid "Even/odd rows"
 msgstr "Четные/нечетные ряды"
 
-#: src/gui.cpp:152
+#: src/gui.cpp:152 src/main.cpp:444
 msgid "Odd/even rows"
 msgstr "Нечетные/четные ряды"
 
@@ -338,88 +340,88 @@
 msgid "<p>Set the 3D output type for your display.</p>"
 msgstr "<p>Укажите 3D режим для вашего дисплея.</p>"
 
-#: src/gui.cpp:163 src/gui.cpp:2149 src/gui.cpp:2178
+#: src/gui.cpp:163 src/gui.cpp:2149 src/gui.cpp:2178 src/main.cpp:448
 msgid "Left view"
 msgstr "Левый видеоряд"
 
-#: src/gui.cpp:164 src/gui.cpp:2150 src/gui.cpp:2179
+#: src/gui.cpp:164 src/gui.cpp:2150 src/gui.cpp:2179 src/main.cpp:449
 msgid "Right view"
 msgstr "Правый видеоряд"
 
-#: src/gui.cpp:165
+#: src/gui.cpp:165 src/main.cpp:446
 msgid "OpenGL stereo"
 msgstr "Стерео OpenGL"
 
-#: src/gui.cpp:166
-msgid "Left/right view alternating"
-msgstr ""
+#: src/gui.cpp:166 src/main.cpp:447
+msgid "Left/right alternating"
+msgstr "Чередование кадров (левый/правый)"
 
-#: src/gui.cpp:172 src/gui.cpp:2156 src/gui.cpp:2185

bino-1.3.4.tar.xz/src/base/msg.cpp -> bino-1.4.0.tar.xz/src/base/msg.cpp Changed

@@ -21,7 +21,6 @@
 #include <limits>
 #include <cstdlib>
 #include <cstdio>
-#include <cwchar>
 
 #include "dbg.h"
 #include "str.h"
@@ -156,49 +155,6 @@
         msg(indent, level, s);
     }
 
-    static std::wstring str_to_wstr(const std::string &in)
-    {
-        std::wstring out;
-        size_t l = std::mbstowcs(NULL, in.c_str(), 0);
-        if (l == static_cast<size_t>(-1) || l > static_cast<size_t>(std::numeric_limits<int>::max() - 1))
-        {
-            // This should never happen. We don't want to handle this case, and we don't want to throw
-            // an exception from a msg function, so inform the user and abort.
-            msg::err("Failure in msg::str_to_wstr().");
-            dbg::crash();
-        }
-        out.resize(l);
-        std::mbstowcs(&(out[0]), in.c_str(), l);
-        return out;
-    }
-
-    static int display_width(const std::wstring &ws)
-    {
-#ifdef HAVE_WCWIDTH
-        return std::max(0, ::wcswidth(ws.c_str(), ws.length()));
-#else
-        return ws.size() - 1;
-#endif
-    }
-
-    static int display_width(const wchar_t *ws, size_t n)
-    {
-#ifdef HAVE_WCWIDTH
-        return std::max(0, ::wcswidth(ws, n));
-#else
-        return n;
-#endif
-    }
-
-    static int display_width(wchar_t w)
-    {
-#ifdef HAVE_WCWIDTH
-        return std::max(0, ::wcwidth(w));
-#else
-        return 1;
-#endif
-    }
-
     void msg_txt(int indent, level_t level, const std::string &s)
     {
         if (level < _level)
@@ -206,12 +162,12 @@
             return;
         }
 
-        std::wstring pfx = str_to_wstr(prefix(level) + std::string(indent, ' '));
-        int pfx_dw = display_width(pfx);
-        std::wstring text = str_to_wstr(s);
+        std::wstring pfx = str::to_wstr(prefix(level) + std::string(indent, ' '));
+        size_t pfx_dw = str::display_width(pfx);
+        std::wstring text = str::to_wstr(s);
 
         std::wstring out;
-        int line_dw = 0;
+        size_t line_dw = 0;
         int first_unprinted = 0;
         int last_blank = -1;
         bool end_of_text = false;
@@ -263,11 +219,11 @@
                     out += std::wstring(text.c_str() + first_unprinted, last_blank - first_unprinted + 1);
                     first_unprinted = last_blank + 1;
                     last_blank = -1;
-                    line_dw = display_width(text.c_str() + first_unprinted, text_index - first_unprinted + 1);
+                    line_dw = str::display_width(text.substr(first_unprinted, text_index - first_unprinted + 1));
                 }
                 else
                 {
-                    line_dw += display_width(text[text_index]);
+                    line_dw += str::display_width(text.substr(text_index, 1));
                 }
             }
         }

bino-1.3.4.tar.xz/src/base/str.cpp -> bino-1.4.0.tar.xz/src/base/str.cpp Changed

@@ -26,6 +26,7 @@
 #include <limits>
 #include <sstream>
 #include <locale>
+#include <cwchar>
 
 #ifdef HAVE_NL_LANGINFO
 # include <locale.h>
@@ -559,4 +560,33 @@
         throw exc(str::asprintf(_("Cannot convert %s to %s."), from_charset.c_str(), to_charset.c_str()), ENOSYS);
 #endif
     }
+
+    std::wstring to_wstr(const std::string &in)
+    {
+        std::wstring out;
+        size_t l = std::mbstowcs(NULL, in.c_str(), 0);
+        if (l == static_cast<size_t>(-1) || l > static_cast<size_t>(std::numeric_limits<int>::max() - 1)) {
+            // This should never happen. We don't want to handle this case, and we don't want to throw
+            // an exception from a str function, so inform the user and abort.
+            msg::err("Failure in str::to_wstr().");
+            dbg::crash();
+        }
+        out.resize(l);
+        std::mbstowcs(&(out[0]), in.c_str(), l);
+        return out;
+    }
+
+    size_t display_width(const std::wstring& ws)
+    {
+#ifdef HAVE_WCSWIDTH
+        return std::max(0, ::wcswidth(ws.c_str(), ws.length()));
+#else
+        return ws.length();
+#endif
+    }
+
+    size_t display_width(const std::string& s)
+    {
+        return display_width(to_wstr(s));
+    }
 }

bino-1.3.4.tar.xz/src/base/str.h -> bino-1.4.0.tar.xz/src/base/str.h Changed

bino-1.3.4.tar.xz/src/gui.cpp -> bino-1.4.0.tar.xz/src/gui.cpp Changed

@@ -163,7 +163,7 @@
     _output_combobox->addItem(QIcon(":icons-local/output-type-mono-left.png"), _("Left view"));
     _output_combobox->addItem(QIcon(":icons-local/output-type-mono-right.png"), _("Right view"));
     _output_combobox->addItem(QIcon(":icons-local/output-type-stereo.png"), _("OpenGL stereo"));
-    _output_combobox->addItem(QIcon(":icons-local/output-type-alternating.png"), _("Left/right view alternating"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-alternating.png"), _("Left/right alternating"));
     _output_combobox->addItem(QIcon(":icons-local/output-type-top-bottom.png"), _("Top/bottom"));
     _output_combobox->addItem(QIcon(":icons-local/output-type-top-bottom-half.png"), _("Top/bottom, half height"));
     _output_combobox->addItem(QIcon(":icons-local/output-type-left-right.png"), _("Left/right"));
@@ -172,20 +172,20 @@
     _output_combobox->addItem(QIcon(":icons-local/output-type-even-odd-columns.png"), _("Even/odd columns"));
     _output_combobox->addItem(QIcon(":icons-local/output-type-checkerboard.png"), _("Checkerboard pattern"));
     _output_combobox->addItem(QIcon(":icons-local/output-type-hdmi-frame-pack.png"), _("HDMI frame packing mode"));
-    _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, monochrome method"));
-    _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, half-color method"));
-    _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, full-color method"));
-    _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, high-quality Dubois method"));
-    _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, monochrome method"));
-    _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, half-color method"));
-    _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, full-color method"));
-    _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, high-quality Dubois method"));
-    _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, monochrome method"));
-    _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, half-color method"));
-    _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, full-color method"));
-    _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, high-quality Dubois method"));
-    _output_combobox->addItem(QIcon(":icons-local/output-type-red-green.png"), _("Red/green glasses, monochrome method"));
-    _output_combobox->addItem(QIcon(":icons-local/output-type-red-blue.png"), _("Red/blue glasses, monochrome method"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, monochrome"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, half color"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, full color"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, Dubois"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, monochrome"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, half color"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, full color"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, Dubois"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, monochrome"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, half color"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, full color"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, Dubois"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-red-green.png"), _("Red/green glasses, monochrome"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-red-blue.png"), _("Red/blue glasses, monochrome"));
     connect(_output_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(output_changed()));
     layout2->addWidget(_output_combobox, 0, 1);
     layout2->setColumnStretch(1, 1);
@@ -1515,9 +1515,9 @@
                 "<p>Set zoom level for videos that<br>"
                 "are wider than the screen:<br>"
                 "0: Show full video width.<br>"
-                "1: Use full screen height.</p"));
+                "1: Use full screen height.</p>"));
     QLabel *z_label = new QLabel(_("Zoom:"));
-    z_label->setToolTip(_("<p>Set the zoom level for videos that are wider than the screen</p>"));
+    z_label->setToolTip(_("<p>Set the zoom level for videos that are wider than the screen.</p>"));
     _z_slider = new QSlider(Qt::Horizontal);
     _z_slider->setRange(0, 1000);
     _z_slider->setValue(dispatch::parameters().zoom() * 1000.0f);
@@ -2155,20 +2155,20 @@
     _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-even-odd-rows.png"), _("Even/odd rows"));
     _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-even-odd-columns.png"), _("Even/odd columns"));
     _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-checkerboard.png"), _("Checkerboard pattern"));
-    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, monochrome method"));
-    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, half-color method"));
-    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, full-color method"));
-    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, high-quality Dubois method"));
-    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, monochrome method"));
-    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, half-color method"));
-    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, full-color method"));
-    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, high-quality Dubois method"));
-    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, monochrome method"));
-    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, half-color method"));
-    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, full-color method"));
-    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, high-quality Dubois method"));
-    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-green.png"), _("Red/green glasses, monochrome method"));
-    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-blue.png"), _("Red/blue glasses, monochrome method"));
+    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, monochrome"));
+    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, half color"));
+    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, full color"));
+    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, Dubois"));
+    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, monochrome"));
+    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, half color"));
+    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, full color"));
+    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, Dubois"));
+    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, monochrome"));
+    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, half color"));
+    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, full color"));
+    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, Dubois"));
+    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-green.png"), _("Red/green glasses, monochrome"));
+    _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-blue.png"), _("Red/blue glasses, monochrome"));
     connect(_sdi_output_left_stereo_mode_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(sdi_output_left_stereo_mode_changed(int)));
 
     QLabel *sdi_output_right_stereo_mode_label = new QLabel(_("Right stereo mode:"));
@@ -2184,20 +2184,20 @@
     _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-even-odd-rows.png"), _("Even/odd rows"));
     _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-even-odd-columns.png"), _("Even/odd columns"));
     _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-checkerboard.png"), _("Checkerboard pattern"));
-    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, monochrome method"));
-    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, half-color method"));
-    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, full-color method"));
-    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, high-quality Dubois method"));
-    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, monochrome method"));
-    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, half-color method"));
-    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, full-color method"));
-    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, high-quality Dubois method"));
-    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, monochrome method"));
-    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, half-color method"));
-    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, full-color method"));
-    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, high-quality Dubois method"));
-    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-green.png"), _("Red/green glasses, monochrome method"));
-    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-blue.png"), _("Red/blue glasses, monochrome method"));
+    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, monochrome"));
+    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, half color"));
+    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, full color"));
+    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, Dubois"));
+    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, monochrome"));
+    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, half color"));
+    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, full color"));
+    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, Dubois"));
+    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, monochrome"));
+    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, half color"));
+    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, full color"));
+    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, Dubois"));
+    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-green.png"), _("Red/green glasses, monochrome"));
+    _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-blue.png"), _("Red/blue glasses, monochrome"));
     connect(_sdi_output_right_stereo_mode_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(sdi_output_right_stereo_mode_changed(int)));
 
     QPushButton *ok_button = new QPushButton(_("OK"));
@@ -2629,14 +2629,22 @@
         _x11_device_field[i] = new QLineEdit();
         _x11_device_field[i]->setToolTip(_("<p>Set the X11 device string. "
                     "Refer to the manual for details.</p>"));
+        _x11_device_field[i]->setText("localhost:0.0+0,0");
         _device_chooser_stack[i] = new QStackedWidget();
         _device_chooser_stack[i]->addWidget(_default_device_combobox[i]);
         _device_chooser_stack[i]->addWidget(_firewire_device_combobox[i]);
         _device_chooser_stack[i]->addWidget(_x11_device_field[i]);
         if (last_devices.size() > i) {
-            _default_device_combobox[i]->setCurrentIndex(_default_device_combobox[i]->findText(last_devices[i]));
-            _firewire_device_combobox[i]->setCurrentIndex(_firewire_device_combobox[i]->findText(last_devices[i]));
-            _x11_device_field[i]->setText(last_devices[i]);
+            int j;
+            if (dev_request.device == device_request::sys_default
+                    && (j = _default_device_combobox[i]->findText(last_devices[i])) >= 0) {
+                _default_device_combobox[i]->setCurrentIndex(j);
+            } else if (dev_request.device == device_request::firewire
+                    && (j = _firewire_device_combobox[i]->findText(last_devices[i])) >= 0) {
+                _firewire_device_combobox[i]->setCurrentIndex(j);
+            } else if (dev_request.device == device_request::x11) {
+                _x11_device_field[i]->setText(last_devices[i]);
+            }
         }
     }
     connect(_type_combobox, SIGNAL(currentIndexChanged(int)), _device_chooser_stack[0], SLOT(setCurrentIndex(int)));
@@ -3007,7 +3015,7 @@
     update_recent_file_actions();
 
     file_menu->addSeparator();
-    QAction *file_quit_act = new QAction(_("&Quit..."), this);
+    QAction *file_quit_act = new QAction(_("&Quit"), this);
     file_quit_act->setShortcut(QKeySequence::Quit);
     file_quit_act->setMenuRole(QAction::QuitRole);
     file_quit_act->setIcon(get_icon("application-exit"));
@@ -3232,6 +3240,9 @@
 
 void main_window::closeEvent(QCloseEvent *event)
 {
+    // Close a currently opened video. This also stops the video if it is
+    // playing, so that its settings are remembered.
+    send_cmd(command::close);
     // Stop the event and play loop
     _timer->stop();
     // Remember the Session preferences
@@ -3660,28 +3671,28 @@
                 // the --help output in main.cpp, to reduce the burden for translators.
                 QString("<p>") + _("Keyboard control:") + "<br>"
                 "<table>"
-                "<tr><td>q, ESC</td><td>" + _("Stop.") + "</td></tr>"
-                "<tr><td>p / SPACE</td><td>" + _("Pause / unpause.") + "</td></tr>"
-                "<tr><td>f</td><td>" + _("Toggle fullscreen.") + "</td></tr>"
-                "<tr><td>c</td><td>" + _("Center window.") + "</td></tr>"
-                "<tr><td>e / F7</td><td>" + _("Swap left/right eye.") + "</td></tr>"
-                "<tr><td>v</td><td>" + _("Cycle through available video streams.") + "</td></tr>"
-                "<tr><td>a</td><td>" + _("Cycle through available audio streams.") + "</td></tr>"
-                "<tr><td>s</td><td>" + _("Cycle through available subtitle streams.") + "</td></tr>"
-                "<tr><td>1, 2</td><td>" + _("Adjust contrast.") + "</td></tr>"
-                "<tr><td>3, 4</td><td>" + _("Adjust brightness.") + "</td></tr>"
-                "<tr><td>5, 6</td><td>" + _("Adjust hue.") + "</td></tr>"
-                "<tr><td>7, 8</td><td>" + _("Adjust saturation.") + "</td></tr>"
-                "<tr><td>[, ]</td><td>" + _("Adjust parallax.") + "</td></tr>"
-                "<tr><td>(, )</td><td>" + _("Adjust ghostbusting.") + "</td></tr>"
-                "<tr><td>&lt;, &gt;</td><td>" + _("Adjust zoom for wide videos.") + "</td></tr>"
-                "<tr><td>/, *</td><td>" + _("Adjust audio volume.") + "</td></tr>"
-                "<tr><td>m</td><td>" + _("Toggle audio mute.") + "</td></tr>"
-                "<tr><td>.</td><td>" + _("Step a single video frame forward.") + "</td></tr>"
-                "<tr><td>left, right</td><td>" + _("Seek 10 seconds backward / forward.") + "</td></tr>"
-                "<tr><td>down, up</td><td>" + _("Seek 1 minute backward / forward.") + "</td></tr>"
-                "<tr><td>page down, page up</td><td>" + _("Seek 10 minutes backward / forward.") + "</td></tr>"
-                "<tr><td>Media keys</td><td>" + _("Media keys should work as expected.") + "</td></tr>"
+                "<tr><td>q, " + _("ESC") + "</td><td>" + _("Stop") + "</td></tr>"
+                "<tr><td>p / " + _("SPACE") + "</td><td>" + _("Pause / unpause") + "</td></tr>"
+                "<tr><td>f</td><td>" + _("Toggle fullscreen") + "</td></tr>"

bino-1.3.4.tar.xz/src/main.cpp -> bino-1.4.0.tar.xz/src/main.cpp Changed

@@ -52,6 +52,7 @@
 
 #include "dbg.h"
 #include "msg.h"
+#include "str.h"
 #include "opt.h"
 
 #include "dispatch.h"
@@ -166,6 +167,15 @@
     }
 }
 
+static std::string lengthen(const std::string& s, int display_width)
+{
+    int spaces = display_width - static_cast<int>(str::display_width(s));
+    if (spaces > 0)
+        return s + std::string(spaces, ' ');
+    else
+        return s;
+}
+
 
 int main(int argc, char *argv[])
 {
@@ -395,127 +405,127 @@
         msg::req_txt(std::string(_("Usage:")) + '\n'
                 + "  " + program_name + ' ' + "[option...] [file...]" + "\n\n"
                 + _("Options:") + '\n'
-                + "  --help                   " + _("Print help.") + '\n'
-                + "  --version                " + _("Print version.") + '\n'
-                + "  -n|--no-gui              " + _("Do not use the GUI, just show a plain window.") + '\n'
-                + "  --log-file=FILE          " + _("Append all log messages to the given file.") + '\n'
-                + "  -L|--log-level=LEVEL     " + _("Set log level (debug/info/warning/error/quiet).") + '\n'
-                + "  --list-audio-devices     " + _("Print a list of known audio devices and exit.") + '\n'
-                + "  -A|--audio-device=N      " + _("Use audio device number N (N=0 is the default).") + '\n'
-                + "  -D|--audio-delay=D       " + _("Delay audio by D milliseconds. Default is 0.") + '\n'
-                + "  -V|--audio-volume=V      " + _("Set audio volume (0 to 1). Default is 1.") + '\n'
-                + "  -m|--audio-mute          " + _("Mute audio.") + '\n'
-                + "  --device-type=TYPE       " + _("Type of input device: default, firewire, x11.") + '\n'
-                + "  --device-frame-size=WxH  " + _("Request frame size WxH from input device.") + '\n'
-                + "  --device-frame-rate=N/D  " + _("Request frame rate N/D from input device.") + '\n'
-                + "  --device-format=FORMAT   " + _("Request device format 'default' or 'mjpeg'.") + '\n'
-                + "  --read-commands=FILE     " + _("Read commands from a file.") + '\n'
-                + "  --lirc-config=FILE       " + _("Use the given LIRC configuration file.") + '\n'
-                + "                           " + _("This option can be used more than once.") + '\n'
-                + "  --quality=Q              " + _("Output quality (0=fastest to 4=best/default).") + '\n'
-                + "  -v|--video=STREAM        " + _("Select video stream (1-n, depending on input).") + '\n'
-                + "  -a|--audio=STREAM        " + _("Select audio stream (1-n, depending on input).") + '\n'
-                + "  -s|--subtitle=STREAM     " + _("Select subtitle stream (0-n, dep. on input).") + '\n'
+                + "  --help                   " + _("Print help") + '\n'
+                + "  --version                " + _("Print version") + '\n'
+                + "  -n|--no-gui              " + _("Do not use the GUI, just show a plain window") + '\n'
+                + "  --log-file=FILE          " + _("Append all log messages to the given file") + '\n'
+                + "  -L|--log-level=LEVEL     " + _("Set log level (debug/info/warning/error/quiet)") + '\n'
+                + "  --list-audio-devices     " + _("Print a list of known audio devices and exit") + '\n'
+                + "  -A|--audio-device=N      " + _("Use audio device number N (N=0 is the default)") + '\n'
+                + "  -D|--audio-delay=D       " + _("Delay audio by D milliseconds (default 0)") + '\n'
+                + "  -V|--audio-volume=V      " + _("Set audio volume (0 to 1, default 1)") + '\n'
+                + "  -m|--audio-mute          " + _("Mute audio") + '\n'
+                + "  --device-type=TYPE       " + _("Type of input device: default, firewire, x11") + '\n'
+                + "  --device-frame-size=WxH  " + _("Request frame size WxH from input device") + '\n'
+                + "  --device-frame-rate=N/D  " + _("Request frame rate N/D from input device") + '\n'
+                + "  --device-format=FORMAT   " + _("Request device format 'default' or 'mjpeg'") + '\n'
+                + "  --read-commands=FILE     " + _("Read commands from a file") + '\n'
+                + "  --lirc-config=FILE       " + _("Use the given LIRC configuration file") + '\n'
+                + "                           " + _("This option can be used more than once") + '\n'
+                + "  --quality=Q              " + _("Output quality (0=fastest to 4=best/default)") + '\n'
+                + "  -v|--video=STREAM        " + _("Select video stream (1-n, depending on input)") + '\n'
+                + "  -a|--audio=STREAM        " + _("Select audio stream (1-n, depending on input)") + '\n'
+                + "  -s|--subtitle=STREAM     " + _("Select subtitle stream (0-n, dep. on input)") + '\n'
                 + "  -i|--input=TYPE          " + _("Select input type (default autodetect):") + '\n'
-                + "    mono                     " + _("Single view.") + '\n'
-                + "    separate-left-right      " + _("Left/right separate streams, left first.") + '\n'
-                + "    separate-right-left      " + _("Left/right separate streams, right first.") + '\n'
-                + "    alternating-left-right   " + _("Left/right alternating, left first.") + '\n'
-                + "    alternating-right-left   " + _("Left/right alternating, right first.") + '\n'
-                + "    top-bottom               " + _("Left top, right bottom.") + '\n'
-                + "    top-bottom-half          " + _("Left top, right bottom, half height.") + '\n'
-                + "    bottom-top               " + _("Left bottom, right top.") + '\n'
-                + "    bottom-top-half          " + _("Left bottom, right top, half height.") + '\n'
-                + "    left-right               " + _("Left left, right right.") + '\n'
-                + "    left-right-half          " + _("Left left, right right, half width.") + '\n'
-                + "    right-left               " + _("Left right, right left.") + '\n'
-                + "    right-left-half          " + _("Left right, right left, half width.") + '\n'
-                + "    even-odd-rows            " + _("Left even rows, right odd rows.") + '\n'
-                + "    odd-even-rows            " + _("Left odd rows, right even rows.") + '\n'
+                + "    mono                     " + _("2D") + '\n'
+                + "    separate-left-right      " + _("Separate streams, left first") + '\n'
+                + "    separate-right-left      " + _("Separate streams, right first") + '\n'
+                + "    alternating-left-right   " + _("Alternating, left first") + '\n'
+                + "    alternating-right-left   " + _("Alternating, right first") + '\n'
+                + "    top-bottom               " + _("Top/bottom") + '\n'
+                + "    top-bottom-half          " + _("Top/bottom, half height") + '\n'
+                + "    bottom-top               " + _("Bottom/top") + '\n'
+                + "    bottom-top-half          " + _("Bottom/top, half height") + '\n'
+                + "    left-right               " + _("Left/right") + '\n'
+                + "    left-right-half          " + _("Left/right, half width") + '\n'
+                + "    right-left               " + _("Right/left") + '\n'
+                + "    right-left-half          " + _("Right/left, half width") + '\n'
+                + "    even-odd-rows            " + _("Even/odd rows") + '\n'
+                + "    odd-even-rows            " + _("Odd/even rows") + '\n'
                 + "  -o|--output=TYPE         " + _("Select output type:") + '\n'
-                + "    stereo                   " + _("OpenGL quad-buffered stereo.") + '\n'
-                + "    alternating              " + _("Left and right view alternating.") + '\n'
-                + "    mono-left                " + _("Only left.") + '\n'
-                + "    mono-right               " + _("Only right.") + '\n'
-                + "    top-bottom               " + _("Left top, right bottom.") + '\n'
-                + "    top-bottom-half          " + _("Left top, right bottom, half height.") + '\n'
-                + "    left-right               " + _("Left left, right right.") + '\n'
-                + "    left-right-half          " + _("Left left, right right, half width.") + '\n'
-                + "    even-odd-rows            " + _("Left even rows, right odd rows.") + '\n'
-                + "    even-odd-columns         " + _("Left even columns, right odd columns.") + '\n'
-                + "    checkerboard             " + _("Left and right in checkerboard pattern.") + '\n'
-                + "    hdmi-frame-pack          " + _("HDMI frame packing mode.") + '\n'
-                + "    red-cyan-monochrome      " + _("Red/cyan anaglyph, monochrome method.") + '\n'
-                + "    red-cyan-half-color      " + _("Red/cyan anaglyph, half color method.") + '\n'
-                + "    red-cyan-full-color      " + _("Red/cyan anaglyph, full color method.") + '\n'
-                + "    red-cyan-dubois          " + _("Red/cyan anaglyph, Dubois method.") + '\n'
-                + "    green-magenta-monochrome " + _("Green/magenta anaglyph, monochrome method.") + '\n'
-                + "    green-magenta-half-color " + _("Green/magenta anaglyph, half color method.") + '\n'
-                + "    green-magenta-full-color " + _("Green/magenta anaglyph, full color method.") + '\n'
-                + "    green-magenta-dubois     " + _("Green/magenta anaglyph, Dubois method.") + '\n'
-                + "    amber-blue-monochrome    " + _("Amber/blue anaglyph, monochrome method.") + '\n'
-                + "    amber-blue-half-color    " + _("Amber/blue anaglyph, half color method.") + '\n'
-                + "    amber-blue-full-color    " + _("Amber/blue anaglyph, full color method.") + '\n'
-                + "    amber-blue-dubois        " + _("Amber/blue anaglyph, Dubois method.") + '\n'
-                + "    red-green-monochrome     " + _("Red/green anaglyph, monochrome method.") + '\n'
-                + "    red-blue-monochrome      " + _("Red/blue anaglyph, monochrome method.") + '\n'
-                + "    equalizer                " + _("Multi-display via Equalizer (2D setup).") + '\n'
-                + "    equalizer-3d             " + _("Multi-display via Equalizer (3D setup).") + '\n'
-                + "  -S|--swap-eyes           " + _("Swap left/right view.") + '\n'
-                + "  -f|--fullscreen          " + _("Fullscreen.") + '\n'
-                + "  --fullscreen-screens=    " + _("Use the listed screens in fullscreen mode.") + '\n'
-                + "     [S0[,S1[,...]]]       " + _("Screen numbers start with 1.") + '\n'
-                + "                           " + _("An empty list defaults to the primary screen.") + '\n'
-                + "  --fullscreen-flip-left   " + _("Flip left view vertically when fullscreen.") + '\n'
-                + "  --fullscreen-flop-left   " + _("Flop left view horizontally when fullscreen.") + '\n'
-                + "  --fullscreen-flip-right  " + _("Flip right view vertically when fullscreen.") + '\n'
-                + "  --fullscreen-flop-right  " + _("Flop right view horizontally when fullscreen.") + '\n'
-                + "  --fullscreen-3dr-sync    " + _("Use DLP 3-D Ready Sync when fullscreen.") + '\n'
-                + "  -z|--zoom=Z              " + _("Set zoom for wide videos (0=off to 1=full).") + '\n'
-                + "  -C|--crop=W:H            " + _("Crop video to given aspect ratio (0:0=off).") + '\n'
-                + "  -c|--center              " + _("Center window on screen.") + '\n'
-                + "  --subtitle-encoding=ENC  " + _("Set subtitle encoding.") + '\n'
-                + "  --subtitle-font=FONT     " + _("Set subtitle font name.") + '\n'
-                + "  --subtitle-size=N        " + _("Set subtitle font size.") + '\n'
-                + "  --subtitle-scale=S       " + _("Set subtitle scale factor.") + '\n'
-                + "  --subtitle-color=COLOR   " + _("Set subtitle color, in [AA]RRGGBB format.") + '\n'
-                + "  --subtitle-shadow=-1|0|1 " + _("Set subtitle shadow, -1=default, 0=off, 1=on.") + '\n'
-                + "  --subtitle-parallax=VAL  " + _("Subtitle parallax adjustment (-1 to +1).") + '\n'
-                + "  -P|--parallax=VAL        " + _("Parallax adjustment (-1 to +1).") + '\n'
-                + "  --crosstalk=VAL          " + _("Crosstalk leak level (0 to 1).") + '\n'
-                + "                           " + _("Comma-separated values for R,G,B.") + '\n'
-                + "  --ghostbust=VAL          " + _("Amount of ghostbusting to apply (0 to 1).") + '\n'
-                + "  -b|--benchmark           " + _("Benchmark mode (no audio, show fps).") + '\n'
-                + "  --swap-interval=D        " + _("Frame rate divisor for display refresh rate.") + '\n'
-                + "                           " + _("Default is 0 for benchmark mode, 1 otherwise.") + '\n'
-                + "  -l|--loop                " + _("Loop the input media.") + '\n'
-                + "  --sdi-output-format=F    " + _("Set SDI output format.") + '\n'
+                + "    stereo                   " + _("OpenGL stereo") + '\n'
+                + "    alternating              " + _("Left/right alternating") + '\n'
+                + "    mono-left                " + _("Left view") + '\n'
+                + "    mono-right               " + _("Right view") + '\n'
+                + "    top-bottom               " + _("Top/bottom") + '\n'
+                + "    top-bottom-half          " + _("Top/bottom, half height") + '\n'
+                + "    left-right               " + _("Left/right") + '\n'
+                + "    left-right-half          " + _("Left/right, half width") + '\n'
+                + "    even-odd-rows            " + _("Even/odd rows") + '\n'
+                + "    even-odd-columns         " + _("Even/odd columns") + '\n'
+                + "    checkerboard             " + _("Checkerboard pattern") + '\n'
+                + "    hdmi-frame-pack          " + _("HDMI frame packing mode") + '\n'
+                + "    red-cyan-monochrome      " + _("Red/cyan glasses, monochrome") + '\n'
+                + "    red-cyan-half-color      " + _("Red/cyan glasses, half color") + '\n'
+                + "    red-cyan-full-color      " + _("Red/cyan glasses, full color") + '\n'
+                + "    red-cyan-dubois          " + _("Red/cyan glasses, Dubois") + '\n'
+                + "    green-magenta-monochrome " + _("Green/magenta glasses, monochrome") + '\n'
+                + "    green-magenta-half-color " + _("Green/magenta glasses, half color") + '\n'
+                + "    green-magenta-full-color " + _("Green/magenta glasses, full color") + '\n'
+                + "    green-magenta-dubois     " + _("Green/magenta glasses, Dubois") + '\n'
+                + "    amber-blue-monochrome    " + _("Amber/blue glasses, monochrome") + '\n'
+                + "    amber-blue-half-color    " + _("Amber/blue glasses, half color") + '\n'
+                + "    amber-blue-full-color    " + _("Amber/blue glasses, full color") + '\n'
+                + "    amber-blue-dubois        " + _("Amber/blue glasses, Dubois") + '\n'
+                + "    red-green-monochrome     " + _("Red/green glasses, monochrome") + '\n'
+                + "    red-blue-monochrome      " + _("Red/blue glasses, monochrome") + '\n'
+                + "    equalizer                " + _("Multi-display via Equalizer (2D setup)") + '\n'
+                + "    equalizer-3d             " + _("Multi-display via Equalizer (3D setup)") + '\n'
+                + "  -S|--swap-eyes           " + _("Swap left/right view") + '\n'
+                + "  -f|--fullscreen          " + _("Fullscreen") + '\n'
+                + "  --fullscreen-screens=    " + _("Use the listed screens in fullscreen mode") + '\n'
+                + "     [S0[,S1[,...]]]       " + _("Screen numbers start with 1") + '\n'
+                + "                           " + _("An empty list defaults to the primary screen") + '\n'
+                + "  --fullscreen-flip-left   " + _("Flip left view vertically when fullscreen") + '\n'
+                + "  --fullscreen-flop-left   " + _("Flop left view horizontally when fullscreen") + '\n'
+                + "  --fullscreen-flip-right  " + _("Flip right view vertically when fullscreen") + '\n'
+                + "  --fullscreen-flop-right  " + _("Flop right view horizontally when fullscreen") + '\n'
+                + "  --fullscreen-3dr-sync    " + _("Use DLP 3-D Ready Sync when fullscreen") + '\n'
+                + "  -z|--zoom=Z              " + _("Set zoom for wide videos (0=off to 1=full)") + '\n'
+                + "  -C|--crop=W:H            " + _("Crop video to given aspect ratio (0:0=off)") + '\n'
+                + "  -c|--center              " + _("Center window on screen") + '\n'

bino-1.3.4.tar.xz/src/media_object.cpp -> bino-1.4.0.tar.xz/src/media_object.cpp Changed

@@ -322,12 +322,28 @@
     }
 }
 
+// Get a file name (or URL) extension, if any
+static std::string get_extension(const std::string& url)
+{
+    std::string extension;
+    size_t dot_pos = url.find_last_of('.');
+    if (dot_pos != std::string::npos) {
+        extension = url.substr(dot_pos + 1);
+        for (size_t i = 0; i < extension.length(); i++)
+            extension[i] =  std::tolower(extension[i]);
+    }
+    return extension;
+}
+
 
 media_object::media_object(bool always_convert_to_bgra32) :
     _always_convert_to_bgra32(always_convert_to_bgra32), _ffmpeg(NULL)
 {
     avdevice_register_all();
     av_register_all();
+#if LIBAVFORMAT_VERSION_MAJOR >= 53 && LIBAVFORMAT_VERSION_MINOR >= 13
+    avformat_network_init();
+#endif
     switch (msg::level())
     {
     case msg::DBG:
@@ -497,16 +513,7 @@
         video_frame_template.stereo_layout = parameters::layout_top_bottom;
     }
     /* Gather hints from the filename extension */
-    std::string extension;
-    size_t extension_dot_pos = _url.find_last_of('.');
-    if (extension_dot_pos != std::string::npos)
-    {
-        extension = _url.substr(extension_dot_pos + 1);
-        for (size_t i = 0; i < extension.length(); i++)
-        {
-            extension[i] =  std::tolower(extension[i]);
-        }
-    }
+    std::string extension = get_extension(_url);
     if (extension == "mpo")
     {
         /* MPO files are alternating-left-right. */
@@ -521,7 +528,7 @@
     /* Determine the input mode by looking at the file name.
      * This should be compatible to these conventions:
      * http://www.tru3d.com/technology/3D_Media_Formats_Software.php?file=TriDef%20Supported%203D%20Formats */
-    std::string marker = _url.substr(0, extension_dot_pos);
+    std::string marker = _url.substr(0, _url.find_last_of('.'));
     size_t last_dash = marker.find_last_of('-');
     if (last_dash != std::string::npos)
     {
@@ -793,6 +800,21 @@
 #endif
         break;
     case device_request::no_device:
+        /* Force the format for a few file types that are unknown to older
+         * versions of FFmpeg and to Libav. Note: this may be removed in
+         * the future if all relevant FFmpeg/Libav versions recognize these
+         * files automatically.
+         * This fixes the problems for MPO and JPS images listed here:
+         * http://lists.nongnu.org/archive/html/bino-list/2012-03/msg00026.html
+         * This does not fix the PNS problem, because the format is "image2" but
+         * we also need to tell FFmpeg about the codec (PNG), which does not
+         * seem to be possible.
+         */
+        {
+            std::string extension = get_extension(_url);
+            if (extension == "mpo" || extension == "jps")
+                iformat = av_find_input_format("mjpeg");
+        }
         break;
     }
     if (_is_device && !iformat)

bino-1.3.4.tar.xz/src/player_equalizer.cpp -> bino-1.4.0.tar.xz/src/player_equalizer.cpp Changed

@@ -402,25 +402,19 @@
 class eq_config : public eq::Config
 {
 private:
-    bool _is_master_config;
     eq_init_data _eq_init_data;         // Master eq_init_data instance
     eq_frame_data _eq_frame_data;       // Master eq_frame_data instance
 
 public:
-    eq_config(eq::ServerPtr parent) : eq::Config(parent), _is_master_config(false)
+    eq_config(eq::ServerPtr parent) : eq::Config(parent)
     {
     }
 
-    bool is_master_config()
-    {
-        return _is_master_config;
-    }
-
     bool init(const open_input_data& input, bool flat_screen)
     {
         msg::dbg(HERE);
-        // If this function is called, then this is the master config
-        _is_master_config = true;
+        setLatency( 0 );
+
         // Initialize master init/frame data instances
         _eq_init_data.input = input;
         _eq_init_data.params = dispatch::parameters();
@@ -756,14 +750,13 @@
 {
 private:
     dispatch* _dispatch;
-    bool _is_app_node;
     player_eq_node _player;
 
 public:
     eq_init_data init_data;
     eq_frame_data frame_data;
 
-    eq_node(eq::Config *parent) : eq::Node(parent), _dispatch(NULL), _is_app_node(false)
+    eq_node(eq::Config *parent) : eq::Node(parent), _dispatch(NULL)
     {
     }
 
@@ -781,17 +774,11 @@
         }
         // Map our InitData instance to the master instance
         eq_config *config = static_cast<eq_config *>(getConfig());
-        config->setLatency( 0 );
         if (!config->mapObject(&init_data, init_id))
         {
             setError(ERROR_MAP_INITDATA_FAILED);
             return false;
         }
-        // Is this the application node?
-        if (config->is_master_config())
-        {
-            _is_app_node = true;
-        }
         // Map our FrameData instance to the master instance
         if (!config->mapObject(&frame_data, init_data.frame_data_id))
         {
@@ -801,7 +788,7 @@
 
         msg::dbg(HERE);
         // Create decoders and input
-        if (!_is_app_node)
+        if (!isApplicationNode( ))
         {
             _dispatch = new dispatch(NULL, NULL, true, init_data.flat_screen, true,
                     false, false, init_data.params.log_level(), init_data.params.benchmark(),
@@ -825,7 +812,7 @@
         // Unmap our InitData instance
         config->unmapObject(&init_data);
         // Cleanup
-        if (!_is_app_node)
+        if (!isApplicationNode( ))
             _player.close();
         msg::dbg(HERE);
         return eq::Node::configExit();
@@ -836,7 +823,7 @@
         // Update our frame data
         frame_data.sync(frame_id);
         // Do as we're told
-        if (_is_app_node)
+        if (isApplicationNode( ))
         {
             // Nothing to do since the config's master player already did it
         }
@@ -862,7 +849,7 @@
 
     virtual void frameFinish(const eq::uint128_t &, const uint32_t frame_number)
     {
-        if (_is_app_node)
+        if (isApplicationNode( ))
         {
             // Nothing to do since the config's master player already did it
         }
@@ -881,7 +868,7 @@
 public:
     const video_frame &get_video_frame()
     {
-        if (_is_app_node)
+        if (isApplicationNode( ))
             return global_player_equalizer->get_video_frame();
         else
             return _player.get_video_frame();
@@ -1042,7 +1029,6 @@
         }
         if (node->frame_data.display_frame)
         {
-            getWindow()->makeCurrent();
             _video_output.activate_next_frame();
         }
         startFrame(frame_number);

bino-1.3.4.tar.xz/src/video_output.cpp -> bino-1.4.0.tar.xz/src/video_output.cpp Changed

@@ -251,7 +251,7 @@
 
 static void compute_viewport_and_tex_coords(int vp[4], float tc[4][2],
         float src_ar, int w, int h, float dst_w, float dst_h, float dst_ar,
-        float crop_ar, float zoom)
+        float crop_ar, float zoom, bool need_even_width, bool need_even_height)
 {
     std::memcpy(tc, full_tex_coords[0], 4 * 2 * sizeof(float));
     if (crop_ar > 0.0f) {
@@ -275,8 +275,6 @@
         float zoom_src_ar = zoom * dst_ar + (1.0f - zoom) * src_ar;
         vp[2] = dst_w;
         vp[3] = dst_ar / zoom_src_ar * dst_h;
-        vp[0] = (w - vp[2]) / 2;
-        vp[1] = (h - vp[3]) / 2;
         float cutoff = (1.0f - zoom_src_ar / src_ar) / 2.0f;
         tc[0][0] += cutoff;
         tc[1][0] -= cutoff;
@@ -286,9 +284,13 @@
         // need black borders left and right
         vp[2] = src_ar / dst_ar * dst_w;
         vp[3] = dst_h;
-        vp[0] = (w - vp[2]) / 2;
-        vp[1] = (h - vp[3]) / 2;
     }
+    if (need_even_width && vp[2] > 1 && vp[2] % 2 == 1)
+        vp[2]--;
+    if (need_even_height && vp[3] > 1 && vp[3] % 2 == 1)
+        vp[3]--;
+    vp[0] = (w - vp[2]) / 2;
+    vp[1] = (h - vp[3]) / 2;
 }
 
 
@@ -319,6 +321,7 @@
     _subtitle_updater = new subtitle_updater(&_subtitle_renderer);
 #if HAVE_LIBXNVCTRL
     _nv_sdi_output = new CNvSDIout();
+    _last_nv_sdi_displayed_frameno = 0;
 #endif // HAVE_LIBXNVCTRL
 }
 
@@ -1052,6 +1055,8 @@
     _full_viewport[1] = 0;
     _full_viewport[2] = w;
     _full_viewport[3] = h;
+    glViewport(0, 0, w, h);
+    clear();
     _viewport[0][0] = 0;
     _viewport[0][1] = 0;
     _viewport[0][2] = w;
@@ -1061,11 +1066,16 @@
     _viewport[1][2] = w;
     _viewport[1][3] = h;
     std::memcpy(_tex_coords, full_tex_coords, sizeof(_tex_coords));
-    glViewport(0, 0, w, h);
-    clear();
     if (!_frame[_active_index].is_valid())
         return;
 
+    // For the interleaved modes, we need even width and/or even height,
+    // otherwise we cannot correctly assign left/right rows/columns.
+    bool need_even_width = (params.stereo_mode() == parameters::mode_even_odd_columns
+            || params.stereo_mode() == parameters::mode_checkerboard);
+    bool need_even_height = (params.stereo_mode() == parameters::mode_even_odd_rows
+            || params.stereo_mode() == parameters::mode_checkerboard);
+
     // Compute viewport with the right aspect ratio
     if (params.stereo_mode() == parameters::mode_left_right
             || params.stereo_mode() == parameters::mode_left_right_half) {
@@ -1080,7 +1090,7 @@
         }
         compute_viewport_and_tex_coords(_viewport[0], _tex_coords[0], src_ar,
                 w / 2, h, dst_w, dst_h, dst_ar,
-                crop_ar, params.zoom());
+                crop_ar, params.zoom(), need_even_width, need_even_height);
         std::memcpy(_viewport[1], _viewport[0], sizeof(_viewport[1]));
         _viewport[1][0] = _viewport[0][0] + w / 2;
         std::memcpy(_tex_coords[1], _tex_coords[0], sizeof(_tex_coords[1]));
@@ -1097,7 +1107,7 @@
         }
         compute_viewport_and_tex_coords(_viewport[0], _tex_coords[0], src_ar,
                 w, h / 2, dst_w, dst_h, dst_ar,
-                crop_ar, params.zoom());
+                crop_ar, params.zoom(), need_even_width, need_even_height);
         std::memcpy(_viewport[1], _viewport[0], sizeof(_viewport[1]));
         _viewport[0][1] = _viewport[1][1] + h / 2;
         std::memcpy(_tex_coords[1], _tex_coords[0], sizeof(_tex_coords[1]));
@@ -1116,7 +1126,7 @@
         float src_ar = _frame[_active_index].aspect_ratio;
         compute_viewport_and_tex_coords(_viewport[0], _tex_coords[0], src_ar,
                 w, (h - blank_lines) / 2, dst_w, dst_h, dst_ar,
-                params.crop_aspect_ratio(), params.zoom());
+                params.crop_aspect_ratio(), params.zoom(), need_even_width, need_even_height);
         std::memcpy(_viewport[1], _viewport[0], sizeof(_viewport[1]));
         _viewport[0][1] = _viewport[1][1] + (h - blank_lines) / 2 + blank_lines;
         std::memcpy(_tex_coords[1], _tex_coords[0], sizeof(_tex_coords[1]));
@@ -1127,7 +1137,7 @@
         float src_ar = _frame[_active_index].aspect_ratio;
         compute_viewport_and_tex_coords(_viewport[0], _tex_coords[0], src_ar,
                 w, h, dst_w, dst_h, dst_ar,
-                params.crop_aspect_ratio(), params.zoom());
+                params.crop_aspect_ratio(), params.zoom(), need_even_width, need_even_height);
         std::memcpy(_viewport[1], _viewport[0], sizeof(_viewport[1]));
         std::memcpy(_tex_coords[1], _tex_coords[0], sizeof(_tex_coords[1]));
     }
@@ -1175,8 +1185,8 @@
                 || _render_last_params.crop_aspect_ratio() > _render_params.crop_aspect_ratio()
                 || _render_last_params.zoom() < _render_params.zoom()
                 || _render_last_params.zoom() > _render_params.zoom()
-                || video_display_width() != dst_width
-                || video_display_height() != dst_height)) {
+                || full_display_width() != dst_width
+                || full_display_height() != dst_height)) {
         reshape(dst_width, dst_height, _render_params);
     }
     assert(xglCheckError(HERE));
@@ -1196,7 +1206,7 @@
     }
     if ((_render_params.stereo_mode() == parameters::mode_even_odd_rows
                 || _render_params.stereo_mode() == parameters::mode_checkerboard)
-            && (pos_y() + viewport[0][1]) % 2 == 0) {
+            && (pos_y() + height() - viewport[0][1] - viewport[0][3]) % 2 == 0) {
         std::swap(left, right);
     }
     if ((_render_params.stereo_mode() == parameters::mode_even_odd_columns
@@ -1416,6 +1426,16 @@
     if (!_nv_sdi_output->isInitialized())
         return;
 
+    // NVIDIA sdi output device has an output queue to display frames, which
+    // default size is 5.
+    // If we send too many frames to this queue, it blocks the thread until a
+    // frame is sent on sdi output, and if the queue is empty, the last sent
+    // frame is automatically repeated.
+    // So by checking frame_no, we make sure to send an image to the device only
+    // if it is a new one.
+    if (display_frameno == _last_nv_sdi_displayed_frameno)
+        return;
+
     if (_nv_sdi_output->getOutputFormat() != dispatch::parameters().sdi_output_format())
         _nv_sdi_output->reinit(dispatch::parameters().sdi_output_format());
 
@@ -1439,6 +1459,17 @@
     // Display both textures on SDI output
     _nv_sdi_output->sendTextures();
     assert(xglCheckError(HERE));
+
+    // Reshape the video again to fit the normal output.
+    // The above call to display_current_frame() will have triggered a reshape
+    // if the SDI output size is different from the video display size. Undo
+    // the effects here.
+    if (_nv_sdi_output->width() != full_display_width()
+            || _nv_sdi_output->height() != full_display_height()) {
+        reshape(full_display_width(), full_display_height());
+    }
+
+    _last_nv_sdi_displayed_frameno = display_frameno;
 }
 #endif // HAVE_LIBXNVCTRL

bino-1.3.4.tar.xz/src/video_output.h -> bino-1.4.0.tar.xz/src/video_output.h Changed

bino-1.3.4.tar.xz/src/video_output_qt.cpp -> bino-1.4.0.tar.xz/src/video_output_qt.cpp Changed