Packman Build Service PMBS

Changes of Revision 12

bino.changes Changed

bino.spec Changed

bino-1.3.2.tar.xz/AUTHORS -> bino-1.3.3.tar.xz/AUTHORS Changed

bino-1.3.2.tar.xz/ChangeLog -> bino-1.3.3.tar.xz/ChangeLog Changed

@@ -1,11 +1,690 @@
+commit f707f8c296365d13cdf2cf184ea453d47af885c7
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-05-01 15:04:56 +0200
+
+ Bump version to 1.3.3.
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 6eed1368a137cc506f1abea8b279a87674267eb6
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-05-01 14:54:08 +0200
+
+ Video output: remove unused parameter.
+
+ src/video_output_qt.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 756d0794c8cc2a21de02c15308ecd58231b3a10b
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-05-01 14:53:15 +0200
+
+ Video output: remove useless estimation of next output frame time.
+ 
+ This needs to be rewritten; in its current form it is not useful.
+
+ src/video_output_qt.cpp | 48 ++++-------------------------------------------
+ src/video_output_qt.h | 8 --------
+ 2 files changed, 4 insertions(+), 52 deletions(-)
+
+commit 4eb6766ab48751fddfbd295ecbb4251465c5a8ea
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-05-01 13:26:16 +0200
+
+ Video output: only apply subtitles, color adjustment, or ghostbusting if required.
+ 
+ This should speed up the render shader on old graphics hardware.
+
+ src/video_output.cpp | 54 +++++++++++++++++++++++++++++++--------
+ src/video_output.h | 3 +++
+ src/video_output_render.fs.glsl | 41 +++++++++++++++++++++++------
+ 3 files changed, 79 insertions(+), 19 deletions(-)
+
+commit 4f8cebd36f1bb0cc3aebbd2eca976e71f85df51d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-05-01 12:59:13 +0200
+
+ Video output: do not busy loop in the render thread.
+
+ src/video_output_qt.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit d16e790f54cd6e6741902bbbc2aeaa55609625a4
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-05-01 12:13:58 +0200
+
+ Video output: only rerender a video frame if necessary.
+ 
+ This makes Bino usable on Ubuntu 12.04 with Intel Sandy Bridge graphics.
+
+ src/dispatch.cpp | 3 ++
+ src/dispatch.h | 2 +
+ src/gui.cpp | 5 +++
+ src/gui.h | 1 +
+ src/video_output_qt.cpp | 105 +++++++++++++++++++++++++++++++++++++----------
+ src/video_output_qt.h | 6 ++-
+ 6 files changed, 99 insertions(+), 23 deletions(-)
+
+commit 46ef117c1436eb054ac8a982734ad0951db7e9fc
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-05-01 11:30:03 +0200
+
+ Video output: make sure to not miss resize events.
+
+ src/video_output.cpp | 18 ++++++++++++++++--
+ src/video_output.h | 7 ++++---
+ src/video_output_qt.cpp | 7 +++----
+ src/video_output_qt.h | 1 -
+ 4 files changed, 23 insertions(+), 10 deletions(-)
+
+commit 4fb6da5b2a22845001dbac6d226dee0a18eb2cd0
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-29 19:16:38 +0200
+
+ Replace color adjustment code.
+ 
+ The expensive conversion from linear RGB to YUV and back is gone. Instead, a
+ single matrix multiplication in linear RGB color space is applied. This should
+ make the render shader much cheaper.
+ 
+ As a side effect, the effect of brightness, contrast, hue, and saturation
+ parameters changed; users may have to re-adjust them.
+
+ src/Makefile.am | 1 +
+ src/color_matrix.cpp | 91 +++++++++++++++++++++++++++++++++++++++
+ src/color_matrix.h | 32 ++++++++++++++
+ src/video_output.cpp | 10 ++---
+ src/video_output_render.fs.glsl | 49 ++-------------------
+ 5 files changed, 133 insertions(+), 50 deletions(-)
+
+commit 0ef0d9ef6bcb192c1cae78b69d6282f32eac1e5c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-28 10:45:00 +0200
+
+ Video output: do not call reshape() excessively.
+ 
+ Bug reported by Frédéric Devernay.
+
+ src/video_output.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 263159511717eae3df077a1665701bf0ffb31bc8
+Merge: 0a78c8e 84e127c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-26 21:59:28 +0200
+
+ Merge branch 'master' of git.sv.gnu.org:/srv/git/bino
+
+commit 0a78c8e2346e74bbc4ab957beec687dfbf051770
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-26 21:59:01 +0200
+
+ GUI: fix setting of audio delay
+
+ src/gui.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 84e127cedc70682a262d07e54ebe0069fd66e8da
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-25 13:00:50 +0200
+
+ Video output: properly handle exceptions in deinit(). Should fix bug #36295.
+
+ src/video_output_qt.cpp | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+commit d133e03d4bec0398125ab6938364f6e30407f9a0
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-25 12:51:31 +0200
+
+ Video output: fix stereo mode swap (bug 36296).
+
+ src/video_output.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 45b19786ff26277fa93ec6a2eef89a02a6c25f60
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-25 06:48:04 +0200
+
+ Video output: in alternating mode, always show both left and right view of a video frame.
+ 
+ This makes sure that every video frame gets two output frames.
+ Fixes bug #36291.
+
+ src/video_output_qt.cpp | 59 +++++++++++++++++++++++++++--------------------
+ 1 file changed, 34 insertions(+), 25 deletions(-)
+
+commit d9370f8a14a9265cb1f85d09bb1d2f58fe6e9e3a
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-19 10:24:00 +0200
+
+ Subtitles: invalidate last subtitle correctly.
+
+ src/video_output.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit bf240f286c88f21ea96ca7722d45cac0427b964a
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-19 06:56:25 +0200
+
+ Windows: update build instructions.
+
+ README.Windows | 26 ++++++++++++--------------
+ 1 file changed, 12 insertions(+), 14 deletions(-)
+
+commit 56d3e6348e5c2f1e25a0c5bec0748cb0231bc262
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-17 07:12:05 +0200
+
+ Documentation: fix typo.
+
+ doc/bino.texi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit cd889c2d16aaca1afd19951aa350c0c94ac4bbd1
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-17 07:08:03 +0200
+
+ Add support for DLP 3-D Ready Sync.
+ 
+ This is a specification from Texas Instruments that allows stereo projectors
+ to identify the stereo mode and the left/right views using special colored
+ lines.
+ 
+ Thanks to Texas Instruments for providing information and for testing.
+
+ NEWS | 1 +
+ doc/bino.1 | 4 +++-
+ doc/bino.texi | 5 +++++
+ src/dispatch.cpp | 7 +++++++
+ src/dispatch.h | 2 ++
+ src/gui.cpp | 13 +++++++++++--
+ src/gui.h | 1 +
+ src/main.cpp | 7 ++++++-
+ src/media_data.cpp | 11 +++++++++++
+ src/media_data.h | 1 +
+ src/player_equalizer.cpp | 1 +
+ src/video_output.cpp | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ src/video_output.h | 4 ++++
+ src/video_output_qt.cpp | 1 +
+ 14 files changed, 100 insertions(+), 4 deletions(-)
+
+commit 40b6f1bd0c68e533a62a19bd64463ae6e8f47bb1
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-16 21:12:14 +0200
+
+ Video output: cleanup.
+
+ src/video_output.cpp | 1443 +++++++++++++++++++++++---------------------------
+ src/video_output.h | 21 +-
+ 2 files changed, 677 insertions(+), 787 deletions(-)
+
+commit 570e6e89f8249ff2862e1dffef027fb4441f86b9
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-16 17:00:36 +0200
+
+ Video output: update comment about rendering pipeline.
+
+ src/video_output.cpp | 28 +++++++++++++++++-----------
+ 1 file changed, 17 insertions(+), 11 deletions(-)
+
+commit da8571d931bc54d4410f3612819e450d4119fc1f
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-16 16:50:41 +0200
+
+ Video output: reduce memory usage.
+ 
+ Now that color space conversion is done in prepare_next_frame(), there is no
+ need to keep two sets of input textures for the original video data.
+
+ src/video_output.cpp | 129 ++++++++++++++++++++++++--------------------------
+ src/video_output.h | 12 ++---
+ 2 files changed, 68 insertions(+), 73 deletions(-)
+
+commit 30dc8a1c097c69918490f98bd861d1a4f17310bb
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-16 13:48:59 +0200
+
+ Equalizer: fix more problems introduced in structural changes to the dispatch.
+ 
+ Scripting should now be fully functional, including opening new files.
+
+ src/dispatch.cpp | 5 +++--
+ src/player_equalizer.cpp | 8 +++++---
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+commit f8272774d272393e02d6c27f5cbe2d13028de383
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-16 13:20:35 +0200
+
+ Fix commit fcbc2c2fade975f68db54bdf56f0c246e8ce202b.
+ 
+ When performing color conversion in the preparation step, we need two sets
+ of textures for the output, just like for the other preparation tasks.
+
+ src/video_output.cpp | 141 +++++++++++++++++++++++++-------------------------
+ src/video_output.h | 15 +++---
+ 2 files changed, 78 insertions(+), 78 deletions(-)
+
+commit 4cbf38c6f9612a9951142b16e6ff4f469619378d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-16 12:41:08 +0200
+
+ Fix bug introduced by stupid typo in last commit.
+
+ src/dispatch.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 66b9c013420dac78872fc62ba8b7b778a45fbae5
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-16 12:37:00 +0200
+
+ Equalizer: fix bugs introduced in structural changes to the dispatch.
+
+ src/dispatch.cpp | 25 ++++++++++++-------------
+ src/dispatch.h | 2 ++
+ src/player_equalizer.cpp | 22 +++++++---------------
+ src/player_equalizer.h | 1 -
+ 4 files changed, 21 insertions(+), 29 deletions(-)
+
+commit c8485237b8023ed38a1b3785127c24c7248dc499
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-16 07:25:46 +0200
+
+ Video output: fix viewport setting.
+
+ src/video_output.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit fcbc2c2fade975f68db54bdf56f0c246e8ce202b
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-16 07:13:06 +0200
+
+ Video output: only perform color space conversion once for each video frame.
+ 
+ This moves the color space conversion from display_current_frame() to
+ prepare_next_frame(), and the color adjustment (brightness, contrast, hue,
+ saturation) from video_output_color.fs.glsl to video_output_render.fs.glsl.
+ 
+ The color adjustment code is too expensive and needs to be replaced later.
+
+ src/video_output.cpp | 197 +++++++++++++++++++--------------------
+ src/video_output_color.fs.glsl | 58 +++---------
+ src/video_output_render.fs.glsl | 55 ++++++++++-
+ 3 files changed, 163 insertions(+), 147 deletions(-)
+
+commit 990f334493cec2ccfb2859fdd7d728608064c415
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-15 22:11:13 +0200
+
+ Translations: add command_file.cpp to list of translatable files.
+
+ po/POTFILES.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 445cc3b9960e4fff4f2a2a71ac5e7b8e98fc69e3
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-15 15:50:10 +0200
+
+ Documentation: enhance the scripting example.
+
+ doc/bino.texi | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+commit 235a4d548ff3aa34e377653658c0bce54a9eeb45
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-15 15:49:07 +0200
+
+ Video output: leave fullscreen mode before deinitializing.
+ 
+ This fixes a crash when scripting with activated fullscreen mode.
+
+ src/video_output_qt.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit e7b647e6e53be3379bc9b6f3679cca96f7766106
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-15 14:20:53 +0200
+
+ Documentation: add a scripting example.
+
+ doc/bino.texi | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+commit ec573ab041a530b4e200e82250ff0c6f4726cc56
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-15 14:10:36 +0200
+
+ Scripting: add new 'wait' command to wait for a given time span or until end of video.
+
+ doc/bino.texi | 4 ++++
+ src/command_file.cpp | 33 ++++++++++++++++++++++++++++++++-
+ src/command_file.h | 2 ++
+ 3 files changed, 38 insertions(+), 1 deletion(-)
+
+commit 912309a5e7cc1265f3fe46437225f42764de706d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-15 14:10:10 +0200
+
+ Dispatch: use new string parsing functions from base module str.
+
+ src/dispatch.cpp | 109 +++++++++++++++++++-----------------------------------
+ 1 file changed, 38 insertions(+), 71 deletions(-)
+
+commit 481eb3cd8f93db8b728ae4f4ba2098831da181ae
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-15 14:09:36 +0200
+
+ Base module str: add new functions to read numbers from strings.
+
+ src/base/str.cpp | 29 +++++++++++++++++++++++++++++
+ src/base/str.h | 15 +++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+commit fb61d0696cfd84a02a256ac8da017bd9761a40d2
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-14 19:08:31 +0200
+
+ Add initial support for scripting.
+ 
+ As a side effect, this enables much more commands for LIRC remote controls.
+
+ NEWS | 3 +-
+ doc/bino.1 | 2 +
+ doc/bino.texi | 213 +++++++++++++++++++----
+ src/Makefile.am | 1 +
+ src/base/str.cpp | 31 ++++
+ src/base/str.h | 4 +
+ src/command_file.cpp | 148 ++++++++++++++++
+ src/command_file.h | 58 +++++++
+ src/dispatch.cpp | 429 +++++++++++++++++++++++++++++++++++++++++++---
+ src/dispatch.h | 39 +++--
+ src/lirc.cpp | 122 +------------
+ src/lirc.h | 3 -
+ src/main.cpp | 58 ++-----
+ src/media_data.cpp | 141 +++++++++------
+ src/media_data.h | 2 +
+ src/player.h | 2 +-
+ src/player_equalizer.cpp | 58 +++++--
+ 17 files changed, 1010 insertions(+), 304 deletions(-)
+
+commit 1f34e3dbd49ae856493abec2fec33f336dca6169
+Author: Olivier Letz <oletz@binocle.com>
+Date: 2012-04-10 22:04:19 +0200
+
+ Add support for video output via SDI on NVIDIA Quadro cards.
+
+ AUTHORS | 1 +
+ NEWS | 1 +
+ README.Linux | 7 +
+ configure.ac | 44 +++-
+ src/Makefile.am | 6 +
+ src/NvSDIout.cpp | 309 +++++++++++++++++++++++++++
+ src/NvSDIout.h | 100 +++++++++
+ src/NvSDIutils.cpp | 461 +++++++++++++++++++++++++++++++++++++++++
+ src/NvSDIutils.h | 53 +++++
+ src/dispatch.cpp | 15 ++
+ src/dispatch.h | 11 +
+ src/gui.cpp | 516 ++++++++++++++++++++++++++++++++++++++++++++++
+ src/gui.h | 37 +++-
+ src/main.cpp | 16 ++
+ src/media_data.cpp | 56 +++++
+ src/media_data.h | 6 +
+ src/player_equalizer.cpp | 2 +-
+ src/video_output.cpp | 67 +++++-
+ src/video_output.h | 26 ++-
+ src/video_output_qt.cpp | 6 +
+ 20 files changed, 1728 insertions(+), 12 deletions(-)
+
+commit 69c6da17f83bb271243af0a7638182bd694366ff
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-09 14:08:10 +0200
+
+ Windows: fix build.
+
+ src/video_output.cpp | 58 +++++++++++++++++++++++++-------------------------
+ src/video_output.h | 2 ++
+ 2 files changed, 31 insertions(+), 29 deletions(-)
+
+commit 68a53b6d2719f6bbbe5d68d6318422c85d079ef1
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-08 14:02:44 +0200
+
+ Improve subtitle handling.
+ 
+ - Fix a bug where a new subtitle was shown too early because
+ only a single subtitle texture was used.
+ - Do not rerender subtitles in display_current_frame(), even
+ if that means that some changes do not take effect immediately.
+
+ src/gui.cpp | 4 +-
+ src/subtitle_renderer.cpp | 2 +-
+ src/video_output.cpp | 141 +++++++++++++++++++++++----------------------
+ src/video_output.h | 7 ++-
+ 4 files changed, 81 insertions(+), 73 deletions(-)
+
+commit 256d872f9bba29c5bf6b9732b1160acfb3cc69a5
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-07 12:59:47 +0200
+
+ Avoid a compiler warning.
+
+ src/subtitle_renderer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 26532854719c454ba18961a32cf313fdcccb31ea
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-07 12:55:01 +0200
+
+ GUI: improve device dialog.
+ 
+ - Allow to open two devices.
+ - Add option for requesting MJPEG format.
+
+ NEWS | 1 +
+ src/gui.cpp | 104 ++++++++++++++++++++++++++++++++++++++---------------------
+ src/gui.h | 14 ++++----
+ 3 files changed, 77 insertions(+), 42 deletions(-)
+
+commit 844ece8ce73780239a413afbba44e07ed5e25b1d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-07 12:12:31 +0200
+
+ Add an option to request MJPEG format from input devices.
+ 
+ This is mainly useful for v4l2 devices, e.g. webcams.
+
+ NEWS | 1 +
+ doc/bino.1 | 2 ++
+ doc/bino.texi | 2 ++
+ src/main.cpp | 8 ++++++++
+ src/media_data.cpp | 5 ++++-
+ src/media_data.h | 1 +
+ src/media_object.cpp | 4 ++++
+ 7 files changed, 22 insertions(+), 1 deletion(-)
+
+commit b8be587680d144f72f05ba7b161c4b8b6b88ad7d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-07 11:57:52 +0200
+
+ Improve subtitle rendering performance.
+ 
+ - Render in a separate thread while at the same time preparing the video frame.
+ - Use only a single subtitle box, not two like for video frames.
+ - Fix a few problems.
+
+ src/media_data.h | 13 +-
+ src/subtitle_renderer.cpp | 17 ++-
+ src/subtitle_renderer.h | 10 +-
+ src/video_output.cpp | 352 +++++++++++++++++++++++++++++----------------
+ src/video_output.h | 21 ++-
+ 5 files changed, 266 insertions(+), 147 deletions(-)
+
+commit 87dd17c34d8863274ea93dd27228162160cd71d7
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-06 23:52:13 +0200
+
+ Subtitles: add option to force shadows on or off.
+
+ doc/bino.1 | 2 +
+ doc/bino.texi | 2 +
+ src/dispatch.cpp | 4 ++
+ src/dispatch.h | 2 +
+ src/gui.cpp | 105 +++++++++++++++++++++++----------------------
+ src/gui.h | 3 ++
+ src/main.cpp | 5 +++
+ src/media_data.cpp | 11 +++++
+ src/media_data.h | 1 +
+ src/subtitle_renderer.cpp | 8 +++-
+ src/video_output.cpp | 15 ++++---
+ src/video_output.h | 2 +-
+ 12 files changed, 99 insertions(+), 61 deletions(-)
+
+commit 365465f43b6428000b375543db6f8f9d3cf8b23a
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-06 22:20:45 +0200
+
+ Fix subtitle parameter usage.
+
+ src/video_output.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 442dbd5af0e1cf9ea3f76823b1e85d169428dbc8
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-06 22:20:31 +0200
+
+ Fix subtitle scale factor setting.
+
+ src/dispatch.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 99f3ae35666d2dc28e95b0cef0b2605cd48eb5ea
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-06 17:20:16 +0200
+
+ Fix X11 screensaver inhibition.
+
+ src/video_output_qt.cpp | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+commit 910608cbb98d1c399b43de3bccaaaf75728f3e09
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-06 16:59:16 +0200
+
+ Enable OpenGL error checks that are not performance critical also for release builds.
+ 
+ Suggested by Frédéric Devernay.
+
+ src/video_output.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+commit e5e96f2d6c092de1129922c243c4447d030e8741
+Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+Date: 2012-04-06 15:57:31 +0200
+
+ Add support for graphics cards that cannot render into SRGB textures.
+
+ NEWS | 1 +
+ src/video_output.cpp | 45 ++++++++++++++++++++++++++++++++++++++++++++-
+ src/video_output.h | 1 +
+ 3 files changed, 46 insertions(+), 1 deletion(-)
+
+commit 7120514ee19ade481f7bd92ca1b285b36b1f9fe8
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-06 13:33:16 +0200
+
+ Video output: fix handling of errors that happen in the GL thread.
+
+ src/video_output_qt.cpp | 42 +++++++++++++++++++++++++++++++-----------
+ src/video_output_qt.h | 5 +++--
+ 2 files changed, 34 insertions(+), 13 deletions(-)
+
+commit 5275f6b088300350751662fdc58556fc82e73efe
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-05 20:00:08 +0200
+
+ Fix order of left/right frame for output modes top-bottom(-half) and hdmi-frame-pack.
+
+ src/video_output.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 95b947cb5add9a152b19326b768f6b181aa45682
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-04-05 19:53:12 +0200
+
+ Allow to open more than one device from the command line.
+
+ src/main.cpp | 2 +-
+ src/media_input.cpp | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+commit 060c9208280d07838357ad562ba16e99a00b7c1c
+Author: 玉堂白鹤 <squeeze@189.cn>
+Date: 2012-03-24 18:41:16 +0100
+
+ Add simplified chinese translation (incomplete).
+
+ po/LINGUAS | 1 +
+ po/zh_cn.po | 1812 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 1813 insertions(+)
+
+commit 2f3cbf224b1dd203ef5a4cb129f80eb8583839fd
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-23 17:52:23 +0100
+
+ Fix switching of video/audio/subtitle streams.
+
+ src/dispatch.cpp | 33 +++++++++++++++++++++------------
+ src/media_input.cpp | 16 ++++++++++++++++
+ src/player.cpp | 22 +++++++++++++---------
+ 3 files changed, 50 insertions(+), 21 deletions(-)
+
+commit b03261666aa97311eb5eb4c4ca98b581d1af50ef
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-19 20:32:21 +0100
+
+ Update display when the input layout changes in pause mode.
+
+ src/player.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+commit a50b1a6fbadd19edf3d9aada597d17fbffd3175c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-17 13:27:15 +0100
+
+ Player: do not set invalid positions.
+
+ src/player.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit 25371fa8b94220f0df3096967ec26ad9dae6938f
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-17 13:26:56 +0100
+
+ GUI: simplify update of in/out and control widget.
+
+ src/gui.cpp | 22 +++++++++-------------
+ src/gui.h | 2 --
+ 2 files changed, 9 insertions(+), 15 deletions(-)
+
+commit 951bf7e081f6e7bcf8ab852018a6d8c418998d76
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-16 19:50:09 +0100
+
+ Bump version to 1.3.2.
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 commit 92813d40b7d425ee2621a3530cbf4ae0b6085e71
 Author: Martin Lambers <marlam@marlam.de>
 Date: 2012-03-16 19:39:10 +0100
 
 GUI: make Keyboard Shortcuts dialog non-modal.
 
- src/gui.cpp | 65 ++++++++++++++++++++++++++++++++--------------------------
- 1 files changed, 36 insertions(+), 29 deletions(-)
+ src/gui.cpp | 65 +++++++++++++++++++++++++++++++++--------------------------
+ 1 file changed, 36 insertions(+), 29 deletions(-)
 
 commit 39eda0dd68ffefd31b2f1b2576eb0d8f0fd1fe8e
 Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
@@ -14,7 +693,7 @@
 Mac OS X: GUI: don't let the user close the main window.
 
 src/gui.cpp | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ 1 file changed, 5 insertions(+)
 
 commit d97e6ac6bcb7783c384fde2416477e77d125e95c
 Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
@@ -23,7 +702,7 @@
 GUI: make About dialog non-modal.
 
 src/gui.cpp | 147 ++++++++++++++++++++++++++++++-----------------------------
- 1 files changed, 75 insertions(+), 72 deletions(-)
+ 1 file changed, 75 insertions(+), 72 deletions(-)
 
 commit 9f40859d3f7078789bc4c22b2b8492014b6ec0e3
 Author: Martin Lambers <marlam@marlam.de>
@@ -32,7 +711,7 @@
 Reduce CPU usage: don't busy-loop when there's nothing to do.
 
 src/dispatch.cpp | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
 
 commit c053f8e0822f01a778bfd9c265e6e7a332ea541a
 Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
@@ -40,7 +719,7 @@
 
 GUI: make button react on signal clicked(), not on pressed().
 
- src/gui.cpp | 82 +++++++++++++++++++++++++++++-----------------------------
+ src/gui.cpp | 82 +++++++++++++++++++++++++++++------------------------------
 src/gui.h | 28 ++++++++++----------
 2 files changed, 55 insertions(+), 55 deletions(-)
 
@@ -51,7 +730,7 @@
 Mac OS X: update packaging Makefile.
 
 Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit aef04f7c398dec6b8b18fa7e84cc15a9df539dc7
 Author: Martin Lambers <marlam@marlam.de>
@@ -60,7 +739,7 @@
 Equalizer: fix pausing and stepping.
 
 src/player_equalizer.cpp | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 50a8801544ccc63bd8fc8a48ff3fdc2d9894163a
 Author: Martin Lambers <marlam@marlam.de>
@@ -79,7 +758,7 @@
 src/player.h | 2 ++
 src/player_equalizer.cpp | 3 +++
 src/video_output_qt.cpp | 3 +++
- 11 files changed, 36 insertions(+), 1 deletions(-)
+ 11 files changed, 36 insertions(+), 1 deletion(-)
 
 commit c9ed557472a1c4e2b016ba955fbc68d8be17d91f
 Author: Martin Lambers <marlam@marlam.de>
@@ -98,7 +777,7 @@
 Video output: simplify synchronization of GL thread and main thread.
 
 src/video_output_qt.cpp | 22 +++++++++++-----------
- 1 files changed, 11 insertions(+), 11 deletions(-)
+ 1 file changed, 11 insertions(+), 11 deletions(-)
 
 commit 5e023364615dc4c51bfec72f1c4db768bbf4ad55
 Author: Martin Lambers <marlam@marlam.de>
@@ -107,7 +786,7 @@
 Media object: flush buffers before seeking.
 
 src/media_object.cpp | 18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
+ 1 file changed, 9 insertions(+), 9 deletions(-)
 
 commit 3a54785c87480df727bed3ff28d9b4ff711a2f63
 Merge: 9ce1983 584bc3c
@@ -148,7 +827,7 @@
 Update base modules.
 
 src/base/dbg.cpp | 88 ++++++++++++++++++++++++++++++++++++++++++++++++---
- src/base/exc.h | 2 -
+ src/base/exc.h | 2 --
 src/base/thread.cpp | 77 ++++++++++++++++++++++++++++++++++++++------
 src/base/thread.h | 34 ++++++++++++++++++--
 4 files changed, 181 insertions(+), 20 deletions(-)
@@ -160,7 +839,7 @@
 Fix typo in fullscreen code.
 
 src/video_output_qt.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit deb739142f80ad34880d8fdbb769db97ca5b5cf5
 Author: Martin Lambers <marlam@marlam.de>
@@ -169,7 +848,7 @@
 Fix type in fullscreen code.
 
 src/video_output_qt.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a2a0d1531acf29044b86e047b86809a94b3294b8
 Author: Martin Lambers <marlam@marlam.de>
@@ -190,10 +869,10 @@
 
 Fix and simplify fullscreen mode and settings dialog.
 
- src/gui.cpp | 108 +++++++++++++----------------------------------
+ src/gui.cpp | 106 +++++++++++++----------------------------------
 src/gui.h | 15 +------
- src/video_output_qt.cpp | 104 +++++++++++++++++++--------------------------
- 3 files changed, 75 insertions(+), 152 deletions(-)
+ src/video_output_qt.cpp | 104 ++++++++++++++++++++--------------------------
+ 3 files changed, 74 insertions(+), 151 deletions(-)
 
 commit 36bafd06135c347f23287c8ce5ee5e0f42bcda4f
 Author: Martin Lambers <marlam@marlam.de>
@@ -201,9 +880,9 @@
 
 Improve icons for input layout alternating-*.
 
- .../input-layout-alternating-left-right.ipe | 26 ++++++++++++-------
+ .../input-layout-alternating-left-right.ipe | 26 ++++++++++++--------
 .../input-layout-alternating-left-right.png | Bin 861 -> 473 bytes
- .../input-layout-alternating-right-left.ipe | 26 ++++++++++++-------
+ .../input-layout-alternating-right-left.ipe | 26 ++++++++++++--------
 .../input-layout-alternating-right-left.png | Bin 872 -> 670 bytes
 4 files changed, 32 insertions(+), 20 deletions(-)
 
@@ -216,7 +895,7 @@
 Some older GLEW version lack '-DGLEW_MX' in their pkgconfig file.
 
 src/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit dc3153ab6ca54bb7c07c264fc48065567ddea163
 Author: Martin Lambers <marlam@marlam.de>
@@ -235,7 +914,7 @@
 Media object: fix crash on closing when opening did not succeed.
 
 src/media_object.cpp | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
 
 commit 4882a5682d3a065fb30e3a573f41616b0ee2e2a5
 Author: Martin Lambers <marlam@marlam.de>
@@ -244,7 +923,7 @@
 Apply workaround for Qt bug only on X11 systems.
 
 src/video_output_qt.h | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit d95b4b0acfa0f0e75c026f8d3511b8765d963a36
 Author: Martin Lambers <marlam@marlam.de>
@@ -255,7 +934,7 @@
 The compiler complained about l being defined more than once.
 
 src/video_output_render.fs.glsl | 15 ++++++++-------
- 1 files changed, 8 insertions(+), 7 deletions(-)
+ 1 file changed, 8 insertions(+), 7 deletions(-)
 
 commit d801d60615cafcbe55dfacfc3ad137625e418dc8
 Author: Martin Lambers <marlam@marlam.de>
@@ -286,7 +965,7 @@
 Bump version to 1.3.1.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8f8cd6f777fb9e6a5c9e1aa8f0d2452eb4390fa3
 Author: Martin Lambers <marlam@marlam.de>
@@ -305,7 +984,7 @@
 Windows: update build instructions.
 
 README.Windows | 15 ++++++++-------
- 1 files changed, 8 insertions(+), 7 deletions(-)
+ 1 file changed, 8 insertions(+), 7 deletions(-)
 
 commit 019193c41b44ce8a6a04664f28afbc7c86be515d
 Author: Martin Lambers <marlam@marlam.de>
@@ -335,7 +1014,7 @@
 doc/bino.1 | 8 +-
 doc/bino.texi | 9 +-
 src/Makefile.am | 5 +-
- src/gui.cpp | 98 ++++++-----
+ src/gui.cpp | 98 +++++-----
 src/icons-local/README | 2 +-
 src/icons-local/output-type-alternating.ipe | 266 +++++++++++++++++++++++++++
 src/icons-local/output-type-alternating.png | Bin 0 -> 473 bytes
@@ -345,7 +1024,7 @@
 src/player_equalizer.cpp | 3 +-
 src/video_output.cpp | 8 +-
 src/video_output.h | 9 +-
- src/video_output_qt.cpp | 47 +++++-
+ src/video_output_qt.cpp | 47 ++++-
 src/video_output_qt.h | 16 ++
 16 files changed, 430 insertions(+), 65 deletions(-)
 
@@ -381,7 +1060,7 @@
 
 Make translations easier.
 
- src/gui.cpp | 72 ++++++++++++++++++++++++++++-----------------------------
+ src/gui.cpp | 72 ++++++++++++++++++++++++++++------------------------------
 src/main.cpp | 2 +-
 2 files changed, 36 insertions(+), 38 deletions(-)
 
@@ -392,7 +1071,7 @@
 GUI: sanitize input duration before displaying it.
 
 src/gui.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit 30142c70b68e4f7946df4c348c738fe652a7b605
 Author: Martin Lambers <marlam@marlam.de>
@@ -402,10 +1081,10 @@
 
 src/player_equalizer.cpp | 2 +-
 src/video_output.cpp | 14 +++++++-------
- src/video_output.h | 20 ++++++++++----------
+ src/video_output.h | 22 +++++++++++-----------
 src/video_output_qt.cpp | 5 ++---
 src/video_output_qt.h | 5 ++++-
- 5 files changed, 24 insertions(+), 22 deletions(-)
+ 5 files changed, 25 insertions(+), 23 deletions(-)
 
 commit fcf75ee9285943609ae974bb7da2b7727651d948
 Author: Martin Lambers <marlam@marlam.de>
@@ -421,9 +1100,9 @@
 
 src/player_equalizer.cpp | 30 ++++++++--------
 src/video_output.cpp | 6 ++--
- src/video_output.h | 44 +++++++++++-----------
- src/video_output_qt.cpp | 87 +++++++++++++++++++++++++++++++--------------
- src/video_output_qt.h | 26 +++++++++----
+ src/video_output.h | 44 +++++++++++------------
+ src/video_output_qt.cpp | 87 ++++++++++++++++++++++++++++++++--------------
+ src/video_output_qt.h | 26 +++++++++-----
 5 files changed, 118 insertions(+), 75 deletions(-)
 
 commit 2a8eff2758c2e945db14de2f481185968117e4e8
@@ -433,7 +1112,7 @@
 Fix setting of streams when closing/reopening a media input.
 
 src/dispatch.cpp | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 4af205fc0e416c7fa7de8f694db688d7b77ba355
 Author: Martin Lambers <marlam@marlam.de>
@@ -442,7 +1121,7 @@
 Video output: synchronize X11 when starting/stopping GL thread.
 
 src/video_output_qt.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit 8dc11a6117d3cfedbbd286d59294bb59c064dcc2
 Author: Martin Lambers <marlam@marlam.de>
@@ -451,7 +1130,7 @@
 GUI: allow command line to override initial output mode.
 
 src/gui.cpp | 33 +++++++++++++++++++++------------
- 1 files changed, 21 insertions(+), 12 deletions(-)
+ 1 file changed, 21 insertions(+), 12 deletions(-)
 
 commit 27c9a5fecff1dee34694dee7104802eecb80c1c1
 Author: Martin Lambers <marlam@marlam.de>
@@ -471,8 +1150,8 @@
 
 Fix parameter initalization on open/play/stop.
 
- src/dispatch.cpp | 136 +++++++++++++++++++++++++++--------------------------
- 1 files changed, 69 insertions(+), 67 deletions(-)
+ src/dispatch.cpp | 136 +++++++++++++++++++++++++++---------------------------
+ 1 file changed, 69 insertions(+), 67 deletions(-)
 
 commit 70a0c32d7d60a0e405659a305821cc348b9dcf6d
 Author: Martin Lambers <marlam@marlam.de>
@@ -481,7 +1160,7 @@
 GUI: fix loading of old-style per-video settings.
 
 src/gui.cpp | 14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
+ 1 file changed, 7 insertions(+), 7 deletions(-)
 
 commit 98ab291898cc760b9dd159679e7d6cd61ddb5923
 Author: Martin Lambers <marlam@marlam.de>
@@ -490,7 +1169,7 @@
 Make OpenGL Stereo support more robust.
 
 src/video_output_qt.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit f4992100b873a977a8952e1979194c83291eb45e
 Author: Martin Lambers <marlam@marlam.de>
@@ -565,7 +1244,7 @@
 Fix build for window systems other than X11.
 
 src/gui.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit dcb1af00370cebc28ce7ce9a09910805710a53f0
 Author: Martin Lambers <marlam@marlam.de>
@@ -584,7 +1263,7 @@
 Fix build with Qt 4.6.4 on Mac OS X.
 
 src/video_output_qt.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 8b8fd4336626e93229c639a86286c4d11181f48f
 Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
@@ -593,7 +1272,7 @@
 Mac OS X: prefer <AL/al.h> over <OpenAL/al.h>, part 2.
 
 src/lib_versions.cpp | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 5d696fd885d3bd3a8033a64bdee76036476f6d76
 Author: Martin Lambers <marlam@marlam.de>
@@ -630,7 +1309,7 @@
 Fix opening of initial file in Equalizer mode.
 
 src/dispatch.cpp | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 7756f6621a55bcc0219cf0545e0781984f96c507
 Author: Martin Lambers <marlam@marlam.de>
@@ -642,7 +1321,7 @@
 src/dispatch.h | 2 +-
 src/gui.cpp | 137 ++++++++++++++++++++++++++++++------------------------
 src/gui.h | 4 +-
- src/main.cpp | 10 +----
+ src/main.cpp | 10 +---
 5 files changed, 106 insertions(+), 77 deletions(-)
 
 commit 4d66732614169744434d7acae27fd2525bbc9cd4
@@ -678,7 +1357,7 @@
 opened.
 
 src/gui.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f70c8b94ca6efcd574109c95b9b0020152c23b55
 Author: Martin Lambers <marlam@marlam.de>
@@ -687,7 +1366,7 @@
 Base module opt: in debug mode, check that all options are unique.
 
 src/base/opt.cpp | 19 +++++++++++++++++++
- 1 files changed, 19 insertions(+), 0 deletions(-)
+ 1 file changed, 19 insertions(+)
 
 commit 5a888e706dd4879ee778f728a7162ba146ffa009
 Author: Martin Lambers <marlam@marlam.de>
@@ -695,8 +1374,8 @@
 
 Equalizer: fix --crop option.
 
- src/player_equalizer.cpp | 63 ++++++++++++++++++++++++++-------------------
- 1 files changed, 36 insertions(+), 27 deletions(-)
+ src/player_equalizer.cpp | 63 ++++++++++++++++++++++++++--------------------
+ 1 file changed, 36 insertions(+), 27 deletions(-)
 
 commit 7b333549166212588942f561860e0085750636a6
 Author: Martin Lambers <marlam@marlam.de>
@@ -716,7 +1395,7 @@
 GUI: Fix in/out widget when starting video from the command line.
 
 src/gui.cpp | 5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
+ 1 file changed, 2 insertions(+), 3 deletions(-)
 
 commit c5b9e2fe4414aaf9d7cc790af4318c4ed7c36087
 Author: Martin Lambers <marlam@marlam.de>
@@ -728,7 +1407,7 @@
 GCC style atomic builtins are not available.
 
 configure.ac | 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
+ 1 file changed, 10 insertions(+)
 
 commit 7ee8379e071102ce1cee02a886c8e50da2db077e
 Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
@@ -753,8 +1432,8 @@
 
 Make GL render thread more robust.
 
- src/video_output_qt.cpp | 52 ++++++++++++++++++++++------------------------
- src/video_output_qt.h | 9 +++----
+ src/video_output_qt.cpp | 52 +++++++++++++++++++++++------------------------
+ src/video_output_qt.h | 9 ++++----
 2 files changed, 29 insertions(+), 32 deletions(-)
 
 commit 03b695adc24952fc17d4324ef58acf8853a6f695
@@ -764,7 +1443,7 @@
 GUI: fix center button.
 
 src/dispatch.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit adf667e2ca211ac7c559de5ead5a1fd068af344f
 Author: Martin Lambers <marlam@marlam.de>
@@ -774,9 +1453,9 @@
 
 This fixes Equalizer mode to work with the new structure.
 
- src/dispatch.cpp | 54 ++++++++-
- src/dispatch.h | 11 ++-
- src/main.cpp | 17 ++--
+ src/dispatch.cpp | 54 +++++++--
+ src/dispatch.h | 11 +-
+ src/main.cpp | 17 ++-
 src/player.h | 22 +++-
 src/player_equalizer.cpp | 294 ++++++++++++++++++----------------------------
 src/player_equalizer.h | 15 ++-
@@ -793,8 +1472,8 @@
 src/dispatch.cpp | 128 +++++++++++++++++++++++------------------------
 src/dispatch.h | 1 +
 src/gui.cpp | 88 +++++++++++++++++++-------------
- src/video_output_qt.cpp | 58 ++++++++++-----------
- src/video_output_qt.h | 23 ++++++--
+ src/video_output_qt.cpp | 58 +++++++++++----------
+ src/video_output_qt.h | 23 ++++++---
 5 files changed, 161 insertions(+), 137 deletions(-)
 
 commit 4bb823917b04b9a4e0a7c7b70c1a256c96214369
@@ -813,10 +1492,10 @@
 
 src/dispatch.cpp | 38 +++++----
 src/main.cpp | 6 ++
- src/video_output.cpp | 26 +++----
+ src/video_output.cpp | 26 +++---
 src/video_output.h | 5 +-
 src/video_output_qt.cpp | 201 ++++++++++++++++++++++++++++++++++++++++-------
- src/video_output_qt.h | 63 ++++++++++++++-
+ src/video_output_qt.h | 63 +++++++++++++--
 6 files changed, 271 insertions(+), 68 deletions(-)
 
 commit 14baff7c96d41dc4763b629f93cd8436d9e2686c
@@ -838,8 +1517,8 @@
 src/gui.h | 403 ++++++
 src/lirc.h | 2 +-
 src/main.cpp | 144 +--
- src/player.cpp | 413 ++-----
- src/player.h | 105 +--
+ src/player.cpp | 413 ++----
+ src/player.h | 105 +-
 src/player_qt.cpp | 3246 -----------------------------------------------
 src/player_qt.h | 434 -------
 src/video_output.cpp | 29 +-
@@ -857,24 +1536,24 @@
 This moves all parameter management to a single central dispatch
 that exists independent of the player object.
 
- src/audio_output.cpp | 40 ++-
+ src/audio_output.cpp | 40 +-
 src/audio_output.h | 12 +-
 src/base/opt.cpp | 4 +
 src/base/opt.h | 13 +-
 src/base/s11n.h | 18 +
 src/controller.cpp | 500 ++++++++++++++++++++--
 src/controller.h | 303 +++++++-------
- src/lirc.cpp | 33 +--
+ src/lirc.cpp | 33 +-
 src/lirc.h | 9 +-
 src/main.cpp | 268 +++++-------
- src/player.cpp | 599 +++++----------------------
+ src/player.cpp | 599 +++++---------------------
 src/player.h | 26 +-
 src/player_equalizer.cpp | 2 +-
 src/player_qt.cpp | 1044 +++++++++++++---------------------------------
- src/player_qt.h | 40 +--
+ src/player_qt.h | 40 +-
 src/video_output.cpp | 2 +-
 src/video_output.h | 9 +-
- src/video_output_qt.cpp | 66 +---
+ src/video_output_qt.cpp | 66 +--
 src/video_output_qt.h | 11 +-
 19 files changed, 1230 insertions(+), 1769 deletions(-)
 
@@ -885,7 +1564,7 @@
 Fix compilation with ffmpeg-0.7.
 
 src/media_object.cpp | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit c84de60dec96897b282db008ec50486f908249c2
 Author: Martin Lambers <marlam@marlam.de>
@@ -906,7 +1585,7 @@
 be revisited.
 
 src/media_object.cpp | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
+ 1 file changed, 8 insertions(+)
 
 commit b3fdb525f8b5a8960dccb3db2b1dd09d53458ae9
 Author: Martin Lambers <marlam@marlam.de>
@@ -915,7 +1594,7 @@
 Fix automatic setting of stereo mode in non-GUI mode.
 
 src/main.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f8115052e164befc2eefe19c192329f042160a40
 Merge: 7043fe4 77be369
@@ -931,7 +1610,7 @@
 Fix swap synchronization in Equalizer mode: The master player alternatingly produces "prep_frame" and "display_frame" signals, each one causing an eq::Config frame. Since the config frames are swaplocked, the maximum video framerate is then half of the display refresh. Fix by only swapping buffers when "display_frame" is set. This causes still too many eq frames to be rendered, but they can be rendered faster than the display refresh rate
 
 src/player_equalizer.cpp | 27 ++++++++++++---------------
- 1 files changed, 12 insertions(+), 15 deletions(-)
+ 1 file changed, 12 insertions(+), 15 deletions(-)
 
 commit 77be3693f5f272be678c34498a5ce1e867e639e9
 Author: Martin Lambers <marlam@marlam.de>
@@ -957,7 +1636,7 @@
 de.po: fix typo
 
 po/de.po | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8a56a4c95fd547f9df407770b9973dcece4420bf
 Merge: 06bed46 dd068a9
@@ -987,7 +1666,7 @@
 This fixes a problem with flipped images; see the comments.
 
 src/media_object.cpp | 26 +++++++++++++++-----------
- 1 files changed, 15 insertions(+), 11 deletions(-)
+ 1 file changed, 15 insertions(+), 11 deletions(-)
 
 commit dd068a9758610b59306357c64cfa921ade9fa2ac
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -1012,7 +1691,7 @@
 Translations: break the "--help" string into smaller segments.
 
 src/main.cpp | 239 +++++++++++++++++++++++++++++-----------------------------
- 1 files changed, 118 insertions(+), 121 deletions(-)
+ 1 file changed, 118 insertions(+), 121 deletions(-)
 
 commit 5d60a1ea7b47f1b3792753b8b1bb3d256d7c6a6d
 Author: Martin Lambers <marlam@marlam.de>
@@ -1030,9 +1709,9 @@
 
 Fix setting and remembering the stereo layout and stereo mode parameters.
 
- src/controller.h | 11 ++++++---
- src/player.cpp | 55 +++++++++++++++++++++++++++++++++++-----------------
- src/player_qt.cpp | 36 ++++++++++++++++++++++++----------
+ src/controller.h | 11 +++++++----
+ src/player.cpp | 55 +++++++++++++++++++++++++++++++++++------------------
+ src/player_qt.cpp | 36 ++++++++++++++++++++++++-----------
 3 files changed, 69 insertions(+), 33 deletions(-)
 
 commit baa06207e9ec7490b036bfbeb2e192eeeda6c594
@@ -1052,7 +1731,7 @@
 Fix setting of correct stereo layout when opening a new file.
 
 src/player_qt.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1ef33bd9241964f42fec31e54644ade36acec953
 Author: Martin Lambers <marlam@marlam.de>
@@ -1111,9 +1790,9 @@
 
 Also update all callers.
 
- src/main.cpp | 106 ++--
+ src/main.cpp | 106 ++-
 src/media_data.cpp | 1899 ++++++++++++++++++++++++----------------------
- src/media_data.h | 289 ++++----
+ src/media_data.h | 289 +++----
 src/media_input.cpp | 26 +-
 src/media_input.h | 6 +-
 src/media_object.cpp | 68 +-
@@ -1122,7 +1801,7 @@
 src/player_equalizer.cpp | 3 +-
 src/player_qt.cpp | 333 ++++----
 src/player_qt.h | 7 +-
- src/video_output.cpp | 176 +++---
+ src/video_output.cpp | 176 ++---
 12 files changed, 1538 insertions(+), 1511 deletions(-)
 
 commit c7b9194e33508ef48a396fc84cee393d202a62d9
@@ -1138,7 +1817,7 @@
 src/media_data.h | 114 +++++---
 src/player.cpp | 273 ++++++++++---------
 src/player_equalizer.cpp | 4 +-
- src/player_qt.cpp | 462 +++++++++++++++----------------
+ src/player_qt.cpp | 462 ++++++++++++++++---------------
 src/subtitle_renderer.cpp | 20 +-
 src/video_output.cpp | 228 ++++++++--------
 10 files changed, 1043 insertions(+), 856 deletions(-)
@@ -1150,7 +1829,7 @@
 Fix "crop to aspect ratio" for stereo modes left-right-half and top-bottom-half.
 
 src/video_output.cpp | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit eabb69501353af2553ee8b4439403c9198a753e0
 Author: Martin Lambers <marlam@marlam.de>
@@ -1161,15 +1840,15 @@
 This allows to remove hard coded black borders from videos, thus fixing e.g.
 zoom mode.
 
- doc/bino.1 | 2 +
+ doc/bino.1 | 2 ++
 doc/bino.texi | 3 ++
- src/controller.h | 2 +
+ src/controller.h | 2 ++
 src/main.cpp | 19 ++++++++++-
 src/media_data.cpp | 7 ++++
 src/media_data.h | 1 +
 src/player.cpp | 11 +++++-
- src/player_qt.cpp | 92 ++++++++++++++++++++++++++++++++++++++++++++-----
- src/player_qt.h | 4 ++
+ src/player_qt.cpp | 92 ++++++++++++++++++++++++++++++++++++++++++++------
+ src/player_qt.h | 4 +++
 src/video_output.cpp | 50 +++++++++++++++++++--------
 10 files changed, 165 insertions(+), 26 deletions(-)
 
@@ -1180,7 +1859,7 @@
 Video output: correctly remember last rendering parameters.
 
 src/video_output.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ccb68fb5ceb8fba19e5a2ff8d536e987b6579c65
 Author: Martin Lambers <marlam@marlam.de>
@@ -1218,7 +1897,7 @@
 configure: reject Qt < 4.6.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fe5a518eec90427f1eff916c6361422062081c50
 Author: Martin Lambers <marlam@marlam.de>
@@ -1231,7 +1910,7 @@
 src/main.cpp | 2 +-
 src/player.cpp | 4 +-
 src/player_qt.cpp | 170 ++++++++++++++++++++++++++++++++++-------------------
- src/player_qt.h | 26 +++++++-
+ src/player_qt.h | 26 ++++++--
 6 files changed, 139 insertions(+), 71 deletions(-)
 
 commit 27095573fee12acc90bc5b181ba7516f06b83779
@@ -1248,7 +1927,7 @@
 Equalizer configuration.
 
 src/player_equalizer.cpp | 15 +++++++++++----
- 1 files changed, 11 insertions(+), 4 deletions(-)
+ 1 file changed, 11 insertions(+), 4 deletions(-)
 
 commit 184ee32fe707ab8daebff1caeb68116898406ac6
 Author: Martin Lambers <marlam@marlam.de>
@@ -1257,7 +1936,7 @@
 Fix delay reported in frame drop warning message.
 
 src/player.cpp | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit dc6ccec9f2ca3a9a8b029caf621b9f6586050dab
 Author: Martin Lambers <marlam@marlam.de>
@@ -1266,7 +1945,7 @@
 Equalizer: toggle statistics overlay with key 'S' (uppercase).
 
 src/player_equalizer.cpp | 15 ++++++++++++++-
- 1 files changed, 14 insertions(+), 1 deletions(-)
+ 1 file changed, 14 insertions(+), 1 deletion(-)
 
 commit 5c3ca62f6cdfebf047cee1bad921b0e0d74a1d9b
 Author: Martin Lambers <marlam@marlam.de>
@@ -1275,7 +1954,7 @@
 Video output: reset some GL state when finished with rendering the current frame.
 
 src/video_output.cpp | 12 ++++++++++--
- 1 files changed, 10 insertions(+), 2 deletions(-)
+ 1 file changed, 10 insertions(+), 2 deletions(-)
 
 commit fb88f42afac68fb1ca833b19801495af8c141c58
 Author: Martin Lambers <marlam@marlam.de>
@@ -1298,7 +1977,7 @@
 
 AUTHORS | 4 +++-
 NEWS | 10 ++++++++++
- 2 files changed, 13 insertions(+), 1 deletions(-)
+ 2 files changed, 13 insertions(+), 1 deletion(-)
 
 commit 8271a9c354f9513fbebe5171ee263437193db44a
 Author: Martin Lambers <marlam@marlam.de>
@@ -1307,7 +1986,7 @@
 GUI: automatically start playing after successfully opening an input.
 
 src/player_qt.cpp | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
+ 1 file changed, 5 insertions(+), 3 deletions(-)
 
 commit a8e2d57702cdc256bdc0080e510c2e06d1678ff7
 Author: Martin Lambers <marlam@marlam.de>
@@ -1316,7 +1995,7 @@
 GUI: Remember the audio delay setting between sessions.
 
 src/player_qt.cpp | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ 1 file changed, 5 insertions(+)
 
 commit d4135448a2ab8b57f3af4f074808d4651e9a3b5e
 Author: Martin Lambers <marlam@marlam.de>
@@ -1332,15 +2011,15 @@
 compositing window managers. See https://savannah.nongnu.org/bugs/?35103 for
 a discussion.
 
- doc/bino.1 | 2 +
- doc/bino.texi | 3 ++
- src/controller.h | 23 ++++++++++++++++++++++
- src/main.cpp | 7 ++++++
- src/media_data.cpp | 9 +++++++-
+ doc/bino.1 | 2 ++
+ doc/bino.texi | 3 +++
+ src/controller.h | 23 +++++++++++++++++++++++
+ src/main.cpp | 7 +++++++
+ src/media_data.cpp | 9 ++++++++-
 src/media_data.h | 1 +
- src/player.cpp | 14 +++++++++++-
- src/player_qt.cpp | 53 +++++++++++++++++++++++++++++++++++++++++++++------
- src/player_qt.h | 2 +
+ src/player.cpp | 14 ++++++++++++--
+ src/player_qt.cpp | 53 +++++++++++++++++++++++++++++++++++++++++++++-------
+ src/player_qt.h | 2 ++
 9 files changed, 104 insertions(+), 10 deletions(-)
 
 commit dd9332cfdf594c99dcaaaff5efcb40ab22a7f4cb
@@ -1350,7 +2029,7 @@
 Subtitles: do not cancel renderer initializer; always let it finish.
 
 src/subtitle_renderer.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8badab16a4ba0b2180f7d566e55e8aef0741ef1a
 Author: Martin Lambers <marlam@marlam.de>
@@ -1359,7 +2038,7 @@
 Fix -A shortcut for --audio-device.
 
 src/main.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f5dd97491eee06ad5309e229ee9fee5ac66fc2dd
 Author: Martin Lambers <marlam@marlam.de>
@@ -1378,12 +2057,12 @@
 
 Add support for audio volume control and mute, via keyboard, GUI, and LIRC.
 
- doc/bino.1 | 8 +++
+ doc/bino.1 | 8 ++++
 doc/bino.texi | 14 ++++++
 src/Makefile.am | 4 ++
- src/audio_output.cpp | 15 ++++++
+ src/audio_output.cpp | 15 +++++++
 src/audio_output.h | 6 +++
- src/controller.h | 7 +++-
+ src/controller.h | 7 ++-
 src/icons/audio-volume-high.png | Bin 0 -> 2280 bytes
 src/icons/audio-volume-low.png | Bin 0 -> 1652 bytes
 src/icons/audio-volume-medium.png | Bin 0 -> 1998 bytes
@@ -1393,8 +2072,8 @@
 src/media_data.cpp | 16 ++++++-
 src/media_data.h | 2 +
 src/player.cpp | 34 ++++++++++++++-
- src/player_qt.cpp | 86 +++++++++++++++++++++++++++++++++---
- src/player_qt.h | 12 ++++-
+ src/player_qt.cpp | 86 +++++++++++++++++++++++++++++++++----
+ src/player_qt.h | 12 +++++-
 src/video_output_qt.cpp | 26 +++++++++--
 18 files changed, 237 insertions(+), 19 deletions(-)
 
@@ -1415,12 +2094,12 @@
 Add support for selecting an audio device.
 
 doc/bino.1 | 4 +++
- doc/bino.texi | 5 +++
- src/audio_output.cpp | 48 +++++++++++++++++++++++++++++++---
- src/audio_output.h | 13 +++++++--
+ doc/bino.texi | 5 ++++
+ src/audio_output.cpp | 48 ++++++++++++++++++++++++++++++++---
+ src/audio_output.h | 13 +++++++---
 src/main.cpp | 28 +++++++++++++++++++-
- src/player.cpp | 7 +++-
- src/player.h | 3 +-
+ src/player.cpp | 7 +++--
+ src/player.h | 3 ++-
 src/player_qt.cpp | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/player_qt.h | 21 +++++++++++++++
 9 files changed, 187 insertions(+), 11 deletions(-)
@@ -1431,7 +2110,7 @@
 
 GUI: integrate zoom preferences into video preferences.
 
- src/player_qt.cpp | 277 ++++++++++++++++++++++------------------------------
+ src/player_qt.cpp | 277 ++++++++++++++++++++++-------------------------------
 src/player_qt.h | 36 ++-----
 2 files changed, 126 insertions(+), 187 deletions(-)
 
@@ -1444,7 +2123,7 @@
 src/Makefile.am | 1 +
 src/icons/dialog-information.png | Bin 0 -> 2742 bytes
 src/player_qt.cpp | 27 +++++++++++++++++++++++++++
- 3 files changed, 28 insertions(+), 0 deletions(-)
+ 3 files changed, 28 insertions(+)
 
 commit d53cf8cd91d92b506ee623a514ead44b60452b6d
 Author: Martin Lambers <marlam@marlam.de>
@@ -1455,7 +2134,7 @@
 src/icons/README | 2 +-
 src/icons/document-open.png | Bin 1616 -> 2798 bytes
 src/icons/help-about.png | Bin 2261 -> 2742 bytes
- 3 files changed, 1 insertions(+), 1 deletions(-)
+ 3 files changed, 1 insertion(+), 1 deletion(-)
 
 commit c5e7afd5e85d31de31247eb48ea9f82799967a6d
 Author: Martin Lambers <marlam@marlam.de>
@@ -1464,7 +2143,7 @@
 Fix previous commit: add missing image files to documentation.
 
 doc/Makefile.am | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit 3a877a1766231838b7952d8decd7bce0e6e9ec84
 Author: Martin Lambers <marlam@marlam.de>
@@ -1492,12 +2171,12 @@
 .../input-layout-alternating-right-left.ipe | 260 ++++++++++++++++++++
 .../input-layout-alternating-right-left.png | Bin 0 -> 872 bytes
 src/main.cpp | 6 +-
- src/media_data.cpp | 18 ++-
+ src/media_data.cpp | 18 +-
 src/media_data.h | 4 +-
 src/media_input.cpp | 18 +-
- src/media_object.cpp | 232 +++++++++++-------
+ src/media_object.cpp | 232 ++++++++++-------
 src/media_object.h | 8 +-
- src/player_qt.cpp | 44 +++--
+ src/player_qt.cpp | 44 ++--
 13 files changed, 742 insertions(+), 113 deletions(-)
 
 commit 4fe593c1918edfacf5914c4b0d2777514ad4ef78
@@ -1507,7 +2186,7 @@
 configure: allow overriding the rcc and moc commands for Qt.
 
 configure.ac | 4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit 83ef7caaa6ca977b6433550e9d1ca2621e59ab3d
 Author: Daniel Schaal <farbing@web.de>
@@ -1528,7 +2207,7 @@
 Adds the 5 most recently opened files to the file menu.
 It also adds an option to clear the recent files list again.
 
- src/player_qt.cpp | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ src/player_qt.cpp | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 src/player_qt.h | 16 ++++++++++-
 2 files changed, 94 insertions(+), 3 deletions(-)
 
@@ -1546,16 +2225,16 @@
 src/base/exc.h | 4 +-
 src/base/intcheck.h | 4 +-
 src/base/msg.cpp | 10 +-
- src/base/msg.h | 20 ++-
+ src/base/msg.h | 20 +-
 src/base/opt.cpp | 4 +-
 src/base/opt.h | 4 +-
 src/base/s11n.cpp | 566 ++++++++++++++++++++++++++++++++++++++++++++-------
- src/base/s11n.h | 179 ++++++++++++-----
+ src/base/s11n.h | 179 +++++++++++-----
 src/base/str.cpp | 46 ++++-
 src/base/str.h | 7 +-
- src/base/thread.cpp | 132 +++++++++----
- src/base/thread.h | 86 ++++++---
- src/base/timer.cpp | 42 ++---
+ src/base/thread.cpp | 132 ++++++++----
+ src/base/thread.h | 86 +++++---
+ src/base/timer.cpp | 42 ++--
 src/base/timer.h | 9 +-
 src/media_data.h | 8 +-
 src/player.h | 2 +-
@@ -1569,7 +2248,7 @@
 Media keys: Only enable on Qt 4.7 or later
 
 src/video_output_qt.cpp | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 commit 8ae7263c23202415c6800954aef90ce6ba3a6f74
 Author: Martin Lambers <marlam@marlam.de>
@@ -1578,7 +2257,7 @@
 Print --version and --help output to stdout, not stderr.
 
 src/main.cpp | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 commit ed8b29a349048a49cc586b509cbab1350324a2e9
 Author: Martin Lambers <marlam@marlam.de>
@@ -1589,7 +2268,7 @@
 doc/bino.1 | 3 +++
 doc/bino.texi | 3 +++
 src/main.cpp | 3 ++-
- 3 files changed, 8 insertions(+), 1 deletions(-)
+ 3 files changed, 8 insertions(+), 1 deletion(-)
 
 commit f7f2f7c7c03b31af6855edb88143fc7746337953
 Author: Martin Lambers <marlam@marlam.de>
@@ -1598,7 +2277,7 @@
 Minor tweak to f1f2df5805ff7e0829267b8a5e337701c7d0821b.
 
 src/player_qt.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit b0cee1642d009a0455bbcc72c6bfb9786db1154d
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -1621,7 +2300,7 @@
 
 configure.ac | 2 +-
 src/player_qt.cpp | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit e2f32f3a5a1ba95b0e8ff7525892fa897ab066ee
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -1630,7 +2309,7 @@
 add object files to .gitignore
 
 .gitignore | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit aa057a953b21b10aae8dc8c18bb658bd649469cf
 Author: Martin Lambers <marlam@marlam.de>
@@ -1639,7 +2318,7 @@
 Windows: compile with -mthreads.
 
 configure.ac | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit a95247da920d46613bff4c02e7c03513526dc6d0
 Author: Martin Lambers <marlam@marlam.de>
@@ -1658,7 +2337,7 @@
 Update autotools files.
 
 build-aux/config.guess | 360 +++++++++++++++++++++++-------------------------
- build-aux/config.sub | 181 +++++++++++++++++--------
+ build-aux/config.sub | 181 ++++++++++++++++--------
 2 files changed, 296 insertions(+), 245 deletions(-)
 
 commit fc6877bf30561e90fe7e0862432b28b68f1af109
@@ -1668,7 +2347,7 @@
 Fix typo that broke GLEWMX/GLEW detection in configure.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4837f6b3491cb94aa6ad437ee923752034f589a3
 Author: Martin Lambers <marlam@marlam.de>
@@ -1677,7 +2356,7 @@
 Do not crash in Equalizer mode if there is no video to play.
 
 src/main.cpp | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 commit aad94f78ec0dede4501b34f43586c572f65263cf
 Author: Martin Lambers <marlam@marlam.de>
@@ -1716,7 +2395,7 @@
 configure.ac: print correct warning when pkg-config for libass failed.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit df04c82ab2ae60aa30354527fdd2d62a36b11f86
 Author: Martin Lambers <marlam@marlam.de>
@@ -1737,7 +2416,7 @@
 
 This avoids losing precision e.g. for 10-bit YUV input video.
 
- src/video_output.cpp | 69 +++++++++++++++++++++++----------------
+ src/video_output.cpp | 69 ++++++++++++++++++++++++----------------
 src/video_output.h | 2 +-
 src/video_output_color.fs.glsl | 24 ++++++++++++++
 3 files changed, 66 insertions(+), 29 deletions(-)
@@ -1749,7 +2428,7 @@
 Add a debugging message about OpenGL framebuffer properties.
 
 src/video_output_qt.cpp | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 commit a41443cc8b105cfaa9fcd866fddb8d97cda18323
 Author: Martin Lambers <marlam@marlam.de>
@@ -1771,7 +2450,7 @@
 Change an unnecessary warning into a debugging message.
 
 src/media_object.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 456443e23fe5bd02013b4feb7c1004a5b5c0c84f
 Author: Martin Lambers <marlam@marlam.de>
@@ -1780,7 +2459,7 @@
 Update AUTHORS.
 
 AUTHORS | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
+ 1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit c93dfb70b8d1be3383c1d53a77169d3891a8d5e5
 Author: Martin Lambers <marlam@marlam.de>
@@ -1789,7 +2468,7 @@
 Bump version to 1.3.0.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 55babc31588b156bb931207a44156cc4c24f9bfa
 Author: Martin Lambers <marlam@marlam.de>
@@ -1798,7 +2477,7 @@
 Improve an error message.
 
 src/video_output_qt.cpp | 4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit 950b69b375f1e85343e8ea774c203770cbc64639
 Author: Martin Lambers <marlam@marlam.de>
@@ -1809,7 +2488,7 @@
 doc/bino.1 | 2 ++
 doc/bino.texi | 2 ++
 src/main.cpp | 29 +++++++++++++++++++++++++++++
- 3 files changed, 33 insertions(+), 0 deletions(-)
+ 3 files changed, 33 insertions(+)
 
 commit edb74e45585c84121958e0d3258ced0b928b96ae
 Author: Daniel Schaal <farbing@web.de>
@@ -1818,7 +2497,7 @@
 GUI: save and restore geometry of the MainWindow.
 
 src/player_qt.cpp | 12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
+ 1 file changed, 12 insertions(+)
 
 commit dfdd1496b2b3ffcb7045915f55eef5adccef3801
 Author: Martin Lambers <marlam@marlam.de>
@@ -1827,7 +2506,7 @@
 GUI: Fix all preferences dialogs to work when no video is opened.
 
 src/player_qt.cpp | 145 ++++++++++++++++++++++++++++++++++++-----------------
- src/player_qt.h | 11 +++--
+ src/player_qt.h | 11 ++--
 2 files changed, 105 insertions(+), 51 deletions(-)
 
 commit 104ce9d380a5cffa93651d8cd99f7fb124e18b11
@@ -1836,19 +2515,19 @@
 
 Add a zoom mode for videos that are wider than the screen.
 
- doc/bino.1 | 7 ++-
- doc/bino.texi | 10 +++-
+ doc/bino.1 | 7 +-
+ doc/bino.texi | 10 ++-
 src/controller.h | 3 +
 src/lirc.cpp | 4 +
- src/main.cpp | 7 ++-
+ src/main.cpp | 7 +-
 src/media_data.cpp | 9 ++-
 src/media_data.h | 1 +
 src/player.cpp | 14 ++++
 src/player_equalizer.cpp | 181 ++++++++++++++++++++++++++++------------------
 src/player_qt.cpp | 97 ++++++++++++++++++++++++-
 src/player_qt.h | 21 ++++++
- src/video_output.cpp | 155 +++++++++++++++++++++++-----------------
- src/video_output.h | 8 ++-
+ src/video_output.cpp | 155 ++++++++++++++++++++++-----------------
+ src/video_output.h | 8 +-
 src/video_output_qt.cpp | 10 ++-
 14 files changed, 381 insertions(+), 146 deletions(-)
 
@@ -1885,7 +2564,7 @@
 Use minus sign instead of hyphen in man page.
 
 doc/bino.1 | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 7ecb5706d2d3eed1c79af1879ba32b619ba5592c
 Author: Martin Lambers <marlam@marlam.de>
@@ -1894,7 +2573,7 @@
 Windows: reenable czech translation in installer.
 
 pkg/w32/bino.nsi | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit f9f24e9c39ac07dc1f888fba386f05e078bf1bfa
 Author: Joe <cuchac@email.cz>
@@ -1914,7 +2593,7 @@
 
 src/media_input.cpp | 10 ++++++++++
 src/media_input.h | 5 +++++
- 2 files changed, 15 insertions(+), 0 deletions(-)
+ 2 files changed, 15 insertions(+)
 
 commit 273d89b639bb49c1917b3a71ad0c2964534798ca
 Author: Martin Lambers <marlam@marlam.de>
@@ -1927,7 +2606,7 @@
 *.po files.
 
 src/bino.desktop | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit a1858665238f7b2b285b1ea585d339aa8cf3b5e0
 Author: Martin Lambers <marlam@marlam.de>
@@ -1947,7 +2626,7 @@
 
 Makefile.am | 2 +-
 README.FreeBSD | 1 +
- 2 files changed, 2 insertions(+), 1 deletions(-)
+ 2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit d84f6f9cce8835587fc1b2b20351027886579019
 Author: Martin Lambers <marlam@marlam.de>
@@ -1958,7 +2637,7 @@
 These should now be mode 644, like all installed files.
 
 src/Makefile.am | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 8507c307eb9f509c3de2bef412b20b364b510393
 Author: Martin Lambers <marlam@marlam.de>
@@ -1967,7 +2646,7 @@
 configure.ac: tell which libraries/tools are optional and which are required.
 
 configure.ac | 32 ++++++++++++++++----------------
- 1 files changed, 16 insertions(+), 16 deletions(-)
+ 1 file changed, 16 insertions(+), 16 deletions(-)
 
 commit 13ae41235212eaf6f1f059f7341c053f7bc9a750
 Author: Martin Lambers <marlam@marlam.de>
@@ -2004,7 +2683,7 @@
 but was forgotten...
 
 configure.ac | 6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
+ 1 file changed, 6 deletions(-)
 
 commit 3711bcff8d42b7ab8cdf7949085aa2ff79fb82ab
 Author: Martin Lambers <marlam@marlam.de>
@@ -2027,7 +2706,7 @@
 the correct CPPFLAGS setting.
 
 configure.ac | 11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
+ 1 file changed, 11 insertions(+)
 
 commit f1fda97f626f70a5acb17e59aa0564dbfa570952
 Author: Martin Lambers <marlam@marlam.de>
@@ -2036,7 +2715,7 @@
 configure.ac: improve portability by checking for grep.
 
 configure.ac | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit b04d5201dad34f0bf181413d3027371bb6f8f46b
 Author: Martin Lambers <marlam@marlam.de>
@@ -2047,7 +2726,7 @@
 The previous X11 test did not work when the Qt headers were not found.
 
 configure.ac | 40 +++++++++++++++++++---------------------
- 1 files changed, 19 insertions(+), 21 deletions(-)
+ 1 file changed, 19 insertions(+), 21 deletions(-)
 
 commit e68b2e9bdf301720f533c4d17fabec5128f8fc62
 Author: Martin Lambers <marlam@marlam.de>
@@ -2056,7 +2735,7 @@
 Remove redundant linking with libGLEW when using Equalizer.
 
 src/Makefile.am | 3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
+ 1 file changed, 3 deletions(-)
 
 commit df1e5021ab46d26761526d19da79374cecc31e92
 Author: Martin Lambers <marlam@marlam.de>
@@ -2084,7 +2763,7 @@
 
 configure.ac | 23 +++++++++++++++++++++++
 src/video_output_qt.cpp | 2 ++
- 2 files changed, 25 insertions(+), 0 deletions(-)
+ 2 files changed, 25 insertions(+)
 
 commit 39577bff20aad63cc3f42a292b2ff2b998d248cb
 Author: Martin Lambers <marlam@marlam.de>
@@ -2114,7 +2793,7 @@
 Fix timer portability issues (for FreeBSD).
 
 src/base/timer.cpp | 32 +++++++++++++++++++++++++++-----
- 1 files changed, 27 insertions(+), 5 deletions(-)
+ 1 file changed, 27 insertions(+), 5 deletions(-)
 
 commit 1e5205644cefc17917aaa71743929951c6b27d13
 Author: Martin Lambers <marlam@marlam.de>
@@ -2134,7 +2813,7 @@
 Manual: some tweaks and improvements.
 
 doc/bino.texi | 171 +++++++++++++++++++++++++++++----------------------------
- 1 files changed, 86 insertions(+), 85 deletions(-)
+ 1 file changed, 86 insertions(+), 85 deletions(-)
 
 commit d59ae1dce114e758d617bd5e315b9685c0e4dfad
 Author: Robert Pliszko <Robert.Pliszko@systems-design.eu>
@@ -2143,7 +2822,7 @@
 Update pl.po.
 
 po/pl.po | 12 +++++-------
- 1 files changed, 5 insertions(+), 7 deletions(-)
+ 1 file changed, 5 insertions(+), 7 deletions(-)
 
 commit 43687f40aea112edacd095384efa0394f6b072a1
 Author: Robert Pliszko <Robert.Pliszko@systems-design.eu>
@@ -2152,7 +2831,7 @@
 Update pl.po.
 
 AUTHORS | 1 +
- po/pl.po | 819 ++++++++++++++++++++++++++++++++++++++++---------------------
+ po/pl.po | 819 ++++++++++++++++++++++++++++++++++++++++----------------------
 2 files changed, 538 insertions(+), 282 deletions(-)
 
 commit 68f3f8d35be69b2915eed2877302b6cdda48c9f0
@@ -2164,7 +2843,7 @@
 Its use was based on a misunderstanding. Use CLOCK_MONOTONIC instead.
 
 src/base/timer.cpp | 7 +------
- 1 files changed, 1 insertions(+), 6 deletions(-)
+ 1 file changed, 1 insertion(+), 6 deletions(-)
 
 commit 5bb72a9e528b13fff95ceedd3579082a38604a67
 Author: Martin Lambers <marlam@marlam.de>
@@ -2173,7 +2852,7 @@
 Windows: update build instructions.
 
 README.Windows | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit b4e8a0749e8590d91ac7daca97b931fe1d4968f2
 Author: Martin Lambers <marlam@marlam.de>
@@ -2182,7 +2861,7 @@
 Clean up loops to avoid compiler warnings.
 
 src/media_input.cpp | 45 ++++++++++++++++++---------------------------
- 1 files changed, 18 insertions(+), 27 deletions(-)
+ 1 file changed, 18 insertions(+), 27 deletions(-)
 
 commit 0b8bb1d8313fee27a56eaff394a066d35d15be0e
 Author: Frédéric Devernay <frederic.devernay@inrialpes.fr>
@@ -2191,7 +2870,7 @@
 Update fr.po.
 
 po/fr.po | 802 +++++++++++++++++++++++++++++++++++++++++---------------------
- 1 files changed, 528 insertions(+), 274 deletions(-)
+ 1 file changed, 528 insertions(+), 274 deletions(-)
 
 commit c5d5d82639348e77ef2b776407e80a0d9cf0454a
 Author: Martin Lambers <marlam@marlam.de>
@@ -2200,7 +2879,7 @@
 Update AUTHORS file.
 
 AUTHORS | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 89c80a75f5e685d400bfbdfa197df64301c9c02e
 Author: Alexey Osipov <simba@lerlan.ru>
@@ -2209,7 +2888,7 @@
 Update ru.po.
 
 po/ru.po | 812 ++++++++++++++++++++++++++++++++++++++++----------------------
- 1 files changed, 531 insertions(+), 281 deletions(-)
+ 1 file changed, 531 insertions(+), 281 deletions(-)
 
 commit 3411dab55e1a0dc2d6867e028877ce23812991a5
 Author: Alexey Osipov <simba@lerlan.ru>
@@ -2221,7 +2900,7 @@
 See <http://lists.gnu.org/archive/html/bino-list/2011-08/msg00019.html>.
 
 src/media_object.cpp | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
+ 1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 768d2e5910b70d930959143141d81f51e0337bdb
 Author: Martin Lambers <marlam@marlam.de>
@@ -2230,7 +2909,7 @@
 Update de.po.
 
 po/de.po | 33 ++++++++++++++++++++++++++++++++-
- 1 files changed, 32 insertions(+), 1 deletions(-)
+ 1 file changed, 32 insertions(+), 1 deletion(-)
 
 commit 866006a65e7558ed9a94813005da952a2d979aa6
 Author: Alexey Osipov <simba@lerlan.ru>
@@ -2239,7 +2918,7 @@
 Add lirc.cpp to list of translatable files.
 
 po/POTFILES.in | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 9fc6061805e77f326ab71451c217618477f4bf20
 Author: Kiavash Faraji <kiavash.faraji@yahoo.com>
@@ -2248,7 +2927,7 @@
 Linux: update information on known problems with free graphics drivers.
 
 README.Linux | 9 ++++-----
- 1 files changed, 4 insertions(+), 5 deletions(-)
+ 1 file changed, 4 insertions(+), 5 deletions(-)
 
 commit 53b147f09b9e233090b2623bc731b4a187ef8d74
 Author: Martin Lambers <marlam@marlam.de>
@@ -2257,7 +2936,7 @@
 Manual: fix typo.
 
 doc/bino.texi | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d51c6b4f01d7facf77ca780383be7a55ab307cb4
 Author: Martin Lambers <marlam@marlam.de>
@@ -2266,7 +2945,7 @@
 Distribute README.Linux.
 
 Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a362bfa7c69069a31afafd7f2b7d8015dd2a09e6
 Author: Martin Lambers <marlam@marlam.de>
@@ -2314,7 +2993,7 @@
 Update de.po.
 
 po/de.po | 26 +++++++++++++++-----------
- 1 files changed, 15 insertions(+), 11 deletions(-)
+ 1 file changed, 15 insertions(+), 11 deletions(-)
 
 commit 49388466c7f521e10a682a7237f73ebc72e74576
 Author: Martin Lambers <marlam@marlam.de>
@@ -2327,7 +3006,7 @@
 necessary for --help/--version or for Equalizer nodes.
 
 src/main.cpp | 39 ++++++++++++++++++++++++++-------------
- 1 files changed, 26 insertions(+), 13 deletions(-)
+ 1 file changed, 26 insertions(+), 13 deletions(-)
 
 commit 2d56d7003a4241680d23b9c29e6bbe8c83e1a9b1
 Author: Martin Lambers <marlam@marlam.de>
@@ -2336,7 +3015,7 @@
 Update de.po.
 
 po/de.po | 449 +++++++++++++++++++++++++++++++-------------------------------
- 1 files changed, 227 insertions(+), 222 deletions(-)
+ 1 file changed, 227 insertions(+), 222 deletions(-)
 
 commit f7e233001b4f84864d2ce55ede83defa7e8b65ab
 Author: Martin Lambers <marlam@marlam.de>
@@ -2345,7 +3024,7 @@
 Remove obsolete source file from list of translatable files.
 
 po/POTFILES.in | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ 1 file changed, 1 deletion(-)
 
 commit 432d1bf74e7e1632926afee047601970c36bd77e
 Author: Martin Lambers <marlam@marlam.de>
@@ -2354,7 +3033,7 @@
 Manual: document support for the Matroska/WebM StereoMode field.
 
 doc/bino.texi | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 902792e5841ce25688056ed22ada52805965058a
 Author: Martin Lambers <marlam@marlam.de>
@@ -2375,7 +3054,7 @@
 
 src/Makefile.am | 1 -
 src/lib_versions.cpp | 7 ----
- src/main.cpp | 37 ++++++++++++++++++-
+ src/main.cpp | 37 +++++++++++++++++--
 src/player_qt.cpp | 8 +----
 src/player_qt.h | 1 -
 src/qt_app.cpp | 92 -----------------------------------------------
@@ -2391,7 +3070,7 @@
 Media object: add support for the Matroska StereoMode metadata.
 
 src/media_object.cpp | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 56 insertions(+), 0 deletions(-)
+ 1 file changed, 56 insertions(+)
 
 commit a32e6a3d072da77fc4954c9d3a07f25db096ee65
 Author: Martin Lambers <marlam@marlam.de>
@@ -2400,7 +3079,7 @@
 Bump version to 1.1.3.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b69451ac8f90efab615e084c4d71bbe4192dde9d
 Author: Martin Lambers <marlam@marlam.de>
@@ -2465,7 +3144,7 @@
 Manual: add full table of contents.
 
 doc/bino.texi | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 77faafb7e756d4fba1899ffefae75071ed5b0f19
 Author: Martin Lambers <marlam@marlam.de>
@@ -2474,7 +3153,7 @@
 Relax license of selfmade icons.
 
 src/icons-local/README | 15 +++------------
- 1 files changed, 3 insertions(+), 12 deletions(-)
+ 1 file changed, 3 insertions(+), 12 deletions(-)
 
 commit 2359c4ceba093bf9c2a578bc4a4156180e733b6f
 Author: Martin Lambers <marlam@marlam.de>
@@ -2482,7 +3161,7 @@
 
 Manual: add images and explanations, and restructure some sections.
 
- doc/Makefile.am | 34 ++-
+ doc/Makefile.am | 34 +-
 doc/bino.texi | 604 ++++++++++++++++++------------
 doc/input-layout-bottom-top-half.png | 1 +
 doc/input-layout-bottom-top.png | 1 +
@@ -2521,7 +3200,7 @@
 
 GUI: add mini-icons to the entries in the input/output comboboxes.
 
- src/Makefile.am | 38 ++-
+ src/Makefile.am | 38 +-
 src/icons-local/README | 21 +
 src/icons-local/input-layout-bottom-top-half.ipe | 253 +++++++++
 src/icons-local/input-layout-bottom-top-half.png | Bin 0 -> 468 bytes
@@ -2581,7 +3260,7 @@
 src/icons-local/output-type-top-bottom-half.png | Bin 0 -> 471 bytes
 src/icons-local/output-type-top-bottom.ipe | 260 +++++++++
 src/icons-local/output-type-top-bottom.png | Bin 0 -> 649 bytes
- src/player_qt.cpp | 76 ++--
+ src/player_qt.cpp | 76 +--
 61 files changed, 7946 insertions(+), 40 deletions(-)
 
 commit a5643dbc8a231393bbed004fb3ef3611873caf4b
@@ -2591,7 +3270,7 @@
 Linux: document known problems with free graphics drivers.
 
 README.Linux | 20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
+ 1 file changed, 20 insertions(+)
 
 commit 8948d1c8d3700911f26fa0aef3248a899ce8708d
 Author: Martin Lambers <marlam@marlam.de>
@@ -2600,7 +3279,7 @@
 Windows: fix fullscreen on more than one screen.
 
 src/video_output_qt.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit a2b94ddb570c0c116987beab7ea3dd78dc333c70
 Author: Martin Lambers <marlam@marlam.de>
@@ -2609,7 +3288,7 @@
 Windows: always include latest translations in installer.
 
 Makefile.am | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 09044aa98a7d2e04ee8d6f14d2806d4d78d5a35f
 Author: Martin Lambers <marlam@marlam.de>
@@ -2620,7 +3299,7 @@
 This prevents the last subtitle to pop up in a new video.
 
 src/player.cpp | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
 
 commit 99991e36617615a9a24d1f50890146a7a01404cb
 Author: Martin Lambers <marlam@marlam.de>
@@ -2629,7 +3308,7 @@
 Video output: clear video area when deinitializing.
 
 src/video_output.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 4961006e6785f3711c4fbd836fa1c81f39cd3e18
 Author: Martin Lambers <marlam@marlam.de>
@@ -2652,7 +3331,7 @@
 
 Subtitle renderer: minor cleanup.
 
- src/subtitle_renderer.cpp | 149 ++++++++++++++++++--------------------------
+ src/subtitle_renderer.cpp | 149 +++++++++++++++++++--------------------------
 src/subtitle_renderer.h | 4 +-
 2 files changed, 63 insertions(+), 90 deletions(-)
 
@@ -2663,7 +3342,7 @@
 Make subtitle renderer initialization safer in case of thread cancellation.
 
 src/subtitle_renderer.cpp | 24 ++++++++++++++++--------
- 1 files changed, 16 insertions(+), 8 deletions(-)
+ 1 file changed, 16 insertions(+), 8 deletions(-)
 
 commit eaf256dfcda53ec5c50a36e2f5431b403fece0bd
 Author: Martin Lambers <marlam@marlam.de>
@@ -2671,8 +3350,8 @@
 
 Update de.po.
 
- po/de.po | 74 +++++++++++++++++++++++++++++++++++--------------------------
- 1 files changed, 42 insertions(+), 32 deletions(-)
+ po/de.po | 74 +++++++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 42 insertions(+), 32 deletions(-)
 
 commit 381a4ade2d43e3708ebff79f9725d918aee860b2
 Author: Martin Lambers <marlam@marlam.de>
@@ -2690,10 +3369,10 @@
 
 src/base/thread.cpp | 17 +++++++++-
 src/base/thread.h | 9 +++++
- src/player.cpp | 4 ++
- src/player_equalizer.cpp | 24 +++++++++++++
+ src/player.cpp | 4 +++
+ src/player_equalizer.cpp | 24 ++++++++++++++
 src/subtitle_renderer.cpp | 81 +++++++++++++++++++++++++++++++++++----------
- src/subtitle_renderer.h | 31 ++++++++++++++++-
+ src/subtitle_renderer.h | 31 +++++++++++++++--
 src/video_output.cpp | 1 +
 src/video_output.h | 7 +++-
 src/video_output_qt.cpp | 56 +++++++++++++++++++++++++++++++
@@ -2717,7 +3396,7 @@
 Fullscreen mode: always re-grab focus after switching.
 
 src/video_output_qt.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 517a0ba33833427940fac3878cf0c8fde8fdd38e
 Author: Martin Lambers <marlam@marlam.de>
@@ -2726,7 +3405,7 @@
 Relax FFmpeg/Libav requirement to Libav >= 0.7 or FFmpeg >= 0.7.
 
 configure.ac | 18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
+ 1 file changed, 9 insertions(+), 9 deletions(-)
 
 commit 38a8087976b9831e3ab3d60e54276b3c2af85255
 Author: Martin Lambers <marlam@marlam.de>
@@ -2735,7 +3414,7 @@
 Tweak display of elapsed time / duration.
 
 src/base/str.cpp | 6 +-----
- 1 files changed, 1 insertions(+), 5 deletions(-)
+ 1 file changed, 1 insertion(+), 5 deletions(-)
 
 commit f2f826e881fc575ce8f3f0068719ffc2c1cc83dd
 Author: Martin Lambers <marlam@marlam.de>
@@ -2769,7 +3448,7 @@
 Update de.po.
 
 po/de.po | 698 +++++++++++++++++++++++++++++++++++++++-----------------------
- 1 files changed, 440 insertions(+), 258 deletions(-)
+ 1 file changed, 440 insertions(+), 258 deletions(-)
 
 commit 762c7a9296fca91387f14d57638fe1a4327b7ab3
 Author: Martin Lambers <marlam@marlam.de>
@@ -2778,7 +3457,7 @@
 Update NEWS.
 
 NEWS | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 5cae17c529018ea8b1cc49e2b40a95e33ab00b13
 Author: Martin Lambers <marlam@marlam.de>
@@ -2788,7 +3467,7 @@
 
 src/base/str.cpp | 20 +++++++++++++
 src/base/str.h | 1 +
- src/player_qt.cpp | 82 +++++++++++++++++++++++++++++++++++-----------------
+ src/player_qt.cpp | 82 +++++++++++++++++++++++++++++++++++------------------
 src/player_qt.h | 4 ++-
 4 files changed, 79 insertions(+), 28 deletions(-)
 
@@ -2798,8 +3477,8 @@
 
 Update to libav >= 0.7 / FFmpeg >= 0.8.
 
- configure.ac | 18 ++++++++--------
- src/media_object.cpp | 55 +++++++++++++++----------------------------------
+ configure.ac | 18 ++++++++---------
+ src/media_object.cpp | 55 ++++++++++++++++----------------------------------
 2 files changed, 26 insertions(+), 47 deletions(-)
 
 commit 03e37d8dc5f4d09c805b284350b78e6d45340622
@@ -2820,7 +3499,7 @@
 
 src/video_output_qt.cpp | 37 +++++++++++++++++++++++++++++++++++++
 src/video_output_qt.h | 2 ++
- 2 files changed, 39 insertions(+), 0 deletions(-)
+ 2 files changed, 39 insertions(+)
 
 commit 448a12a68a5722ddfe38d92b29e13e34a60c4a58
 Author: Martin Lambers <marlam@marlam.de>
@@ -2828,8 +3507,8 @@
 
 Media object: ignore unsupported streams instead of failing.
 
- src/media_object.cpp | 70 +++++++++++++++----------------------------------
- 1 files changed, 22 insertions(+), 48 deletions(-)
+ src/media_object.cpp | 70 ++++++++++++++++----------------------------------
+ 1 file changed, 22 insertions(+), 48 deletions(-)
 
 commit ca2bf05dbdef0ff5d79723501434e5844acff4c5
 Author: Martin Lambers <marlam@marlam.de>
@@ -2859,7 +3538,7 @@
 
 Makefile.am | 2 +-
 TODO | 32 --------------------------------
- 2 files changed, 1 insertions(+), 33 deletions(-)
+ 2 files changed, 1 insertion(+), 33 deletions(-)
 
 commit 90bea74c2aef13667baa2a25215c45d89bdcfc53
 Author: Martin Lambers <marlam@marlam.de>
@@ -2868,7 +3547,7 @@
 Windows: update and simplify build instructions.
 
 README.Windows | 100 ++++----------------------------------------------------
- 1 files changed, 7 insertions(+), 93 deletions(-)
+ 1 file changed, 7 insertions(+), 93 deletions(-)
 
 commit 8df7a6f1bd994002a4dca6e7d7112e012434228d
 Author: Martin Lambers <marlam@marlam.de>
@@ -2887,7 +3566,7 @@
 configure: add -pthread option only if the compiler supports it.
 
 configure.ac | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
 
 commit 569e6657c5a0d5473d24be9e57754621dbfab8c2
 Author: Martin Lambers <marlam@marlam.de>
@@ -2899,7 +3578,7 @@
 
 src/player.cpp | 1 +
 src/video_output_qt.cpp | 2 +-
- 2 files changed, 2 insertions(+), 1 deletions(-)
+ 2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit 5188292ae04f90fe4ff39451b57f97fc21151b77
 Author: Martin Lambers <marlam@marlam.de>
@@ -2908,7 +3587,7 @@
 Fix compilation with older gcc releases.
 
 src/video_output.cpp | 24 ++++++++++++++++--------
- 1 files changed, 16 insertions(+), 8 deletions(-)
+ 1 file changed, 16 insertions(+), 8 deletions(-)
 
 commit d7a2566be5606fc288d23d9ffe8a86e5686c6472
 Author: Martin Lambers <marlam@marlam.de>
@@ -2917,7 +3596,7 @@
 GUI: stop timer before exiting.
 
 src/player_qt.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit 178d4e6f5cedecd08b961a745470ec6a0decc391
 Author: Martin Lambers <marlam@marlam.de>
@@ -2927,7 +3606,7 @@
 
 src/player.h | 4 ++++
 src/player_qt.cpp | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit aa2aa2d9837cb9e8bbe31ed11c6f94bda149c86f
 Author: Martin Lambers <marlam@marlam.de>
@@ -2935,9 +3614,9 @@
 
 LIRC: improve the set of commands, and make it work when the player is stopped.
 
- doc/bino.texi | 10 ++++---
- src/lirc.cpp | 74 +++++++++++++++++++++++++++++++++++++++++++++-------
- src/lirc.h | 8 +++++
+ doc/bino.texi | 10 +++++---
+ src/lirc.cpp | 74 +++++++++++++++++++++++++++++++++++++++++++++--------
+ src/lirc.h | 8 ++++++
 src/player_qt.cpp | 32 +++++++++++++----------
 src/player_qt.h | 1 +
 5 files changed, 97 insertions(+), 28 deletions(-)
@@ -2951,18 +3630,18 @@
 NEWS | 2 +-
 doc/bino.1 | 15 ++-
 doc/bino.texi | 29 +++--
- src/controller.h | 12 ++-
- src/main.cpp | 50 +++++++-
+ src/controller.h | 12 +-
+ src/main.cpp | 50 ++++++--
 src/media_data.cpp | 38 +++++-
 src/media_data.h | 6 +-
- src/player.cpp | 47 +++++++-
+ src/player.cpp | 47 ++++++--
 src/player_equalizer.cpp | 1 +
 src/player_qt.cpp | 246 ++++++++++++++++++++++++++++++++++-----
 src/video_output.cpp | 99 +++++++++++-----
 src/video_output.h | 1 +
 src/video_output_qt.cpp | 78 +++++++++++--
 src/video_output_qt.h | 5 +-
- src/video_output_render.fs.glsl | 32 +++---
+ src/video_output_render.fs.glsl | 32 ++---
 15 files changed, 539 insertions(+), 122 deletions(-)
 
 commit 96ab59272883a1c94227dec88b9198e676ea73c8
@@ -2972,7 +3651,7 @@
 Base module opt: allow empty tuples.
 
 src/base/opt.h | 33 ++++++++++++++++++---------------
- 1 files changed, 18 insertions(+), 15 deletions(-)
+ 1 file changed, 18 insertions(+), 15 deletions(-)
 
 commit 559aa8e9305f894d08d730e8eb25b820c21e083d
 Author: Martin Lambers <marlam@marlam.de>
@@ -2981,7 +3660,7 @@
 GUI: re-establish keyboard focus after leaving fullscreen mode.
 
 src/video_output_qt.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit e4a297e02b45e4d2bfef14240ad50e244ea80bbf
 Author: Martin Lambers <marlam@marlam.de>
@@ -2990,7 +3669,7 @@
 Manual: improve section on LIRC support.
 
 doc/bino.texi | 31 ++++++++++++++++---------------
- 1 files changed, 16 insertions(+), 15 deletions(-)
+ 1 file changed, 16 insertions(+), 15 deletions(-)
 
 commit 457da87669bc20ac51e9e0b71415387cb8b925bb
 Author: Martin Lambers <marlam@marlam.de>
@@ -2999,7 +3678,7 @@
 GUI: focus the Play button after opening a file.
 
 src/player_qt.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 9bb0d74d8eb6647ef2b01c029ec1e6c30a8957a8
 Author: Martin Lambers <marlam@marlam.de>
@@ -3012,7 +3691,7 @@
 not available.
 
 src/video_output.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit ddaa4a614bd9ca866e54fd5ee4ea5ff09bf937b2
 Author: Martin Lambers <marlam@marlam.de>
@@ -3038,7 +3717,7 @@
 
 src/video_output_qt.cpp | 18 ++++++++++++++++++
 src/video_output_qt.h | 2 ++
- 2 files changed, 20 insertions(+), 0 deletions(-)
+ 2 files changed, 20 insertions(+)
 
 commit c55e028d0bf0b4c7f152f843951fc9b15ad75753
 Author: Martin Lambers <marlam@marlam.de>
@@ -3047,7 +3726,7 @@
 Update NEWS.
 
 NEWS | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 757f04ca34cf2a887aac61f9d949b7a37dbb646b
 Author: Martin Lambers <marlam@marlam.de>
@@ -3056,7 +3735,7 @@
 Enable Equalizer by default.
 
 configure.ac | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
+ 1 file changed, 5 insertions(+), 3 deletions(-)
 
 commit 91d18e43780e30af760c7193ed08ace3ea09fbb3
 Author: Martin Lambers <marlam@marlam.de>
@@ -3076,7 +3755,7 @@
 
 Add LIRC support.
 
- configure.ac | 31 +++++++-
+ configure.ac | 31 ++++++-
 doc/bino.1 | 2 +
 doc/bino.texi | 62 ++++++++++++++
 src/Makefile.am | 6 ++
@@ -3086,7 +3765,7 @@
 src/lirc.h | 56 +++++++++++++
 src/main.cpp | 28 +++++++
 src/player.cpp | 2 +
- 10 files changed, 438 insertions(+), 1 deletions(-)
+ 10 files changed, 438 insertions(+), 1 deletion(-)
 
 commit 3f5bd9ed540af47298a69c9f1d473dedc5cda234
 Author: Martin Lambers <marlam@marlam.de>
@@ -3104,7 +3783,7 @@
 src/audio_output.h | 2 +-
 src/controller.cpp | 118 +++++++++++++++++++++++++++++++++++++++++++---
 src/controller.h | 40 ++++++++++++----
- src/player.cpp | 103 ++++++++++++++++------------------------
+ src/player.cpp | 103 +++++++++++++++++-----------------------
 src/player.h | 9 ----
 src/player_equalizer.cpp | 4 +-
 src/player_qt.cpp | 4 +-
@@ -3120,7 +3799,7 @@
 Fix stupid compile error.
 
 src/base/str.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 519336446a4b1f20b596d5c6265bef8dadb8b888
 Author: Martin Lambers <marlam@marlam.de>
@@ -3130,7 +3809,7 @@
 
 src/base/str.cpp | 17 +++++++++++++++++
 src/base/str.h | 3 +++
- 2 files changed, 20 insertions(+), 0 deletions(-)
+ 2 files changed, 20 insertions(+)
 
 commit dc8b561e84215e9a0dda5600977379f63f54ecd5
 Author: Martin Lambers <marlam@marlam.de>
@@ -3141,7 +3820,7 @@
 This is now tested on GNU/Linux.
 
 src/media_object.cpp | 12 +++++-------
- 1 files changed, 5 insertions(+), 7 deletions(-)
+ 1 file changed, 5 insertions(+), 7 deletions(-)
 
 commit 8f75fd137042f7df8ba2e238d85ec64997d7b503
 Author: Martin Lambers <marlam@marlam.de>
@@ -3150,7 +3829,7 @@
 Documentation: add note about FFmpeg features required for device support.
 
 doc/bino.texi | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
 
 commit 5be91fef8b90501a069ecd97dc4d9101560964cf
 Author: Martin Lambers <marlam@marlam.de>
@@ -3160,7 +3839,7 @@
 
 doc/bino.texi | 19 +++++++++++++++++++
 src/player_qt.cpp | 2 +-
- 2 files changed, 20 insertions(+), 1 deletions(-)
+ 2 files changed, 20 insertions(+), 1 deletion(-)
 
 commit 36a492daf65e307fad898e417c08a727ad8d74b5
 Author: Martin Lambers <marlam@marlam.de>
@@ -3179,7 +3858,7 @@
 GUI: improve tool tips in File->Open device dialog.
 
 src/player_qt.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 44429232f229faf2cedd98b6e250f42793dc8a95
 Author: Martin Lambers <marlam@marlam.de>
@@ -3188,7 +3867,7 @@
 GUI: improve check for OS in Help->Manual.
 
 src/player_qt.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 664bb1b048eab85690ba0b23585a29d56ade9ae9
 Author: Martin Lambers <marlam@marlam.de>
@@ -3197,7 +3876,7 @@
 GUI: improve screen selector for fullscreen mode.
 
 src/player_qt.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 324298fd9bbb2a2f105f49077de87c01f6f38bb2
 Author: Martin Lambers <marlam@marlam.de>
@@ -3206,7 +3885,7 @@
 GUI: make fullscreen button available as soon as a file is opened.
 
 src/player_qt.cpp | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
+ 1 file changed, 5 insertions(+), 3 deletions(-)
 
 commit 2b680bb8b8e6296458222599a5382c0164d3de1f
 Author: Martin Lambers <marlam@marlam.de>
@@ -3218,7 +3897,7 @@
 when fullscreen mode uses a different screen.
 
 src/player_qt.cpp | 17 ++++++++++++++++-
- 1 files changed, 16 insertions(+), 1 deletions(-)
+ 1 file changed, 16 insertions(+), 1 deletion(-)
 
 commit 78e93223cb08a18c6a915f928bbd14aa7e445c1f
 Author: Martin Lambers <marlam@marlam.de>
@@ -3227,7 +3906,7 @@
 GUI: always remember fullscreen screen setting.
 
 src/player_qt.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 5b768874c5c8a0052c6f7ba77d48950595bcb2b7
 Author: Martin Lambers <marlam@marlam.de>
@@ -3236,7 +3915,7 @@
 Fullscreen screen selector: minor fix when the number of screens changes between runs.
 
 src/player_qt.cpp | 9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
+ 1 file changed, 8 insertions(+), 1 deletion(-)
 
 commit 5826178a17f9bda0b2849cc4735e6d7dd2287caa
 Author: Martin Lambers <marlam@marlam.de>
@@ -3244,19 +3923,19 @@
 
 Allow to select the screen for fullscreen mode.
 
- doc/bino.1 | 3 ++
- doc/bino.texi | 3 ++
- src/controller.h | 2 +
- src/main.cpp | 5 ++++
- src/media_data.cpp | 9 +++++++-
+ doc/bino.1 | 3 +++
+ doc/bino.texi | 3 +++
+ src/controller.h | 2 ++
+ src/main.cpp | 5 +++++
+ src/media_data.cpp | 9 ++++++++-
 src/media_data.h | 1 +
- src/player.cpp | 11 ++++++++-
- src/player_equalizer.cpp | 4 +-
+ src/player.cpp | 11 ++++++++--
+ src/player_equalizer.cpp | 4 ++--
 src/player_qt.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++++++
 src/player_qt.h | 1 +
- src/video_output.h | 4 +-
- src/video_output_qt.cpp | 15 +++++++++++--
- src/video_output_qt.h | 4 +-
+ src/video_output.h | 4 ++--
+ src/video_output_qt.cpp | 15 +++++++++++---
+ src/video_output_qt.h | 4 ++--
 13 files changed, 100 insertions(+), 12 deletions(-)
 
 commit 1066898f46ebfbd7db6cd6fb5f385963bc91c272
@@ -3266,7 +3945,7 @@
 GUI: properly open devices that were given on the command line.
 
 src/player_qt.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 81008dd5af11dac86650faf48087fb8cfbf09c82
 Author: Martin Lambers <marlam@marlam.de>
@@ -3275,7 +3954,7 @@
 GUI: fix cancel / ok button order in File->Open URL.
 
 src/player_qt.cpp | 9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
+ 1 file changed, 5 insertions(+), 4 deletions(-)
 
 commit bef1512d149922f51b14c7315af9033f1df8998f
 Author: Martin Lambers <marlam@marlam.de>
@@ -3290,7 +3969,7 @@
 src/main.cpp | 23 +++++-
 src/media_data.h | 3 +-
 src/media_object.cpp | 193 +++++++++++++++++++++++++++-----------------------
- src/player_qt.cpp | 101 ++++++++++++++++++++-------
+ src/player_qt.cpp | 101 +++++++++++++++++++-------
 src/player_qt.h | 10 ++-
 7 files changed, 215 insertions(+), 119 deletions(-)
 
@@ -3305,14 +3984,14 @@
 src/main.cpp | 16 +++++-
 src/media_data.cpp | 30 ++++++++++
 src/media_data.h | 30 ++++++++++
- src/media_input.cpp | 8 ++--
+ src/media_input.cpp | 8 +--
 src/media_input.h | 2 +-
 src/media_object.cpp | 28 ++++++++--
 src/media_object.h | 2 +-
- src/player.cpp | 8 ++--
+ src/player.cpp | 8 +--
 src/player.h | 2 +-
 src/player_qt.cpp | 148 +++++++++++++++++++++++++++++++++++++++-----------
- src/player_qt.h | 24 ++++++++-
+ src/player_qt.h | 24 +++++++-
 13 files changed, 258 insertions(+), 48 deletions(-)
 
 commit e83b858eaad24e611fe2918b1d5ce1e2005f3a8c
@@ -3322,7 +4001,7 @@
 List libavdevice version in library version information.
 
 src/lib_versions.cpp | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 commit b5946dadb1e2f33fcde964d65ede7e37816eb6fe
 Author: Martin Lambers <marlam@marlam.de>
@@ -3333,7 +4012,7 @@
 Use parameters only if strictly necessary.
 
 src/media_object.cpp | 14 +++++++++-----
- 1 files changed, 9 insertions(+), 5 deletions(-)
+ 1 file changed, 9 insertions(+), 5 deletions(-)
 
 commit 5ff881cc1a334825d7b277f255b489706868732b
 Author: Martin Lambers <marlam@marlam.de>
@@ -3344,7 +4023,7 @@
 The BSD code is still untested.
 
 src/media_object.cpp | 15 ++++++++++++++-
- 1 files changed, 14 insertions(+), 1 deletions(-)
+ 1 file changed, 14 insertions(+), 1 deletion(-)
 
 commit bf6de50910c563ebbb1571d5b3cab67b1e592310
 Author: Martin Lambers <marlam@marlam.de>
@@ -3355,7 +4034,7 @@
 This partially reverts ee5bf86e505f4a8489df6f8b6b399671823c5220.
 
 configure.ac | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit a04749b3db8c033986b5421aca472ee5fcfd072d
 Author: Martin Lambers <marlam@marlam.de>
@@ -3366,7 +4045,7 @@
 src/Makefile.am | 1 +
 src/icons/camera-web.png | Bin 0 -> 3441 bytes
 src/player_qt.cpp | 64 +++++++++++++++++++++++++++++++++++++++++++++-
- src/player_qt.h | 3 +-
+ src/player_qt.h | 3 ++-
 4 files changed, 66 insertions(+), 2 deletions(-)
 
 commit 85dc69f931266096621bcb5258c6ae263bf851b3
@@ -3395,7 +4074,7 @@
 Video output: remove code that had no effect.
 
 src/video_output.cpp | 13 +------------
- 1 files changed, 1 insertions(+), 12 deletions(-)
+ 1 file changed, 1 insertion(+), 12 deletions(-)
 
 commit ee5bf86e505f4a8489df6f8b6b399671823c5220
 Author: Martin Lambers <marlam@marlam.de>
@@ -3407,7 +4086,7 @@
 the manual pages.
 
 configure.ac | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 6ec5b63e9060cb122b61a742e611a90c17d8579b
 Author: Martin Lambers <marlam@marlam.de>
@@ -3419,7 +4098,7 @@
 pressing "play".
 
 src/player_qt.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5f48363d022ac05960b54f6c54fc2e4bb937ea42
 Author: Martin Lambers <marlam@marlam.de>
@@ -3440,7 +4119,7 @@
 Also clear all members on closing, not just the FFmpeg stuff.
 
 src/media_object.cpp | 172 ++++++++++++++++++++++++++------------------------
- 1 files changed, 89 insertions(+), 83 deletions(-)
+ 1 file changed, 89 insertions(+), 83 deletions(-)
 
 commit aac1aa089008a843559f38e6f657d58e72994119
 Author: Martin Lambers <marlam@marlam.de>
@@ -3449,7 +4128,7 @@
 Update TODO.
 
 TODO | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit c3167b591a3dfaeb9405a4aaee70657de07cbd7c
 Author: Martin Lambers <marlam@marlam.de>
@@ -3458,7 +4137,7 @@
 Print proper signal description when catching a signal.
 
 src/base/dbg.cpp | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit f682325625ec0ddbd6bbc565581d47ee7eba214e
 Author: Martin Lambers <marlam@marlam.de>
@@ -3468,7 +4147,7 @@
 
 AUTHORS | 3 +++
 configure.ac | 2 +-
- 2 files changed, 4 insertions(+), 1 deletions(-)
+ 2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit ecb3dd53a5df13036a3e80bf18900145b9fd20bb
 Author: Martin Lambers <marlam@marlam.de>
@@ -3481,14 +4160,14 @@
 doc/bino.1 | 4 ++-
 doc/bino.texi | 5 +++-
 src/Makefile.am | 1 +
- src/controller.h | 6 +++-
+ src/controller.h | 6 +++--
 src/icons/media-playlist-repeat.png | Bin 0 -> 2872 bytes
- src/main.cpp | 8 ++++-
- src/media_data.cpp | 6 +++-
+ src/main.cpp | 8 ++++--
+ src/media_data.cpp | 6 ++++-
 src/media_data.h | 7 +++++
- src/player.cpp | 30 ++++++++++++++++++++-
+ src/player.cpp | 30 ++++++++++++++++++++--
 src/player_qt.cpp | 48 +++++++++++++++++++++++++++--------
- src/player_qt.h | 2 +
+ src/player_qt.h | 2 ++
 11 files changed, 97 insertions(+), 20 deletions(-)
 
 commit 09f2da198678465215a1dbd87e5d74c4cde40c5d
@@ -3499,8 +4178,8 @@
 
 po/cs.po | 323 +++++++++++++++++++++++++++++++-------------------------------
 po/de.po | 317 ++++++++++++++++++++++++++++++------------------------------
- po/fr.po | 257 +++++++++++++++++++++++++-------------------------
- po/pl.po | 257 +++++++++++++++++++++++++-------------------------
+ po/fr.po | 257 +++++++++++++++++++++++++------------------------
+ po/pl.po | 257 +++++++++++++++++++++++++------------------------
 po/ru.po | 265 +++++++++++++++++++++++++--------------------------
 5 files changed, 707 insertions(+), 712 deletions(-)
 
@@ -3531,7 +4210,7 @@
 Mac OS X: update icons for application bundle.
 
 pkg/macosx/Bino.icns | Bin 29307 -> 162673 bytes
- 1 files changed, 0 insertions(+), 0 deletions(-)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit ef0e76ba470f24ae11887b9b3a2ff0c01ab834a5
 Author: Martin Lambers <marlam@marlam.de>
@@ -3540,7 +4219,7 @@
 Windows: update build instructions.
 
 README.Windows | 18 +++++++-----------
- 1 files changed, 7 insertions(+), 11 deletions(-)
+ 1 file changed, 7 insertions(+), 11 deletions(-)
 
 commit 851d2fca5a278ffef13deb79e89a8d6206c4bfb0
 Author: Martin Lambers <marlam@marlam.de>
@@ -3573,7 +4252,7 @@
 scaled, instead of the buttons themselves.
 
 src/player_qt.cpp | 14 ++++++++++----
- 1 files changed, 10 insertions(+), 4 deletions(-)
+ 1 file changed, 10 insertions(+), 4 deletions(-)
 
 commit 6df88a12e3807b5ad97d6eb2928332b5ce4a8271
 Author: Martin Lambers <marlam@marlam.de>
@@ -3586,7 +4265,7 @@
 quit.
 
 src/video_output_qt.cpp | 22 +++++++---------------
- 1 files changed, 7 insertions(+), 15 deletions(-)
+ 1 file changed, 7 insertions(+), 15 deletions(-)
 
 commit ac84c5f0f614911a60c1c9a374015bd8cb91ec1e
 Author: Martin Lambers <marlam@marlam.de>
@@ -3646,7 +4325,7 @@
 Tweak information for translators.
 
 ABOUT-NLS | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit 3bfcd57fbe7ef452dc5bcf9c03309a4210933eec
 Author: Joe <cuchac@email.cz>
@@ -3655,7 +4334,7 @@
 Update cs.po.
 
 po/cs.po | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit d27f392159a78f030d4523281b3ec0c865a534f3
 Author: Martin Lambers <marlam@marlam.de>
@@ -3665,7 +4344,7 @@
 
 Makefile.am | 2 +-
 TODO | 32 ++++++++++++++++++++++++++++++++
- 2 files changed, 33 insertions(+), 1 deletions(-)
+ 2 files changed, 33 insertions(+), 1 deletion(-)
 
 commit bc6df0ee3f7051bbe7c3104e4133e4cd099ada96
 Author: Frédéric Devernay <frederic.devernay@inrialpes.fr>
@@ -3674,7 +4353,7 @@
 GUI: set Qt menu roles, for better behaviour on Mac OS X.
 
 src/player_qt.cpp | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 commit 5bdccfddccbc01019693f17b11f222ed0a17f1d1
 Author: Frédéric Devernay <frederic.devernay@inrialpes.fr>
@@ -3694,7 +4373,7 @@
 Subtitles: properly handle newlines in text format subtitles.
 
 src/subtitle_renderer.cpp | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 6e3b65e0c2d5c71325179ee37e7db31fa4ca87a4
 Author: Vittorio Giovara <vittorio.giovara@sisveltech.com>
@@ -3703,7 +4382,7 @@
 Update AUTHORS.
 
 AUTHORS | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit caeabc2ce403589a0fc91ef401e27a25979fc3e1
 Author: Vittorio Giovara <vittorio.giovara@sisveltech.com>
@@ -3712,7 +4391,7 @@
 Media object: replace obsolete libavformat constants.
 
 src/media_object.cpp | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 657e3dd98ec6dd8834b80cfb24746119415016a1
 Author: Martin Lambers <marlam@marlam.de>
@@ -3721,7 +4400,7 @@
 Sleep in pause mode.
 
 src/player.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ecdcb92c4275bfa33e916b1e5db30e0d445134ca
 Author: Martin Lambers <marlam@marlam.de>
@@ -3756,7 +4435,7 @@
 translated dialog.
 
 src/player_qt.cpp | 14 +++-----------
- 1 files changed, 3 insertions(+), 11 deletions(-)
+ 1 file changed, 3 insertions(+), 11 deletions(-)
 
 commit 10e493e2e4f544bddbc8a673bcf6bf72789ad96c
 Author: Martin Lambers <marlam@marlam.de>
@@ -3765,7 +4444,7 @@
 Windows: update, simplify and fix the installer.
 
 pkg/w32/bino.nsi | 96 ++++++++++++------------------------------------------
- 1 files changed, 21 insertions(+), 75 deletions(-)
+ 1 file changed, 21 insertions(+), 75 deletions(-)
 
 commit 575115c786e38e511af059950d5f6d6a02b4eb61
 Author: Robert Pliszko <Robert.Pliszko@systems-design.eu>
@@ -3777,7 +4456,7 @@
 pkg/w32/bino.nsi | 6 +
 po/LINGUAS | 3 +-
 po/pl.po | 1310 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 1319 insertions(+), 1 deletions(-)
+ 4 files changed, 1319 insertions(+), 1 deletion(-)
 
 commit 9843961076f65c8b947df4f34ccfd265e48d989a
 Author: Martin Lambers <marlam@marlam.de>
@@ -3786,7 +4465,7 @@
 Make LibASS subtitle rendering thread-safe for Equalizer.
 
 src/subtitle_renderer.cpp | 27 +++++++++++++++++++++++++++
- 1 files changed, 27 insertions(+), 0 deletions(-)
+ 1 file changed, 27 insertions(+)
 
 commit d62321b76b01d193e9ea12e794bc5ed0b49798ff
 Author: Martin Lambers <marlam@marlam.de>
@@ -3795,7 +4474,7 @@
 Update ru.po.
 
 po/ru.po | 181 +++++++++++++++++++++++++++++---------------------------------
- 1 files changed, 85 insertions(+), 96 deletions(-)
+ 1 file changed, 85 insertions(+), 96 deletions(-)
 
 commit 949dde274f45f0bd17d56366edaf80d22e1f8691
 Author: Martin Lambers <marlam@marlam.de>
@@ -3804,7 +4483,7 @@
 Player: read next subtitle in the background.
 
 src/player.cpp | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 21c91afe4eabbde27c86035b0105529c3d668389
 Author: Martin Lambers <marlam@marlam.de>
@@ -3815,7 +4494,7 @@
 Use AV_SAMPLE_FMT_* instead of SAMPLE_FMT_*.
 
 src/media_object.cpp | 16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 
 commit d2021b49bc6ff993c932733d304a83ab46f04b1e
 Author: Martin Lambers <marlam@marlam.de>
@@ -3827,7 +4506,7 @@
 - Make code more readable.
 
 src/media_object.cpp | 14 ++++++++------
- 1 files changed, 8 insertions(+), 6 deletions(-)
+ 1 file changed, 8 insertions(+), 6 deletions(-)
 
 commit e62c266501059539a5b244c4b93b9bb3887608da
 Author: Martin Lambers <marlam@marlam.de>
@@ -3836,7 +4515,7 @@
 Increase audio buffer size, required for very high resolution audio.
 
 src/audio_output.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit cd681825fb32f1763b317daaff87f2ac0dd149be
 Author: Martin Lambers <marlam@marlam.de>
@@ -3845,7 +4524,7 @@
 Add support for s32 audio samples by converting them to f32.
 
 src/media_object.cpp | 21 +++++++++++++++++++++
- 1 files changed, 21 insertions(+), 0 deletions(-)
+ 1 file changed, 21 insertions(+)
 
 commit 149c0917b7cebb03e51c9b6d132f822ad584cd98
 Author: Martin Lambers <marlam@marlam.de>
@@ -3856,7 +4535,7 @@
 Don't let audio "run out"; this might take too long depending on buffered data.
 
 src/player.cpp | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 commit f96bef7e283e635182b02f4c73be7be2c873fa03
 Author: Martin Lambers <marlam@marlam.de>
@@ -3865,7 +4544,7 @@
 Update de.po.
 
 po/de.po | 38 ++++++++++++++++++++------------------
- 1 files changed, 20 insertions(+), 18 deletions(-)
+ 1 file changed, 20 insertions(+), 18 deletions(-)
 
 commit 3275d6a57275c217b68d315cc09a5b99f95dcb99
 Author: Martin Lambers <marlam@marlam.de>
@@ -3891,7 +4570,7 @@
 pkg/w32/bino.nsi | 6 +
 po/LINGUAS | 1 +
 po/ru.po | 1317 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 1324 insertions(+), 0 deletions(-)
+ 3 files changed, 1324 insertions(+)
 
 commit 66993854b13c0039d98ce3e7b3e2ec8856236c98
 Author: Martin Lambers <marlam@marlam.de>
@@ -3900,7 +4579,7 @@
 Fix formatted output from msg::*_txt for non-ASCII locales.
 
 configure.ac | 2 +-
- src/base/msg.cpp | 90 ++++++++++++++++++++++++++++++++++++++++-------------
+ src/base/msg.cpp | 90 +++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 69 insertions(+), 23 deletions(-)
 
 commit b40f31c9bbd0137598afbebbb52400115d7fa423
@@ -3910,7 +4589,7 @@
 Windows: add czech translation to installer.
 
 pkg/w32/bino.nsi | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ 1 file changed, 6 insertions(+)
 
 commit 7fb3f343d9d853892bc7ce864eb5e2d9b678ac48
 Author: Martin Lambers <marlam@marlam.de>
@@ -3919,7 +4598,7 @@
 Bump version to 0.9.3.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 720fc76c5159fe82bc2a1bf5ae31c14eb990ba9d
 Author: Martin Lambers <marlam@marlam.de>
@@ -3928,7 +4607,7 @@
 configure.ac: make message about required FFmpeg version more helpful.
 
 configure.ac | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 54e6932039230c7e1c7fa450f725b89434f21318
 Author: Joe <cuchac@email.cz>
@@ -3938,7 +4617,7 @@
 
 po/LINGUAS | 1 +
 po/cs.po | 1302 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 1303 insertions(+), 0 deletions(-)
+ 2 files changed, 1303 insertions(+)
 
 commit 6a861d3642b7a38c07ec9fa09d8e582d1c6064c7
 Author: Frédéric Devernay <frederic.devernay@inrialpes.fr>
@@ -3951,7 +4630,7 @@
 
 Makefile.am | 3 ++-
 src/main.cpp | 44 ++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 46 insertions(+), 1 deletions(-)
+ 2 files changed, 46 insertions(+), 1 deletion(-)
 
 commit 67250f19783f16fdff4933064aa631425f360f13
 Author: Martin Lambers <marlam@marlam.de>
@@ -3962,7 +4641,7 @@
 The meaning of negative / positive parallax was swapped.
 
 src/video_output_render.fs.glsl | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 97c8ecb7aee790819df443415bb1e01b446ca16a
 Author: Martin Lambers <marlam@marlam.de>
@@ -3971,7 +4650,7 @@
 Update de.po.
 
 po/de.po | 35 ++++++++++++++++++++++++-----------
- 1 files changed, 24 insertions(+), 11 deletions(-)
+ 1 file changed, 24 insertions(+), 11 deletions(-)
 
 commit 50ed387c68e26737c27ba389a4ee9ec9209ac315
 Author: Martin Lambers <marlam@marlam.de>
@@ -3980,7 +4659,7 @@
 Add documentation for translators.
 
 ABOUT-NLS | 19 +++++++++++++++++--
- 1 files changed, 17 insertions(+), 2 deletions(-)
+ 1 file changed, 17 insertions(+), 2 deletions(-)
 
 commit e4ee0200b647893bea534387893e949ed5df7cd0
 Author: Martin Lambers <marlam@marlam.de>
@@ -3990,7 +4669,7 @@
 
 doc/bino.1 | 12 ++++++++++++
 doc/bino.texi | 12 ++++++++++++
- 2 files changed, 24 insertions(+), 0 deletions(-)
+ 2 files changed, 24 insertions(+)
 
 commit e96e4ec6e9236853ba4239217c6f59e534984570
 Author: Martin Lambers <marlam@marlam.de>
@@ -4009,7 +4688,7 @@
 Add --subtitle-parallax option, for completeness.
 
 src/main.cpp | 42 +++++++++++++++++++++++-------------------
- 1 files changed, 23 insertions(+), 19 deletions(-)
+ 1 file changed, 23 insertions(+), 19 deletions(-)
 
 commit 52e0e9e9aa4d0124218fe176249fe5f38c209e9c
 Author: Martin Lambers <marlam@marlam.de>
@@ -4018,7 +4697,7 @@
 Add command line options for subtitle settings.
 
 src/base/opt.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/main.cpp | 31 +++++++++++++++++++++++++++--
+ src/main.cpp | 31 +++++++++++++++++++++++++++---
 2 files changed, 86 insertions(+), 3 deletions(-)
 
 commit df93eb314286f566b16fdd5d4c9e70a2dfde014e
@@ -4030,7 +4709,7 @@
 This corrects e7dfd62c9ed2625f18080d26de2f4f15e536fbc0.
 
 src/qt_app.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit fa8243868b6b6aeee2df5e08509bc0ae85e45423
 Author: Martin Lambers <marlam@marlam.de>
@@ -4039,7 +4718,7 @@
 Update de.po.
 
 po/de.po | 261 +++++++++++++++++++++++++++++++++-----------------------------
- 1 files changed, 140 insertions(+), 121 deletions(-)
+ 1 file changed, 140 insertions(+), 121 deletions(-)
 
 commit 882cd1fd34a48acdb905614ccd720fd3507e087b
 Author: Martin Lambers <marlam@marlam.de>
@@ -4074,7 +4753,7 @@
 Cleanup and document the localedir() function.
 
 src/main.cpp | 26 +++++++++++++-------------
- 1 files changed, 13 insertions(+), 13 deletions(-)
+ 1 file changed, 13 insertions(+), 13 deletions(-)
 
 commit 18f1befdb11f64f7046fb1e29fcecde380a432cb
 Author: Martin Lambers <marlam@marlam.de>
@@ -4149,10 +4828,10 @@
 src/base/thread.cpp | 17 +-
 src/base/timer.cpp | 19 +-
 src/lib_versions.cpp | 11 +-
- src/main.cpp | 195 ++++----
+ src/main.cpp | 195 +++----
 src/media_data.cpp | 11 +-
 src/media_input.cpp | 21 +-
- src/media_object.cpp | 69 ++-
+ src/media_object.cpp | 69 +--
 src/player.cpp | 23 +-
 src/player_equalizer.cpp | 31 +-
 src/player_qt.cpp | 343 ++++++------
@@ -4169,7 +4848,7 @@
 GUI: add big friendly OK buttons to all dialogs.
 
 src/player_qt.cpp | 30 +++++++++++++++++++++++-------
- 1 files changed, 23 insertions(+), 7 deletions(-)
+ 1 file changed, 23 insertions(+), 7 deletions(-)
 
 commit b0ef87212703c16eec79156d29a44249b30cc4ec
 Author: Martin Lambers <marlam@marlam.de>
@@ -4180,7 +4859,7 @@
 ... if more than one stream is present.
 
 src/media_input.cpp | 12 +++++++++---
- 1 files changed, 9 insertions(+), 3 deletions(-)
+ 1 file changed, 9 insertions(+), 3 deletions(-)
 
 commit 0b88e72509f742e3a455aeb69d6cd0ba059c8315
 Author: Martin Lambers <marlam@marlam.de>
@@ -4203,7 +4882,7 @@
 description of the data format of an individual subtitle box. So remove
 it from the media object template and the info and name.
 
- src/media_data.cpp | 52 ++++---------------------------------------------
+ src/media_data.cpp | 52 +++++---------------------------------------------
 src/media_data.h | 2 +-
 src/media_object.cpp | 1 -
 3 files changed, 6 insertions(+), 49 deletions(-)
@@ -4215,7 +4894,7 @@
 Media object: add support for CODEC_ID_TEXT subtitles.
 
 src/media_object.cpp | 49 +++++++++++++++++++++++++++++++++++++++++--------
- 1 files changed, 41 insertions(+), 8 deletions(-)
+ 1 file changed, 41 insertions(+), 8 deletions(-)
 
 commit 4c519726ca10d53c2af62e7040941281747ddd74
 Author: Martin Lambers <marlam@marlam.de>
@@ -4224,7 +4903,7 @@
 GUI: Improve remembering of per-video settings.
 
 src/player_qt.cpp | 13 +++++++++----
- 1 files changed, 9 insertions(+), 4 deletions(-)
+ 1 file changed, 9 insertions(+), 4 deletions(-)
 
 commit 36d569c6550bd867c0a2aea34fd8266514e84710
 Author: Martin Lambers <marlam@marlam.de>
@@ -4235,7 +4914,7 @@
 These are independent of the media object and hopefully less confusing.
 
 src/media_input.cpp | 21 +++++++++++++++++++++
- 1 files changed, 21 insertions(+), 0 deletions(-)
+ 1 file changed, 21 insertions(+)
 
 commit cc51972b9cab9a2d617774fd8d14c802a2fd48fc
 Author: Martin Lambers <marlam@marlam.de>
@@ -4244,7 +4923,7 @@
 Media data: minor improvement for audio channel names.
 
 src/media_data.cpp | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit d53d11e305fb50e2236d10f4b0ba75bd5cc0dc26
 Author: Martin Lambers <marlam@marlam.de>
@@ -4255,7 +4934,7 @@
 They were confusing instead of helpful.
 
 src/media_input.cpp | 21 ++++++---------------
- 1 files changed, 6 insertions(+), 15 deletions(-)
+ 1 file changed, 6 insertions(+), 15 deletions(-)
 
 commit f34b1a0ee30955d4608d7249b3c4b7785deb14d0
 Author: Martin Lambers <marlam@marlam.de>
@@ -4264,7 +4943,7 @@
 Update Windows build instructions and package file.
 
 README.Windows | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++---
- pkg/w32/notes.txt | 2 +
+ pkg/w32/notes.txt | 2 ++
 2 files changed, 94 insertions(+), 5 deletions(-)
 
 commit f6a8d638a6a5a8428672f89c1fac786ecd3153aa
@@ -4273,8 +4952,8 @@
 
 Port subtitle rendering to Windows.
 
- src/subtitle_renderer.cpp | 66 +++++++++++++++++++++++++++++++++++++++++++-
- src/subtitle_renderer.h | 2 +
+ src/subtitle_renderer.cpp | 66 +++++++++++++++++++++++++++++++++++++++++++--
+ src/subtitle_renderer.h | 2 ++
 2 files changed, 66 insertions(+), 2 deletions(-)
 
 commit 0aa7a523402ee10ef67c2a88f2fb850631b911ec
@@ -4284,7 +4963,7 @@
 configure.ac: find iconv also in external libiconv.
 
 configure.ac | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
 
 commit 62aea2db79ca63b0e86f75601a9d31b9f4995fa3
 Author: Martin Lambers <marlam@marlam.de>
@@ -4295,7 +4974,7 @@
 The meaning of LIBASS_VERSION is entirely unclear (to me).
 
 src/lib_versions.cpp | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 6a8a72792ad908bba30d678398e6ba6f6d4a64be
 Author: Joe <cuchac@email.cz>
@@ -4306,8 +4985,8 @@
 src/controller.h | 2 +
 src/media_data.cpp | 7 +++
 src/media_data.h | 1 +
- src/player.cpp | 8 +++
- src/player_qt.cpp | 116 +++++++++++++++++++++++++++++++++++++++++---
+ src/player.cpp | 8 ++++
+ src/player_qt.cpp | 116 +++++++++++++++++++++++++++++++++++++++++----
 src/player_qt.h | 5 ++
 src/subtitle_renderer.cpp | 17 ++++++-
 src/video_output.cpp | 1 +
@@ -4325,8 +5004,8 @@
 
 configure.ac | 1 +
 src/base/str.cpp | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/base/str.h | 3 ++
- 3 files changed, 63 insertions(+), 0 deletions(-)
+ src/base/str.h | 3 +++
+ 3 files changed, 63 insertions(+)
 
 commit 47284673757234d79d344d87d07b298fec8a1c47
 Author: Martin Lambers <marlam@marlam.de>
@@ -4335,7 +5014,7 @@
 Add informational note to subtitle dialog.
 
 src/player_qt.cpp | 19 +++++++++++--------
- 1 files changed, 11 insertions(+), 8 deletions(-)
+ 1 file changed, 11 insertions(+), 8 deletions(-)
 
 commit 3409f623c0573abd7226725cc82c15d6e3c00038
 Author: Martin Lambers <marlam@marlam.de>
@@ -4344,7 +5023,7 @@
 Media object: work around FFmpeg bug w.r.t. ASS subtitle durations.
 
 src/media_object.cpp | 22 ++++++++++++++++++++++
- 1 files changed, 22 insertions(+), 0 deletions(-)
+ 1 file changed, 22 insertions(+)
 
 commit 78ef2408c21f6b928ae2781afb61f1140a7ba24c
 Author: Martin Lambers <marlam@marlam.de>
@@ -4353,7 +5032,7 @@
 Fix subtitle stream selection.
 
 src/player.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 472b970807f0c22a28942b118cd24a009cb186da
 Author: Joe <cuchac@email.cz>
@@ -4362,15 +5041,15 @@
 Make subtitle appearance configurable.
 
 src/controller.h | 41 +++++-
- src/media_data.cpp | 37 +++++-
+ src/media_data.cpp | 37 ++++-
 src/media_data.h | 5 +
- src/player.cpp | 65 ++++++++--
+ src/player.cpp | 65 +++++++--
 src/player.h | 1 +
 src/player_qt.cpp | 326 ++++++++++++++++++++++++++++++++++++++++++++-
 src/player_qt.h | 38 ++++++
- src/subtitle_renderer.cpp | 52 ++++++-
- src/subtitle_renderer.h | 12 ++-
- src/video_output.cpp | 22 ++-
+ src/subtitle_renderer.cpp | 52 +++++++-
+ src/subtitle_renderer.h | 12 +-
+ src/video_output.cpp | 22 +--
 src/video_output.h | 3 +-
 11 files changed, 564 insertions(+), 38 deletions(-)
 
@@ -4380,17 +5059,17 @@
 
 Make subtitle streams selectable via keyboard and GUI.
 
- doc/bino.1 | 6 +++-
- doc/bino.texi | 6 +++-
- src/controller.h | 4 +++
- src/main.cpp | 7 +++--
- src/media_input.cpp | 9 +++++--
- src/media_input.h | 3 +-
+ doc/bino.1 | 6 ++++--
+ doc/bino.texi | 6 ++++--
+ src/controller.h | 4 ++++
+ src/main.cpp | 7 +++---
+ src/media_input.cpp | 9 +++++---
+ src/media_input.h | 3 ++-
 src/player.cpp | 34 +++++++++++++++++++++++++++++
 src/player_equalizer.cpp | 8 ++++++-
- src/player_qt.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++++-
- src/player_qt.h | 4 +++
- src/video_output_qt.cpp | 5 +++-
+ src/player_qt.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++++--
+ src/player_qt.h | 4 ++++
+ src/video_output_qt.cpp | 5 ++++-
 11 files changed, 125 insertions(+), 15 deletions(-)
 
 commit daf0018df0afd3c12945fbb94dc6b9e074119aad
@@ -4403,7 +5082,7 @@
 channel in the framebuffer (even if we add an on-screen-display in the future).
 
 src/video_output_qt.cpp | 8 +-------
- 1 files changed, 1 insertions(+), 7 deletions(-)
+ 1 file changed, 1 insertion(+), 7 deletions(-)
 
 commit b1de160f82d4517375b78065ee8c743918d82942
 Author: Martin Lambers <marlam@marlam.de>
@@ -4412,8 +5091,8 @@
 Equalizer: add support for subtitles.
 
 src/media_data.cpp | 65 ++++++++++++++++++++++++++++++++++++++++++++++
- src/media_data.h | 14 ++++++++--
- src/player_equalizer.cpp | 43 ++++++++++++++++++++++++-----
+ src/media_data.h | 14 +++++++---
+ src/player_equalizer.cpp | 43 ++++++++++++++++++++++++------
 3 files changed, 111 insertions(+), 11 deletions(-)
 
 commit 51678d049ea56c735efba2afca8f77b65f795eba
@@ -4423,7 +5102,7 @@
 Equalizer: make context current in eq_channel outside of frameDraw().
 
 src/player_equalizer.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit a8ce1bf402c83b62ee7a3a8e15dc11a2a0f45e6c
 Author: Martin Lambers <marlam@marlam.de>
@@ -4432,7 +5111,7 @@
 Equalizer: minor comment improvements.
 
 src/player_equalizer.cpp | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
+ 1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit 2ec716acf471c88e1b042bdad5147151e04fe108
 Author: Martin Lambers <marlam@marlam.de>
@@ -4441,7 +5120,7 @@
 Equalizer: move prepare_next_frame() from node to channel.
 
 src/player_equalizer.cpp | 18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
+ 1 file changed, 9 insertions(+), 9 deletions(-)
 
 commit 01bb1d5a6818d05d45592fd8a0b996a71dd2c34d
 Author: Martin Lambers <marlam@marlam.de>
@@ -4452,9 +5131,9 @@
 This is because some virtual functions can really only be implemented on
 channel level (e.g. screen_pixel_aspect_ratio, video_display_width, ...).
 
- src/player_equalizer.cpp | 112 ++++++++++++++++++++++++++-------------------
+ src/player_equalizer.cpp | 112 +++++++++++++++++++++++++++-------------------
 src/video_output.cpp | 4 +-
- src/video_output.h | 12 +++---
+ src/video_output.h | 12 ++---
 3 files changed, 73 insertions(+), 55 deletions(-)
 
 commit 94d8cb8d6a7125eeb0e2e24b925cb65bc1c311e5
@@ -4464,7 +5143,7 @@
 Equalizer: remove unused and misleading code.
 
 src/player_equalizer.cpp | 9 +--------
- 1 files changed, 1 insertions(+), 8 deletions(-)
+ 1 file changed, 1 insertion(+), 8 deletions(-)
 
 commit 7bb2fe24ca145353af9efd62f9a89230ea1673a6
 Author: Martin Lambers <marlam@marlam.de>
@@ -4473,7 +5152,7 @@
 Video output: only check subtitle render size if it is valid.
 
 src/video_output.cpp | 22 +++++++++++++---------
- 1 files changed, 13 insertions(+), 9 deletions(-)
+ 1 file changed, 13 insertions(+), 9 deletions(-)
 
 commit 380f0057240a5d7ce8d5321ed157b509f01351d0
 Author: Martin Lambers <marlam@marlam.de>
@@ -4482,7 +5161,7 @@
 Remove forgotten debugging output.
 
 src/video_output.cpp | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ 1 file changed, 1 deletion(-)
 
 commit e16200318a08af03e616dbb2a0c93c48d7bfb863
 Author: Martin Lambers <marlam@marlam.de>
@@ -4490,9 +5169,9 @@
 
 Fix animated subtitles: rerender subtitle for each frame.
 
- src/media_data.h | 7 +++++
+ src/media_data.h | 7 ++++++
 src/video_output.cpp | 66 ++++++++++++++++++++++++++++----------------------
- src/video_output.h | 11 ++++----
+ src/video_output.h | 11 +++++----
 3 files changed, 50 insertions(+), 34 deletions(-)
 
 commit acdeea9c9a7937045ba09a42ff5b80ad8e67d595
@@ -4507,7 +5186,7 @@
 
 src/subtitle_renderer.cpp | 218 +++++++++++++++++++++++++++++++++------------
 src/subtitle_renderer.h | 45 ++++++++--
- src/video_output.cpp | 64 +++++++++-----
+ src/video_output.cpp | 64 ++++++++-----
 src/video_output.h | 1 +
 4 files changed, 242 insertions(+), 86 deletions(-)
 
@@ -4535,7 +5214,7 @@
 
 src/media_data.cpp | 9 +++-
 src/media_data.h | 26 ++++++++---
- src/media_object.cpp | 20 ++++++--
+ src/media_object.cpp | 20 +++++---
 src/subtitle_renderer.cpp | 112 ++++++++++++++++++++++++++++++++-------------
 src/subtitle_renderer.h | 7 ++-
 src/video_output.cpp | 19 ++++++--
@@ -4549,7 +5228,7 @@
 Subtitle renderer: use font-native hinting by default.
 
 src/subtitle_renderer.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d3ec16e016ffc7500d10d69d4607f36cdfc7772b
 Author: Martin Lambers <marlam@marlam.de>
@@ -4570,12 +5249,12 @@
 
 src/Makefile.am | 2 -
 src/subtitle_renderer.cpp | 44 +++++------
- src/subtitle_renderer.h | 10 +-
- src/video_output.cpp | 157 +++++++++++++++++++++++-------------
+ src/subtitle_renderer.h | 10 +--
+ src/video_output.cpp | 155 +++++++++++++++++++++++--------------
 src/video_output.h | 14 +++-
 src/video_output_render.fs.glsl | 36 +++++++--
 src/video_output_subtitle.fs.glsl | 49 ------------
- 7 files changed, 167 insertions(+), 145 deletions(-)
+ 7 files changed, 166 insertions(+), 144 deletions(-)
 
 commit 06cc1e308aaffad984f854ccf30a2a4d660eb930
 Author: Martin Lambers <marlam@marlam.de>
@@ -4584,7 +5263,7 @@
 Subtitle renderer: fix subtitle aspect ratio.
 
 src/subtitle_renderer.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 193be6cddf702e07b9df165f71b5b9ca051d24e0
 Author: Martin Lambers <marlam@marlam.de>
@@ -4593,7 +5272,7 @@
 Video output: fix blending of subtitles.
 
 src/video_output.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit a69f41e8d4a1ef95c8241bb582b7f560dc44c4f4
 Author: Martin Lambers <marlam@marlam.de>
@@ -4604,8 +5283,8 @@
 This allows to convert the subtitle colors to SRGB, which is necessary because
 we render them onto an SRGB texture.
 
- src/Makefile.am | 2 +
- src/video_output.cpp | 18 ++++++++++++-
+ src/Makefile.am | 2 ++
+ src/video_output.cpp | 18 ++++++++++++--
 src/video_output.h | 1 +
 src/video_output_subtitle.fs.glsl | 49 +++++++++++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 2 deletions(-)
@@ -4645,7 +5324,7 @@
 Subtitle renderer: minor fix for plain text subtitles.
 
 src/subtitle_renderer.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit df1af1e60ae53d25138e0edfcaef8ce49fe6da44
 Author: Martin Lambers <marlam@marlam.de>
@@ -4657,7 +5336,7 @@
 and parameter defaults are not explicitly set anymore.
 
 src/subtitle_renderer.cpp | 6 ++----
- 1 files changed, 2 insertions(+), 4 deletions(-)
+ 1 file changed, 2 insertions(+), 4 deletions(-)
 
 commit 49804e30c3bfa6de741ef5a9d0d8d7d6d75b52f8
 Author: Martin Lambers <marlam@marlam.de>
@@ -4669,7 +5348,7 @@
 so that subtitles do not appear stretched e.g. for left-right-half videos.
 
 src/subtitle_renderer.cpp | 11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
+ 1 file changed, 6 insertions(+), 5 deletions(-)
 
 commit 71b76b46c800df3c87e5f247d9211bb6b76f84e6
 Author: Martin Lambers <marlam@marlam.de>
@@ -4678,7 +5357,7 @@
 Video output: slightly simplify subtitle texture rendering.
 
 src/video_output.cpp | 34 ++++++++++++++++------------------
- 1 files changed, 16 insertions(+), 18 deletions(-)
+ 1 file changed, 16 insertions(+), 18 deletions(-)
 
 commit 3df15087ef08c69e1394699028c1fffd7914ee0d
 Author: Joe <cuchac@email.cz>
@@ -4687,7 +5366,7 @@
 Media input: ignore subtitle streams when computing duration.
 
 src/media_input.cpp | 9 +--------
- 1 files changed, 1 insertions(+), 8 deletions(-)
+ 1 file changed, 1 insertion(+), 8 deletions(-)
 
 commit c50a7a25af70691dd7bbec02db9e56172f55d23e
 Author: Martin Lambers <marlam@marlam.de>
@@ -4707,7 +5386,7 @@
 Subtitle renderer: add support for plain text subtitles.
 
 src/subtitle_renderer.cpp | 20 +++++++++++++++++++-
- 1 files changed, 19 insertions(+), 1 deletions(-)
+ 1 file changed, 19 insertions(+), 1 deletion(-)
 
 commit 7b7cde1b9818ef84cbbb0f555cccc60e1025461c
 Author: Martin Lambers <marlam@marlam.de>
@@ -4716,7 +5395,7 @@
 Media object: avoid crash on closing an unsuccessfully opened file.
 
 src/media_object.cpp | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 44e3ce23328d2c8ece48ce3dc204d7261c6fbc6e
 Author: Joe <cuchac@email.cz>
@@ -4724,11 +5403,11 @@
 
 Add subtitle handling and rendering.
 
- src/player.cpp | 70 ++++++++++++++++++++++++++++++++++++++++++++-
- src/player.h | 8 ++++-
+ src/player.cpp | 70 ++++++++++++++++++++++++++++++++++++++++++++--
+ src/player.h | 8 +++++-
 src/player_equalizer.cpp | 3 +-
 src/video_output.cpp | 63 ++++++++++++++++++++++++++++++++++++++++-
- src/video_output.h | 8 ++++-
+ src/video_output.h | 8 ++++--
 src/video_output_qt.cpp | 2 +-
 6 files changed, 146 insertions(+), 8 deletions(-)
 
@@ -4742,10 +5421,10 @@
 doc/bino.1 | 6 +-
 doc/bino.texi | 5 +-
 src/main.cpp | 8 +-
- src/media_input.cpp | 139 +++++++++++++++++-
- src/media_input.h | 38 +++++-
+ src/media_input.cpp | 139 ++++++++++++++++-
+ src/media_input.h | 38 ++++-
 src/media_object.cpp | 413 ++++++++++++++++++++++++++++++++++++++++++++++----
- src/media_object.h | 34 +++-
+ src/media_object.h | 34 ++++-
 8 files changed, 594 insertions(+), 50 deletions(-)
 
 commit bed1064c5e6a691018763c941f2d94e4ddfa391b
@@ -4756,7 +5435,7 @@
 
 src/media_data.cpp | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/media_data.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 108 insertions(+), 1 deletions(-)
+ 2 files changed, 108 insertions(+), 1 deletion(-)
 
 commit 97a71015d6d13491c4e5e4ca2b8757889beb13c5
 Author: Martin Lambers <marlam@marlam.de>
@@ -4768,7 +5447,7 @@
 src/Makefile.am | 5 +-
 src/lib_versions.cpp | 24 ++++++
 src/subtitle_renderer.cpp | 201 +++++++++++++++++++++++++++++++++++++++++++++
- src/subtitle_renderer.h | 55 ++++++++++++
+ src/subtitle_renderer.h | 55 +++++++++++++
 5 files changed, 292 insertions(+), 2 deletions(-)
 
 commit ae512c212521e2caf8feb77a74a354870cc71205
@@ -4778,7 +5457,7 @@
 Fix aspect ratio in hdmi-frame-pack output mode.
 
 src/video_output.cpp | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ 1 file changed, 1 deletion(-)
 
 commit 64a2d1b31018322516b8191e909f7c50f92a0eeb
 Author: Martin Lambers <marlam@marlam.de>
@@ -4790,7 +5469,7 @@
 position in the stream.
 
 src/player_equalizer.cpp | 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
+ 1 file changed, 10 insertions(+)
 
 commit 6b0b455b809b9f08f550df7e5ec29a95f31f8800
 Author: Martin Lambers <marlam@marlam.de>
@@ -4813,7 +5492,7 @@
 HDMI frame pack mode on GNU/Linux.
 
 doc/bino.texi | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 6b893a1e78592e502ccaff0cbf4c6bb4d4c3d32f
 Author: Martin Lambers <marlam@marlam.de>
@@ -4825,8 +5504,8 @@
 hdmi_frame_pack now use viewports that split aspect ratio borders equally
 between the two views.
 
- src/player_equalizer.cpp | 6 ++-
- src/video_output.cpp | 164 +++++++++++++++++++++++++++------------------
+ src/player_equalizer.cpp | 6 +-
+ src/video_output.cpp | 164 +++++++++++++++++++++++++++-------------------
 src/video_output.h | 6 +-
 3 files changed, 106 insertions(+), 70 deletions(-)
 
@@ -4840,13 +5519,13 @@
 separating the two. It is intended for forced HDMI 3D frame packing modes
 720p-3D and 1080p-3D.
 
- doc/bino.1 | 4 +++
- doc/bino.texi | 4 +++
- src/main.cpp | 2 +
- src/media_data.cpp | 7 +++++
+ doc/bino.1 | 4 ++++
+ doc/bino.texi | 4 ++++
+ src/main.cpp | 2 ++
+ src/media_data.cpp | 7 ++++++
 src/media_data.h | 1 +
- src/player_qt.cpp | 61 +++++++++++++++++++++++++++----------------------
- src/video_output.cpp | 29 +++++++++++++++++++++--
+ src/player_qt.cpp | 61 ++++++++++++++++++++++++++++----------------------
+ src/video_output.cpp | 29 +++++++++++++++++++++---
 7 files changed, 78 insertions(+), 30 deletions(-)
 
 commit c025d2e67a533d27f1ffe33f6d5edd78307f68bb
@@ -4856,7 +5535,7 @@
 Improve Qt video area resizing.
 
 src/video_output_qt.cpp | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 90a267884946886a860a633632cdbf086e793f2c
 Author: Martin Lambers <marlam@marlam.de>
@@ -4865,7 +5544,7 @@
 Update credits.
 
 AUTHORS | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 71e5c7f3ee4295373eb9d7eee4a717aaa003082d
 Author: Martin Lambers <marlam@marlam.de>
@@ -4894,7 +5573,7 @@
 quad-buffer contexts.
 
 src/video_output_qt.cpp | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 0a703cc26bdc6773b96dd8d5be27904fc2f6ad9c
 Author: Martin Lambers <marlam@marlam.de>
@@ -4903,7 +5582,7 @@
 Windows: simplify instructions to create binaries.
 
 README.Windows | 9 +++------
- 1 files changed, 3 insertions(+), 6 deletions(-)
+ 1 file changed, 3 insertions(+), 6 deletions(-)
 
 commit a0d2cfc4a20024c0cd9365d3c090b155cf792a62
 Author: Martin Lambers <marlam@marlam.de>
@@ -4912,7 +5591,7 @@
 Update documentation of file name conventions.
 
 doc/bino.texi | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit fe26b331705c28de6157a6c2b17ddf34fcafb33a
 Author: Martin Lambers <marlam@marlam.de>
@@ -4937,7 +5616,7 @@
 Rebuild Qt ressources when necessary.
 
 src/Makefile.am | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit cab0d49aa0c1a7cf8528552caaf41e66d0e3ef1f
 Author: Martin Lambers <marlam@marlam.de>
@@ -4959,7 +5638,7 @@
 necessary.
 
 src/media_data.cpp | 17 ++++++++++++-----
- 1 files changed, 12 insertions(+), 5 deletions(-)
+ 1 file changed, 12 insertions(+), 5 deletions(-)
 
 commit a70007bb3399edfe793ce7bb1027c7cb4fc84612
 Author: Martin Lambers <marlam@marlam.de>
@@ -4971,7 +5650,7 @@
 information that depends on the stereo layout.
 
 src/media_data.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 729f33c1f882ba53e8a6eeb965617e7093d77df2
 Author: Martin Lambers <marlam@marlam.de>
@@ -4980,7 +5659,7 @@
 GUI: Improve resizing behaviour.
 
 src/video_output_qt.cpp | 9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
+ 1 file changed, 5 insertions(+), 4 deletions(-)
 
 commit 32eb152a5f97e0789153aafdcbfd475b69f2fe8a
 Author: Martin Lambers <marlam@marlam.de>
@@ -4989,7 +5668,7 @@
 Media object: remove wrong line from error handling path.
 
 src/media_object.cpp | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ 1 file changed, 1 deletion(-)
 
 commit ac74520f8cc7630eada17f8dc6347a4eb1fcc1cd
 Author: Martin Lambers <marlam@marlam.de>
@@ -5006,7 +5685,7 @@
 more important there because the audio clock is the master clock.
 
 src/media_object.cpp | 35 ++++++++++++++---------------------
- 1 files changed, 14 insertions(+), 21 deletions(-)
+ 1 file changed, 14 insertions(+), 21 deletions(-)
 
 commit d5cf814d3fc83944592a4214f500faa7a2df7545
 Author: Martin Lambers <marlam@marlam.de>
@@ -5042,7 +5721,7 @@
 This should never be necessary, but there are all kinds of problematic videos...
 
 src/media_object.cpp | 23 +++++++++++++++++++----
- 1 files changed, 19 insertions(+), 4 deletions(-)
+ 1 file changed, 19 insertions(+), 4 deletions(-)
 
 commit c5a247c7c3783b28182aef0e63e366d8aeefc574
 Author: Martin Lambers <marlam@marlam.de>
@@ -5050,8 +5729,8 @@
 
 Media object: make sure that packets have timestamps after a seek.
 
- src/media_object.cpp | 58 ++++++++++++++++++++++++++++++++++++-------------
- 1 files changed, 42 insertions(+), 16 deletions(-)
+ src/media_object.cpp | 58 ++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 42 insertions(+), 16 deletions(-)
 
 commit 25fe9b946781f9574852ce9fe914b15359684835
 Author: Martin Lambers <marlam@marlam.de>
@@ -5060,7 +5739,7 @@
 Media object: when no audio timestamp is available, guess.
 
 src/media_object.cpp | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ 1 file changed, 6 insertions(+)
 
 commit 8e1ee5e153efbbde420f321b395fc8d01eb9ee43
 Author: Martin Lambers <marlam@marlam.de>
@@ -5069,7 +5748,7 @@
 Avoid clang compiler warning.
 
 src/media_data.cpp | 10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
+ 1 file changed, 6 insertions(+), 4 deletions(-)
 
 commit ee0fd75f492157061aec2c2e76c73cbdbda8858f
 Author: Frédéric Devernay <frederic.devernay@inrialpes.fr>
@@ -5081,7 +5760,7 @@
 to link libavcodec and libavutil.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f2cb7edf2b67441055212828e19ff24ca5e97c04
 Author: Martin Lambers <marlam@marlam.de>
@@ -5090,7 +5769,7 @@
 Avoid a compiler warning.
 
 src/media_object.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 230b665430437232247e3e0ba2c3709a850ded33
 Author: Martin Lambers <marlam@marlam.de>
@@ -5103,7 +5782,7 @@
 test cases. Finally.
 
 src/media_object.cpp | 9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
+ 1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit 3f26ec5171f028a04235f48956e27944450f1714
 Author: Martin Lambers <marlam@marlam.de>
@@ -5112,7 +5791,7 @@
 Media object: do not destroy video packets before they are consumed.
 
 src/media_object.cpp | 17 ++++++++++++-----
- 1 files changed, 12 insertions(+), 5 deletions(-)
+ 1 file changed, 12 insertions(+), 5 deletions(-)
 
 commit 3758874a571f9ef1834cf7d37031dd835f2b0e29
 Author: Martin Lambers <marlam@marlam.de>
@@ -5123,7 +5802,7 @@
 after starting the player and after seeking.
 
 src/player_equalizer.cpp | 12 +++++++++---
- 1 files changed, 9 insertions(+), 3 deletions(-)
+ 1 file changed, 9 insertions(+), 3 deletions(-)
 
 commit f7d75e011a50239d0fe5b05124d198ad5f03a8e2
 Author: Martin Lambers <marlam@marlam.de>
@@ -5134,7 +5813,7 @@
 This avoids a one-frame difference between master and slave nodes after seeking.
 
 src/player_equalizer.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit 1ab9e8cd4e9a9e685b3624eb0cd38fc7ae847d21
 Author: Martin Lambers <marlam@marlam.de>
@@ -5145,7 +5824,7 @@
 This fixes seeking in a .webm video test case.
 
 src/media_object.cpp | 11 ++++++++++-
- 1 files changed, 10 insertions(+), 1 deletions(-)
+ 1 file changed, 10 insertions(+), 1 deletion(-)
 
 commit b5fca890b049c4d9074bbbdfcb69f7376aaec588
 Author: Martin Lambers <marlam@marlam.de>
@@ -5155,7 +5834,7 @@
 
 src/player_qt.cpp | 10 ++++++++++
 src/qt_resources.qrc | 1 +
- 2 files changed, 11 insertions(+), 0 deletions(-)
+ 2 files changed, 11 insertions(+)
 
 commit a9562de7d2aa4bbd1202bb548d19dad3c6be5f29
 Author: Martin Lambers <marlam@marlam.de>
@@ -5175,7 +5854,7 @@
 Bump version to 0.9.1.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 02922792bf476a106aa22c4451067edcf52a59ee
 Author: Martin Lambers <marlam@marlam.de>
@@ -5184,7 +5863,7 @@
 GUI: Add a "Team" tab to the About Box.
 
 src/player_qt.cpp | 23 +++++++++++++++++++++++
- 1 files changed, 23 insertions(+), 0 deletions(-)
+ 1 file changed, 23 insertions(+)
 
 commit db0403ab4cbfd5974e3a52484ea7f83272b27e27
 Author: Martin Lambers <marlam@marlam.de>
@@ -5195,7 +5874,7 @@
 I cannot believe that this is not the default.
 
 src/qt_app.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit 5cdfdbfb102e28905381489b637f24e8a3d7571b
 Author: Martin Lambers <marlam@marlam.de>
@@ -5204,7 +5883,7 @@
 Windows: Document requirement of pthreads.
 
 README.Windows | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 36f6e70530c06a3b0918b94d458e0f66e04441bd
 Author: Tobias Lange <tobias@longly-home.de>
@@ -5247,7 +5926,7 @@
 src/logo/bino_logo_small_32x32.png | Bin 0 -> 1698 bytes
 src/logo/bino_logo_small_48x48.png | Bin 0 -> 2554 bytes
 src/logo/bino_logo_small_64x64.png | Bin 0 -> 3914 bytes
- 9 files changed, 2109 insertions(+), 0 deletions(-)
+ 9 files changed, 2109 insertions(+)
 
 commit 2e503d672b639e89fcb909dc70b9764bc042703e
 Author: Martin Lambers <marlam@marlam.de>
@@ -5256,7 +5935,7 @@
 Print Qt messages through the base msg module.
 
 src/qt_app.cpp | 23 +++++++++++++++++++++++
- 1 files changed, 23 insertions(+), 0 deletions(-)
+ 1 file changed, 23 insertions(+)
 
 commit a30b35646601da9247e83e7a6f2e64ed0ca7b8e1
 Author: Frédéric Devernay <frederic.devernay@inrialpes.fr>
@@ -5276,7 +5955,7 @@
 Equalizer: minor cleanup (avoid bumpyCaps).
 
 src/player_equalizer.cpp | 32 ++++++++++++++++----------------
- 1 files changed, 16 insertions(+), 16 deletions(-)
+ 1 file changed, 16 insertions(+), 16 deletions(-)
 
 commit b7a13a7cf193924421b23a36ff6eb5900d751621
 Author: Martin Lambers <marlam@marlam.de>
@@ -5285,7 +5964,7 @@
 Equalizer: use multithreaded input also on slave nodes.
 
 src/player_equalizer.cpp | 30 +++++++++++++++++++++++++++---
- 1 files changed, 27 insertions(+), 3 deletions(-)
+ 1 file changed, 27 insertions(+), 3 deletions(-)
 
 commit 7f8a6f76a588ae34b187e84c73916ce57ff5613e
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -5306,7 +5985,7 @@
 This avoids malloc/free for every single audio packet.
 
 src/media_object.cpp | 25 ++++++++++++++++++-------
- 1 files changed, 18 insertions(+), 7 deletions(-)
+ 1 file changed, 18 insertions(+), 7 deletions(-)
 
 commit 36bbc46de75214d1f85b8ad1b4f31ff8fab9c5b8
 Author: Martin Lambers <marlam@marlam.de>
@@ -5317,8 +5996,8 @@
 A few packets (instead of only one) are now buffered asynchronously, to avoid
 waiting for audio and video packets in many common situations.
 
- src/media_object.cpp | 52 +++++++++++++++++++++++++++----------------------
- 1 files changed, 29 insertions(+), 23 deletions(-)
+ src/media_object.cpp | 52 ++++++++++++++++++++++++++++----------------------
+ 1 file changed, 29 insertions(+), 23 deletions(-)
 
 commit 66f327e182a2d486690f04d4dbbbbfeb603886f1
 Author: Martin Lambers <marlam@marlam.de>
@@ -5327,7 +6006,7 @@
 Do not crash when opening a file without video streams.
 
 src/media_input.cpp | 9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
+ 1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit d75b70419e7adafb71724e4c6ef4855fc8aa237e
 Author: Martin Lambers <marlam@marlam.de>
@@ -5346,7 +6025,7 @@
 Fix video stream selection.
 
 src/media_input.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit 7ebb4d55b8951cfd4fe299761e2b2c9468e78d2c
 Author: Martin Lambers <marlam@marlam.de>
@@ -5355,7 +6034,7 @@
 GUI: Fix handling of errors that occur during playback.
 
 src/player_qt.cpp | 13 +++++++------
- 1 files changed, 7 insertions(+), 6 deletions(-)
+ 1 file changed, 7 insertions(+), 6 deletions(-)
 
 commit e102a54a5326014e5764f11091a849a704b49aec
 Author: Martin Lambers <marlam@marlam.de>
@@ -5388,10 +6067,10 @@
 
 configure.ac | 1 +
 src/audio_output.cpp | 24 ++-
- src/audio_output.h | 26 ++--
+ src/audio_output.h | 26 +--
 src/base/Makefile.am | 3 +-
 src/base/thread.cpp | 151 ++++++++++++++
- src/base/thread.h | 152 ++++++++++++++
+ src/base/thread.h | 152 +++++++++++++++
 src/media_input.cpp | 110 ++++++++---
 src/media_input.h | 3 +
 src/media_object.cpp | 531 ++++++++++++++++++++++++++++++++++----------------
@@ -5409,7 +6088,7 @@
 Now, messages from different threads are not intermixed anymore.
 
 src/base/msg.cpp | 19 ++++++++++---------
- 1 files changed, 10 insertions(+), 9 deletions(-)
+ 1 file changed, 10 insertions(+), 9 deletions(-)
 
 commit 0c9ce1f2f651395374a0b6edb5b0b3250bd0b9e2
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -5420,7 +6099,7 @@
 (This was accidentaly removed during the rewrite.)
 
 src/player_equalizer.cpp | 51 ++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 51 insertions(+), 0 deletions(-)
+ 1 file changed, 51 insertions(+)
 
 commit c10fb59331b55238b5aa796e692b7dc25b532f7a
 Author: Martin Lambers <marlam@marlam.de>
@@ -5429,7 +6108,7 @@
 Fix mouse-based seeking in non-GUI mode.
 
 src/video_output_qt.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 64dea2eacefb8ddad3cafbb4f9f59966abcdd55d
 Author: Martin Lambers <marlam@marlam.de>
@@ -5438,7 +6117,7 @@
 Fix application icon in non-GUI mode.
 
 src/video_output_qt.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 84a15084cf40184ca78c35aba247dbe1ba6909d2
 Author: Martin Lambers <marlam@marlam.de>
@@ -5452,7 +6131,7 @@
 src/video_output.cpp | 5 +++
 src/video_output.h | 3 +-
 src/video_output_qt.cpp | 92 ++++++-----------------------------------------
- src/video_output_qt.h | 39 +-------------------
+ src/video_output_qt.h | 39 ++------------------
 5 files changed, 20 insertions(+), 126 deletions(-)
 
 commit 409d2dc3a37f376c654a29ee3355bf88f9a57c76
@@ -5464,7 +6143,7 @@
 This reverts commit b04b4a027872d2f5c7127a768005b6ea6e6d0916.
 
 src/player.cpp | 4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
+ 1 file changed, 4 deletions(-)
 
 commit b04b4a027872d2f5c7127a768005b6ea6e6d0916
 Author: Martin Lambers <marlam@marlam.de>
@@ -5473,7 +6152,7 @@
 Player: do not busy loop when there's nothing to do.
 
 src/player.cpp | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 commit 7125556be5d306420948ff6a6a64382ae24d13a7
 Author: Martin Lambers <marlam@marlam.de>
@@ -5488,7 +6167,7 @@
 src/video_output.cpp | 5 ---
 src/video_output.h | 3 +-
 src/video_output_qt.cpp | 92 +++++++++++++++++++++++++++++++++++++++++------
- src/video_output_qt.h | 39 +++++++++++++++++++-
+ src/video_output_qt.h | 39 ++++++++++++++++++--
 5 files changed, 126 insertions(+), 20 deletions(-)
 
 commit 569c9ca78efa6b8b212893d26f30a343351edd28
@@ -5498,7 +6177,7 @@
 Video output: do not prohibit keyboard actions in non-GUI mode.
 
 src/video_output_qt.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d21fc40d12e30f025d6130de05b588d051a53809
 Author: Martin Lambers <marlam@marlam.de>
@@ -5507,7 +6186,7 @@
 GUI: improve update of in/out widget.
 
 src/player_qt.cpp | 15 ++++++---------
- 1 files changed, 6 insertions(+), 9 deletions(-)
+ 1 file changed, 6 insertions(+), 9 deletions(-)
 
 commit 0dc0b7984429149a5064da5d1dcc545460e9251c
 Author: Martin Lambers <marlam@marlam.de>
@@ -5516,7 +6195,7 @@
 GUI: add some safety checks for video and audio stream indices.
 
 src/player_qt.cpp | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 6ef45f3b4cbb5a46d9e5756d497c3d83a8c70be0
 Author: Martin Lambers <marlam@marlam.de>
@@ -5545,7 +6224,7 @@
 GUI: Disable controls when opening invalid input files.
 
 src/player_qt.cpp | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
+ 1 file changed, 7 insertions(+)
 
 commit 24265bafb5293dd3b7c8c441378398b63eccf4e9
 Author: Martin Lambers <marlam@marlam.de>
@@ -5553,8 +6232,8 @@
 
 GUI: Clean up About Box.
 
- src/player_qt.cpp | 67 +++++++++++++++++++++++++++++++++++++++++-----------
- 1 files changed, 53 insertions(+), 14 deletions(-)
+ src/player_qt.cpp | 67 ++++++++++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 53 insertions(+), 14 deletions(-)
 
 commit 721f76b7019c666a8ea55ae36ffb47cb0ba5cbee
 Author: Martin Lambers <marlam@marlam.de>
@@ -5563,7 +6242,7 @@
 configure.ac: make package name upper case.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit dec838ee66d952bed09e63893cf66cb0ded3b9eb
 Author: Martin Lambers <marlam@marlam.de>
@@ -5572,7 +6251,7 @@
 Video output: properly handle exceptions during playback.
 
 src/video_output_qt.cpp | 13 ++++++++++++-
- 1 files changed, 12 insertions(+), 1 deletions(-)
+ 1 file changed, 12 insertions(+), 1 deletion(-)
 
 commit f22a265ff3837c27ae22c83dabdf8ac8032e0e20
 Author: Martin Lambers <marlam@marlam.de>
@@ -5581,7 +6260,7 @@
 Render shader: remove a space that upsets picky free OpenGL drivers.
 
 src/video_output_render.fs.glsl | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d2427662c0483ef5f5f4939968e695dbee080d4f
 Author: Martin Lambers <marlam@marlam.de>
@@ -5594,7 +6273,7 @@
 replaced with ones published by E. Dubois.
 
 src/video_output_render.fs.glsl | 80 +++++++++++++++++++++------------------
- 1 files changed, 43 insertions(+), 37 deletions(-)
+ 1 file changed, 43 insertions(+), 37 deletions(-)
 
 commit 2804c904c06b17630ec5ba331f116c2243ba3a05
 Author: Martin Lambers <marlam@marlam.de>
@@ -5616,7 +6295,7 @@
 Render shader: Work around NVIDIA driver limitations.
 
 src/video_output_render.fs.glsl | 9 +--------
- 1 files changed, 1 insertions(+), 8 deletions(-)
+ 1 file changed, 1 insertion(+), 8 deletions(-)
 
 commit 1f6bf6be6b3cd7a407b12b2350a744c275f45aec
 Author: Martin Lambers <marlam@marlam.de>
@@ -5625,7 +6304,7 @@
 GUI: Clear video area when video reaches its end.
 
 src/player.cpp | 20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
+ 1 file changed, 20 insertions(+)
 
 commit 9b719c7e3c9b05dd206eb5e840c008beaaea24a8
 Author: Martin Lambers <marlam@marlam.de>
@@ -5647,10 +6326,10 @@
 the matrices in red-cyan-dubois with those used by E. Dubois.
 
 doc/bino.1 | 14 +++++---
- doc/bino.texi | 12 ++++--
- src/main.cpp | 12 ++++--
- src/media_data.cpp | 42 +++++++++++++++-------
- src/media_data.h | 6 ++-
+ doc/bino.texi | 12 ++++---
+ src/main.cpp | 12 ++++---
+ src/media_data.cpp | 42 ++++++++++++++--------
+ src/media_data.h | 6 ++--
 src/player_qt.cpp | 68 +++++++++++++++++++++--------------
 src/video_output.cpp | 24 ++++++++-----
 src/video_output_render.fs.glsl | 74 ++++++++++++++++++++++++---------------
@@ -5678,7 +6357,7 @@
 
 GUI: Disabled unsupported ComboBox entries.
 
- src/player_qt.cpp | 59 +++++++++++++++++++++++++++-------------------------
+ src/player_qt.cpp | 59 ++++++++++++++++++++++++++++-------------------------
 src/player_qt.h | 1 +
 2 files changed, 32 insertions(+), 28 deletions(-)
 
@@ -5689,7 +6368,7 @@
 Equalizer: clean up.
 
 src/player_equalizer.cpp | 33 +++++++--------------------------
- 1 files changed, 7 insertions(+), 26 deletions(-)
+ 1 file changed, 7 insertions(+), 26 deletions(-)
 
 commit 906c7945ad5fd258c2997ee1ce303f07569585fd
 Author: Martin Lambers <marlam@marlam.de>
@@ -5698,7 +6377,7 @@
 Equalizer: fix keyboard interaction.
 
 src/player.cpp | 55 ++++++++++++++++++++++++++++++----------------
- src/player_equalizer.cpp | 10 ++++++-
+ src/player_equalizer.cpp | 10 +++++++--
 2 files changed, 44 insertions(+), 21 deletions(-)
 
 commit 3f2ba205a15f93bc8182bd5fcc03d12a4426b9c0
@@ -5708,7 +6387,7 @@
 Player: clean up and add comments.
 
 src/player.cpp | 17 ++++---
- src/player.h | 145 ++++++++++++++++++++++++++++++++-----------------------
+ src/player.h | 145 ++++++++++++++++++++++++++++++++------------------------
 2 files changed, 94 insertions(+), 68 deletions(-)
 
 commit 8e07b3c8450b14a1f45acbf1a732a0e604433a4c
@@ -5729,7 +6408,7 @@
 
 src/video_output.cpp | 2 +-
 src/video_output_qt.cpp | 2 ++
- 2 files changed, 3 insertions(+), 1 deletions(-)
+ 2 files changed, 3 insertions(+), 1 deletion(-)
 
 commit a37be3e286818610283149b918f029bcbb264bb9
 Author: Martin Lambers <marlam@marlam.de>
@@ -5754,15 +6433,15 @@
 green-magenta-half-color
 green-magenta-full-color
 
- doc/bino.1 | 25 +++++--
- doc/bino.texi | 24 ++++--
- src/main.cpp | 145 ++++++++++++++++++++------------------
- src/media_data.cpp | 67 ++++++++++++++----
- src/media_data.h | 13 +++-
+ doc/bino.1 | 25 ++++---
+ doc/bino.texi | 24 ++++---
+ src/main.cpp | 145 ++++++++++++++++++++-------------------
+ src/media_data.cpp | 67 +++++++++++++-----
+ src/media_data.h | 13 ++--
 src/player.cpp | 2 +-
- src/player_qt.cpp | 91 +++++++++++++++++--------
- src/video_output.cpp | 39 +++++++---
- src/video_output_render.fs.glsl | 39 +++++++---
+ src/player_qt.cpp | 91 ++++++++++++++++--------
+ src/video_output.cpp | 39 +++++++----
+ src/video_output_render.fs.glsl | 39 +++++++----
 9 files changed, 287 insertions(+), 158 deletions(-)
 
 commit 90e4ba79a239073a4b04cc68c55e7c64a0035267
@@ -5782,7 +6461,7 @@
 GUI: Fix drag-and-drop for local files on Windows systems.
 
 src/player_qt.cpp | 9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
+ 1 file changed, 8 insertions(+), 1 deletion(-)
 
 commit 3ceeb0b240456ee26158184921fec4f9d6768b12
 Author: Martin Lambers <marlam@marlam.de>
@@ -5792,7 +6471,7 @@
 
 src/player.cpp | 2 ++
 src/video_output.cpp | 7 ++++++-
- 2 files changed, 8 insertions(+), 1 deletions(-)
+ 2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit f5c80cbd2ec8fdc828b6bd05f0062c519436d2ee
 Author: Martin Lambers <marlam@marlam.de>
@@ -5801,7 +6480,7 @@
 Fix crash caused by invalid video/audio stream defaults.
 
 src/player.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit baf349fd57d30eb036e1546a945941aa82b402e9
 Author: Martin Lambers <marlam@marlam.de>
@@ -5811,8 +6490,8 @@
 
 src/media_data.cpp | 32 ++++
 src/media_data.h | 8 +-
- src/player.cpp | 90 ++++++++--
- src/player.h | 19 ++-
+ src/player.cpp | 90 +++++++--
+ src/player.h | 19 +-
 src/player_equalizer.cpp | 451 ++++++++++++++++------------------------------
 5 files changed, 279 insertions(+), 321 deletions(-)
 
@@ -5823,7 +6502,7 @@
 Video output: improve an error message.
 
 src/video_output.cpp | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 03b20c0f046ea4a8865318fc730998e10b209ed5
 Author: Martin Lambers <marlam@marlam.de>
@@ -5831,12 +6510,12 @@
 
 End all messages with '.' consistently.
 
- src/audio_output.cpp | 32 ++++++------
- src/main.cpp | 120 +++++++++++++++++++++++-----------------------
- src/media_object.cpp | 38 +++++++-------
+ src/audio_output.cpp | 32 ++++++-------
+ src/main.cpp | 120 +++++++++++++++++++++++------------------------
+ src/media_object.cpp | 38 +++++++--------
 src/player.cpp | 14 +++---
- src/video_output_qt.cpp | 6 +-
- src/xgl.cpp | 12 ++--
+ src/video_output_qt.cpp | 6 +--
+ src/xgl.cpp | 12 ++---
 6 files changed, 111 insertions(+), 111 deletions(-)
 
 commit 72afdff2b4c477161015c46656c1025c1c91df6b
@@ -5846,7 +6525,7 @@
 GUI: Fix error message copy-and-paste error.
 
 src/player_qt.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e85863a55954ddfa91a6c3b5548fe3c3385362a5
 Author: Martin Lambers <marlam@marlam.de>
@@ -5855,7 +6534,7 @@
 Bump version to 0.9.0.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a9da8523821cdafdca6742039306e4f2bb9a53b0
 Author: Martin Lambers <marlam@marlam.de>
@@ -5863,7 +6542,7 @@
 
 Improve library version listing.
 
- src/lib_versions.cpp | 121 +++++++++++++++++++++++++++++++------------------
+ src/lib_versions.cpp | 121 +++++++++++++++++++++++++++++++-------------------
 src/player_qt.cpp | 8 ++--
 2 files changed, 80 insertions(+), 49 deletions(-)
 
@@ -5873,10 +6552,10 @@
 
 Update documentation.
 
- doc/bino.1 | 38 +++++++++++++++++++++++++----------
- doc/bino.texi | 57 ++++++++++++++++++++++++++++++++++------------------
- src/main.cpp | 2 +
- src/player_qt.cpp | 2 +
+ doc/bino.1 | 38 ++++++++++++++++++++++++-----------
+ doc/bino.texi | 57 ++++++++++++++++++++++++++++++++++-------------------
+ src/main.cpp | 2 ++
+ src/player_qt.cpp | 2 ++
 4 files changed, 68 insertions(+), 31 deletions(-)
 
 commit 78005a739685424cf15246f4567671174b812e7a
@@ -5885,8 +6564,8 @@
 
 Add support for switching video and audio streams during playback.
 
- src/controller.h | 26 +++++++
- src/main.cpp | 4 +
+ src/controller.h | 26 ++++++++
+ src/main.cpp | 4 ++
 src/media_input.cpp | 23 ++++++-
 src/media_input.h | 12 ++++
 src/player.cpp | 94 ++++++++++++++++++++++++---
@@ -5905,7 +6584,7 @@
 Fix workaroung for rgba32 frames with odd sizes.
 
 src/video_output.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a218ed508c351d1ecf24b5b410f910f3acb30c41
 Author: Martin Lambers <marlam@marlam.de>
@@ -5914,7 +6593,7 @@
 Media data: improve video format name and info.
 
 src/media_data.cpp | 6 ++----
- 1 files changed, 2 insertions(+), 4 deletions(-)
+ 1 file changed, 2 insertions(+), 4 deletions(-)
 
 commit cb09ca11fc52eab9542dca15aff26843caa61901
 Author: Martin Lambers <marlam@marlam.de>
@@ -5926,7 +6605,7 @@
 src/icons/center.png | Bin 0 -> 1335 bytes
 src/icons/fullscreen.ipe | 419 +++++++++++++++++++++++++++++++++++++++++++++
 src/icons/fullscreen.png | Bin 0 -> 1109 bytes
- 4 files changed, 839 insertions(+), 0 deletions(-)
+ 4 files changed, 839 insertions(+)
 
 commit bcc2ec4bdc9ee32ca1ba77e159e1020f0b6726d5
 Author: Martin Lambers <marlam@marlam.de>
@@ -5935,7 +6614,7 @@
 Media object: add some assertions.
 
 src/media_object.cpp | 27 +++++++++++++++++++++++++++
- 1 files changed, 27 insertions(+), 0 deletions(-)
+ 1 file changed, 27 insertions(+)
 
 commit 2ddd799e0d78f6db20a0a75ed79df205d0f3eb84
 Author: Martin Lambers <marlam@marlam.de>
@@ -5947,10 +6626,10 @@
 
 src/Makefile.am | 2 +
 src/controller.h | 6 +
- src/player.cpp | 103 ++++++-
+ src/player.cpp | 103 +++++-
 src/player.h | 1 +
- src/player_qt.cpp | 867 +++++++++++++++++++++++++++++++++++--------------
- src/player_qt.h | 117 ++++++--
+ src/player_qt.cpp | 867 +++++++++++++++++++++++++++++++++++---------------
+ src/player_qt.h | 117 +++++--
 src/qt_resources.qrc | 2 +
 7 files changed, 820 insertions(+), 278 deletions(-)
 
@@ -5962,7 +6641,7 @@
 
 src/media_object.cpp | 5 +++++
 src/media_object.h | 4 ++++
- 2 files changed, 9 insertions(+), 0 deletions(-)
+ 2 files changed, 9 insertions(+)
 
 commit 636fbc830f3e0014ab3d78e3b31c3bd0baa812e8
 Author: Martin Lambers <marlam@marlam.de>
@@ -5981,7 +6660,7 @@
 Media input: fix switching the stereo layout to 'separate'.
 
 src/media_input.cpp | 9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
+ 1 file changed, 8 insertions(+), 1 deletion(-)
 
 commit 2460b8e641b213f95fc701fd2d0bd7ec9549e307
 Author: Martin Lambers <marlam@marlam.de>
@@ -6013,8 +6692,8 @@
 are not available.
 
 src/media_input.cpp | 55 ++++++++++++++++++++++++++++++++++++++++----------
- src/media_input.h | 7 +++--
- src/media_object.cpp | 8 +++---
+ src/media_input.h | 7 ++++---
+ src/media_object.cpp | 8 ++++----
 3 files changed, 52 insertions(+), 18 deletions(-)
 
 commit 91b774c1a0c43c1677e3c82ce0175a1006b90b6f
@@ -6026,7 +6705,7 @@
 Add commands and notifications to change the stereo layout and mode, and allow
 generic parameters to commands and notifications.
 
- src/base/Makefile.am | 5 +--
+ src/base/Makefile.am | 5 +-
 src/controller.h | 128 +++++++++++++++++++++++++++++---------------------
 2 files changed, 75 insertions(+), 58 deletions(-)
 
@@ -6039,7 +6718,7 @@
 Since we don't resize the video, there should be no negative impact on quality.
 
 src/media_object.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8d80d2386f7c2e8d817db4beaa5ad4eb458ef65f
 Author: Frédéric Devernay <frederic.devernay@inrialpes.fr>
@@ -6051,7 +6730,7 @@
 odd width.
 
 src/video_output.cpp | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 9c6de932004a9363300fde572da80f8957b2af96
 Author: Martin Lambers <marlam@marlam.de>
@@ -6063,9 +6742,9 @@
 
 src/main.cpp | 6 +-
 src/media_data.cpp | 37 +++++-----
- src/player_qt.cpp | 188 ++++++++++++++++++++++------------------------
+ src/player_qt.cpp | 188 +++++++++++++++++++++++------------------------
 src/player_qt.h | 3 +-
- src/video_output_qt.cpp | 20 ++++--
+ src/video_output_qt.cpp | 20 +++--
 5 files changed, 128 insertions(+), 126 deletions(-)
 
 commit 0b9e5cbdcd6ba9a908f176b53f971fbfbc8f6b1e
@@ -6075,10 +6754,10 @@
 Improve handling of output parameters.
 
 src/main.cpp | 25 +++++++++-------------
- src/media_data.cpp | 58 +++++++++++++++++++++++++++++++++++++++++++--------
- src/media_data.h | 3 ++
- src/player.cpp | 7 +++--
- src/player.h | 21 +++++++++++++++++-
+ src/media_data.cpp | 58 ++++++++++++++++++++++++++++++++++++++++++++--------
+ src/media_data.h | 3 +++
+ src/player.cpp | 7 ++++---
+ src/player.h | 21 +++++++++++++++++--
 5 files changed, 85 insertions(+), 29 deletions(-)
 
 commit 85c38ab83074cb34b9fa45cb31d4a5a7627c732d
@@ -6088,7 +6767,7 @@
 Player: remove stray debugging output.
 
 src/player.cpp | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ 1 file changed, 1 deletion(-)
 
 commit d68a2e5fc2edd771c136c0625a289de29e4effbc
 Author: Martin Lambers <marlam@marlam.de>
@@ -6108,7 +6787,7 @@
 Media input: improve comments, and implement close().
 
 src/media_input.cpp | 19 ++++++++++++++
- src/media_input.h | 70 +++++++++++++++++++++++++++++++++-----------------
+ src/media_input.h | 70 +++++++++++++++++++++++++++++++++------------------
 2 files changed, 65 insertions(+), 24 deletions(-)
 
 commit 2ae8dc81a53ac67312da23398846cb8c4cf66fbb
@@ -6129,8 +6808,8 @@
 
 src/main.cpp | 2 +-
 src/player.cpp | 192 +++++++++++++++++++++++++----------------------------
- src/player.h | 33 +++------
- src/player_qt.cpp | 54 +++++-----------
+ src/player.h | 33 ++++-----
+ src/player_qt.cpp | 54 +++++----------
 src/player_qt.h | 9 ++-
 5 files changed, 126 insertions(+), 164 deletions(-)
 
@@ -6141,7 +6820,7 @@
 Media input: fix problem with some URLs.
 
 src/media_input.cpp | 9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
+ 1 file changed, 8 insertions(+), 1 deletion(-)
 
 commit d92d693342b20ff00a4f04bcef92557829ec0328
 Author: Martin Lambers <marlam@marlam.de>
@@ -6150,7 +6829,7 @@
 Fixes for the input and output widget.
 
 src/player_qt.cpp | 86 ++++++++++++++++++++++++++++++++++++++++-------------
- 1 files changed, 65 insertions(+), 21 deletions(-)
+ 1 file changed, 65 insertions(+), 21 deletions(-)
 
 commit 27d59c65cb626be1a0252fdea12b314ebbff7c71
 Author: Martin Lambers <marlam@marlam.de>
@@ -6159,7 +6838,7 @@
 Remove restriction on number of input files.
 
 src/main.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0ac0fb02b0e66546b964a6f3ef5fc08bda6c2975
 Author: Martin Lambers <marlam@marlam.de>
@@ -6174,13 +6853,13 @@
 src/decoder_ffmpeg.h | 86 ----
 src/input.cpp | 518 -----------------------
 src/input.h | 196 ---------
- src/media_data.cpp | 59 +++-
+ src/media_data.cpp | 59 ++-
 src/media_data.h | 26 +-
 src/media_input.cpp | 458 ++++++++++++++++++++
 src/media_input.h | 146 +++++++
 src/media_object.cpp | 1081 +++++++++++++++++++++++++++++++++++++++++++++++
- src/media_object.h | 118 +++++
- src/player.cpp | 293 ++++----------
+ src/media_object.h | 118 ++++++
+ src/player.cpp | 293 ++++---------
 src/player.h | 14 +-
 src/player_qt.cpp | 38 +-
 src/player_qt.h | 1 -
@@ -6197,9 +6876,9 @@
 
 src/Makefile.am | 13 +-
 src/controller.h | 4 +-
- src/input.cpp | 109 +----
+ src/input.cpp | 109 +---
 src/input.h | 7 +-
- src/main.cpp | 85 ++--
+ src/main.cpp | 85 +--
 src/media_data.cpp | 441 +++++++++++++++
 src/media_data.h | 128 +++++
 src/player.cpp | 252 ++++++---
@@ -6227,7 +6906,7 @@
 Only print backtraces with --enable-debug builds.
 
 src/base/dbg.cpp | 10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
+ 1 file changed, 6 insertions(+), 4 deletions(-)
 
 commit 9468188e3aa34bc82d8c258b4c68c0aab8c13f7b
 Author: Martin Lambers <marlam@marlam.de>
@@ -6236,8 +6915,8 @@
 Improve library version handling.
 
 src/audio_output.cpp | 2 +
- src/lib_versions.cpp | 225 +++++++++++++++++++++++++------------------------
- src/lib_versions.h | 5 +
+ src/lib_versions.cpp | 225 ++++++++++++++++++++++++++------------------------
+ src/lib_versions.h | 5 ++
 3 files changed, 122 insertions(+), 110 deletions(-)
 
 commit a0218a74a6955b43bd7866a8d55210a51f1eb5f5
@@ -6247,7 +6926,7 @@
 Improve library version handling.
 
 src/lib_versions.cpp | 147 ++++++++++++++++++++++++++++++++------------------
- src/lib_versions.h | 5 ++-
+ src/lib_versions.h | 5 +-
 2 files changed, 99 insertions(+), 53 deletions(-)
 
 commit eb397aef85f0dca6c8bce5420570373a5e048ddd
@@ -6257,7 +6936,7 @@
 Library versions: report unused libraries, too.
 
 src/lib_versions.cpp | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 8d61fc57a647fa1a25528c0a601432a4367d20c0
 Author: Martin Lambers <marlam@marlam.de>
@@ -6271,9 +6950,9 @@
 src/decoder_ffmpeg.h | 2 -
 src/lib_versions.cpp | 155 ++++++++++++++++++++++++++++++++++++++++++----
 src/lib_versions.h | 6 +-
- src/player_equalizer.cpp | 11 ---
+ src/player_equalizer.cpp | 11 ----
 src/player_equalizer.h | 2 -
- src/qt_app.cpp | 7 --
+ src/qt_app.cpp | 7 ---
 src/qt_app.h | 5 --
 10 files changed, 149 insertions(+), 106 deletions(-)
 
@@ -6284,7 +6963,7 @@
 Rewrite audio data handling.
 
 src/Makefile.am | 2 +-
- src/audio_output.cpp | 428 ++++++++++++++++++++++++++++++++++++++++++-
+ src/audio_output.cpp | 428 +++++++++++++++++++++++++++++++++++++++++-
 src/audio_output.h | 71 +++++--
 src/audio_output_openal.cpp | 433 -------------------------------------------
 src/audio_output_openal.h | 77 --------
@@ -6333,7 +7012,7 @@
 a missing pkg-config. Reported by Thomas Vincke.
 
 configure.ac | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
+ 1 file changed, 8 insertions(+)
 
 commit 6fa75faa2ab507a988c4dbd8111a63ada1a9054e
 Author: Martin Lambers <marlam@marlam.de>
@@ -6342,7 +7021,7 @@
 Decoder: Fix segfault in close() on invalid input.
 
 src/decoder_ffmpeg.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit db3a8a8ace4af2a2368bfaf0fe687e64ee45a97a
 Author: Martin Lambers <marlam@marlam.de>
@@ -6351,7 +7030,7 @@
 Bump version to 0.8.1.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit bf3374065beaaa19a98ad822ca3919590611c0b6
 Author: Martin Lambers <marlam@marlam.de>
@@ -6360,7 +7039,7 @@
 Fix the --enable-debug configure option.
 
 configure.ac | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 2a917b86c91151ba935055d58fef09dabd5d381e
 Author: Martin Lambers <marlam@marlam.de>
@@ -6369,7 +7048,7 @@
 Fix the --enable-debug configure option.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 75160c3406737e983716bae3cc33da98f6315631
 Author: Martin Lambers <marlam@marlam.de>
@@ -6378,7 +7057,7 @@
 Equalizer: document the NDEBUG requirements for using the library.
 
 doc/bino.texi | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
+ 1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit dc5538e072b269a06505e00f40ede931d7e6138c
 Author: Martin Lambers <marlam@marlam.de>
@@ -6421,7 +7100,7 @@
 Equalizer: update documentation for versions >= 0.9.2.
 
 doc/bino.texi | 16 ++++++----------
- 1 files changed, 6 insertions(+), 10 deletions(-)
+ 1 file changed, 6 insertions(+), 10 deletions(-)
 
 commit e4a509896d647c5d0e949e4fdfd74db94ebd08a5
 Author: Martin Lambers <marlam@marlam.de>
@@ -6432,7 +7111,7 @@
 Eq 0.9.2 is 1.0-alpha, and the API is supposed to be stable now.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 00432aaf735195857e581c6886e050b26d134064
 Merge: 8486103 0268cb8
@@ -6448,7 +7127,7 @@
 Change bug report address to mailing list.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 21e5a66e7c07c427a42a6b4f262fd2bce5ef14c4
 Author: Martin Lambers <marlam@marlam.de>
@@ -6462,7 +7141,7 @@
 reflected in the GUI.
 
 src/player_qt.cpp | 18 ++++--------------
- 1 files changed, 4 insertions(+), 14 deletions(-)
+ 1 file changed, 4 insertions(+), 14 deletions(-)
 
 commit 2020e29c58f439adaf81c176ab40d96c3078d95e
 Author: Martin Lambers <marlam@marlam.de>
@@ -6474,7 +7153,7 @@
 crosstalk ghostbusting, parallax adjustment etc.
 
 src/player_equalizer.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit dfeec1efa3d0ba177951c6785282eb5ed38339c5
 Author: Martin Lambers <marlam@marlam.de>
@@ -6485,7 +7164,7 @@
 This is fallout from the recent timestamp changes.
 
 src/player_equalizer.cpp | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 7a0a643403bf60c304bed14ca2cbacec773d3b3e
 Author: Martin Lambers <marlam@marlam.de>
@@ -6513,8 +7192,8 @@
 
 GUI: Make better use of QSettings.
 
- src/player_qt.cpp | 68 +++++++++++++++++++---------------------------------
- 1 files changed, 25 insertions(+), 43 deletions(-)
+ src/player_qt.cpp | 68 ++++++++++++++++++++---------------------------------
+ 1 file changed, 25 insertions(+), 43 deletions(-)
 
 commit 89dfb9c11b18f27906c92aab8a9989234e94cb5d
 Author: Martin Lambers <marlam@marlam.de>
@@ -6523,7 +7202,7 @@
 GUI: Fix parallax spinbox: do not change ghostbust setting.
 
 src/player_qt.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit 84fa16ea34fc22f69b2e9f574d21026a86a65d0c
 Author: Martin Lambers <marlam@marlam.de>
@@ -6543,7 +7222,7 @@
 Avoid compiler warning.
 
 src/input.cpp | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
 
 commit e56ec0e70d32e907400ed87a13671aaf91df716a
 Author: Martin Lambers <marlam@marlam.de>
@@ -6563,7 +7242,7 @@
 GUI: Fix the keyboard shortcuts list.
 
 src/player_qt.cpp | 8 +++-----
- 1 files changed, 3 insertions(+), 5 deletions(-)
+ 1 file changed, 3 insertions(+), 5 deletions(-)
 
 commit e4891b7d0df51161ea43df7e08817366d64abb3a
 Author: Martin Lambers <marlam@marlam.de>
@@ -6572,7 +7251,7 @@
 GUI: minor tweaks to the parallax and crosstalk ghostbusting elements.
 
 src/player_qt.cpp | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit bfc6ec69a29e889cf070e3a1c1d77263fa6edbd0
 Author: Martin Lambers <marlam@marlam.de>
@@ -6581,7 +7260,7 @@
 Move a function definition.
 
 src/player_qt.cpp | 28 ++++++++++++++--------------
- 1 files changed, 14 insertions(+), 14 deletions(-)
+ 1 file changed, 14 insertions(+), 14 deletions(-)
 
 commit 13be955c2c520e28373683ed2532c00e323c2fbe
 Author: Martin Lambers <marlam@marlam.de>
@@ -6591,7 +7270,7 @@
 
 src/player_qt.cpp | 32 ++++++++++++++++++++++++++++++++
 src/player_qt.h | 2 ++
- 2 files changed, 34 insertions(+), 0 deletions(-)
+ 2 files changed, 34 insertions(+)
 
 commit c5fc8bc27ccc4647640ae9c8f67e8ddbab8df6b5
 Author: Martin Lambers <marlam@marlam.de>
@@ -6600,7 +7279,7 @@
 GUI: Add tool tips, tweak layout.
 
 src/player_qt.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
- 1 files changed, 46 insertions(+), 4 deletions(-)
+ 1 file changed, 46 insertions(+), 4 deletions(-)
 
 commit f350a87314b23182b7a5c66489cad39426514ef6
 Author: Martin Lambers <marlam@marlam.de>
@@ -6609,7 +7288,7 @@
 Fix --center command line option.
 
 src/video_output_opengl_qt.cpp | 10 ++++------
- 1 files changed, 4 insertions(+), 6 deletions(-)
+ 1 file changed, 4 insertions(+), 6 deletions(-)
 
 commit 0268cb802ba7c6fa4f38bc02644d2ee60b6ee199
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -6618,7 +7297,7 @@
 Adaptations for Eq 1.0a
 
 src/player_equalizer.cpp | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 75bf68dfbae24b0c0861eeae8a25158527b8b911
 Author: Martin Lambers <marlam@marlam.de>
@@ -6627,7 +7306,7 @@
 Bump version to 0.8.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 44cd16c7ac39508cb7b96c2f48f017a75780645f
 Author: Martin Lambers <marlam@marlam.de>
@@ -6636,7 +7315,7 @@
 GUI: Do not repeatedly fail once a non-existing audio stream was chosen.
 
 src/player_qt.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit f6011b64ee1a61f132fd8434fc662ff773e94226
 Author: Martin Lambers <marlam@marlam.de>
@@ -6647,16 +7326,16 @@
 The GUI now has a slider for seeking and progress display, and in non-GUI mode
 a mouse click will seek according to the horizontal click position.
 
- doc/bino.1 | 2 +
- doc/bino.texi | 2 +
+ doc/bino.1 | 2 ++
+ doc/bino.texi | 2 ++
 src/controller.h | 1 +
- src/main.cpp | 5 ++-
- src/player.cpp | 49 ++++++++++++++++++++++++++++++++------
- src/player.h | 3 ++
- src/player_qt.cpp | 50 +++++++++++++++++++++++++++++++--------
- src/player_qt.h | 3 ++
+ src/main.cpp | 5 ++--
+ src/player.cpp | 49 ++++++++++++++++++++++++++++++++-------
+ src/player.h | 3 +++
+ src/player_qt.cpp | 50 +++++++++++++++++++++++++++++++---------
+ src/player_qt.h | 3 +++
 src/video_output_opengl_qt.cpp | 15 ++++++++++++
- src/video_output_opengl_qt.h | 2 +
+ src/video_output_opengl_qt.h | 2 ++
 10 files changed, 111 insertions(+), 21 deletions(-)
 
 commit 77d1d76f1c62a2bdf4726139760d375c9c4fa043
@@ -6669,14 +7348,14 @@
 not possible to switch audio streams during playback. That functionality could
 be added later.
 
- doc/bino.1 | 2 +
- doc/bino.texi | 3 ++
- src/main.cpp | 4 +++
- src/player.cpp | 19 +++++++++++++--
- src/player.h | 3 +-
- src/player_equalizer.cpp | 4 ++-
- src/player_qt.cpp | 54 +++++++++++++++++++++++++++++++++------------
- src/player_qt.h | 2 +
+ doc/bino.1 | 2 ++
+ doc/bino.texi | 3 +++
+ src/main.cpp | 4 ++++
+ src/player.cpp | 19 +++++++++++++---
+ src/player.h | 3 ++-
+ src/player_equalizer.cpp | 4 +++-
+ src/player_qt.cpp | 54 +++++++++++++++++++++++++++++++++-------------
+ src/player_qt.h | 2 ++
 8 files changed, 71 insertions(+), 20 deletions(-)
 
 commit 3c1db9e2cf1b94f385d7689866dfecd0aac31f27
@@ -6707,7 +7386,7 @@
 Document ghostbusting keyboard shortcuts in --help output.
 
 src/main.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 96fa87f95b7a64878a982b696cab1b63b2c15859
 Merge: db04869 5917bb3
@@ -6734,7 +7413,7 @@
 src/player_equalizer.cpp | 6 ++++++
 src/player_qt.cpp | 1 +
 src/video_output_opengl_qt.cpp | 6 ++++++
- 5 files changed, 18 insertions(+), 0 deletions(-)
+ 5 files changed, 18 insertions(+)
 
 commit 07b4f7d93152b349267fbcdae31ce71e191d9d3c
 Author: Martin Lambers <marlam@marlam.de>
@@ -6743,7 +7422,7 @@
 GUI: Remember contrast/brightness/hue/saturation settings (but not per video).
 
 src/player_qt.cpp | 16 ++++++++++++++++
- 1 files changed, 16 insertions(+), 0 deletions(-)
+ 1 file changed, 16 insertions(+)
 
 commit 1c77ba8ddb6fe5e7da82a2a5bcb8eb4fee011a27
 Author: Martin Lambers <marlam@marlam.de>
@@ -6752,7 +7431,7 @@
 GUI: Remember swap-eyes setting per video.
 
 src/player_qt.cpp | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
+ 1 file changed, 8 insertions(+)
 
 commit e3980e7a9d164d12f3c0eaf691ab18164bb10290
 Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
@@ -6762,7 +7441,7 @@
 
 Makefile.am | 3 ++-
 src/player_qt.cpp | 2 ++
- 2 files changed, 4 insertions(+), 1 deletions(-)
+ 2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit 9f011f563e0bf9a42b820b7d08ced54ab1e1ac60
 Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
@@ -6771,7 +7450,7 @@
 Manual: Set document language.
 
 doc/bino.texi | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 857afc5d73fbf46a09ce4506a6863168d882ffa3
 Author: Martin Lambers <marlam@marlam.de>
@@ -6782,8 +7461,8 @@
 src/controller.h | 7 ++-
 src/player.cpp | 10 +++
 src/player_qt.cpp | 131 +++++++++++++++++++++++++++++++++++++---
- src/player_qt.h | 7 ++
- src/video_output_opengl_qt.cpp | 4 +
+ src/player_qt.h | 7 +++
+ src/video_output_opengl_qt.cpp | 4 ++
 5 files changed, 148 insertions(+), 11 deletions(-)
 
 commit bd2d5de0ef0e36a1da257c82ef88a8e2dbb52003
@@ -6793,7 +7472,7 @@
 GUI: Minor tweak to the Help menu.
 
 src/player_qt.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 4b8517d8cf8b89eda8296d9d5965205b71fedb95
 Author: Martin Lambers <marlam@marlam.de>
@@ -6803,7 +7482,7 @@
 
 src/player_qt.cpp | 11 +++++++++++
 src/player_qt.h | 1 +
- 2 files changed, 12 insertions(+), 0 deletions(-)
+ 2 files changed, 12 insertions(+)
 
 commit 63aa5183b55ebdaab30f16714cdd47dc39e90076
 Author: Martin Lambers <marlam@marlam.de>
@@ -6812,7 +7491,7 @@
 W32: Update README.
 
 README.Windows | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit a8a219acfec94a7d118719c6aa11de633c84c361
 Author: Martin Lambers <marlam@marlam.de>
@@ -6834,7 +7513,7 @@
 src/Makefile.am | 2 ++
 src/player_qt.cpp | 17 ++++++++++++++++-
 src/player_qt.h | 1 +
- 3 files changed, 19 insertions(+), 1 deletions(-)
+ 3 files changed, 19 insertions(+), 1 deletion(-)
 
 commit ef7e2f741c86479c57f9df9e9f8796cc4f2b1a12
 Author: Martin Lambers <marlam@marlam.de>
@@ -6867,7 +7546,7 @@
 Equalizer: Handle the crosstalk settings in init data and frame data.
 
 src/player_equalizer.cpp | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
+ 1 file changed, 8 insertions(+)
 
 commit 1a9d13287da7525a9557065e0528d7d8f9546638
 Author: Martin Lambers <marlam@marlam.de>
@@ -6876,7 +7555,7 @@
 Equalizer: Handle the crosstalk settings in init data and frame data.
 
 src/player_equalizer.cpp | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
+ 1 file changed, 8 insertions(+)
 
 commit 63896ecb20642427d9fec5eaaf312952b0006014
 Author: Martin Lambers <marlam@marlam.de>
@@ -6885,7 +7564,7 @@
 Avoid compiler warnings.
 
 src/base/opt.h | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 6486b20a383772de3b863261145ea66489a2ce63
 Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
@@ -6893,16 +7572,16 @@
 
 Add initial support for crosstalk ghostbusting.
 
- doc/Makefile.am | 6 ++-
+ doc/Makefile.am | 6 +-
 doc/bino.1 | 6 ++
- doc/crosstalk-ghostbusting.txt | 43 ++++++++++++
+ doc/crosstalk-ghostbusting.txt | 43 +++++++++++++
 doc/crosstalk-pattern-l.png | Bin 0 -> 19148 bytes
 doc/crosstalk-pattern-r.png | Bin 0 -> 19159 bytes
 doc/gamma-pattern.png | Bin 0 -> 14653 bytes
 src/main.cpp | 16 +++++
 src/video_output.cpp | 1 +
 src/video_output.h | 5 ++
- src/video_output_opengl.cpp | 54 +++++++--------
+ src/video_output_opengl.cpp | 54 ++++++++--------
 src/video_output_opengl_render.fs.glsl | 110 ++++++++++++++++----------------
 11 files changed, 155 insertions(+), 86 deletions(-)
 
@@ -6920,8 +7599,8 @@
 configure.ac | 1 +
 pkg/macosx/Bino.icns | Bin 0 -> 29307 bytes
 pkg/macosx/Info.plist.in | 356 ++++++++++++++++++++++++++++++++++++++++++++++
- pkg/macosx/README | 8 +
- 6 files changed, 382 insertions(+), 0 deletions(-)
+ pkg/macosx/README | 8 ++
+ 6 files changed, 382 insertions(+)
 
 commit 3708ef057012bf8fe7ae677076853279afef2a31
 Author: Martin Lambers <marlam@marlam.de>
@@ -6942,7 +7621,7 @@
 
 src/player_qt.cpp | 18 ++++++++++++++++++
 src/player_qt.h | 2 ++
- 2 files changed, 20 insertions(+), 0 deletions(-)
+ 2 files changed, 20 insertions(+)
 
 commit 240157d628f95d18c04230abda68a4e23e22b1de
 Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
@@ -6951,7 +7630,7 @@
 MacOSX: Add support for launching Bino from the Finder.
 
 src/main.cpp | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
+ 1 file changed, 9 insertions(+)
 
 commit 07838b2e96957bbe6b97ee8dc2378fefd845bd86
 Author: Martin Lambers <marlam@marlam.de>
@@ -6964,11 +7643,11 @@
 This is now documented in README.Windows.
 
 Makefile.am | 16 ++++++
- README.Windows | 22 +++++++-
- configure.ac | 17 ++++++
+ README.Windows | 22 ++++++--
+ configure.ac | 17 +++++++
 pkg/w32/bino.nsi | 134 +++++++++++++++++++++++++++++++++++++++++++++++++
 pkg/w32/notes.txt | 18 +++++++
- src/Makefile.am | 6 ++
+ src/Makefile.am | 6 +++
 src/icons/appicon.ico | Bin 0 -> 1078 bytes
 7 files changed, 210 insertions(+), 3 deletions(-)
 
@@ -6993,7 +7672,7 @@
 the new stream location.
 
 src/audio_output_openal.cpp | 14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
+ 1 file changed, 14 insertions(+)
 
 commit b09fca974f0a726b60d57e4f456f0e36df0ffe3e
 Author: Martin Lambers <marlam@marlam.de>
@@ -7002,7 +7681,7 @@
 Fix minor glitch in audio/video synchronization.
 
 src/player.cpp | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 4a17e7dae70f59e7ed83ef910a065b4070e634c9
 Author: Martin Lambers <marlam@marlam.de>
@@ -7011,7 +7690,7 @@
 Fix benchmark mode.
 
 src/player.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 403597f0d3fa80f9622abf6ec5664758c83d6d9f
 Author: Martin Lambers <marlam@marlam.de>
@@ -7023,7 +7702,7 @@
 video streams.
 
 src/player.cpp | 85 +++++++++++++++++++++++++++++---------------------------
- src/player.h | 14 +++++----
+ src/player.h | 14 ++++++----
 2 files changed, 52 insertions(+), 47 deletions(-)
 
 commit f95c44e2460fead3b0ed8835fd0ad4478261495b
@@ -7033,7 +7712,7 @@
 Remember current stream position more accurately.
 
 src/player.cpp | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
+ 1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit 09a87e7db295adb2c17486f9764be1d3ea1c2d31
 Author: Martin Lambers <marlam@marlam.de>
@@ -7045,10 +7724,10 @@
 Instead, be prepared to handle time stamps that start at an arbitrary point,
 and video/audio streams that start with different time stamps.
 
- src/decoder.h | 4 +-
+ src/decoder.h | 4 +--
 src/decoder_ffmpeg.cpp | 68 +++++++++++++++++++++-----------------
 src/decoder_ffmpeg.h | 3 ++
- src/input.cpp | 4 +-
+ src/input.cpp | 4 +--
 src/input.h | 6 ++--
 src/player.cpp | 85 +++++++++++++++++++++++-------------------------
 src/player.h | 2 +-
@@ -7061,7 +7740,7 @@
 Fix handling of video streams that don't need software scaling.
 
 src/decoder_ffmpeg.cpp | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
+ 1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit d304c00b00a31010efb60d73633a9ffde63caea2
 Author: Martin Lambers <marlam@marlam.de>
@@ -7070,7 +7749,7 @@
 Limit maximum number of decoding threads to 16.
 
 src/decoder_ffmpeg.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 27dd1ba657cfc35873715333883a462bc3498219
 Author: Martin Lambers <marlam@marlam.de>
@@ -7079,7 +7758,7 @@
 Fix build error caused by stupid typo.
 
 src/video_output_opengl.cpp | 12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit d91f10302ecbbb159dfdd07db73a35b97c4deb8a
 Author: Martin Lambers <marlam@marlam.de>
@@ -7088,7 +7767,7 @@
 Minor cleanup in chroma location placement.
 
 src/video_output_opengl.cpp | 15 ++++++++++-----
- 1 files changed, 10 insertions(+), 5 deletions(-)
+ 1 file changed, 10 insertions(+), 5 deletions(-)
 
 commit 066a7ac7e79391f1dc8a1f48c5463f47ebb8463e
 Author: Martin Lambers <marlam@marlam.de>
@@ -7123,7 +7802,7 @@
 major error and resulted in wrong colors.
 
 src/video_output_opengl_color.fs.glsl | 41 +++++++++++++++++----------------
- 1 files changed, 21 insertions(+), 20 deletions(-)
+ 1 file changed, 21 insertions(+), 20 deletions(-)
 
 commit 47a4c365475ede3ccf8ced04105338cf186d1d37
 Author: Martin Lambers <marlam@marlam.de>
@@ -7131,17 +7810,17 @@
 
 Use a more flexible description of the video frame format.
 
- src/decoder.cpp | 91 ++++++++++++++++----------------
+ src/decoder.cpp | 91 ++++++++++++++++---------------
 src/decoder.h | 84 +++++++++++++++++++++--------
 src/decoder_ffmpeg.cpp | 94 ++++++++++++++++-----------------
 src/decoder_ffmpeg.h | 2 +-
 src/input.cpp | 34 +++++-------
- src/input.h | 6 +-
+ src/input.h | 6 +--
 src/player.cpp | 4 +-
 src/player_equalizer.cpp | 16 +++---
 src/video_output.h | 2 +-
 src/video_output_opengl.cpp | 70 ++++++++++++------------
- src/video_output_opengl.h | 6 +-
+ src/video_output_opengl.h | 6 +--
 src/video_output_opengl_color.fs.glsl | 40 +++++++-------
 src/video_output_opengl_qt.cpp | 2 +-
 src/video_output_opengl_qt.h | 2 +-
@@ -7154,7 +7833,7 @@
 Fix YUV to SRGB color space conversions.
 
 src/video_output_opengl_color.fs.glsl | 10 +++++++---
- 1 files changed, 7 insertions(+), 3 deletions(-)
+ 1 file changed, 7 insertions(+), 3 deletions(-)
 
 commit fc87aa6ffa1b1c505c1a377c644af4d3bad41610
 Author: Martin Lambers <marlam@marlam.de>
@@ -7166,15 +7845,15 @@
 handling of the ITU-709 YUV variant (used by HD video) and of the JPEG YUV
 variant (which uses the full 0-255 range, in contrast to ITU-601).
 
- src/decoder.cpp | 52 +++++++--
- src/decoder.h | 26 ++++-
- src/decoder_ffmpeg.cpp | 150 +++++++++++++++++-------
+ src/decoder.cpp | 52 ++++++--
+ src/decoder.h | 26 +++-
+ src/decoder_ffmpeg.cpp | 150 ++++++++++++++++-------
 src/decoder_ffmpeg.h | 3 +-
- src/input.cpp | 43 ++++++--
+ src/input.cpp | 43 +++++--
 src/player_equalizer.cpp | 4 +-
 src/video_output_opengl.cpp | 211 ++++++++++++++++++++-------------
 src/video_output_opengl.h | 8 +-
- src/video_output_opengl_color.fs.glsl | 31 ++++--
+ src/video_output_opengl_color.fs.glsl | 31 +++--
 9 files changed, 365 insertions(+), 163 deletions(-)
 
 commit eec7661847ad7920c85f7adfa309548184f95cd8
@@ -7248,7 +7927,7 @@
 Eq trunk compile fixes
 
 src/player_equalizer.cpp | 16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 
 commit 7b6a7f44d8993062f74840532bbf39592bc19118
 Merge: b6e7af1 6f63a4f
@@ -7265,7 +7944,7 @@
 
 src/main.cpp | 26 --------------------------
 src/player_equalizer.cpp | 2 --
- 2 files changed, 0 insertions(+), 28 deletions(-)
+ 2 files changed, 28 deletions(-)
 
 commit 8f8eafbf6c0969701b03689cd9aaa07d928a596e
 Author: Martin Lambers <marlam@marlam.de>
@@ -7274,7 +7953,7 @@
 Bump version to 0.7.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b55c7ba334175af9247999f28df30581ab7e9ad3
 Author: Martin Lambers <marlam@marlam.de>
@@ -7343,7 +8022,7 @@
 Minor update.
 
 README.Windows | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 09f4933bb236534ceb19de7b76b2c079e75d77fd
 Author: Martin Lambers <marlam@marlam.de>
@@ -7352,7 +8031,7 @@
 Minor update.
 
 README | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7bace76d58b8bf4f05c52b6f273713aaae31db6e
 Author: Martin Lambers <marlam@marlam.de>
@@ -7361,7 +8040,7 @@
 Cosmetic changes.
 
 src/player_equalizer.cpp | 55 +++++++++++++++++++++++++---------------------
- 1 files changed, 30 insertions(+), 25 deletions(-)
+ 1 file changed, 30 insertions(+), 25 deletions(-)
 
 commit ad74ece870db84e2235001a150ba66dc3106fd54
 Author: Martin Lambers <marlam@marlam.de>
@@ -7370,7 +8049,7 @@
 Cleanup some fallout from the eq-trunk update.
 
 src/player_equalizer.cpp | 4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit c5c30c5b699f1bdbe743a93aef3bb302161de931
 Author: Martin Lambers <marlam@marlam.de>
@@ -7381,7 +8060,7 @@
 doc/MacOSX.txt | 22 ----------------------
 doc/rotated.jpg | Bin 24928 -> 0 bytes
 src/player.cpp | 2 +-
- 3 files changed, 1 insertions(+), 23 deletions(-)
+ 3 files changed, 1 insertion(+), 23 deletions(-)
 
 commit 72439af243235bb2ef75935dd21b19e0206efa46
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -7390,7 +8069,7 @@
 Template stats
 
 src/player_equalizer.cpp | 11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
+ 1 file changed, 11 insertions(+)
 
 commit 52a19822ac8052bb4614bff4fa6465f4befc24cf
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -7399,7 +8078,7 @@
 Set error codes
 
 src/player_equalizer.cpp | 43 +++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 43 insertions(+), 0 deletions(-)
+ 1 file changed, 43 insertions(+)
 
 commit 17d37d1ce71238fdc8c37a6fb43c1dbf717242b6
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -7408,7 +8087,7 @@
 Fix Eq build
 
 src/player_equalizer.cpp | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit ccd415a5ed330288b6e2725fd02c592cba70a9aa
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -7417,7 +8096,7 @@
 Minor fixes
 
 doc/MacOSX.txt | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
+ 1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 83439061fc6332af6e6dbf56d1571f2c14570841
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -7426,7 +8105,7 @@
 document equalizer-3d mode
 
 doc/rotated.jpg | Bin 0 -> 24928 bytes
- 1 files changed, 0 insertions(+), 0 deletions(-)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit 5192cc0491e98109cf2619887c3d9c292583b03a
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -7435,7 +8114,7 @@
 Auto-position 3D screen
 
 src/player_equalizer.cpp | 54 ----------------------------------------------
- 1 files changed, 0 insertions(+), 54 deletions(-)
+ 1 file changed, 54 deletions(-)
 
 commit b74473a106d0c7e52e4e74e0dd6d7418227262e7
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -7444,7 +8123,7 @@
 Add 3D output screen mode
 
 doc/MacOSX.txt | 2 +-
- src/main.cpp | 26 +++++++++++++++++++
+ src/main.cpp | 26 ++++++++++++++++++++
 src/player.cpp | 2 +-
 src/player_equalizer.cpp | 61 +++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 88 insertions(+), 3 deletions(-)
@@ -7467,7 +8146,7 @@
 OS X/Eq porting
 
 doc/MacOSX.txt | 16 ++++++++++++++++
- 1 files changed, 16 insertions(+), 0 deletions(-)
+ 1 file changed, 16 insertions(+)
 
 commit 795897c6131f802afe8c1f793324e31d06161e59
 Author: Martin Lambers <marlam@marlam.de>
@@ -7481,12 +8160,12 @@
 src/decoder.cpp | 13 ++++
 src/decoder.h | 1 +
 src/input.cpp | 147 +++++++++++++++++++++----------------------
- src/input.h | 13 +++-
- src/player.cpp | 16 ++++-
+ src/input.h | 13 ++--
+ src/player.cpp | 16 +++--
 src/player.h | 4 +-
 src/player_equalizer.cpp | 2 +-
 src/player_qt.cpp | 2 +-
- src/video_output.h | 12 +++-
+ src/video_output.h | 12 ++--
 src/video_output_opengl.cpp | 138 +++++++++++++++++++++-------------------
 src/video_output_opengl.h | 6 +-
 11 files changed, 195 insertions(+), 159 deletions(-)
@@ -7499,7 +8178,7 @@
 
 src/player_qt.cpp | 1 +
 src/video_output_opengl_qt.cpp | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
+ 2 files changed, 2 insertions(+)
 
 commit 846b773b174ec83366ae30000ec258b2987e00d6
 Author: Martin Lambers <marlam@marlam.de>
@@ -7522,7 +8201,7 @@
 Update copyright information.
 
 src/video_output_opengl_qt.cpp | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 33a8e9e0cc4819ee995a373d0d1790540b0624e2
 Author: Frédéric Devernay <frederic.devernay@inrialpes.fr>
@@ -7534,7 +8213,7 @@
 mode did not work correcyly on MacOSX. This fixes it.
 
 src/video_output_opengl_qt.cpp | 20 +++++++++-----------
- 1 files changed, 9 insertions(+), 11 deletions(-)
+ 1 file changed, 9 insertions(+), 11 deletions(-)
 
 commit 25755f8dcb423e538bf7224f85a1ac56d9a5cc56
 Author: Frédéric Devernay <frederic.devernay@inrialpes.fr>
@@ -7547,7 +8226,7 @@
 occur.
 
 src/decoder_ffmpeg.cpp | 22 +++++++++++++++++++---
- 1 files changed, 19 insertions(+), 3 deletions(-)
+ 1 file changed, 19 insertions(+), 3 deletions(-)
 
 commit 73b2c7aa700d90c520bc37b280d672e89449b5b0
 Author: Martin Lambers <marlam@marlam.de>
@@ -7560,18 +8239,18 @@
 determines is a video is mono or not; this cannot change.
 
 src/decoder.h | 2 +-
- src/decoder_ffmpeg.cpp | 6 ++--
- src/decoder_ffmpeg.h | 4 +-
+ src/decoder_ffmpeg.cpp | 6 ++---
+ src/decoder_ffmpeg.h | 4 +--
 src/input.cpp | 10 ++++----
- src/input.h | 12 +++++++--
- src/player.cpp | 12 +-------
+ src/input.h | 12 ++++++---
+ src/player.cpp | 12 ++-------
 src/player.h | 1 -
- src/player_equalizer.cpp | 49 +++++++++++++++++++-----------------
+ src/player_equalizer.cpp | 49 ++++++++++++++++++++-----------------
 src/player_qt.cpp | 2 +-
 src/video_output.h | 5 +---
 src/video_output_opengl.cpp | 53 +++++++++++++++++++---------------------
- src/video_output_opengl.h | 10 +++----
- src/video_output_opengl_qt.cpp | 4 +-
+ src/video_output_opengl.h | 10 +++-----
+ src/video_output_opengl_qt.cpp | 4 +--
 src/video_output_opengl_qt.h | 2 +-
 14 files changed, 82 insertions(+), 90 deletions(-)
 
@@ -7600,7 +8279,7 @@
 Bump version to 0.7.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 155ac548342b956b9367677a996a0b3fe580767b
 Author: Martin Lambers <marlam@marlam.de>
@@ -7669,7 +8348,7 @@
 Minor update.
 
 README.Windows | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit db5cde56f577953cdcdeb8b57f222b20fb2ab58d
 Author: Martin Lambers <marlam@marlam.de>
@@ -7678,7 +8357,7 @@
 Minor update.
 
 README | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fe50855f710496747827042b835669f2ee0cd526
 Author: Martin Lambers <marlam@marlam.de>
@@ -7687,7 +8366,7 @@
 Cosmetic changes.
 
 src/player_equalizer.cpp | 55 +++++++++++++++++++++++++---------------------
- 1 files changed, 30 insertions(+), 25 deletions(-)
+ 1 file changed, 30 insertions(+), 25 deletions(-)
 
 commit fcb529828acfbd1cde83d1550d4a6c7246efb96b
 Author: Martin Lambers <marlam@marlam.de>
@@ -7696,7 +8375,7 @@
 Cleanup some fallout from the eq-trunk update.
 
 src/player_equalizer.cpp | 4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit 038f1dbb1b3d0ebacb4f7a092175f1f4156c2bbf
 Author: Martin Lambers <marlam@marlam.de>
@@ -7704,8 +8383,8 @@
 
 Cleanup some fallout from the eq-trunk update.
 
- doc/multi-display.txt | 55 ++++++++++++++++++++++--------------------------
- 1 files changed, 25 insertions(+), 30 deletions(-)
+ doc/multi-display.txt | 55 ++++++++++++++++++++++---------------------------
+ 1 file changed, 25 insertions(+), 30 deletions(-)
 
 commit e102b09b4d4ea9f170317f6f402c69eaf6ef5f66
 Author: Martin Lambers <marlam@marlam.de>
@@ -7733,7 +8412,7 @@
 Template stats
 
 src/player_equalizer.cpp | 11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
+ 1 file changed, 11 insertions(+)
 
 commit 0deb024bc8fad4bf34ec19b5176bf408781bb24b
 Author: Martin Lambers <marlam@marlam.de>
@@ -7742,7 +8421,7 @@
 Complete the documentation of file name conventions for input modes.
 
 doc/bino.1 | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit d34c174a69bbc4dacdfc34d09c72ddcc50a8d9e8
 Author: Martin Lambers <marlam@marlam.de>
@@ -7751,7 +8430,7 @@
 Fix detection of -abq and -baq in file names.
 
 src/input.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit fb0b6a0721b1a2592b286c38c8278e9fa0ac3eda
 Author: Martin Lambers <marlam@marlam.de>
@@ -7760,7 +8439,7 @@
 Update man page.
 
 doc/bino.1 | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 913b480880ee5229cdeabac69f3acc1e3a893f33
 Author: Martin Lambers <marlam@marlam.de>
@@ -7769,7 +8448,7 @@
 Recognize 'h' in addition to 'q' in file names for half-resolution modes.
 
 src/input.cpp | 20 ++++++++++++++------
- 1 files changed, 14 insertions(+), 6 deletions(-)
+ 1 file changed, 14 insertions(+), 6 deletions(-)
 
 commit 9e1e5d00ec5c483589b90f524e0f6a59989d946b
 Author: Martin Lambers <marlam@marlam.de>
@@ -7778,7 +8457,7 @@
 Update man page.
 
 doc/bino.1 | 70 ++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 35 insertions(+), 35 deletions(-)
+ 1 file changed, 35 insertions(+), 35 deletions(-)
 
 commit 7388660cd95977d3ea0199d21bc3719b4ff5b309
 Author: Martin Lambers <marlam@marlam.de>
@@ -7787,7 +8466,7 @@
 Recognize "-tb" and variations in addition to "-ab" and variations in file names.
 
 src/input.cpp | 12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
+ 1 file changed, 8 insertions(+), 4 deletions(-)
 
 commit b092aae2404f3f6043d891c4909eba5715fb3cf6
 Author: Martin Lambers <marlam@marlam.de>
@@ -7796,7 +8475,7 @@
 Improve man page.
 
 doc/bino.1 | 139 ++++++++++++++++++++++++++++++++++++------------------------
- 1 files changed, 84 insertions(+), 55 deletions(-)
+ 1 file changed, 84 insertions(+), 55 deletions(-)
 
 commit 89122297e6cfd3d458306b3c92739bac8acd8964
 Author: Martin Lambers <marlam@marlam.de>
@@ -7805,7 +8484,7 @@
 Handle the default anaglyph method as documented.
 
 src/main.cpp | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 commit a9e885034f88a0d86f99a778ea8895f5313f7367
 Author: Frédéric Devernay <frederic.devernay@inrialpes.fr>
@@ -7818,7 +8497,7 @@
 
 src/decoder.h | 3 +-
 src/decoder_ffmpeg.h | 5 ++
- src/input.cpp | 147 ++++++++++++++++++++++++++++++++++++++-----------
+ src/input.cpp | 147 ++++++++++++++++++++++++++++++++++++++------------
 3 files changed, 121 insertions(+), 34 deletions(-)
 
 commit fe7181288edfca857e318b49e0d5a55bce15b118
@@ -7860,7 +8539,7 @@
 optimizations.
 
 src/video_output_opengl_render.fs.glsl | 13 +++++++++----
- 1 files changed, 9 insertions(+), 4 deletions(-)
+ 1 file changed, 9 insertions(+), 4 deletions(-)
 
 commit cb7938e8cdcfdbddb0f1e2d4a30c03c99d553414
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -7869,7 +8548,7 @@
 Set error codes
 
 src/player_equalizer.cpp | 43 +++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 43 insertions(+), 0 deletions(-)
+ 1 file changed, 43 insertions(+)
 
 commit 3cbe8984d3871e3d4d026977bc1d63b782888a90
 Merge: 3056d98 c9e58a2
@@ -7885,7 +8564,7 @@
 Fix Eq build
 
 src/player_equalizer.cpp | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit c9e58a2de4f03ca1c19f0aab66334b151eb3b846
 Author: Martin Lambers <marlam@marlam.de>
@@ -7909,7 +8588,7 @@
 GUI: Force exit of fullscreen mode when player stops.
 
 src/video_output_opengl_qt.cpp | 7 ++-----
- 1 files changed, 2 insertions(+), 5 deletions(-)
+ 1 file changed, 2 insertions(+), 5 deletions(-)
 
 commit 708d34719b31d4ab7f433844ede36294ed38cd50
 Author: Martin Lambers <marlam@marlam.de>
@@ -7917,8 +8596,8 @@
 
 Clarify YUV <-> non-linear RGB conversions, and add some comments.
 
- src/video_output_opengl.cpp | 11 +++++++++
- src/video_output_opengl_color.fs.glsl | 38 ++++++++++++++++++++++++--------
+ src/video_output_opengl.cpp | 11 ++++++++++
+ src/video_output_opengl_color.fs.glsl | 38 ++++++++++++++++++++++++---------
 2 files changed, 39 insertions(+), 10 deletions(-)
 
 commit bd47c6416c710d1988617c9fdfad7bff5b629bcf
@@ -7935,7 +8614,7 @@
 src/player_equalizer.cpp | 2 -
 src/video_output_opengl.cpp | 479 ++++++++++++++++++--------------
 src/video_output_opengl.fs.glsl | 236 ----------------
- src/video_output_opengl.h | 44 ++-
+ src/video_output_opengl.h | 44 +--
 src/video_output_opengl_color.fs.glsl | 92 ++++++
 src/video_output_opengl_render.fs.glsl | 180 ++++++++++++
 7 files changed, 577 insertions(+), 462 deletions(-)
@@ -7947,7 +8626,7 @@
 Equalizer: handle initialization failures properly.
 
 src/player_equalizer.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 9321ce8fae6f5ad778b067f8d1c0d3a8522c6038
 Author: Martin Lambers <marlam@marlam.de>
@@ -7958,9 +8637,9 @@
 Remove all workarounds for OpenGL implementations that do not meet these
 minimum requirements.
 
- src/player_equalizer.cpp | 23 +--
+ src/player_equalizer.cpp | 23 +-
 src/video_output_opengl.cpp | 451 +++++++++++-----------------------------
- src/video_output_opengl.h | 23 ++-
+ src/video_output_opengl.h | 23 +-
 src/video_output_opengl_qt.cpp | 12 +-
 4 files changed, 152 insertions(+), 357 deletions(-)
 
@@ -7971,7 +8650,7 @@
 Add a few comments.
 
 src/player_qt.cpp | 11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
+ 1 file changed, 11 insertions(+)
 
 commit 941c3eef54047df89ae9263e6edb6e00634319d2
 Author: Martin Lambers <marlam@marlam.de>
@@ -7983,7 +8662,7 @@
 initial advertisement is not possible anymore.
 
 src/input.cpp | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit c64fae7edf9ca0ab67b20e671e52ebbf936939eb
 Author: Martin Lambers <marlam@marlam.de>
@@ -7998,7 +8677,7 @@
 some of the example videos, and older ffmpeg versions may fail completely.
 
 src/input.cpp | 21 +++++++++++----------
- 1 files changed, 11 insertions(+), 10 deletions(-)
+ 1 file changed, 11 insertions(+), 10 deletions(-)
 
 commit 75a3184971d18e56150b527f7d7077c0d256d02b
 Author: Martin Lambers <marlam@marlam.de>
@@ -8021,7 +8700,7 @@
 Fix centering of video area on screen.
 
 src/video_output_opengl_qt.cpp | 14 ++++++++------
- 1 files changed, 8 insertions(+), 6 deletions(-)
+ 1 file changed, 8 insertions(+), 6 deletions(-)
 
 commit f706f8f1433833392b9ee3606e4607f9b72106d4
 Author: Martin Lambers <marlam@marlam.de>
@@ -8043,7 +8722,7 @@
 MacOSX: Add example port files, to be used with MacPorts.
 
 README.MacOSX | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 96 insertions(+), 0 deletions(-)
+ 1 file changed, 96 insertions(+)
 
 commit 662d8218a6bc343dbe81c9d2fc60fc625e7ebd2b
 Author: Martin Lambers <marlam@marlam.de>
@@ -8064,7 +8743,7 @@
 src/player_qt.cpp | 39 ++++++++--------
 src/player_qt.h | 3 +-
 src/video_output_opengl_qt.cpp | 101 +++++++++++++++++++++++++---------------
- src/video_output_opengl_qt.h | 42 +++++++++++++---
+ src/video_output_opengl_qt.h | 42 +++++++++++++----
 4 files changed, 119 insertions(+), 66 deletions(-)
 
 commit 0c3c8a13147a565717aac57e73c9f3ed56246a69
@@ -8075,7 +8754,7 @@
 
 src/player_qt.cpp | 6 ------
 src/player_qt.h | 2 --
- 2 files changed, 0 insertions(+), 8 deletions(-)
+ 2 files changed, 8 deletions(-)
 
 commit 9c2193619b2c8f69056b546d48deeb5929a0cb36
 Author: Martin Lambers <marlam@marlam.de>
@@ -8084,7 +8763,7 @@
 GUI: Only print warnings to the console by default.
 
 src/main.cpp | 12 ++++++++++--
- 1 files changed, 10 insertions(+), 2 deletions(-)
+ 1 file changed, 10 insertions(+), 2 deletions(-)
 
 commit 72b625f506f28d54bea622a7e4bc51973cd50733
 Author: Martin Lambers <marlam@marlam.de>
@@ -8094,7 +8773,7 @@
 
 src/video_output_opengl.cpp | 2 +-
 src/video_output_opengl_qt.cpp | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletions(-)
+ 2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit a676a0c61eb9358b0aa5309e0022a7f013cd9d9f
 Author: Martin Lambers <marlam@marlam.de>
@@ -8104,7 +8783,7 @@
 
 src/video_output_opengl.cpp | 14 +++++++++++++-
 src/video_output_opengl.h | 1 +
- 2 files changed, 14 insertions(+), 1 deletions(-)
+ 2 files changed, 14 insertions(+), 1 deletion(-)
 
 commit 77dccfbaa4b06fe2b0b27b8b23d6be1a9bb5dabd
 Author: Martin Lambers <marlam@marlam.de>
@@ -8113,7 +8792,7 @@
 Remove unnecessary invalidation of video textures.
 
 src/video_output_opengl_qt.cpp | 3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
+ 1 file changed, 3 deletions(-)
 
 commit a93a202184b0ed05cda0c8ca2b705f2a4db49c66
 Author: Martin Lambers <marlam@marlam.de>
@@ -8122,7 +8801,7 @@
 Deinitialize GL context.
 
 src/video_output_opengl_qt.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit 2b1942d44dcb8ce1bda0b42de804a933d4181c05
 Author: Martin Lambers <marlam@marlam.de>
@@ -8131,7 +8810,7 @@
 GUI: Fix initial dummy video widget size.
 
 src/player_qt.cpp | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 9de1694e1b4716beda182e72c5d3f9dcfaf3e888
 Author: Martin Lambers <marlam@marlam.de>
@@ -8143,7 +8822,7 @@
 was not Equalizer-specific, but was not triggered in other modes.
 
 src/player.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2b0db6401d7351a2d4e1ea2c97c95455977d02ee
 Author: Martin Lambers <marlam@marlam.de>
@@ -8157,7 +8836,7 @@
 getContext() call is made explicit.
 
 src/player_equalizer.cpp | 9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
+ 1 file changed, 8 insertions(+), 1 deletion(-)
 
 commit 82f338c140e7f0841d852776e4a5417d13e283f8
 Author: Martin Lambers <marlam@marlam.de>
@@ -8211,7 +8890,7 @@
 with newer Equalizer versions.
 
 src/player_equalizer.cpp | 4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit 39858255970b62f5ee8c185b86fb8ec1e2d3b1fd
 Author: Martin Lambers <marlam@marlam.de>
@@ -8220,7 +8899,7 @@
 Clear video widget when initializing.
 
 src/video_output_opengl_qt.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit aafa3f8aebf8380162bd5a6a8e4fd0fa7448d06f
 Author: Martin Lambers <marlam@marlam.de>
@@ -8229,7 +8908,7 @@
 GUI: Use sha1-hash of filename to remember input format.
 
 src/player_qt.cpp | 12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
+ 1 file changed, 8 insertions(+), 4 deletions(-)
 
 commit 87702896dc9277dd6b81c875de87d3b96603fa80
 Author: Martin Lambers <marlam@marlam.de>
@@ -8290,7 +8969,7 @@
 
 Makefile.am | 2 +-
 README.MacOSX | 23 +++++++++++++++++++++++
- 2 files changed, 24 insertions(+), 1 deletions(-)
+ 2 files changed, 24 insertions(+), 1 deletion(-)
 
 commit f40d58736fcdbf150ff66bd7ddfb0b54cfcb0d45
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -8299,7 +8978,7 @@
 Equalizer: Fix computation of 3D screen position.
 
 src/player_equalizer.cpp | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit be5f0a6c9ce2b19f106f9de1cce2523aff1dd59c
 Author: Martin Lambers <marlam@marlam.de>
@@ -8310,7 +8989,7 @@
 However, fullscreen still does not work on Windows currently.
 
 src/video_output_opengl_qt.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit 7cc5ff58debb4245ac63349a689dd0727432b793
 Author: Martin Lambers <marlam@marlam.de>
@@ -8319,7 +8998,7 @@
 GUI: Override fullscreen and center settings.
 
 src/main.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit 6b391a2019af773e5232457121a4cb099801144e
 Author: Martin Lambers <marlam@marlam.de>
@@ -8328,7 +9007,7 @@
 Change order of libraries in --version output.
 
 src/lib_versions.cpp | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit af2f947d882f8ef3ab85b596c1b0c34e3e555843
 Author: Martin Lambers <marlam@marlam.de>
@@ -8337,7 +9016,7 @@
 Improve documentation of Windows build.
 
 README.Windows | 5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
+ 1 file changed, 2 insertions(+), 3 deletions(-)
 
 commit 1561142e4b7f7c1cc5db5324e085b6fc5e3c0490
 Author: Martin Lambers <marlam@marlam.de>
@@ -8347,7 +9026,7 @@
 
 Makefile.am | 2 ++
 README.Windows | 39 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 41 insertions(+), 0 deletions(-)
+ 2 files changed, 41 insertions(+)
 
 commit db646ab19e788704969fc2ebff0d0cc862395fa6
 Author: Martin Lambers <marlam@marlam.de>
@@ -8358,7 +9037,7 @@
 src/player_qt.cpp | 1 +
 src/video_output_opengl_qt.cpp | 10 ++++++++++
 src/video_output_opengl_qt.h | 2 ++
- 3 files changed, 13 insertions(+), 0 deletions(-)
+ 3 files changed, 13 insertions(+)
 
 commit 1b1d643e77b281e17975d8754ee39c32e1003922
 Author: Lion-Simba <lion-simba@pridelands.ru>
@@ -8386,7 +9065,7 @@
 doc/Makefile.am | 4 +++-
 doc/multi-display-vrlab.jpg | Bin 0 -> 28237 bytes
 doc/multi-display.txt | 2 ++
- 3 files changed, 5 insertions(+), 1 deletions(-)
+ 3 files changed, 5 insertions(+), 1 deletion(-)
 
 commit a76d18ea6839faeb0ebad8856b26f68737d8f96b
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -8398,7 +9077,7 @@
 doc/multi-display-rotated.jpg | Bin 0 -> 24928 bytes
 doc/multi-display.txt | 113 +++++++++++++++++++++++++++++++++++++++++
 src/player_equalizer.cpp | 8 +++
- 4 files changed, 122 insertions(+), 1 deletions(-)
+ 4 files changed, 122 insertions(+), 1 deletion(-)
 
 commit 6e40db3e5dbd0c5749220941258ae8b1fb2280c5
 Author: Frédéric Devernay <frederic.devernay@inrialpes.fr>
@@ -8410,7 +9089,7 @@
 screen, to avoid tearing effects.
 
 src/video_output_opengl_qt.cpp | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit d3b536103c17163604c419bf2abc6263bac8a66a
 Author: Frédéric Devernay <frederic.devernay@inrialpes.fr>
@@ -8422,7 +9101,7 @@
 line.
 
 src/video_output.cpp | 16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 
 commit d31cce04a73a1b353fa2547029f946daba0f8a2f
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -8431,8 +9110,8 @@
 document equalizer-3d mode
 
 doc/multi-display.txt | 117 ++++++++++++++++++++++++++++++++++++++++++++++
- src/player_equalizer.cpp | 8 +++
- 2 files changed, 125 insertions(+), 0 deletions(-)
+ src/player_equalizer.cpp | 8 ++++
+ 2 files changed, 125 insertions(+)
 
 commit d1c3e84f6fcf4e876de07fd79e8d466997848614
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -8441,7 +9120,7 @@
 document equalizer-3d mode
 
 doc/rotated.jpg | Bin 0 -> 24928 bytes
- 1 files changed, 0 insertions(+), 0 deletions(-)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit 2c50c8997d7e01ac759818e79aadc3de316e2a9b
 Author: Martin Lambers <marlam@marlam.de>
@@ -8453,7 +9132,7 @@
 the use of GLEW in video_output_opengl_qt.
 
 src/player_equalizer.cpp | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
+ 1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit 8832aa87a0fb8b2e0428fade3e116ee42f90d985
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -8464,8 +9143,8 @@
 The new ouput mode 'equalizer-3d' allows to configure non-planar projections.
 
 doc/bino.1 | 4 +-
- doc/multi-display.txt | 8 ++
- src/main.cpp | 19 ++++-
+ doc/multi-display.txt | 8 +++
+ src/main.cpp | 19 +++--
 src/player_equalizer.cpp | 174 +++++++++++++++++++++++++++++++++++++---------
 src/player_equalizer.h | 24 ++++++-
 5 files changed, 190 insertions(+), 39 deletions(-)
@@ -8476,7 +9155,7 @@
 
 Auto-position 3D screen
 
- doc/multi-display.txt | 14 +++++---
+ doc/multi-display.txt | 14 +++++----
 src/player_equalizer.cpp | 78 +++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 78 insertions(+), 14 deletions(-)
 
@@ -8490,7 +9169,7 @@
 
 configure.ac | 1 +
 src/decoder_ffmpeg.cpp | 37 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 38 insertions(+), 0 deletions(-)
+ 2 files changed, 38 insertions(+)
 
 commit eab0c4e9894dd1ca541e937847987d3824e05cc4
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -8499,7 +9178,7 @@
 Document Equalizer3D mode
 
 doc/multi-display.txt | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
+ 1 file changed, 7 insertions(+)
 
 commit 8303dd3e9700b5444e199e2da8ee59365ec1a974
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -8508,7 +9187,7 @@
 Add 3D output screen mode
 
 doc/MacOSX.txt | 2 +-
- src/main.cpp | 16 ++++++-
+ src/main.cpp | 16 ++++++--
 src/player.cpp | 2 +-
 src/player_equalizer.cpp | 93 ++++++++++++++++++++++++++++++++++------------
 src/player_equalizer.h | 2 +-
@@ -8521,7 +9200,7 @@
 Bump version to 0.6.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit dac00ac61561c27be9a01c10bbf8a19594da727f
 Author: Martin Lambers <marlam@marlam.de>
@@ -8545,7 +9224,7 @@
 Decoder: update current position after seek.
 
 src/decoder_ffmpeg.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit 9bafe8ea099bc3de5ed3065df153133ee45fedb5
 Merge: a5319c1 0760462
@@ -8576,7 +9255,7 @@
 OS X/Eq porting
 
 doc/MacOSX.txt | 16 ++++++++++++++++
- 1 files changed, 16 insertions(+), 0 deletions(-)
+ 1 file changed, 16 insertions(+)
 
 commit 07604626831fa832d4fac395f445007856bf94ff
 Author: Martin Lambers <marlam@marlam.de>
@@ -8602,7 +9281,7 @@
 The alignment problem was reported and debugged by Jordanis Kiriakidis.
 
 src/decoder_ffmpeg.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit da8eb469a55f97c2d7ca7e05dc705b9f4d87114f
 Author: Martin Lambers <marlam@marlam.de>
@@ -8611,7 +9290,7 @@
 Use av_malloc/av_free for audio buffers, to avoid alignment issues.
 
 src/decoder_ffmpeg.cpp | 9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
+ 1 file changed, 5 insertions(+), 4 deletions(-)
 
 commit a1116ff28e44393a1fe4f118feb1cbf433e0ae8f
 Author: Martin Lambers <marlam@marlam.de>
@@ -8620,7 +9299,7 @@
 Simplify audio buffer copying.
 
 src/decoder_ffmpeg.cpp | 11 +++++------
- 1 files changed, 5 insertions(+), 6 deletions(-)
+ 1 file changed, 5 insertions(+), 6 deletions(-)
 
 commit 64369d7a3f3fac37ee604e1eef93a73762421a67
 Author: Martin Lambers <marlam@marlam.de>
@@ -8629,7 +9308,7 @@
 GUI: Fix automatic output mode for videos given on the command line.
 
 src/player_qt.cpp | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 commit c23c0c50df4bfb4e4e0fa86de557b72fdcb88688
 Author: Martin Lambers <marlam@marlam.de>
@@ -8638,7 +9317,7 @@
 GUI: Do not clobber video output mode set on the command line.
 
 src/player_qt.cpp | 25 ++++++++++++++-----------
- 1 files changed, 14 insertions(+), 11 deletions(-)
+ 1 file changed, 14 insertions(+), 11 deletions(-)
 
 commit da0a41d79dd6298d2e396b2847e508c9ca170867
 Author: Martin Lambers <marlam@marlam.de>
@@ -8650,7 +9329,7 @@
 mode is set. Problem reported by Jordanis Kiriakidis.
 
 src/player_qt.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 277dc349f6a0e10ce58a7bd7e48ffe47903113d5
 Author: Martin Lambers <marlam@marlam.de>
@@ -8692,7 +9371,7 @@
 Avoid examining DISPLAY on non-X11 platforms when checking the OpenGL version strings.
 
 src/video_output_opengl_qt.cpp | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
+ 1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit 34e74571025d54332f9289d106700da39e961112
 Author: Martin Lambers <marlam@marlam.de>
@@ -8705,20 +9384,20 @@
 
 src/Makefile.am | 1 +
 src/audio_output_openal.cpp | 42 ++++++++++++++++++++++++++++++++
- src/audio_output_openal.h | 3 ++
- src/decoder_ffmpeg.cpp | 15 +++++++++++
+ src/audio_output_openal.h | 3 +++
+ src/decoder_ffmpeg.cpp | 15 ++++++++++++
 src/decoder_ffmpeg.h | 5 ++++
 src/lib_versions.cpp | 52 ++++++++++++++++++++++++++++++++++++++++
- src/lib_versions.h | 28 +++++++++++++++++++++
+ src/lib_versions.h | 28 ++++++++++++++++++++++
 src/main.cpp | 9 ++++++-
- src/player_equalizer.cpp | 11 ++++++++
+ src/player_equalizer.cpp | 11 +++++++++
 src/player_equalizer.h | 5 ++++
- src/player_qt.cpp | 28 ++++++++++++++-------
- src/qt_app.cpp | 11 ++++++++
+ src/player_qt.cpp | 28 +++++++++++++++-------
+ src/qt_app.cpp | 11 +++++++++
 src/qt_app.h | 5 ++++
- src/video_output_opengl.cpp | 7 +++++
+ src/video_output_opengl.cpp | 7 ++++++
 src/video_output_opengl.h | 5 ++++
- src/video_output_opengl_qt.cpp | 44 +++++++++++++++++++++++++++++++++
+ src/video_output_opengl_qt.cpp | 44 ++++++++++++++++++++++++++++++++++
 src/video_output_opengl_qt.h | 5 ++++
 17 files changed, 266 insertions(+), 10 deletions(-)
 
@@ -8729,7 +9408,7 @@
 Bump version to 0.5.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 020d0c2e8e1bebb9447726884def9a1026466d00
 Author: Martin Lambers <marlam@marlam.de>
@@ -8754,7 +9433,7 @@
 Simplify detection of 3dtv.at input formats.
 
 src/input.cpp | 22 ++--------------------
- 1 files changed, 2 insertions(+), 20 deletions(-)
+ 1 file changed, 2 insertions(+), 20 deletions(-)
 
 commit 1e2eb83c131daf3c262d3278f8bc06a511f4f32a
 Author: Martin Lambers <marlam@marlam.de>
@@ -8767,7 +9446,7 @@
 work correctly when started from the GUI.
 
 src/input.cpp | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
+ 1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit 1d8034112fdd5ef4097c91d7ec3afd6a680786d2
 Author: Martin Lambers <marlam@marlam.de>
@@ -8776,7 +9455,7 @@
 Remove debug time measurements from video output code.
 
 src/video_output_opengl.cpp | 10 ----------
- 1 files changed, 0 insertions(+), 10 deletions(-)
+ 1 file changed, 10 deletions(-)
 
 commit 9f961067d04b824c7fc7812cc18d6be96ff9e15b
 Author: Martin Lambers <marlam@marlam.de>
@@ -8785,7 +9464,7 @@
 GUI: Fix resetting of output mode when input mode is changed.
 
 src/player_qt.cpp | 10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
+ 1 file changed, 6 insertions(+), 4 deletions(-)
 
 commit ff0fe87b8868d749ad63932ac2493f4ec61f33e5
 Author: Martin Lambers <marlam@marlam.de>
@@ -8805,7 +9484,7 @@
 Update homepage URL.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7a06e24b91ebb4635ab3d46f76fb448d9c52ba7f
 Author: Martin Lambers <marlam@marlam.de>
@@ -8814,7 +9493,7 @@
 Update README.
 
 README | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit a8cedf42ecbb96695a177b55135ab9a1cf135ca6
 Author: Martin Lambers <marlam@marlam.de>
@@ -8833,7 +9512,7 @@
 Equalizer: minor documentation tweaks.
 
 doc/multi-display.txt | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 1d779ff894a56b9d231dfe53b9f0df071acef92e
 Author: Martin Lambers <marlam@marlam.de>
@@ -8843,7 +9522,7 @@
 
 configure.ac | 2 +-
 doc/Makefile.am | 1 +
- doc/bino.1 | 27 ++++++++-
+ doc/bino.1 | 27 +++++++-
 doc/multi-display.txt | 170 +++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 198 insertions(+), 2 deletions(-)
 
@@ -8854,7 +9533,7 @@
 Equalizer: improve error message.
 
 src/player_equalizer.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit da757ea2a5e96b2664babbb6bb9af456610deaf1
 Author: Martin Lambers <marlam@marlam.de>
@@ -8863,7 +9542,7 @@
 Equalizer: fix synchronized seeking.
 
 src/player.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit afad85e4708b0eef802dd19aefb4609b60d51b25
 Author: Martin Lambers <marlam@marlam.de>
@@ -8884,7 +9563,7 @@
 Equalizer: Move appnode video frame handling from config to node.
 
 src/player_equalizer.cpp | 45 ++++++++++++++++++++++++++++-----------------
- 1 files changed, 28 insertions(+), 17 deletions(-)
+ 1 file changed, 28 insertions(+), 17 deletions(-)
 
 commit 9772b0711cce23bed2fef20cd3f012bf7605660f
 Author: Martin Lambers <marlam@marlam.de>
@@ -8907,10 +9586,10 @@
 
 src/input.cpp | 82 +++++++++++++++++++++++++++++++
 src/input.h | 2 +
- src/main.cpp | 104 +++++++---------------------------------
+ src/main.cpp | 104 +++++++--------------------------------
 src/player_qt.cpp | 23 +++++----
 src/video_output.cpp | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++
- src/video_output.h | 5 ++-
+ src/video_output.h | 5 +-
 6 files changed, 250 insertions(+), 97 deletions(-)
 
 commit e49fcea4a714adb6ed8dcc78daf9f99882a12335
@@ -8920,7 +9599,7 @@
 GUI: Remember the last input mode for each video file.
 
 src/player_qt.cpp | 23 +++++++++++++++++++++--
- 1 files changed, 21 insertions(+), 2 deletions(-)
+ 1 file changed, 21 insertions(+), 2 deletions(-)
 
 commit 9a5727c4608c53ed0b589f958bacb5f30ef9471f
 Author: Martin Lambers <marlam@marlam.de>
@@ -8931,7 +9610,7 @@
 Remember the last video directory and the last 2D and 3D output modes.
 
 src/player_qt.cpp | 124 +++++++++++++++++++++++++++++++++++++++--------------
- src/player_qt.h | 26 ++++++++---
+ src/player_qt.h | 26 +++++++----
 2 files changed, 109 insertions(+), 41 deletions(-)
 
 commit 0ba0570e5947258eec5762bec0375ac5f0093615
@@ -8941,7 +9620,7 @@
 GUI: update video display after stop.
 
 src/video_output_opengl_qt.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit e865ddcc9df05bbece2d2fb2b0dc6e3f0c677355
 Author: Martin Lambers <marlam@marlam.de>
@@ -8960,7 +9639,7 @@
 Equalizer: print informational messages about the canvas.
 
 src/player_equalizer.cpp | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ 1 file changed, 5 insertions(+)
 
 commit d436032e45b51c3f61ac75a213d1925005b34dad
 Author: Martin Lambers <marlam@marlam.de>
@@ -8969,7 +9648,7 @@
 Equalizer: refuse to run if no canvas is found.
 
 src/player_equalizer.cpp | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ 1 file changed, 5 insertions(+)
 
 commit e9d8e293abb4e1a176b9a606f3ffeef5c210018d
 Author: Martin Lambers <marlam@marlam.de>
@@ -8978,7 +9657,7 @@
 Improve warning message.
 
 src/video_output_opengl.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit dadde391069cd527e9fb55bc704fcc2e12f80e1a
 Author: Martin Lambers <marlam@marlam.de>
@@ -9008,7 +9687,7 @@
 Linux.
 
 src/video_output_opengl.cpp | 143 ++++++++++++++++++++++++++++-----------
- src/video_output_opengl.fs.glsl | 141 ++++++++++++++++++++++++++++++++-------
+ src/video_output_opengl.fs.glsl | 141 +++++++++++++++++++++++++++++++-------
 src/video_output_opengl.h | 1 +
 3 files changed, 221 insertions(+), 64 deletions(-)
 
@@ -9020,8 +9699,8 @@
 
 Take the viewport offset into account, not just the window position.
 
- src/video_output_opengl.cpp | 63 ++++++++++++------------------------------
- 1 files changed, 18 insertions(+), 45 deletions(-)
+ src/video_output_opengl.cpp | 63 +++++++++++++------------------------------
+ 1 file changed, 18 insertions(+), 45 deletions(-)
 
 commit 391b808a4bf842b19bf4f60e8c751dfa3995b57b
 Author: Martin Lambers <marlam@marlam.de>
@@ -9083,7 +9762,7 @@
 Fix eye swap.
 
 src/player.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7fe51d3aeb23e524434caf6d2907eb57b848ef13
 Author: Martin Lambers <marlam@marlam.de>
@@ -9091,8 +9770,8 @@
 
 Equalizer: simplify video state handling.
 
- src/player_equalizer.cpp | 82 ++++++++++++++-------------------------------
- 1 files changed, 26 insertions(+), 56 deletions(-)
+ src/player_equalizer.cpp | 82 +++++++++++++++-------------------------------
+ 1 file changed, 26 insertions(+), 56 deletions(-)
 
 commit 6b5ab140103e0d7b1b88ad919c98102aeebc6ddb
 Author: Martin Lambers <marlam@marlam.de>
@@ -9100,7 +9779,7 @@
 
 Equalizer: handle keyboard events.
 
- src/player.cpp | 40 +++++++++--------
+ src/player.cpp | 40 ++++++++--------
 src/player.h | 5 +-
 src/player_equalizer.cpp | 113 ++++++++++++++++++++++++++++++++++++++++++++--
 src/player_qt.cpp | 3 +-
@@ -9117,7 +9796,7 @@
 video, and not the whole video unconditionally. It is now possible to setup
 correct video across multiple displays.
 
- src/player_equalizer.cpp | 68 +++++++++++++++++++++++++++++++++---------
+ src/player_equalizer.cpp | 68 +++++++++++++++++++++++++++++++++----------
 src/video_output_opengl.cpp | 44 ++++++++++++++--------------
 src/video_output_opengl.h | 6 ++--
 3 files changed, 78 insertions(+), 40 deletions(-)
@@ -9129,7 +9808,7 @@
 Equalizer: close the player when done.
 
 src/player_equalizer.cpp | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 commit 60c42d234bbc85418b5b00338f2406cf777127d5
 Author: Martin Lambers <marlam@marlam.de>
@@ -9141,7 +9820,7 @@
 GL_GEOMETRY_SHADER_EXT instead, which has the same value.
 
 src/xgl.cpp | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit b1a287bb9d89b19b1911cd0754d526d0de766c92
 Author: Martin Lambers <marlam@marlam.de>
@@ -9166,7 +9845,7 @@
 Fix building with ffmpeg-0.6.1.
 
 src/decoder_ffmpeg.cpp | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit a308845f7d90395ce2057ca673ad4ad794376326
 Author: Frédéric Dervernay <frederic.devernay@inrialpes.fr>
@@ -9217,7 +9896,7 @@
 This fixes errors with some audio streams.
 
 src/decoder_ffmpeg.cpp | 7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
+ 1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit bbf5b2e0a95fd2cf7a21bf2f69337bf9abcecc6a
 Author: Martin Lambers <marlam@marlam.de>
@@ -9225,15 +9904,15 @@
 
 Accept multiple sample formats from ffmpeg, and let OpenAL resample.
 
- src/audio_output.h | 5 ++-
- src/audio_output_openal.cpp | 59 ++++++++++++++++++++++++++++++++++++++----
- src/audio_output_openal.h | 4 +-
- src/decoder.cpp | 38 +++++++++++++++++++++++++++
- src/decoder.h | 13 ++++++++-
+ src/audio_output.h | 5 ++--
+ src/audio_output_openal.cpp | 59 ++++++++++++++++++++++++++++++++++++++-----
+ src/audio_output_openal.h | 4 +--
+ src/decoder.cpp | 38 ++++++++++++++++++++++++++++
+ src/decoder.h | 13 +++++++++-
 src/decoder_ffmpeg.cpp | 35 +++++++++++++++++++------
 src/decoder_ffmpeg.h | 2 +-
 src/input.cpp | 8 +++---
- src/input.h | 6 ++--
+ src/input.h | 6 ++---
 src/player.cpp | 2 +-
 10 files changed, 144 insertions(+), 28 deletions(-)
 
@@ -9248,8 +9927,8 @@
 not used anymore, and 3) it was wrong because the texture content was lost
 and the next frame displayed was random crap.
 
- src/video_output_opengl_qt.cpp | 70 +++++++++------------------------------
- src/video_output_opengl_qt.h | 4 --
+ src/video_output_opengl_qt.cpp | 70 +++++++++-------------------------------
+ src/video_output_opengl_qt.h | 4 ---
 2 files changed, 16 insertions(+), 58 deletions(-)
 
 commit 29b696c6fcec93f86cbf335477a1985efe0c5dba
@@ -9269,7 +9948,7 @@
 src/video_output_opengl.cpp | 191 ++++++++++++++++++++++++++++------------
 src/video_output_opengl.h | 3 +
 src/video_output_opengl_qt.cpp | 35 +++++---
- src/video_output_opengl_qt.h | 5 +
+ src/video_output_opengl_qt.h | 5 ++
 5 files changed, 169 insertions(+), 67 deletions(-)
 
 commit b600453f99013deb98a907302a02eaeac6c4d773
@@ -9279,7 +9958,7 @@
 Use backward-compatible ffmpeg API for audio sample formats.
 
 src/decoder_ffmpeg.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5a113f9ebc16fbfef2100f0ab0c10c35d70c29e1
 Merge: 2785368 385ffe8
@@ -9297,7 +9976,7 @@
 This reverts commit 796107ec205a0a129383c3dd7d5bf2b0d3c517ed.
 
 configure.ac | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 796107ec205a0a129383c3dd7d5bf2b0d3c517ed
 Author: Martin Lambers <marlam@marlam.de>
@@ -9309,7 +9988,7 @@
 and/or moved around. So now we lost compatibility with ffmpeg-0.6.1.
 
 configure.ac | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 429a99371dfea98db8cf280892fa4933f888cb23
 Author: Martin Lambers <marlam@marlam.de>
@@ -9323,8 +10002,8 @@
 
 configure.ac | 1 -
 src/base/str.cpp | 71 ------------------------------------------------------
- src/base/str.h | 6 ----
- 3 files changed, 0 insertions(+), 78 deletions(-)
+ src/base/str.h | 6 -----
+ 3 files changed, 78 deletions(-)
 
 commit 385ffe898647b12d5e98419de7a8e208233fdc8c
 Author: Martin Lambers <marlam@marlam.de>
@@ -9335,7 +10014,7 @@
 This allows compilation with Qt < 4.6, e.g. for Debian lenny, which uses 4.4.3.
 
 src/player_qt.cpp | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 commit e031438cff89e6090a2b3083a7bc125c006d00c4
 Author: Martin Lambers <marlam@marlam.de>
@@ -9344,7 +10023,7 @@
 Remove forgotten debugging output.
 
 src/decoder_ffmpeg.cpp | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ 1 file changed, 1 deletion(-)
 
 commit 93b7446eb73d07535379b27938056c3d4c95dad6
 Merge: a472f5a 8dc16d4
@@ -9363,7 +10042,7 @@
 some codecs that don't do this.
 
 src/decoder_ffmpeg.cpp | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ 1 file changed, 6 insertions(+)
 
 commit 8dc16d44a2745b8d44fb0cada799df29b106b1fe
 Author: Martin Lambers <marlam@marlam.de>
@@ -9374,7 +10053,7 @@
 Bug reported by Jordanis Kiriakidis.
 
 src/player_qt.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 46b7f38ff5b1fe19ccb2bb0cb8b37e49b9ead854
 Author: Martin Lambers <marlam@marlam.de>
@@ -9386,7 +10065,7 @@
 case provided by Jordanis Kiriakidis.
 
 src/input.cpp | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 5a3974be25e2e0f699b26d858f5070af2c52a740
 Author: Martin Lambers <marlam@marlam.de>
@@ -9397,7 +10076,7 @@
 Most users seem to override the requirement for the SVN version anyway...
 
 configure.ac | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 0ab3ab30bb65b5dec1fcbb305f334087ba412162
 Author: Martin Lambers <marlam@marlam.de>
@@ -9406,7 +10085,7 @@
 Double-check that our OpenGL context has all required capabilities when reinitializing it.
 
 src/video_output_opengl_qt.cpp | 40 +++++++++++++++++++++++++++++-----------
- 1 files changed, 29 insertions(+), 11 deletions(-)
+ 1 file changed, 29 insertions(+), 11 deletions(-)
 
 commit dde79c44986babc9784cae1c35e3edcedb010fc6
 Author: Martin Lambers <marlam@marlam.de>
@@ -9417,7 +10096,7 @@
 Video output is now in sync across nodes.
 
 src/player_equalizer.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 43490427648267cf24b84ffcc6256ca232e961ba
 Author: Martin Lambers <marlam@marlam.de>
@@ -9426,7 +10105,7 @@
 Fix minor inconsistency.
 
 src/player.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 724cfc6ce7fe288f129f443fbd2aeb78794b2f5c
 Author: Martin Lambers <marlam@marlam.de>
@@ -9438,7 +10117,7 @@
 However, video is not yet synchronized, and the output area is not adapted yet.
 
 src/player_equalizer.cpp | 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
+ 1 file changed, 10 insertions(+)
 
 commit 6edaf808f2521c339dc8cc4d8765777b83c15ddf
 Author: Martin Lambers <marlam@marlam.de>
@@ -9447,7 +10126,7 @@
 GUI: Fix a crash when commands are send to a player that is not playing.
 
 src/player_qt.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 52060ce0d56c222e8c12f410c03ebb36f0e5dc35
 Author: Martin Lambers <marlam@marlam.de>
@@ -9456,7 +10135,7 @@
 Make GL context current on de-initialization.
 
 src/video_output_opengl_qt.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 3db0c4ad5a3167acc3e75d1288479e53215c85b9
 Author: Martin Lambers <marlam@marlam.de>
@@ -9465,7 +10144,7 @@
 Make GL context current on re-initialization.
 
 src/video_output_opengl_qt.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 32c1041bad4ad254103fe255936c4b821d742423
 Author: Martin Lambers <marlam@marlam.de>
@@ -9486,8 +10165,8 @@
 Don't do it twice, in case Qt calls initializeGL().
 Also re-resize.
 
- src/video_output_opengl_qt.cpp | 45 +++++++++++++++++++++++++++++----------
- src/video_output_opengl_qt.h | 3 ++
+ src/video_output_opengl_qt.cpp | 45 +++++++++++++++++++++++++++++-----------
+ src/video_output_opengl_qt.h | 3 +++
 2 files changed, 36 insertions(+), 12 deletions(-)
 
 commit 44595b11936da8e8ef52a29a177308c0ded39c76
@@ -9497,7 +10176,7 @@
 Move GL context reinitialization after the QWidget::show() call.
 
 src/video_output_opengl_qt.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 48ea0e38ac61981f384a10a5876ade339c68e2ab
 Author: Martin Lambers <marlam@marlam.de>
@@ -9510,7 +10189,7 @@
 
 src/video_output_opengl_qt.cpp | 9 +++++++++
 src/video_output_opengl_qt.h | 1 +
- 2 files changed, 10 insertions(+), 0 deletions(-)
+ 2 files changed, 10 insertions(+)
 
 commit ea8f198d841d876b47dc766c6a3341b4035f07d8
 Author: Martin Lambers <marlam@marlam.de>
@@ -9519,7 +10198,7 @@
 Fix bug in audio decoding that can cause crashes and inaccuracies.
 
 src/decoder_ffmpeg.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 85c03c506f5cedac4591a7ee4b4a11bea59af093
 Author: Martin Lambers <marlam@marlam.de>
@@ -9528,7 +10207,7 @@
 Equalizer: fix crashes in texture upload.
 
 src/player_equalizer.cpp | 9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
+ 1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit 2bea26f26449ddd3a377d4154ea32f27170396cc
 Author: Martin Lambers <marlam@marlam.de>
@@ -9578,7 +10257,7 @@
 same functions without ARB suffix are not initialized for some reason.
 
 src/video_output_opengl.cpp | 14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
+ 1 file changed, 7 insertions(+), 7 deletions(-)
 
 commit 4251b1011b0641c847d406dde1205b8efd29bc00
 Author: Martin Lambers <marlam@marlam.de>
@@ -9612,7 +10291,7 @@
 And remove nonsense comment about it.
 
 src/controller.cpp | 4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit c91d289360b117a9e0bfd70c282e14a7a4fa2f38
 Author: Martin Lambers <marlam@marlam.de>
@@ -9621,7 +10300,7 @@
 Bump version to 0.3.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 756dd190c499fbfc1e9da4a5188b327ba6e469d1
 Author: Martin Lambers <marlam@marlam.de>
@@ -9644,7 +10323,7 @@
 stream.
 
 src/player.cpp | 4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
+ 1 file changed, 4 deletions(-)
 
 commit 3730f8da01aa99e91c3095b01a5834b7322ceb93
 Author: Martin Lambers <marlam@marlam.de>
@@ -9653,7 +10332,7 @@
 Remove forgotten debugging output.
 
 src/player_qt.cpp | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ 1 file changed, 1 deletion(-)
 
 commit 1fd194a300d4797e051e8e7970fb46bd4ae63c83
 Author: Gabriele Greco <gabrielegreco@gmail.com>
@@ -9706,16 +10385,16 @@
 src/icons/stop.ipe | 403 +++++++++++++++++++++
 src/icons/stop.png | Bin 0 -> 417 bytes
 src/main.cpp | 17 +-
- src/player.cpp | 77 +++--
+ src/player.cpp | 77 ++--
 src/player.h | 24 +-
 src/player_equalizer.cpp | 4 +-
 src/player_qt.cpp | 760 ++++++++++++++++++++++++++++++++++++++++
 src/player_qt.h | 173 +++++++++
 src/qt_resources.qrc | 11 +-
 src/video_output.h | 3 +
- src/video_output_opengl.cpp | 82 +++--
+ src/video_output_opengl.cpp | 82 ++---
 src/video_output_opengl.h | 23 +-
- src/video_output_opengl_qt.cpp | 97 +++++-
+ src/video_output_opengl_qt.cpp | 97 ++++-
 src/video_output_opengl_qt.h | 20 +-
 39 files changed, 4913 insertions(+), 408 deletions(-)
 
@@ -9748,8 +10427,8 @@
 src/Makefile.am | 1 +
 src/qt_app.cpp | 46 ++++++++++++++++++++++++++++++++++++++++
 src/qt_app.h | 29 +++++++++++++++++++++++++
- src/video_output_opengl_qt.cpp | 19 ++++++----------
- src/video_output_opengl_qt.h | 5 +---
+ src/video_output_opengl_qt.cpp | 19 ++++++-----------
+ src/video_output_opengl_qt.h | 5 +----
 5 files changed, 84 insertions(+), 16 deletions(-)
 
 commit 5eca7c925eddea823dd09224d61d2d871013ba2c
@@ -9785,7 +10464,7 @@
 Improve error message when OpenGL stereo mode is not available.
 
 src/video_output_opengl_qt.cpp | 11 ++++++++++-
- 1 files changed, 10 insertions(+), 1 deletions(-)
+ 1 file changed, 10 insertions(+), 1 deletion(-)
 
 commit 45436f20115f941687497e45b67b4dffe8e2eda1
 Author: Martin Lambers <marlam@marlam.de>
@@ -9795,7 +10474,7 @@
 
 src/video_output_opengl_freeglut.cpp | 345 ----------------------------------
 src/video_output_opengl_freeglut.h | 62 ------
- 2 files changed, 0 insertions(+), 407 deletions(-)
+ 2 files changed, 407 deletions(-)
 
 commit ef6c6ead7e8cd293567d61ba8deec8829f561c83
 Author: Martin Lambers <marlam@marlam.de>
@@ -9806,7 +10485,7 @@
 configure.ac | 41 +++--
 src/Makefile.am | 23 ++-
 src/player.cpp | 4 +-
- src/video_output_opengl.cpp | 54 ++++++-
+ src/video_output_opengl.cpp | 54 +++++-
 src/video_output_opengl.h | 8 +-
 src/video_output_opengl_freeglut.cpp | 63 +------
 src/video_output_opengl_qt.cpp | 322 ++++++++++++++++++++++++++++++++++
@@ -9832,21 +10511,21 @@
 
 This does not currently work and is disabled by default.
 
- configure.ac | 36 ++-
+ configure.ac | 36 +-
 src/Makefile.am | 7 +
 src/base/Makefile.am | 4 +
 src/base/s11n.cpp | 235 +++++++++++
- src/base/s11n.h | 152 +++++++
+ src/base/s11n.h | 152 ++++++++
 src/input.h | 5 +
 src/main.cpp | 397 ++++++++-----------
- src/player.cpp | 571 +++++++++++++++++++---------
+ src/player.cpp | 571 ++++++++++++++++++---------
 src/player.h | 77 +++-
 src/player_equalizer.cpp | 715 ++++++++++++++++++++++++++++++++++
 src/player_equalizer.h | 23 ++
 src/video_output.cpp | 11 +
 src/video_output.h | 28 +-
 src/video_output_opengl.cpp | 423 +++-----------------
- src/video_output_opengl.h | 58 ++--
+ src/video_output_opengl.h | 58 +--
 src/video_output_opengl_freeglut.cpp | 398 +++++++++++++++++++
 src/video_output_opengl_freeglut.h | 62 +++
 src/xgl.h | 2 +-
@@ -9859,7 +10538,7 @@
 Avoid dynamic arrays; use a vector instead.
 
 src/video_output_opengl.cpp | 14 ++++++--------
- 1 files changed, 6 insertions(+), 8 deletions(-)
+ 1 file changed, 6 insertions(+), 8 deletions(-)
 
 commit 8827cd7a4f69fa4a56fccb73018b96130fc779cf
 Author: Martin Lambers <marlam@marlam.de>
@@ -9870,7 +10549,7 @@
 Such videos were presented too small before.
 
 src/video_output_opengl.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit f72c254b098402efc7e48d641562c97769c5153d
 Author: Martin Lambers <marlam@marlam.de>
@@ -9879,7 +10558,7 @@
 Fix message about input format.
 
 src/input.cpp | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 83ecb5c6938a14120502c590683eae560bfbcad3
 Author: Martin Lambers <marlam@marlam.de>
@@ -9891,7 +10570,7 @@
 used here: http://3dtv.at/Knowhow/StereoWmvSpec_en.aspx
 
 src/input.cpp | 20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
+ 1 file changed, 20 insertions(+)
 
 commit 63ca251f88921dcecbc437f545a266e9d0256ae5
 Author: Martin Lambers <marlam@marlam.de>
@@ -9900,7 +10579,7 @@
 Fill in homepage field in configure.ac.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 978238715d6844caadf4aba7dabbeaaad6e7f8cc
 Author: Martin Lambers <marlam@marlam.de>
@@ -9909,7 +10588,7 @@
 Bump version to 0.2.
 
 configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7817b3f93503e4a3724713fd49022085ed6756b3
 Author: Martin Lambers <marlam@marlam.de>
@@ -9917,9 +10596,9 @@
 
 Add support for the output formats top-bottom, left-right, and checkerboard.
 
- doc/bino.1 | 3 ++
+ doc/bino.1 | 3 +++
 src/main.cpp | 18 +++++++++++++++
- src/video_output.h | 3 ++
+ src/video_output.h | 3 +++
 src/video_output_opengl.cpp | 52 ++++++++++++++++++++++++++++++++++++++-----
 4 files changed, 70 insertions(+), 6 deletions(-)
 
@@ -9932,7 +10611,7 @@
 Reported by Frédéric Devernay.
 
 src/audio_output_openal.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 678e654dc8746e5e51b0a83630bf984100270190
 Author: Martin Lambers <marlam@marlam.de>
@@ -9946,7 +10625,7 @@
 Based on a suggestion by Frédéric Devernay.
 
 src/xgl.cpp | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ 1 file changed, 1 deletion(-)
 
 commit 3d24015b7df2649d53d73dc79ad551be33a25a4d
 Author: Martin Lambers <marlam@marlam.de>
@@ -9969,7 +10648,7 @@
 Patch by Frédéric Devernay.
 
 src/audio_output_openal.h | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
+ 1 file changed, 2 deletions(-)
 
 commit ff4070a5eea345a3534ea8957b8906ecac1bc5cd
 Author: Martin Lambers <marlam@marlam.de>
@@ -9978,7 +10657,7 @@
 Fix shader compilation for free ATI drivers on Ubuntu 10.10.
 
 src/video_output_opengl.fs.glsl | 30 +++++++++++++++---------------
- 1 files changed, 15 insertions(+), 15 deletions(-)
+ 1 file changed, 15 insertions(+), 15 deletions(-)
 
 commit 2c412477105ebb08f7feae080c80e61fb90052e4
 Author: Martin Lambers <marlam@marlam.de>
@@ -9997,7 +10676,7 @@
 Support OpenGL implementations that do not support non-power-of-two textures.
 
 src/video_output_opengl.cpp | 150 +++++++++++++++++++++++++++++++++----------
- src/video_output_opengl.h | 4 +
+ src/video_output_opengl.h | 4 ++
 2 files changed, 120 insertions(+), 34 deletions(-)
 
 commit f9bcd2131e5fcd43de68d45d5bdfc66b6fbfb2b5
@@ -10017,7 +10696,7 @@
 Remove unused constant.
 
 src/video_output_opengl.fs.glsl | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
+ 1 file changed, 2 deletions(-)
 
 commit 94a71d6d6197097833a4b1c88d85abb96277537b
 Author: Martin Lambers <marlam@marlam.de>
@@ -10026,7 +10705,7 @@
 Add basic README.
 
 README | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
+ 1 file changed, 9 insertions(+)
 
 commit b345c846b859493cd8d6e7114a73f0c150914613
 Author: Martin Lambers <marlam@marlam.de>
@@ -10039,7 +10718,7 @@
 src/player.cpp | 4 ----
 src/video_output.h | 1 -
 src/video_output_opengl.cpp | 10 ----------
- 5 files changed, 0 insertions(+), 18 deletions(-)
+ 5 files changed, 18 deletions(-)
 
 commit 955d15605cf83096055e4ad363acd45952512728
 Author: Martin Lambers <marlam@marlam.de>
@@ -10047,7 +10726,7 @@
 
 Improve / fix yuv<->rgb conversion and yuv color adjustment.
 
- src/video_output_opengl.cpp | 3 +-
+ src/video_output_opengl.cpp | 3 ++-
 src/video_output_opengl.fs.glsl | 57 +++++++++++++--------------------------
 2 files changed, 21 insertions(+), 39 deletions(-)
 
@@ -10058,7 +10737,7 @@
 Improve reporting of warnings for shader compilation.
 
 src/xgl.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit fe57de256ec00994341cb5a38794f21b6def5e96
 Author: Martin Lambers <marlam@marlam.de>
@@ -10068,7 +10747,7 @@
 
 doc/bino.1 | 2 --
 src/main.cpp | 1 -
- 2 files changed, 0 insertions(+), 3 deletions(-)
+ 2 files changed, 3 deletions(-)
 
 commit c5f87a4fb40f21718671971f35b090c0130758f1
 Author: Martin Lambers <marlam@marlam.de>
@@ -10093,8 +10772,8 @@
 src/video_frame_format.h | 29 +++
 src/video_output.h | 9 +-
 src/video_output_opengl.cpp | 407 ++++++++++++++++++++++++---------------
- src/video_output_opengl.fs.glsl | 278 ++++++++++++---------------
- src/video_output_opengl.h | 16 ++-
+ src/video_output_opengl.fs.glsl | 278 ++++++++++++--------------
+ src/video_output_opengl.h | 16 +-
 13 files changed, 618 insertions(+), 446 deletions(-)
 
 commit 41cee5622973cb8ba3b28a449f93d281ea22cd9d
@@ -10104,7 +10783,7 @@
 Remove workarounds for older ffmpeg versions.
 
 src/decoder_ffmpeg.cpp | 43 -------------------------------------------
- 1 files changed, 0 insertions(+), 43 deletions(-)
+ 1 file changed, 43 deletions(-)
 
 commit af9c215741ea989b9cd4abe6cd6ba593492b0c4e
 Author: Martin Lambers <marlam@marlam.de>
@@ -10113,7 +10792,7 @@
 Require recent SVN versions of ffmpeg, and improve error messages for libraries that are not found.
 
 configure.ac | 16 ++++++++++------
- 1 files changed, 10 insertions(+), 6 deletions(-)
+ 1 file changed, 10 insertions(+), 6 deletions(-)
 
 commit a999166526dbf4c625d4addcf60fc51960643207
 Author: Martin Lambers <marlam@marlam.de>
@@ -10174,4 +10853,4 @@
 src/video_output_opengl.h | 84 ++
 src/xgl.cpp | 412 ++++++++++
 src/xgl.h | 161 ++++
- 53 files changed, 14370 insertions(+), 0 deletions(-)
+ 53 files changed, 14370 insertions(+)

bino-1.3.2.tar.xz/Makefile.in -> bino-1.3.3.tar.xz/Makefile.in Changed

bino-1.3.2.tar.xz/NEWS -> bino-1.3.3.tar.xz/NEWS Changed

bino-1.3.2.tar.xz/README.Linux -> bino-1.3.3.tar.xz/README.Linux Changed

bino-1.3.2.tar.xz/README.Windows -> bino-1.3.3.tar.xz/README.Windows Changed

@@ -1,32 +1,30 @@
 You can build a Windows binary using MinGW.
 
-The easiest way to do this is to use a GNU/Linux system with the Mingw-cross-env
-environment (http://www.nongnu.org/mingw-cross-env). This is because
-Mingw-cross-env not only provides a recent version of gcc as a cross compiler,
-but also all required libraries, and the nsis package to build an installer.
+The easiest way to do this is to use a GNU/Linux system with MXE (the M cross
+environment, <http://mxe.cc>). This is because MXE not only provides a recent
+version of gcc as a cross compiler, but also all required libraries, and the
+nsis package to build an installer.
 
-The current development version of Mingw-cross-env should work fine. Revision
-2271 is known to work as of 2012-03-11, so we recommend to use that version.
+The current stable version of MXE should work fine.
 
-Use the following steps to build Bino using a Mingw-cross-env installation in
-/path/to/mingw-cross-env:
+Use the following steps to build Bino using MXE installed in /path/to/mxe:
 
-1. Build the required Mingw-cross-env packages:
+1. Build the required MXE packages:
 
 $ cd /path/to
- $ hg clone -r 2271 http://hg.savannah.nongnu.org/hgweb/mingw-cross-env
- $ cd mingw-cross-env
+ $ git clone -b stable https://github.com/mxe/mxe.git
+ $ cd mxe
 $ make gettext pthreads ffmpeg libass openal glew qt nsis
 
 (If you do not need to build a Bino installer package, you can skip nsis).
 
- Add Mingw-cross-env to your PATH:
- $ export PATH="/path/to/mingw-cross-env/usr/bin:$PATH"
+ Add MXE to your PATH:
+ $ export PATH="/path/to/mxe/usr/bin:$PATH"
 
 2. Build Bino
 
 $ cd /path/to/bino
- $ ./configure --host=i686-pc-mingw32
+ $ ./configure --host=i686-pc-mingw32 --build=`build-aux/config.guess`
 $ make
 
 Optionally build the installer (requires nsis):

bino-1.3.2.tar.xz/aclocal.m4 -> bino-1.3.3.tar.xz/aclocal.m4 Changed

@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -231,12 +232,15 @@
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -246,7 +250,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.11.3], [],
 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -262,19 +266,21 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -356,14 +362,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
+# serial 12
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -403,6 +409,7 @@
 # instance it was reported that on HP-UX the gcc test will end up
 # making a dummy file named `D' -- because `-MD' means `put the output
 # in D'.
+ rm -rf conftest.dir
 mkdir conftest.dir
 # Copy depcomp to subdir because otherwise we won't find it if we're
 # using a relative directory.
@@ -467,7 +474,7 @@
 	break
 fi
 ;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
 # This compiler won't grok `-c -o', but also, the minuso test has
 # not run yet. These depmodes are late enough in the game, and
 # so weak that their functioning should not be impacted.
@@ -532,10 +539,13 @@
 if test "x$enable_dependency_tracking" != xno; then
 am_depcomp="$ac_aux_dir/depcomp"
 AMDEPBACKSLASH='\'
+ am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -757,12 +767,15 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -894,12 +907,15 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -922,13 +938,14 @@
 
 # Helper functions for option handling. -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -936,13 +953,13 @@
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME. Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -953,12 +970,14 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_RUN_LOG(COMMAND)
 # -------------------
 # Run COMMAND, save the exit status in ac_status, and log it.
@@ -1035,13 +1054,13 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 2
 
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
@@ -1056,18 +1075,50 @@
 no) AM_DEFAULT_VERBOSITY=1;;
 *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
+dnl
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+ [am_cv_make_support_nested_variables],
+ [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+ dnl Using `$V' instead of `$(V)' breaks IRIX make.
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -1090,13 +1141,13 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -1105,13 +1156,13 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball. -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1133,10 +1184,11 @@
 # a tarball read from stdin.
 # $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
 m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
 [m4_case([$1], [ustar],, [pax],,
 [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])

bino-1.3.2.tar.xz/config.h.in -> bino-1.3.3.tar.xz/config.h.in Changed

bino-1.3.2.tar.xz/configure -> bino-1.3.3.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.2.
+# Generated by GNU Autoconf 2.68 for Bino 1.3.3.
 #
 # 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.2'
-PACKAGE_STRING='Bino 1.3.2'
+PACKAGE_VERSION='1.3.3'
+PACKAGE_STRING='Bino 1.3.3'
 PACKAGE_BUGREPORT='bino-list@nongnu.org'
 PACKAGE_URL='http://bino3d.org/'
 
@@ -615,6 +615,10 @@
 liblircclient_CFLAGS
 libgl_LIBS
 libgl_CFLAGS
+HAVE_LIBXNVCTRL_FALSE
+HAVE_LIBXNVCTRL_TRUE
+xnvctrl_LDFLAGS
+xnvctrl_CFLAGS
 HAVE_LIBGLEWMX_FALSE
 HAVE_LIBGLEWMX_TRUE
 libglewmx_LIBS
@@ -678,9 +682,12 @@
 CXX
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -783,6 +790,7 @@
 enable_nls
 with_libintl_prefix
 with_equalizer
+with_xnvctrl
 with_liblircclient
 '
 ac_precious_vars='build_alias
@@ -1369,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.2 to adapt to many kinds of systems.
+\`configure' configures Bino 1.3.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1440,7 +1448,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of Bino 1.3.2:";;
+ short | recursive ) echo "Configuration of Bino 1.3.3:";;
 esac
 cat <<\_ACEOF
 
@@ -1467,6 +1475,8 @@
 --without-libintl-prefix don't search for libintl in includedir and libdir
 --without-equalizer Disable multi-display support via Equalizer (enabled
 by default)
+ --with-xnvctrl Enable NVIDIA Quadro SDI output (disabled by
+ default)
 --without-liblircclient Disable remote control support via liblircclient
 (enabled by default)
 
@@ -1602,7 +1612,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-Bino configure 1.3.2
+Bino configure 1.3.3
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2267,11 +2277,42 @@
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_header_mongrel
+
+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_cxx_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_cxx_check_header_compile
 cat >config.log <<_ACEOF
 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.2, which was
+It was created by Bino $as_me 1.3.3, which was
 generated by GNU Autoconf 2.68. Invocation command line was
 
 $ $0 $@
@@ -4678,6 +4719,7 @@
 if test "x$enable_dependency_tracking" != xno; then
 am_depcomp="$ac_aux_dir/depcomp"
 AMDEPBACKSLASH='\'
+ am__nodep='_no'
 fi
 if test "x$enable_dependency_tracking" != xno; then
 AMDEP_TRUE=
@@ -4698,6 +4740,33 @@
 no) AM_DEFAULT_VERBOSITY=1;;
 *) AM_DEFAULT_VERBOSITY=1;;
 esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
 AM_BACKSLASH='\'
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
@@ -4722,7 +4791,7 @@
 
 # Define the identity of the package.
 PACKAGE='bino'
- VERSION='1.3.2'
+ VERSION='1.3.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4752,9 +4821,9 @@
 
 # We need awk for the "check" target. The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5
@@ -4855,6 +4924,7 @@
 # instance it was reported that on HP-UX the gcc test will end up
 # making a dummy file named `D' -- because `-MD' means `put the output
 # in D'.
+ rm -rf conftest.dir
 mkdir conftest.dir
 # Copy depcomp to subdir because otherwise we won't find it if we're
 # using a relative directory.
@@ -4914,7 +4984,7 @@
 	break
 fi
 ;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
 # This compiler won't grok `-c -o', but also, the minuso test has
 # not run yet. These depmodes are late enough in the game, and
 # so weak that their functioning should not be impacted.
@@ -4980,6 +5050,33 @@
 no) AM_DEFAULT_VERBOSITY=1;;
 *) AM_DEFAULT_VERBOSITY=0;;
 esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
 AM_BACKSLASH='\'
 
 ac_ext=cpp
@@ -5252,6 +5349,7 @@
 # instance it was reported that on HP-UX the gcc test will end up
 # making a dummy file named `D' -- because `-MD' means `put the output
 # in D'.
+ rm -rf conftest.dir
 mkdir conftest.dir
 # Copy depcomp to subdir because otherwise we won't find it if we're
 # using a relative directory.
@@ -5311,7 +5409,7 @@
 	break
 fi
 ;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
 # This compiler won't grok `-c -o', but also, the minuso test has
 # not run yet. These depmodes are late enough in the game, and
 # so weak that their functioning should not be impacted.
@@ -9724,6 +9822,107 @@
 
 
 
+# Check whether --with-xnvctrl was given.
+if test "${with_xnvctrl+set}" = set; then :
+ withval=$with_xnvctrl; if test "$withval" = "yes"; then xnvctrl="yes"; else xnvctrl="no"; fi
+else
+ xnvctrl="no"
+fi
+
+if test "$xnvctrl" = "yes"; then
+ CPPFLAGS_BAK="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $libX11_CFLAGS $xnvctrl_CFLAGS"
+
+ for ac_header in NVCtrl.h NVCtrlLib.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <GL/glx.h>
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ HAVE_LIBXNVCTRL=1
+else
+ HAVE_LIBXNVCTRL=0
+fi
+
+done
+
+ if test "$HAVE_LIBXNVCTRL" = "1"; then
+ LDFLAGS_BAK="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $xnvctrl_LDFLAGS"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XNVCTRLQueryAttribute in -lXNVCtrl" >&5
+$as_echo_n "checking for XNVCTRLQueryAttribute in -lXNVCtrl... " >&6; }
+if ${ac_cv_lib_XNVCtrl_XNVCTRLQueryAttribute+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXNVCtrl $libX11_LIBS -lXext $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XNVCTRLQueryAttribute ();
+int
+main ()
+{
+return XNVCTRLQueryAttribute ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_lib_XNVCtrl_XNVCTRLQueryAttribute=yes
+else
+ ac_cv_lib_XNVCtrl_XNVCTRLQueryAttribute=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_XNVCtrl_XNVCTRLQueryAttribute" >&5
+$as_echo "$ac_cv_lib_XNVCtrl_XNVCTRLQueryAttribute" >&6; }
+if test "x$ac_cv_lib_XNVCtrl_XNVCTRLQueryAttribute" = xyes; then :
+ HAVE_LIBXNVCTRL=1
+else
+ HAVE_LIBXNVCTRL=0
+fi
+
+ LDFLAGS="$LDFLAGS_BAK"
+ fi
+ CPPFLAGS="$CPPFLAGS_BAK"
+ if test "$HAVE_LIBXNVCTRL" != "1"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: optional library libXNVCtrl not found" >&5
+$as_echo "$as_me: WARNING: optional library libXNVCtrl not found" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libXNVCtrl is provided by NVIDIA; Ubuntu package: nvidia-settings" >&5
+$as_echo "$as_me: WARNING: libXNVCtrl is provided by NVIDIA; Ubuntu package: nvidia-settings" >&2;}
+ xnvctrl="no"
+ fi
+else
+ HAVE_LIBXNVCTRL=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBXNVCTRL $HAVE_LIBXNVCTRL
+_ACEOF
+
+ if test "$HAVE_LIBXNVCTRL" = "1"; then
+ HAVE_LIBXNVCTRL_TRUE=
+ HAVE_LIBXNVCTRL_FALSE='#'
+else
+ HAVE_LIBXNVCTRL_TRUE='#'
+ HAVE_LIBXNVCTRL_FALSE=
+fi
+
+
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgl" >&5
 $as_echo_n "checking for libgl... " >&6; }
@@ -10007,6 +10206,7 @@
 -o "$HAVE_LIBQTOPENGL" != "1" \
 -o "$HAVE_LIBGLEWMX" != "1" \
 -o $ "$equalizer" = "yes" -a "$HAVE_LIBEQUALIZER" != "1" $ \
+ -o $ "$xnvctrl" = "yes" -a "$HAVE_LIBXNVCTRL" != "1" $ \
 -o $ "$lirc" = "yes" -a "$HAVE_LIBLIRCCLIENT" != "1" $ ; then
 as_fn_error $? "One or more libraries were not found. See messages above." "$LINENO" 5
 fi
@@ -10159,6 +10359,10 @@
 as_fn_error $? "conditional \"HAVE_LIBGLEWMX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_LIBXNVCTRL_TRUE}" && test -z "${HAVE_LIBXNVCTRL_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_LIBXNVCTRL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_LIBLIRCCLIENT_TRUE}" && test -z "${HAVE_LIBLIRCCLIENT_FALSE}"; then
 as_fn_error $? "conditional \"HAVE_LIBLIRCCLIENT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -10572,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.2, which was
+This file was extended by Bino $as_me 1.3.3, which was
 generated by GNU Autoconf 2.68. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
@@ -10639,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.2
+Bino config.status 1.3.3
 configured by $0, generated by GNU Autoconf 2.68,
 with options \\"\$ac_cs_config\\"
 
@@ -11627,6 +11831,7 @@
 
 
 echo "Configuration:"
-echo "NLS: $USE_NLS"
-echo "Equalizer: $equalizer"
-echo "liblircclient: $lirc"
+echo "NLS: $USE_NLS"
+echo "Equalizer: $equalizer"
+echo "NVIDIA Quadro SDI output: $xnvctrl"
+echo "liblircclient: $lirc"

bino-1.3.2.tar.xz/configure.ac -> bino-1.3.3.tar.xz/configure.ac Changed

@@ -7,6 +7,7 @@
 dnl Copyright (C) 2010, 2011, 2012
 dnl Martin Lambers <marlam@marlam.de>
 dnl Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+dnl Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -23,7 +24,7 @@
 
 dnl Autotools init stuff
 AC_PREREQ([2.63])
-AC_INIT([Bino], [1.3.2], [bino-list@nongnu.org], [bino], [http://bino3d.org/])
+AC_INIT([Bino], [1.3.3], [bino-list@nongnu.org], [bino], [http://bino3d.org/])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
@@ -225,6 +226,41 @@
 fi
 AM_CONDITIONAL([HAVE_LIBGLEWMX], [test "$HAVE_LIBGLEWMX" = "1"])
 
+dnl libXNVCtrl
+AC_ARG_WITH([xnvctrl],
+ [AS_HELP_STRING([--with-xnvctrl], [Enable NVIDIA Quadro SDI output (disabled by default)])],
+ [if test "$withval" = "yes"; then xnvctrl="yes"; else xnvctrl="no"; fi], [xnvctrl="no"])
+if test "$xnvctrl" = "yes"; then
+ CPPFLAGS_BAK="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $libX11_CFLAGS $xnvctrl_CFLAGS"
+ AC_SUBST([xnvctrl_CFLAGS])
+ AC_CHECK_HEADERS([NVCtrl.h NVCtrlLib.h],
+ [HAVE_LIBXNVCTRL=1],
+ [HAVE_LIBXNVCTRL=0],
+ [#include <GL/glx.h>])
+ if test "$HAVE_LIBXNVCTRL" = "1"; then
+ LDFLAGS_BAK="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $xnvctrl_LDFLAGS"
+ AC_SUBST([xnvctrl_LDFLAGS])
+ AC_CHECK_LIB([XNVCtrl],
+ [XNVCTRLQueryAttribute],
+ [HAVE_LIBXNVCTRL=1],
+ [HAVE_LIBXNVCTRL=0],
+ [$libX11_LIBS -lXext])
+ LDFLAGS="$LDFLAGS_BAK"
+ fi
+ CPPFLAGS="$CPPFLAGS_BAK"
+ if test "$HAVE_LIBXNVCTRL" != "1"; then
+ AC_MSG_WARN([optional library libXNVCtrl not found])
+ AC_MSG_WARN([libXNVCtrl is provided by NVIDIA; Ubuntu package: nvidia-settings])
+ xnvctrl="no"
+ fi
+else
+ HAVE_LIBXNVCTRL=0
+fi
+AC_DEFINE_UNQUOTED([HAVE_LIBXNVCTRL], [$HAVE_LIBXNVCTRL], [Have NVIDIA libXNVCtrl for Quadro SDI output?])
+AM_CONDITIONAL([HAVE_LIBXNVCTRL], [test "$HAVE_LIBXNVCTRL" = "1"])
+
 dnl OpenGL
 dnl We need to explicitly link with OpenGL since we use its functions directly.
 dnl However, this is most probably not necessary on Windows and Mac OS X (for
@@ -272,6 +308,7 @@
 -o "$HAVE_LIBQTOPENGL" != "1" \
 -o "$HAVE_LIBGLEWMX" != "1" \
 -o $ "$equalizer" = "yes" -a "$HAVE_LIBEQUALIZER" != "1" $ \
+ -o $ "$xnvctrl" = "yes" -a "$HAVE_LIBXNVCTRL" != "1" $ \
 -o $ "$lirc" = "yes" -a "$HAVE_LIBLIRCCLIENT" != "1" $ ; then
 AC_MSG_ERROR([One or more libraries were not found. See messages above.])
 fi
@@ -288,6 +325,7 @@
 
 dnl Print configuration for user to check
 echo "Configuration:"
-echo "NLS: $USE_NLS"
-echo "Equalizer: $equalizer"
-echo "liblircclient: $lirc"
+echo "NLS: $USE_NLS"
+echo "Equalizer: $equalizer"
+echo "NVIDIA Quadro SDI output: $xnvctrl"
+echo "liblircclient: $lirc"

bino-1.3.2.tar.xz/doc/Makefile.in -> bino-1.3.3.tar.xz/doc/Makefile.in Changed

bino-1.3.2.tar.xz/doc/bino.1 -> bino-1.3.3.tar.xz/doc/bino.1 Changed

@@ -50,6 +50,10 @@
 If the input is a device, request the given frame size, e.g. 640x480.
 .IP "\-\-device\-frame\-rate=\fIN\fP/\fID\fP"
 If the input is a device, request the given frame rate, e.g. 25/1.
+.IP "\-\-device\-format=\fIFORMAT\fP"
+Request format \fIdefault\fP or \fImjpeg\fP from device.
+.IP "\-\-read\-commands=\fIFILE\fP"
+Read commands from file.
 .IP "\-\-lirc\-config=\fIFILE\fP"
 Use the given LIRC configuration file. This option can be used more than once.
 .IP "\-v|\-\-video=\fISTREAM\fP"
@@ -203,6 +207,8 @@
 Flip right view vertically when in fullscreen mode.
 .IP "\-\-fullscreen\-flop\-right"
 Flop right view horizontally when in fullscreen mode.
+.IP "\-\-fullscreen\-3dr\-sync"
+Use DLP\*R 3-D Ready Sync when in fullscreen mode.
 .IP "\-z|\-\-zoom=\fIZ\fP"
 Set zoom for videos that are wider than the screen, from 0 (off; show full
 video width) to 1 (full; use full screen height). The default is 0.
@@ -220,6 +226,8 @@
 Set subtitle scale factor.
 .IP "\-\-subtitle\-color=\fICOLOR\fP"
 Set subtitle color, in [AA]RRGGBB format.
+.IP "\-\-subtitle\-shadow=\fI-1|0|1\fP"
+Set subtitle shadow, -1=default, 0=off, 1=on.
 .IP "\-\-subtitle\-parallax=\fIVAL\fP"
 Subtitle parallax adjustment (\-1 to +1).
 .IP "\-P|\-\-parallax=\fIVAL\fP"
@@ -247,7 +255,7 @@
 Toggle fullscreen.
 .IP "c"
 Center window.
-.IP "e"
+.IP "e or F7"
 Swap left/right eye.
 .IP "v"
 Cycle through available video streams.

bino-1.3.2.tar.xz/doc/bino.html -> bino-1.3.3.tar.xz/doc/bino.html Changed

@@ -7,7 +7,7 @@
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <!--
-This manual was last updated 15 March 2012 for version
+This manual was last updated 17 April 2012 for version
 1.3.2 of Bino.
 
 Copyright (C) 2011, 2012
@@ -45,7 +45,7 @@
 
 <h2 class="unnumbered">Bino</h2>
 
-This manual was last updated 15 March 2012 for version
+This manual was last updated 17 April 2012 for version
 1.3.2 of Bino.
 
 Copyright &copy; 2011, 2012
@@ -68,7 +68,8 @@
 <li><a accesskey="3" href="#Input-Layouts">Input Layouts</a>
 <li><a accesskey="4" href="#Output-Techniques">Output Techniques</a>
 <li><a accesskey="5" href="#Interactive-Control">Interactive Control</a>
-<li><a accesskey="6" href="#Camera-Devices">Camera Devices</a>
+<li><a accesskey="6" href="#Scripting">Scripting</a>
+<li><a accesskey="7" href="#Camera-Devices">Camera Devices</a>
 </ul>
 <div class="contents">
 <h2>Table of Contents</h2>
@@ -100,7 +101,11 @@
 <li><a href="#Interactive-Control">5.1 Keyboard Shortcuts</a>
 <li><a href="#Interactive-Control">5.2 Remote Controls</a>
 </li></ul>
-<li><a name="toc_Camera-Devices" href="#Camera-Devices">6 Camera Devices</a>
+<li><a name="toc_Scripting" href="#Scripting">6 Scripting</a>
+<ul>
+<li><a href="#Scripting">6.1 Script Commands</a>
+</li></ul>
+<li><a name="toc_Camera-Devices" href="#Camera-Devices">7 Camera Devices</a>
 </li></ul>
 </div>
 
@@ -172,6 +177,8 @@
 <dt>&lsquo;<samp>--device-type=<var>TYPE</var></samp>&rsquo;<dd>Type of input device: <var>default</var>, <var>firewire</var>, or <var>x11</var>. 
 <dt>&lsquo;<samp>--device-frame-size=<var>W</var>x<var>H</var></samp>&rsquo;<dd>If the input is a device, request the given frame size, e.g. 640x480. 
 <dt>&lsquo;<samp>--device-frame-rate=<var>N</var>/<var>D</var></samp>&rsquo;<dd>If the input is a device, request the given frame rate, e.g. 25/1. 
+ <dt>&lsquo;<samp>--device-format=<var>FORMAT</var></samp>&rsquo;<dd>Request format <var>default</var> or <var>mjpeg</var> from device. 
+ <dt>&lsquo;<samp>--read-commands=<var>FILE</var></samp>&rsquo;<dd>Read commands from file. See <a href="#Scripting">Scripting</a>. 
 <dt>&lsquo;<samp>--lirc-config=<var>FILE</var></samp>&rsquo;<dd>Use the given LIRC configuration file. This option can be used more than once. 
 <dt>&lsquo;<samp>-v</samp>&rsquo;<dt>&lsquo;<samp>--video=<var>STREAM</var></samp>&rsquo;<dd>Select video stream (1-n, depending on the input). 
 <dt>&lsquo;<samp>-a</samp>&rsquo;<dt>&lsquo;<samp>--audio=<var>STREAM</var></samp>&rsquo;<dd>Select audio stream (1-n, depending on the input). 
@@ -187,6 +194,7 @@
 <dt>&lsquo;<samp>--fullscreen-flop-left</samp>&rsquo;<dd>Flop left view horizontally when in fullscreen mode. 
 <dt>&lsquo;<samp>--fullscreen-flip-right</samp>&rsquo;<dd>Flip right view vertically when in fullscreen mode. 
 <dt>&lsquo;<samp>--fullscreen-flop-right</samp>&rsquo;<dd>Flop right view horizontally when in fullscreen mode. 
+ <dt>&lsquo;<samp>--fullscreen-3dr-sync</samp>&rsquo;<dd>Use DLP&reg; 3-D Ready Sync when in fullscreen mode. 
 <dt>&lsquo;<samp>-z</samp>&rsquo;<dt>&lsquo;<samp>--zoom=<var>Z</var></samp>&rsquo;<dd>Set zoom for videos that are wider than the screen, from 0 (off; show full
 video width) to 1 (full; use full screen height). The default is 0. 
 <dt>&lsquo;<samp>-C</samp>&rsquo;<dt>&lsquo;<samp>--crop=<var>W:H</var></samp>&rsquo;<dd>Crop the video to the given aspect ratio, to remove borders. 0:0 disables cropping. 
@@ -196,6 +204,7 @@
 <dt>&lsquo;<samp>--subtitle-size=<var>N</var></samp>&rsquo;<dd>Set subtitle font size. 
 <dt>&lsquo;<samp>--subtitle-scale=<var>S</var></samp>&rsquo;<dd>Set subtitle scale factor. 
 <dt>&lsquo;<samp>--subtitle-color=<var>COLOR</var></samp>&rsquo;<dd>Set subtitle color, in [AA]RRGGBB format. 
+ <dt>&lsquo;<samp>--subtitle-shadow=<var>-1|0|1</var></samp>&rsquo;<dd>Set subtitle shadow, -1=default, 0=off, 1=on. 
 <dt>&lsquo;<samp>--subtitle-parallax=<var>VAL</var></samp>&rsquo;<dd>Subtitle parallax adjustment (-1 to +1). 
 <dt>&lsquo;<samp>-P</samp>&rsquo;<dt>&lsquo;<samp>--parallax=<var>VAL</var></samp>&rsquo;<dd>Parallax adjustment (-1 to +1). 
 <dt>&lsquo;<samp>--crosstalk=<var>VAL</var></samp>&rsquo;<dd>Crosstalk leak level (0 to 1). Comma-separated values for the R,G,B channels. 
@@ -235,6 +244,7 @@
 
 <h3 class="section">3.2 Supported Input Layouts</h3>
 
+<a name="Supported-Input-Layouts"></a>
 <dl>
 <dt><var>mono</var><dd>Single view (2D conventional video). 
 <img src="input-layout-mono.png" alt="input-layout-mono.png">
@@ -349,6 +359,7 @@
 
 <h3 class="section">4.2 Supported Output Techniques</h3>
 
+<a name="Supported-Output-Techniques"></a>
 <dl>
 <dt><var>stereo</var><dd>OpenGL quad-buffer stereo. 
 <img src="output-type-stereo.png" alt="output-type-stereo.png">
@@ -768,7 +779,7 @@
 <div class="node">
 <a name="Interactive-Control"></a>
 <hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Camera-Devices">Camera Devices</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#Scripting">Scripting</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#Output-Techniques">Output Techniques</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 
@@ -787,10 +798,10 @@
 <dt><kbd>p</kbd> <dt><kbd>SPACE</kbd><dd>Pause / unpause. 
 <dt><kbd>f</kbd><dd>Toggle fullscreen. 
 <dt><kbd>c</kbd><dd>Center window. 
- <dt><kbd>e</kbd><dd>Swap left/right eye. 
+ <dt><kbd>e</kbd> <dt><kbd>F7</kbd><dd>Swap left/right eye. 
 <dt><kbd>v</kbd><dd>Cycle through available video streams. 
 <dt><kbd>a</kbd><dd>Cycle through available audio streams. 
- <dt><kbd>a</kbd><dd>Cycle through available subtitle streams. 
+ <dt><kbd>s</kbd><dd>Cycle through available subtitle streams. 
 <dt><kbd>1, 2</kbd><dd>Adjust contrast. 
 <dt><kbd>3, 4</kbd><dd>Adjust brightness. 
 <dt><kbd>5, 6</kbd><dd>Adjust hue. 
@@ -817,50 +828,181 @@
 &lsquo;<samp>--lirc-config</samp>&rsquo; option to use one or more custom LIRC configuration files
 instead.
 
- The following commands are available:
+ The available commands are the same commands that are available for scripting. 
+See <a href="#Script-Commands">Script Commands</a>.
+
+ Example LIRC configuration file excerpt:
+<pre class="example"> begin
+ remote = ...
+ button = ...
+ prog = bino
+ config = adjust-brightness +0.05
+ end
+</pre>
+ <div class="node">
+<a name="Scripting"></a>
+<hr>
+Next:&nbsp;<a rel="next" accesskey="n" href="#Camera-Devices">Camera Devices</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#Interactive-Control">Interactive Control</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
+
+</div>
+
+<h2 class="chapter">6 Scripting</h2>
+
+Bino can read commands from one or multiple script files. Use the &lsquo;<samp>--read-commands</samp>&rsquo;
+option to specify script files.
+
+ Available script commands are listed below. See <a href="#Script-Commands">Script Commands</a>.
+
+ A script file can be a standard text file, but it can also be a named pipe,
+which allows other programs or scripts to submit commands to Bino as they see
+fit.
+
+<pre class="example"> $ mkfifo ~/bino-command-fifo
+ $ bino --read-commands ~/bino-command-fifo &amp;
+ 
+ $ echo 'set-contrast 0.1' &gt; ~/bino-command-fifo
+ $ ...
+</pre>
+ Using the &lsquo;<samp>netcat</samp>&rsquo; utility, this also works over the network.
+
+<pre class="example"> $ mkfifo ~/bino-command-fifo
+ $ bino --read-commands ~/bino-command-fifo &amp;
+ 
+ $ nc -l 1234 &gt; ~/bino-command-fifo &amp;
+ $ telnet localhost 1234
+ set-contrast 0.1
+ ...
+</pre>
+ Here is a simple example script file:
+<pre class="example"> # Play all videos in fullscreen mode.
+ toggle-fullscreen
+ # Open the first video.
+ open /path/to/video.webm
+ # Start playing.
+ play
+ # Wait until the video finishes before continuing this script.
+ wait stop
+ # Open a second video. This one has a space in its file name.
+ open /path/to/video%20file.webm
+ # Start playing.
+ play
+ # Immediately increase brightness.
+ adjust-brightness +0.1
+ # Immediately seek to 60 seconds within the video.
+ seek 60.0
+ # Let the video play for 30.0 seconds before continuing with this script.
+ wait 30.0
+ # Open a third video. This one has left and right view in separate files.
+ open /path/to/left.webm /path/to/right.webm
+ # Start playing.
+ play
+</pre>
+ This script is executed with the following command. The &lsquo;<samp>--no-gui</samp>&rsquo; option
+is not necessary, but prevents the GUI to remember the changed brightness
+setting in future sessions.
+<pre class="example"> $ bino --read-commands /path/to/script.txt --no-gui
+</pre>
+ <h3 class="section">6.1 Script Commands</h3>
+
+<a name="Script-Commands"></a>One script line defines exactly one script command. Empty lines or lines
+starting with the &lsquo;<samp>#</samp>&rsquo; character are comment lines and define the
+&lsquo;<samp>noop</samp>&rsquo; command, which has no effect.
 
 <dl>
-<dt>&lsquo;<samp>play</samp>&rsquo;<dd>Start playback, or exit pause mode. 
- <dt>&lsquo;<samp>pause</samp>&rsquo;<dd>When playing, go into pause mode. 
+<dt>&lsquo;<samp>noop</samp>&rsquo;<dd>This command has no effect. 
+ <dt>&lsquo;<samp>quit</samp>&rsquo;<dd>Quit the application. 
+ <dt>&lsquo;<samp>wait <var>stop</var>|<var>seconds</var></samp>&rsquo;<dd>Wait until the currently playing video stops, or wait for the given number of seconds,
+before processing more commands from this file, script, or FIFO. 
+(This command is not available for LIRC remote controls.) 
+ <dt>&lsquo;<samp>open [<var>option</var>...] <var>file</var>...</samp>&rsquo;<dd>Open the given files. 
+You can use percent-encoding to encode special characters. 
+See <a href="http://en.wikipedia.org/wiki/Percent_encoding">http://en.wikipedia.org/wiki/Percent_encoding</a>. 
+Use this if the file names contain whitespace. 
+To open devices, the following options are available, analogous to the command
+line options with the same name:
+	
+ <dl>
+	<dt>&lsquo;<samp>--device-type=<var>none</var>|<var>default</var>|<var>firewire</var>|<var>x11</var></samp>&rsquo;	 <dt>&lsquo;<samp>--device-frame-size=<var>W</var>x<var>H</var></samp>&rsquo;	 <dt>&lsquo;<samp>--device-frame-rate=<var>N</var>/<var>D</var></samp>&rsquo;	 <dt>&lsquo;<samp>--device-format=<var>default</var>|<var>mjpeg</var></samp>&rsquo;<dd>	</dl>
+ <dt>&lsquo;<samp>close</samp>&rsquo;<dd>Close the currently opened input. 
+ <dt>&lsquo;<samp>toggle-play</samp>&rsquo;<dd>Toggle playback. 
+ <dt>&lsquo;<samp>play</samp>&rsquo;<dd>Start playback, or exit pause mode. 
 <dt>&lsquo;<samp>stop</samp>&rsquo;<dd>Stop playback. 
+ <dt>&lsquo;<samp>toggle-pause</samp>&rsquo;<dd>Toggle pause mode. 
+ <dt>&lsquo;<samp>pause</samp>&rsquo;<dd>When playing, go into pause mode. 
+ <dt>&lsquo;<samp>step</samp>&rsquo;<dd>Single-step to the next video frame. 
+ <dt>&lsquo;<samp>seek <var>delta</var></samp>&rsquo;<dd>Seek by the given number of seconds relative to the current position. For
+example -60.0 seeks backwards one minute, and +600.0 seeks forward ten minutes. 
+ <dt>&lsquo;<samp>set-pos <var>pos</var></samp>&rsquo;<dd>Seek by setting an absolute position in the stream, with <var>pos</var> between 0 and
+1. For example, to seek to the middle of the video, use 0.5. 
+ <dt>&lsquo;<samp>set-audio-device <var>dev</var></samp>&rsquo;<dd>Set the audio device to the one with the given index. 
+ <dt>&lsquo;<samp>set-stereo-mode <var>mode</var></samp>&rsquo;<dd>Set the stereo mode. See <a href="#Supported-Output-Techniques">Supported Output Techniques</a>. 
+ <dt>&lsquo;<samp>set-stereo-mode-swap <var>swap</var></samp>&rsquo;<dd>Set stereo mode left/right swap (on or off). 
+ <dt>&lsquo;<samp>toggle-stereo-mode-swap</samp>&rsquo;<dd>Toggle stereo mode left/right swap. 
+ <dt>&lsquo;<samp>set-crosstalk <var>cr</var> <var>cg</var> <var>cb</var></samp>&rsquo;<dd>Set display crosstalk levels for red, green, and blue. Each value must be between 0 and 1. 
+ <dt>&lsquo;<samp>set-fullscreen-screens <var>screens</var></samp>&rsquo;<dd>Set screens to use in fullscreen mode. The value is an integer in which bits
+are set for each screen that should be used (screen 1 = lowest bit). The value
+0 means the default screen. 
+ <dt>&lsquo;<samp>set-fullscreen-flip-left <var>b</var></samp>&rsquo;<dd>Set fullscreen flip left (on or off). 
+ <dt>&lsquo;<samp>set-fullscreen-flop-left<var>b</var></samp>&rsquo;<dd>Set fullscreen flop left (on or off). 
+ <dt>&lsquo;<samp>set-fullscreen-flip-right <var>b</var></samp>&rsquo;<dd>Set fullscreen flip right (on or off). 
+ <dt>&lsquo;<samp>set-fullscreen-flop-right <var>b</var></samp>&rsquo;<dd>Set fullscreen flop right (on or off). 
+ <dt>&lsquo;<samp>set-fullscreen-inhibit-screensaver <var>b</var></samp>&rsquo;<dd>Set fullscreen inhibit screensaver (on or off). 
+ <dt>&lsquo;<samp>set-fullscreen-3dr-sync <var>b</var></samp>&rsquo;<dd>Set fullscreen DLP&reg; 3-D Ready Sync (on or off). 
+ <dt>&lsquo;<samp>set-contrast <var>value</var></samp>&rsquo;<dd>Set contrast to the given <var>value</var>, from -1 to +1. 
+ <dt>&lsquo;<samp>adjust-contrast <var>delta</var></samp>&rsquo;<dd>Adjust contrast by adding <var>delta</var>, e.g. -0.05 or +0.05. 
+ <dt>&lsquo;<samp>set-brightness <var>value</var></samp>&rsquo;<dd>Set brightness to the given <var>value</var>, from -1 to +1. 
+ <dt>&lsquo;<samp>adjust-brightness <var>delta</var></samp>&rsquo;<dd>Adjust brightness by adding <var>delta</var>, e.g. -0.05 or +0.05. 
+ <dt>&lsquo;<samp>set-hue <var>value</var></samp>&rsquo;<dd>Set hue to the given <var>value</var>, from -1 to +1. 
+ <dt>&lsquo;<samp>adjust-hue <var>delta</var></samp>&rsquo;<dd>Adjust hue by adding <var>delta</var>, e.g. -0.05 or +0.05. 
+ <dt>&lsquo;<samp>set-saturation <var>value</var></samp>&rsquo;<dd>Set saturation to the given <var>value</var>, from -1 to +1. 
+ <dt>&lsquo;<samp>adjust-saturation <var>delta</var></samp>&rsquo;<dd>Adjust saturation by adding <var>delta</var>, e.g. -0.05 or +0.05. 
+ <dt>&lsquo;<samp>set-zoom <var>value</var></samp>&rsquo;<dd>Set zoom to the given <var>value</var>, from 0 to 1. 
+ <dt>&lsquo;<samp>adjust-zoom <var>delta</var></samp>&rsquo;<dd>Adjust zoom by adding <var>delta</var>, e.g. -0.05 or +0.05. 
+ <dt>&lsquo;<samp>set-loop-mode <var>mode</var></samp>&rsquo;<dd>Set loop mode to &lsquo;<samp>off</samp>&rsquo; or &lsquo;<samp>current</samp>&rsquo;. 
+ <dt>&lsquo;<samp>set-audio-delay <var>seconds</var></samp>&rsquo;<dd>Set audio delay. 
+ <dt>&lsquo;<samp>set-subtitle-encoding <var>enc</var></samp>&rsquo;<dd>Set subtitle encoding. An empty value means to use the default. 
+ <dt>&lsquo;<samp>set-subtitle-font <var>font</var></samp>&rsquo;<dd>Set subtitle font. An empty value means to use the default. 
+ <dt>&lsquo;<samp>set-subtitle-size <var>size</var></samp>&rsquo;<dd>Set the subtitle font size. The value is an integer, e.g. 12. 
+Use -1 to keep the default size. 
+ <dt>&lsquo;<samp>set-subtitle-color <var>color</var></samp>&rsquo;<dd>Set the subtitle color as an integer that represents an RGB color. 
+Use a value larger than UINT32_MAX to keep the default color. 
+ <dt>&lsquo;<samp>set-subtitle-shadow <var>mode</var></samp>&rsquo;<dd>Set subtitle shadow to force-on (1), force-off (0), or default (-1). 
+ <dt>&lsquo;<samp>set-video-stream <var>stream</var></samp>&rsquo;<dd>Set video stream. Stream numbers start with 0. 
 <dt>&lsquo;<samp>cycle-video-stream</samp>&rsquo;<dd>Cycle through available video streams. 
+ <dt>&lsquo;<samp>set-audio-stream <var>stream</var></samp>&rsquo;<dd>Set audio stream. Stream numbers start with 0. 
 <dt>&lsquo;<samp>cycle-audio-stream</samp>&rsquo;<dd>Cycle through available audio streams. 
+ <dt>&lsquo;<samp>set-subtitle-stream <var>stream</var></samp>&rsquo;<dd>Set subtitle stream. Stream numbers start with 0. Using -1 disables subtitles. 
 <dt>&lsquo;<samp>cycle-subtitle-stream</samp>&rsquo;<dd>Cycle through available subtitle streams. 
- <dt>&lsquo;<samp>toggle-stereo-mode-swap</samp>&rsquo;<dd>Swap left/right eye. 
+ <dt>&lsquo;<samp>set-stereo-layout <var>layout</var></samp>&rsquo;<dd>Set stereo layout. See <a href="#Supported-Input-Layouts">Supported Input Layouts</a>. Note that here only the
+left first, right second modes are supported. To get the right first, left second
+modes, use &lsquo;<samp>set-stereo-layout-swap</samp>&rsquo;. 
+ <dt>&lsquo;<samp>set-stereo-layout-swap <var>b</var></samp>&rsquo;<dd>Set stereo layout swap (on or off). 
+ <dt>&lsquo;<samp>set-crop-aspect-ratio <var>ar</var></samp>&rsquo;<dd>Set crop aspect ratio, either as a floating point number (e.g. 1.78), or as a
+ratio (e.g. 16:9). 
+ <dt>&lsquo;<samp>set-parallax <var>value</var></samp>&rsquo;<dd>Set parallax, from -1 to +1. 
+ <dt>&lsquo;<samp>adjust-parallax <var>delta</var></samp>&rsquo;<dd>Adjust parallax by adding <var>delta</var>, e.g. -0.05 or + 0.05. 
+ <dt>&lsquo;<samp>set-ghostbust <var>value</var></samp>&rsquo;<dd>Set ghostbust, from -1 to +1. 
+ <dt>&lsquo;<samp>adjust-ghostbust <var>delta</var></samp>&rsquo;<dd>Adjust ghostbust by adding <var>delta</var>, e.g. -0.05 or + 0.05. 
+ <dt>&lsquo;<samp>set-subtitle-parallax <var>value</var></samp>&rsquo;<dd>Set subtitle parallax, from -1 to +1. 
+ <dt>&lsquo;<samp>adjust-subtitle-parallax <var>delta</var></samp>&rsquo;<dd>Adjust subtitle parallax by adding <var>delta</var>, e.g. -0.05 or + 0.05. 
 <dt>&lsquo;<samp>toggle-fullscreen</samp>&rsquo;<dd>Toggle fullscreen. 
 <dt>&lsquo;<samp>center</samp>&rsquo;<dd>Center window. 
- <dt>&lsquo;<samp>adjust-zoom <var>delta</var></samp>&rsquo;<dd>Adjust zoom for wide videos by adding <var>delta</var>, e.g. -0.1 or +0.1. 
- <dt>&lsquo;<samp>adjust-contrast <var>delta</var></samp>&rsquo;<dd>Adjust contrast by adding <var>delta</var>, e.g. -0.05 or +0.05. 
- <dt>&lsquo;<samp>adjust-brightness <var>delta</var></samp>&rsquo;<dd>Adjust brightness by adding <var>delta</var>, e.g. -0.05 or +0.05. 
- <dt>&lsquo;<samp>adjust-hue <var>delta</var></samp>&rsquo;<dd>Adjust hue by adding <var>delta</var>, e.g. -0.05 or +0.05. 
- <dt>&lsquo;<samp>adjust-saturation <var>delta</var></samp>&rsquo;<dd>Adjust saturation by adding <var>delta</var>, e.g. -0.05 or +0.05. 
- <dt>&lsquo;<samp>adjust-parallax <var>delta</var></samp>&rsquo;<dd>Adjust parallax by adding <var>delta</var>, e.g. -0.01 or +0.01. 
- <dt>&lsquo;<samp>adjust-subtitle-parallax <var>delta</var></samp>&rsquo;<dd>Adjust contrast by adding <var>delta</var>, e.g. -0.01 or +0.01. 
- <dt>&lsquo;<samp>seek <var>delta</var></samp>&rsquo;<dd>Seek by the given number of seconds relative to the current position. For
-example -60.0 seeks backwards one minute, and +60.0 seeks forward one minute. 
- <dt>&lsquo;<samp>set-pos <var>pos</var></samp>&rsquo;<dd>Seek by setting an absolute position in the stream, with <var>pos</var> between 0 and
-1. For example, to seek to the middle of the video, use 0.5. 
+ <dt>&lsquo;<samp>set-audio-volume <var>value</var></samp>&rsquo;<dd>Set audio volume, from 0 to 1. 
 <dt>&lsquo;<samp>adjust-audio-volume <var>delta</var></samp>&rsquo;<dd>Adjust audio volume by adding <var>delta</var>, e.g. -0.05 or +0.05. 
 <dt>&lsquo;<samp>toggle-audio-mute</samp>&rsquo;<dd>Toggle audio mute. 
 </dl>
 
- Example LIRC configuration file excerpt:
-<pre class="example"> begin
- remote = ...
- button = ...
- prog = bino
- config = adjust-brightness +0.05
- end
-</pre>
- <div class="node">
+<div class="node">
 <a name="Camera-Devices"></a>
 <hr>
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Interactive-Control">Interactive Control</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#Scripting">Scripting</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 
 </div>
 
-<h2 class="chapter">6 Camera Devices</h2>
+<h2 class="chapter">7 Camera Devices</h2>
 
 Bino supports the following types of camera devices:
 <ul>

bino-1.3.2.tar.xz/doc/bino.info -> bino-1.3.3.tar.xz/doc/bino.info Changed

@@ -1,7 +1,7 @@
 This is ../../sources/bino/doc/bino.info, produced by makeinfo version
 4.13 from ../../sources/bino/doc/bino.texi.
 
-This manual was last updated 15 March 2012 for version 1.3.2 of Bino.
+This manual was last updated 17 April 2012 for version 1.3.3 of Bino.
 
 Copyright (C) 2011, 2012 Martin Lambers (<marlam@marlam.de>), Stefan
 Eilemann (<eile@eyescale.ch>), Frédéric Devernay
@@ -23,7 +23,7 @@
 Bino
 ****
 
-This manual was last updated 15 March 2012 for version 1.3.2 of Bino.
+This manual was last updated 17 April 2012 for version 1.3.3 of Bino.
 
 Copyright (C) 2011, 2012 Martin Lambers (<marlam@marlam.de>), Stefan
 Eilemann (<eile@eyescale.ch>), Frédéric Devernay
@@ -41,6 +41,7 @@
 * Input Layouts::
 * Output Techniques::
 * Interactive Control::
+* Scripting::
 * Camera Devices::
 
 &#x1f;
@@ -130,6 +131,12 @@
 `--device-frame-rate=N/D'
 If the input is a device, request the given frame rate, e.g. 25/1.
 
+`--device-format=FORMAT'
+ Request format DEFAULT or MJPEG from device.
+
+`--read-commands=FILE'
+ Read commands from file. *Note Scripting::.
+
 `--lirc-config=FILE'
 Use the given LIRC configuration file. This option can be used
 more than once.
@@ -179,6 +186,9 @@
 `--fullscreen-flop-right'
 Flop right view horizontally when in fullscreen mode.
 
+`--fullscreen-3dr-sync'
+ Use DLP(R) 3-D Ready Sync when in fullscreen mode.
+
 `-z'
 `--zoom=Z'
 Set zoom for videos that are wider than the screen, from 0 (off;
@@ -209,6 +219,9 @@
 `--subtitle-color=COLOR'
 Set subtitle color, in [AA]RRGGBB format.
 
+`--subtitle-shadow=-1|0|1'
+ Set subtitle shadow, -1=default, 0=off, 1=on.
+
 `--subtitle-parallax=VAL'
 Subtitle parallax adjustment (-1 to +1).
 
@@ -922,7 +935,7 @@
 }
 
 &#x1f;
-File: bino.info, Node: Interactive Control, Next: Camera Devices, Prev: Output Techniques, Up: Top
+File: bino.info, Node: Interactive Control, Next: Scripting, Prev: Output Techniques, Up: Top
 
 5 Interactive Control
 *********************
@@ -951,6 +964,8 @@
 Center window.
 
 `e'
+
+`F7'
 Swap left/right eye.
 
 `v'
@@ -959,7 +974,7 @@
 `a'
 Cycle through available audio streams.
 
-`a'
+`s'
 Cycle through available subtitle streams.
 
 `1, 2'
@@ -1017,65 +1032,298 @@
 `--lirc-config' option to use one or more custom LIRC configuration
 files instead.
 
- The following commands are available:
+ The available commands are the same commands that are available for
+scripting. *Note Script Commands::.
+
+ Example LIRC configuration file excerpt:
+ begin
+ remote = ...
+ button = ...
+ prog = bino
+ config = adjust-brightness +0.05
+ end
+
+&#x1f;
+File: bino.info, Node: Scripting, Next: Camera Devices, Prev: Interactive Control, Up: Top
+
+6 Scripting
+***********
+
+Bino can read commands from one or multiple script files. Use the
+`--read-commands' option to specify script files.
+
+ Available script commands are listed below. *Note Script Commands::.
+
+ A script file can be a standard text file, but it can also be a
+named pipe, which allows other programs or scripts to submit commands
+to Bino as they see fit.
+
+ $ mkfifo ~/bino-command-fifo
+ $ bino --read-commands ~/bino-command-fifo &
+
+ $ echo 'set-contrast 0.1' > ~/bino-command-fifo
+ $ ...
+
+ Using the `netcat' utility, this also works over the network.
+
+ $ mkfifo ~/bino-command-fifo
+ $ bino --read-commands ~/bino-command-fifo &
+
+ $ nc -l 1234 > ~/bino-command-fifo &
+ $ telnet localhost 1234
+ set-contrast 0.1
+ ...
+
+ Here is a simple example script file:
+ # Play all videos in fullscreen mode.
+ toggle-fullscreen
+ # Open the first video.
+ open /path/to/video.webm
+ # Start playing.
+ play
+ # Wait until the video finishes before continuing this script.
+ wait stop
+ # Open a second video. This one has a space in its file name.
+ open /path/to/video%20file.webm
+ # Start playing.
+ play
+ # Immediately increase brightness.
+ adjust-brightness +0.1
+ # Immediately seek to 60 seconds within the video.
+ seek 60.0
+ # Let the video play for 30.0 seconds before continuing with this script.
+ wait 30.0
+ # Open a third video. This one has left and right view in separate files.
+ open /path/to/left.webm /path/to/right.webm
+ # Start playing.
+ play
+
+ This script is executed with the following command. The `--no-gui'
+option is not necessary, but prevents the GUI to remember the changed
+brightness setting in future sessions.
+ $ bino --read-commands /path/to/script.txt --no-gui
+
+6.1 Script Commands
+===================
+
+One script line defines exactly one script command. Empty lines or
+lines starting with the `#' character are comment lines and define the
+`noop' command, which has no effect.
+
+`noop'
+ This command has no effect.
+
+`quit'
+ Quit the application.
+
+`wait STOP|SECONDS'
+ Wait until the currently playing video stops, or wait for the
+ given number of seconds, before processing more commands from this
+ file, script, or FIFO.
+ (This command is not available for LIRC remote controls.)
+
+`open [OPTION...] FILE...'
+ Open the given files.
+ You can use percent-encoding to encode special characters. See
+ `http://en.wikipedia.org/wiki/Percent_encoding'. Use this if the
+ file names contain whitespace.
+ To open devices, the following options are available, analogous to
+ the command line options with the same name:
+
+
+ `--device-type=NONE|DEFAULT|FIREWIRE|X11'
+
+
+ `--device-frame-size=WxH'
+
+
+ `--device-frame-rate=N/D'
+
+
+ `--device-format=DEFAULT|MJPEG'
+
+
+`close'
+ Close the currently opened input.
+
+`toggle-play'
+ Toggle playback.
 
 `play'
 Start playback, or exit pause mode.
 
+`stop'
+ Stop playback.
+
+`toggle-pause'
+ Toggle pause mode.
+
 `pause'
 When playing, go into pause mode.
 
-`stop'
- Stop playback.
+`step'
+ Single-step to the next video frame.
 
-`cycle-video-stream'
- Cycle through available video streams.
+`seek DELTA'
+ Seek by the given number of seconds relative to the current
+ position. For example -60.0 seeks backwards one minute, and
+ +600.0 seeks forward ten minutes.
 
-`cycle-audio-stream'
- Cycle through available audio streams.
+`set-pos POS'
+ Seek by setting an absolute position in the stream, with POS
+ between 0 and 1. For example, to seek to the middle of the video,
+ use 0.5.
 
-`cycle-subtitle-stream'
- Cycle through available subtitle streams.
+`set-audio-device DEV'
+ Set the audio device to the one with the given index.
+
+`set-stereo-mode MODE'
+ Set the stereo mode. *Note Supported Output Techniques::.
+
+`set-stereo-mode-swap SWAP'
+ Set stereo mode left/right swap (on or off).
 
 `toggle-stereo-mode-swap'
- Swap left/right eye.
+ Toggle stereo mode left/right swap.
 
-`toggle-fullscreen'
- Toggle fullscreen.
+`set-crosstalk CR CG CB'
+ Set display crosstalk levels for red, green, and blue. Each value
+ must be between 0 and 1.
 
-`center'
- Center window.
+`set-fullscreen-screens SCREENS'
+ Set screens to use in fullscreen mode. The value is an integer in
+ which bits are set for each screen that should be used (screen 1 =
+ lowest bit). The value 0 means the default screen.
 
-`adjust-zoom DELTA'
- Adjust zoom for wide videos by adding DELTA, e.g. -0.1 or +0.1.
+`set-fullscreen-flip-left B'
+ Set fullscreen flip left (on or off).
+
+`set-fullscreen-flop-leftB'
+ Set fullscreen flop left (on or off).
+
+`set-fullscreen-flip-right B'
+ Set fullscreen flip right (on or off).
+
+`set-fullscreen-flop-right B'
+ Set fullscreen flop right (on or off).
+
+`set-fullscreen-inhibit-screensaver B'
+ Set fullscreen inhibit screensaver (on or off).
+
+`set-fullscreen-3dr-sync B'
+ Set fullscreen DLP(R) 3-D Ready Sync (on or off).
+
+`set-contrast VALUE'
+ Set contrast to the given VALUE, from -1 to +1.
 
 `adjust-contrast DELTA'
 Adjust contrast by adding DELTA, e.g. -0.05 or +0.05.
 
+`set-brightness VALUE'
+ Set brightness to the given VALUE, from -1 to +1.
+
 `adjust-brightness DELTA'
 Adjust brightness by adding DELTA, e.g. -0.05 or +0.05.
 
+`set-hue VALUE'
+ Set hue to the given VALUE, from -1 to +1.
+
 `adjust-hue DELTA'
 Adjust hue by adding DELTA, e.g. -0.05 or +0.05.
 
+`set-saturation VALUE'
+ Set saturation to the given VALUE, from -1 to +1.
+
 `adjust-saturation DELTA'
 Adjust saturation by adding DELTA, e.g. -0.05 or +0.05.
 
+`set-zoom VALUE'
+ Set zoom to the given VALUE, from 0 to 1.
+
+`adjust-zoom DELTA'
+ Adjust zoom by adding DELTA, e.g. -0.05 or +0.05.
+
+`set-loop-mode MODE'
+ Set loop mode to `off' or `current'.
+
+`set-audio-delay SECONDS'
+ Set audio delay.
+
+`set-subtitle-encoding ENC'
+ Set subtitle encoding. An empty value means to use the default.
+
+`set-subtitle-font FONT'
+ Set subtitle font. An empty value means to use the default.
+
+`set-subtitle-size SIZE'
+ Set the subtitle font size. The value is an integer, e.g. 12. Use
+ -1 to keep the default size.
+
+`set-subtitle-color COLOR'
+ Set the subtitle color as an integer that represents an RGB color.
+ Use a value larger than UINT32_MAX to keep the default color.
+
+`set-subtitle-shadow MODE'
+ Set subtitle shadow to force-on (1), force-off (0), or default
+ (-1).
+
+`set-video-stream STREAM'
+ Set video stream. Stream numbers start with 0.
+
+`cycle-video-stream'
+ Cycle through available video streams.
+
+`set-audio-stream STREAM'
+ Set audio stream. Stream numbers start with 0.
+
+`cycle-audio-stream'
+ Cycle through available audio streams.
+
+`set-subtitle-stream STREAM'
+ Set subtitle stream. Stream numbers start with 0. Using -1
+ disables subtitles.
+
+`cycle-subtitle-stream'
+ Cycle through available subtitle streams.
+
+`set-stereo-layout LAYOUT'
+ Set stereo layout. *Note Supported Input Layouts::. Note that here
+ only the left first, right second modes are supported. To get the
+ right first, left second modes, use `set-stereo-layout-swap'.
+
+`set-stereo-layout-swap B'
+ Set stereo layout swap (on or off).
+
+`set-crop-aspect-ratio AR'
+ Set crop aspect ratio, either as a floating point number (e.g.
+ 1.78), or as a ratio (e.g. 16:9).
+
+`set-parallax VALUE'
+ Set parallax, from -1 to +1.
+
 `adjust-parallax DELTA'
- Adjust parallax by adding DELTA, e.g. -0.01 or +0.01.
+ Adjust parallax by adding DELTA, e.g. -0.05 or + 0.05.
+
+`set-ghostbust VALUE'
+ Set ghostbust, from -1 to +1.
+
+`adjust-ghostbust DELTA'
+ Adjust ghostbust by adding DELTA, e.g. -0.05 or + 0.05.
+
+`set-subtitle-parallax VALUE'
+ Set subtitle parallax, from -1 to +1.
 
 `adjust-subtitle-parallax DELTA'
- Adjust contrast by adding DELTA, e.g. -0.01 or +0.01.
+ Adjust subtitle parallax by adding DELTA, e.g. -0.05 or + 0.05.
 
-`seek DELTA'
- Seek by the given number of seconds relative to the current
- position. For example -60.0 seeks backwards one minute, and +60.0
- seeks forward one minute.
+`toggle-fullscreen'
+ Toggle fullscreen.
 
-`set-pos POS'
- Seek by setting an absolute position in the stream, with POS
- between 0 and 1. For example, to seek to the middle of the video,
- use 0.5.
+`center'
+ Center window.
+
+`set-audio-volume VALUE'
+ Set audio volume, from 0 to 1.
 
 `adjust-audio-volume DELTA'
 Adjust audio volume by adding DELTA, e.g. -0.05 or +0.05.
@@ -1083,18 +1331,10 @@
 `toggle-audio-mute'
 Toggle audio mute.
 
- Example LIRC configuration file excerpt:
- begin
- remote = ...
- button = ...
- prog = bino
- config = adjust-brightness +0.05
- end
-
 &#x1f;
-File: bino.info, Node: Camera Devices, Prev: Interactive Control, Up: Top
+File: bino.info, Node: Camera Devices, Prev: Scripting, Up: Top
 
-6 Camera Devices
+7 Camera Devices
 ****************
 
 Bino supports the following types of camera devices:
@@ -1120,16 +1360,20 @@
 &#x1f;
 Tag Table:
 Node: Top&#x7f;774
-Node: Introduction&#x7f;1483
-Node: Invocation&#x7f;2506
-Node: Input Layouts&#x7f;6360
-Ref: File Name Conventions&#x7f;9345
-Node: Output Techniques&#x7f;10179
-Ref: Crosstalk Ghostbusting&#x7f;16549
-Ref: Basic Multi Display Support&#x7f;18525
-Ref: Advanced Multi Display Support&#x7f;19656
-Node: Interactive Control&#x7f;30901
-Node: Camera Devices&#x7f;34301
+Node: Introduction&#x7f;1497
+Node: Invocation&#x7f;2520
+Node: Input Layouts&#x7f;6683
+Ref: Supported Input Layouts&#x7f;7586
+Ref: File Name Conventions&#x7f;9668
+Node: Output Techniques&#x7f;10502
+Ref: Supported Output Techniques&#x7f;13226
+Ref: Crosstalk Ghostbusting&#x7f;16872
+Ref: Basic Multi Display Support&#x7f;18848
+Ref: Advanced Multi Display Support&#x7f;19979
+Node: Interactive Control&#x7f;31224
+Node: Scripting&#x7f;33149
+Ref: Script Commands&#x7f;35118
+Node: Camera Devices&#x7f;41066
 &#x1f;
 End Tag Table

bino-1.3.2.tar.xz/doc/bino.texi -> bino-1.3.3.tar.xz/doc/bino.texi Changed

@@ -58,6 +58,7 @@
 * Input Layouts::
 * Output Techniques::
 * Interactive Control::
+* Scripting::
 * Camera Devices::
 @end menu
 @ifhtml
@@ -133,6 +134,10 @@
 If the input is a device, request the given frame size, e.g. 640x480.
 @item --device-frame-rate=@var{N}/@var{D}
 If the input is a device, request the given frame rate, e.g. 25/1.
+@item --device-format=@var{FORMAT}
+Request format @var{default} or @var{mjpeg} from device.
+@item --read-commands=@var{FILE}
+Read commands from file. @xref{Scripting}.
 @item --lirc-config=@var{FILE}
 Use the given LIRC configuration file. This option can be used more than once.
 @item -v
@@ -168,6 +173,8 @@
 Flip right view vertically when in fullscreen mode.
 @item --fullscreen-flop-right
 Flop right view horizontally when in fullscreen mode.
+@item --fullscreen-3dr-sync
+Use DLP@registeredsymbol{} 3-D Ready Sync when in fullscreen mode.
 @item -z
 @itemx --zoom=@var{Z}
 Set zoom for videos that are wider than the screen, from 0 (off; show full
@@ -188,6 +195,8 @@
 Set subtitle scale factor.
 @item --subtitle-color=@var{COLOR}
 Set subtitle color, in [AA]RRGGBB format.
+@item --subtitle-shadow=@var{-1|0|1}
+Set subtitle shadow, -1=default, 0=off, 1=on.
 @item --subtitle-parallax=@var{VAL}
 Subtitle parallax adjustment (-1 to +1).
 @item -P
@@ -228,6 +237,7 @@
 based on the resolution of the input.
 
 @section Supported Input Layouts
+@anchor{Supported Input Layouts}
 
 @table @var
 @item mono
@@ -372,6 +382,7 @@
 stereo if the graphics card supports it, otherwise red/cyan anaglyph glasses.
 
 @section Supported Output Techniques
+@anchor{Supported Output Techniques}
 
 @table @var
 @item stereo
@@ -864,12 +875,13 @@
 @item c
 Center window.
 @item e
+@item F7
 Swap left/right eye.
 @item v
 Cycle through available video streams.
 @item a
 Cycle through available audio streams.
-@item a
+@item s
 Cycle through available subtitle streams.
 @item 1, 2
 Adjust contrast.
@@ -912,63 +924,241 @@
 @samp{--lirc-config} option to use one or more custom LIRC configuration files
 instead.
 
-The following commands are available:
+The available commands are the same commands that are available for scripting.
+@xref{Script Commands}.
+
+Example LIRC configuration file excerpt:
+@example
+begin
+  remote = ...
+  button = ...
+  prog   = bino
+  config = adjust-brightness +0.05
+end
+@end example
+
+
+@node Scripting
+@chapter Scripting
+
+Bino can read commands from one or multiple script files. Use the @samp{--read-commands}
+option to specify script files.
+
+Available script commands are listed below. @xref{Script Commands}.
+
+A script file can be a standard text file, but it can also be a named pipe,
+which allows other programs or scripts to submit commands to Bino as they see
+fit.
+
+@example
+$ mkfifo ~/bino-command-fifo
+$ bino --read-commands ~/bino-command-fifo &
+
+$ echo 'set-contrast 0.1' > ~/bino-command-fifo
+$ ...
+@end example
+
+Using the @samp{netcat} utility, this also works over the network.
+
+@example
+$ mkfifo ~/bino-command-fifo
+$ bino --read-commands ~/bino-command-fifo &
+
+$ nc -l 1234 > ~/bino-command-fifo &
+$ telnet localhost 1234
+set-contrast 0.1
+...
+@end example
+
+Here is a simple example script file:
+@example
+# Play all videos in fullscreen mode.
+toggle-fullscreen
+# Open the first video.
+open /path/to/video.webm
+# Start playing.
+play
+# Wait until the video finishes before continuing this script.
+wait stop
+# Open a second video. This one has a space in its file name.
+open /path/to/video%20file.webm
+# Start playing.
+play
+# Immediately increase brightness.
+adjust-brightness +0.1
+# Immediately seek to 60 seconds within the video.
+seek 60.0
+# Let the video play for 30.0 seconds before continuing with this script.
+wait 30.0
+# Open a third video. This one has left and right view in separate files.
+open /path/to/left.webm /path/to/right.webm
+# Start playing.
+play
+@end example
+
+This script is executed with the following command. The @samp{--no-gui} option
+is not necessary, but prevents the GUI to remember the changed brightness
+setting in future sessions.
+@example
+$ bino --read-commands /path/to/script.txt --no-gui
+@end example
+
+@section Script Commands
+@anchor{Script Commands}
+
+One script line defines exactly one script command.  Empty lines or lines
+starting with the @samp{#} character are comment lines and define the
+@samp{noop} command, which has no effect.
 
 @table @samp
+@item noop
+This command has no effect.
+@item quit
+Quit the application.
+@item wait @var{stop}|@var{seconds}
+Wait until the currently playing video stops, or wait for the given number of seconds,
+before processing more commands from this file, script, or FIFO.@*
+(This command is not available for LIRC remote controls.)
+@item open [@var{option}@dots{}] @var{file}@dots{}
+Open the given files.@*
+You can use percent-encoding to encode special characters.
+See @url{http://en.wikipedia.org/wiki/Percent_encoding}.
+Use this if the file names contain whitespace.@*
+To open devices, the following options are available, analogous to the command
+line options with the same name:
+	@table @samp
+	@item --device-type=@var{none}|@var{default}|@var{firewire}|@var{x11}
+	@item --device-frame-size=@var{W}x@var{H}
+	@item --device-frame-rate=@var{N}/@var{D}
+	@item --device-format=@var{default}|@var{mjpeg}
+	@end table
+@item close
+Close the currently opened input.
+@item toggle-play
+Toggle playback.
 @item play
 Start playback, or exit pause mode.
-@item pause
-When playing, go into pause mode.
 @item stop
 Stop playback.
-@item cycle-video-stream
-Cycle through available video streams.
-@item cycle-audio-stream
-Cycle through available audio streams.
-@item cycle-subtitle-stream
-Cycle through available subtitle streams.
+@item toggle-pause
+Toggle pause mode.
+@item pause
+When playing, go into pause mode.
+@item step
+Single-step to the next video frame.
+@item seek @var{delta}
+Seek by the given number of seconds relative to the current position.  For
+example -60.0 seeks backwards one minute, and +600.0 seeks forward ten minutes.
+@item set-pos @var{pos}
+Seek by setting an absolute position in the stream, with @var{pos} between 0 and
+1. For example, to seek to the middle of the video, use 0.5.
+@item set-audio-device @var{dev}
+Set the audio device to the one with the given index.
+@item set-stereo-mode @var{mode}
+Set the stereo mode. @xref{Supported Output Techniques}.
+@item set-stereo-mode-swap @var{swap}
+Set stereo mode left/right swap (on or off).
 @item toggle-stereo-mode-swap
-Swap left/right eye.
-@item toggle-fullscreen
-Toggle fullscreen.
-@item center
-Center window.
-@item adjust-zoom @var{delta}
-Adjust zoom for wide videos by adding @var{delta}, e.g. -0.1 or +0.1.
+Toggle stereo mode left/right swap.
+@item set-crosstalk @var{cr} @var{cg} @var{cb}
+Set display crosstalk levels for red, green, and blue. Each value must be between 0 and 1.
+@item set-fullscreen-screens @var{screens}
+Set screens to use in fullscreen mode. The value is an integer in which bits
+are set for each screen that should be used (screen 1 = lowest bit). The value
+0 means the default screen.
+@item set-fullscreen-flip-left @var{b}
+Set fullscreen flip left (on or off).
+@item set-fullscreen-flop-left@var{b}
+Set fullscreen flop left (on or off).
+@item set-fullscreen-flip-right @var{b}
+Set fullscreen flip right (on or off).
+@item set-fullscreen-flop-right @var{b}
+Set fullscreen flop right (on or off).
+@item set-fullscreen-inhibit-screensaver @var{b}
+Set fullscreen inhibit screensaver (on or off).
+@item set-fullscreen-3dr-sync @var{b}
+Set fullscreen DLP@registeredsymbol{} 3-D Ready Sync (on or off).
+@item set-contrast @var{value}
+Set contrast to the given @var{value}, from -1 to +1.
 @item adjust-contrast @var{delta}
 Adjust contrast by adding @var{delta}, e.g. -0.05 or +0.05.
+@item set-brightness @var{value}
+Set brightness to the given @var{value}, from -1 to +1.
 @item adjust-brightness @var{delta}
 Adjust brightness by adding @var{delta}, e.g. -0.05 or +0.05.
+@item set-hue @var{value}
+Set hue to the given @var{value}, from -1 to +1.
 @item adjust-hue @var{delta}
 Adjust hue by adding @var{delta}, e.g. -0.05 or +0.05.
+@item set-saturation @var{value}
+Set saturation to the given @var{value}, from -1 to +1.
 @item adjust-saturation @var{delta}
 Adjust saturation by adding @var{delta}, e.g. -0.05 or +0.05.
+@item set-zoom @var{value}
+Set zoom to the given @var{value}, from 0 to 1.
+@item adjust-zoom @var{delta}
+Adjust zoom by adding @var{delta}, e.g. -0.05 or +0.05.
+@item set-loop-mode @var{mode}
+Set loop mode to @samp{off} or @samp{current}.
+@item set-audio-delay @var{seconds}
+Set audio delay.
+@item set-subtitle-encoding @var{enc}
+Set subtitle encoding. An empty value means to use the default.
+@item set-subtitle-font @var{font}
+Set subtitle font. An empty value means to use the default.
+@item set-subtitle-size @var{size}
+Set the subtitle font size. The value is an integer, e.g. 12.
+Use -1 to keep the default size.
+@item set-subtitle-color @var{color}
+Set the subtitle color as an integer that represents an RGB color.
+Use a value larger than UINT32_MAX to keep the default color.
+@item set-subtitle-shadow @var{mode}
+Set subtitle shadow to force-on (1), force-off (0), or default (-1).
+@item set-video-stream @var{stream}
+Set video stream. Stream numbers start with 0.
+@item cycle-video-stream
+Cycle through available video streams.
+@item set-audio-stream @var{stream}
+Set audio stream. Stream numbers start with 0.
+@item cycle-audio-stream
+Cycle through available audio streams.
+@item set-subtitle-stream @var{stream}
+Set subtitle stream. Stream numbers start with 0. Using -1 disables subtitles.
+@item cycle-subtitle-stream
+Cycle through available subtitle streams.
+@item set-stereo-layout @var{layout}
+Set stereo layout. @xref{Supported Input Layouts}. Note that here only the
+left first, right second modes are supported. To get the right first, left second
+modes, use @samp{set-stereo-layout-swap}.
+@item set-stereo-layout-swap @var{b}
+Set stereo layout swap (on or off).
+@item set-crop-aspect-ratio @var{ar}
+Set crop aspect ratio, either as a floating point number (e.g. 1.78), or as a
+ratio (e.g. 16:9).
+@item set-parallax @var{value}
+Set parallax, from -1 to +1.
 @item adjust-parallax @var{delta}
-Adjust parallax by adding @var{delta}, e.g. -0.01 or +0.01.
+Adjust parallax by adding @var{delta}, e.g. -0.05 or + 0.05.
+@item set-ghostbust @var{value}
+Set ghostbust, from -1 to +1.
+@item adjust-ghostbust @var{delta}
+Adjust ghostbust by adding @var{delta}, e.g. -0.05 or + 0.05.
+@item set-subtitle-parallax @var{value}
+Set subtitle parallax, from -1 to +1.
 @item adjust-subtitle-parallax @var{delta}
-Adjust contrast by adding @var{delta}, e.g. -0.01 or +0.01.
-@item seek @var{delta}
-Seek by the given number of seconds relative to the current position.  For
-example -60.0 seeks backwards one minute, and +60.0 seeks forward one minute.
-@item set-pos @var{pos}
-Seek by setting an absolute position in the stream, with @var{pos} between 0 and
-1. For example, to seek to the middle of the video, use 0.5.
+Adjust subtitle parallax by adding @var{delta}, e.g. -0.05 or + 0.05.
+@item toggle-fullscreen
+Toggle fullscreen.
+@item center
+Center window.
+@item set-audio-volume @var{value}
+Set audio volume, from 0 to 1.
 @item adjust-audio-volume @var{delta}
 Adjust audio volume by adding @var{delta}, e.g. -0.05 or +0.05.
 @item toggle-audio-mute
 Toggle audio mute.
 @end table
 
-Example LIRC configuration file excerpt:
-@example
-begin
-  remote = ...
-  button = ...
-  prog   = bino
-  config = adjust-brightness +0.05
-end
-@end example
-
 
 @node Camera Devices
 @chapter Camera Devices

bino-1.3.2.tar.xz/doc/stamp-vti -> bino-1.3.3.tar.xz/doc/stamp-vti Changed

bino-1.3.2.tar.xz/doc/version.texi -> bino-1.3.3.tar.xz/doc/version.texi Changed

bino-1.3.2.tar.xz/po/LINGUAS -> bino-1.3.3.tar.xz/po/LINGUAS Changed

bino-1.3.2.tar.xz/po/POTFILES.in -> bino-1.3.3.tar.xz/po/POTFILES.in Changed

bino-1.3.2.tar.xz/po/bino.pot -> bino-1.3.3.tar.xz/po/bino.pot Changed

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: bino 1.3.2\n"
+"Project-Id-Version: bino 1.3.3\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-03-16 19:49+0100\n"
+"POT-Creation-Date: 2012-05-01 15:05+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:236
+#: src/base/str.cpp:267
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr ""
 
-#: src/base/str.cpp:455 src/base/str.cpp:473 src/base/str.cpp:483
-#: src/base/str.cpp:494 src/base/str.cpp:499
+#: 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 ""
@@ -123,8 +123,8 @@
 msgstr ""
 
 #: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
-#: src/media_data.cpp:1067 src/media_data.cpp:1090 src/media_data.cpp:1128
-#: src/media_data.cpp:1133
+#: src/media_data.cpp:1183 src/media_data.cpp:1206 src/media_data.cpp:1244
+#: src/media_data.cpp:1249
 msgid "unknown"
 msgstr ""
 
@@ -189,856 +189,941 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr ""
 
-#: src/dispatch.cpp:156
+#: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
+#: src/main.cpp:361 src/media_object.cpp:825 src/media_object.cpp:1290
+#: src/video_output.cpp:416
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: src/command_file.cpp:174
+#, c-format
+msgid "%s: invalid command '%s'"
+msgstr ""
+
+#: src/dispatch.cpp:166
 msgid "Cannot connect to X server."
 msgstr ""
 
-#: src/dispatch.cpp:171
+#: src/dispatch.cpp:182
 msgid "No video to play."
 msgstr ""
 
-#: src/dispatch.cpp:411 src/player_equalizer.cpp:84
+#: src/dispatch.cpp:437 src/player_equalizer.cpp:85
 msgid "No video streams found."
 msgstr ""
 
-#: src/dispatch.cpp:428
+#: src/dispatch.cpp:454
 msgid "Cannot set requested stereo layout: incompatible media."
 msgstr ""
 
-#: src/dispatch.cpp:443
+#: src/dispatch.cpp:469
 #, c-format
 msgid "Video stream %d not found."
 msgstr ""
 
-#: src/dispatch.cpp:449
+#: src/dispatch.cpp:475
 #, c-format
 msgid "Audio stream %d not found."
 msgstr ""
 
-#: src/dispatch.cpp:457
+#: src/dispatch.cpp:483
 #, c-format
 msgid "Subtitle stream %d not found."
 msgstr ""
 
-#: src/dispatch.cpp:529 src/main.cpp:736
+#: src/dispatch.cpp:555 src/main.cpp:748
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr ""
 
-#: src/gui.cpp:101
+#: src/gui.cpp:107
 msgid "Video:"
 msgstr ""
 
-#: src/gui.cpp:102
+#: src/gui.cpp:108
 msgid "Select the video stream."
 msgstr ""
 
-#: src/gui.cpp:108
+#: src/gui.cpp:114
 msgid "Audio:"
 msgstr ""
 
-#: src/gui.cpp:109
+#: src/gui.cpp:115
 msgid "Select the audio stream."
 msgstr ""
 
-#: src/gui.cpp:115
+#: src/gui.cpp:121
 msgid "Subtitle:"
 msgstr ""
 
-#: src/gui.cpp:116
+#: src/gui.cpp:122
 msgid "Select the subtitle stream."
 msgstr ""
 
-#: src/gui.cpp:127 src/media_input.cpp:277
+#: src/gui.cpp:133 src/media_input.cpp:276
 msgid "Input:"
 msgstr ""
 
-#: src/gui.cpp:128
+#: src/gui.cpp:134
 msgid "Set the 3D layout of the video stream."
 msgstr ""
 
-#: src/gui.cpp:132
+#: src/gui.cpp:138
 msgid "2D"
 msgstr ""
 
-#: src/gui.cpp:133
+#: src/gui.cpp:139
 msgid "Separate streams, left first"
 msgstr ""
 
-#: src/gui.cpp:134
+#: src/gui.cpp:140
 msgid "Separate streams, right first"
 msgstr ""
 
-#: src/gui.cpp:135
+#: src/gui.cpp:141
 msgid "Alternating, left first"
 msgstr ""
 
-#: src/gui.cpp:136
+#: src/gui.cpp:142
 msgid "Alternating, right first"
 msgstr ""
 
-#: src/gui.cpp:137 src/gui.cpp:161
+#: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2095 src/gui.cpp:2124
 msgid "Top/bottom"
 msgstr ""
 
-#: src/gui.cpp:138 src/gui.cpp:162
+#: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2096 src/gui.cpp:2125
 msgid "Top/bottom, half height"
 msgstr ""
 
-#: src/gui.cpp:139
+#: src/gui.cpp:145
 msgid "Bottom/top"
 msgstr ""
 
-#: src/gui.cpp:140
+#: src/gui.cpp:146
 msgid "Bottom/top, half height"
 msgstr ""
 
-#: src/gui.cpp:141 src/gui.cpp:163
+#: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2097 src/gui.cpp:2126
 msgid "Left/right"
 msgstr ""
 
-#: src/gui.cpp:142 src/gui.cpp:164
+#: src/gui.cpp:148 src/gui.cpp:170 src/gui.cpp:2098 src/gui.cpp:2127
 msgid "Left/right, half width"
 msgstr ""
 
-#: src/gui.cpp:143
+#: src/gui.cpp:149
 msgid "Right/left"
 msgstr ""
 
-#: src/gui.cpp:144
+#: src/gui.cpp:150
 msgid "Right/left, half width"
 msgstr ""
 
-#: src/gui.cpp:145 src/gui.cpp:165
+#: src/gui.cpp:151 src/gui.cpp:171 src/gui.cpp:2099 src/gui.cpp:2128
 msgid "Even/odd rows"
 msgstr ""
 
-#: src/gui.cpp:146
+#: src/gui.cpp:152
 msgid "Odd/even rows"
 msgstr ""
 
-#: src/gui.cpp:152
+#: src/gui.cpp:158
 msgid "Output:"
 msgstr ""
 
-#: src/gui.cpp:153
+#: src/gui.cpp:159
 msgid "Set the 3D output type for your display."
 msgstr ""
 
-#: src/gui.cpp:157
+#: src/gui.cpp:163 src/gui.cpp:2093 src/gui.cpp:2122
 msgid "Left view"
 msgstr ""
 
-#: src/gui.cpp:158
+#: src/gui.cpp:164 src/gui.cpp:2094 src/gui.cpp:2123
 msgid "Right view"
 msgstr ""
 
-#: src/gui.cpp:159
+#: src/gui.cpp:165
 msgid "OpenGL stereo"
 msgstr ""
 
-#: src/gui.cpp:160
+#: src/gui.cpp:166
 msgid "Left/right view alternating"
 msgstr ""
 
-#: src/gui.cpp:166
+#: src/gui.cpp:172 src/gui.cpp:2100 src/gui.cpp:2129
 msgid "Even/odd columns"
 msgstr ""
 
-#: src/gui.cpp:167
+#: src/gui.cpp:173 src/gui.cpp:2101 src/gui.cpp:2130
 msgid "Checkerboard pattern"
 msgstr ""
 
-#: src/gui.cpp:168
+#: src/gui.cpp:174
 msgid "HDMI frame packing mode"
 msgstr ""
 
-#: src/gui.cpp:169
+#: src/gui.cpp:175 src/gui.cpp:2102 src/gui.cpp:2131
 msgid "Red/cyan glasses, monochrome method"
 msgstr ""
 
-#: src/gui.cpp:170
+#: src/gui.cpp:176 src/gui.cpp:2103 src/gui.cpp:2132
 msgid "Red/cyan glasses, half-color method"
 msgstr ""
 
-#: src/gui.cpp:171
+#: src/gui.cpp:177 src/gui.cpp:2104 src/gui.cpp:2133
 msgid "Red/cyan glasses, full-color method"
 msgstr ""
 
-#: src/gui.cpp:172
+#: src/gui.cpp:178 src/gui.cpp:2105 src/gui.cpp:2134
 msgid "Red/cyan glasses, high-quality Dubois method"
 msgstr ""
 
-#: src/gui.cpp:173
+#: src/gui.cpp:179 src/gui.cpp:2106 src/gui.cpp:2135
 msgid "Green/magenta glasses, monochrome method"
 msgstr ""
 
-#: src/gui.cpp:174
+#: src/gui.cpp:180 src/gui.cpp:2107 src/gui.cpp:2136
 msgid "Green/magenta glasses, half-color method"
 msgstr ""
 
-#: src/gui.cpp:175
+#: src/gui.cpp:181 src/gui.cpp:2108 src/gui.cpp:2137
 msgid "Green/magenta glasses, full-color method"
 msgstr ""
 
-#: src/gui.cpp:176
+#: src/gui.cpp:182 src/gui.cpp:2109 src/gui.cpp:2138
 msgid "Green/magenta glasses, high-quality Dubois method"
 msgstr ""
 
-#: src/gui.cpp:177
+#: src/gui.cpp:183 src/gui.cpp:2110 src/gui.cpp:2139
 msgid "Amber/blue glasses, monochrome method"
 msgstr ""
 
-#: src/gui.cpp:178
+#: src/gui.cpp:184 src/gui.cpp:2111 src/gui.cpp:2140
 msgid "Amber/blue glasses, half-color method"
 msgstr ""
 
-#: src/gui.cpp:179
+#: src/gui.cpp:185 src/gui.cpp:2112 src/gui.cpp:2141
 msgid "Amber/blue glasses, full-color method"
 msgstr ""
 
-#: src/gui.cpp:180
+#: src/gui.cpp:186 src/gui.cpp:2113 src/gui.cpp:2142
 msgid "Amber/blue glasses, high-quality Dubois method"
 msgstr ""
 
-#: src/gui.cpp:181
+#: src/gui.cpp:187 src/gui.cpp:2114 src/gui.cpp:2143
 msgid "Red/green glasses, monochrome method"
 msgstr ""
 
-#: src/gui.cpp:182
+#: src/gui.cpp:188 src/gui.cpp:2115 src/gui.cpp:2144
 msgid "Red/blue glasses, monochrome method"
 msgstr ""
 
-#: src/gui.cpp:186
+#: src/gui.cpp:192
 msgid "Swap left/right"
 msgstr ""
 
-#: src/gui.cpp:187
+#: src/gui.cpp:193
 msgid ""
 "Swap the left and right view. Use this if the 3D effect seems wrong."
 msgstr ""
 
-#: src/gui.cpp:467
+#: src/gui.cpp:471 src/gui.cpp:1676
 msgid "Off"
 msgstr ""
 
-#: src/gui.cpp:694
+#: src/gui.cpp:702
 msgid ""
 "This slider shows the progress during video playback, and can be used to "
 "seek in the video."
 msgstr ""
 
-#: src/gui.cpp:701
+#: src/gui.cpp:709
 msgid "Elapsed / total time."
 msgstr ""
 
-#: src/gui.cpp:708
+#: src/gui.cpp:716
 msgid "Toggle audio mute."
 msgstr ""
 
-#: src/gui.cpp:713
+#: src/gui.cpp:721
 msgid "Adjust audio volume."
 msgstr ""
 
-#: src/gui.cpp:725
+#: src/gui.cpp:733
 msgid "Play."
 msgstr ""
 
-#: src/gui.cpp:729
+#: src/gui.cpp:737
 msgid "Pause."
 msgstr ""
 
-#: src/gui.cpp:733
+#: src/gui.cpp:741
 msgid "Stop."
 msgstr ""
 
-#: src/gui.cpp:738
+#: src/gui.cpp:746
 msgid "Toggle loop mode."
 msgstr ""
 
-#: src/gui.cpp:745
+#: src/gui.cpp:753
 msgid ""
 "Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
 "f key."
 msgstr ""
 
-#: src/gui.cpp:751
+#: src/gui.cpp:759
 msgid "Center the video area on your screen."
 msgstr ""
 
-#: src/gui.cpp:758
+#: src/gui.cpp:766
 msgid "Seek backward 10 minutes."
 msgstr ""
 
-#: src/gui.cpp:763
+#: src/gui.cpp:771
 msgid "Seek backward 1 minute."
 msgstr ""
 
-#: src/gui.cpp:769
+#: src/gui.cpp:777
 msgid "Seek backward 10 seconds."
 msgstr ""
 
-#: src/gui.cpp:775
+#: src/gui.cpp:783
 msgid "Seek forward 10 seconds."
 msgstr ""
 
-#: src/gui.cpp:780
+#: src/gui.cpp:788
 msgid "Seek forward 1 minute."
 msgstr ""
 
-#: src/gui.cpp:786
+#: src/gui.cpp:794
 msgid "Seek forward 10 minutes."
 msgstr ""
 
-#: src/gui.cpp:1047
+#: src/gui.cpp:1055
 msgid "Fullscreen/Multiscreen Settings"
 msgstr ""
 
-#: src/gui.cpp:1049
+#: src/gui.cpp:1057
 msgid "Configure fullscreen mode:"
 msgstr ""
 
-#: src/gui.cpp:1050
+#: src/gui.cpp:1058
 msgid "Select the screens to use in fullscreen mode."
 msgstr ""
 
-#: src/gui.cpp:1052
+#: src/gui.cpp:1060
 msgid "Single screen:"
 msgstr ""
 
-#: src/gui.cpp:1053
+#: src/gui.cpp:1061
 msgid "Use a single screen for fullscreen mode."
 msgstr ""
 
-#: src/gui.cpp:1056
+#: src/gui.cpp:1064
 msgid "Primary screen"
 msgstr ""
 
-#: src/gui.cpp:1059 src/gui.cpp:1070 src/gui.cpp:1071
+#: src/gui.cpp:1067 src/gui.cpp:1078 src/gui.cpp:1079
 #, c-format
 msgid "Screen %d"
 msgstr ""
 
-#: src/gui.cpp:1062
+#: src/gui.cpp:1070
 msgid "Dual screen:"
 msgstr ""
 
-#: src/gui.cpp:1063
+#: src/gui.cpp:1071
 msgid "Use two screens for fullscreen mode."
 msgstr ""
 
-#: src/gui.cpp:1075
+#: src/gui.cpp:1083
 msgid "Multi screen:"
 msgstr ""
 
-#: src/gui.cpp:1076
+#: src/gui.cpp:1084
 msgid "Use multiple screens for fullscreen mode."
 msgstr ""
 
-#: src/gui.cpp:1078
+#: src/gui.cpp:1086
 msgid "Comma-separated list of screens to use for fullscreen mode."
 msgstr ""
 
-#: src/gui.cpp:1081
+#: src/gui.cpp:1089
 msgid "When in fullscreen mode,"
 msgstr ""
 
-#: src/gui.cpp:1082
+#: src/gui.cpp:1090
 msgid "Set special left/right view handling for fullscreen mode."
 msgstr ""
 
-#: src/gui.cpp:1084
+#: src/gui.cpp:1092
 msgid "flip left view vertically."
 msgstr ""
 
-#: src/gui.cpp:1086
+#: src/gui.cpp:1094
 msgid "flop left view horizontally."
 msgstr ""
 
-#: src/gui.cpp:1088
+#: src/gui.cpp:1096
 msgid "flip right view vertically."
 msgstr ""
 
-#: src/gui.cpp:1090
+#: src/gui.cpp:1098
 msgid "flop right view horizontally."
 msgstr ""
 
-#: src/gui.cpp:1093
+#: src/gui.cpp:1101
+msgid "use DLP(R) 3-D Ready Sync"
+msgstr ""
+
+#: src/gui.cpp:1102
+msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
+msgstr ""
+
+#: src/gui.cpp:1104
 msgid "inhibit the screensaver"
 msgstr ""
 
-#: src/gui.cpp:1094
+#: src/gui.cpp:1105
 msgid "Inhibit the screensaver during fullscreen playback."
 msgstr ""
 
-#: src/gui.cpp:1096 src/gui.cpp:1258 src/gui.cpp:1393 src/gui.cpp:1463
-#: src/gui.cpp:1541 src/gui.cpp:1652 src/gui.cpp:1928 src/gui.cpp:2108
-#: src/gui.cpp:2778 src/gui.cpp:2825 src/gui.cpp:3114
+#: src/gui.cpp:1107 src/gui.cpp:1273 src/gui.cpp:1408 src/gui.cpp:1478
+#: src/gui.cpp:1556 src/gui.cpp:1680 src/gui.cpp:1948 src/gui.cpp:2147
+#: src/gui.cpp:2625 src/gui.cpp:3324 src/gui.cpp:3371 src/gui.cpp:3677
 msgid "OK"
 msgstr ""
 
-#: src/gui.cpp:1211
+#: src/gui.cpp:1226
 msgid "Display Color Adjustments"
 msgstr ""
 
-#: src/gui.cpp:1213
+#: src/gui.cpp:1228
 msgid "Contrast:"
 msgstr ""
 
-#: src/gui.cpp:1224
+#: src/gui.cpp:1239
 msgid "Brightness:"
 msgstr ""
 
-#: src/gui.cpp:1235
+#: src/gui.cpp:1250
 msgid "Hue:"
 msgstr ""
 
-#: src/gui.cpp:1246
+#: src/gui.cpp:1261
 msgid "Saturation:"
 msgstr ""
 
-#: src/gui.cpp:1364
+#: src/gui.cpp:1379
 msgid "Display Crosstalk Calibration"
 msgstr ""
 
 #. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/gui.cpp:1367
+#: src/gui.cpp:1382
 msgid ""
 "Please read the manual to find out how to measure the crosstalk "
 "levels of your display."
 msgstr ""
 
-#: src/gui.cpp:1371
+#: src/gui.cpp:1386
 msgid "Red:"
 msgstr ""
 
-#: src/gui.cpp:1378
+#: src/gui.cpp:1393
 msgid "Green:"
 msgstr ""
 
-#: src/gui.cpp:1385
+#: src/gui.cpp:1400
 msgid "Blue:"
 msgstr ""
 
-#: src/gui.cpp:1441
+#: src/gui.cpp:1456
 msgid "Zoom for wide videos"
 msgstr ""
 
-#: src/gui.cpp:1444
+#: src/gui.cpp:1459
 msgid ""
 "Set zoom level for videos that are wider than the screen: 0: Show "
 "full video width. 1: Use full screen height.</p"
 msgstr ""
 
-#: src/gui.cpp:1448
+#: src/gui.cpp:1463
 msgid "Zoom:"
 msgstr ""
 
-#: src/gui.cpp:1449
+#: src/gui.cpp:1464
 msgid "Set the zoom level for videos that are wider than the screen"
 msgstr ""
 
-#: src/gui.cpp:1507
+#: src/gui.cpp:1522
 msgid "Audio Settings"
 msgstr ""
 
-#: src/gui.cpp:1509
+#: src/gui.cpp:1524
 msgid "Audio device:"
 msgstr ""
 
-#: src/gui.cpp:1510
+#: src/gui.cpp:1525
 msgid ""
 "Select the audio device. This will take effect for the next started "
 "video."
 msgstr ""
 
-#: src/gui.cpp:1514 src/gui.cpp:2063
+#: src/gui.cpp:1529 src/gui.cpp:2563
 msgid "Default"
 msgstr ""
 
-#: src/gui.cpp:1531
+#: src/gui.cpp:1546
 msgid "Audio delay (ms):"
 msgstr ""
 
-#: src/gui.cpp:1532
+#: src/gui.cpp:1547
 msgid ""
 "Set an audio delay, in milliseconds. This is useful if audio and video "
 "are not in sync."
 msgstr ""
 
-#: src/gui.cpp:1589
+#: src/gui.cpp:1604
 msgid "Subtitle Settings"
 msgstr ""
 
-#: src/gui.cpp:1591
-msgid "These settings apply to soft subtitles, but not to bitmaps."
+#: src/gui.cpp:1607
+msgid ""
+"These settings apply only to soft subtitles, not to bitmaps. Some "
+"changes require a restart of the video to take effect."
 msgstr ""
 
-#: src/gui.cpp:1593
+#: src/gui.cpp:1610
 msgid "Encoding:"
 msgstr ""
 
-#: src/gui.cpp:1594
+#: src/gui.cpp:1611
 msgid "Set the subtitle character set encoding."
 msgstr ""
 
-#: src/gui.cpp:1609
+#: src/gui.cpp:1626
 msgid "Override font:"
 msgstr ""
 
-#: src/gui.cpp:1610
+#: src/gui.cpp:1627
 msgid "Override the subtitle font family."
 msgstr ""
 
-#: src/gui.cpp:1619
+#: src/gui.cpp:1636
 msgid "Override font size:"
 msgstr ""
 
-#: src/gui.cpp:1620
+#: src/gui.cpp:1637
 msgid "Override the subtitle font size."
 msgstr ""
 
-#: src/gui.cpp:1630
+#: src/gui.cpp:1647
 msgid "Override scale factor:"
 msgstr ""
 
-#: src/gui.cpp:1631
+#: src/gui.cpp:1648
 msgid "Override the subtitle scale factor."
 msgstr ""
 
-#: src/gui.cpp:1642
+#: src/gui.cpp:1659
 msgid "Override color:"
 msgstr ""
 
-#: src/gui.cpp:1643
+#: src/gui.cpp:1660
 msgid "Override the subtitle color."
 msgstr ""
 
-#: src/gui.cpp:1866
+#: src/gui.cpp:1669
+msgid "Override shadow:"
+msgstr ""
+
+#: src/gui.cpp:1670
+msgid "Override the subtitle shadow."
+msgstr ""
+
+#: src/gui.cpp:1675
+msgid "On"
+msgstr ""
+
+#: src/gui.cpp:1886
 msgid "Video Settings"
 msgstr ""
 
-#: src/gui.cpp:1868
+#: src/gui.cpp:1888
 msgid "Crop to aspect ratio:"
 msgstr ""
 
-#: src/gui.cpp:1869
+#: src/gui.cpp:1889
 msgid ""
 "Set the real aspect ratio of the video, so that borders can be cropped.</"
 "p>"
 msgstr ""
 
-#: src/gui.cpp:1872
+#: src/gui.cpp:1892
 msgid "Do not crop"
 msgstr ""
 
-#: src/gui.cpp:1885
+#: src/gui.cpp:1905
 msgid "Parallax:"
 msgstr ""
 
-#: src/gui.cpp:1886
+#: src/gui.cpp:1906
 msgid ""
 "Adjust parallax, from -1 to +1. This changes the separation of left and "
 "right view, and thus the perceived distance of the scene."
 msgstr ""
 
-#: src/gui.cpp:1899
+#: src/gui.cpp:1919
 msgid "Subtitle parallax:"
 msgstr ""
 
-#: src/gui.cpp:1900
+#: src/gui.cpp:1920
 msgid ""
 "Adjust subtitle parallax, from -1 to +1. This changes the perceived "
 "distance of the subtitles."
 msgstr ""
 
-#: src/gui.cpp:1913
+#: src/gui.cpp:1933
 msgid "Ghostbusting:"
 msgstr ""
 
-#: src/gui.cpp:1914
+#: src/gui.cpp:1934
 msgid ""
 "Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
 "the crosstalk levels of your display first. Note that crosstalk ghostbusting "
 "does not work with anaglyph glasses."
 msgstr ""
 
-#: src/gui.cpp:2059
-msgid "Open device"
+#: src/gui.cpp:2078
+msgid "SDI Output Settings"
+msgstr ""
+
+#: src/gui.cpp:2080
+msgid "SDI Output Format:"
+msgstr ""
+
+#: src/gui.cpp:2081
+msgid "Select output format used for SDI output."
+msgstr ""
+
+#: src/gui.cpp:2089
+msgid "Left stereo mode:"
+msgstr ""
+
+#: src/gui.cpp:2090
+msgid "Select stereo mode used for left SDI output."
+msgstr ""
+
+#: src/gui.cpp:2118
+msgid "Right stereo mode:"
+msgstr ""
+
+#: src/gui.cpp:2119
+msgid "Select stereo mode used for right SDI output."
 msgstr ""
 
-#: src/gui.cpp:2062
+#: src/gui.cpp:2559
+msgid "Open device(s)"
+msgstr ""
+
+#: src/gui.cpp:2562
 msgid "Choose a device type."
 msgstr ""
 
-#: src/gui.cpp:2064 src/media_object.cpp:801
+#: src/gui.cpp:2564 src/media_object.cpp:801
 msgid "Firewire"
 msgstr ""
 
-#: src/gui.cpp:2065 src/media_object.cpp:802
+#: src/gui.cpp:2565 src/media_object.cpp:802
 msgid "X11"
 msgstr ""
 
-#: src/gui.cpp:2067 src/gui.cpp:2070
+#: src/gui.cpp:2568 src/gui.cpp:2571
 msgid "Choose a device."
 msgstr ""
 
-#: src/gui.cpp:2073
+#: src/gui.cpp:2574
 msgid "Set the X11 device string. Refer to the manual for details."
 msgstr ""
 
-#: src/gui.cpp:2082
+#: src/gui.cpp:2590
+msgid "First device:"
+msgstr ""
+
+#: src/gui.cpp:2591
+msgid "Second device:"
+msgstr ""
+
+#: src/gui.cpp:2595
 msgid "Request frame size"
 msgstr ""
 
-#: src/gui.cpp:2083
+#: src/gui.cpp:2596
 msgid ""
 "Request a specific frame size from the device, e.g. 640x480. The device "
 "must support this frame size. Some devices require a frame size to be "
 "selected."
 msgstr ""
 
-#: src/gui.cpp:2094
+#: src/gui.cpp:2607
 msgid "Request frame rate"
 msgstr ""
 
-#: src/gui.cpp:2095
+#: src/gui.cpp:2608
 msgid ""
 "Request a specific frame rate from the device, e.g. 25/1. The device must "
 "support this frame rate. Some devices require a frame rate to be selected.</"
 "p>"
 msgstr ""
 
-#: src/gui.cpp:2106 src/gui.cpp:2824
+#: src/gui.cpp:2619
+msgid "Request MJPEG format"
+msgstr ""
+
+#: src/gui.cpp:2620
+msgid ""
+"Request MJPEG data from the input device. The device may ignore this "
+"request."
+msgstr ""
+
+#: src/gui.cpp:2623 src/gui.cpp:3370
 msgid "Cancel"
 msgstr ""
 
-#: src/gui.cpp:2377
+#: src/gui.cpp:2918
 msgid "&File"
 msgstr ""
 
-#: src/gui.cpp:2378
+#: src/gui.cpp:2919
 msgid "&Open file(s)..."
 msgstr ""
 
-#: src/gui.cpp:2383
+#: src/gui.cpp:2924
 msgid "Open &URL(s)..."
 msgstr ""
 
-#: src/gui.cpp:2387
-msgid "Open &device..."
+#: src/gui.cpp:2928
+msgid "Open &device(s)..."
 msgstr ""
 
-#: src/gui.cpp:2402
+#: src/gui.cpp:2943
 msgid "&Clear recent files"
 msgstr ""
 
-#: src/gui.cpp:2410
+#: src/gui.cpp:2951
 msgid "&Quit..."
 msgstr ""
 
-#: src/gui.cpp:2416
+#: src/gui.cpp:2957
 msgid "&Preferences"
 msgstr ""
 
-#: src/gui.cpp:2419
+#: src/gui.cpp:2960
 msgid "&Fullscreen Settings..."
 msgstr ""
 
-#: src/gui.cpp:2422
+#: src/gui.cpp:2963
 msgid "Display &Color Adjustments..."
 msgstr ""
 
-#: src/gui.cpp:2425
+#: src/gui.cpp:2966
 msgid "Display Cross&talk Calibration..."
 msgstr ""
 
-#: src/gui.cpp:2429
+#: src/gui.cpp:2970
 msgid "&Zoom for wide videos..."
 msgstr ""
 
-#: src/gui.cpp:2433
+#: src/gui.cpp:2974
 msgid "&Audio Settings..."
 msgstr ""
 
-#: src/gui.cpp:2437
+#: src/gui.cpp:2978
 msgid "&Subtitle Settings..."
 msgstr ""
 
-#: src/gui.cpp:2441
+#: src/gui.cpp:2982
 msgid "Current &Video Settings..."
 msgstr ""
 
-#: src/gui.cpp:2444
+#: src/gui.cpp:2987
+msgid "SDI &Output Settings..."
+msgstr ""
+
+#: src/gui.cpp:2991
 msgid "&Help"
 msgstr ""
 
-#: src/gui.cpp:2445
+#: src/gui.cpp:2992
 msgid "&Manual..."
 msgstr ""
 
-#: src/gui.cpp:2450
+#: src/gui.cpp:2997
 msgid "&Website..."
 msgstr ""
 
-#: src/gui.cpp:2454
+#: src/gui.cpp:3001
 msgid "&Keyboard Shortcuts"
 msgstr ""
 
-#: src/gui.cpp:2458
+#: src/gui.cpp:3005
 msgid "&About"
 msgstr ""
 
-#: src/gui.cpp:2771
+#: src/gui.cpp:3317
 msgid "Tip"
 msgstr ""
 
-#: src/gui.cpp:2774
+#: src/gui.cpp:3320
 msgid ""
 "You can select and open multiple files at once.This is useful for "
 "example if you have extra subtitle files, or if left and right view are "
 "stored in separate files."
 msgstr ""
 
-#: src/gui.cpp:2777
+#: src/gui.cpp:3323
 msgid "Do not show this message again."
 msgstr ""
 
-#: src/gui.cpp:2794
+#: src/gui.cpp:3340
 msgid "Open files"
 msgstr ""
 
-#: src/gui.cpp:2818
+#: src/gui.cpp:3364
 msgid "Open URL(s)"
 msgstr ""
 
-#: src/gui.cpp:2819
+#: src/gui.cpp:3365
 msgid "URL(s):"
 msgstr ""
 
-#: src/gui.cpp:2820
+#: src/gui.cpp:3366
 msgid "Enter one or more space separated URLs."
 msgstr ""
 
-#: src/gui.cpp:3005 src/gui.cpp:3013 src/video_output_qt.cpp:234
-#: src/video_output_qt.cpp:643 src/video_output_qt.cpp:664
+#: src/gui.cpp:3568 src/gui.cpp:3576 src/video_output_qt.cpp:241
+#: src/video_output_qt.cpp:477 src/video_output_qt.cpp:659
+#: src/video_output_qt.cpp:671 src/video_output_qt.cpp:692
 msgid "Error"
 msgstr ""
 
-#: src/gui.cpp:3005
+#: src/gui.cpp:3568
 msgid "Cannot open manual."
 msgstr ""
 
-#: src/gui.cpp:3013
+#: src/gui.cpp:3576
 msgid "Cannot open website."
 msgstr ""
 
-#: src/gui.cpp:3021
+#: src/gui.cpp:3584
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: src/gui.cpp:3024
+#: src/gui.cpp:3587
 msgid "Keyboard control:"
 msgstr ""
 
-#: src/gui.cpp:3026
+#: src/gui.cpp:3589
 msgid "Stop."
 msgstr ""
 
-#: src/gui.cpp:3027 src/main.cpp:495
+#: src/gui.cpp:3590 src/main.cpp:494
 msgid "Pause / unpause."
 msgstr ""
 
-#: src/gui.cpp:3028 src/main.cpp:496
+#: src/gui.cpp:3591 src/main.cpp:495
 msgid "Toggle fullscreen."
 msgstr ""
 
-#: src/gui.cpp:3029 src/main.cpp:497
+#: src/gui.cpp:3592 src/main.cpp:496
 msgid "Center window."
 msgstr ""
 
-#: src/gui.cpp:3030 src/main.cpp:498
+#: src/gui.cpp:3593 src/main.cpp:497
 msgid "Swap left/right eye."
 msgstr ""
 
-#: src/gui.cpp:3031 src/main.cpp:499
+#: src/gui.cpp:3594 src/main.cpp:498
 msgid "Cycle through available video streams."
 msgstr ""
 
-#: src/gui.cpp:3032 src/main.cpp:500
+#: src/gui.cpp:3595 src/main.cpp:499
 msgid "Cycle through available audio streams."
 msgstr ""
 
-#: src/gui.cpp:3033 src/main.cpp:501
+#: src/gui.cpp:3596 src/main.cpp:500
 msgid "Cycle through available subtitle streams."
 msgstr ""
 
-#: src/gui.cpp:3034 src/main.cpp:502
+#: src/gui.cpp:3597 src/main.cpp:501
 msgid "Adjust contrast."
 msgstr ""
 
-#: src/gui.cpp:3035 src/main.cpp:503
+#: src/gui.cpp:3598 src/main.cpp:502
 msgid "Adjust brightness."
 msgstr ""
 
-#: src/gui.cpp:3036 src/main.cpp:504
+#: src/gui.cpp:3599 src/main.cpp:503
 msgid "Adjust hue."
 msgstr ""
 
-#: src/gui.cpp:3037 src/main.cpp:505
+#: src/gui.cpp:3600 src/main.cpp:504
 msgid "Adjust saturation."
 msgstr ""
 
-#: src/gui.cpp:3038 src/main.cpp:506
+#: src/gui.cpp:3601 src/main.cpp:505
 msgid "Adjust parallax."
 msgstr ""
 
-#: src/gui.cpp:3039 src/main.cpp:507
+#: src/gui.cpp:3602 src/main.cpp:506
 msgid "Adjust ghostbusting."
 msgstr ""
 
-#: src/gui.cpp:3040 src/main.cpp:508
+#: src/gui.cpp:3603 src/main.cpp:507
 msgid "Adjust zoom for wide videos."
 msgstr ""
 
-#: src/gui.cpp:3041 src/main.cpp:509
+#: src/gui.cpp:3604 src/main.cpp:508
 msgid "Adjust audio volume."
 msgstr ""
 
-#: src/gui.cpp:3042 src/main.cpp:510
+#: src/gui.cpp:3605 src/main.cpp:509
 msgid "Toggle audio mute."
 msgstr ""
 
-#: src/gui.cpp:3043 src/main.cpp:511
+#: src/gui.cpp:3606 src/main.cpp:510
 msgid "Step a single video frame forward."
 msgstr ""
 
-#: src/gui.cpp:3044 src/main.cpp:512
+#: src/gui.cpp:3607 src/main.cpp:511
 msgid "Seek 10 seconds backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3045 src/main.cpp:513
+#: src/gui.cpp:3608 src/main.cpp:512
 msgid "Seek 1 minute backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3046 src/main.cpp:514
+#: src/gui.cpp:3609 src/main.cpp:513
 msgid "Seek 10 minutes backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3047 src/main.cpp:516
+#: src/gui.cpp:3610 src/main.cpp:515
 msgid "Media keys should work as expected."
 msgstr ""
 
-#: src/gui.cpp:3063
+#: src/gui.cpp:3626
 #, c-format
 msgid "About %s"
 msgstr ""
 
-#: src/gui.cpp:3069
+#: src/gui.cpp:3632
 #, c-format
 msgid "The %s 3D video player"
 msgstr ""
 
-#: src/gui.cpp:3074
+#: src/gui.cpp:3637
 #, c-format
 msgid ""
 "%s version %s.Copyright (C) 2012 the Bino developers.This "
@@ -1048,27 +1133,27 @@
 "\"%s\">%s</a> for more information on this software."
 msgstr ""
 
-#: src/gui.cpp:3086 src/main.cpp:384
+#: src/gui.cpp:3649 src/main.cpp:378
 msgid "Platform:"
 msgstr ""
 
-#: src/gui.cpp:3087 src/main.cpp:386
+#: src/gui.cpp:3650 src/main.cpp:380
 msgid "Libraries used:"
 msgstr ""
 
-#: src/gui.cpp:3109
+#: src/gui.cpp:3672
 msgid "About"
 msgstr ""
 
-#: src/gui.cpp:3110
+#: src/gui.cpp:3673
 msgid "Libraries"
 msgstr ""
 
-#: src/gui.cpp:3111
+#: src/gui.cpp:3674
 msgid "Team"
 msgstr ""
 
-#: src/gui.cpp:3112
+#: src/gui.cpp:3675
 msgid "License"
 msgstr ""
 
@@ -1106,22 +1191,16 @@
 msgid "Cannot get command for LIRC code."
 msgstr ""
 
-#: src/main.cpp:367 src/media_object.cpp:821 src/media_object.cpp:1286
-#: src/video_output.cpp:212
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/main.cpp:379
+#: src/main.cpp:373
 #, c-format
 msgid "%s version %s"
 msgstr ""
 
-#: src/main.cpp:380
+#: src/main.cpp:374
 msgid "Copyright (C) 2012 the Bino developers."
 msgstr ""
 
-#: src/main.cpp:381
+#: src/main.cpp:375
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -1130,423 +1209,448 @@
 
 #. TRANSLATORS: This is the --help text. Please keep the line length limited.
 #. * The --help output should look good with a line width of 80 characters.
-#: src/main.cpp:399
+#: src/main.cpp:393
 msgid "Usage:"
 msgstr ""
 
-#: src/main.cpp:401
+#: src/main.cpp:395
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:402
+#: src/main.cpp:396
 msgid "Print help."
 msgstr ""
 
-#: src/main.cpp:403
+#: src/main.cpp:397
 msgid "Print version."
 msgstr ""
 
-#: src/main.cpp:404
+#: src/main.cpp:398
 msgid "Do not use the GUI, just show a plain window."
 msgstr ""
 
-#: src/main.cpp:405
+#: src/main.cpp:399
 msgid "Append all log messages to the given file."
 msgstr ""
 
-#: src/main.cpp:406
+#: src/main.cpp:400
 msgid "Set log level (debug/info/warning/error/quiet)."
 msgstr ""
 
-#: src/main.cpp:407
+#: src/main.cpp:401
 msgid "Print a list of known audio devices and exit."
 msgstr ""
 
-#: src/main.cpp:408
+#: src/main.cpp:402
 msgid "Use audio device number N (N=0 is the default)."
 msgstr ""
 
-#: src/main.cpp:409
+#: src/main.cpp:403
 msgid "Delay audio by D milliseconds. Default is 0."
 msgstr ""
 
-#: src/main.cpp:410
+#: src/main.cpp:404
 msgid "Set audio volume (0 to 1). Default is 1."
 msgstr ""
 
-#: src/main.cpp:411
+#: src/main.cpp:405
 msgid "Mute audio."
 msgstr ""
 
-#: src/main.cpp:412
+#: src/main.cpp:406
 msgid "Type of input device: default, firewire, x11."
 msgstr ""
 
-#: src/main.cpp:413
+#: src/main.cpp:407
 msgid "Request frame size WxH from input device."
 msgstr ""
 
-#: src/main.cpp:414
+#: src/main.cpp:408
 msgid "Request frame rate N/D from input device."
 msgstr ""
 
-#: src/main.cpp:415
+#: src/main.cpp:409
+msgid "Request device format 'default' or 'mjpeg'."
+msgstr ""
+
+#: src/main.cpp:410
+msgid "Read commands from a file."
+msgstr ""
+
+#: src/main.cpp:411
 msgid "Use the given LIRC configuration file."
 msgstr ""
 
-#: src/main.cpp:416
+#: src/main.cpp:412
 msgid "This option can be used more than once."
 msgstr ""
 
-#: src/main.cpp:417
+#: src/main.cpp:413
 msgid "Select video stream (1-n, depending on input)."
 msgstr ""
 
-#: src/main.cpp:418
+#: src/main.cpp:414
 msgid "Select audio stream (1-n, depending on input)."
 msgstr ""
 
-#: src/main.cpp:419
+#: src/main.cpp:415
 msgid "Select subtitle stream (0-n, dep. on input)."
 msgstr ""
 
-#: src/main.cpp:420
+#: src/main.cpp:416
 msgid "Select input type (default autodetect):"
 msgstr ""
 
-#: src/main.cpp:421
+#: src/main.cpp:417
 msgid "Single view."
 msgstr ""
 
-#: src/main.cpp:422
+#: src/main.cpp:418
 msgid "Left/right separate streams, left first."
 msgstr ""
 
-#: src/main.cpp:423
+#: src/main.cpp:419
 msgid "Left/right separate streams, right first."
 msgstr ""
 
-#: src/main.cpp:424
+#: src/main.cpp:420
 msgid "Left/right alternating, left first."
 msgstr ""
 
-#: src/main.cpp:425
+#: src/main.cpp:421
 msgid "Left/right alternating, right first."
 msgstr ""
 
-#: src/main.cpp:426 src/main.cpp:441
+#: src/main.cpp:422 src/main.cpp:437
 msgid "Left top, right bottom."
 msgstr ""
 
-#: src/main.cpp:427 src/main.cpp:442
+#: src/main.cpp:423 src/main.cpp:438
 msgid "Left top, right bottom, half height."
 msgstr ""
 
-#: src/main.cpp:428
+#: src/main.cpp:424
 msgid "Left bottom, right top."
 msgstr ""
 
-#: src/main.cpp:429
+#: src/main.cpp:425
 msgid "Left bottom, right top, half height."
 msgstr ""
 
-#: src/main.cpp:430 src/main.cpp:443
+#: src/main.cpp:426 src/main.cpp:439
 msgid "Left left, right right."
 msgstr ""
 
-#: src/main.cpp:431 src/main.cpp:444
+#: src/main.cpp:427 src/main.cpp:440
 msgid "Left left, right right, half width."
 msgstr ""
 
-#: src/main.cpp:432
+#: src/main.cpp:428
 msgid "Left right, right left."
 msgstr ""
 
-#: src/main.cpp:433
+#: src/main.cpp:429
 msgid "Left right, right left, half width."
 msgstr ""
 
-#: src/main.cpp:434 src/main.cpp:445
+#: src/main.cpp:430 src/main.cpp:441
 msgid "Left even rows, right odd rows."
 msgstr ""
 
-#: src/main.cpp:435
+#: src/main.cpp:431
 msgid "Left odd rows, right even rows."
 msgstr ""
 
-#: src/main.cpp:436
+#: src/main.cpp:432
 msgid "Select output type:"
 msgstr ""
 
-#: src/main.cpp:437
+#: src/main.cpp:433
 msgid "OpenGL quad-buffered stereo."
 msgstr ""
 
-#: src/main.cpp:438
+#: src/main.cpp:434
 msgid "Left and right view alternating."
 msgstr ""
 
-#: src/main.cpp:439
+#: src/main.cpp:435
 msgid "Only left."
 msgstr ""
 
-#: src/main.cpp:440
+#: src/main.cpp:436
 msgid "Only right."
 msgstr ""
 
-#: src/main.cpp:446
+#: src/main.cpp:442
 msgid "Left even columns, right odd columns."
 msgstr ""
 
-#: src/main.cpp:447
+#: src/main.cpp:443
 msgid "Left and right in checkerboard pattern."
 msgstr ""
 
-#: src/main.cpp:448
+#: src/main.cpp:444
 msgid "HDMI frame packing mode."
 msgstr ""
 
-#: src/main.cpp:449
+#: src/main.cpp:445
 msgid "Red/cyan anaglyph, monochrome method."
 msgstr ""
 
-#: src/main.cpp:450
+#: src/main.cpp:446
 msgid "Red/cyan anaglyph, half color method."
 msgstr ""
 
-#: src/main.cpp:451
+#: src/main.cpp:447
 msgid "Red/cyan anaglyph, full color method."
 msgstr ""
 
-#: src/main.cpp:452
+#: src/main.cpp:448
 msgid "Red/cyan anaglyph, Dubois method."
 msgstr ""
 
-#: src/main.cpp:453
+#: src/main.cpp:449
 msgid "Green/magenta anaglyph, monochrome method."
 msgstr ""
 
-#: src/main.cpp:454
+#: src/main.cpp:450
 msgid "Green/magenta anaglyph, half color method."
 msgstr ""
 
-#: src/main.cpp:455
+#: src/main.cpp:451
 msgid "Green/magenta anaglyph, full color method."
 msgstr ""
 
-#: src/main.cpp:456
+#: src/main.cpp:452
 msgid "Green/magenta anaglyph, Dubois method."
 msgstr ""
 
-#: src/main.cpp:457
+#: src/main.cpp:453
 msgid "Amber/blue anaglyph, monochrome method."
 msgstr ""
 
-#: src/main.cpp:458
+#: src/main.cpp:454
 msgid "Amber/blue anaglyph, half color method."
 msgstr ""
 
-#: src/main.cpp:459
+#: src/main.cpp:455
 msgid "Amber/blue anaglyph, full color method."
 msgstr ""
 
-#: src/main.cpp:460
+#: src/main.cpp:456
 msgid "Amber/blue anaglyph, Dubois method."
 msgstr ""
 
-#: src/main.cpp:461
+#: src/main.cpp:457
 msgid "Red/green anaglyph, monochrome method."
 msgstr ""
 
-#: src/main.cpp:462
+#: src/main.cpp:458
 msgid "Red/blue anaglyph, monochrome method."
 msgstr ""
 
-#: src/main.cpp:463
+#: src/main.cpp:459
 msgid "Multi-display via Equalizer (2D setup)."
 msgstr ""
 
-#: src/main.cpp:464
+#: src/main.cpp:460
 msgid "Multi-display via Equalizer (3D setup)."
 msgstr ""
 
-#: src/main.cpp:465
+#: src/main.cpp:461
 msgid "Swap left/right view."
 msgstr ""
 
-#: src/main.cpp:466
+#: src/main.cpp:462
 msgid "Fullscreen."
 msgstr ""
 
-#: src/main.cpp:467
+#: src/main.cpp:463
 msgid "Use the listed screens in fullscreen mode."
 msgstr ""
 
-#: src/main.cpp:468
+#: src/main.cpp:464
 msgid "Screen numbers start with 1."
 msgstr ""
 
-#: src/main.cpp:469
+#: src/main.cpp:465
 msgid "An empty list defaults to the primary screen."
 msgstr ""
 
-#: src/main.cpp:470
+#: src/main.cpp:466
 msgid "Flip left view vertically when fullscreen."
 msgstr ""
 
-#: src/main.cpp:471
+#: src/main.cpp:467
 msgid "Flop left view horizontally when fullscreen."
 msgstr ""
 
-#: src/main.cpp:472
+#: src/main.cpp:468
 msgid "Flip right view vertically when fullscreen."
 msgstr ""
 
-#: src/main.cpp:473
+#: src/main.cpp:469
 msgid "Flop right view horizontally when fullscreen."
 msgstr ""
 
-#: src/main.cpp:474
+#: src/main.cpp:470
+msgid "Use DLP 3-D Ready Sync when fullscreen."
+msgstr ""
+
+#: src/main.cpp:471
 msgid "Set zoom for wide videos (0=off to 1=full)."
 msgstr ""
 
-#: src/main.cpp:475
+#: src/main.cpp:472
 msgid "Crop video to given aspect ratio (0:0=off)."
 msgstr ""
 
-#: src/main.cpp:476
+#: src/main.cpp:473
 msgid "Center window on screen."
 msgstr ""
 
-#: src/main.cpp:477
+#: src/main.cpp:474
 msgid "Set subtitle encoding."
 msgstr ""
 
-#: src/main.cpp:478
+#: src/main.cpp:475
 msgid "Set subtitle font name."
 msgstr ""
 
-#: src/main.cpp:479
+#: src/main.cpp:476
 msgid "Set subtitle font size."
 msgstr ""
 
-#: src/main.cpp:480
+#: src/main.cpp:477
 msgid "Set subtitle scale factor."
 msgstr ""
 
-#: src/main.cpp:481
+#: src/main.cpp:478
 msgid "Set subtitle color, in [AA]RRGGBB format."
 msgstr ""
 
-#: src/main.cpp:482
+#: src/main.cpp:479
+msgid "Set subtitle shadow, -1=default, 0=off, 1=on."
+msgstr ""
+
+#: src/main.cpp:480
 msgid "Subtitle parallax adjustment (-1 to +1)."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:481
 msgid "Parallax adjustment (-1 to +1)."
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:482
 msgid "Crosstalk leak level (0 to 1)."
 msgstr ""
 
-#: src/main.cpp:485
+#: src/main.cpp:483
 msgid "Comma-separated values for R,G,B."
 msgstr ""
 
-#: src/main.cpp:486
+#: src/main.cpp:484
 msgid "Amount of ghostbusting to apply (0 to 1)."
 msgstr ""
 
-#: src/main.cpp:487
+#: src/main.cpp:485
 msgid "Benchmark mode (no audio, show fps)."
 msgstr ""
 
-#: src/main.cpp:488
+#: src/main.cpp:486
 msgid "Frame rate divisor for display refresh rate."
 msgstr ""
 
-#: src/main.cpp:489
+#: src/main.cpp:487
 msgid "Default is 0 for benchmark mode, 1 otherwise."
 msgstr ""
 
-#: src/main.cpp:490
+#: src/main.cpp:488
 msgid "Loop the input media."
 msgstr ""
 
-#: src/main.cpp:492
+#: src/main.cpp:489
+msgid "Set SDI output format."
+msgstr ""
+
+#: src/main.cpp:491
 msgid "Interactive control:"
 msgstr ""
 
-#: src/main.cpp:493
+#: src/main.cpp:492
 msgid "Leave fullscreen mode, or quit."
 msgstr ""
 
-#: src/main.cpp:494
+#: src/main.cpp:493
 msgid "Quit."
 msgstr ""
 
-#: src/main.cpp:515
+#: src/main.cpp:514
 msgid "Seek according to horizontal click position."
 msgstr ""
 
-#: src/main.cpp:523
+#: src/main.cpp:522
 msgid "No audio devices known."
 msgstr ""
 
-#: src/main.cpp:595
+#: src/main.cpp:594
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr ""
 
-#: src/main.cpp:729
+#: src/main.cpp:608
+#, c-format
+msgid "Unknown mode %s."
+msgstr ""
+
+#: src/main.cpp:740
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr ""
 
 #. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:935
+#: src/media_data.cpp:1051
 #, c-format
 msgid "%dx%d, %.3g:1"
 msgstr ""
 
 #. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:1066
+#: src/media_data.cpp:1182
 #, c-format
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr ""
 
-#: src/media_input.cpp:282
+#: src/media_input.cpp:281
 #, c-format
 msgid "Video %s: %s"
 msgstr ""
 
-#: src/media_input.cpp:287
+#: src/media_input.cpp:286
 msgid "No video."
 msgstr ""
 
-#: src/media_input.cpp:293
+#: src/media_input.cpp:292
 #, c-format
 msgid "Audio %s: %s"
 msgstr ""
 
-#: src/media_input.cpp:298
+#: src/media_input.cpp:297
 msgid "No audio."
 msgstr ""
 
-#: src/media_input.cpp:304
+#: src/media_input.cpp:303
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr ""
 
-#: src/media_input.cpp:309
+#: src/media_input.cpp:308
 msgid "No subtitle."
 msgstr ""
 
-#: src/media_input.cpp:311
+#: src/media_input.cpp:310
 #, c-format
 msgid "Duration: %g seconds"
 msgstr ""
 
-#: src/media_input.cpp:314
+#: src/media_input.cpp:313
 #, c-format
 msgid "Stereo layout: %s"
 msgstr ""
@@ -1575,145 +1679,145 @@
 msgid "default"
 msgstr ""
 
-#: src/media_object.cpp:832
+#: src/media_object.cpp:836
 #, c-format
 msgid "%s: Cannot read stream info: %s"
 msgstr ""
 
-#: src/media_object.cpp:876
+#: src/media_object.cpp:880
 #, c-format
 msgid "%s stream %d: Cannot open %s: %s"
 msgstr ""
 
-#: src/media_object.cpp:877
+#: src/media_object.cpp:881
 msgid "video codec"
 msgstr ""
 
-#: src/media_object.cpp:878
+#: src/media_object.cpp:882
 msgid "audio codec"
 msgstr ""
 
-#: src/media_object.cpp:879
+#: src/media_object.cpp:883
 msgid "subtitle codec"
 msgstr ""
 
-#: src/media_object.cpp:880
+#: src/media_object.cpp:884
 msgid "data"
 msgstr ""
 
-#: src/media_object.cpp:881
+#: src/media_object.cpp:885
 msgid "codec not supported"
 msgstr ""
 
-#: src/media_object.cpp:891
+#: src/media_object.cpp:895
 #, c-format
 msgid "%s video stream %d: Invalid frame size."
 msgstr ""
 
-#: src/media_object.cpp:935
+#: src/media_object.cpp:939
 #, c-format
 msgid "%s video stream %d: Cannot initialize conversion context."
 msgstr ""
 
-#: src/media_object.cpp:998
+#: src/media_object.cpp:1002
 #, c-format
 msgid "Video stream %d: %s / %s, %g seconds"
 msgstr ""
 
-#: src/media_object.cpp:1002
+#: src/media_object.cpp:1006
 #, c-format
 msgid "Using up to %d threads for decoding."
 msgstr ""
 
-#: src/media_object.cpp:1007
+#: src/media_object.cpp:1011
 #, c-format
 msgid "Audio stream %d: %s / %s, %g seconds"
 msgstr ""
 
-#: src/media_object.cpp:1014
+#: src/media_object.cpp:1018
 #, c-format
 msgid "Subtitle stream %d: %s / %s, %g seconds"
 msgstr ""
 
-#: src/media_object.cpp:1021
+#: src/media_object.cpp:1025
 msgid "No usable streams."
 msgstr ""
 
-#: src/media_object.cpp:1302 src/media_object.cpp:1332
-#: src/media_object.cpp:1362
+#: src/media_object.cpp:1306 src/media_object.cpp:1336
+#: src/media_object.cpp:1366
 #, c-format
 msgid "%s: Cannot duplicate packet."
 msgstr ""
 
-#: src/media_object.cpp:1456
+#: src/media_object.cpp:1460
 #, c-format
 msgid "%s video stream %d: Dropping %dx%d frame"
 msgstr ""
 
-#: src/media_object.cpp:1919
+#: src/media_object.cpp:1923
 #, c-format
 msgid "%s: Seeking failed."
 msgstr ""
 
-#: src/player.cpp:434
+#: src/player.cpp:437
 #, c-format
 msgid "Video: delay %g seconds/%g frames; dropping next frame."
 msgstr ""
 
-#: src/player.cpp:450
+#: src/player.cpp:453
 #, c-format
 msgid "FPS: %.2f"
 msgstr ""
 
-#: src/player_equalizer.cpp:116
+#: src/player_equalizer.cpp:117
 msgid "Reading input frame failed."
 msgstr ""
 
-#: src/player_equalizer.cpp:165 src/video_output_qt.cpp:590
-#: src/video_output_qt.cpp:597
+#: src/player_equalizer.cpp:166 src/video_output_qt.cpp:613
+#: src/video_output_qt.cpp:620
 msgid "Waiting for subtitle renderer initialization..."
 msgstr ""
 
-#: src/player_equalizer.cpp:250
+#: src/player_equalizer.cpp:251
 msgid "Init data mapping failed."
 msgstr ""
 
-#: src/player_equalizer.cpp:251
+#: src/player_equalizer.cpp:252
 msgid "Frame data mapping failed."
 msgstr ""
 
-#: src/player_equalizer.cpp:252
+#: src/player_equalizer.cpp:253
 msgid "Video player initialization failed."
 msgstr ""
 
-#: src/player_equalizer.cpp:253
+#: src/player_equalizer.cpp:254
 msgid "Need at least OpenGL 2.1."
 msgstr ""
 
-#: src/player_equalizer.cpp:430
+#: src/player_equalizer.cpp:431
 msgid "No canvas in Equalizer configuration."
 msgstr ""
 
-#: src/player_equalizer.cpp:437
+#: src/player_equalizer.cpp:438
 #, c-format
 msgid "Equalizer canvas: %gx%g, aspect ratio %g:1"
 msgstr ""
 
-#: src/player_equalizer.cpp:922 src/video_output_qt.cpp:560
+#: src/player_equalizer.cpp:926 src/video_output_qt.cpp:583
 msgid ""
 "This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
 "objects."
 msgstr ""
 
-#: src/player_equalizer.cpp:1105
+#: src/player_equalizer.cpp:1107
 msgid "Equalizer initialization failed."
 msgstr ""
 
-#: src/player_equalizer.cpp:1113
+#: src/player_equalizer.cpp:1115
 msgid "Cannot get equalizer configuration."
 msgstr ""
 
-#: src/player_equalizer.cpp:1127
+#: src/player_equalizer.cpp:1132
 msgid "Equalizer configuration initialization failed."
 msgstr ""
 
@@ -1725,81 +1829,86 @@
 msgid "Cannot initialize LibASS renderer."
 msgstr ""
 
-#: src/subtitle_renderer.cpp:398
+#: src/subtitle_renderer.cpp:404
 msgid "Cannot initialize LibASS track."
 msgstr ""
 
-#: src/subtitle_renderer.cpp:409
+#: src/subtitle_renderer.cpp:415
 #, c-format
 msgid "Subtitle character set conversion failed: %s"
 msgstr ""
 
-#: src/video_output.cpp:145
+#: src/video_output.cpp:347
 #, c-format
 msgid "OpenGL error 0x%04X."
 msgstr ""
 
-#: src/video_output.cpp:203
+#: src/video_output.cpp:359
+#, c-format
+msgid "OpenGL Framebuffer status error 0x%04X."
+msgstr ""
+
+#: src/video_output.cpp:407
 #, c-format
 msgid "OpenGL %s '%s': compiler warning:"
 msgstr ""
 
-#: src/video_output.cpp:204 src/video_output.cpp:209
+#: src/video_output.cpp:408 src/video_output.cpp:413
 msgid "vertex shader"
 msgstr ""
 
-#: src/video_output.cpp:204 src/video_output.cpp:209
+#: src/video_output.cpp:408 src/video_output.cpp:413
 msgid "fragment shader"
 msgstr ""
 
-#: src/video_output.cpp:208
+#: src/video_output.cpp:412
 #, c-format
 msgid "OpenGL %s '%s': compilation failed."
 msgstr ""
 
-#: src/video_output.cpp:211 src/video_output.cpp:288
+#: src/video_output.cpp:415 src/video_output.cpp:492
 msgid "unknown error"
 msgstr ""
 
-#: src/video_output.cpp:284
+#: src/video_output.cpp:488
 #, c-format
 msgid "OpenGL program '%s': linker warning:"
 msgstr ""
 
-#: src/video_output.cpp:287
+#: src/video_output.cpp:491
 #, c-format
 msgid "OpenGL program '%s': linking failed."
 msgstr ""
 
-#: src/video_output.cpp:563 src/video_output.cpp:675
+#: src/video_output.cpp:1494 src/video_output.cpp:1635
 msgid "Cannot create a PBO buffer."
 msgstr ""
 
-#: src/video_output_qt.cpp:555
+#: src/video_output_qt.cpp:578
 #, c-format
 msgid "Cannot initialize GLEW: %s"
 msgstr ""
 
-#: src/video_output_qt.cpp:588
+#: src/video_output_qt.cpp:611
 msgid "Please wait"
 msgstr ""
 
-#: src/video_output_qt.cpp:643
+#: src/video_output_qt.cpp:671
 msgid "Cannot get valid OpenGL context."
 msgstr ""
 
-#: src/video_output_qt.cpp:654
+#: src/video_output_qt.cpp:682
 msgid "The display does not support OpenGL stereo mode."
 msgstr ""
 
-#: src/video_output_qt.cpp:659
+#: src/video_output_qt.cpp:687
 msgid "Cannot set OpenGL context format."
 msgstr ""
 
-#: src/video_output_qt.cpp:752
+#: src/video_output_qt.cpp:780
 msgid "Cannot suspend screensaver."
 msgstr ""
 
-#: src/video_output_qt.cpp:767
+#: src/video_output_qt.cpp:795
 msgid "Cannot resume screensaver."
 msgstr ""

bino-1.3.2.tar.xz/po/cs.gmo -> bino-1.3.3.tar.xz/po/cs.gmo Changed

bino-1.3.2.tar.xz/po/cs.po -> bino-1.3.3.tar.xz/po/cs.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-03-16 19:49+0100\n"
+"POT-Creation-Date: 2012-05-01 15:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Joe <cuchac@email.cz>\n"
 "Language-Team: none\n"
@@ -91,13 +91,13 @@
 msgid "Too many arguments."
 msgstr "Příliš mnoho parametrů."
 
-#: src/base/str.cpp:236
+#: 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:455 src/base/str.cpp:473 src/base/str.cpp:483
-#: src/base/str.cpp:494 src/base/str.cpp:499
+#: 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."
@@ -124,8 +124,8 @@
 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:1067 src/media_data.cpp:1090 src/media_data.cpp:1128
-#: src/media_data.cpp:1133
+#: src/media_data.cpp:1183 src/media_data.cpp:1206 src/media_data.cpp:1244
+#: src/media_data.cpp:1249
 msgid "unknown"
 msgstr "neznámá"
 
@@ -191,242 +191,254 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Nelze odpojit buffery OpeanAL zdroje."
 
-#: src/dispatch.cpp:156
+#: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
+#: src/main.cpp:361 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
+#, fuzzy, c-format
+msgid "%s: invalid command '%s'"
+msgstr "Obdržen neplatný příkaz '%s' z LIRC."
+
+#: src/dispatch.cpp:166
 msgid "Cannot connect to X server."
 msgstr "Nelze se připojit k X serveru."
 
-#: src/dispatch.cpp:171
+#: src/dispatch.cpp:182
 msgid "No video to play."
 msgstr "Nenalezeno žádné video."
 
-#: src/dispatch.cpp:411 src/player_equalizer.cpp:84
+#: src/dispatch.cpp:437 src/player_equalizer.cpp:85
 msgid "No video streams found."
 msgstr "Nebyly nalezeny žádné video stopy."
 
-#: src/dispatch.cpp:428
+#: src/dispatch.cpp:454
 msgid "Cannot set requested stereo layout: incompatible media."
 msgstr "Nemohu nastavit požadovaný stereo formát: nekompatibilní vstup."
 
-#: src/dispatch.cpp:443
+#: src/dispatch.cpp:469
 #, c-format
 msgid "Video stream %d not found."
 msgstr "Video stopa %d nebyla nalezena."
 
-#: src/dispatch.cpp:449
+#: src/dispatch.cpp:475
 #, c-format
 msgid "Audio stream %d not found."
 msgstr "Zvuková stopa %d nebyla nalezena."
 
-#: src/dispatch.cpp:457
+#: src/dispatch.cpp:483
 #, c-format
 msgid "Subtitle stream %d not found."
 msgstr "Stopa titulků %d nebyla nalezena."
 
-#: src/dispatch.cpp:529 src/main.cpp:736
+#: src/dispatch.cpp:555 src/main.cpp:748
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Tato verze Bina byla zkompilována bez podpory knihovny Equalizer."
 
-#: src/gui.cpp:101
+#: src/gui.cpp:107
 msgid "Video:"
 msgstr "Video:"
 
-#: src/gui.cpp:102
+#: src/gui.cpp:108
 msgid "Select the video stream."
 msgstr "Vyber video stopu."
 
-#: src/gui.cpp:108
+#: src/gui.cpp:114
 msgid "Audio:"
 msgstr "Zvuk:"
 
-#: src/gui.cpp:109
+#: src/gui.cpp:115
 msgid "Select the audio stream."
 msgstr "Vyber zvukovou stopu."
 
-#: src/gui.cpp:115
+#: src/gui.cpp:121
 msgid "Subtitle:"
 msgstr "Titulky:"
 
-#: src/gui.cpp:116
+#: src/gui.cpp:122
 msgid "Select the subtitle stream."
 msgstr "Vyber stopu titulků."
 
-#: src/gui.cpp:127 src/media_input.cpp:277
+#: src/gui.cpp:133 src/media_input.cpp:276
 msgid "Input:"
 msgstr "Vstup:"
 
-#: src/gui.cpp:128
+#: src/gui.cpp:134
 msgid "Set the 3D layout of the video stream."
 msgstr "Nastav 3D formát videa."
 
-#: src/gui.cpp:132
+#: src/gui.cpp:138
 msgid "2D"
 msgstr "2D"
 
-#: src/gui.cpp:133
+#: src/gui.cpp:139
 msgid "Separate streams, left first"
 msgstr "Oddělené stopy, levá první"
 
-#: src/gui.cpp:134
+#: src/gui.cpp:140
 msgid "Separate streams, right first"
 msgstr "Oddělené stopy, pravá první"
 
-#: src/gui.cpp:135
+#: src/gui.cpp:141
 #, fuzzy
 msgid "Alternating, left first"
 msgstr "Oddělené stopy, levá první"
 
-#: src/gui.cpp:136
+#: src/gui.cpp:142
 #, fuzzy
 msgid "Alternating, right first"
 msgstr "Oddělené stopy, pravá první"
 
-#: src/gui.cpp:137 src/gui.cpp:161
+#: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2095 src/gui.cpp:2124
 msgid "Top/bottom"
 msgstr "Nahoře/Dole"
 
-#: src/gui.cpp:138 src/gui.cpp:162
+#: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2096 src/gui.cpp:2125
 msgid "Top/bottom, half height"
 msgstr "Nahoře/Dole, poloviční výška"
 
-#: src/gui.cpp:139
+#: src/gui.cpp:145
 msgid "Bottom/top"
 msgstr "Dole/Nahoře"
 
-#: src/gui.cpp:140
+#: src/gui.cpp:146
 msgid "Bottom/top, half height"
 msgstr "Dole/Nahoře, poloviční výška"
 
-#: src/gui.cpp:141 src/gui.cpp:163
+#: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2097 src/gui.cpp:2126
 msgid "Left/right"
 msgstr "Levá/Pravá"
 
-#: src/gui.cpp:142 src/gui.cpp:164
+#: src/gui.cpp:148 src/gui.cpp:170 src/gui.cpp:2098 src/gui.cpp:2127
 msgid "Left/right, half width"
 msgstr "Levá/Pravá, poloviční šířka"
 
-#: src/gui.cpp:143
+#: src/gui.cpp:149
 msgid "Right/left"
 msgstr "Pravá/Levá"
 
-#: src/gui.cpp:144
+#: src/gui.cpp:150
 msgid "Right/left, half width"
 msgstr "Pravá/Levá, poloviční šířka"
 
-#: src/gui.cpp:145 src/gui.cpp:165
+#: src/gui.cpp:151 src/gui.cpp:171 src/gui.cpp:2099 src/gui.cpp:2128
 msgid "Even/odd rows"
 msgstr "Sudé/Liché řádky"
 
-#: src/gui.cpp:146
+#: src/gui.cpp:152
 msgid "Odd/even rows"
 msgstr "Liché/Sudé řádky"
 
-#: src/gui.cpp:152
+#: src/gui.cpp:158
 msgid "Output:"
 msgstr "Výstup:"
 
-#: src/gui.cpp:153
+#: src/gui.cpp:159
 msgid "Set the 3D output type for your display."
 msgstr "Nastav 3D formát výstupu vašeho monitoru."
 
-#: src/gui.cpp:157
+#: src/gui.cpp:163 src/gui.cpp:2093 src/gui.cpp:2122
 msgid "Left view"
 msgstr "Levý obraz"
 
-#: src/gui.cpp:158
+#: src/gui.cpp:164 src/gui.cpp:2094 src/gui.cpp:2123
 msgid "Right view"
 msgstr "Pravý obraz"
 
-#: src/gui.cpp:159
+#: src/gui.cpp:165
 msgid "OpenGL stereo"
 msgstr "OpenGL stereo"
 
-#: src/gui.cpp:160
+#: src/gui.cpp:166
 msgid "Left/right view alternating"
 msgstr ""
 
-#: src/gui.cpp:166
+#: src/gui.cpp:172 src/gui.cpp:2100 src/gui.cpp:2129
 msgid "Even/odd columns"
 msgstr "Sudé/Liché sloupce"
 
-#: src/gui.cpp:167
+#: src/gui.cpp:173 src/gui.cpp:2101 src/gui.cpp:2130
 msgid "Checkerboard pattern"
 msgstr "Šachovnice"
 
-#: src/gui.cpp:168
+#: src/gui.cpp:174
 msgid "HDMI frame packing mode"
 msgstr "HDMI režim"
 
-#: src/gui.cpp:169
+#: src/gui.cpp:175 src/gui.cpp:2102 src/gui.cpp:2131
 msgid "Red/cyan glasses, monochrome method"
 msgstr "Červené/modré brýle, stupně šedi"
 
-#: src/gui.cpp:170
+#: src/gui.cpp:176 src/gui.cpp:2103 src/gui.cpp:2132
 msgid "Red/cyan glasses, half-color method"
 msgstr "Červené/modré brýle, polotóny"
 
-#: src/gui.cpp:171
+#: src/gui.cpp:177 src/gui.cpp:2104 src/gui.cpp:2133
 msgid "Red/cyan glasses, full-color method"
 msgstr "Červené/modré brýle, plné tóny"
 
-#: src/gui.cpp:172
+#: src/gui.cpp:178 src/gui.cpp:2105 src/gui.cpp:2134
 msgid "Red/cyan glasses, high-quality Dubois method"
 msgstr "Červené/modré brýle, kvalitní Dubois metoda"
 
-#: src/gui.cpp:173
+#: src/gui.cpp:179 src/gui.cpp:2106 src/gui.cpp:2135
 msgid "Green/magenta glasses, monochrome method"
 msgstr "Zelené/fialové brýle, stupně šedi"
 
-#: src/gui.cpp:174
+#: src/gui.cpp:180 src/gui.cpp:2107 src/gui.cpp:2136
 msgid "Green/magenta glasses, half-color method"
 msgstr "Zelené/fialové brýle, polotóny"
 
-#: src/gui.cpp:175
+#: src/gui.cpp:181 src/gui.cpp:2108 src/gui.cpp:2137
 msgid "Green/magenta glasses, full-color method"
 msgstr "Zelené/fialové brýle, plné tóny"
 
-#: src/gui.cpp:176
+#: src/gui.cpp:182 src/gui.cpp:2109 src/gui.cpp:2138
 msgid "Green/magenta glasses, high-quality Dubois method"
 msgstr "Zelené/fialové brýle, kvalitní Dubois metoda"
 
-#: src/gui.cpp:177
+#: src/gui.cpp:183 src/gui.cpp:2110 src/gui.cpp:2139
 msgid "Amber/blue glasses, monochrome method"
 msgstr "Žluté/modré brýle, stupně šedi"
 
-#: src/gui.cpp:178
+#: src/gui.cpp:184 src/gui.cpp:2111 src/gui.cpp:2140
 msgid "Amber/blue glasses, half-color method"
 msgstr "Žluté/modré brýle, polotóny"
 
-#: src/gui.cpp:179
+#: src/gui.cpp:185 src/gui.cpp:2112 src/gui.cpp:2141
 msgid "Amber/blue glasses, full-color method"
 msgstr "Žluté/modré brýle, plné tóny"
 
-#: src/gui.cpp:180
+#: src/gui.cpp:186 src/gui.cpp:2113 src/gui.cpp:2142
 msgid "Amber/blue glasses, high-quality Dubois method"
 msgstr "Žluté/modré brýle, kvalitní Dubois metoda"
 
-#: src/gui.cpp:181
+#: src/gui.cpp:187 src/gui.cpp:2114 src/gui.cpp:2143
 msgid "Red/green glasses, monochrome method"
 msgstr "Červené/zelené brýle, stupně šedi"
 
-#: src/gui.cpp:182
+#: src/gui.cpp:188 src/gui.cpp:2115 src/gui.cpp:2144
 msgid "Red/blue glasses, monochrome method"
 msgstr "Červené/modré brýle, stupně šedi"
 
-#: src/gui.cpp:186
+#: src/gui.cpp:192
 msgid "Swap left/right"
 msgstr "Prohoď levou/pravou"
 
-#: src/gui.cpp:187
+#: src/gui.cpp:193
 msgid ""
 "Swap the left and right view. Use this if the 3D effect seems wrong."
 msgstr ""
 "Prohoď levou a pravou. Použijte, pokud je 3D efekt špatný (obrácený)"
 
-#: src/gui.cpp:467
+#: src/gui.cpp:471 src/gui.cpp:1676
 msgid "Off"
 msgstr "Žádné"
 
-#: src/gui.cpp:694
+#: src/gui.cpp:702
 msgid ""
 "This slider shows the progress during video playback, and can be used to "
 "seek in the video."
@@ -434,36 +446,36 @@
 "Tento posuvník zobrazuje pozici přehrávaného videa, můžete ho použít pro "
 "vyhledávání ve videu."
 
-#: src/gui.cpp:701
+#: src/gui.cpp:709
 msgid "Elapsed / total time."
 msgstr "Uplynulý / celkový čas."
 
-#: src/gui.cpp:708
+#: src/gui.cpp:716
 #, fuzzy
 msgid "Toggle audio mute."
 msgstr "Přepnout přehrávání ve smyčce."
 
-#: src/gui.cpp:713
+#: src/gui.cpp:721
 msgid "Adjust audio volume."
 msgstr ""
 
-#: src/gui.cpp:725
+#: src/gui.cpp:733
 msgid "Play."
 msgstr "Spustit."
 
-#: src/gui.cpp:729
+#: src/gui.cpp:737
 msgid "Pause."
 msgstr "Pozastav."
 
-#: src/gui.cpp:733
+#: src/gui.cpp:741
 msgid "Stop."
 msgstr "Zastav."
 
-#: src/gui.cpp:738
+#: src/gui.cpp:746
 msgid "Toggle loop mode."
 msgstr "Přepnout přehrávání ve smyčce."
 
-#: src/gui.cpp:745
+#: src/gui.cpp:753
 msgid ""
 "Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
 "f key."
@@ -471,152 +483,160 @@
 "Přepni do režimu celé obrazovky. Tento režim můžete ukončit stiskem "
 "tlačítka f"
 
-#: src/gui.cpp:751
+#: src/gui.cpp:759
 msgid "Center the video area on your screen."
 msgstr "Vycentruj video na středu obrazovky."
 
-#: src/gui.cpp:758
+#: src/gui.cpp:766
 msgid "Seek backward 10 minutes."
 msgstr "Přeskoč 10 minut zpět."
 
-#: src/gui.cpp:763
+#: src/gui.cpp:771
 msgid "Seek backward 1 minute."
 msgstr "Přeskoč 1 minutu zpět."
 
-#: src/gui.cpp:769
+#: src/gui.cpp:777
 msgid "Seek backward 10 seconds."
 msgstr "Přeskoč 10 vteřin zpět."
 
-#: src/gui.cpp:775
+#: src/gui.cpp:783
 msgid "Seek forward 10 seconds."
 msgstr "Přeskoč 10 vteřin dopředu."
 
-#: src/gui.cpp:780
+#: src/gui.cpp:788
 msgid "Seek forward 1 minute."
 msgstr "Přeskoč 1 minutu dopředu."
 
-#: src/gui.cpp:786
+#: src/gui.cpp:794
 msgid "Seek forward 10 minutes."
 msgstr "Přeskoč 10 minut dopředu."
 
-#: src/gui.cpp:1047
+#: src/gui.cpp:1055
 msgid "Fullscreen/Multiscreen Settings"
 msgstr "Nastavení Celoobrazového/Víceobrazového režimu"
 
-#: src/gui.cpp:1049
+#: src/gui.cpp:1057
 msgid "Configure fullscreen mode:"
 msgstr "Nastavení celoobrazového režimu:"
 
-#: src/gui.cpp:1050
+#: src/gui.cpp:1058
 msgid "Select the screens to use in fullscreen mode."
 msgstr "Vyber obrazovky, které budou použity v celoobrazovém režimu."
 
-#: src/gui.cpp:1052
+#: src/gui.cpp:1060
 msgid "Single screen:"
 msgstr "Jedna obrazovka:"
 
-#: src/gui.cpp:1053
+#: src/gui.cpp:1061
 msgid "Use a single screen for fullscreen mode."
 msgstr "Použij jednu obrazovku pro celoobrazový režim."
 
-#: src/gui.cpp:1056
+#: src/gui.cpp:1064
 msgid "Primary screen"
 msgstr "Primární obrazovka"
 
-#: src/gui.cpp:1059 src/gui.cpp:1070 src/gui.cpp:1071
+#: src/gui.cpp:1067 src/gui.cpp:1078 src/gui.cpp:1079
 #, c-format
 msgid "Screen %d"
 msgstr "Obrazovka %d"
 
-#: src/gui.cpp:1062
+#: src/gui.cpp:1070
 msgid "Dual screen:"
 msgstr "Dvě obrazovky:"
 
-#: src/gui.cpp:1063
+#: src/gui.cpp:1071
 msgid "Use two screens for fullscreen mode."
 msgstr "Použij dvě obrazovky pro celoobrazový režim."
 
-#: src/gui.cpp:1075
+#: src/gui.cpp:1083
 msgid "Multi screen:"
 msgstr "Více obrazovek:"
 
-#: src/gui.cpp:1076
+#: src/gui.cpp:1084
 msgid "Use multiple screens for fullscreen mode."
 msgstr "Použij více obrazovek pro celoobrazový režim."
 
-#: src/gui.cpp:1078
+#: src/gui.cpp:1086
 msgid "Comma-separated list of screens to use for fullscreen mode."
 msgstr ""
 "Seznam obrazovek pro použití v celoobrazovém režimu, oddělený čárkou."
 
-#: src/gui.cpp:1081
+#: src/gui.cpp:1089
 msgid "When in fullscreen mode,"
 msgstr "V celoobrazovém režimu,"
 
-#: src/gui.cpp:1082
+#: src/gui.cpp:1090
 msgid "Set special left/right view handling for fullscreen mode."
 msgstr ""
 "Nastav zvláštní chování pravého/levého obrazu při celoobrazovém režimu.</"
 "p>"
 
-#: src/gui.cpp:1084
+#: src/gui.cpp:1092
 msgid "flip left view vertically."
 msgstr "překlop levý obraz vertikálně."
 
-#: src/gui.cpp:1086
+#: src/gui.cpp:1094
 msgid "flop left view horizontally."
 msgstr "překlop levý obraz horizontálně."
 
-#: src/gui.cpp:1088
+#: src/gui.cpp:1096
 msgid "flip right view vertically."
 msgstr "překlop pravý obraz vertikálně."
 
-#: src/gui.cpp:1090
+#: src/gui.cpp:1098
 msgid "flop right view horizontally."
 msgstr "překlop pravý obraz horizontálně."
 
-#: src/gui.cpp:1093
+#: src/gui.cpp:1101
+msgid "use DLP(R) 3-D Ready Sync"
+msgstr ""
+
+#: src/gui.cpp:1102
+msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
+msgstr ""
+
+#: src/gui.cpp:1104
 #, fuzzy
 msgid "inhibit the screensaver"
 msgstr "Nelze povolit spořič obrazovky."
 
-#: src/gui.cpp:1094
+#: src/gui.cpp:1105
 #, fuzzy
 msgid "Inhibit the screensaver during fullscreen playback."
 msgstr "Vyber obrazovky, které budou použity v celoobrazovém režimu."
 
-#: src/gui.cpp:1096 src/gui.cpp:1258 src/gui.cpp:1393 src/gui.cpp:1463
-#: src/gui.cpp:1541 src/gui.cpp:1652 src/gui.cpp:1928 src/gui.cpp:2108
-#: src/gui.cpp:2778 src/gui.cpp:2825 src/gui.cpp:3114
+#: src/gui.cpp:1107 src/gui.cpp:1273 src/gui.cpp:1408 src/gui.cpp:1478
+#: src/gui.cpp:1556 src/gui.cpp:1680 src/gui.cpp:1948 src/gui.cpp:2147
+#: src/gui.cpp:2625 src/gui.cpp:3324 src/gui.cpp:3371 src/gui.cpp:3677
 msgid "OK"
 msgstr "OK"
 
-#: src/gui.cpp:1211
+#: src/gui.cpp:1226
 msgid "Display Color Adjustments"
 msgstr "Zobraz nastavení barev"
 
-#: src/gui.cpp:1213
+#: src/gui.cpp:1228
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/gui.cpp:1224
+#: src/gui.cpp:1239
 msgid "Brightness:"
 msgstr "Jas:"
 
-#: src/gui.cpp:1235
+#: src/gui.cpp:1250
 msgid "Hue:"
 msgstr "Odstín:"
 
-#: src/gui.cpp:1246
+#: src/gui.cpp:1261
 msgid "Saturation:"
 msgstr "Sytost:"
 
-#: src/gui.cpp:1364
+#: src/gui.cpp:1379
 msgid "Display Crosstalk Calibration"
 msgstr "Zobra Crosstalk kalibraci"
 
 #. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/gui.cpp:1367
+#: src/gui.cpp:1382
 msgid ""
 "Please read the manual to find out how to measure the crosstalk "
 "levels of your display."
@@ -624,141 +644,158 @@
 "Přečtěte si prosím v manuálu jak změřit nastavení crosstalku pro "
 "váš monitor."
 
-#: src/gui.cpp:1371
+#: src/gui.cpp:1386
 msgid "Red:"
 msgstr "Červená:"
 
-#: src/gui.cpp:1378
+#: src/gui.cpp:1393
 msgid "Green:"
 msgstr "Zelená:"
 
-#: src/gui.cpp:1385
+#: src/gui.cpp:1400
 msgid "Blue:"
 msgstr "Modrá:"
 
-#: src/gui.cpp:1441
+#: src/gui.cpp:1456
 msgid "Zoom for wide videos"
 msgstr ""
 
-#: src/gui.cpp:1444
+#: src/gui.cpp:1459
 msgid ""
 "Set zoom level for videos that are wider than the screen: 0: Show "
 "full video width. 1: Use full screen height.</p"
 msgstr ""
 
-#: src/gui.cpp:1448
+#: src/gui.cpp:1463
 msgid "Zoom:"
 msgstr ""
 
-#: src/gui.cpp:1449
+#: src/gui.cpp:1464
 msgid "Set the zoom level for videos that are wider than the screen"
 msgstr ""
 
-#: src/gui.cpp:1507
+#: src/gui.cpp:1522
 #, fuzzy
 msgid "Audio Settings"
 msgstr "Nastavení titulků"
 
-#: src/gui.cpp:1509
+#: src/gui.cpp:1524
 #, fuzzy
 msgid "Audio device:"
 msgstr "zvukový kodek"
 
-#: src/gui.cpp:1510
+#: src/gui.cpp:1525
 msgid ""
 "Select the audio device. This will take effect for the next started "
 "video."
 msgstr ""
 
-#: src/gui.cpp:1514 src/gui.cpp:2063
+#: src/gui.cpp:1529 src/gui.cpp:2563
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/gui.cpp:1531
+#: src/gui.cpp:1546
 msgid "Audio delay (ms):"
 msgstr ""
 
-#: src/gui.cpp:1532
+#: src/gui.cpp:1547
 msgid ""
 "Set an audio delay, in milliseconds. This is useful if audio and video "
 "are not in sync."
 msgstr ""
 
-#: src/gui.cpp:1589
+#: src/gui.cpp:1604
 msgid "Subtitle Settings"
 msgstr "Nastavení titulků"
 
-#: src/gui.cpp:1591
-msgid "These settings apply to soft subtitles, but not to bitmaps."
+#: src/gui.cpp:1607
+#, fuzzy
+msgid ""
+"These settings apply only to soft subtitles, not to bitmaps. Some "
+"changes require a restart of the video to take effect."
 msgstr ""
 "Toto nastavení se aplikuje titulky v textové podobě, ne na obrázkové."
 
-#: src/gui.cpp:1593
+#: src/gui.cpp:1610
 msgid "Encoding:"
 msgstr "Kódování:"
 
-#: src/gui.cpp:1594
+#: src/gui.cpp:1611
 msgid "Set the subtitle character set encoding."
 msgstr "Nastaví znakovou stránku titulků."
 
-#: src/gui.cpp:1609
+#: src/gui.cpp:1626
 msgid "Override font:"
 msgstr "Vynutit font:"
 
-#: src/gui.cpp:1610
+#: src/gui.cpp:1627
 msgid "Override the subtitle font family."
 msgstr "Vynutí font titulků."
 
-#: src/gui.cpp:1619
+#: src/gui.cpp:1636
 msgid "Override font size:"
 msgstr "Vynutit velikost fontu:"
 
-#: src/gui.cpp:1620
+#: src/gui.cpp:1637
 msgid "Override the subtitle font size."
 msgstr "Vynutí velikost titulků."
 
-#: src/gui.cpp:1630
+#: src/gui.cpp:1647
 msgid "Override scale factor:"
 msgstr "Vynutit zvětšení:"
 
-#: src/gui.cpp:1631
+#: src/gui.cpp:1648
 msgid "Override the subtitle scale factor."
 msgstr "Vynutí zvětšní titulků."
 
-#: src/gui.cpp:1642
+#: src/gui.cpp:1659
 msgid "Override color:"
 msgstr "Vynutit barvu:"
 
-#: src/gui.cpp:1643
+#: src/gui.cpp:1660
 msgid "Override the subtitle color."
 msgstr "Vynutí barvu titulků."
 
-#: src/gui.cpp:1866
+#: src/gui.cpp:1669
+#, fuzzy
+msgid "Override shadow:"
+msgstr "Vynutit font:"
+
+#: src/gui.cpp:1670
+#, fuzzy
+msgid "Override the subtitle shadow."
+msgstr "Vynutí barvu titulků."
+
+#: src/gui.cpp:1675
+msgid "On"
+msgstr ""
+
+#: src/gui.cpp:1886
 #, fuzzy
 msgid "Video Settings"
 msgstr "Nastavení titulků"
 
-#: src/gui.cpp:1868
+#: src/gui.cpp:1888
 #, fuzzy
 msgid "Crop to aspect ratio:"
 msgstr "%gx%g, poměr stran %g:1"
 
-#: src/gui.cpp:1869
+#: src/gui.cpp:1889
 #, fuzzy
 msgid ""
 "Set the real aspect ratio of the video, so that borders can be cropped.</"
 "p>"
 msgstr "Nastav 3D formát videa."
 
-#: src/gui.cpp:1872
+#: src/gui.cpp:1892
 msgid "Do not crop"
 msgstr ""
 
-#: src/gui.cpp:1885
+#: src/gui.cpp:1905
 msgid "Parallax:"
 msgstr "Parallax:"
 
-#: src/gui.cpp:1886
+#: src/gui.cpp:1906
 msgid ""
 "Adjust parallax, from -1 to +1. This changes the separation of left and "
 "right view, and thus the perceived distance of the scene."
@@ -766,11 +803,11 @@
 "Upraví parallax, od -1 do +1. Změní vzdálenost levého a pravého obrazu a "
 "tím nastaví hloubku vnímání 3D scény."
 
-#: src/gui.cpp:1899
+#: src/gui.cpp:1919
 msgid "Subtitle parallax:"
 msgstr "Parallax titulků:"
 
-#: src/gui.cpp:1900
+#: src/gui.cpp:1920
 msgid ""
 "Adjust subtitle parallax, from -1 to +1. This changes the perceived "
 "distance of the subtitles."
@@ -778,11 +815,11 @@
 "Upraví parallax titulků, od -1 do +1. Změní vnímanou vzdálenost titulků.</"
 "p>"
 
-#: src/gui.cpp:1913
+#: src/gui.cpp:1933
 msgid "Ghostbusting:"
 msgstr "Ghostbusting:"
 
-#: src/gui.cpp:1914
+#: src/gui.cpp:1934
 msgid ""
 "Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
 "the crosstalk levels of your display first. Note that crosstalk ghostbusting "
@@ -792,35 +829,76 @@
 "the crosstalk levels of your display first. Note that crosstalk ghostbusting "
 "does not work with anaglyph glasses."
 
-#: src/gui.cpp:2059
-msgid "Open device"
+#: src/gui.cpp:2078
+#, fuzzy
+msgid "SDI Output Settings"
+msgstr "Nastavení titulků"
+
+#: src/gui.cpp:2080
+msgid "SDI Output Format:"
+msgstr ""
+
+#: src/gui.cpp:2081
+#, fuzzy
+msgid "Select output format used for SDI output."
+msgstr "Nastav 3D formát výstupu vašeho monitoru."
+
+#: src/gui.cpp:2089
+msgid "Left stereo mode:"
+msgstr ""
+
+#: src/gui.cpp:2090
+#, fuzzy
+msgid "Select stereo mode used for left SDI output."
+msgstr "Vyber obrazovky, které budou použity v celoobrazovém režimu."
+
+#: src/gui.cpp:2118
+msgid "Right stereo mode:"
+msgstr ""
+
+#: src/gui.cpp:2119
+msgid "Select stereo mode used for right SDI output."
+msgstr ""
+
+#: src/gui.cpp:2559
+#, fuzzy
+msgid "Open device(s)"
 msgstr "Otevři zařízení"
 
-#: src/gui.cpp:2062
+#: src/gui.cpp:2562
 msgid "Choose a device type."
 msgstr "Vyberte typ zařízení."
 
-#: src/gui.cpp:2064 src/media_object.cpp:801
+#: src/gui.cpp:2564 src/media_object.cpp:801
 msgid "Firewire"
 msgstr "Firewire"
 
-#: src/gui.cpp:2065 src/media_object.cpp:802
+#: src/gui.cpp:2565 src/media_object.cpp:802
 msgid "X11"
 msgstr "X11"
 
-#: src/gui.cpp:2067 src/gui.cpp:2070
+#: src/gui.cpp:2568 src/gui.cpp:2571
 msgid "Choose a device."
 msgstr "Vyberte zařízení."
 
-#: src/gui.cpp:2073
+#: src/gui.cpp:2574
 msgid "Set the X11 device string. Refer to the manual for details."
 msgstr "Zadejte X11 device string. Podrobnosti najdete v manuálu."
 
-#: src/gui.cpp:2082
+#: src/gui.cpp:2590
+msgid "First device:"
+msgstr ""
+
+#: src/gui.cpp:2591
+#, fuzzy
+msgid "Second device:"
+msgstr "Otevři zařízení"
+
+#: src/gui.cpp:2595
 msgid "Request frame size"
 msgstr "Vynutit velikost obrazu"
 
-#: src/gui.cpp:2083
+#: src/gui.cpp:2596
 msgid ""
 "Request a specific frame size from the device, e.g. 640x480. The device "
 "must support this frame size. Some devices require a frame size to be "
@@ -830,11 +908,11 @@
 "velikost podporovat. Některá zařízení vyžadují, aby byla velikost nastavena."
 ""
 
-#: src/gui.cpp:2094
+#: src/gui.cpp:2607
 msgid "Request frame rate"
 msgstr "Vynutit snímkovou frekvenci"
 
-#: src/gui.cpp:2095
+#: src/gui.cpp:2608
 msgid ""
 "Request a specific frame rate from the device, e.g. 25/1. The device must "
 "support this frame rate. Some devices require a frame rate to be selected.</"
@@ -844,250 +922,268 @@
 "frekvenci podporovat. Některá zařízení vyžadují, aby byla frekvence "
 "nastavena."
 
-#: src/gui.cpp:2106 src/gui.cpp:2824
+#: src/gui.cpp:2619
+#, fuzzy
+msgid "Request MJPEG format"
+msgstr "Vynutit snímkovou frekvenci"
+
+#: src/gui.cpp:2620
+msgid ""
+"Request MJPEG data from the input device. The device may ignore this "
+"request."
+msgstr ""
+
+#: src/gui.cpp:2623 src/gui.cpp:3370
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/gui.cpp:2377
+#: src/gui.cpp:2918
 msgid "&File"
 msgstr "&Soubor"
 
-#: src/gui.cpp:2378
+#: src/gui.cpp:2919
 #, fuzzy
 msgid "&Open file(s)..."
 msgstr "Otevři soubory"
 
-#: src/gui.cpp:2383
+#: src/gui.cpp:2924
 #, fuzzy
 msgid "Open &URL(s)..."
 msgstr "Otevřít &URL..."
 
-#: src/gui.cpp:2387
-msgid "Open &device..."
+#: src/gui.cpp:2928
+#, fuzzy
+msgid "Open &device(s)..."
 msgstr "Otevřít &zařízení..."
 
-#: src/gui.cpp:2402
+#: src/gui.cpp:2943
 msgid "&Clear recent files"
 msgstr ""
 
-#: src/gui.cpp:2410
+#: src/gui.cpp:2951
 msgid "&Quit..."
 msgstr "&Ukončit..."
 
-#: src/gui.cpp:2416
+#: src/gui.cpp:2957
 msgid "&Preferences"
 msgstr "&Nastavení"
 
-#: src/gui.cpp:2419
+#: src/gui.cpp:2960
 msgid "&Fullscreen Settings..."
 msgstr "Nastavení &celoobrazového režimu..."
 
-#: src/gui.cpp:2422
+#: src/gui.cpp:2963
 msgid "Display &Color Adjustments..."
 msgstr "Nastavení &barev..."
 
-#: src/gui.cpp:2425
+#: src/gui.cpp:2966
 msgid "Display Cross&talk Calibration..."
 msgstr "Nastavení &Crosstalku..."
 
-#: src/gui.cpp:2429
+#: src/gui.cpp:2970
 msgid "&Zoom for wide videos..."
 msgstr ""
 
-#: src/gui.cpp:2433
+#: src/gui.cpp:2974
 #, fuzzy
 msgid "&Audio Settings..."
 msgstr "Nastavení &Titulků..."
 
-#: src/gui.cpp:2437
+#: src/gui.cpp:2978
 msgid "&Subtitle Settings..."
 msgstr "Nastavení &Titulků..."
 
-#: src/gui.cpp:2441
+#: src/gui.cpp:2982
 #, fuzzy
 msgid "Current &Video Settings..."
 msgstr "Nastavení 3D videa..."
 
-#: src/gui.cpp:2444
+#: src/gui.cpp:2987
+#, fuzzy
+msgid "SDI &Output Settings..."
+msgstr "Nastavení &Titulků..."
+
+#: src/gui.cpp:2991
 msgid "&Help"
 msgstr "&Nápověda"
 
-#: src/gui.cpp:2445
+#: src/gui.cpp:2992
 msgid "&Manual..."
 msgstr "&Manuál..."
 
-#: src/gui.cpp:2450
+#: src/gui.cpp:2997
 msgid "&Website..."
 msgstr "&Webová stránka..."
 
-#: src/gui.cpp:2454
+#: src/gui.cpp:3001
 msgid "&Keyboard Shortcuts"
 msgstr "&Klávesové zkratky"
 
-#: src/gui.cpp:2458
+#: src/gui.cpp:3005
 msgid "&About"
 msgstr "&O Binu"
 
-#: src/gui.cpp:2771
+#: src/gui.cpp:3317
 msgid "Tip"
 msgstr ""
 
-#: src/gui.cpp:2774
+#: src/gui.cpp:3320
 msgid ""
 "You can select and open multiple files at once.This is useful for "
 "example if you have extra subtitle files, or if left and right view are "
 "stored in separate files."
 msgstr ""
 
-#: src/gui.cpp:2777
+#: src/gui.cpp:3323
 msgid "Do not show this message again."
 msgstr ""
 
-#: src/gui.cpp:2794
+#: src/gui.cpp:3340
 msgid "Open files"
 msgstr "Otevři soubory"
 
-#: src/gui.cpp:2818
+#: src/gui.cpp:3364
 #, fuzzy
 msgid "Open URL(s)"
 msgstr "Otevři URL"
 
-#: src/gui.cpp:2819
+#: src/gui.cpp:3365
 msgid "URL(s):"
 msgstr ""
 
-#: src/gui.cpp:2820
+#: src/gui.cpp:3366
 msgid "Enter one or more space separated URLs."
 msgstr ""
 
-#: src/gui.cpp:3005 src/gui.cpp:3013 src/video_output_qt.cpp:234
-#: src/video_output_qt.cpp:643 src/video_output_qt.cpp:664
+#: src/gui.cpp:3568 src/gui.cpp:3576 src/video_output_qt.cpp:241
+#: src/video_output_qt.cpp:477 src/video_output_qt.cpp:659
+#: src/video_output_qt.cpp:671 src/video_output_qt.cpp:692
 msgid "Error"
 msgstr "Chyba"
 
-#: src/gui.cpp:3005
+#: src/gui.cpp:3568
 msgid "Cannot open manual."
 msgstr "Nemohu otevřít manál."
 
-#: src/gui.cpp:3013
+#: src/gui.cpp:3576
 msgid "Cannot open website."
 msgstr "Nemohu otevřít webovou stránku."
 
-#: src/gui.cpp:3021
+#: src/gui.cpp:3584
 msgid "Keyboard Shortcuts"
 msgstr "Klávesové zkratky"
 
-#: src/gui.cpp:3024
+#: src/gui.cpp:3587
 #, fuzzy
 msgid "Keyboard control:"
 msgstr "Klávesové zkratky"
 
-#: src/gui.cpp:3026
+#: src/gui.cpp:3589
 msgid "Stop."
 msgstr ""
 
-#: src/gui.cpp:3027 src/main.cpp:495
+#: src/gui.cpp:3590 src/main.cpp:494
 msgid "Pause / unpause."
 msgstr ""
 
-#: src/gui.cpp:3028 src/main.cpp:496
+#: src/gui.cpp:3591 src/main.cpp:495
 #, fuzzy
 msgid "Toggle fullscreen."
 msgstr "Nastavení celoobrazového režimu:"
 
-#: src/gui.cpp:3029 src/main.cpp:497
+#: src/gui.cpp:3592 src/main.cpp:496
 msgid "Center window."
 msgstr ""
 
-#: src/gui.cpp:3030 src/main.cpp:498
+#: src/gui.cpp:3593 src/main.cpp:497
 #, fuzzy
 msgid "Swap left/right eye."
 msgstr "Prohoď levou/pravou"
 
-#: src/gui.cpp:3031 src/main.cpp:499
+#: src/gui.cpp:3594 src/main.cpp:498
 msgid "Cycle through available video streams."
 msgstr ""
 
-#: src/gui.cpp:3032 src/main.cpp:500
+#: src/gui.cpp:3595 src/main.cpp:499
 msgid "Cycle through available audio streams."
 msgstr ""
 
-#: src/gui.cpp:3033 src/main.cpp:501
+#: src/gui.cpp:3596 src/main.cpp:500
 #, fuzzy
 msgid "Cycle through available subtitle streams."
 msgstr "Vyber stopu titulků."
 
-#: src/gui.cpp:3034 src/main.cpp:502
+#: src/gui.cpp:3597 src/main.cpp:501
 msgid "Adjust contrast."
 msgstr ""
 
-#: src/gui.cpp:3035 src/main.cpp:503
+#: src/gui.cpp:3598 src/main.cpp:502
 #, fuzzy
 msgid "Adjust brightness."
 msgstr "Jas:"
 
-#: src/gui.cpp:3036 src/main.cpp:504
+#: src/gui.cpp:3599 src/main.cpp:503
 msgid "Adjust hue."
 msgstr ""
 
-#: src/gui.cpp:3037 src/main.cpp:505
+#: src/gui.cpp:3600 src/main.cpp:504
 #, fuzzy
 msgid "Adjust saturation."
 msgstr "Sytost:"
 
-#: src/gui.cpp:3038 src/main.cpp:506
+#: src/gui.cpp:3601 src/main.cpp:505
 #, fuzzy
 msgid "Adjust parallax."
 msgstr "Parallax titulků:"
 
-#: src/gui.cpp:3039 src/main.cpp:507
+#: src/gui.cpp:3602 src/main.cpp:506
 #, fuzzy
 msgid "Adjust ghostbusting."
 msgstr "Ghostbusting:"
 
-#: src/gui.cpp:3040 src/main.cpp:508
+#: src/gui.cpp:3603 src/main.cpp:507
 msgid "Adjust zoom for wide videos."
 msgstr ""
 
-#: src/gui.cpp:3041 src/main.cpp:509
+#: src/gui.cpp:3604 src/main.cpp:508
 msgid "Adjust audio volume."
 msgstr ""
 
-#: src/gui.cpp:3042 src/main.cpp:510
+#: src/gui.cpp:3605 src/main.cpp:509
 msgid "Toggle audio mute."
 msgstr ""
 
-#: src/gui.cpp:3043 src/main.cpp:511
+#: src/gui.cpp:3606 src/main.cpp:510
 msgid "Step a single video frame forward."
 msgstr ""
 
-#: src/gui.cpp:3044 src/main.cpp:512
+#: src/gui.cpp:3607 src/main.cpp:511
 msgid "Seek 10 seconds backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3045 src/main.cpp:513
+#: src/gui.cpp:3608 src/main.cpp:512
 msgid "Seek 1 minute backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3046 src/main.cpp:514
+#: src/gui.cpp:3609 src/main.cpp:513
 msgid "Seek 10 minutes backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3047 src/main.cpp:516
+#: src/gui.cpp:3610 src/main.cpp:515
 msgid "Media keys should work as expected."
 msgstr ""
 
-#: src/gui.cpp:3063
+#: src/gui.cpp:3626
 #, c-format
 msgid "About %s"
 msgstr "O pragramu %s"
 
-#: src/gui.cpp:3069
+#: src/gui.cpp:3632
 #, c-format
 msgid "The %s 3D video player"
 msgstr "%s 3D video přehrávač"
 
-#: src/gui.cpp:3074
+#: src/gui.cpp:3637
 #, fuzzy, c-format
 msgid ""
 "%s version %s.Copyright (C) 2012 the Bino developers.This "
@@ -1104,27 +1200,27 @@
 "URČITÝ ÚČEL.Navštivte <a href=\"%s\">%s</a> pro více informací o "
 "tomto software."
 
-#: src/gui.cpp:3086 src/main.cpp:384
+#: src/gui.cpp:3649 src/main.cpp:378
 msgid "Platform:"
 msgstr "Platforma:"
 
-#: src/gui.cpp:3087 src/main.cpp:386
+#: src/gui.cpp:3650 src/main.cpp:380
 msgid "Libraries used:"
 msgstr "Použité knihovny:"
 
-#: src/gui.cpp:3109
+#: src/gui.cpp:3672
 msgid "About"
 msgstr "O programu"
 
-#: src/gui.cpp:3110
+#: src/gui.cpp:3673
 msgid "Libraries"
 msgstr "Knihovny"
 
-#: src/gui.cpp:3111
+#: src/gui.cpp:3674
 msgid "Team"
 msgstr "Tým"
 
-#: src/gui.cpp:3112
+#: src/gui.cpp:3675
 msgid "License"
 msgstr "Licence"
 
@@ -1162,23 +1258,17 @@
 msgid "Cannot get command for LIRC code."
 msgstr "Nelze získat příkaz pro daný LIRC kód."
 
-#: src/main.cpp:367 src/media_object.cpp:821 src/media_object.cpp:1286
-#: src/video_output.cpp:212
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: src/main.cpp:379
+#: src/main.cpp:373
 #, c-format
 msgid "%s version %s"
 msgstr "%s verze %s"
 
-#: src/main.cpp:380
+#: src/main.cpp:374
 #, fuzzy
 msgid "Copyright (C) 2012 the Bino developers."
 msgstr "Copyright (C) 2011 Bino vývojáři."
 
-#: src/main.cpp:381
+#: src/main.cpp:375
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -1191,470 +1281,496 @@
 
 #. TRANSLATORS: This is the --help text. Please keep the line length limited.
 #. * The --help output should look good with a line width of 80 characters.
-#: src/main.cpp:399
+#: src/main.cpp:393
 msgid "Usage:"
 msgstr ""
 
-#: src/main.cpp:401
+#: src/main.cpp:395
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:402
+#: src/main.cpp:396
 msgid "Print help."
 msgstr ""
 
-#: src/main.cpp:403
+#: src/main.cpp:397
 msgid "Print version."
 msgstr ""
 
-#: src/main.cpp:404
+#: src/main.cpp:398
 msgid "Do not use the GUI, just show a plain window."
 msgstr ""
 
-#: src/main.cpp:405
+#: src/main.cpp:399
 msgid "Append all log messages to the given file."
 msgstr ""
 
-#: src/main.cpp:406
+#: src/main.cpp:400
 msgid "Set log level (debug/info/warning/error/quiet)."
 msgstr ""
 
-#: src/main.cpp:407
+#: src/main.cpp:401
 msgid "Print a list of known audio devices and exit."
 msgstr ""
 
-#: src/main.cpp:408
+#: src/main.cpp:402
 msgid "Use audio device number N (N=0 is the default)."
 msgstr ""
 
-#: src/main.cpp:409
+#: src/main.cpp:403
 msgid "Delay audio by D milliseconds. Default is 0."
 msgstr ""
 
-#: src/main.cpp:410
+#: src/main.cpp:404
 msgid "Set audio volume (0 to 1). Default is 1."
 msgstr ""
 
-#: src/main.cpp:411
+#: src/main.cpp:405
 #, fuzzy
 msgid "Mute audio."
 msgstr "Žádná zvuková stopa."
 
-#: src/main.cpp:412
+#: src/main.cpp:406
 msgid "Type of input device: default, firewire, x11."
 msgstr ""
 
-#: src/main.cpp:413
+#: src/main.cpp:407
 #, fuzzy
 msgid "Request frame size WxH from input device."
 msgstr "Vynutit velikost obrazu"
 
-#: src/main.cpp:414
+#: src/main.cpp:408
 #, fuzzy
 msgid "Request frame rate N/D from input device."
 msgstr "Vynutit snímkovou frekvenci"
 
-#: src/main.cpp:415
+#: src/main.cpp:409
+msgid "Request device format 'default' or 'mjpeg'."
+msgstr ""
+
+#: src/main.cpp:410
+#, fuzzy
+msgid "Read commands from a file."
+msgstr "Obdržen neplatný příkaz '%s' z LIRC."
+
+#: src/main.cpp:411
 #, fuzzy
 msgid "Use the given LIRC configuration file."
 msgstr "Nelze přečíst LIRC konfigurační soubor %s."
 
-#: src/main.cpp:416
+#: src/main.cpp:412
 msgid "This option can be used more than once."
 msgstr ""
 
-#: src/main.cpp:417
+#: src/main.cpp:413
 msgid "Select video stream (1-n, depending on input)."
 msgstr ""
 
-#: src/main.cpp:418
+#: src/main.cpp:414
 msgid "Select audio stream (1-n, depending on input)."
 msgstr ""
 
-#: src/main.cpp:419
+#: src/main.cpp:415
 #, fuzzy
 msgid "Select subtitle stream (0-n, dep. on input)."
 msgstr "Vyber stopu titulků."
 
-#: src/main.cpp:420
+#: src/main.cpp:416
 msgid "Select input type (default autodetect):"
 msgstr ""
 
-#: src/main.cpp:421
+#: src/main.cpp:417
 #, fuzzy
 msgid "Single view."
 msgstr "Pravý obraz"
 
-#: src/main.cpp:422
+#: src/main.cpp:418
 #, fuzzy
 msgid "Left/right separate streams, left first."
 msgstr "Oddělené stopy, levá první"
 
-#: src/main.cpp:423
+#: src/main.cpp:419
 #, fuzzy
 msgid "Left/right separate streams, right first."
 msgstr "Oddělené stopy, pravá první"
 
-#: src/main.cpp:424
+#: src/main.cpp:420
 #, fuzzy
 msgid "Left/right alternating, left first."
 msgstr "Oddělené stopy, levá první"
 
-#: src/main.cpp:425
+#: src/main.cpp:421
 #, fuzzy
 msgid "Left/right alternating, right first."
 msgstr "Oddělené stopy, pravá první"
 
-#: src/main.cpp:426 src/main.cpp:441
+#: src/main.cpp:422 src/main.cpp:437
 msgid "Left top, right bottom."
 msgstr ""
 
-#: src/main.cpp:427 src/main.cpp:442
+#: src/main.cpp:423 src/main.cpp:438
 #, fuzzy
 msgid "Left top, right bottom, half height."
 msgstr "Nahoře/Dole, poloviční výška"
 
-#: src/main.cpp:428
+#: src/main.cpp:424
 msgid "Left bottom, right top."
 msgstr ""
 
-#: src/main.cpp:429
+#: src/main.cpp:425
 #, fuzzy
 msgid "Left bottom, right top, half height."
 msgstr "Dole/Nahoře, poloviční výška"
 
-#: src/main.cpp:430 src/main.cpp:443
+#: src/main.cpp:426 src/main.cpp:439
 msgid "Left left, right right."
 msgstr ""
 
-#: src/main.cpp:431 src/main.cpp:444
+#: src/main.cpp:427 src/main.cpp:440
 #, fuzzy
 msgid "Left left, right right, half width."
 msgstr "Levá/Pravá, poloviční šířka"
 
-#: src/main.cpp:432
+#: src/main.cpp:428
 #, fuzzy
 msgid "Left right, right left."
 msgstr "Levá/Pravá, poloviční šířka"
 
-#: src/main.cpp:433
+#: src/main.cpp:429
 #, fuzzy
 msgid "Left right, right left, half width."
 msgstr "Levá/Pravá, poloviční šířka"
 
-#: src/main.cpp:434 src/main.cpp:445
+#: src/main.cpp:430 src/main.cpp:441
 msgid "Left even rows, right odd rows."
 msgstr ""
 
-#: src/main.cpp:435
+#: src/main.cpp:431
 msgid "Left odd rows, right even rows."
 msgstr ""
 
-#: src/main.cpp:436
+#: src/main.cpp:432
 msgid "Select output type:"
 msgstr ""
 
-#: src/main.cpp:437
+#: src/main.cpp:433
 #, fuzzy
 msgid "OpenGL quad-buffered stereo."
 msgstr "OpenGL stereo"
 
-#: src/main.cpp:438
+#: src/main.cpp:434
 #, fuzzy
 msgid "Left and right view alternating."
 msgstr "překlop pravý obraz vertikálně."
 
-#: src/main.cpp:439
+#: src/main.cpp:435
 msgid "Only left."
 msgstr ""
 
-#: src/main.cpp:440
+#: src/main.cpp:436
 msgid "Only right."
 msgstr ""
 
-#: src/main.cpp:446
+#: src/main.cpp:442
 msgid "Left even columns, right odd columns."
 msgstr ""
 
-#: src/main.cpp:447
+#: src/main.cpp:443
 #, fuzzy
 msgid "Left and right in checkerboard pattern."
 msgstr "Šachovnice"
 
-#: src/main.cpp:448
+#: src/main.cpp:444
 #, fuzzy
 msgid "HDMI frame packing mode."
 msgstr "HDMI režim"
 
-#: src/main.cpp:449
+#: src/main.cpp:445
 #, fuzzy
 msgid "Red/cyan anaglyph, monochrome method."
 msgstr "Červené/modré brýle, stupně šedi"
 
-#: src/main.cpp:450
+#: src/main.cpp:446
 #, fuzzy
 msgid "Red/cyan anaglyph, half color method."
 msgstr "Červené/modré brýle, polotóny"
 
-#: src/main.cpp:451
+#: src/main.cpp:447
 #, fuzzy
 msgid "Red/cyan anaglyph, full color method."
 msgstr "Červené/modré brýle, plné tóny"
 
-#: src/main.cpp:452
+#: src/main.cpp:448
 #, fuzzy
 msgid "Red/cyan anaglyph, Dubois method."
 msgstr "Červené/modré brýle, kvalitní Dubois metoda"
 
-#: src/main.cpp:453
+#: src/main.cpp:449
 #, fuzzy
 msgid "Green/magenta anaglyph, monochrome method."
 msgstr "Zelené/fialové brýle, stupně šedi"
 
-#: src/main.cpp:454
+#: src/main.cpp:450
 #, fuzzy
 msgid "Green/magenta anaglyph, half color method."
 msgstr "Zelené/fialové brýle, polotóny"
 
-#: src/main.cpp:455
+#: src/main.cpp:451
 #, fuzzy
 msgid "Green/magenta anaglyph, full color method."
 msgstr "Zelené/fialové brýle, plné tóny"
 
-#: src/main.cpp:456
+#: src/main.cpp:452
 #, fuzzy
 msgid "Green/magenta anaglyph, Dubois method."
 msgstr "Zelené/fialové brýle, kvalitní Dubois metoda"
 
-#: src/main.cpp:457
+#: src/main.cpp:453
 #, fuzzy
 msgid "Amber/blue anaglyph, monochrome method."
 msgstr "Žluté/modré brýle, stupně šedi"
 
-#: src/main.cpp:458
+#: src/main.cpp:454
 #, fuzzy
 msgid "Amber/blue anaglyph, half color method."
 msgstr "Žluté/modré brýle, polotóny"
 
-#: src/main.cpp:459
+#: src/main.cpp:455
 #, fuzzy
 msgid "Amber/blue anaglyph, full color method."
 msgstr "Žluté/modré brýle, plné tóny"
 
-#: src/main.cpp:460
+#: src/main.cpp:456
 #, fuzzy
 msgid "Amber/blue anaglyph, Dubois method."
 msgstr "Žluté/modré brýle, kvalitní Dubois metoda"
 
-#: src/main.cpp:461
+#: src/main.cpp:457
 #, fuzzy
 msgid "Red/green anaglyph, monochrome method."
 msgstr "Červené/zelené brýle, stupně šedi"
 
-#: src/main.cpp:462
+#: src/main.cpp:458
 #, fuzzy
 msgid "Red/blue anaglyph, monochrome method."
 msgstr "Červené/modré brýle, stupně šedi"
 
-#: src/main.cpp:463
+#: src/main.cpp:459
 msgid "Multi-display via Equalizer (2D setup)."
 msgstr ""
 
-#: src/main.cpp:464
+#: src/main.cpp:460
 msgid "Multi-display via Equalizer (3D setup)."
 msgstr ""
 
-#: src/main.cpp:465
+#: src/main.cpp:461
 #, fuzzy
 msgid "Swap left/right view."
 msgstr "Prohoď levou/pravou"
 
-#: src/main.cpp:466
+#: src/main.cpp:462
 #, fuzzy
 msgid "Fullscreen."
 msgstr "Dvě obrazovky:"
 
-#: src/main.cpp:467
+#: src/main.cpp:463
 #, fuzzy
 msgid "Use the listed screens in fullscreen mode."
 msgstr "Použij více obrazovek pro celoobrazový režim."
 
-#: src/main.cpp:468
+#: src/main.cpp:464
 msgid "Screen numbers start with 1."
 msgstr ""
 
-#: src/main.cpp:469
+#: src/main.cpp:465
 msgid "An empty list defaults to the primary screen."
 msgstr ""
 
-#: src/main.cpp:470
+#: src/main.cpp:466
 #, fuzzy
 msgid "Flip left view vertically when fullscreen."
 msgstr "překlop levý obraz vertikálně."
 
-#: src/main.cpp:471
+#: src/main.cpp:467
 #, fuzzy
 msgid "Flop left view horizontally when fullscreen."
 msgstr "překlop levý obraz horizontálně."
 
-#: src/main.cpp:472
+#: src/main.cpp:468
 #, fuzzy
 msgid "Flip right view vertically when fullscreen."
 msgstr "překlop pravý obraz vertikálně."
 
-#: src/main.cpp:473
+#: src/main.cpp:469
 #, fuzzy
 msgid "Flop right view horizontally when fullscreen."
 msgstr "překlop pravý obraz horizontálně."
 
-#: src/main.cpp:474
+#: src/main.cpp:470
+msgid "Use DLP 3-D Ready Sync when fullscreen."
+msgstr ""
+
+#: src/main.cpp:471
 msgid "Set zoom for wide videos (0=off to 1=full)."
 msgstr ""
 
-#: src/main.cpp:475
+#: src/main.cpp:472
 msgid "Crop video to given aspect ratio (0:0=off)."
 msgstr ""
 
-#: src/main.cpp:476
+#: src/main.cpp:473
 #, fuzzy
 msgid "Center window on screen."
 msgstr "Vycentruj video na středu obrazovky."
 
-#: src/main.cpp:477
+#: src/main.cpp:474
 #, fuzzy
 msgid "Set subtitle encoding."
 msgstr "kodek titulků"
 
-#: src/main.cpp:478
+#: src/main.cpp:475
 #, fuzzy
 msgid "Set subtitle font name."
 msgstr "Vynutí font titulků."
 
-#: src/main.cpp:479
+#: src/main.cpp:476
 #, fuzzy
 msgid "Set subtitle font size."
 msgstr "Vynutí velikost titulků."
 
-#: src/main.cpp:480
+#: src/main.cpp:477
 #, fuzzy
 msgid "Set subtitle scale factor."
 msgstr "Vynutí zvětšní titulků."
 
-#: src/main.cpp:481
+#: src/main.cpp:478
 msgid "Set subtitle color, in [AA]RRGGBB format."
 msgstr ""
 
-#: src/main.cpp:482
+#: src/main.cpp:479
+msgid "Set subtitle shadow, -1=default, 0=off, 1=on."
+msgstr ""
+
+#: src/main.cpp:480
 msgid "Subtitle parallax adjustment (-1 to +1)."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:481
 msgid "Parallax adjustment (-1 to +1)."
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:482
 msgid "Crosstalk leak level (0 to 1)."
 msgstr ""
 
-#: src/main.cpp:485
+#: src/main.cpp:483
 msgid "Comma-separated values for R,G,B."
 msgstr ""
 
-#: src/main.cpp:486
+#: src/main.cpp:484
 msgid "Amount of ghostbusting to apply (0 to 1)."
 msgstr ""
 
-#: src/main.cpp:487
+#: src/main.cpp:485
 msgid "Benchmark mode (no audio, show fps)."
 msgstr ""
 
-#: src/main.cpp:488
+#: src/main.cpp:486
 msgid "Frame rate divisor for display refresh rate."
 msgstr ""
 
-#: src/main.cpp:489
+#: src/main.cpp:487
 msgid "Default is 0 for benchmark mode, 1 otherwise."
 msgstr ""
 
-#: src/main.cpp:490
+#: src/main.cpp:488
 msgid "Loop the input media."
 msgstr ""
 
-#: src/main.cpp:492
+#: src/main.cpp:489
+msgid "Set SDI output format."
+msgstr ""
+
+#: src/main.cpp:491
 msgid "Interactive control:"
 msgstr ""
 
-#: src/main.cpp:493
+#: src/main.cpp:492
 #, fuzzy
 msgid "Leave fullscreen mode, or quit."
 msgstr "V celoobrazovém režimu,"
 
-#: src/main.cpp:494
+#: src/main.cpp:493
 #, fuzzy
 msgid "Quit."
 msgstr "&Ukončit..."
 
-#: src/main.cpp:515
+#: src/main.cpp:514
 msgid "Seek according to horizontal click position."
 msgstr ""
 
-#: src/main.cpp:523
+#: src/main.cpp:522
 msgid "No audio devices known."
 msgstr ""
 
-#: src/main.cpp:595
+#: src/main.cpp:594
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Testovací režim, synchronizace zvuku a času je vypnuta."
 
-#: src/main.cpp:729
+#: src/main.cpp:608
+#, c-format
+msgid "Unknown mode %s."
+msgstr ""
+
+#: src/main.cpp:740
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Tato verze Bina byla zkompilována bez podpory knihovny LIRC."
 
 #. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:935
+#: src/media_data.cpp:1051
 #, c-format
 msgid "%dx%d, %.3g:1"
 msgstr "%dx%d, %.3g:1"
 
 #. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:1066
+#: src/media_data.cpp:1182
 #, c-format
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d ch., %g kHz, %d bit"
 
-#: src/media_input.cpp:282
+#: src/media_input.cpp:281
 #, c-format
 msgid "Video %s: %s"
 msgstr "Video %s: %s"
 
-#: src/media_input.cpp:287
+#: src/media_input.cpp:286
 msgid "No video."
 msgstr "Žádná video stopa."
 
-#: src/media_input.cpp:293
+#: src/media_input.cpp:292
 #, c-format
 msgid "Audio %s: %s"
 msgstr "Zvuk %s: %s"
 
-#: src/media_input.cpp:298
+#: src/media_input.cpp:297
 msgid "No audio."
 msgstr "Žádná zvuková stopa."
 
-#: src/media_input.cpp:304
+#: src/media_input.cpp:303
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr "Titulky %s: %s"
 
-#: src/media_input.cpp:309
+#: src/media_input.cpp:308
 msgid "No subtitle."
 msgstr "Žádné titulky."
 
-#: src/media_input.cpp:311
+#: src/media_input.cpp:310
 #, c-format
 msgid "Duration: %g seconds"
 msgstr "Délka: %g sekund"
 
-#: src/media_input.cpp:314
+#: src/media_input.cpp:313
 #, c-format
 msgid "Stereo layout: %s"
 msgstr "Stereo režim: %s"
@@ -1683,145 +1799,145 @@
 msgid "default"
 msgstr "výchozí"
 
-#: src/media_object.cpp:832
+#: src/media_object.cpp:836
 #, c-format
 msgid "%s: Cannot read stream info: %s"
 msgstr "%s: Nemohu přečíst informace o stopě: %s"
 
-#: src/media_object.cpp:876
+#: src/media_object.cpp:880
 #, c-format
 msgid "%s stream %d: Cannot open %s: %s"
 msgstr "%s stopa %d: Nemohu otevřít %s: %s"
 
-#: src/media_object.cpp:877
+#: src/media_object.cpp:881
 msgid "video codec"
 msgstr "video kodek"
 
-#: src/media_object.cpp:878
+#: src/media_object.cpp:882
 msgid "audio codec"
 msgstr "zvukový kodek"
 
-#: src/media_object.cpp:879
+#: src/media_object.cpp:883
 msgid "subtitle codec"
 msgstr "kodek titulků"
 
-#: src/media_object.cpp:880
+#: src/media_object.cpp:884
 msgid "data"
 msgstr "data"
 
-#: src/media_object.cpp:881
+#: src/media_object.cpp:885
 msgid "codec not supported"
 msgstr "kodek není podporován"
 
-#: src/media_object.cpp:891
+#: src/media_object.cpp:895
 #, c-format
 msgid "%s video stream %d: Invalid frame size."
 msgstr "%s video stopa %d: Špatná velikost obrazu."
 
-#: src/media_object.cpp:935
+#: src/media_object.cpp:939
 #, c-format
 msgid "%s video stream %d: Cannot initialize conversion context."
 msgstr "%s video stopa %d: Nemohu vytvořit conversion context."
 
-#: src/media_object.cpp:998
+#: src/media_object.cpp:1002
 #, c-format
 msgid "Video stream %d: %s / %s, %g seconds"
 msgstr "Video stopa %d: %s / %s, %g sekund"
 
-#: src/media_object.cpp:1002
+#: src/media_object.cpp:1006
 #, c-format
 msgid "Using up to %d threads for decoding."
 msgstr "Využívám až %d vláken pro dekódování."
 
-#: src/media_object.cpp:1007
+#: src/media_object.cpp:1011
 #, c-format
 msgid "Audio stream %d: %s / %s, %g seconds"
 msgstr "Zvuková stopa %d: %s / %s, %g sekund"
 
-#: src/media_object.cpp:1014
+#: src/media_object.cpp:1018
 #, c-format
 msgid "Subtitle stream %d: %s / %s, %g seconds"
 msgstr "Titulky %d: %s / %s, %g sekund"
 
-#: src/media_object.cpp:1021
+#: src/media_object.cpp:1025
 msgid "No usable streams."
 msgstr "Žádná použitelná stopa."
 
-#: src/media_object.cpp:1302 src/media_object.cpp:1332
-#: src/media_object.cpp:1362
+#: src/media_object.cpp:1306 src/media_object.cpp:1336
+#: src/media_object.cpp:1366
 #, c-format
 msgid "%s: Cannot duplicate packet."
 msgstr "%s: Nemohu duplikovat paket."
 
-#: src/media_object.cpp:1456
+#: src/media_object.cpp:1460
 #, fuzzy, c-format
 msgid "%s video stream %d: Dropping %dx%d frame"
 msgstr "%s video stopa %d: Špatná velikost obrazu."
 
-#: src/media_object.cpp:1919
+#: src/media_object.cpp:1923
 #, c-format
 msgid "%s: Seeking failed."
 msgstr "%s: Vyhledávání selhalo."
 
-#: src/player.cpp:434
+#: src/player.cpp:437
 #, fuzzy, c-format
 msgid "Video: delay %g seconds/%g frames; dropping next frame."
 msgstr "Video: zpoždění %g sekund; zahazuji následující snímek."
 
-#: src/player.cpp:450
+#: src/player.cpp:453
 #, c-format
 msgid "FPS: %.2f"
 msgstr "FPS: %.2f"
 
-#: src/player_equalizer.cpp:116
+#: src/player_equalizer.cpp:117
 msgid "Reading input frame failed."
 msgstr "Selhalo čtení snímku."
 
-#: src/player_equalizer.cpp:165 src/video_output_qt.cpp:590
-#: src/video_output_qt.cpp:597
+#: src/player_equalizer.cpp:166 src/video_output_qt.cpp:613
+#: src/video_output_qt.cpp:620
 msgid "Waiting for subtitle renderer initialization..."
 msgstr "Čekám na inicializaci vykreslování titulků..."
 
-#: src/player_equalizer.cpp:250
+#: src/player_equalizer.cpp:251
 msgid "Init data mapping failed."
 msgstr "Počáteční mapování dat selhalo."
 
-#: src/player_equalizer.cpp:251
+#: src/player_equalizer.cpp:252
 msgid "Frame data mapping failed."
 msgstr "Mapování dat snímku selhalo."
 
-#: src/player_equalizer.cpp:252
+#: src/player_equalizer.cpp:253
 msgid "Video player initialization failed."
 msgstr "Nepodařilo se inicializovat přehrávač videa."
 
-#: src/player_equalizer.cpp:253
+#: src/player_equalizer.cpp:254
 msgid "Need at least OpenGL 2.1."
 msgstr "Je vyžadováno alespon OpenGL 2.1."
 
-#: src/player_equalizer.cpp:430
+#: src/player_equalizer.cpp:431
 msgid "No canvas in Equalizer configuration."
 msgstr "V konfiguraci Equalizeru není nastaveno plátno."
 
-#: src/player_equalizer.cpp:437
+#: src/player_equalizer.cpp:438
 #, fuzzy, c-format
 msgid "Equalizer canvas: %gx%g, aspect ratio %g:1"
 msgstr "%gx%g, poměr stran %g:1"
 
-#: src/player_equalizer.cpp:922 src/video_output_qt.cpp:560
+#: src/player_equalizer.cpp:926 src/video_output_qt.cpp:583
 msgid ""
 "This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
 "objects."
 msgstr "OpenGL nepodporuje verzi 2.1 a framebuffer objekty."
 
-#: src/player_equalizer.cpp:1105
+#: src/player_equalizer.cpp:1107
 msgid "Equalizer initialization failed."
 msgstr "Chyba inicializace Equalizeru."
 
-#: src/player_equalizer.cpp:1113
+#: src/player_equalizer.cpp:1115
 msgid "Cannot get equalizer configuration."
 msgstr "Nelze získat nastavení Equalizeru."
 
-#: src/player_equalizer.cpp:1127
+#: src/player_equalizer.cpp:1132
 msgid "Equalizer configuration initialization failed."
 msgstr "Nelze získat nastavení Equalizeru."
 
@@ -1833,83 +1949,88 @@
 msgid "Cannot initialize LibASS renderer."
 msgstr "Nemohu inicializovat vykreslování LibASS."
 
-#: src/subtitle_renderer.cpp:398
+#: src/subtitle_renderer.cpp:404
 msgid "Cannot initialize LibASS track."
 msgstr "Nemohu inicializovat LibASS stopu."
 
-#: src/subtitle_renderer.cpp:409
+#: src/subtitle_renderer.cpp:415
 #, c-format
 msgid "Subtitle character set conversion failed: %s"
 msgstr "Konverze kódování titulků selhala: %s"
 
-#: src/video_output.cpp:145
+#: src/video_output.cpp:347
 #, c-format
 msgid "OpenGL error 0x%04X."
 msgstr "OpenGL chyba 0x%04X."
 
-#: src/video_output.cpp:203
+#: src/video_output.cpp:359
+#, fuzzy, c-format
+msgid "OpenGL Framebuffer status error 0x%04X."
+msgstr "OpenGL chyba 0x%04X."
+
+#: src/video_output.cpp:407
 #, c-format
 msgid "OpenGL %s '%s': compiler warning:"
 msgstr "OpenGL %s '%s': varování při kompilaci:"
 
-#: src/video_output.cpp:204 src/video_output.cpp:209
+#: src/video_output.cpp:408 src/video_output.cpp:413
 msgid "vertex shader"
 msgstr "vertex shader"
 
-#: src/video_output.cpp:204 src/video_output.cpp:209
+#: src/video_output.cpp:408 src/video_output.cpp:413
 msgid "fragment shader"
 msgstr "fragment shader"
 
-#: src/video_output.cpp:208
+#: src/video_output.cpp:412
 #, c-format
 msgid "OpenGL %s '%s': compilation failed."
 msgstr "OpenGL %s '%s': selhala kompilace."
 
-#: src/video_output.cpp:211 src/video_output.cpp:288
+#: src/video_output.cpp:415 src/video_output.cpp:492
 msgid "unknown error"
 msgstr "neznámá chyba"
 
-#: src/video_output.cpp:284
+#: src/video_output.cpp:488
 #, c-format
 msgid "OpenGL program '%s': linker warning:"
 msgstr "OpenGL program '%s': varování linkeru:"
 
-#: src/video_output.cpp:287
+#: src/video_output.cpp:491
 #, c-format
 msgid "OpenGL program '%s': linking failed."
 msgstr "OpenGL program '%s': selhalo linkování."
 
-#: src/video_output.cpp:563 src/video_output.cpp:675
+#: src/video_output.cpp:1494 src/video_output.cpp:1635
 msgid "Cannot create a PBO buffer."
 msgstr "Nemohu vytvořit PBO buffer."
 
-#: src/video_output_qt.cpp:555
+#: src/video_output_qt.cpp:578
 #, c-format
 msgid "Cannot initialize GLEW: %s"
 msgstr "Nemohu inicializovat GLEW: %s"
 
-#: src/video_output_qt.cpp:588
+#: src/video_output_qt.cpp:611
 msgid "Please wait"
 msgstr "Prosím čekejte"
 
-#: src/video_output_qt.cpp:643
+#: src/video_output_qt.cpp:671
 #, fuzzy
 msgid "Cannot get valid OpenGL context."
 msgstr "Nemohu nastavit OpenGL formát."
 
-#: src/video_output_qt.cpp:654
+#: src/video_output_qt.cpp:682
 msgid "The display does not support OpenGL stereo mode."
 msgstr "Stereo OpenGL režim není podporován."
 
-#: src/video_output_qt.cpp:659
+#: src/video_output_qt.cpp:687
 msgid "Cannot set OpenGL context format."
 msgstr "Nemohu nastavit OpenGL formát."
 
-#: src/video_output_qt.cpp:752
+#: src/video_output_qt.cpp:780
 msgid "Cannot suspend screensaver."
 msgstr "Nelze zakázat spořič obrazovky."
 
-#: src/video_output_qt.cpp:767
+#: src/video_output_qt.cpp:795
 msgid "Cannot resume screensaver."
 msgstr "Nelze povolit spořič obrazovky."

bino-1.3.2.tar.xz/po/de.gmo -> bino-1.3.3.tar.xz/po/de.gmo Changed

bino-1.3.2.tar.xz/po/de.po -> bino-1.3.3.tar.xz/po/de.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: bino 1.1.1\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-03-16 19:49+0100\n"
+"POT-Creation-Date: 2012-05-01 15:05+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:236
+#: src/base/str.cpp:267
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Kann Zeichenkette nicht zu %s konvertieren."
 
-#: src/base/str.cpp:455 src/base/str.cpp:473 src/base/str.cpp:483
-#: src/base/str.cpp:494 src/base/str.cpp:499
+#: 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 "Kann %s nicht zu %s konvertieren."
@@ -121,8 +121,8 @@
 msgstr "Kein OpenAL Gerät verfügbar."
 
 #: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
-#: src/media_data.cpp:1067 src/media_data.cpp:1090 src/media_data.cpp:1128
-#: src/media_data.cpp:1133
+#: src/media_data.cpp:1183 src/media_data.cpp:1206 src/media_data.cpp:1244
+#: src/media_data.cpp:1249
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -188,244 +188,256 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Kann OpenAL Quellenpuffer nicht aus Warteschlange entfernen."
 
-#: src/dispatch.cpp:156
+#: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
+#: src/main.cpp:361 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
+#, fuzzy, c-format
+msgid "%s: invalid command '%s'"
+msgstr "Ungültiges Kommando '%s' von LIRC erhalten."
+
+#: src/dispatch.cpp:166
 msgid "Cannot connect to X server."
 msgstr "Kann keine Verbindung zum X Server aufbauen."
 
-#: src/dispatch.cpp:171
+#: src/dispatch.cpp:182
 msgid "No video to play."
 msgstr "Kein Video abzuspielen."
 
-#: src/dispatch.cpp:411 src/player_equalizer.cpp:84
+#: src/dispatch.cpp:437 src/player_equalizer.cpp:85
 msgid "No video streams found."
 msgstr "Keine Videokanäle gefunden."
 
-#: src/dispatch.cpp:428
+#: src/dispatch.cpp:454
 msgid "Cannot set requested stereo layout: incompatible media."
 msgstr "Kann Stereolayout nicht setzen: inkompatible Daten."
 
-#: src/dispatch.cpp:443
+#: src/dispatch.cpp:469
 #, c-format
 msgid "Video stream %d not found."
 msgstr "Videokanal %d nicht gefunden."
 
-#: src/dispatch.cpp:449
+#: src/dispatch.cpp:475
 #, c-format
 msgid "Audio stream %d not found."
 msgstr "Audiokanal %d nicht gefunden."
 
-#: src/dispatch.cpp:457
+#: src/dispatch.cpp:483
 #, c-format
 msgid "Subtitle stream %d not found."
 msgstr "Untertitelkanal %d nicht gefunden."
 
-#: src/dispatch.cpp:529 src/main.cpp:736
+#: src/dispatch.cpp:555 src/main.cpp:748
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr ""
 "Diese Version von Bino wurde ohne Unterstützung für Equalizer erstellt."
 
-#: src/gui.cpp:101
+#: src/gui.cpp:107
 msgid "Video:"
 msgstr "Video:"
 
-#: src/gui.cpp:102
+#: src/gui.cpp:108
 msgid "Select the video stream."
 msgstr "Auswahl des Videokanals."
 
-#: src/gui.cpp:108
+#: src/gui.cpp:114
 msgid "Audio:"
 msgstr "Audio:"
 
-#: src/gui.cpp:109
+#: src/gui.cpp:115
 msgid "Select the audio stream."
 msgstr "Auswahl des Videokanals."
 
-#: src/gui.cpp:115
+#: src/gui.cpp:121
 msgid "Subtitle:"
 msgstr "Untertitel:"
 
-#: src/gui.cpp:116
+#: src/gui.cpp:122
 msgid "Select the subtitle stream."
 msgstr "Auswahl des Untertitelkanals."
 
-#: src/gui.cpp:127 src/media_input.cpp:277
+#: src/gui.cpp:133 src/media_input.cpp:276
 msgid "Input:"
 msgstr "Eingabe:"
 
-#: src/gui.cpp:128
+#: src/gui.cpp:134
 msgid "Set the 3D layout of the video stream."
 msgstr "Auswahl des Stereolayouts des Videokanals."
 
-#: src/gui.cpp:132
+#: src/gui.cpp:138
 msgid "2D"
 msgstr "2D"
 
-#: src/gui.cpp:133
+#: src/gui.cpp:139
 msgid "Separate streams, left first"
 msgstr "Getrennte Kanäle, links zuerst"
 
-#: src/gui.cpp:134
+#: src/gui.cpp:140
 msgid "Separate streams, right first"
 msgstr "Getrennte Kanäle, rechts zuerst"
 
-#: src/gui.cpp:135
+#: src/gui.cpp:141
 #, fuzzy
 msgid "Alternating, left first"
 msgstr "Getrennte Kanäle, links zuerst"
 
-#: src/gui.cpp:136
+#: src/gui.cpp:142
 #, fuzzy
 msgid "Alternating, right first"
 msgstr "Getrennte Kanäle, rechts zuerst"
 
-#: src/gui.cpp:137 src/gui.cpp:161
+#: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2095 src/gui.cpp:2124
 msgid "Top/bottom"
 msgstr "Oben/unten"
 
-#: src/gui.cpp:138 src/gui.cpp:162
+#: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2096 src/gui.cpp:2125
 msgid "Top/bottom, half height"
 msgstr "Oben/unten, halbe Höhe"
 
-#: src/gui.cpp:139
+#: src/gui.cpp:145
 msgid "Bottom/top"
 msgstr "Unten/oben"
 
-#: src/gui.cpp:140
+#: src/gui.cpp:146
 msgid "Bottom/top, half height"
 msgstr "Unten/oben, halbe Höhe"
 
-#: src/gui.cpp:141 src/gui.cpp:163
+#: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2097 src/gui.cpp:2126
 msgid "Left/right"
 msgstr "Links/rechts"
 
-#: src/gui.cpp:142 src/gui.cpp:164
+#: src/gui.cpp:148 src/gui.cpp:170 src/gui.cpp:2098 src/gui.cpp:2127
 msgid "Left/right, half width"
 msgstr "Links/rechts, halbe Breite"
 
-#: src/gui.cpp:143
+#: src/gui.cpp:149
 msgid "Right/left"
 msgstr "Rechts/links"
 
-#: src/gui.cpp:144
+#: src/gui.cpp:150
 msgid "Right/left, half width"
 msgstr "Rechts/links, halbe Breite"
 
-#: src/gui.cpp:145 src/gui.cpp:165
+#: src/gui.cpp:151 src/gui.cpp:171 src/gui.cpp:2099 src/gui.cpp:2128
 msgid "Even/odd rows"
 msgstr "Gerade/ungerade Zeilen"
 
-#: src/gui.cpp:146
+#: src/gui.cpp:152
 msgid "Odd/even rows"
 msgstr "Ungerade/gerade Zeilen"
 
-#: src/gui.cpp:152
+#: src/gui.cpp:158
 msgid "Output:"
 msgstr "Ausgabe:"
 
-#: src/gui.cpp:153
+#: src/gui.cpp:159
 msgid "Set the 3D output type for your display."
 msgstr "Auswahl des 3D Ausgabetyps für das Ausgabegerät."
 
-#: src/gui.cpp:157
+#: src/gui.cpp:163 src/gui.cpp:2093 src/gui.cpp:2122
 msgid "Left view"
 msgstr "Linke Sicht"
 
-#: src/gui.cpp:158
+#: src/gui.cpp:164 src/gui.cpp:2094 src/gui.cpp:2123
 msgid "Right view"
 msgstr "Rechte Sicht"
 
-#: src/gui.cpp:159
+#: src/gui.cpp:165
 msgid "OpenGL stereo"
 msgstr "OpenGL Stereo"
 
-#: src/gui.cpp:160
+#: src/gui.cpp:166
 msgid "Left/right view alternating"
 msgstr ""
 
-#: src/gui.cpp:166
+#: src/gui.cpp:172 src/gui.cpp:2100 src/gui.cpp:2129
 msgid "Even/odd columns"
 msgstr "Gerade/ungerade Spalten"
 
-#: src/gui.cpp:167
+#: src/gui.cpp:173 src/gui.cpp:2101 src/gui.cpp:2130
 msgid "Checkerboard pattern"
 msgstr "Schachbrettmuster"
 
-#: src/gui.cpp:168
+#: src/gui.cpp:174
 msgid "HDMI frame packing mode"
 msgstr "HDMI Framepacking Modus"
 
-#: src/gui.cpp:169
+#: src/gui.cpp:175 src/gui.cpp:2102 src/gui.cpp:2131
 msgid "Red/cyan glasses, monochrome method"
 msgstr "Rot/cyan Brillen, monochrome Methode"
 
-#: src/gui.cpp:170
+#: src/gui.cpp:176 src/gui.cpp:2103 src/gui.cpp:2132
 msgid "Red/cyan glasses, half-color method"
 msgstr "Rot/cyan Brillen, Halbfarbenmethode"
 
-#: src/gui.cpp:171
+#: src/gui.cpp:177 src/gui.cpp:2104 src/gui.cpp:2133
 msgid "Red/cyan glasses, full-color method"
 msgstr "Rot/cyan Brillen, Vollfarbenmethode"
 
-#: src/gui.cpp:172
+#: src/gui.cpp:178 src/gui.cpp:2105 src/gui.cpp:2134
 msgid "Red/cyan glasses, high-quality Dubois method"
 msgstr "Rot/cyan Brillen, hochwertige Dubois-Methode"
 
-#: src/gui.cpp:173
+#: src/gui.cpp:179 src/gui.cpp:2106 src/gui.cpp:2135
 msgid "Green/magenta glasses, monochrome method"
 msgstr "Grün/magenta Brillen, monochrome Methode"
 
-#: src/gui.cpp:174
+#: src/gui.cpp:180 src/gui.cpp:2107 src/gui.cpp:2136
 msgid "Green/magenta glasses, half-color method"
 msgstr "Grün/magenta Brillen, Halbfarbenmethode"
 
-#: src/gui.cpp:175
+#: src/gui.cpp:181 src/gui.cpp:2108 src/gui.cpp:2137
 msgid "Green/magenta glasses, full-color method"
 msgstr "Grün/magenta Brillen, Vollfarbenmethode"
 
-#: src/gui.cpp:176
+#: src/gui.cpp:182 src/gui.cpp:2109 src/gui.cpp:2138
 msgid "Green/magenta glasses, high-quality Dubois method"
 msgstr "Grün/magenta Brillen, hochwertige Dubois-Methode"
 
-#: src/gui.cpp:177
+#: src/gui.cpp:183 src/gui.cpp:2110 src/gui.cpp:2139
 msgid "Amber/blue glasses, monochrome method"
 msgstr "Orange/blau Brillen, monochrome Methode"
 
-#: src/gui.cpp:178
+#: src/gui.cpp:184 src/gui.cpp:2111 src/gui.cpp:2140
 msgid "Amber/blue glasses, half-color method"
 msgstr "Orange/blau Brillen, Halbfarbenmethode"
 
-#: src/gui.cpp:179
+#: src/gui.cpp:185 src/gui.cpp:2112 src/gui.cpp:2141
 msgid "Amber/blue glasses, full-color method"
 msgstr "Orange/blau Brillen, Vollfarbenmethode"
 
-#: src/gui.cpp:180
+#: src/gui.cpp:186 src/gui.cpp:2113 src/gui.cpp:2142
 msgid "Amber/blue glasses, high-quality Dubois method"
 msgstr "Orange/blau Brillen, hochwertige Dubois-Methode"
 
-#: src/gui.cpp:181
+#: src/gui.cpp:187 src/gui.cpp:2114 src/gui.cpp:2143
 msgid "Red/green glasses, monochrome method"
 msgstr "Rot/grün Brillen, monochrome Methode"
 
-#: src/gui.cpp:182
+#: src/gui.cpp:188 src/gui.cpp:2115 src/gui.cpp:2144
 msgid "Red/blue glasses, monochrome method"
 msgstr "Rot/blau Brillen, monochrome Methode"
 
-#: src/gui.cpp:186
+#: src/gui.cpp:192
 msgid "Swap left/right"
 msgstr "Tausche links/rechts"
 
-#: src/gui.cpp:187
+#: src/gui.cpp:193
 msgid ""
 "Swap the left and right view. Use this if the 3D effect seems wrong."
 msgstr ""
 "Vertauschung von linker und rechter Sicht (falls der 3D Effekt falsch "
 "wirkt)."
 
-#: src/gui.cpp:467
+#: src/gui.cpp:471 src/gui.cpp:1676
 msgid "Off"
 msgstr "Aus"
 
-#: src/gui.cpp:694
+#: src/gui.cpp:702
 msgid ""
 "This slider shows the progress during video playback, and can be used to "
 "seek in the video."
@@ -433,36 +445,36 @@
 "Dieser Gleiter zeigt der Fortschritt beim Abspielen an, und kann zum Vor- "
 "und Zurückspulen benutzt werden."
 
-#: src/gui.cpp:701
+#: src/gui.cpp:709
 msgid "Elapsed / total time."
 msgstr "Zeit / Gesamtdauer."
 
-#: src/gui.cpp:708
+#: src/gui.cpp:716
 #, fuzzy
 msgid "Toggle audio mute."
 msgstr "Schalte Wiederholmodus um."
 
-#: src/gui.cpp:713
+#: src/gui.cpp:721
 msgid "Adjust audio volume."
 msgstr ""
 
-#: src/gui.cpp:725
+#: src/gui.cpp:733
 msgid "Play."
 msgstr "Abspielen."
 
-#: src/gui.cpp:729
+#: src/gui.cpp:737
 msgid "Pause."
 msgstr "Pause."
 
-#: src/gui.cpp:733
+#: src/gui.cpp:741
 msgid "Stop."
 msgstr "Stopp."
 
-#: src/gui.cpp:738
+#: src/gui.cpp:746
 msgid "Toggle loop mode."
 msgstr "Schalte Wiederholmodus um."
 
-#: src/gui.cpp:745
+#: src/gui.cpp:753
 msgid ""
 "Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
 "f key."
@@ -470,152 +482,160 @@
 "Zum Vollbildmodus schalten. Der Vollbildmodus kann mit der Taste f "
 "verlassen werden."
 
-#: src/gui.cpp:751
+#: src/gui.cpp:759
 msgid "Center the video area on your screen."
 msgstr "Zentrierung des Videos in der Mitte des Bildschirms."
 
-#: src/gui.cpp:758
+#: src/gui.cpp:766
 msgid "Seek backward 10 minutes."
 msgstr "10 Minuten zurückspulen."
 
-#: src/gui.cpp:763
+#: src/gui.cpp:771
 msgid "Seek backward 1 minute."
 msgstr "1 Minute zurückspulen."
 
-#: src/gui.cpp:769
+#: src/gui.cpp:777
 msgid "Seek backward 10 seconds."
 msgstr "10 Sekunden zurückspulen."
 
-#: src/gui.cpp:775
+#: src/gui.cpp:783
 msgid "Seek forward 10 seconds."
 msgstr "10 Sekunden vorspulen."
 
-#: src/gui.cpp:780
+#: src/gui.cpp:788
 msgid "Seek forward 1 minute."
 msgstr "1 Minute vorspulen."
 
-#: src/gui.cpp:786
+#: src/gui.cpp:794
 msgid "Seek forward 10 minutes."
 msgstr "10 Minuten vorspulen."
 
-#: src/gui.cpp:1047
+#: src/gui.cpp:1055
 msgid "Fullscreen/Multiscreen Settings"
 msgstr "Vollbild-/Multibildeinstellungen"
 
-#: src/gui.cpp:1049
+#: src/gui.cpp:1057
 msgid "Configure fullscreen mode:"
 msgstr "Konfiguriere Vollbildmodus:"
 
-#: src/gui.cpp:1050
+#: src/gui.cpp:1058
 msgid "Select the screens to use in fullscreen mode."
 msgstr "Auswahl der Bildschirme für den Vollbildmodus."
 
-#: src/gui.cpp:1052
+#: src/gui.cpp:1060
 msgid "Single screen:"
 msgstr "Einzelner Bildschirm:"
 
-#: src/gui.cpp:1053
+#: src/gui.cpp:1061
 msgid "Use a single screen for fullscreen mode."
 msgstr "Benutze einen einzelnen Bildschirm im Vollbildmodus."
 
-#: src/gui.cpp:1056
+#: src/gui.cpp:1064
 msgid "Primary screen"
 msgstr "Hauptbildschirm"
 
-#: src/gui.cpp:1059 src/gui.cpp:1070 src/gui.cpp:1071
+#: src/gui.cpp:1067 src/gui.cpp:1078 src/gui.cpp:1079
 #, c-format
 msgid "Screen %d"
 msgstr "Bildschirm %d"
 
-#: src/gui.cpp:1062
+#: src/gui.cpp:1070
 msgid "Dual screen:"
 msgstr "Doppelbildschirm:"
 
-#: src/gui.cpp:1063
+#: src/gui.cpp:1071
 msgid "Use two screens for fullscreen mode."
 msgstr "Benutze zwei Bildschirme im Vollbildmodus."
 
-#: src/gui.cpp:1075
+#: src/gui.cpp:1083
 msgid "Multi screen:"
 msgstr "Multibildschirm:"
 
-#: src/gui.cpp:1076
+#: src/gui.cpp:1084
 msgid "Use multiple screens for fullscreen mode."
 msgstr "Benutze mehrere Bildschirme im Vollbildmodus."
 
-#: src/gui.cpp:1078
+#: src/gui.cpp:1086
 msgid "Comma-separated list of screens to use for fullscreen mode."
 msgstr ""
 "Liste von Bildschirmen für den Vollbildmodus, durch Kommata getrennt."
 
-#: src/gui.cpp:1081
+#: src/gui.cpp:1089
 msgid "When in fullscreen mode,"
 msgstr "Im Vollbildmodus:"
 
-#: src/gui.cpp:1082
+#: src/gui.cpp:1090
 msgid "Set special left/right view handling for fullscreen mode."
 msgstr ""
 "Wähle spezielle Einstellungen für linke und rechte Ansicht im "
 "Vollbildmodus."
 
-#: src/gui.cpp:1084
+#: src/gui.cpp:1092
 msgid "flip left view vertically."
 msgstr "Spiegele linke Ansicht vertikal."
 
-#: src/gui.cpp:1086
+#: src/gui.cpp:1094
 msgid "flop left view horizontally."
 msgstr "Spiegele linke Ansicht horizontal."
 
-#: src/gui.cpp:1088
+#: src/gui.cpp:1096
 msgid "flip right view vertically."
 msgstr "Spiegele rechte Ansicht vertikal."
 
-#: src/gui.cpp:1090
+#: src/gui.cpp:1098
 msgid "flop right view horizontally."
 msgstr "Spiegele rechte Ansicht horizontal."
 
-#: src/gui.cpp:1093
+#: src/gui.cpp:1101
+msgid "use DLP(R) 3-D Ready Sync"
+msgstr ""
+
+#: src/gui.cpp:1102
+msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
+msgstr ""
+
+#: src/gui.cpp:1104
 #, fuzzy
 msgid "inhibit the screensaver"
 msgstr "Kann Bildschirmschoner nicht reaktivieren."
 
-#: src/gui.cpp:1094
+#: src/gui.cpp:1105
 #, fuzzy
 msgid "Inhibit the screensaver during fullscreen playback."
 msgstr "Auswahl der Bildschirme für den Vollbildmodus."
 
-#: src/gui.cpp:1096 src/gui.cpp:1258 src/gui.cpp:1393 src/gui.cpp:1463
-#: src/gui.cpp:1541 src/gui.cpp:1652 src/gui.cpp:1928 src/gui.cpp:2108
-#: src/gui.cpp:2778 src/gui.cpp:2825 src/gui.cpp:3114
+#: src/gui.cpp:1107 src/gui.cpp:1273 src/gui.cpp:1408 src/gui.cpp:1478
+#: src/gui.cpp:1556 src/gui.cpp:1680 src/gui.cpp:1948 src/gui.cpp:2147
+#: src/gui.cpp:2625 src/gui.cpp:3324 src/gui.cpp:3371 src/gui.cpp:3677
 msgid "OK"
 msgstr "OK"
 
-#: src/gui.cpp:1211
+#: src/gui.cpp:1226
 msgid "Display Color Adjustments"
 msgstr "Bildschirmfarbenjustierung"
 
-#: src/gui.cpp:1213
+#: src/gui.cpp:1228
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/gui.cpp:1224
+#: src/gui.cpp:1239
 msgid "Brightness:"
 msgstr "Helligkeit:"
 
-#: src/gui.cpp:1235
+#: src/gui.cpp:1250
 msgid "Hue:"
 msgstr "Farbton:"
 
-#: src/gui.cpp:1246
+#: src/gui.cpp:1261
 msgid "Saturation:"
 msgstr "Farbsättigung:"
 
-#: src/gui.cpp:1364
+#: src/gui.cpp:1379
 msgid "Display Crosstalk Calibration"
 msgstr "Bildschirm-Crosstalk Kalibrierung"
 
 #. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/gui.cpp:1367
+#: src/gui.cpp:1382
 msgid ""
 "Please read the manual to find out how to measure the crosstalk "
 "levels of your display."
@@ -623,142 +643,159 @@
 "Bitte lese das Handbuch um herauszufinden wie Crosstalk-Level für "
 "Deinen Bildschirm gemessen werden."
 
-#: src/gui.cpp:1371
+#: src/gui.cpp:1386
 msgid "Red:"
 msgstr "Rot:"
 
-#: src/gui.cpp:1378
+#: src/gui.cpp:1393
 msgid "Green:"
 msgstr "Grün:"
 
-#: src/gui.cpp:1385
+#: src/gui.cpp:1400
 msgid "Blue:"
 msgstr "Blau:"
 
-#: src/gui.cpp:1441
+#: src/gui.cpp:1456
 msgid "Zoom for wide videos"
 msgstr ""
 
-#: src/gui.cpp:1444
+#: src/gui.cpp:1459
 msgid ""
 "Set zoom level for videos that are wider than the screen: 0: Show "
 "full video width. 1: Use full screen height.</p"
 msgstr ""
 
-#: src/gui.cpp:1448
+#: src/gui.cpp:1463
 msgid "Zoom:"
 msgstr ""
 
-#: src/gui.cpp:1449
+#: src/gui.cpp:1464
 msgid "Set the zoom level for videos that are wider than the screen"
 msgstr ""
 
-#: src/gui.cpp:1507
+#: src/gui.cpp:1522
 #, fuzzy
 msgid "Audio Settings"
 msgstr "Einstellungen für Untertitel"
 
-#: src/gui.cpp:1509
+#: src/gui.cpp:1524
 #, fuzzy
 msgid "Audio device:"
 msgstr "Audiocodec"
 
-#: src/gui.cpp:1510
+#: src/gui.cpp:1525
 msgid ""
 "Select the audio device. This will take effect for the next started "
 "video."
 msgstr ""
 
-#: src/gui.cpp:1514 src/gui.cpp:2063
+#: src/gui.cpp:1529 src/gui.cpp:2563
 msgid "Default"
 msgstr "Standard"
 
-#: src/gui.cpp:1531
+#: src/gui.cpp:1546
 msgid "Audio delay (ms):"
 msgstr ""
 
-#: src/gui.cpp:1532
+#: src/gui.cpp:1547
 msgid ""
 "Set an audio delay, in milliseconds. This is useful if audio and video "
 "are not in sync."
 msgstr ""
 
-#: src/gui.cpp:1589
+#: src/gui.cpp:1604
 msgid "Subtitle Settings"
 msgstr "Einstellungen für Untertitel"
 
-#: src/gui.cpp:1591
-msgid "These settings apply to soft subtitles, but not to bitmaps."
+#: src/gui.cpp:1607
+#, fuzzy
+msgid ""
+"These settings apply only to soft subtitles, not to bitmaps. Some "
+"changes require a restart of the video to take effect."
 msgstr ""
 "Diese Einstellungen gelten für Text-Untertitel, nicht für Bild-Untertitel."
 ""
 
-#: src/gui.cpp:1593
+#: src/gui.cpp:1610
 msgid "Encoding:"
 msgstr "Zeichensatz:"
 
-#: src/gui.cpp:1594
+#: src/gui.cpp:1611
 msgid "Set the subtitle character set encoding."
 msgstr "Auswahl des Untertitelzeichensatzes."
 
-#: src/gui.cpp:1609
+#: src/gui.cpp:1626
 msgid "Override font:"
 msgstr "Setze Schriftart:"
 
-#: src/gui.cpp:1610
+#: src/gui.cpp:1627
 msgid "Override the subtitle font family."
 msgstr "Auswahl der Schriftart des Untertitels."
 
-#: src/gui.cpp:1619
+#: src/gui.cpp:1636
 msgid "Override font size:"
 msgstr "Setze Schriftgröße:"
 
-#: src/gui.cpp:1620
+#: src/gui.cpp:1637
 msgid "Override the subtitle font size."
 msgstr "Auswahl der Schriftgröße des Untertitels."
 
-#: src/gui.cpp:1630
+#: src/gui.cpp:1647
 msgid "Override scale factor:"
 msgstr "Setze Skalierungsfaktor:"
 
-#: src/gui.cpp:1631
+#: src/gui.cpp:1648
 msgid "Override the subtitle scale factor."
 msgstr "Auswahl des Skalierungsfaktors des Untertitels."
 
-#: src/gui.cpp:1642
+#: src/gui.cpp:1659
 msgid "Override color:"
 msgstr "Setze Farbe:"
 
-#: src/gui.cpp:1643
+#: src/gui.cpp:1660
 msgid "Override the subtitle color."
 msgstr "Auswahl der Farbe des Untertitels."
 
-#: src/gui.cpp:1866
+#: src/gui.cpp:1669
+#, fuzzy
+msgid "Override shadow:"
+msgstr "Setze Schriftart:"
+
+#: src/gui.cpp:1670
+#, fuzzy
+msgid "Override the subtitle shadow."
+msgstr "Auswahl der Farbe des Untertitels."
+
+#: src/gui.cpp:1675
+msgid "On"
+msgstr ""
+
+#: src/gui.cpp:1886
 #, fuzzy
 msgid "Video Settings"
 msgstr "Einstellungen für Untertitel"
 
-#: src/gui.cpp:1868
+#: src/gui.cpp:1888
 #, fuzzy
 msgid "Crop to aspect ratio:"
 msgstr "%gx%g, Seitenverhältnis %g:1"
 
-#: src/gui.cpp:1869
+#: src/gui.cpp:1889
 #, fuzzy
 msgid ""
 "Set the real aspect ratio of the video, so that borders can be cropped.</"
 "p>"
 msgstr "Auswahl des Stereolayouts des Videokanals."
 
-#: src/gui.cpp:1872
+#: src/gui.cpp:1892
 msgid "Do not crop"
 msgstr ""
 
-#: src/gui.cpp:1885
+#: src/gui.cpp:1905
 msgid "Parallax:"
 msgstr "Parallaxe:"
 
-#: src/gui.cpp:1886
+#: src/gui.cpp:1906
 msgid ""
 "Adjust parallax, from -1 to +1. This changes the separation of left and "
 "right view, and thus the perceived distance of the scene."
@@ -766,11 +803,11 @@
 "Justierung der Parallaxe, von -1 bis +1. Dies ändert die Separierung von "
 "linker und rechter Sicht und damit den wahrgenommenen Abstand der Szene."
 
-#: src/gui.cpp:1899
+#: src/gui.cpp:1919
 msgid "Subtitle parallax:"
 msgstr "Untertitelparallaxe:"
 
-#: src/gui.cpp:1900
+#: src/gui.cpp:1920
 msgid ""
 "Adjust subtitle parallax, from -1 to +1. This changes the perceived "
 "distance of the subtitles."
@@ -778,11 +815,11 @@
 "Justierung der Untertitelparallaxe, von -1 bis +1. Dies ändert den "
 "wahrgenommenen Abstand der Untertitel."
 
-#: src/gui.cpp:1913
+#: src/gui.cpp:1933
 msgid "Ghostbusting:"
 msgstr "Crosstalk-Verringerungsfaktor:"
 
-#: src/gui.cpp:1914
+#: src/gui.cpp:1934
 msgid ""
 "Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
 "the crosstalk levels of your display first. Note that crosstalk ghostbusting "
@@ -792,35 +829,76 @@
 "müssen die Crosstalk-Level des Bildschirms gesetzt werden. Crosstalk-"
 "Verringerung funktioniert nicht mit Anaglyphenbrillen."
 
-#: src/gui.cpp:2059
-msgid "Open device"
+#: src/gui.cpp:2078
+#, fuzzy
+msgid "SDI Output Settings"
+msgstr "Einstellungen für Untertitel"
+
+#: src/gui.cpp:2080
+msgid "SDI Output Format:"
+msgstr ""
+
+#: src/gui.cpp:2081
+#, fuzzy
+msgid "Select output format used for SDI output."
+msgstr "Auswahl des 3D Ausgabetyps für das Ausgabegerät."
+
+#: src/gui.cpp:2089
+msgid "Left stereo mode:"
+msgstr ""
+
+#: src/gui.cpp:2090
+#, fuzzy
+msgid "Select stereo mode used for left SDI output."
+msgstr "Auswahl der Bildschirme für den Vollbildmodus."
+
+#: src/gui.cpp:2118
+msgid "Right stereo mode:"
+msgstr ""
+
+#: src/gui.cpp:2119
+msgid "Select stereo mode used for right SDI output."
+msgstr ""
+
+#: src/gui.cpp:2559
+#, fuzzy
+msgid "Open device(s)"
 msgstr "Kamera öffnen"
 
-#: src/gui.cpp:2062
+#: src/gui.cpp:2562
 msgid "Choose a device type."
 msgstr "Auswahl des Kameratyps."
 
-#: src/gui.cpp:2064 src/media_object.cpp:801
+#: src/gui.cpp:2564 src/media_object.cpp:801
 msgid "Firewire"
 msgstr "Firewire"
 
-#: src/gui.cpp:2065 src/media_object.cpp:802
+#: src/gui.cpp:2565 src/media_object.cpp:802
 msgid "X11"
 msgstr "X11"
 
-#: src/gui.cpp:2067 src/gui.cpp:2070
+#: src/gui.cpp:2568 src/gui.cpp:2571
 msgid "Choose a device."
 msgstr "Auswahl der Kamera."
 
-#: src/gui.cpp:2073
+#: src/gui.cpp:2574
 msgid "Set the X11 device string. Refer to the manual for details."
 msgstr "Setze das X11 Gerät. Siehe Benutzerhandbuch."
 
-#: src/gui.cpp:2082
+#: src/gui.cpp:2590
+msgid "First device:"
+msgstr ""
+
+#: src/gui.cpp:2591
+#, fuzzy
+msgid "Second device:"
+msgstr "Kamera öffnen"
+
+#: src/gui.cpp:2595
 msgid "Request frame size"
 msgstr "Fordere Bildgröße an"
 
-#: src/gui.cpp:2083
+#: src/gui.cpp:2596
 msgid ""
 "Request a specific frame size from the device, e.g. 640x480. The device "
 "must support this frame size. Some devices require a frame size to be "
@@ -830,11 +908,11 @@
 "Die Kamera muss diese Auflösung unterstützen. Einige Kameras verlangen, dass "
 "eine Auflösung ausgewählt wird."
 
-#: src/gui.cpp:2094
+#: src/gui.cpp:2607
 msgid "Request frame rate"
 msgstr "Fordere Bildrate an"
 
-#: src/gui.cpp:2095
+#: src/gui.cpp:2608
 msgid ""
 "Request a specific frame rate from the device, e.g. 25/1. The device must "
 "support this frame rate. Some devices require a frame rate to be selected.</"
@@ -844,250 +922,268 @@
 "muss diese Bildrate unterstützen. Einige Kameras verlangen, dass eine "
 "Bildrate ausgewählt wird."
 
-#: src/gui.cpp:2106 src/gui.cpp:2824
+#: src/gui.cpp:2619
+#, fuzzy
+msgid "Request MJPEG format"
+msgstr "Fordere Bildrate an"
+
+#: src/gui.cpp:2620
+msgid ""
+"Request MJPEG data from the input device. The device may ignore this "
+"request."
+msgstr ""
+
+#: src/gui.cpp:2623 src/gui.cpp:3370
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/gui.cpp:2377
+#: src/gui.cpp:2918
 msgid "&File"
 msgstr "&Datei"
 
-#: src/gui.cpp:2378
+#: src/gui.cpp:2919
 #, fuzzy
 msgid "&Open file(s)..."
 msgstr "Dateien öffnen"
 
-#: src/gui.cpp:2383
+#: src/gui.cpp:2924
 #, fuzzy
 msgid "Open &URL(s)..."
 msgstr "Öffne &URL..."
 
-#: src/gui.cpp:2387
-msgid "Open &device..."
+#: src/gui.cpp:2928
+#, fuzzy
+msgid "Open &device(s)..."
 msgstr "Öffne &Kamera..."
 
-#: src/gui.cpp:2402
+#: src/gui.cpp:2943
 msgid "&Clear recent files"
 msgstr ""
 
-#: src/gui.cpp:2410
+#: src/gui.cpp:2951
 msgid "&Quit..."
 msgstr "&Beenden..."
 
-#: src/gui.cpp:2416
+#: src/gui.cpp:2957
 msgid "&Preferences"
 msgstr "&Einstellungen"
 
-#: src/gui.cpp:2419
+#: src/gui.cpp:2960
 msgid "&Fullscreen Settings..."
 msgstr "&Vollbildeinstellungen..."
 
-#: src/gui.cpp:2422
+#: src/gui.cpp:2963
 msgid "Display &Color Adjustments..."
 msgstr "Bildschirm&farben..."
 
-#: src/gui.cpp:2425
+#: src/gui.cpp:2966
 msgid "Display Cross&talk Calibration..."
 msgstr "Bildschirm-Crosstalk..."
 
-#: src/gui.cpp:2429
+#: src/gui.cpp:2970
 msgid "&Zoom for wide videos..."
 msgstr ""
 
-#: src/gui.cpp:2433
+#: src/gui.cpp:2974
 #, fuzzy
 msgid "&Audio Settings..."
 msgstr "&Untertitel..."
 
-#: src/gui.cpp:2437
+#: src/gui.cpp:2978
 msgid "&Subtitle Settings..."
 msgstr "&Untertitel..."
 
-#: src/gui.cpp:2441
+#: src/gui.cpp:2982
 #, fuzzy
 msgid "Current &Video Settings..."
 msgstr "&Stereoskopische Videos..."
 
-#: src/gui.cpp:2444
+#: src/gui.cpp:2987
+#, fuzzy
+msgid "SDI &Output Settings..."
+msgstr "&Untertitel..."
+
+#: src/gui.cpp:2991
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: src/gui.cpp:2445
+#: src/gui.cpp:2992
 msgid "&Manual..."
 msgstr "&Handbuch..."
 
-#: src/gui.cpp:2450
+#: src/gui.cpp:2997
 msgid "&Website..."
 msgstr "&Webseite..."
 
-#: src/gui.cpp:2454
+#: src/gui.cpp:3001
 msgid "&Keyboard Shortcuts"
 msgstr "&Tastaturkürzel"
 
-#: src/gui.cpp:2458
+#: src/gui.cpp:3005
 msgid "&About"
 msgstr "&Über"
 
-#: src/gui.cpp:2771
+#: src/gui.cpp:3317
 msgid "Tip"
 msgstr ""
 
-#: src/gui.cpp:2774
+#: src/gui.cpp:3320
 msgid ""
 "You can select and open multiple files at once.This is useful for "
 "example if you have extra subtitle files, or if left and right view are "
 "stored in separate files."
 msgstr ""
 
-#: src/gui.cpp:2777
+#: src/gui.cpp:3323
 msgid "Do not show this message again."
 msgstr ""
 
-#: src/gui.cpp:2794
+#: src/gui.cpp:3340
 msgid "Open files"
 msgstr "Dateien öffnen"
 
-#: src/gui.cpp:2818
+#: src/gui.cpp:3364
 #, fuzzy
 msgid "Open URL(s)"
 msgstr "Öffne URL"
 
-#: src/gui.cpp:2819
+#: src/gui.cpp:3365
 msgid "URL(s):"
 msgstr ""
 
-#: src/gui.cpp:2820
+#: src/gui.cpp:3366
 msgid "Enter one or more space separated URLs."
 msgstr ""
 
-#: src/gui.cpp:3005 src/gui.cpp:3013 src/video_output_qt.cpp:234
-#: src/video_output_qt.cpp:643 src/video_output_qt.cpp:664
+#: src/gui.cpp:3568 src/gui.cpp:3576 src/video_output_qt.cpp:241
+#: src/video_output_qt.cpp:477 src/video_output_qt.cpp:659
+#: src/video_output_qt.cpp:671 src/video_output_qt.cpp:692
 msgid "Error"
 msgstr "Fehler"
 
-#: src/gui.cpp:3005
+#: src/gui.cpp:3568
 msgid "Cannot open manual."
 msgstr "Kann Handbuch nicht öffnen."
 
-#: src/gui.cpp:3013
+#: src/gui.cpp:3576
 msgid "Cannot open website."
 msgstr "Kann Webseite nicht öffnen."
 
-#: src/gui.cpp:3021
+#: src/gui.cpp:3584
 msgid "Keyboard Shortcuts"
 msgstr "Tastaturkürzel"
 
-#: src/gui.cpp:3024
+#: src/gui.cpp:3587
 #, fuzzy
 msgid "Keyboard control:"
 msgstr "Tastaturkürzel"
 
-#: src/gui.cpp:3026
+#: src/gui.cpp:3589
 msgid "Stop."
 msgstr ""
 
-#: src/gui.cpp:3027 src/main.cpp:495
+#: src/gui.cpp:3590 src/main.cpp:494
 msgid "Pause / unpause."
 msgstr ""
 
-#: src/gui.cpp:3028 src/main.cpp:496
+#: src/gui.cpp:3591 src/main.cpp:495
 #, fuzzy
 msgid "Toggle fullscreen."
 msgstr "Konfiguriere Vollbildmodus:"
 
-#: src/gui.cpp:3029 src/main.cpp:497
+#: src/gui.cpp:3592 src/main.cpp:496
 msgid "Center window."
 msgstr ""
 
-#: src/gui.cpp:3030 src/main.cpp:498
+#: src/gui.cpp:3593 src/main.cpp:497
 #, fuzzy
 msgid "Swap left/right eye."
 msgstr "Tausche links/rechts"
 
-#: src/gui.cpp:3031 src/main.cpp:499
+#: src/gui.cpp:3594 src/main.cpp:498
 msgid "Cycle through available video streams."
 msgstr ""
 
-#: src/gui.cpp:3032 src/main.cpp:500
+#: src/gui.cpp:3595 src/main.cpp:499
 msgid "Cycle through available audio streams."
 msgstr ""
 
-#: src/gui.cpp:3033 src/main.cpp:501
+#: src/gui.cpp:3596 src/main.cpp:500
 #, fuzzy
 msgid "Cycle through available subtitle streams."
 msgstr "Auswahl des Untertitelkanals."
 
-#: src/gui.cpp:3034 src/main.cpp:502
+#: src/gui.cpp:3597 src/main.cpp:501
 msgid "Adjust contrast."
 msgstr ""
 
-#: src/gui.cpp:3035 src/main.cpp:503
+#: src/gui.cpp:3598 src/main.cpp:502
 #, fuzzy
 msgid "Adjust brightness."
 msgstr "Helligkeit:"
 
-#: src/gui.cpp:3036 src/main.cpp:504
+#: src/gui.cpp:3599 src/main.cpp:503
 msgid "Adjust hue."
 msgstr ""
 
-#: src/gui.cpp:3037 src/main.cpp:505
+#: src/gui.cpp:3600 src/main.cpp:504
 #, fuzzy
 msgid "Adjust saturation."
 msgstr "Farbsättigung:"
 
-#: src/gui.cpp:3038 src/main.cpp:506
+#: src/gui.cpp:3601 src/main.cpp:505
 #, fuzzy
 msgid "Adjust parallax."
 msgstr "Untertitelparallaxe:"
 
-#: src/gui.cpp:3039 src/main.cpp:507
+#: src/gui.cpp:3602 src/main.cpp:506
 #, fuzzy
 msgid "Adjust ghostbusting."
 msgstr "Crosstalk-Verringerungsfaktor:"
 
-#: src/gui.cpp:3040 src/main.cpp:508
+#: src/gui.cpp:3603 src/main.cpp:507
 msgid "Adjust zoom for wide videos."
 msgstr ""
 
-#: src/gui.cpp:3041 src/main.cpp:509
+#: src/gui.cpp:3604 src/main.cpp:508
 msgid "Adjust audio volume."
 msgstr ""
 
-#: src/gui.cpp:3042 src/main.cpp:510
+#: src/gui.cpp:3605 src/main.cpp:509
 msgid "Toggle audio mute."
 msgstr ""
 
-#: src/gui.cpp:3043 src/main.cpp:511
+#: src/gui.cpp:3606 src/main.cpp:510
 msgid "Step a single video frame forward."
 msgstr ""
 
-#: src/gui.cpp:3044 src/main.cpp:512
+#: src/gui.cpp:3607 src/main.cpp:511
 msgid "Seek 10 seconds backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3045 src/main.cpp:513
+#: src/gui.cpp:3608 src/main.cpp:512
 msgid "Seek 1 minute backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3046 src/main.cpp:514
+#: src/gui.cpp:3609 src/main.cpp:513
 msgid "Seek 10 minutes backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3047 src/main.cpp:516
+#: src/gui.cpp:3610 src/main.cpp:515
 msgid "Media keys should work as expected."
 msgstr ""
 
-#: src/gui.cpp:3063
+#: src/gui.cpp:3626
 #, c-format
 msgid "About %s"
 msgstr "Über %s"
 
-#: src/gui.cpp:3069
+#: src/gui.cpp:3632
 #, c-format
 msgid "The %s 3D video player"
 msgstr "%s - 3D Videospieler"
 
-#: src/gui.cpp:3074
+#: src/gui.cpp:3637
 #, fuzzy, c-format
 msgid ""
 "%s version %s.Copyright (C) 2012 the Bino developers.This "
@@ -1102,27 +1198,27 @@
 "License</a>. Es gibt keine Garantie.Siehe <a href=\"%s\">%s</a> für "
 "mehr Informationen über diese Software."
 
-#: src/gui.cpp:3086 src/main.cpp:384
+#: src/gui.cpp:3649 src/main.cpp:378
 msgid "Platform:"
 msgstr "Plattform:"
 
-#: src/gui.cpp:3087 src/main.cpp:386
+#: src/gui.cpp:3650 src/main.cpp:380
 msgid "Libraries used:"
 msgstr "Benutzte Bibliotheken:"
 
-#: src/gui.cpp:3109
+#: src/gui.cpp:3672
 msgid "About"
 msgstr "Über"
 
-#: src/gui.cpp:3110
+#: src/gui.cpp:3673
 msgid "Libraries"
 msgstr "Bibliotheken"
 
-#: src/gui.cpp:3111
+#: src/gui.cpp:3674
 msgid "Team"
 msgstr "Team"
 
-#: src/gui.cpp:3112
+#: src/gui.cpp:3675
 msgid "License"
 msgstr "Lizenz"
 
@@ -1161,23 +1257,17 @@
 msgid "Cannot get command for LIRC code."
 msgstr "Kann kein Kommando für LIRC Code bekommen."
 
-#: src/main.cpp:367 src/media_object.cpp:821 src/media_object.cpp:1286
-#: src/video_output.cpp:212
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: src/main.cpp:379
+#: src/main.cpp:373
 #, c-format
 msgid "%s version %s"
 msgstr "%s Version %s"
 
-#: src/main.cpp:380
+#: src/main.cpp:374
 #, fuzzy
 msgid "Copyright (C) 2012 the Bino developers."
 msgstr "Copyright (C) 2011 Bino Entwickler."
 
-#: src/main.cpp:381
+#: src/main.cpp:375
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -1188,470 +1278,496 @@
 
 #. TRANSLATORS: This is the --help text. Please keep the line length limited.
 #. * The --help output should look good with a line width of 80 characters.
-#: src/main.cpp:399
+#: src/main.cpp:393
 msgid "Usage:"
 msgstr ""
 
-#: src/main.cpp:401
+#: src/main.cpp:395
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:402
+#: src/main.cpp:396
 msgid "Print help."
 msgstr ""
 
-#: src/main.cpp:403
+#: src/main.cpp:397
 msgid "Print version."
 msgstr ""
 
-#: src/main.cpp:404
+#: src/main.cpp:398
 msgid "Do not use the GUI, just show a plain window."
 msgstr ""
 
-#: src/main.cpp:405
+#: src/main.cpp:399
 msgid "Append all log messages to the given file."
 msgstr ""
 
-#: src/main.cpp:406
+#: src/main.cpp:400
 msgid "Set log level (debug/info/warning/error/quiet)."
 msgstr ""
 
-#: src/main.cpp:407
+#: src/main.cpp:401
 msgid "Print a list of known audio devices and exit."
 msgstr ""
 
-#: src/main.cpp:408
+#: src/main.cpp:402
 msgid "Use audio device number N (N=0 is the default)."
 msgstr ""
 
-#: src/main.cpp:409
+#: src/main.cpp:403
 msgid "Delay audio by D milliseconds. Default is 0."
 msgstr ""
 
-#: src/main.cpp:410
+#: src/main.cpp:404
 msgid "Set audio volume (0 to 1). Default is 1."
 msgstr ""
 
-#: src/main.cpp:411
+#: src/main.cpp:405
 #, fuzzy
 msgid "Mute audio."
 msgstr "Kein Audio."
 
-#: src/main.cpp:412
+#: src/main.cpp:406
 msgid "Type of input device: default, firewire, x11."
 msgstr ""
 
-#: src/main.cpp:413
+#: src/main.cpp:407
 #, fuzzy
 msgid "Request frame size WxH from input device."
 msgstr "Fordere Bildgröße an"
 
-#: src/main.cpp:414
+#: src/main.cpp:408
 #, fuzzy
 msgid "Request frame rate N/D from input device."
 msgstr "Fordere Bildrate an"
 
-#: src/main.cpp:415
+#: src/main.cpp:409
+msgid "Request device format 'default' or 'mjpeg'."
+msgstr ""
+
+#: src/main.cpp:410
+#, fuzzy
+msgid "Read commands from a file."
+msgstr "Ungültiges Kommando '%s' von LIRC erhalten."
+
+#: src/main.cpp:411
 #, fuzzy
 msgid "Use the given LIRC configuration file."
 msgstr "Kann LIRC Konfigurationsdatei %s nicht lesen."
 
-#: src/main.cpp:416
+#: src/main.cpp:412
 msgid "This option can be used more than once."
 msgstr ""
 
-#: src/main.cpp:417
+#: src/main.cpp:413
 msgid "Select video stream (1-n, depending on input)."
 msgstr ""
 
-#: src/main.cpp:418
+#: src/main.cpp:414
 msgid "Select audio stream (1-n, depending on input)."
 msgstr ""
 
-#: src/main.cpp:419
+#: src/main.cpp:415
 #, fuzzy
 msgid "Select subtitle stream (0-n, dep. on input)."
 msgstr "Auswahl des Untertitelkanals."
 
-#: src/main.cpp:420
+#: src/main.cpp:416
 msgid "Select input type (default autodetect):"
 msgstr ""
 
-#: src/main.cpp:421
+#: src/main.cpp:417
 #, fuzzy
 msgid "Single view."
 msgstr "Rechte Sicht"
 
-#: src/main.cpp:422
+#: src/main.cpp:418
 #, fuzzy
 msgid "Left/right separate streams, left first."
 msgstr "Getrennte Kanäle, links zuerst"
 
-#: src/main.cpp:423
+#: src/main.cpp:419
 #, fuzzy
 msgid "Left/right separate streams, right first."
 msgstr "Getrennte Kanäle, rechts zuerst"
 
-#: src/main.cpp:424
+#: src/main.cpp:420
 #, fuzzy
 msgid "Left/right alternating, left first."
 msgstr "Getrennte Kanäle, links zuerst"
 
-#: src/main.cpp:425
+#: src/main.cpp:421
 #, fuzzy
 msgid "Left/right alternating, right first."
 msgstr "Getrennte Kanäle, rechts zuerst"
 
-#: src/main.cpp:426 src/main.cpp:441
+#: src/main.cpp:422 src/main.cpp:437
 msgid "Left top, right bottom."
 msgstr ""
 
-#: src/main.cpp:427 src/main.cpp:442
+#: src/main.cpp:423 src/main.cpp:438
 #, fuzzy
 msgid "Left top, right bottom, half height."
 msgstr "Oben/unten, halbe Höhe"
 
-#: src/main.cpp:428
+#: src/main.cpp:424
 msgid "Left bottom, right top."
 msgstr ""
 
-#: src/main.cpp:429
+#: src/main.cpp:425
 #, fuzzy
 msgid "Left bottom, right top, half height."
 msgstr "Unten/oben, halbe Höhe"
 
-#: src/main.cpp:430 src/main.cpp:443
+#: src/main.cpp:426 src/main.cpp:439
 msgid "Left left, right right."
 msgstr ""
 
-#: src/main.cpp:431 src/main.cpp:444
+#: src/main.cpp:427 src/main.cpp:440
 #, fuzzy
 msgid "Left left, right right, half width."
 msgstr "Links/rechts, halbe Breite"
 
-#: src/main.cpp:432
+#: src/main.cpp:428
 #, fuzzy
 msgid "Left right, right left."
 msgstr "Links/rechts, halbe Breite"
 
-#: src/main.cpp:433
+#: src/main.cpp:429
 #, fuzzy
 msgid "Left right, right left, half width."
 msgstr "Links/rechts, halbe Breite"
 
-#: src/main.cpp:434 src/main.cpp:445
+#: src/main.cpp:430 src/main.cpp:441
 msgid "Left even rows, right odd rows."
 msgstr ""
 
-#: src/main.cpp:435
+#: src/main.cpp:431
 msgid "Left odd rows, right even rows."
 msgstr ""
 
-#: src/main.cpp:436
+#: src/main.cpp:432
 msgid "Select output type:"
 msgstr ""
 
-#: src/main.cpp:437
+#: src/main.cpp:433
 #, fuzzy
 msgid "OpenGL quad-buffered stereo."
 msgstr "OpenGL Stereo"
 
-#: src/main.cpp:438
+#: src/main.cpp:434
 #, fuzzy
 msgid "Left and right view alternating."
 msgstr "Spiegele rechte Ansicht vertikal."
 
-#: src/main.cpp:439
+#: src/main.cpp:435
 msgid "Only left."
 msgstr ""
 
-#: src/main.cpp:440
+#: src/main.cpp:436
 msgid "Only right."
 msgstr ""
 
-#: src/main.cpp:446
+#: src/main.cpp:442
 msgid "Left even columns, right odd columns."
 msgstr ""
 
-#: src/main.cpp:447
+#: src/main.cpp:443
 #, fuzzy
 msgid "Left and right in checkerboard pattern."
 msgstr "Schachbrettmuster"
 
-#: src/main.cpp:448
+#: src/main.cpp:444
 #, fuzzy
 msgid "HDMI frame packing mode."
 msgstr "HDMI Framepacking Modus"
 
-#: src/main.cpp:449
+#: src/main.cpp:445
 #, fuzzy
 msgid "Red/cyan anaglyph, monochrome method."
 msgstr "Rot/cyan Brillen, monochrome Methode"
 
-#: src/main.cpp:450
+#: src/main.cpp:446
 #, fuzzy
 msgid "Red/cyan anaglyph, half color method."
 msgstr "Rot/cyan Brillen, Halbfarbenmethode"
 
-#: src/main.cpp:451
+#: src/main.cpp:447
 #, fuzzy
 msgid "Red/cyan anaglyph, full color method."
 msgstr "Rot/cyan Brillen, Vollfarbenmethode"
 
-#: src/main.cpp:452
+#: src/main.cpp:448
 #, fuzzy
 msgid "Red/cyan anaglyph, Dubois method."
 msgstr "Rot/cyan Brillen, hochwertige Dubois-Methode"
 
-#: src/main.cpp:453
+#: src/main.cpp:449
 #, fuzzy
 msgid "Green/magenta anaglyph, monochrome method."
 msgstr "Grün/magenta Brillen, monochrome Methode"
 
-#: src/main.cpp:454
+#: src/main.cpp:450
 #, fuzzy
 msgid "Green/magenta anaglyph, half color method."
 msgstr "Grün/magenta Brillen, Halbfarbenmethode"
 
-#: src/main.cpp:455
+#: src/main.cpp:451
 #, fuzzy
 msgid "Green/magenta anaglyph, full color method."
 msgstr "Grün/magenta Brillen, Vollfarbenmethode"
 
-#: src/main.cpp:456
+#: src/main.cpp:452
 #, fuzzy
 msgid "Green/magenta anaglyph, Dubois method."
 msgstr "Grün/magenta Brillen, hochwertige Dubois-Methode"
 
-#: src/main.cpp:457
+#: src/main.cpp:453
 #, fuzzy
 msgid "Amber/blue anaglyph, monochrome method."
 msgstr "Orange/blau Brillen, monochrome Methode"
 
-#: src/main.cpp:458
+#: src/main.cpp:454
 #, fuzzy
 msgid "Amber/blue anaglyph, half color method."
 msgstr "Orange/blau Brillen, Halbfarbenmethode"
 
-#: src/main.cpp:459
+#: src/main.cpp:455
 #, fuzzy
 msgid "Amber/blue anaglyph, full color method."
 msgstr "Orange/blau Brillen, Vollfarbenmethode"
 
-#: src/main.cpp:460
+#: src/main.cpp:456
 #, fuzzy
 msgid "Amber/blue anaglyph, Dubois method."
 msgstr "Orange/blau Brillen, hochwertige Dubois-Methode"
 
-#: src/main.cpp:461
+#: src/main.cpp:457
 #, fuzzy
 msgid "Red/green anaglyph, monochrome method."
 msgstr "Rot/grün Brillen, monochrome Methode"
 
-#: src/main.cpp:462
+#: src/main.cpp:458
 #, fuzzy
 msgid "Red/blue anaglyph, monochrome method."
 msgstr "Rot/blau Brillen, monochrome Methode"
 
-#: src/main.cpp:463
+#: src/main.cpp:459
 msgid "Multi-display via Equalizer (2D setup)."
 msgstr ""
 
-#: src/main.cpp:464
+#: src/main.cpp:460
 msgid "Multi-display via Equalizer (3D setup)."
 msgstr ""
 
-#: src/main.cpp:465
+#: src/main.cpp:461
 #, fuzzy
 msgid "Swap left/right view."
 msgstr "Tausche links/rechts"
 
-#: src/main.cpp:466
+#: src/main.cpp:462
 #, fuzzy
 msgid "Fullscreen."
 msgstr "Doppelbildschirm:"
 
-#: src/main.cpp:467
+#: src/main.cpp:463
 #, fuzzy
 msgid "Use the listed screens in fullscreen mode."
 msgstr "Benutze mehrere Bildschirme im Vollbildmodus."
 
-#: src/main.cpp:468
+#: src/main.cpp:464
 msgid "Screen numbers start with 1."
 msgstr ""
 
-#: src/main.cpp:469
+#: src/main.cpp:465
 msgid "An empty list defaults to the primary screen."
 msgstr ""
 
-#: src/main.cpp:470
+#: src/main.cpp:466
 #, fuzzy
 msgid "Flip left view vertically when fullscreen."
 msgstr "Spiegele linke Ansicht vertikal."
 
-#: src/main.cpp:471
+#: src/main.cpp:467
 #, fuzzy
 msgid "Flop left view horizontally when fullscreen."
 msgstr "Spiegele linke Ansicht horizontal."
 
-#: src/main.cpp:472
+#: src/main.cpp:468
 #, fuzzy
 msgid "Flip right view vertically when fullscreen."
 msgstr "Spiegele rechte Ansicht vertikal."
 
-#: src/main.cpp:473
+#: src/main.cpp:469
 #, fuzzy
 msgid "Flop right view horizontally when fullscreen."
 msgstr "Spiegele rechte Ansicht horizontal."
 
-#: src/main.cpp:474
+#: src/main.cpp:470
+msgid "Use DLP 3-D Ready Sync when fullscreen."
+msgstr ""
+
+#: src/main.cpp:471
 msgid "Set zoom for wide videos (0=off to 1=full)."
 msgstr ""
 
-#: src/main.cpp:475
+#: src/main.cpp:472
 msgid "Crop video to given aspect ratio (0:0=off)."
 msgstr ""
 
-#: src/main.cpp:476
+#: src/main.cpp:473
 #, fuzzy
 msgid "Center window on screen."
 msgstr "Zentrierung des Videos in der Mitte des Bildschirms."
 
-#: src/main.cpp:477
+#: src/main.cpp:474
 #, fuzzy
 msgid "Set subtitle encoding."
 msgstr "Untertitelcodec"
 
-#: src/main.cpp:478
+#: src/main.cpp:475
 #, fuzzy
 msgid "Set subtitle font name."
 msgstr "Auswahl der Schriftart des Untertitels."
 
-#: src/main.cpp:479
+#: src/main.cpp:476
 #, fuzzy
 msgid "Set subtitle font size."
 msgstr "Auswahl der Schriftgröße des Untertitels."
 
-#: src/main.cpp:480
+#: src/main.cpp:477
 #, fuzzy
 msgid "Set subtitle scale factor."
 msgstr "Auswahl des Skalierungsfaktors des Untertitels."
 
-#: src/main.cpp:481
+#: src/main.cpp:478
 msgid "Set subtitle color, in [AA]RRGGBB format."
 msgstr ""
 
-#: src/main.cpp:482
+#: src/main.cpp:479
+msgid "Set subtitle shadow, -1=default, 0=off, 1=on."
+msgstr ""
+
+#: src/main.cpp:480
 msgid "Subtitle parallax adjustment (-1 to +1)."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:481
 msgid "Parallax adjustment (-1 to +1)."
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:482
 msgid "Crosstalk leak level (0 to 1)."
 msgstr ""
 
-#: src/main.cpp:485
+#: src/main.cpp:483
 msgid "Comma-separated values for R,G,B."
 msgstr ""
 
-#: src/main.cpp:486
+#: src/main.cpp:484
 msgid "Amount of ghostbusting to apply (0 to 1)."
 msgstr ""
 
-#: src/main.cpp:487
+#: src/main.cpp:485
 msgid "Benchmark mode (no audio, show fps)."
 msgstr ""
 
-#: src/main.cpp:488
+#: src/main.cpp:486
 msgid "Frame rate divisor for display refresh rate."
 msgstr ""
 
-#: src/main.cpp:489
+#: src/main.cpp:487
 msgid "Default is 0 for benchmark mode, 1 otherwise."
 msgstr ""
 
-#: src/main.cpp:490
+#: src/main.cpp:488
 msgid "Loop the input media."
 msgstr ""
 
-#: src/main.cpp:492
+#: src/main.cpp:489
+msgid "Set SDI output format."
+msgstr ""
+
+#: src/main.cpp:491
 msgid "Interactive control:"
 msgstr ""
 
-#: src/main.cpp:493
+#: src/main.cpp:492
 #, fuzzy
 msgid "Leave fullscreen mode, or quit."
 msgstr "Im Vollbildmodus:"
 
-#: src/main.cpp:494
+#: src/main.cpp:493
 #, fuzzy
 msgid "Quit."
 msgstr "&Beenden..."
 
-#: src/main.cpp:515
+#: src/main.cpp:514
 msgid "Seek according to horizontal click position."
 msgstr ""
 
-#: src/main.cpp:523
+#: src/main.cpp:522
 msgid "No audio devices known."
 msgstr ""
 
-#: src/main.cpp:595
+#: src/main.cpp:594
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Benchmark Modus: Audio und Videosynchronisation deaktiviert."
 
-#: src/main.cpp:729
+#: src/main.cpp:608
+#, c-format
+msgid "Unknown mode %s."
+msgstr ""
+
+#: src/main.cpp:740
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Diese Version von Bino wurde ohne Unterstützung für LIRC erstellt."
 
 #. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:935
+#: src/media_data.cpp:1051
 #, c-format
 msgid "%dx%d, %.3g:1"
 msgstr "%dx%d, %.3g:1"
 
 #. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:1066
+#: src/media_data.cpp:1182
 #, c-format
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d Kan., %g kHz, %d bit"
 
-#: src/media_input.cpp:282
+#: src/media_input.cpp:281
 #, c-format
 msgid "Video %s: %s"
 msgstr "Video %s: %s"
 
-#: src/media_input.cpp:287
+#: src/media_input.cpp:286
 msgid "No video."
 msgstr "Kein Video."
 
-#: src/media_input.cpp:293
+#: src/media_input.cpp:292
 #, c-format
 msgid "Audio %s: %s"
 msgstr "Audio %s: %s"
 
-#: src/media_input.cpp:298
+#: src/media_input.cpp:297
 msgid "No audio."
 msgstr "Kein Audio."
 
-#: src/media_input.cpp:304
+#: src/media_input.cpp:303
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr "Untertitel %s: %s"
 
-#: src/media_input.cpp:309
+#: src/media_input.cpp:308
 msgid "No subtitle."
 msgstr "Kein Untertitel."
 
-#: src/media_input.cpp:311
+#: src/media_input.cpp:310
 #, c-format
 msgid "Duration: %g seconds"
 msgstr "Dauer: %g Sekunden"
 
-#: src/media_input.cpp:314
+#: src/media_input.cpp:313
 #, c-format
 msgid "Stereo layout: %s"
 msgstr "Stereolayout: %s"
@@ -1680,131 +1796,131 @@
 msgid "default"
 msgstr "Standard"
 
-#: src/media_object.cpp:832
+#: src/media_object.cpp:836
 #, c-format
 msgid "%s: Cannot read stream info: %s"
 msgstr "%s: Kann Informationen über Kanal nicht lesen: %s"
 
-#: src/media_object.cpp:876
+#: src/media_object.cpp:880
 #, c-format
 msgid "%s stream %d: Cannot open %s: %s"
 msgstr "%s Kanal %d: Kann %s nicht öffnen: %s"
 
-#: src/media_object.cpp:877
+#: src/media_object.cpp:881
 msgid "video codec"
 msgstr "Videocodec"
 
-#: src/media_object.cpp:878
+#: src/media_object.cpp:882
 msgid "audio codec"
 msgstr "Audiocodec"
 
-#: src/media_object.cpp:879
+#: src/media_object.cpp:883
 msgid "subtitle codec"
 msgstr "Untertitelcodec"
 
-#: src/media_object.cpp:880
+#: src/media_object.cpp:884
 msgid "data"
 msgstr "Daten"
 
-#: src/media_object.cpp:881
+#: src/media_object.cpp:885
 msgid "codec not supported"
 msgstr "Codec nicht unterstützt"
 
-#: src/media_object.cpp:891
+#: src/media_object.cpp:895
 #, c-format
 msgid "%s video stream %d: Invalid frame size."
 msgstr "%s Videokanal %d: Ungültige Bildgröße."
 
-#: src/media_object.cpp:935
+#: src/media_object.cpp:939
 #, c-format
 msgid "%s video stream %d: Cannot initialize conversion context."
 msgstr "%s Videokanal %d: Kann Konvertierungskontext nicht initialisieren."
 
-#: src/media_object.cpp:998
+#: src/media_object.cpp:1002
 #, c-format
 msgid "Video stream %d: %s / %s, %g seconds"
 msgstr "Videokanal %d: %s / %s, %g Sekunden"
 
-#: src/media_object.cpp:1002
+#: src/media_object.cpp:1006
 #, c-format
 msgid "Using up to %d threads for decoding."
 msgstr "Benutze bis zu %d Threads zum dekodieren."
 
-#: src/media_object.cpp:1007
+#: src/media_object.cpp:1011
 #, c-format
 msgid "Audio stream %d: %s / %s, %g seconds"
 msgstr "Audiokanal %d: %s / %s, %g Sekunden"
 
-#: src/media_object.cpp:1014
+#: src/media_object.cpp:1018
 #, c-format
 msgid "Subtitle stream %d: %s / %s, %g seconds"
 msgstr "Untertitelkanal %d: %s / %s, %g Sekunden"
 
-#: src/media_object.cpp:1021
+#: src/media_object.cpp:1025
 msgid "No usable streams."
 msgstr "Keine nutzbaren Kanäle."
 
-#: src/media_object.cpp:1302 src/media_object.cpp:1332
-#: src/media_object.cpp:1362
+#: src/media_object.cpp:1306 src/media_object.cpp:1336
+#: src/media_object.cpp:1366
 #, c-format
 msgid "%s: Cannot duplicate packet."
 msgstr "%s: Kann Paket nicht duplizieren."
 
-#: src/media_object.cpp:1456
+#: src/media_object.cpp:1460
 #, fuzzy, c-format
 msgid "%s video stream %d: Dropping %dx%d frame"
 msgstr "%s Videokanal %d: Ungültige Bildgröße."
 
-#: src/media_object.cpp:1919
+#: src/media_object.cpp:1923
 #, c-format
 msgid "%s: Seeking failed."
 msgstr "%s: Positionsänderung fehlgeschlagen."
 
-#: src/player.cpp:434
+#: src/player.cpp:437
 #, fuzzy, c-format
 msgid "Video: delay %g seconds/%g frames; dropping next frame."
 msgstr "Video: %g Sekunden zu spät; überspringe nächstes Bild."
 
-#: src/player.cpp:450
+#: src/player.cpp:453
 #, c-format
 msgid "FPS: %.2f"
 msgstr "FPS: %.2f"
 
-#: src/player_equalizer.cpp:116
+#: src/player_equalizer.cpp:117
 msgid "Reading input frame failed."
 msgstr "Lesen des Eingabebildes fehlgeschlagen."
 
-#: src/player_equalizer.cpp:165 src/video_output_qt.cpp:590
-#: src/video_output_qt.cpp:597
+#: src/player_equalizer.cpp:166 src/video_output_qt.cpp:613
+#: src/video_output_qt.cpp:620
 msgid "Waiting for subtitle renderer initialization..."
 msgstr "Warte auf die Initialisierung der Untertitelanzeige..."
 
-#: src/player_equalizer.cpp:250
+#: src/player_equalizer.cpp:251
 msgid "Init data mapping failed."
 msgstr "Zuordnung von InitData fehlgeschlagen."
 
-#: src/player_equalizer.cpp:251
+#: src/player_equalizer.cpp:252
 msgid "Frame data mapping failed."
 msgstr "Zuordnung von FrameData fehlgeschlagen."
 
-#: src/player_equalizer.cpp:252
+#: src/player_equalizer.cpp:253
 msgid "Video player initialization failed."
 msgstr "Videoplayer-Initialisierung fehlgeschlagen."
 
-#: src/player_equalizer.cpp:253
+#: src/player_equalizer.cpp:254
 msgid "Need at least OpenGL 2.1."
 msgstr "Benötige mindestens OpenGL 2.1."
 
-#: src/player_equalizer.cpp:430
+#: src/player_equalizer.cpp:431
 msgid "No canvas in Equalizer configuration."
 msgstr "Kein canvas in Equalizer Konfiguration."
 
-#: src/player_equalizer.cpp:437
+#: src/player_equalizer.cpp:438
 #, fuzzy, c-format
 msgid "Equalizer canvas: %gx%g, aspect ratio %g:1"
 msgstr "%gx%g, Seitenverhältnis %g:1"
 
-#: src/player_equalizer.cpp:922 src/video_output_qt.cpp:560
+#: src/player_equalizer.cpp:926 src/video_output_qt.cpp:583
 msgid ""
 "This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
 "objects."
@@ -1812,15 +1928,15 @@
 "Diese OpenGL Implementierung unterstützt nicht OpenGL 2.1 und "
 "Framebufferobjekte."
 
-#: src/player_equalizer.cpp:1105
+#: src/player_equalizer.cpp:1107
 msgid "Equalizer initialization failed."
 msgstr "Equalizer-Initialisierung fehlgeschlagen."
 
-#: src/player_equalizer.cpp:1113
+#: src/player_equalizer.cpp:1115
 msgid "Cannot get equalizer configuration."
 msgstr "Kann Equalizer Konfiguration nicht bekommen."
 
-#: src/player_equalizer.cpp:1127
+#: src/player_equalizer.cpp:1132
 msgid "Equalizer configuration initialization failed."
 msgstr "Kann Equalizer Konfiguration nicht initialisieren."
 
@@ -1832,83 +1948,88 @@
 msgid "Cannot initialize LibASS renderer."
 msgstr "Kann LibASS-Renderer nicht initialisieren."
 
-#: src/subtitle_renderer.cpp:398
+#: src/subtitle_renderer.cpp:404
 msgid "Cannot initialize LibASS track."
 msgstr "Kann LibASS-Spur nicht initialisieren."
 
-#: src/subtitle_renderer.cpp:409
+#: src/subtitle_renderer.cpp:415
 #, c-format
 msgid "Subtitle character set conversion failed: %s"
 msgstr "Untertitel-Zeichensatzkonvertierung fehlgeschlagen: %s"
 
-#: src/video_output.cpp:145
+#: src/video_output.cpp:347
 #, c-format
 msgid "OpenGL error 0x%04X."
 msgstr "OpenGL Fehler 0x%04X."
 
-#: src/video_output.cpp:203
+#: src/video_output.cpp:359
+#, fuzzy, c-format
+msgid "OpenGL Framebuffer status error 0x%04X."
+msgstr "OpenGL Fehler 0x%04X."
+
+#: src/video_output.cpp:407
 #, c-format
 msgid "OpenGL %s '%s': compiler warning:"
 msgstr "OpenGL %s '%s': Compilerwarnung:"
 
-#: src/video_output.cpp:204 src/video_output.cpp:209
+#: src/video_output.cpp:408 src/video_output.cpp:413
 msgid "vertex shader"
 msgstr "Vertexshader"
 
-#: src/video_output.cpp:204 src/video_output.cpp:209
+#: src/video_output.cpp:408 src/video_output.cpp:413
 msgid "fragment shader"
 msgstr "Fragmentshader"
 
-#: src/video_output.cpp:208
+#: src/video_output.cpp:412
 #, c-format
 msgid "OpenGL %s '%s': compilation failed."
 msgstr "OpenGL %s '%s': Compilieren fehlgeschlagen."
 
-#: src/video_output.cpp:211 src/video_output.cpp:288
+#: src/video_output.cpp:415 src/video_output.cpp:492
 msgid "unknown error"
 msgstr "unbekannter Fehler"
 
-#: src/video_output.cpp:284
+#: src/video_output.cpp:488
 #, c-format
 msgid "OpenGL program '%s': linker warning:"
 msgstr "OpenGL Programm '%s': Linkerwarnung:"
 
-#: src/video_output.cpp:287
+#: src/video_output.cpp:491
 #, c-format
 msgid "OpenGL program '%s': linking failed."
 msgstr "OpenGL Programm '%s': Linken fehlgeschlagen."
 
-#: src/video_output.cpp:563 src/video_output.cpp:675
+#: src/video_output.cpp:1494 src/video_output.cpp:1635
 msgid "Cannot create a PBO buffer."
 msgstr "Kann keinen PBO Puffer erzeugen."
 
-#: src/video_output_qt.cpp:555
+#: src/video_output_qt.cpp:578
 #, c-format
 msgid "Cannot initialize GLEW: %s"
 msgstr "Kann GLEW nicht initialisieren: %s"
 
-#: src/video_output_qt.cpp:588
+#: src/video_output_qt.cpp:611
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: src/video_output_qt.cpp:643
+#: src/video_output_qt.cpp:671
 #, fuzzy
 msgid "Cannot get valid OpenGL context."
 msgstr "Kann OpenGL Kontextformat nicht setzen."
 
-#: src/video_output_qt.cpp:654
+#: src/video_output_qt.cpp:682
 msgid "The display does not support OpenGL stereo mode."
 msgstr "Dieses Gerät unterstützt kein OpenGL Stereo."
 
-#: src/video_output_qt.cpp:659
+#: src/video_output_qt.cpp:687
 msgid "Cannot set OpenGL context format."
 msgstr "Kann OpenGL Kontextformat nicht setzen."
 
-#: src/video_output_qt.cpp:752
+#: src/video_output_qt.cpp:780
 msgid "Cannot suspend screensaver."
 msgstr "Kann Bildschirmschoner nicht deaktivieren."
 
-#: src/video_output_qt.cpp:767
+#: src/video_output_qt.cpp:795
 msgid "Cannot resume screensaver."
 msgstr "Kann Bildschirmschoner nicht reaktivieren."

bino-1.3.2.tar.xz/po/fr.gmo -> bino-1.3.3.tar.xz/po/fr.gmo Changed

bino-1.3.2.tar.xz/po/fr.po -> bino-1.3.3.tar.xz/po/fr.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-03-16 19:49+0100\n"
+"POT-Creation-Date: 2012-05-01 15:05+0200\n"
 "PO-Revision-Date: 2011-08-28 17:34+0200\n"
 "Last-Translator: Frédéric Devernay <>\n"
 "Language-Team: French\n"
@@ -91,13 +91,13 @@
 msgid "Too many arguments."
 msgstr "Trop d'arguments."
 
-#: src/base/str.cpp:236
+#: src/base/str.cpp:267
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Impossible de convertir la chaîne de caractères en %s."
 
-#: src/base/str.cpp:455 src/base/str.cpp:473 src/base/str.cpp:483
-#: src/base/str.cpp:494 src/base/str.cpp:499
+#: 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 "Impossible de convertir %s en %s."
@@ -124,8 +124,8 @@
 msgstr "Aucun périphérique OpenAL disponible."
 
 #: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
-#: src/media_data.cpp:1067 src/media_data.cpp:1090 src/media_data.cpp:1128
-#: src/media_data.cpp:1133
+#: src/media_data.cpp:1183 src/media_data.cpp:1206 src/media_data.cpp:1244
+#: src/media_data.cpp:1249
 msgid "unknown"
 msgstr "inconnu"
 
@@ -191,243 +191,255 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Impossible de vider la queue de tampons de la source OpenAL."
 
-#: src/dispatch.cpp:156
+#: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
+#: src/main.cpp:361 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
+#, fuzzy, c-format
+msgid "%s: invalid command '%s'"
+msgstr "Commande LIRC '%s' invalide."
+
+#: src/dispatch.cpp:166
 msgid "Cannot connect to X server."
 msgstr "Impossible de se connecter au serveur X."
 
-#: src/dispatch.cpp:171
+#: src/dispatch.cpp:182
 msgid "No video to play."
 msgstr "Aucune vidéo à jouer."
 
-#: src/dispatch.cpp:411 src/player_equalizer.cpp:84
+#: src/dispatch.cpp:437 src/player_equalizer.cpp:85
 msgid "No video streams found."
 msgstr "Aucun flux vidéo trouvé."
 
-#: src/dispatch.cpp:428
+#: src/dispatch.cpp:454
 msgid "Cannot set requested stereo layout: incompatible media."
 msgstr "Impossible de choisir le mode stéréo sélectionné : média incompatible."
 
-#: src/dispatch.cpp:443
+#: src/dispatch.cpp:469
 #, c-format
 msgid "Video stream %d not found."
 msgstr "Flux vidéo %d non trouvé."
 
-#: src/dispatch.cpp:449
+#: src/dispatch.cpp:475
 #, c-format
 msgid "Audio stream %d not found."
 msgstr "Flux audio %d non trouvé."
 
-#: src/dispatch.cpp:457
+#: src/dispatch.cpp:483
 #, c-format
 msgid "Subtitle stream %d not found."
 msgstr "Flux de sous-titres %d non trouvé."
 
-#: src/dispatch.cpp:529 src/main.cpp:736
+#: src/dispatch.cpp:555 src/main.cpp:748
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Cette version de Bino a été compilée sans le support Equalizer."
 
-#: src/gui.cpp:101
+#: src/gui.cpp:107
 msgid "Video:"
 msgstr "Vidéo :"
 
-#: src/gui.cpp:102
+#: src/gui.cpp:108
 msgid "Select the video stream."
 msgstr "Choisir le flux vidéo."
 
-#: src/gui.cpp:108
+#: src/gui.cpp:114
 msgid "Audio:"
 msgstr "Audio :"
 
-#: src/gui.cpp:109
+#: src/gui.cpp:115
 msgid "Select the audio stream."
 msgstr "Choisir le flux audio."
 
-#: src/gui.cpp:115
+#: src/gui.cpp:121
 msgid "Subtitle:"
 msgstr "Sous-titres :"
 
-#: src/gui.cpp:116
+#: src/gui.cpp:122
 msgid "Select the subtitle stream."
 msgstr "Choisir le flux de sous-titres."
 
-#: src/gui.cpp:127 src/media_input.cpp:277
+#: src/gui.cpp:133 src/media_input.cpp:276
 msgid "Input:"
 msgstr "Entrée :"
 
-#: src/gui.cpp:128
+#: src/gui.cpp:134
 msgid "Set the 3D layout of the video stream."
 msgstr "Choisir la disposition 3D du flux vidéo"
 
-#: src/gui.cpp:132
+#: src/gui.cpp:138
 msgid "2D"
 msgstr "2D"
 
-#: src/gui.cpp:133
+#: src/gui.cpp:139
 msgid "Separate streams, left first"
 msgstr "Flux séparés, gauche d'abord"
 
-#: src/gui.cpp:134
+#: src/gui.cpp:140
 msgid "Separate streams, right first"
 msgstr "Flux séparés, droit d'abord"
 
-#: src/gui.cpp:135
+#: src/gui.cpp:141
 #, fuzzy
 msgid "Alternating, left first"
 msgstr "Flux séparés, gauche d'abord"
 
-#: src/gui.cpp:136
+#: src/gui.cpp:142
 #, fuzzy
 msgid "Alternating, right first"
 msgstr "Flux séparés, droit d'abord"
 
-#: src/gui.cpp:137 src/gui.cpp:161
+#: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2095 src/gui.cpp:2124
 msgid "Top/bottom"
 msgstr "Haut/bas"
 
-#: src/gui.cpp:138 src/gui.cpp:162
+#: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2096 src/gui.cpp:2125
 msgid "Top/bottom, half height"
 msgstr "Haut/bas, demi-hauteur"
 
-#: src/gui.cpp:139
+#: src/gui.cpp:145
 msgid "Bottom/top"
 msgstr "Bas/haut"
 
-#: src/gui.cpp:140
+#: src/gui.cpp:146
 msgid "Bottom/top, half height"
 msgstr "Bas/haut, demi-hauteur"
 
-#: src/gui.cpp:141 src/gui.cpp:163
+#: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2097 src/gui.cpp:2126
 msgid "Left/right"
 msgstr "gauche/droite"
 
-#: src/gui.cpp:142 src/gui.cpp:164
+#: src/gui.cpp:148 src/gui.cpp:170 src/gui.cpp:2098 src/gui.cpp:2127
 msgid "Left/right, half width"
 msgstr "Gauche/droite, demi-largeur"
 
-#: src/gui.cpp:143
+#: src/gui.cpp:149
 msgid "Right/left"
 msgstr "Droite/gauche"
 
-#: src/gui.cpp:144
+#: src/gui.cpp:150
 msgid "Right/left, half width"
 msgstr "Droite/gauche, demi-largeur"
 
-#: src/gui.cpp:145 src/gui.cpp:165
+#: src/gui.cpp:151 src/gui.cpp:171 src/gui.cpp:2099 src/gui.cpp:2128
 msgid "Even/odd rows"
 msgstr "Lignes paires/impaires"
 
-#: src/gui.cpp:146
+#: src/gui.cpp:152
 msgid "Odd/even rows"
 msgstr "Lignes impaires/paires"
 
-#: src/gui.cpp:152
+#: src/gui.cpp:158
 msgid "Output:"
 msgstr "Sortie :"
 
-#: src/gui.cpp:153
+#: src/gui.cpp:159
 msgid "Set the 3D output type for your display."
 msgstr "Choisir le type de sortie 3D pour votre affichage."
 
-#: src/gui.cpp:157
+#: src/gui.cpp:163 src/gui.cpp:2093 src/gui.cpp:2122
 msgid "Left view"
 msgstr "Vue gauche"
 
-#: src/gui.cpp:158
+#: src/gui.cpp:164 src/gui.cpp:2094 src/gui.cpp:2123
 msgid "Right view"
 msgstr "Vue droite"
 
-#: src/gui.cpp:159
+#: src/gui.cpp:165
 msgid "OpenGL stereo"
 msgstr "Stéréo OpenGL"
 
-#: src/gui.cpp:160
+#: src/gui.cpp:166
 msgid "Left/right view alternating"
 msgstr ""
 
-#: src/gui.cpp:166
+#: src/gui.cpp:172 src/gui.cpp:2100 src/gui.cpp:2129
 msgid "Even/odd columns"
 msgstr "Colonnes paires/impaires"
 
-#: src/gui.cpp:167
+#: src/gui.cpp:173 src/gui.cpp:2101 src/gui.cpp:2130
 msgid "Checkerboard pattern"
 msgstr "Damier"
 
-#: src/gui.cpp:168
+#: src/gui.cpp:174
 msgid "HDMI frame packing mode"
 msgstr "Mode HDMI frame packing"
 
-#: src/gui.cpp:169
+#: src/gui.cpp:175 src/gui.cpp:2102 src/gui.cpp:2131
 msgid "Red/cyan glasses, monochrome method"
 msgstr "Lunettes rouge/cyan, monochrome"
 
-#: src/gui.cpp:170
+#: src/gui.cpp:176 src/gui.cpp:2103 src/gui.cpp:2132
 msgid "Red/cyan glasses, half-color method"
 msgstr "Lunettes rouge/cyan, demi-couleur"
 
-#: src/gui.cpp:171
+#: src/gui.cpp:177 src/gui.cpp:2104 src/gui.cpp:2133
 msgid "Red/cyan glasses, full-color method"
 msgstr "Lunettes rouge/cyan, pleine couleur"
 
-#: src/gui.cpp:172
+#: src/gui.cpp:178 src/gui.cpp:2105 src/gui.cpp:2134
 msgid "Red/cyan glasses, high-quality Dubois method"
 msgstr "Lunettes rouge/cyan, méthode Dubois"
 
-#: src/gui.cpp:173
+#: src/gui.cpp:179 src/gui.cpp:2106 src/gui.cpp:2135
 msgid "Green/magenta glasses, monochrome method"
 msgstr "Lunettes vert/magenta, monochrome"
 
-#: src/gui.cpp:174
+#: src/gui.cpp:180 src/gui.cpp:2107 src/gui.cpp:2136
 msgid "Green/magenta glasses, half-color method"
 msgstr "Lunettes vert/magenta, demi-couleur"
 
-#: src/gui.cpp:175
+#: src/gui.cpp:181 src/gui.cpp:2108 src/gui.cpp:2137
 msgid "Green/magenta glasses, full-color method"
 msgstr "Lunettes vert/magenta, pleine couleur"
 
-#: src/gui.cpp:176
+#: src/gui.cpp:182 src/gui.cpp:2109 src/gui.cpp:2138
 msgid "Green/magenta glasses, high-quality Dubois method"
 msgstr "Lunettes vert/magenta, méthode Dubois"
 
-#: src/gui.cpp:177
+#: src/gui.cpp:183 src/gui.cpp:2110 src/gui.cpp:2139
 msgid "Amber/blue glasses, monochrome method"
 msgstr "Lunettes Ambre/bleu, monochrome"
 
-#: src/gui.cpp:178
+#: src/gui.cpp:184 src/gui.cpp:2111 src/gui.cpp:2140
 msgid "Amber/blue glasses, half-color method"
 msgstr "Lunettes Ambre/bleu, demi-couleur"
 
-#: src/gui.cpp:179
+#: src/gui.cpp:185 src/gui.cpp:2112 src/gui.cpp:2141
 msgid "Amber/blue glasses, full-color method"
 msgstr "Lunettes Ambre/bleu, pleine couleur"
 
-#: src/gui.cpp:180
+#: src/gui.cpp:186 src/gui.cpp:2113 src/gui.cpp:2142
 msgid "Amber/blue glasses, high-quality Dubois method"
 msgstr "Lunettes Ambre/bleu, méthode Dubois"
 
-#: src/gui.cpp:181
+#: src/gui.cpp:187 src/gui.cpp:2114 src/gui.cpp:2143
 msgid "Red/green glasses, monochrome method"
 msgstr "Lunettes rouge/vert, monochrome"
 
-#: src/gui.cpp:182
+#: src/gui.cpp:188 src/gui.cpp:2115 src/gui.cpp:2144
 msgid "Red/blue glasses, monochrome method"
 msgstr "Lunettes rouge/bleu, monochrome"
 
-#: src/gui.cpp:186
+#: src/gui.cpp:192
 msgid "Swap left/right"
 msgstr "Echanger gauche/droite"
 
-#: src/gui.cpp:187
+#: src/gui.cpp:193
 msgid ""
 "Swap the left and right view. Use this if the 3D effect seems wrong."
 msgstr ""
 "Echanger les vues droite et gauche. À utiliser si l'effet 3D parait "
 "étrange."
 
-#: src/gui.cpp:467
+#: src/gui.cpp:471 src/gui.cpp:1676
 msgid "Off"
 msgstr "Eteint"
 
-#: src/gui.cpp:694
+#: src/gui.cpp:702
 msgid ""
 "This slider shows the progress during video playback, and can be used to "
 "seek in the video."
@@ -435,36 +447,36 @@
 "Ce curseur montre la progression de la lecture vidéo, et peut être "
 "utiliser pour naviguer dans la vidéo"
 
-#: src/gui.cpp:701
+#: src/gui.cpp:709
 msgid "Elapsed / total time."
 msgstr "Temps écoulé/total."
 
-#: src/gui.cpp:708
+#: src/gui.cpp:716
 #, fuzzy
 msgid "Toggle audio mute."
 msgstr "Basculer le mode lecture en boucle."
 
-#: src/gui.cpp:713
+#: src/gui.cpp:721
 msgid "Adjust audio volume."
 msgstr ""
 
-#: src/gui.cpp:725
+#: src/gui.cpp:733
 msgid "Play."
 msgstr "Lecture."
 
-#: src/gui.cpp:729
+#: src/gui.cpp:737
 msgid "Pause."
 msgstr "Pause."
 
-#: src/gui.cpp:733
+#: src/gui.cpp:741
 msgid "Stop."
 msgstr "Stop."
 
-#: src/gui.cpp:738
+#: src/gui.cpp:746
 msgid "Toggle loop mode."
 msgstr "Basculer le mode lecture en boucle."
 
-#: src/gui.cpp:745
+#: src/gui.cpp:753
 msgid ""
 "Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
 "f key."
@@ -472,152 +484,160 @@
 "Passer en mode plein écran. Vous pouvez quitter le mode plein écran avec "
 "la touche f ou ESC."
 
-#: src/gui.cpp:751
+#: src/gui.cpp:759
 msgid "Center the video area on your screen."
 msgstr "Centrer la vidéo sur l'écran."
 
-#: src/gui.cpp:758
+#: src/gui.cpp:766
 msgid "Seek backward 10 minutes."
 msgstr "Aller 10 minutes en arrière."
 
-#: src/gui.cpp:763
+#: src/gui.cpp:771
 msgid "Seek backward 1 minute."
 msgstr "Aller 1 minute en arrière."
 
-#: src/gui.cpp:769
+#: src/gui.cpp:777
 msgid "Seek backward 10 seconds."
 msgstr "Aller 10 secondes en arrière."
 
-#: src/gui.cpp:775
+#: src/gui.cpp:783
 msgid "Seek forward 10 seconds."
 msgstr "Aller 10 secondes en avant."
 
-#: src/gui.cpp:780
+#: src/gui.cpp:788
 msgid "Seek forward 1 minute."
 msgstr "Aller 1 minute en avant."
 
-#: src/gui.cpp:786
+#: src/gui.cpp:794
 msgid "Seek forward 10 minutes."
 msgstr "Aller 10 minutes en avant."
 
-#: src/gui.cpp:1047
+#: src/gui.cpp:1055
 msgid "Fullscreen/Multiscreen Settings"
 msgstr "Réglages plein écran/multi-écrans"
 
-#: src/gui.cpp:1049
+#: src/gui.cpp:1057
 msgid "Configure fullscreen mode:"
 msgstr "Configuration du mode plein écran :"
 
-#: src/gui.cpp:1050
+#: src/gui.cpp:1058
 msgid "Select the screens to use in fullscreen mode."
 msgstr "Choisir les écrans à utiliser pour le mode plein écran."
 
-#: src/gui.cpp:1052
+#: src/gui.cpp:1060
 msgid "Single screen:"
 msgstr "Écran unique :"
 
-#: src/gui.cpp:1053
+#: src/gui.cpp:1061
 msgid "Use a single screen for fullscreen mode."
 msgstr "Utiliser un seul écran pour le mode plein écran."
 
-#: src/gui.cpp:1056
+#: src/gui.cpp:1064
 msgid "Primary screen"
 msgstr "Écran primaire"
 
-#: src/gui.cpp:1059 src/gui.cpp:1070 src/gui.cpp:1071
+#: src/gui.cpp:1067 src/gui.cpp:1078 src/gui.cpp:1079
 #, c-format
 msgid "Screen %d"
 msgstr "Écran %d"
 
-#: src/gui.cpp:1062
+#: src/gui.cpp:1070
 msgid "Dual screen:"
 msgstr "Double écran :"
 
-#: src/gui.cpp:1063
+#: src/gui.cpp:1071
 msgid "Use two screens for fullscreen mode."
 msgstr "Utiliser deux écrans pour le mode plein écran."
 
-#: src/gui.cpp:1075
+#: src/gui.cpp:1083
 msgid "Multi screen:"
 msgstr "Plein écran :"
 
-#: src/gui.cpp:1076
+#: src/gui.cpp:1084
 msgid "Use multiple screens for fullscreen mode."
 msgstr "Utiliser plusieurs écrans pour le mode plein écran"
 
-#: src/gui.cpp:1078
+#: src/gui.cpp:1086
 msgid "Comma-separated list of screens to use for fullscreen mode."
 msgstr ""
 "Liste d'écrans à utiliser pour le mode plein écran, séparés par des "
 "virgules."
 
-#: src/gui.cpp:1081
+#: src/gui.cpp:1089
 msgid "When in fullscreen mode,"
 msgstr "En mode plein écran,"
 
-#: src/gui.cpp:1082
+#: src/gui.cpp:1090
 msgid "Set special left/right view handling for fullscreen mode."
 msgstr ""
 "Réglages spéciaux pour les vues droite et gauche en plein écran."
 
-#: src/gui.cpp:1084
+#: src/gui.cpp:1092
 msgid "flip left view vertically."
 msgstr "flip vertical de la vue gauche"
 
-#: src/gui.cpp:1086
+#: src/gui.cpp:1094
 msgid "flop left view horizontally."
 msgstr "flip horizontal de la vue gauche"
 
-#: src/gui.cpp:1088
+#: src/gui.cpp:1096
 msgid "flip right view vertically."
 msgstr "flip vertical de la vue droite"
 
-#: src/gui.cpp:1090
+#: src/gui.cpp:1098
 msgid "flop right view horizontally."
 msgstr "flop horizontal de la vue droite"
 
-#: src/gui.cpp:1093
+#: src/gui.cpp:1101
+msgid "use DLP(R) 3-D Ready Sync"
+msgstr ""
+
+#: src/gui.cpp:1102
+msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
+msgstr ""
+
+#: src/gui.cpp:1104
 #, fuzzy
 msgid "inhibit the screensaver"
 msgstr "Impossible de rétablir l'économiseur d'écran."
 
-#: src/gui.cpp:1094
+#: src/gui.cpp:1105
 #, fuzzy
 msgid "Inhibit the screensaver during fullscreen playback."
 msgstr "Choisir les écrans à utiliser pour le mode plein écran."
 
-#: src/gui.cpp:1096 src/gui.cpp:1258 src/gui.cpp:1393 src/gui.cpp:1463
-#: src/gui.cpp:1541 src/gui.cpp:1652 src/gui.cpp:1928 src/gui.cpp:2108
-#: src/gui.cpp:2778 src/gui.cpp:2825 src/gui.cpp:3114
+#: src/gui.cpp:1107 src/gui.cpp:1273 src/gui.cpp:1408 src/gui.cpp:1478
+#: src/gui.cpp:1556 src/gui.cpp:1680 src/gui.cpp:1948 src/gui.cpp:2147
+#: src/gui.cpp:2625 src/gui.cpp:3324 src/gui.cpp:3371 src/gui.cpp:3677
 msgid "OK"
 msgstr "OK"
 
-#: src/gui.cpp:1211
+#: src/gui.cpp:1226
 msgid "Display Color Adjustments"
 msgstr "Réglages des couleurs d'affichage"
 
-#: src/gui.cpp:1213
+#: src/gui.cpp:1228
 msgid "Contrast:"
 msgstr "Contraste :"
 
-#: src/gui.cpp:1224
+#: src/gui.cpp:1239
 msgid "Brightness:"
 msgstr "Luminosité :"
 
-#: src/gui.cpp:1235
+#: src/gui.cpp:1250
 msgid "Hue:"
 msgstr "Teinte :"
 
-#: src/gui.cpp:1246
+#: src/gui.cpp:1261
 msgid "Saturation:"
 msgstr "Saturation :"
 
-#: src/gui.cpp:1364
+#: src/gui.cpp:1379
 msgid "Display Crosstalk Calibration"
 msgstr "Calibrage du crosstalk d'affichage"
 
 #. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/gui.cpp:1367
+#: src/gui.cpp:1382
 msgid ""
 "Please read the manual to find out how to measure the crosstalk "
 "levels of your display."
@@ -625,141 +645,158 @@
 "Le manuel explique comment mesurer le niveau de crosstalk de votre "
 "affichage."
 
-#: src/gui.cpp:1371
+#: src/gui.cpp:1386
 msgid "Red:"
 msgstr "Rouge :"
 
-#: src/gui.cpp:1378
+#: src/gui.cpp:1393
 msgid "Green:"
 msgstr "Vert :"
 
-#: src/gui.cpp:1385
+#: src/gui.cpp:1400
 msgid "Blue:"
 msgstr "Bleu :"
 
-#: src/gui.cpp:1441
+#: src/gui.cpp:1456
 msgid "Zoom for wide videos"
 msgstr ""
 
-#: src/gui.cpp:1444
+#: src/gui.cpp:1459
 msgid ""
 "Set zoom level for videos that are wider than the screen: 0: Show "
 "full video width. 1: Use full screen height.</p"
 msgstr ""
 
-#: src/gui.cpp:1448
+#: src/gui.cpp:1463
 msgid "Zoom:"
 msgstr ""
 
-#: src/gui.cpp:1449
+#: src/gui.cpp:1464
 msgid "Set the zoom level for videos that are wider than the screen"
 msgstr ""
 
-#: src/gui.cpp:1507
+#: src/gui.cpp:1522
 #, fuzzy
 msgid "Audio Settings"
 msgstr "Réglages des sous-titres"
 
-#: src/gui.cpp:1509
+#: src/gui.cpp:1524
 #, fuzzy
 msgid "Audio device:"
 msgstr "codec audio"
 
-#: src/gui.cpp:1510
+#: src/gui.cpp:1525
 msgid ""
 "Select the audio device. This will take effect for the next started "
 "video."
 msgstr ""
 
-#: src/gui.cpp:1514 src/gui.cpp:2063
+#: src/gui.cpp:1529 src/gui.cpp:2563
 msgid "Default"
 msgstr "Par défaut"
 
-#: src/gui.cpp:1531
+#: src/gui.cpp:1546
 msgid "Audio delay (ms):"
 msgstr ""
 
-#: src/gui.cpp:1532
+#: src/gui.cpp:1547
 msgid ""
 "Set an audio delay, in milliseconds. This is useful if audio and video "
 "are not in sync."
 msgstr ""
 
-#: src/gui.cpp:1589
+#: src/gui.cpp:1604
 msgid "Subtitle Settings"
 msgstr "Réglages des sous-titres"
 
-#: src/gui.cpp:1591
-msgid "These settings apply to soft subtitles, but not to bitmaps."
+#: src/gui.cpp:1607
+#, fuzzy
+msgid ""
+"These settings apply only to soft subtitles, not to bitmaps. Some "
+"changes require a restart of the video to take effect."
 msgstr ""
 "Ces réglages s'appliquent aux sous-titres textuels, pas aux bitmaps."
 
-#: src/gui.cpp:1593
+#: src/gui.cpp:1610
 msgid "Encoding:"
 msgstr "Encodage :"
 
-#: src/gui.cpp:1594
+#: src/gui.cpp:1611
 msgid "Set the subtitle character set encoding."
 msgstr "Choisir l'encodage du jeux de caractères des sous-titres."
 
-#: src/gui.cpp:1609
+#: src/gui.cpp:1626
 msgid "Override font:"
 msgstr "Police de caractères :"
 
-#: src/gui.cpp:1610
+#: src/gui.cpp:1627
 msgid "Override the subtitle font family."
 msgstr "Force la police de caractères utilisée pour les sous-titres."
 
-#: src/gui.cpp:1619
+#: src/gui.cpp:1636
 msgid "Override font size:"
 msgstr "Taille de police :"
 
-#: src/gui.cpp:1620
+#: src/gui.cpp:1637
 msgid "Override the subtitle font size."
 msgstr "Force la taille de la police des sous-titres."
 
-#: src/gui.cpp:1630
+#: src/gui.cpp:1647
 msgid "Override scale factor:"
 msgstr "Facteur d'échelle :"
 
-#: src/gui.cpp:1631
+#: src/gui.cpp:1648
 msgid "Override the subtitle scale factor."
 msgstr "Force le facteur d'échelle des sous-titres."
 
-#: src/gui.cpp:1642
+#: src/gui.cpp:1659
 msgid "Override color:"
 msgstr "Couleur :"
 
-#: src/gui.cpp:1643
+#: src/gui.cpp:1660
 msgid "Override the subtitle color."
 msgstr "Force la couleur des sous-titres."
 
-#: src/gui.cpp:1866
+#: src/gui.cpp:1669
+#, fuzzy
+msgid "Override shadow:"
+msgstr "Police de caractères :"
+
+#: src/gui.cpp:1670
+#, fuzzy
+msgid "Override the subtitle shadow."
+msgstr "Force la couleur des sous-titres."
+
+#: src/gui.cpp:1675
+msgid "On"
+msgstr ""
+
+#: src/gui.cpp:1886
 #, fuzzy
 msgid "Video Settings"
 msgstr "Réglages des sous-titres"
 
-#: src/gui.cpp:1868
+#: src/gui.cpp:1888
 #, fuzzy
 msgid "Crop to aspect ratio:"
 msgstr "%gx%g, facteur d'aspect %g:1"
 
-#: src/gui.cpp:1869
+#: src/gui.cpp:1889
 #, fuzzy
 msgid ""
 "Set the real aspect ratio of the video, so that borders can be cropped.</"
 "p>"
 msgstr "Choisir la disposition 3D du flux vidéo"
 
-#: src/gui.cpp:1872
+#: src/gui.cpp:1892
 msgid "Do not crop"
 msgstr ""
 
-#: src/gui.cpp:1885
+#: src/gui.cpp:1905
 msgid "Parallax:"
 msgstr "Parallaxe :"
 
-#: src/gui.cpp:1886
+#: src/gui.cpp:1906
 msgid ""
 "Adjust parallax, from -1 to +1. This changes the separation of left and "
 "right view, and thus the perceived distance of the scene."
@@ -767,11 +804,11 @@
 "Ajuster la parallaxe, de -1 à 1. Ceci change la séparation des vues "
 "gauche et droite, et donc la distance perçue de la scène."
 
-#: src/gui.cpp:1899
+#: src/gui.cpp:1919
 msgid "Subtitle parallax:"
 msgstr "Parallaxe des sous-titres :"
 
-#: src/gui.cpp:1900
+#: src/gui.cpp:1920
 msgid ""
 "Adjust subtitle parallax, from -1 to +1. This changes the perceived "
 "distance of the subtitles."
@@ -779,11 +816,11 @@
 "Ajuster la parallaxe des sous-titres, de -1 à 1. Ceci change la distance "
 "perçue des sous-titres."
 
-#: src/gui.cpp:1913
+#: src/gui.cpp:1933
 msgid "Ghostbusting:"
 msgstr "Ghostbusting :"
 
-#: src/gui.cpp:1914
+#: src/gui.cpp:1934
 msgid ""
 "Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
 "the crosstalk levels of your display first. Note that crosstalk ghostbusting "
@@ -793,36 +830,77 @@
 "Vous devez régler le niveau de crosstalk de votre affichage d'abord. Le "
 "ghostbusting ne fonctionne pas avec les lunettes anaglyphes."
 
-#: src/gui.cpp:2059
-msgid "Open device"
+#: src/gui.cpp:2078
+#, fuzzy
+msgid "SDI Output Settings"
+msgstr "Réglages des sous-titres"
+
+#: src/gui.cpp:2080
+msgid "SDI Output Format:"
+msgstr ""
+
+#: src/gui.cpp:2081
+#, fuzzy
+msgid "Select output format used for SDI output."
+msgstr "Choisir le type de sortie 3D pour votre affichage."
+
+#: src/gui.cpp:2089
+msgid "Left stereo mode:"
+msgstr ""
+
+#: src/gui.cpp:2090
+#, fuzzy
+msgid "Select stereo mode used for left SDI output."
+msgstr "Choisir les écrans à utiliser pour le mode plein écran."
+
+#: src/gui.cpp:2118
+msgid "Right stereo mode:"
+msgstr ""
+
+#: src/gui.cpp:2119
+msgid "Select stereo mode used for right SDI output."
+msgstr ""
+
+#: src/gui.cpp:2559
+#, fuzzy
+msgid "Open device(s)"
 msgstr "Ouvrir le périphérique"
 
-#: src/gui.cpp:2062
+#: src/gui.cpp:2562
 msgid "Choose a device type."
 msgstr "Sélectionner un type de périphérique."
 
-#: src/gui.cpp:2064 src/media_object.cpp:801
+#: src/gui.cpp:2564 src/media_object.cpp:801
 msgid "Firewire"
 msgstr "Firewire"
 
-#: src/gui.cpp:2065 src/media_object.cpp:802
+#: src/gui.cpp:2565 src/media_object.cpp:802
 msgid "X11"
 msgstr "X11"
 
-#: src/gui.cpp:2067 src/gui.cpp:2070
+#: src/gui.cpp:2568 src/gui.cpp:2571
 msgid "Choose a device."
 msgstr "Sélectionner un périphérique"
 
-#: src/gui.cpp:2073
+#: src/gui.cpp:2574
 msgid "Set the X11 device string. Refer to the manual for details."
 msgstr ""
 "Identifiant du périphérique X11. Voir le manuel pour les détails."
 
-#: src/gui.cpp:2082
+#: src/gui.cpp:2590
+msgid "First device:"
+msgstr ""
+
+#: src/gui.cpp:2591
+#, fuzzy
+msgid "Second device:"
+msgstr "Ouvrir le périphérique"
+
+#: src/gui.cpp:2595
 msgid "Request frame size"
 msgstr "Résolution demandée"
 
-#: src/gui.cpp:2083
+#: src/gui.cpp:2596
 msgid ""
 "Request a specific frame size from the device, e.g. 640x480. The device "
 "must support this frame size. Some devices require a frame size to be "
@@ -832,11 +910,11 @@
 "périphérique doit supporter cette résolution. Certains périphériques exigent "
 "de sélectionner une résolution."
 
-#: src/gui.cpp:2094
+#: src/gui.cpp:2607
 msgid "Request frame rate"
 msgstr "Taux de rafraichissement demandé"
 
-#: src/gui.cpp:2095
+#: src/gui.cpp:2608
 msgid ""
 "Request a specific frame rate from the device, e.g. 25/1. The device must "
 "support this frame rate. Some devices require a frame rate to be selected.</"
@@ -846,250 +924,268 @@
 "périphérique doit supporter ce taux de rafraichissement. Certains "
 "périphériques exigent de sélectionner un taux de rafraichissement."
 
-#: src/gui.cpp:2106 src/gui.cpp:2824
+#: src/gui.cpp:2619
+#, fuzzy
+msgid "Request MJPEG format"
+msgstr "Taux de rafraichissement demandé"
+
+#: src/gui.cpp:2620
+msgid ""
+"Request MJPEG data from the input device. The device may ignore this "
+"request."
+msgstr ""
+
+#: src/gui.cpp:2623 src/gui.cpp:3370
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/gui.cpp:2377
+#: src/gui.cpp:2918
 msgid "&File"
 msgstr "&Fichier"
 
-#: src/gui.cpp:2378
+#: src/gui.cpp:2919
 #, fuzzy
 msgid "&Open file(s)..."
 msgstr "Ouvrir des fichiers"
 
-#: src/gui.cpp:2383
+#: src/gui.cpp:2924
 #, fuzzy
 msgid "Open &URL(s)..."
 msgstr "Ouvrir l'&URL..."
 
-#: src/gui.cpp:2387
-msgid "Open &device..."
+#: src/gui.cpp:2928
+#, fuzzy
+msgid "Open &device(s)..."
 msgstr "Ouvrir le périphérique..."
 
-#: src/gui.cpp:2402
+#: src/gui.cpp:2943
 msgid "&Clear recent files"
 msgstr ""
 
-#: src/gui.cpp:2410
+#: src/gui.cpp:2951
 msgid "&Quit..."
 msgstr "&Quitter..."
 
-#: src/gui.cpp:2416
+#: src/gui.cpp:2957
 msgid "&Preferences"
 msgstr "&Préférences"
 
-#: src/gui.cpp:2419
+#: src/gui.cpp:2960
 msgid "&Fullscreen Settings..."
 msgstr "Réglages du mode &plein écran..."
 
-#: src/gui.cpp:2422
+#: src/gui.cpp:2963
 msgid "Display &Color Adjustments..."
 msgstr "Réglage des &couleurs de l'affichage..."
 
-#: src/gui.cpp:2425
+#: src/gui.cpp:2966
 msgid "Display Cross&talk Calibration..."
 msgstr "Calibrage du cross&talk de l'affichage..."
 
-#: src/gui.cpp:2429
+#: src/gui.cpp:2970
 msgid "&Zoom for wide videos..."
 msgstr ""
 
-#: src/gui.cpp:2433
+#: src/gui.cpp:2974
 #, fuzzy
 msgid "&Audio Settings..."
 msgstr "Réglage des &sous-titres..."
 
-#: src/gui.cpp:2437
+#: src/gui.cpp:2978
 msgid "&Subtitle Settings..."
 msgstr "Réglage des &sous-titres..."
 
-#: src/gui.cpp:2441
+#: src/gui.cpp:2982
 #, fuzzy
 msgid "Current &Video Settings..."
 msgstr "Réglages de la vidéo stéréoscopique..."
 
-#: src/gui.cpp:2444
+#: src/gui.cpp:2987
+#, fuzzy
+msgid "SDI &Output Settings..."
+msgstr "Réglage des &sous-titres..."
+
+#: src/gui.cpp:2991
 msgid "&Help"
 msgstr "Aide"
 
-#: src/gui.cpp:2445
+#: src/gui.cpp:2992
 msgid "&Manual..."
 msgstr "&Manuel..."
 
-#: src/gui.cpp:2450
+#: src/gui.cpp:2997
 msgid "&Website..."
 msgstr "Site &web..."
 
-#: src/gui.cpp:2454
+#: src/gui.cpp:3001
 msgid "&Keyboard Shortcuts"
 msgstr "Raccourcis clavier"
 
-#: src/gui.cpp:2458
+#: src/gui.cpp:3005
 msgid "&About"
 msgstr "&À propos"
 
-#: src/gui.cpp:2771
+#: src/gui.cpp:3317
 msgid "Tip"
 msgstr ""
 
-#: src/gui.cpp:2774
+#: src/gui.cpp:3320
 msgid ""
 "You can select and open multiple files at once.This is useful for "
 "example if you have extra subtitle files, or if left and right view are "
 "stored in separate files."
 msgstr ""
 
-#: src/gui.cpp:2777
+#: src/gui.cpp:3323
 msgid "Do not show this message again."
 msgstr ""
 
-#: src/gui.cpp:2794
+#: src/gui.cpp:3340
 msgid "Open files"
 msgstr "Ouvrir des fichiers"
 
-#: src/gui.cpp:2818
+#: src/gui.cpp:3364
 #, fuzzy
 msgid "Open URL(s)"
 msgstr "Ouvrir un URL"
 
-#: src/gui.cpp:2819
+#: src/gui.cpp:3365
 msgid "URL(s):"
 msgstr ""
 
-#: src/gui.cpp:2820
+#: src/gui.cpp:3366
 msgid "Enter one or more space separated URLs."
 msgstr ""
 
-#: src/gui.cpp:3005 src/gui.cpp:3013 src/video_output_qt.cpp:234
-#: src/video_output_qt.cpp:643 src/video_output_qt.cpp:664
+#: src/gui.cpp:3568 src/gui.cpp:3576 src/video_output_qt.cpp:241
+#: src/video_output_qt.cpp:477 src/video_output_qt.cpp:659
+#: src/video_output_qt.cpp:671 src/video_output_qt.cpp:692
 msgid "Error"
 msgstr "Erreur"
 
-#: src/gui.cpp:3005
+#: src/gui.cpp:3568
 msgid "Cannot open manual."
 msgstr "Impossible d'ouvrir le manuel."
 
-#: src/gui.cpp:3013
+#: src/gui.cpp:3576
 msgid "Cannot open website."
 msgstr "Impossible d'ouvrir le site web."
 
-#: src/gui.cpp:3021
+#: src/gui.cpp:3584
 msgid "Keyboard Shortcuts"
 msgstr "Raccourcis clavier"
 
-#: src/gui.cpp:3024
+#: src/gui.cpp:3587
 #, fuzzy
 msgid "Keyboard control:"
 msgstr "Raccourcis clavier"
 
-#: src/gui.cpp:3026
+#: src/gui.cpp:3589
 msgid "Stop."
 msgstr ""
 
-#: src/gui.cpp:3027 src/main.cpp:495
+#: src/gui.cpp:3590 src/main.cpp:494
 msgid "Pause / unpause."
 msgstr ""
 
-#: src/gui.cpp:3028 src/main.cpp:496
+#: src/gui.cpp:3591 src/main.cpp:495
 #, fuzzy
 msgid "Toggle fullscreen."
 msgstr "Configuration du mode plein écran :"
 
-#: src/gui.cpp:3029 src/main.cpp:497
+#: src/gui.cpp:3592 src/main.cpp:496
 msgid "Center window."
 msgstr ""
 
-#: src/gui.cpp:3030 src/main.cpp:498
+#: src/gui.cpp:3593 src/main.cpp:497
 #, fuzzy
 msgid "Swap left/right eye."
 msgstr "Echanger gauche/droite"
 
-#: src/gui.cpp:3031 src/main.cpp:499
+#: src/gui.cpp:3594 src/main.cpp:498
 msgid "Cycle through available video streams."
 msgstr ""
 
-#: src/gui.cpp:3032 src/main.cpp:500
+#: src/gui.cpp:3595 src/main.cpp:499
 msgid "Cycle through available audio streams."
 msgstr ""
 
-#: src/gui.cpp:3033 src/main.cpp:501
+#: src/gui.cpp:3596 src/main.cpp:500
 #, fuzzy
 msgid "Cycle through available subtitle streams."
 msgstr "Choisir le flux de sous-titres."
 
-#: src/gui.cpp:3034 src/main.cpp:502
+#: src/gui.cpp:3597 src/main.cpp:501
 msgid "Adjust contrast."
 msgstr ""
 
-#: src/gui.cpp:3035 src/main.cpp:503
+#: src/gui.cpp:3598 src/main.cpp:502
 #, fuzzy
 msgid "Adjust brightness."
 msgstr "Luminosité :"
 
-#: src/gui.cpp:3036 src/main.cpp:504
+#: src/gui.cpp:3599 src/main.cpp:503
 msgid "Adjust hue."
 msgstr ""
 
-#: src/gui.cpp:3037 src/main.cpp:505
+#: src/gui.cpp:3600 src/main.cpp:504
 #, fuzzy
 msgid "Adjust saturation."
 msgstr "Saturation :"
 
-#: src/gui.cpp:3038 src/main.cpp:506
+#: src/gui.cpp:3601 src/main.cpp:505
 #, fuzzy
 msgid "Adjust parallax."
 msgstr "Parallaxe des sous-titres :"
 
-#: src/gui.cpp:3039 src/main.cpp:507
+#: src/gui.cpp:3602 src/main.cpp:506
 #, fuzzy
 msgid "Adjust ghostbusting."
 msgstr "Ghostbusting :"
 
-#: src/gui.cpp:3040 src/main.cpp:508
+#: src/gui.cpp:3603 src/main.cpp:507
 msgid "Adjust zoom for wide videos."
 msgstr ""
 
-#: src/gui.cpp:3041 src/main.cpp:509
+#: src/gui.cpp:3604 src/main.cpp:508
 msgid "Adjust audio volume."
 msgstr ""
 
-#: src/gui.cpp:3042 src/main.cpp:510
+#: src/gui.cpp:3605 src/main.cpp:509
 msgid "Toggle audio mute."
 msgstr ""
 
-#: src/gui.cpp:3043 src/main.cpp:511
+#: src/gui.cpp:3606 src/main.cpp:510
 msgid "Step a single video frame forward."
 msgstr ""
 
-#: src/gui.cpp:3044 src/main.cpp:512
+#: src/gui.cpp:3607 src/main.cpp:511
 msgid "Seek 10 seconds backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3045 src/main.cpp:513
+#: src/gui.cpp:3608 src/main.cpp:512
 msgid "Seek 1 minute backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3046 src/main.cpp:514
+#: src/gui.cpp:3609 src/main.cpp:513
 msgid "Seek 10 minutes backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3047 src/main.cpp:516
+#: src/gui.cpp:3610 src/main.cpp:515
 msgid "Media keys should work as expected."
 msgstr ""
 
-#: src/gui.cpp:3063
+#: src/gui.cpp:3626
 #, c-format
 msgid "About %s"
 msgstr "À propos de %s"
 
-#: src/gui.cpp:3069
+#: src/gui.cpp:3632
 #, c-format
 msgid "The %s 3D video player"
 msgstr "Le lecteur vidéo 3D %s"
 
-#: src/gui.cpp:3074
+#: src/gui.cpp:3637
 #, fuzzy, c-format
 msgid ""
 "%s version %s.Copyright (C) 2012 the Bino developers.This "
@@ -1105,27 +1201,27 @@
 "loi.Voir <a href=\"%s\">%s</a> pour plus d'informations sur ce "
 "logiciel."
 
-#: src/gui.cpp:3086 src/main.cpp:384
+#: src/gui.cpp:3649 src/main.cpp:378
 msgid "Platform:"
 msgstr "Plateforme :"
 
-#: src/gui.cpp:3087 src/main.cpp:386
+#: src/gui.cpp:3650 src/main.cpp:380
 msgid "Libraries used:"
 msgstr "Bibliothèques utilisées :"
 
-#: src/gui.cpp:3109
+#: src/gui.cpp:3672
 msgid "About"
 msgstr "À propos"
 
-#: src/gui.cpp:3110
+#: src/gui.cpp:3673
 msgid "Libraries"
 msgstr "Bibliothèques"
 
-#: src/gui.cpp:3111
+#: src/gui.cpp:3674
 msgid "Team"
 msgstr "Équipe"
 
-#: src/gui.cpp:3112
+#: src/gui.cpp:3675
 msgid "License"
 msgstr "Licence"
 
@@ -1163,23 +1259,17 @@
 msgid "Cannot get command for LIRC code."
 msgstr "Commande non disponible pour le code LIRC."
 
-#: src/main.cpp:367 src/media_object.cpp:821 src/media_object.cpp:1286
-#: src/video_output.cpp:212
-#, c-format
-msgid "%s: %s"
-msgstr "%s : %s"
-
-#: src/main.cpp:379
+#: src/main.cpp:373
 #, c-format
 msgid "%s version %s"
 msgstr "%s version %s"
 
-#: src/main.cpp:380
+#: src/main.cpp:374
 #, fuzzy
 msgid "Copyright (C) 2012 the Bino developers."
 msgstr "Copyright (C) 2011 les développeurs Bino."
 
-#: src/main.cpp:381
+#: src/main.cpp:375
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -1191,470 +1281,496 @@
 
 #. TRANSLATORS: This is the --help text. Please keep the line length limited.
 #. * The --help output should look good with a line width of 80 characters.
-#: src/main.cpp:399
+#: src/main.cpp:393
 msgid "Usage:"
 msgstr ""
 
-#: src/main.cpp:401
+#: src/main.cpp:395
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:402
+#: src/main.cpp:396
 msgid "Print help."
 msgstr ""
 
-#: src/main.cpp:403
+#: src/main.cpp:397
 msgid "Print version."
 msgstr ""
 
-#: src/main.cpp:404
+#: src/main.cpp:398
 msgid "Do not use the GUI, just show a plain window."
 msgstr ""
 
-#: src/main.cpp:405
+#: src/main.cpp:399
 msgid "Append all log messages to the given file."
 msgstr ""
 
-#: src/main.cpp:406
+#: src/main.cpp:400
 msgid "Set log level (debug/info/warning/error/quiet)."
 msgstr ""
 
-#: src/main.cpp:407
+#: src/main.cpp:401
 msgid "Print a list of known audio devices and exit."
 msgstr ""
 
-#: src/main.cpp:408
+#: src/main.cpp:402
 msgid "Use audio device number N (N=0 is the default)."
 msgstr ""
 
-#: src/main.cpp:409
+#: src/main.cpp:403
 msgid "Delay audio by D milliseconds. Default is 0."
 msgstr ""
 
-#: src/main.cpp:410
+#: src/main.cpp:404
 msgid "Set audio volume (0 to 1). Default is 1."
 msgstr ""
 
-#: src/main.cpp:411
+#: src/main.cpp:405
 #, fuzzy
 msgid "Mute audio."
 msgstr "Pas d'audio."
 
-#: src/main.cpp:412
+#: src/main.cpp:406
 msgid "Type of input device: default, firewire, x11."
 msgstr ""
 
-#: src/main.cpp:413
+#: src/main.cpp:407
 #, fuzzy
 msgid "Request frame size WxH from input device."
 msgstr "Résolution demandée"
 
-#: src/main.cpp:414
+#: src/main.cpp:408
 #, fuzzy
 msgid "Request frame rate N/D from input device."
 msgstr "Taux de rafraichissement demandé"
 
-#: src/main.cpp:415
+#: src/main.cpp:409
+msgid "Request device format 'default' or 'mjpeg'."
+msgstr ""
+
+#: src/main.cpp:410
+#, fuzzy
+msgid "Read commands from a file."
+msgstr "Commande LIRC '%s' invalide."
+
+#: src/main.cpp:411
 #, fuzzy
 msgid "Use the given LIRC configuration file."
 msgstr "Impossible de lire le fichier de configuration LIRC %s."
 
-#: src/main.cpp:416
+#: src/main.cpp:412
 msgid "This option can be used more than once."
 msgstr ""
 
-#: src/main.cpp:417
+#: src/main.cpp:413
 msgid "Select video stream (1-n, depending on input)."
 msgstr ""
 
-#: src/main.cpp:418
+#: src/main.cpp:414
 msgid "Select audio stream (1-n, depending on input)."
 msgstr ""
 
-#: src/main.cpp:419
+#: src/main.cpp:415
 #, fuzzy
 msgid "Select subtitle stream (0-n, dep. on input)."
 msgstr "Choisir le flux de sous-titres."
 
-#: src/main.cpp:420
+#: src/main.cpp:416
 msgid "Select input type (default autodetect):"
 msgstr ""
 
-#: src/main.cpp:421
+#: src/main.cpp:417
 #, fuzzy
 msgid "Single view."
 msgstr "Vue droite"
 
-#: src/main.cpp:422
+#: src/main.cpp:418
 #, fuzzy
 msgid "Left/right separate streams, left first."
 msgstr "Flux séparés, gauche d'abord"
 
-#: src/main.cpp:423
+#: src/main.cpp:419
 #, fuzzy
 msgid "Left/right separate streams, right first."
 msgstr "Flux séparés, droit d'abord"
 
-#: src/main.cpp:424
+#: src/main.cpp:420
 #, fuzzy
 msgid "Left/right alternating, left first."
 msgstr "Flux séparés, gauche d'abord"
 
-#: src/main.cpp:425
+#: src/main.cpp:421
 #, fuzzy
 msgid "Left/right alternating, right first."
 msgstr "Flux séparés, droit d'abord"
 
-#: src/main.cpp:426 src/main.cpp:441
+#: src/main.cpp:422 src/main.cpp:437
 msgid "Left top, right bottom."
 msgstr ""
 
-#: src/main.cpp:427 src/main.cpp:442
+#: src/main.cpp:423 src/main.cpp:438
 #, fuzzy
 msgid "Left top, right bottom, half height."
 msgstr "Haut/bas, demi-hauteur"
 
-#: src/main.cpp:428
+#: src/main.cpp:424
 msgid "Left bottom, right top."
 msgstr ""
 
-#: src/main.cpp:429
+#: src/main.cpp:425
 #, fuzzy
 msgid "Left bottom, right top, half height."
 msgstr "Bas/haut, demi-hauteur"
 
-#: src/main.cpp:430 src/main.cpp:443
+#: src/main.cpp:426 src/main.cpp:439
 msgid "Left left, right right."
 msgstr ""
 
-#: src/main.cpp:431 src/main.cpp:444
+#: src/main.cpp:427 src/main.cpp:440
 #, fuzzy
 msgid "Left left, right right, half width."
 msgstr "Gauche/droite, demi-largeur"
 
-#: src/main.cpp:432
+#: src/main.cpp:428
 #, fuzzy
 msgid "Left right, right left."
 msgstr "Gauche/droite, demi-largeur"
 
-#: src/main.cpp:433
+#: src/main.cpp:429
 #, fuzzy
 msgid "Left right, right left, half width."
 msgstr "Gauche/droite, demi-largeur"
 
-#: src/main.cpp:434 src/main.cpp:445
+#: src/main.cpp:430 src/main.cpp:441
 msgid "Left even rows, right odd rows."
 msgstr ""
 
-#: src/main.cpp:435
+#: src/main.cpp:431
 msgid "Left odd rows, right even rows."
 msgstr ""
 
-#: src/main.cpp:436
+#: src/main.cpp:432
 msgid "Select output type:"
 msgstr ""
 
-#: src/main.cpp:437
+#: src/main.cpp:433
 #, fuzzy
 msgid "OpenGL quad-buffered stereo."
 msgstr "Stéréo OpenGL"
 
-#: src/main.cpp:438
+#: src/main.cpp:434
 #, fuzzy
 msgid "Left and right view alternating."
 msgstr "flip vertical de la vue droite"
 
-#: src/main.cpp:439
+#: src/main.cpp:435
 msgid "Only left."
 msgstr ""
 
-#: src/main.cpp:440
+#: src/main.cpp:436
 msgid "Only right."
 msgstr ""
 
-#: src/main.cpp:446
+#: src/main.cpp:442
 msgid "Left even columns, right odd columns."
 msgstr ""
 
-#: src/main.cpp:447
+#: src/main.cpp:443
 #, fuzzy
 msgid "Left and right in checkerboard pattern."
 msgstr "Damier"
 
-#: src/main.cpp:448
+#: src/main.cpp:444
 #, fuzzy
 msgid "HDMI frame packing mode."
 msgstr "Mode HDMI frame packing"
 
-#: src/main.cpp:449
+#: src/main.cpp:445
 #, fuzzy
 msgid "Red/cyan anaglyph, monochrome method."
 msgstr "Lunettes rouge/cyan, monochrome"
 
-#: src/main.cpp:450
+#: src/main.cpp:446
 #, fuzzy
 msgid "Red/cyan anaglyph, half color method."
 msgstr "Lunettes rouge/cyan, demi-couleur"
 
-#: src/main.cpp:451
+#: src/main.cpp:447
 #, fuzzy
 msgid "Red/cyan anaglyph, full color method."
 msgstr "Lunettes rouge/cyan, pleine couleur"
 
-#: src/main.cpp:452
+#: src/main.cpp:448
 #, fuzzy
 msgid "Red/cyan anaglyph, Dubois method."
 msgstr "Lunettes rouge/cyan, méthode Dubois"
 
-#: src/main.cpp:453
+#: src/main.cpp:449
 #, fuzzy
 msgid "Green/magenta anaglyph, monochrome method."
 msgstr "Lunettes vert/magenta, monochrome"
 
-#: src/main.cpp:454
+#: src/main.cpp:450
 #, fuzzy
 msgid "Green/magenta anaglyph, half color method."
 msgstr "Lunettes vert/magenta, demi-couleur"
 
-#: src/main.cpp:455
+#: src/main.cpp:451
 #, fuzzy
 msgid "Green/magenta anaglyph, full color method."
 msgstr "Lunettes vert/magenta, pleine couleur"
 
-#: src/main.cpp:456
+#: src/main.cpp:452
 #, fuzzy
 msgid "Green/magenta anaglyph, Dubois method."
 msgstr "Lunettes vert/magenta, méthode Dubois"
 
-#: src/main.cpp:457
+#: src/main.cpp:453
 #, fuzzy
 msgid "Amber/blue anaglyph, monochrome method."
 msgstr "Lunettes Ambre/bleu, monochrome"
 
-#: src/main.cpp:458
+#: src/main.cpp:454
 #, fuzzy
 msgid "Amber/blue anaglyph, half color method."
 msgstr "Lunettes Ambre/bleu, demi-couleur"
 
-#: src/main.cpp:459
+#: src/main.cpp:455
 #, fuzzy
 msgid "Amber/blue anaglyph, full color method."
 msgstr "Lunettes Ambre/bleu, pleine couleur"
 
-#: src/main.cpp:460
+#: src/main.cpp:456
 #, fuzzy
 msgid "Amber/blue anaglyph, Dubois method."
 msgstr "Lunettes Ambre/bleu, méthode Dubois"
 
-#: src/main.cpp:461
+#: src/main.cpp:457
 #, fuzzy
 msgid "Red/green anaglyph, monochrome method."
 msgstr "Lunettes rouge/vert, monochrome"
 
-#: src/main.cpp:462
+#: src/main.cpp:458
 #, fuzzy
 msgid "Red/blue anaglyph, monochrome method."
 msgstr "Lunettes rouge/bleu, monochrome"
 
-#: src/main.cpp:463
+#: src/main.cpp:459
 msgid "Multi-display via Equalizer (2D setup)."
 msgstr ""
 
-#: src/main.cpp:464
+#: src/main.cpp:460
 msgid "Multi-display via Equalizer (3D setup)."
 msgstr ""
 
-#: src/main.cpp:465
+#: src/main.cpp:461
 #, fuzzy
 msgid "Swap left/right view."
 msgstr "Echanger gauche/droite"
 
-#: src/main.cpp:466
+#: src/main.cpp:462
 #, fuzzy
 msgid "Fullscreen."
 msgstr "Double écran :"
 
-#: src/main.cpp:467
+#: src/main.cpp:463
 #, fuzzy
 msgid "Use the listed screens in fullscreen mode."
 msgstr "Utiliser plusieurs écrans pour le mode plein écran"
 
-#: src/main.cpp:468
+#: src/main.cpp:464
 msgid "Screen numbers start with 1."
 msgstr ""
 
-#: src/main.cpp:469
+#: src/main.cpp:465
 msgid "An empty list defaults to the primary screen."
 msgstr ""
 
-#: src/main.cpp:470
+#: src/main.cpp:466
 #, fuzzy
 msgid "Flip left view vertically when fullscreen."
 msgstr "flip vertical de la vue gauche"
 
-#: src/main.cpp:471
+#: src/main.cpp:467
 #, fuzzy
 msgid "Flop left view horizontally when fullscreen."
 msgstr "flip horizontal de la vue gauche"
 
-#: src/main.cpp:472
+#: src/main.cpp:468
 #, fuzzy
 msgid "Flip right view vertically when fullscreen."
 msgstr "flip vertical de la vue droite"
 
-#: src/main.cpp:473
+#: src/main.cpp:469
 #, fuzzy
 msgid "Flop right view horizontally when fullscreen."
 msgstr "flop horizontal de la vue droite"
 
-#: src/main.cpp:474
+#: src/main.cpp:470
+msgid "Use DLP 3-D Ready Sync when fullscreen."
+msgstr ""
+
+#: src/main.cpp:471
 msgid "Set zoom for wide videos (0=off to 1=full)."
 msgstr ""
 
-#: src/main.cpp:475
+#: src/main.cpp:472
 msgid "Crop video to given aspect ratio (0:0=off)."
 msgstr ""
 
-#: src/main.cpp:476
+#: src/main.cpp:473
 #, fuzzy
 msgid "Center window on screen."
 msgstr "Centrer la vidéo sur l'écran."
 
-#: src/main.cpp:477
+#: src/main.cpp:474
 #, fuzzy
 msgid "Set subtitle encoding."
 msgstr "codec de sous-titres"
 
-#: src/main.cpp:478
+#: src/main.cpp:475
 #, fuzzy
 msgid "Set subtitle font name."
 msgstr "Force la police de caractères utilisée pour les sous-titres."
 
-#: src/main.cpp:479
+#: src/main.cpp:476
 #, fuzzy
 msgid "Set subtitle font size."
 msgstr "Force la taille de la police des sous-titres."
 
-#: src/main.cpp:480
+#: src/main.cpp:477
 #, fuzzy
 msgid "Set subtitle scale factor."
 msgstr "Force le facteur d'échelle des sous-titres."
 
-#: src/main.cpp:481
+#: src/main.cpp:478
 msgid "Set subtitle color, in [AA]RRGGBB format."
 msgstr ""
 
-#: src/main.cpp:482
+#: src/main.cpp:479
+msgid "Set subtitle shadow, -1=default, 0=off, 1=on."
+msgstr ""
+
+#: src/main.cpp:480
 msgid "Subtitle parallax adjustment (-1 to +1)."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:481
 msgid "Parallax adjustment (-1 to +1)."
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:482
 msgid "Crosstalk leak level (0 to 1)."
 msgstr ""
 
-#: src/main.cpp:485
+#: src/main.cpp:483
 msgid "Comma-separated values for R,G,B."
 msgstr ""
 
-#: src/main.cpp:486
+#: src/main.cpp:484
 msgid "Amount of ghostbusting to apply (0 to 1)."
 msgstr ""
 
-#: src/main.cpp:487
+#: src/main.cpp:485
 msgid "Benchmark mode (no audio, show fps)."
 msgstr ""
 
-#: src/main.cpp:488
+#: src/main.cpp:486
 msgid "Frame rate divisor for display refresh rate."
 msgstr ""
 
-#: src/main.cpp:489
+#: src/main.cpp:487
 msgid "Default is 0 for benchmark mode, 1 otherwise."
 msgstr ""
 
-#: src/main.cpp:490
+#: src/main.cpp:488
 msgid "Loop the input media."
 msgstr ""
 
-#: src/main.cpp:492
+#: src/main.cpp:489
+msgid "Set SDI output format."
+msgstr ""
+
+#: src/main.cpp:491
 msgid "Interactive control:"
 msgstr ""
 
-#: src/main.cpp:493
+#: src/main.cpp:492
 #, fuzzy
 msgid "Leave fullscreen mode, or quit."
 msgstr "En mode plein écran,"
 
-#: src/main.cpp:494
+#: src/main.cpp:493
 #, fuzzy
 msgid "Quit."
 msgstr "&Quitter..."
 
-#: src/main.cpp:515
+#: src/main.cpp:514
 msgid "Seek according to horizontal click position."
 msgstr ""
 
-#: src/main.cpp:523
+#: src/main.cpp:522
 msgid "No audio devices known."
 msgstr ""
 
-#: src/main.cpp:595
+#: src/main.cpp:594
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Mode banc d'essai: audio et synchronisation temporelle désactivés."
 
-#: src/main.cpp:729
+#: src/main.cpp:608
+#, c-format
+msgid "Unknown mode %s."
+msgstr ""
+
+#: src/main.cpp:740
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Cette version de Bino a été compilée sans le support LIRC."
 
 #. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:935
+#: src/media_data.cpp:1051
 #, c-format
 msgid "%dx%d, %.3g:1"
 msgstr "%dx%d, %.3g:1"
 
 #. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:1066
+#: src/media_data.cpp:1182
 #, c-format
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d ch., %g kHz, %d bit"
 
-#: src/media_input.cpp:282
+#: src/media_input.cpp:281
 #, c-format
 msgid "Video %s: %s"
 msgstr "Vidéo %s : %s"
 
-#: src/media_input.cpp:287
+#: src/media_input.cpp:286
 msgid "No video."
 msgstr "Aucune vidéo."
 
-#: src/media_input.cpp:293
+#: src/media_input.cpp:292
 #, c-format
 msgid "Audio %s: %s"
 msgstr "Audio %s : %s"
 
-#: src/media_input.cpp:298
+#: src/media_input.cpp:297
 msgid "No audio."
 msgstr "Pas d'audio."
 
-#: src/media_input.cpp:304
+#: src/media_input.cpp:303
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr "Sous-titres %s : %s"
 
-#: src/media_input.cpp:309
+#: src/media_input.cpp:308
 msgid "No subtitle."
 msgstr "Aucun sous-titre."
 
-#: src/media_input.cpp:311
+#: src/media_input.cpp:310
 #, c-format
 msgid "Duration: %g seconds"
 msgstr "Durée : %g secondes"
 
-#: src/media_input.cpp:314
+#: src/media_input.cpp:313
 #, c-format
 msgid "Stereo layout: %s"
 msgstr "Mode stéréo : %s"
@@ -1684,131 +1800,131 @@
 msgid "default"
 msgstr "par défaut"
 
-#: src/media_object.cpp:832
+#: src/media_object.cpp:836
 #, c-format
 msgid "%s: Cannot read stream info: %s"
 msgstr "%s : Impossible de lire l'information du flux : %s"
 
-#: src/media_object.cpp:876
+#: src/media_object.cpp:880
 #, c-format
 msgid "%s stream %d: Cannot open %s: %s"
 msgstr "%s flux vidéo %d : Impossible d'ouvrir %s : %s"
 
-#: src/media_object.cpp:877
+#: src/media_object.cpp:881
 msgid "video codec"
 msgstr "codec vidéo"
 
-#: src/media_object.cpp:878
+#: src/media_object.cpp:882
 msgid "audio codec"
 msgstr "codec audio"
 
-#: src/media_object.cpp:879
+#: src/media_object.cpp:883
 msgid "subtitle codec"
 msgstr "codec de sous-titres"
 
-#: src/media_object.cpp:880
+#: src/media_object.cpp:884
 msgid "data"
 msgstr "données"
 
-#: src/media_object.cpp:881
+#: src/media_object.cpp:885
 msgid "codec not supported"
 msgstr "codec non supporté"
 
-#: src/media_object.cpp:891
+#: src/media_object.cpp:895
 #, c-format
 msgid "%s video stream %d: Invalid frame size."
 msgstr "%s flux vidéo %d : Taille de l'image invalide."
 
-#: src/media_object.cpp:935
+#: src/media_object.cpp:939
 #, c-format
 msgid "%s video stream %d: Cannot initialize conversion context."
 msgstr "%s flux vidéo %d : Impossible d'initialiser le contexte de conversion."
 
-#: src/media_object.cpp:998
+#: src/media_object.cpp:1002
 #, c-format
 msgid "Video stream %d: %s / %s, %g seconds"
 msgstr "Flux vidéo %d : %s / %s, %g secondes"
 
-#: src/media_object.cpp:1002
+#: src/media_object.cpp:1006
 #, c-format
 msgid "Using up to %d threads for decoding."
 msgstr "Utilisation de maximum %d threads pour le décodage."
 
-#: src/media_object.cpp:1007
+#: src/media_object.cpp:1011
 #, c-format
 msgid "Audio stream %d: %s / %s, %g seconds"
 msgstr "Flux audio %d : %s / %s, %g secondes"
 
-#: src/media_object.cpp:1014
+#: src/media_object.cpp:1018
 #, c-format
 msgid "Subtitle stream %d: %s / %s, %g seconds"
 msgstr "Flux de sous-titres %d : %s / %s, %g secondes"
 
-#: src/media_object.cpp:1021
+#: src/media_object.cpp:1025
 msgid "No usable streams."
 msgstr "Aucun flux utilisable"
 
-#: src/media_object.cpp:1302 src/media_object.cpp:1332
-#: src/media_object.cpp:1362
+#: src/media_object.cpp:1306 src/media_object.cpp:1336
+#: src/media_object.cpp:1366
 #, c-format
 msgid "%s: Cannot duplicate packet."
 msgstr "%s : Impossible de dupliquer le paquet."
 
-#: src/media_object.cpp:1456
+#: src/media_object.cpp:1460
 #, fuzzy, c-format
 msgid "%s video stream %d: Dropping %dx%d frame"
 msgstr "%s flux vidéo %d : Taille de l'image invalide."
 
-#: src/media_object.cpp:1919
+#: src/media_object.cpp:1923
 #, c-format
 msgid "%s: Seeking failed."
 msgstr "%s : Échec de la recherche."
 
-#: src/player.cpp:434
+#: src/player.cpp:437
 #, fuzzy, c-format
 msgid "Video: delay %g seconds/%g frames; dropping next frame."
 msgstr "Vidéo : retard de %g secondes; image suivante sautée."
 
-#: src/player.cpp:450
+#: src/player.cpp:453
 #, c-format
 msgid "FPS: %.2f"
 msgstr "FPS : %.2f"
 
-#: src/player_equalizer.cpp:116
+#: src/player_equalizer.cpp:117
 msgid "Reading input frame failed."
 msgstr "Echec de la lecture de l'image d'entrée."
 
-#: src/player_equalizer.cpp:165 src/video_output_qt.cpp:590
-#: src/video_output_qt.cpp:597
+#: src/player_equalizer.cpp:166 src/video_output_qt.cpp:613
+#: src/video_output_qt.cpp:620
 msgid "Waiting for subtitle renderer initialization..."
 msgstr "Attente de l'initialisation du rendu des sous-titres..."
 
-#: src/player_equalizer.cpp:250
+#: src/player_equalizer.cpp:251
 msgid "Init data mapping failed."
 msgstr "Echec du routage des données initiales."
 
-#: src/player_equalizer.cpp:251
+#: src/player_equalizer.cpp:252
 msgid "Frame data mapping failed."
 msgstr "Echec du routage des images."
 
-#: src/player_equalizer.cpp:252
+#: src/player_equalizer.cpp:253
 msgid "Video player initialization failed."
 msgstr "Echec de l'initialisation du lecteur vidéo."
 
-#: src/player_equalizer.cpp:253
+#: src/player_equalizer.cpp:254
 msgid "Need at least OpenGL 2.1."
 msgstr "OpenGL 2.1 minimum requis."
 
-#: src/player_equalizer.cpp:430
+#: src/player_equalizer.cpp:431
 msgid "No canvas in Equalizer configuration."
 msgstr "Pas de canevas dans la configuration Equalizer."
 
-#: src/player_equalizer.cpp:437
+#: src/player_equalizer.cpp:438
 #, fuzzy, c-format
 msgid "Equalizer canvas: %gx%g, aspect ratio %g:1"
 msgstr "%gx%g, facteur d'aspect %g:1"
 
-#: src/player_equalizer.cpp:922 src/video_output_qt.cpp:560
+#: src/player_equalizer.cpp:926 src/video_output_qt.cpp:583
 msgid ""
 "This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
 "objects."
@@ -1816,15 +1932,15 @@
 "Cette implémentation OpenGL se supporte pas OpenGL 2.1 et les framebuffer "
 "objects."
 
-#: src/player_equalizer.cpp:1105
+#: src/player_equalizer.cpp:1107
 msgid "Equalizer initialization failed."
 msgstr "Echec de l'initialisation d'Equalizer."
 
-#: src/player_equalizer.cpp:1113
+#: src/player_equalizer.cpp:1115
 msgid "Cannot get equalizer configuration."
 msgstr "Impossible de lire la configuration d'Equalizer."
 
-#: src/player_equalizer.cpp:1127
+#: src/player_equalizer.cpp:1132
 msgid "Equalizer configuration initialization failed."
 msgstr "Echec de l'initialisation de la configuration d'Equalizer."
 
@@ -1836,83 +1952,88 @@
 msgid "Cannot initialize LibASS renderer."
 msgstr "Impossible d'initialiser le rendu par LibASS."
 
-#: src/subtitle_renderer.cpp:398
+#: src/subtitle_renderer.cpp:404
 msgid "Cannot initialize LibASS track."
 msgstr "Impossible d'initialiser la piste LibASS."
 
-#: src/subtitle_renderer.cpp:409
+#: src/subtitle_renderer.cpp:415
 #, c-format
 msgid "Subtitle character set conversion failed: %s"
 msgstr "La conversion de jeu de caractère de sous-titres a échoué : %s"
 
-#: src/video_output.cpp:145
+#: src/video_output.cpp:347
 #, c-format
 msgid "OpenGL error 0x%04X."
 msgstr "Erreur OpenGL 0x%04X."
 
-#: src/video_output.cpp:203
+#: src/video_output.cpp:359
+#, fuzzy, c-format
+msgid "OpenGL Framebuffer status error 0x%04X."
+msgstr "Erreur OpenGL 0x%04X."
+
+#: src/video_output.cpp:407
 #, c-format
 msgid "OpenGL %s '%s': compiler warning:"
 msgstr "OpenGL %s '%s' : avertissement du compilateur :"
 
-#: src/video_output.cpp:204 src/video_output.cpp:209
+#: src/video_output.cpp:408 src/video_output.cpp:413
 msgid "vertex shader"
 msgstr "vertex shader"
 
-#: src/video_output.cpp:204 src/video_output.cpp:209
+#: src/video_output.cpp:408 src/video_output.cpp:413
 msgid "fragment shader"
 msgstr "fragment shader"
 
-#: src/video_output.cpp:208
+#: src/video_output.cpp:412
 #, c-format
 msgid "OpenGL %s '%s': compilation failed."
 msgstr "OpenGL %s '%s' : Échec de la compilation."
 
-#: src/video_output.cpp:211 src/video_output.cpp:288
+#: src/video_output.cpp:415 src/video_output.cpp:492
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: src/video_output.cpp:284
+#: src/video_output.cpp:488
 #, c-format
 msgid "OpenGL program '%s': linker warning:"
 msgstr "Programme OpenGL '%s' : avertissement de l'éditeur de liens."
 
-#: src/video_output.cpp:287
+#: src/video_output.cpp:491
 #, c-format
 msgid "OpenGL program '%s': linking failed."
 msgstr "Programme OpenGL '%s' : erreur de l'éditeur de liens."
 
-#: src/video_output.cpp:563 src/video_output.cpp:675
+#: src/video_output.cpp:1494 src/video_output.cpp:1635
 msgid "Cannot create a PBO buffer."
 msgstr "Impossuble de créer un buffer PBO."
 
-#: src/video_output_qt.cpp:555
+#: src/video_output_qt.cpp:578
 #, c-format
 msgid "Cannot initialize GLEW: %s"
 msgstr "Impossible d'initialiser GLEW : %s"
 
-#: src/video_output_qt.cpp:588
+#: src/video_output_qt.cpp:611
 msgid "Please wait"
 msgstr "Veuillez patienter"
 
-#: src/video_output_qt.cpp:643
+#: src/video_output_qt.cpp:671
 #, fuzzy
 msgid "Cannot get valid OpenGL context."
 msgstr "Impossible de choisir le format du contexte OpenGL"
 
-#: src/video_output_qt.cpp:654
+#: src/video_output_qt.cpp:682
 msgid "The display does not support OpenGL stereo mode."
 msgstr "L'affichage ne supporte pas le mode OpenGL stéréo"
 
-#: src/video_output_qt.cpp:659
+#: src/video_output_qt.cpp:687
 msgid "Cannot set OpenGL context format."
 msgstr "Impossible de choisir le format du contexte OpenGL"
 
-#: src/video_output_qt.cpp:752
+#: src/video_output_qt.cpp:780
 msgid "Cannot suspend screensaver."
 msgstr "Impossible de suspendre l'économiseur d'écran."
 
-#: src/video_output_qt.cpp:767
+#: src/video_output_qt.cpp:795
 msgid "Cannot resume screensaver."
 msgstr "Impossible de rétablir l'économiseur d'écran."

bino-1.3.2.tar.xz/po/pl.gmo -> bino-1.3.3.tar.xz/po/pl.gmo Changed

bino-1.3.2.tar.xz/po/pl.po -> bino-1.3.3.tar.xz/po/pl.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.3\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-03-16 19:49+0100\n"
+"POT-Creation-Date: 2012-05-01 15:05+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"
@@ -94,13 +94,13 @@
 msgid "Too many arguments."
 msgstr "Za dużo parametrów."
 
-#: src/base/str.cpp:236
+#: 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:455 src/base/str.cpp:473 src/base/str.cpp:483
-#: src/base/str.cpp:494 src/base/str.cpp:499
+#: 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."
@@ -127,8 +127,8 @@
 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:1067 src/media_data.cpp:1090 src/media_data.cpp:1128
-#: src/media_data.cpp:1133
+#: src/media_data.cpp:1183 src/media_data.cpp:1206 src/media_data.cpp:1244
+#: src/media_data.cpp:1249
 msgid "unknown"
 msgstr "nieznany"
 
@@ -194,241 +194,253 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Nie można odkolejkować źródła buforów OpenAL."
 
-#: src/dispatch.cpp:156
+#: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
+#: src/main.cpp:361 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
+#, fuzzy, c-format
+msgid "%s: invalid command '%s'"
+msgstr "Błędna odebrana komenda LIRC '%s'."
+
+#: src/dispatch.cpp:166
 msgid "Cannot connect to X server."
 msgstr "Nie można połączyć się z X serwerem."
 
-#: src/dispatch.cpp:171
+#: src/dispatch.cpp:182
 msgid "No video to play."
 msgstr "Brak video do odtwarzania."
 
-#: src/dispatch.cpp:411 src/player_equalizer.cpp:84
+#: src/dispatch.cpp:437 src/player_equalizer.cpp:85
 msgid "No video streams found."
 msgstr "Brak strumieni video."
 
-#: src/dispatch.cpp:428
+#: src/dispatch.cpp:454
 msgid "Cannot set requested stereo layout: incompatible media."
 msgstr "Nie można ustawić narzuconego planu stereo: niekompatybilne media."
 
-#: src/dispatch.cpp:443
+#: src/dispatch.cpp:469
 #, c-format
 msgid "Video stream %d not found."
 msgstr "Strumień video %d nie znaleziony."
 
-#: src/dispatch.cpp:449
+#: src/dispatch.cpp:475
 #, c-format
 msgid "Audio stream %d not found."
 msgstr "Strumień audio %d nie znaleziony."
 
-#: src/dispatch.cpp:457
+#: src/dispatch.cpp:483
 #, c-format
 msgid "Subtitle stream %d not found."
 msgstr "Strumień napisów %d nie znaleziony."
 
-#: src/dispatch.cpp:529 src/main.cpp:736
+#: src/dispatch.cpp:555 src/main.cpp:748
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Ta wersja bino została skompilowana bez obsługi korektora."
 
-#: src/gui.cpp:101
+#: src/gui.cpp:107
 msgid "Video:"
 msgstr "Video:"
 
-#: src/gui.cpp:102
+#: src/gui.cpp:108
 msgid "Select the video stream."
 msgstr "Wybierz strumień video."
 
-#: src/gui.cpp:108
+#: src/gui.cpp:114
 msgid "Audio:"
 msgstr "Dźwięk :"
 
-#: src/gui.cpp:109
+#: src/gui.cpp:115
 msgid "Select the audio stream."
 msgstr "Wybierz strumień audio."
 
-#: src/gui.cpp:115
+#: src/gui.cpp:121
 msgid "Subtitle:"
 msgstr "Napisy:"
 
-#: src/gui.cpp:116
+#: src/gui.cpp:122
 msgid "Select the subtitle stream."
 msgstr "Wybierz strumień napisów."
 
-#: src/gui.cpp:127 src/media_input.cpp:277
+#: src/gui.cpp:133 src/media_input.cpp:276
 msgid "Input:"
 msgstr "Wejście:"
 
-#: src/gui.cpp:128
+#: src/gui.cpp:134
 msgid "Set the 3D layout of the video stream."
 msgstr "Ustaw format strumienia 3D."
 
-#: src/gui.cpp:132
+#: src/gui.cpp:138
 msgid "2D"
 msgstr "2D"
 
-#: src/gui.cpp:133
+#: src/gui.cpp:139
 msgid "Separate streams, left first"
 msgstr "Oddzielne strumienie, lewy pierwszy"
 
-#: src/gui.cpp:134
+#: src/gui.cpp:140
 msgid "Separate streams, right first"
 msgstr "Oddzielne strumienie, prawy pierwszy"
 
-#: src/gui.cpp:135
+#: src/gui.cpp:141
 #, fuzzy
 msgid "Alternating, left first"
 msgstr "Oddzielne strumienie, lewy pierwszy"
 
-#: src/gui.cpp:136
+#: src/gui.cpp:142
 #, fuzzy
 msgid "Alternating, right first"
 msgstr "Oddzielne strumienie, prawy pierwszy"
 
-#: src/gui.cpp:137 src/gui.cpp:161
+#: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2095 src/gui.cpp:2124
 msgid "Top/bottom"
 msgstr "Góra/Dół"
 
-#: src/gui.cpp:138 src/gui.cpp:162
+#: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2096 src/gui.cpp:2125
 msgid "Top/bottom, half height"
 msgstr "Góra/Dół, połowa wysokości"
 
-#: src/gui.cpp:139
+#: src/gui.cpp:145
 msgid "Bottom/top"
 msgstr "Dół/Góra"
 
-#: src/gui.cpp:140
+#: src/gui.cpp:146
 msgid "Bottom/top, half height"
 msgstr "Dół/Góra, połowa wysokości"
 
-#: src/gui.cpp:141 src/gui.cpp:163
+#: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2097 src/gui.cpp:2126
 msgid "Left/right"
 msgstr "Lewy/Prawy"
 
-#: src/gui.cpp:142 src/gui.cpp:164
+#: src/gui.cpp:148 src/gui.cpp:170 src/gui.cpp:2098 src/gui.cpp:2127
 msgid "Left/right, half width"
 msgstr "Lewy/Prawy, połowa szerokości"
 
-#: src/gui.cpp:143
+#: src/gui.cpp:149
 msgid "Right/left"
 msgstr "Prawy/Lewy"
 
-#: src/gui.cpp:144
+#: src/gui.cpp:150
 msgid "Right/left, half width"
 msgstr "Prawy/Lewy połowa szerokości"
 
-#: src/gui.cpp:145 src/gui.cpp:165
+#: src/gui.cpp:151 src/gui.cpp:171 src/gui.cpp:2099 src/gui.cpp:2128
 msgid "Even/odd rows"
 msgstr "Parzyste/nieparzyste rzędy"
 
-#: src/gui.cpp:146
+#: src/gui.cpp:152
 msgid "Odd/even rows"
 msgstr "Nieparzyste/parzyste rzędy"
 
-#: src/gui.cpp:152
+#: src/gui.cpp:158
 msgid "Output:"
 msgstr "Wyjście:"
 
-#: src/gui.cpp:153
+#: src/gui.cpp:159
 msgid "Set the 3D output type for your display."
 msgstr "Ustaw typ wyjście 3D dla swojego monitora."
 
-#: src/gui.cpp:157
+#: src/gui.cpp:163 src/gui.cpp:2093 src/gui.cpp:2122
 msgid "Left view"
 msgstr "Lewy obraz"
 
-#: src/gui.cpp:158
+#: src/gui.cpp:164 src/gui.cpp:2094 src/gui.cpp:2123
 msgid "Right view"
 msgstr "Prawy obraz"
 
-#: src/gui.cpp:159
+#: src/gui.cpp:165
 msgid "OpenGL stereo"
 msgstr "OpenGL stereo"
 
-#: src/gui.cpp:160
+#: src/gui.cpp:166
 msgid "Left/right view alternating"
 msgstr ""
 
-#: src/gui.cpp:166
+#: src/gui.cpp:172 src/gui.cpp:2100 src/gui.cpp:2129
 msgid "Even/odd columns"
 msgstr "Parzyste/nieparzyste kolumny"
 
-#: src/gui.cpp:167
+#: src/gui.cpp:173 src/gui.cpp:2101 src/gui.cpp:2130
 msgid "Checkerboard pattern"
 msgstr "Wzór szachownicy"
 
-#: src/gui.cpp:168
+#: src/gui.cpp:174
 msgid "HDMI frame packing mode"
 msgstr "Tryb HDMI"
 
-#: src/gui.cpp:169
+#: src/gui.cpp:175 src/gui.cpp:2102 src/gui.cpp:2131
 msgid "Red/cyan glasses, monochrome method"
 msgstr "Czerwony/cyjan, czarnobiały"
 
-#: src/gui.cpp:170
+#: src/gui.cpp:176 src/gui.cpp:2103 src/gui.cpp:2132
 msgid "Red/cyan glasses, half-color method"
 msgstr "Czerwony/cyjan, połowa koloru"
 
-#: src/gui.cpp:171
+#: src/gui.cpp:177 src/gui.cpp:2104 src/gui.cpp:2133
 msgid "Red/cyan glasses, full-color method"
 msgstr "Czerwony/cyjan, kolorowy"
 
-#: src/gui.cpp:172
+#: src/gui.cpp:178 src/gui.cpp:2105 src/gui.cpp:2134
 msgid "Red/cyan glasses, high-quality Dubois method"
 msgstr "Czerwony/cyjan, Dubois"
 
-#: src/gui.cpp:173
+#: src/gui.cpp:179 src/gui.cpp:2106 src/gui.cpp:2135
 msgid "Green/magenta glasses, monochrome method"
 msgstr "Zielony/karmazynowy, czarnobiały"
 
-#: src/gui.cpp:174
+#: src/gui.cpp:180 src/gui.cpp:2107 src/gui.cpp:2136
 msgid "Green/magenta glasses, half-color method"
 msgstr "Zielony/karmazynowy, połowa koloru"
 
-#: src/gui.cpp:175
+#: src/gui.cpp:181 src/gui.cpp:2108 src/gui.cpp:2137
 msgid "Green/magenta glasses, full-color method"
 msgstr "Zielony/karmazynowy, kolorowy"
 
-#: src/gui.cpp:176
+#: src/gui.cpp:182 src/gui.cpp:2109 src/gui.cpp:2138
 msgid "Green/magenta glasses, high-quality Dubois method"
 msgstr "Zielony/karmazynowy, Dubois"
 
-#: src/gui.cpp:177
+#: src/gui.cpp:183 src/gui.cpp:2110 src/gui.cpp:2139
 msgid "Amber/blue glasses, monochrome method"
 msgstr "Bursztynowy/niebieski, czarnobiały"
 
-#: src/gui.cpp:178
+#: src/gui.cpp:184 src/gui.cpp:2111 src/gui.cpp:2140
 msgid "Amber/blue glasses, half-color method"
 msgstr "Bursztynowy/niebieski, połowa koloru"
 
-#: src/gui.cpp:179
+#: src/gui.cpp:185 src/gui.cpp:2112 src/gui.cpp:2141
 msgid "Amber/blue glasses, full-color method"
 msgstr "Bursztynowy/niebieski, kolorowy"
 
-#: src/gui.cpp:180
+#: src/gui.cpp:186 src/gui.cpp:2113 src/gui.cpp:2142
 msgid "Amber/blue glasses, high-quality Dubois method"
 msgstr "Bursztynowy/niebieski, Dubois"
 
-#: src/gui.cpp:181
+#: src/gui.cpp:187 src/gui.cpp:2114 src/gui.cpp:2143
 msgid "Red/green glasses, monochrome method"
 msgstr "Czerwony/zielony, czarnobiały"
 
-#: src/gui.cpp:182
+#: src/gui.cpp:188 src/gui.cpp:2115 src/gui.cpp:2144
 msgid "Red/blue glasses, monochrome method"
 msgstr "Czerwony/zielony, czarnobiały"
 
-#: src/gui.cpp:186
+#: src/gui.cpp:192
 msgid "Swap left/right"
 msgstr "Zamień lewy/prawy"
 
-#: src/gui.cpp:187
+#: src/gui.cpp:193
 msgid ""
 "Swap the left and right view. Use this if the 3D effect seems wrong."
 msgstr "p>Zamiana obrazu lewego i prawego. Użyj gdy efekt 3D będzie zły."
 
-#: src/gui.cpp:467
+#: src/gui.cpp:471 src/gui.cpp:1676
 msgid "Off"
 msgstr "Wyłącz"
 
-#: src/gui.cpp:694
+#: src/gui.cpp:702
 msgid ""
 "This slider shows the progress during video playback, and can be used to "
 "seek in the video."
@@ -436,36 +448,36 @@
 "Suwak pokazuje postęp podczas odtwarzania video i może być używany do "
 "odtwarzania od zaznaczonego punktu czasu w video"
 
-#: src/gui.cpp:701
+#: src/gui.cpp:709
 msgid "Elapsed / total time."
 msgstr "Upłynięty/całkowity czas"
 
-#: src/gui.cpp:708
+#: src/gui.cpp:716
 #, fuzzy
 msgid "Toggle audio mute."
 msgstr "Przełączanie opcji pętli"
 
-#: src/gui.cpp:713
+#: src/gui.cpp:721
 msgid "Adjust audio volume."
 msgstr ""
 
-#: src/gui.cpp:725
+#: src/gui.cpp:733
 msgid "Play."
 msgstr "Odtwarzaj."
 
-#: src/gui.cpp:729
+#: src/gui.cpp:737
 msgid "Pause."
 msgstr "Pauza."
 
-#: src/gui.cpp:733
+#: src/gui.cpp:741
 msgid "Stop."
 msgstr "Stop."
 
-#: src/gui.cpp:738
+#: src/gui.cpp:746
 msgid "Toggle loop mode."
 msgstr "Przełączanie opcji pętli"
 
-#: src/gui.cpp:745
+#: src/gui.cpp:753
 msgid ""
 "Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
 "f key."
@@ -473,150 +485,158 @@
 "Przełącz na tryb pełnoekranowy. Klikając klawisz \"f\" możesz wyjść z "
 "tego trybu."
 
-#: src/gui.cpp:751
+#: src/gui.cpp:759
 msgid "Center the video area on your screen."
 msgstr "Wypośrodkuj obszar video na monitorze."
 
-#: src/gui.cpp:758
+#: src/gui.cpp:766
 msgid "Seek backward 10 minutes."
 msgstr "Cofnij 10 minut do tyłu."
 
-#: src/gui.cpp:763
+#: src/gui.cpp:771
 msgid "Seek backward 1 minute."
 msgstr "Cofnij 1 minutę do tyłu."
 
-#: src/gui.cpp:769
+#: src/gui.cpp:777
 msgid "Seek backward 10 seconds."
 msgstr "Cofnij 10 sekund do tyłu."
 
-#: src/gui.cpp:775
+#: src/gui.cpp:783
 msgid "Seek forward 10 seconds."
 msgstr "Przeskocz 10 sekund do przodu."
 
-#: src/gui.cpp:780
+#: src/gui.cpp:788
 msgid "Seek forward 1 minute."
 msgstr "Przeskocz 1 minutę do przodu."
 
-#: src/gui.cpp:786
+#: src/gui.cpp:794
 msgid "Seek forward 10 minutes."
 msgstr "Przeskocz 10 minut do przodu."
 
-#: src/gui.cpp:1047
+#: src/gui.cpp:1055
 msgid "Fullscreen/Multiscreen Settings"
 msgstr "Ustawienia pełny ekran/wiele ekranów"
 
-#: src/gui.cpp:1049
+#: src/gui.cpp:1057
 msgid "Configure fullscreen mode:"
 msgstr "Konfiguracja trybu pełnego ekranu:"
 
-#: src/gui.cpp:1050
+#: src/gui.cpp:1058
 msgid "Select the screens to use in fullscreen mode."
 msgstr "Wybierz ekran do trybu \"pełnego ekranu\"."
 
-#: src/gui.cpp:1052
+#: src/gui.cpp:1060
 msgid "Single screen:"
 msgstr "Pojedynczy ekran:"
 
-#: src/gui.cpp:1053
+#: src/gui.cpp:1061
 msgid "Use a single screen for fullscreen mode."
 msgstr "Użyj pojedynczy ekran jako tryb \"pełnego ekranu\"."
 
-#: src/gui.cpp:1056
+#: src/gui.cpp:1064
 msgid "Primary screen"
 msgstr "Pierwszy ekran"
 
-#: src/gui.cpp:1059 src/gui.cpp:1070 src/gui.cpp:1071
+#: src/gui.cpp:1067 src/gui.cpp:1078 src/gui.cpp:1079
 #, c-format
 msgid "Screen %d"
 msgstr "Ekran %d"
 
-#: src/gui.cpp:1062
+#: src/gui.cpp:1070
 msgid "Dual screen:"
 msgstr "Podwójny ekran:"
 
-#: src/gui.cpp:1063
+#: src/gui.cpp:1071
 msgid "Use two screens for fullscreen mode."
 msgstr "Użyj dwóch ekranów jako trybu \"pełnego ekranu\"."
 
-#: src/gui.cpp:1075
+#: src/gui.cpp:1083
 msgid "Multi screen:"
 msgstr "Wiele ekranów:"
 
-#: src/gui.cpp:1076
+#: src/gui.cpp:1084
 msgid "Use multiple screens for fullscreen mode."
 msgstr "Użyj wiele ekranów jako trybu \"pełnego ekranu\""
 
-#: src/gui.cpp:1078
+#: src/gui.cpp:1086
 msgid "Comma-separated list of screens to use for fullscreen mode."
 msgstr "Lista dostępnych ekranów do użycia w trybie \"pełnego ekranu\"."
 
-#: src/gui.cpp:1081
+#: src/gui.cpp:1089
 msgid "When in fullscreen mode,"
 msgstr "Kiedy w trybie \"pełnego ekranu\","
 
-#: src/gui.cpp:1082
+#: src/gui.cpp:1090
 msgid "Set special left/right view handling for fullscreen mode."
 msgstr ""
 "Réglages spéciaux pour les vues droite et gauche en plein écran."
 
-#: src/gui.cpp:1084
+#: src/gui.cpp:1092
 msgid "flip left view vertically."
 msgstr "widok \"flip\" z lewej w pionie."
 
-#: src/gui.cpp:1086
+#: src/gui.cpp:1094
 msgid "flop left view horizontally."
 msgstr "widok \"flop\" z lewej w poziomie."
 
-#: src/gui.cpp:1088
+#: src/gui.cpp:1096
 msgid "flip right view vertically."
 msgstr "widok \"flip\" z prawej w pionie."
 
-#: src/gui.cpp:1090
+#: src/gui.cpp:1098
 msgid "flop right view horizontally."
 msgstr "widok \"flop\" z prawej w poziomie."
 
-#: src/gui.cpp:1093
+#: src/gui.cpp:1101
+msgid "use DLP(R) 3-D Ready Sync"
+msgstr ""
+
+#: src/gui.cpp:1102
+msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
+msgstr ""
+
+#: src/gui.cpp:1104
 #, fuzzy
 msgid "inhibit the screensaver"
 msgstr "Nie można wznowić działania \"screensaver'a\""
 
-#: src/gui.cpp:1094
+#: src/gui.cpp:1105
 #, fuzzy
 msgid "Inhibit the screensaver during fullscreen playback."
 msgstr "Wybierz ekran do trybu \"pełnego ekranu\"."
 
-#: src/gui.cpp:1096 src/gui.cpp:1258 src/gui.cpp:1393 src/gui.cpp:1463
-#: src/gui.cpp:1541 src/gui.cpp:1652 src/gui.cpp:1928 src/gui.cpp:2108
-#: src/gui.cpp:2778 src/gui.cpp:2825 src/gui.cpp:3114
+#: src/gui.cpp:1107 src/gui.cpp:1273 src/gui.cpp:1408 src/gui.cpp:1478
+#: src/gui.cpp:1556 src/gui.cpp:1680 src/gui.cpp:1948 src/gui.cpp:2147
+#: src/gui.cpp:2625 src/gui.cpp:3324 src/gui.cpp:3371 src/gui.cpp:3677
 msgid "OK"
 msgstr "OK"
 
-#: src/gui.cpp:1211
+#: src/gui.cpp:1226
 msgid "Display Color Adjustments"
 msgstr "Wyświetl regulację kolorów"
 
-#: src/gui.cpp:1213
+#: src/gui.cpp:1228
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/gui.cpp:1224
+#: src/gui.cpp:1239
 msgid "Brightness:"
 msgstr "Jasność:"
 
-#: src/gui.cpp:1235
+#: src/gui.cpp:1250
 msgid "Hue:"
 msgstr "Kolor:"
 
-#: src/gui.cpp:1246
+#: src/gui.cpp:1261
 msgid "Saturation:"
 msgstr "Nasycenie:"
 
-#: src/gui.cpp:1364
+#: src/gui.cpp:1379
 msgid "Display Crosstalk Calibration"
 msgstr "Wyświetl kalibrację \"crosstalk\""
 
 #. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/gui.cpp:1367
+#: src/gui.cpp:1382
 msgid ""
 "Please read the manual to find out how to measure the crosstalk "
 "levels of your display."
@@ -624,140 +644,157 @@
 "Proszę przeczytać instrukcję aby dowiedzieć się jak zmierzyć poziom "
 "\"crosstalk\" twojego monitora."
 
-#: src/gui.cpp:1371
+#: src/gui.cpp:1386
 msgid "Red:"
 msgstr "Czerwony:"
 
-#: src/gui.cpp:1378
+#: src/gui.cpp:1393
 msgid "Green:"
 msgstr "Zielony:"
 
-#: src/gui.cpp:1385
+#: src/gui.cpp:1400
 msgid "Blue:"
 msgstr "Niebieski:"
 
-#: src/gui.cpp:1441
+#: src/gui.cpp:1456
 msgid "Zoom for wide videos"
 msgstr ""
 
-#: src/gui.cpp:1444
+#: src/gui.cpp:1459
 msgid ""
 "Set zoom level for videos that are wider than the screen: 0: Show "
 "full video width. 1: Use full screen height.</p"
 msgstr ""
 
-#: src/gui.cpp:1448
+#: src/gui.cpp:1463
 msgid "Zoom:"
 msgstr ""
 
-#: src/gui.cpp:1449
+#: src/gui.cpp:1464
 msgid "Set the zoom level for videos that are wider than the screen"
 msgstr ""
 
-#: src/gui.cpp:1507
+#: src/gui.cpp:1522
 #, fuzzy
 msgid "Audio Settings"
 msgstr "Ustawienia napisów"
 
-#: src/gui.cpp:1509
+#: src/gui.cpp:1524
 #, fuzzy
 msgid "Audio device:"
 msgstr "kodek audio"
 
-#: src/gui.cpp:1510
+#: src/gui.cpp:1525
 msgid ""
 "Select the audio device. This will take effect for the next started "
 "video."
 msgstr ""
 
-#: src/gui.cpp:1514 src/gui.cpp:2063
+#: src/gui.cpp:1529 src/gui.cpp:2563
 msgid "Default"
 msgstr "Domyślne"
 
-#: src/gui.cpp:1531
+#: src/gui.cpp:1546
 msgid "Audio delay (ms):"
 msgstr ""
 
-#: src/gui.cpp:1532
+#: src/gui.cpp:1547
 msgid ""
 "Set an audio delay, in milliseconds. This is useful if audio and video "
 "are not in sync."
 msgstr ""
 
-#: src/gui.cpp:1589
+#: src/gui.cpp:1604
 msgid "Subtitle Settings"
 msgstr "Ustawienia napisów"
 
-#: src/gui.cpp:1591
-msgid "These settings apply to soft subtitles, but not to bitmaps."
+#: src/gui.cpp:1607
+#, fuzzy
+msgid ""
+"These settings apply only to soft subtitles, not to bitmaps. Some "
+"changes require a restart of the video to take effect."
 msgstr "Te ustawienia dotyczą zwykłych napisów, a nie w bitmapach."
 
-#: src/gui.cpp:1593
+#: src/gui.cpp:1610
 msgid "Encoding:"
 msgstr "Kodowanie:"
 
-#: src/gui.cpp:1594
+#: src/gui.cpp:1611
 msgid "Set the subtitle character set encoding."
 msgstr "Ustaw kodowanie napisów."
 
-#: src/gui.cpp:1609
+#: src/gui.cpp:1626
 msgid "Override font:"
 msgstr "Zastąp czcionkę:"
 
-#: src/gui.cpp:1610
+#: src/gui.cpp:1627
 msgid "Override the subtitle font family."
 msgstr "Zastąp czcionkę napisu."
 
-#: src/gui.cpp:1619
+#: src/gui.cpp:1636
 msgid "Override font size:"
 msgstr "Zastąp rozmiar czcionki:"
 
-#: src/gui.cpp:1620
+#: src/gui.cpp:1637
 msgid "Override the subtitle font size."
 msgstr "Zastąp rozmiar czcioni napisu."
 
-#: src/gui.cpp:1630
+#: src/gui.cpp:1647
 msgid "Override scale factor:"
 msgstr "Zastąp współczynnik skali:"
 
-#: src/gui.cpp:1631
+#: src/gui.cpp:1648
 msgid "Override the subtitle scale factor."
 msgstr "Zastąp współczynnik skali napisu."
 
-#: src/gui.cpp:1642
+#: src/gui.cpp:1659
 msgid "Override color:"
 msgstr "Zastąp kolor:"
 
-#: src/gui.cpp:1643
+#: src/gui.cpp:1660
 msgid "Override the subtitle color."
 msgstr "Zastąp kolor napisu."
 
-#: src/gui.cpp:1866
+#: src/gui.cpp:1669
+#, fuzzy
+msgid "Override shadow:"
+msgstr "Zastąp czcionkę:"
+
+#: src/gui.cpp:1670
+#, fuzzy
+msgid "Override the subtitle shadow."
+msgstr "Zastąp kolor napisu."
+
+#: src/gui.cpp:1675
+msgid "On"
+msgstr ""
+
+#: src/gui.cpp:1886
 #, fuzzy
 msgid "Video Settings"
 msgstr "Ustawienia napisów"
 
-#: src/gui.cpp:1868
+#: src/gui.cpp:1888
 #, fuzzy
 msgid "Crop to aspect ratio:"
 msgstr "%gx%g, proporcja obrazu %g:1"
 
-#: src/gui.cpp:1869
+#: src/gui.cpp:1889
 #, fuzzy
 msgid ""
 "Set the real aspect ratio of the video, so that borders can be cropped.</"
 "p>"
 msgstr "Ustaw format strumienia 3D."
 
-#: src/gui.cpp:1872
+#: src/gui.cpp:1892
 msgid "Do not crop"
 msgstr ""
 
-#: src/gui.cpp:1885
+#: src/gui.cpp:1905
 msgid "Parallax:"
 msgstr "Paralaksa:"
 
-#: src/gui.cpp:1886
+#: src/gui.cpp:1906
 msgid ""
 "Adjust parallax, from -1 to +1. This changes the separation of left and "
 "right view, and thus the perceived distance of the scene."
@@ -765,11 +802,11 @@
 "Regulacja paralaksy od -1 do +1. Zmiany oddzielają lewy i prawy obraz i "
 "wpływają na spostrzeganie dystansu w scenie."
 
-#: src/gui.cpp:1899
+#: src/gui.cpp:1919
 msgid "Subtitle parallax:"
 msgstr "Paralaksa napisów:"
 
-#: src/gui.cpp:1900
+#: src/gui.cpp:1920
 msgid ""
 "Adjust subtitle parallax, from -1 to +1. This changes the perceived "
 "distance of the subtitles."
@@ -777,11 +814,11 @@
 "Regulacja paralaksy od -1 do +1. Zmiany wpływają na spostrzeganiu "
 "dystansu napisów względem danej sceny."
 
-#: src/gui.cpp:1913
+#: src/gui.cpp:1933
 msgid "Ghostbusting:"
 msgstr "Ghostbusting :"
 
-#: src/gui.cpp:1914
+#: src/gui.cpp:1934
 msgid ""
 "Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
 "the crosstalk levels of your display first. Note that crosstalk ghostbusting "
@@ -791,36 +828,77 @@
 "powinieneś ustawić poziom \"crosstalk\" dla monitora. UWAGA. Ustawienie to "
 "nie działa przy okularach anaglifowych."
 
-#: src/gui.cpp:2059
-msgid "Open device"
+#: src/gui.cpp:2078
+#, fuzzy
+msgid "SDI Output Settings"
+msgstr "Ustawienia napisów"
+
+#: src/gui.cpp:2080
+msgid "SDI Output Format:"
+msgstr ""
+
+#: src/gui.cpp:2081
+#, fuzzy
+msgid "Select output format used for SDI output."
+msgstr "Ustaw typ wyjście 3D dla swojego monitora."
+
+#: src/gui.cpp:2089
+msgid "Left stereo mode:"
+msgstr ""
+
+#: src/gui.cpp:2090
+#, fuzzy
+msgid "Select stereo mode used for left SDI output."
+msgstr "Wybierz ekran do trybu \"pełnego ekranu\"."
+
+#: src/gui.cpp:2118
+msgid "Right stereo mode:"
+msgstr ""
+
+#: src/gui.cpp:2119
+msgid "Select stereo mode used for right SDI output."
+msgstr ""
+
+#: src/gui.cpp:2559
+#, fuzzy
+msgid "Open device(s)"
 msgstr "Otwórz urządzenie"
 
-#: src/gui.cpp:2062
+#: src/gui.cpp:2562
 msgid "Choose a device type."
 msgstr "Wybierz typ urządzenia."
 
-#: src/gui.cpp:2064 src/media_object.cpp:801
+#: src/gui.cpp:2564 src/media_object.cpp:801
 msgid "Firewire"
 msgstr "Firewire"
 
-#: src/gui.cpp:2065 src/media_object.cpp:802
+#: src/gui.cpp:2565 src/media_object.cpp:802
 msgid "X11"
 msgstr "X11"
 
-#: src/gui.cpp:2067 src/gui.cpp:2070
+#: src/gui.cpp:2568 src/gui.cpp:2571
 msgid "Choose a device."
 msgstr "Wybierz urządzenie"
 
-#: src/gui.cpp:2073
+#: src/gui.cpp:2574
 msgid "Set the X11 device string. Refer to the manual for details."
 msgstr ""
 "Ustaw wartość urządzenia dla serwera X11. Szczegóły w dokumentacji."
 
-#: src/gui.cpp:2082
+#: src/gui.cpp:2590
+msgid "First device:"
+msgstr ""
+
+#: src/gui.cpp:2591
+#, fuzzy
+msgid "Second device:"
+msgstr "Otwórz urządzenie"
+
+#: src/gui.cpp:2595
 msgid "Request frame size"
 msgstr "Wymagany rozmiar ramki"
 
-#: src/gui.cpp:2083
+#: src/gui.cpp:2596
 msgid ""
 "Request a specific frame size from the device, e.g. 640x480. The device "
 "must support this frame size. Some devices require a frame size to be "
@@ -830,11 +908,11 @@
 "obsługiwać tą wielkość ramki. Niektóre urządzenia wymagają wyboru rozmiaru "
 "ramki."
 
-#: src/gui.cpp:2094
+#: src/gui.cpp:2607
 msgid "Request frame rate"
 msgstr "Wymagany współczynnik \"fps\""
 
-#: src/gui.cpp:2095
+#: src/gui.cpp:2608
 msgid ""
 "Request a specific frame rate from the device, e.g. 25/1. The device must "
 "support this frame rate. Some devices require a frame rate to be selected.</"
@@ -844,250 +922,268 @@
 "obsługiwać taki współczynnik. Niektóre urządzenia wymagają wyboru "
 "wspołczynnika \"fps\"."
 
-#: src/gui.cpp:2106 src/gui.cpp:2824
+#: src/gui.cpp:2619
+#, fuzzy
+msgid "Request MJPEG format"
+msgstr "Wymagany współczynnik \"fps\""
+
+#: src/gui.cpp:2620
+msgid ""
+"Request MJPEG data from the input device. The device may ignore this "
+"request."
+msgstr ""
+
+#: src/gui.cpp:2623 src/gui.cpp:3370
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/gui.cpp:2377
+#: src/gui.cpp:2918
 msgid "&File"
 msgstr "&Plik"
 
-#: src/gui.cpp:2378
+#: src/gui.cpp:2919
 #, fuzzy
 msgid "&Open file(s)..."
 msgstr "Otwórz pliki"
 
-#: src/gui.cpp:2383
+#: src/gui.cpp:2924
 #, fuzzy
 msgid "Open &URL(s)..."
 msgstr "Otwórz &URL..."
 
-#: src/gui.cpp:2387
-msgid "Open &device..."
+#: src/gui.cpp:2928
+#, fuzzy
+msgid "Open &device(s)..."
 msgstr "Otwórz urządzenie..."
 
-#: src/gui.cpp:2402
+#: src/gui.cpp:2943
 msgid "&Clear recent files"
 msgstr ""
 
-#: src/gui.cpp:2410
+#: src/gui.cpp:2951
 msgid "&Quit..."
 msgstr "&Zakończ..."
 
-#: src/gui.cpp:2416
+#: src/gui.cpp:2957
 msgid "&Preferences"
 msgstr "&Preferencje"
 
-#: src/gui.cpp:2419
+#: src/gui.cpp:2960
 msgid "&Fullscreen Settings..."
 msgstr "&Ustawienia dla pełnego ekranu..."
 
-#: src/gui.cpp:2422
+#: src/gui.cpp:2963
 msgid "Display &Color Adjustments..."
 msgstr "Regulacja &koloru..."
 
-#: src/gui.cpp:2425
+#: src/gui.cpp:2966
 msgid "Display Cross&talk Calibration..."
 msgstr "Kalibracja &Crosstalku..."
 
-#: src/gui.cpp:2429
+#: src/gui.cpp:2970
 msgid "&Zoom for wide videos..."
 msgstr ""
 
-#: src/gui.cpp:2433
+#: src/gui.cpp:2974
 #, fuzzy
 msgid "&Audio Settings..."
 msgstr "Ustawienia &Napisów..."
 
-#: src/gui.cpp:2437
+#: src/gui.cpp:2978
 msgid "&Subtitle Settings..."
 msgstr "Ustawienia &Napisów..."
 
-#: src/gui.cpp:2441
+#: src/gui.cpp:2982
 #, fuzzy
 msgid "Current &Video Settings..."
 msgstr "Ustawienia video 3D..."
 
-#: src/gui.cpp:2444
+#: src/gui.cpp:2987
+#, fuzzy
+msgid "SDI &Output Settings..."
+msgstr "Ustawienia &Napisów..."
+
+#: src/gui.cpp:2991
 msgid "&Help"
 msgstr "&Pomoc"
 
-#: src/gui.cpp:2445
+#: src/gui.cpp:2992
 msgid "&Manual..."
 msgstr "&Instrukcja..."
 
-#: src/gui.cpp:2450
+#: src/gui.cpp:2997
 msgid "&Website..."
 msgstr "&Strona..."
 
-#: src/gui.cpp:2454
+#: src/gui.cpp:3001
 msgid "&Keyboard Shortcuts"
 msgstr "&Skróty klawiszy"
 
-#: src/gui.cpp:2458
+#: src/gui.cpp:3005
 msgid "&About"
 msgstr "&O Bino"
 
-#: src/gui.cpp:2771
+#: src/gui.cpp:3317
 msgid "Tip"
 msgstr ""
 
-#: src/gui.cpp:2774
+#: src/gui.cpp:3320
 msgid ""
 "You can select and open multiple files at once.This is useful for "
 "example if you have extra subtitle files, or if left and right view are "
 "stored in separate files."
 msgstr ""
 
-#: src/gui.cpp:2777
+#: src/gui.cpp:3323
 msgid "Do not show this message again."
 msgstr ""
 
-#: src/gui.cpp:2794
+#: src/gui.cpp:3340
 msgid "Open files"
 msgstr "Otwórz pliki"
 
-#: src/gui.cpp:2818
+#: src/gui.cpp:3364
 #, fuzzy
 msgid "Open URL(s)"
 msgstr "Otwórz URL"
 
-#: src/gui.cpp:2819
+#: src/gui.cpp:3365
 msgid "URL(s):"
 msgstr ""
 
-#: src/gui.cpp:2820
+#: src/gui.cpp:3366
 msgid "Enter one or more space separated URLs."
 msgstr ""
 
-#: src/gui.cpp:3005 src/gui.cpp:3013 src/video_output_qt.cpp:234
-#: src/video_output_qt.cpp:643 src/video_output_qt.cpp:664
+#: src/gui.cpp:3568 src/gui.cpp:3576 src/video_output_qt.cpp:241
+#: src/video_output_qt.cpp:477 src/video_output_qt.cpp:659
+#: src/video_output_qt.cpp:671 src/video_output_qt.cpp:692
 msgid "Error"
 msgstr "Błąd"
 
-#: src/gui.cpp:3005
+#: src/gui.cpp:3568
 msgid "Cannot open manual."
 msgstr "Nie można otworzyć instrukcji."
 
-#: src/gui.cpp:3013
+#: src/gui.cpp:3576
 msgid "Cannot open website."
 msgstr "Nie można otworzyć przeglądarki."
 
-#: src/gui.cpp:3021
+#: src/gui.cpp:3584
 msgid "Keyboard Shortcuts"
 msgstr "Skróty klawiszy"
 
-#: src/gui.cpp:3024
+#: src/gui.cpp:3587
 #, fuzzy
 msgid "Keyboard control:"
 msgstr "Skróty klawiszy"
 
-#: src/gui.cpp:3026
+#: src/gui.cpp:3589
 msgid "Stop."
 msgstr ""
 
-#: src/gui.cpp:3027 src/main.cpp:495
+#: src/gui.cpp:3590 src/main.cpp:494
 msgid "Pause / unpause."
 msgstr ""
 
-#: src/gui.cpp:3028 src/main.cpp:496
+#: src/gui.cpp:3591 src/main.cpp:495
 #, fuzzy
 msgid "Toggle fullscreen."
 msgstr "Konfiguracja trybu pełnego ekranu:"
 
-#: src/gui.cpp:3029 src/main.cpp:497
+#: src/gui.cpp:3592 src/main.cpp:496
 msgid "Center window."
 msgstr ""
 
-#: src/gui.cpp:3030 src/main.cpp:498
+#: src/gui.cpp:3593 src/main.cpp:497
 #, fuzzy
 msgid "Swap left/right eye."
 msgstr "Zamień lewy/prawy"
 
-#: src/gui.cpp:3031 src/main.cpp:499
+#: src/gui.cpp:3594 src/main.cpp:498
 msgid "Cycle through available video streams."
 msgstr ""
 
-#: src/gui.cpp:3032 src/main.cpp:500
+#: src/gui.cpp:3595 src/main.cpp:499
 msgid "Cycle through available audio streams."
 msgstr ""
 
-#: src/gui.cpp:3033 src/main.cpp:501
+#: src/gui.cpp:3596 src/main.cpp:500
 #, fuzzy
 msgid "Cycle through available subtitle streams."
 msgstr "Wybierz strumień napisów."
 
-#: src/gui.cpp:3034 src/main.cpp:502
+#: src/gui.cpp:3597 src/main.cpp:501
 msgid "Adjust contrast."
 msgstr ""
 
-#: src/gui.cpp:3035 src/main.cpp:503
+#: src/gui.cpp:3598 src/main.cpp:502
 #, fuzzy
 msgid "Adjust brightness."
 msgstr "Jasność:"
 
-#: src/gui.cpp:3036 src/main.cpp:504
+#: src/gui.cpp:3599 src/main.cpp:503
 msgid "Adjust hue."
 msgstr ""
 
-#: src/gui.cpp:3037 src/main.cpp:505
+#: src/gui.cpp:3600 src/main.cpp:504
 #, fuzzy
 msgid "Adjust saturation."
 msgstr "Nasycenie:"
 
-#: src/gui.cpp:3038 src/main.cpp:506
+#: src/gui.cpp:3601 src/main.cpp:505
 #, fuzzy
 msgid "Adjust parallax."
 msgstr "Paralaksa napisów:"
 
-#: src/gui.cpp:3039 src/main.cpp:507
+#: src/gui.cpp:3602 src/main.cpp:506
 #, fuzzy
 msgid "Adjust ghostbusting."
 msgstr "Ghostbusting :"
 
-#: src/gui.cpp:3040 src/main.cpp:508
+#: src/gui.cpp:3603 src/main.cpp:507
 msgid "Adjust zoom for wide videos."
 msgstr ""
 
-#: src/gui.cpp:3041 src/main.cpp:509
+#: src/gui.cpp:3604 src/main.cpp:508
 msgid "Adjust audio volume."
 msgstr ""
 
-#: src/gui.cpp:3042 src/main.cpp:510
+#: src/gui.cpp:3605 src/main.cpp:509
 msgid "Toggle audio mute."
 msgstr ""
 
-#: src/gui.cpp:3043 src/main.cpp:511
+#: src/gui.cpp:3606 src/main.cpp:510
 msgid "Step a single video frame forward."
 msgstr ""
 
-#: src/gui.cpp:3044 src/main.cpp:512
+#: src/gui.cpp:3607 src/main.cpp:511
 msgid "Seek 10 seconds backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3045 src/main.cpp:513
+#: src/gui.cpp:3608 src/main.cpp:512
 msgid "Seek 1 minute backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3046 src/main.cpp:514
+#: src/gui.cpp:3609 src/main.cpp:513
 msgid "Seek 10 minutes backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3047 src/main.cpp:516
+#: src/gui.cpp:3610 src/main.cpp:515
 msgid "Media keys should work as expected."
 msgstr ""
 
-#: src/gui.cpp:3063
+#: src/gui.cpp:3626
 #, c-format
 msgid "About %s"
 msgstr "O programie %s"
 
-#: src/gui.cpp:3069
+#: src/gui.cpp:3632
 #, c-format
 msgid "The %s 3D video player"
 msgstr "%s odtwarzacz 3D"
 
-#: src/gui.cpp:3074
+#: src/gui.cpp:3637
 #, fuzzy, c-format
 msgid ""
 "%s version %s.Copyright (C) 2012 the Bino developers.This "
@@ -1102,27 +1198,27 @@
 "a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
 "\"%s\">%s</a> for more information on this software."
 
-#: src/gui.cpp:3086 src/main.cpp:384
+#: src/gui.cpp:3649 src/main.cpp:378
 msgid "Platform:"
 msgstr "Platforma:"
 
-#: src/gui.cpp:3087 src/main.cpp:386
+#: src/gui.cpp:3650 src/main.cpp:380
 msgid "Libraries used:"
 msgstr "Użyte biblioteki:"
 
-#: src/gui.cpp:3109
+#: src/gui.cpp:3672
 msgid "About"
 msgstr "O programie"
 
-#: src/gui.cpp:3110
+#: src/gui.cpp:3673
 msgid "Libraries"
 msgstr "Biblioteki"
 
-#: src/gui.cpp:3111
+#: src/gui.cpp:3674
 msgid "Team"
 msgstr "Zespół"
 
-#: src/gui.cpp:3112
+#: src/gui.cpp:3675
 msgid "License"
 msgstr "Licencja"
 
@@ -1160,23 +1256,17 @@
 msgid "Cannot get command for LIRC code."
 msgstr "Nie można pobrać komendy z LIRC."
 
-#: src/main.cpp:367 src/media_object.cpp:821 src/media_object.cpp:1286
-#: src/video_output.cpp:212
-#, c-format
-msgid "%s: %s"
-msgstr "%s : %s"
-
-#: src/main.cpp:379
+#: src/main.cpp:373
 #, c-format
 msgid "%s version %s"
 msgstr "%s wersja %s"
 
-#: src/main.cpp:380
+#: src/main.cpp:374
 #, fuzzy
 msgid "Copyright (C) 2012 the Bino developers."
 msgstr "Copyright (C) 2011 deweloperzy Bino."
 
-#: src/main.cpp:381
+#: src/main.cpp:375
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -1188,470 +1278,496 @@
 
 #. TRANSLATORS: This is the --help text. Please keep the line length limited.
 #. * The --help output should look good with a line width of 80 characters.
-#: src/main.cpp:399
+#: src/main.cpp:393
 msgid "Usage:"
 msgstr ""
 
-#: src/main.cpp:401
+#: src/main.cpp:395
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:402
+#: src/main.cpp:396
 msgid "Print help."
 msgstr ""
 
-#: src/main.cpp:403
+#: src/main.cpp:397
 msgid "Print version."
 msgstr ""
 
-#: src/main.cpp:404
+#: src/main.cpp:398
 msgid "Do not use the GUI, just show a plain window."
 msgstr ""
 
-#: src/main.cpp:405
+#: src/main.cpp:399
 msgid "Append all log messages to the given file."
 msgstr ""
 
-#: src/main.cpp:406
+#: src/main.cpp:400
 msgid "Set log level (debug/info/warning/error/quiet)."
 msgstr ""
 
-#: src/main.cpp:407
+#: src/main.cpp:401
 msgid "Print a list of known audio devices and exit."
 msgstr ""
 
-#: src/main.cpp:408
+#: src/main.cpp:402
 msgid "Use audio device number N (N=0 is the default)."
 msgstr ""
 
-#: src/main.cpp:409
+#: src/main.cpp:403
 msgid "Delay audio by D milliseconds. Default is 0."
 msgstr ""
 
-#: src/main.cpp:410
+#: src/main.cpp:404
 msgid "Set audio volume (0 to 1). Default is 1."
 msgstr ""
 
-#: src/main.cpp:411
+#: src/main.cpp:405
 #, fuzzy
 msgid "Mute audio."
 msgstr "Brak audio."
 
-#: src/main.cpp:412
+#: src/main.cpp:406
 msgid "Type of input device: default, firewire, x11."
 msgstr ""
 
-#: src/main.cpp:413
+#: src/main.cpp:407
 #, fuzzy
 msgid "Request frame size WxH from input device."
 msgstr "Wymagany rozmiar ramki"
 
-#: src/main.cpp:414
+#: src/main.cpp:408
 #, fuzzy
 msgid "Request frame rate N/D from input device."
 msgstr "Wymagany współczynnik \"fps\""
 
-#: src/main.cpp:415
+#: src/main.cpp:409
+msgid "Request device format 'default' or 'mjpeg'."
+msgstr ""
+
+#: src/main.cpp:410
+#, fuzzy
+msgid "Read commands from a file."
+msgstr "Błędna odebrana komenda LIRC '%s'."
+
+#: src/main.cpp:411
 #, fuzzy
 msgid "Use the given LIRC configuration file."
 msgstr "Nie można odczytać pliku konfiguracyjnego LIRC %s."
 
-#: src/main.cpp:416
+#: src/main.cpp:412
 msgid "This option can be used more than once."
 msgstr ""
 
-#: src/main.cpp:417
+#: src/main.cpp:413
 msgid "Select video stream (1-n, depending on input)."
 msgstr ""
 
-#: src/main.cpp:418
+#: src/main.cpp:414
 msgid "Select audio stream (1-n, depending on input)."
 msgstr ""
 
-#: src/main.cpp:419
+#: src/main.cpp:415
 #, fuzzy
 msgid "Select subtitle stream (0-n, dep. on input)."
 msgstr "Wybierz strumień napisów."
 
-#: src/main.cpp:420
+#: src/main.cpp:416
 msgid "Select input type (default autodetect):"
 msgstr ""
 
-#: src/main.cpp:421
+#: src/main.cpp:417
 #, fuzzy
 msgid "Single view."
 msgstr "Prawy obraz"
 
-#: src/main.cpp:422
+#: src/main.cpp:418
 #, fuzzy
 msgid "Left/right separate streams, left first."
 msgstr "Oddzielne strumienie, lewy pierwszy"
 
-#: src/main.cpp:423
+#: src/main.cpp:419
 #, fuzzy
 msgid "Left/right separate streams, right first."
 msgstr "Oddzielne strumienie, prawy pierwszy"
 
-#: src/main.cpp:424
+#: src/main.cpp:420
 #, fuzzy
 msgid "Left/right alternating, left first."
 msgstr "Oddzielne strumienie, lewy pierwszy"
 
-#: src/main.cpp:425
+#: src/main.cpp:421
 #, fuzzy
 msgid "Left/right alternating, right first."
 msgstr "Oddzielne strumienie, prawy pierwszy"
 
-#: src/main.cpp:426 src/main.cpp:441
+#: src/main.cpp:422 src/main.cpp:437
 msgid "Left top, right bottom."
 msgstr ""
 
-#: src/main.cpp:427 src/main.cpp:442
+#: src/main.cpp:423 src/main.cpp:438
 #, fuzzy
 msgid "Left top, right bottom, half height."
 msgstr "Góra/Dół, połowa wysokości"
 
-#: src/main.cpp:428
+#: src/main.cpp:424
 msgid "Left bottom, right top."
 msgstr ""
 
-#: src/main.cpp:429
+#: src/main.cpp:425
 #, fuzzy
 msgid "Left bottom, right top, half height."
 msgstr "Dół/Góra, połowa wysokości"
 
-#: src/main.cpp:430 src/main.cpp:443
+#: src/main.cpp:426 src/main.cpp:439
 msgid "Left left, right right."
 msgstr ""
 
-#: src/main.cpp:431 src/main.cpp:444
+#: src/main.cpp:427 src/main.cpp:440
 #, fuzzy
 msgid "Left left, right right, half width."
 msgstr "Lewy/Prawy, połowa szerokości"
 
-#: src/main.cpp:432
+#: src/main.cpp:428
 #, fuzzy
 msgid "Left right, right left."
 msgstr "Lewy/Prawy, połowa szerokości"
 
-#: src/main.cpp:433
+#: src/main.cpp:429
 #, fuzzy
 msgid "Left right, right left, half width."
 msgstr "Lewy/Prawy, połowa szerokości"
 
-#: src/main.cpp:434 src/main.cpp:445
+#: src/main.cpp:430 src/main.cpp:441
 msgid "Left even rows, right odd rows."
 msgstr ""
 
-#: src/main.cpp:435
+#: src/main.cpp:431
 msgid "Left odd rows, right even rows."
 msgstr ""
 
-#: src/main.cpp:436
+#: src/main.cpp:432
 msgid "Select output type:"
 msgstr ""
 
-#: src/main.cpp:437
+#: src/main.cpp:433
 #, fuzzy
 msgid "OpenGL quad-buffered stereo."
 msgstr "OpenGL stereo"
 
-#: src/main.cpp:438
+#: src/main.cpp:434
 #, fuzzy
 msgid "Left and right view alternating."
 msgstr "widok \"flip\" z prawej w pionie."
 
-#: src/main.cpp:439
+#: src/main.cpp:435
 msgid "Only left."
 msgstr ""
 
-#: src/main.cpp:440
+#: src/main.cpp:436
 msgid "Only right."
 msgstr ""
 
-#: src/main.cpp:446
+#: src/main.cpp:442
 msgid "Left even columns, right odd columns."
 msgstr ""
 
-#: src/main.cpp:447
+#: src/main.cpp:443
 #, fuzzy
 msgid "Left and right in checkerboard pattern."
 msgstr "Wzór szachownicy"
 
-#: src/main.cpp:448
+#: src/main.cpp:444
 #, fuzzy
 msgid "HDMI frame packing mode."
 msgstr "Tryb HDMI"
 
-#: src/main.cpp:449
+#: src/main.cpp:445
 #, fuzzy
 msgid "Red/cyan anaglyph, monochrome method."
 msgstr "Czerwony/cyjan, czarnobiały"
 
-#: src/main.cpp:450
+#: src/main.cpp:446
 #, fuzzy
 msgid "Red/cyan anaglyph, half color method."
 msgstr "Czerwony/cyjan, połowa koloru"
 
-#: src/main.cpp:451
+#: src/main.cpp:447
 #, fuzzy
 msgid "Red/cyan anaglyph, full color method."
 msgstr "Czerwony/cyjan, kolorowy"
 
-#: src/main.cpp:452
+#: src/main.cpp:448
 #, fuzzy
 msgid "Red/cyan anaglyph, Dubois method."
 msgstr "Czerwony/cyjan, Dubois"
 
-#: src/main.cpp:453
+#: src/main.cpp:449
 #, fuzzy
 msgid "Green/magenta anaglyph, monochrome method."
 msgstr "Zielony/karmazynowy, czarnobiały"
 
-#: src/main.cpp:454
+#: src/main.cpp:450
 #, fuzzy
 msgid "Green/magenta anaglyph, half color method."
 msgstr "Zielony/karmazynowy, połowa koloru"
 
-#: src/main.cpp:455
+#: src/main.cpp:451
 #, fuzzy
 msgid "Green/magenta anaglyph, full color method."
 msgstr "Zielony/karmazynowy, kolorowy"
 
-#: src/main.cpp:456
+#: src/main.cpp:452
 #, fuzzy
 msgid "Green/magenta anaglyph, Dubois method."
 msgstr "Zielony/karmazynowy, Dubois"
 
-#: src/main.cpp:457
+#: src/main.cpp:453
 #, fuzzy
 msgid "Amber/blue anaglyph, monochrome method."
 msgstr "Bursztynowy/niebieski, czarnobiały"
 
-#: src/main.cpp:458
+#: src/main.cpp:454
 #, fuzzy
 msgid "Amber/blue anaglyph, half color method."
 msgstr "Bursztynowy/niebieski, połowa koloru"
 
-#: src/main.cpp:459
+#: src/main.cpp:455
 #, fuzzy
 msgid "Amber/blue anaglyph, full color method."
 msgstr "Bursztynowy/niebieski, kolorowy"
 
-#: src/main.cpp:460
+#: src/main.cpp:456
 #, fuzzy
 msgid "Amber/blue anaglyph, Dubois method."
 msgstr "Bursztynowy/niebieski, Dubois"
 
-#: src/main.cpp:461
+#: src/main.cpp:457
 #, fuzzy
 msgid "Red/green anaglyph, monochrome method."
 msgstr "Czerwony/zielony, czarnobiały"
 
-#: src/main.cpp:462
+#: src/main.cpp:458
 #, fuzzy
 msgid "Red/blue anaglyph, monochrome method."
 msgstr "Czerwony/zielony, czarnobiały"
 
-#: src/main.cpp:463
+#: src/main.cpp:459
 msgid "Multi-display via Equalizer (2D setup)."
 msgstr ""
 
-#: src/main.cpp:464
+#: src/main.cpp:460
 msgid "Multi-display via Equalizer (3D setup)."
 msgstr ""
 
-#: src/main.cpp:465
+#: src/main.cpp:461
 #, fuzzy
 msgid "Swap left/right view."
 msgstr "Zamień lewy/prawy"
 
-#: src/main.cpp:466
+#: src/main.cpp:462
 #, fuzzy
 msgid "Fullscreen."
 msgstr "Podwójny ekran:"
 
-#: src/main.cpp:467
+#: src/main.cpp:463
 #, fuzzy
 msgid "Use the listed screens in fullscreen mode."
 msgstr "Użyj wiele ekranów jako trybu \"pełnego ekranu\""
 
-#: src/main.cpp:468
+#: src/main.cpp:464
 msgid "Screen numbers start with 1."
 msgstr ""
 
-#: src/main.cpp:469
+#: src/main.cpp:465
 msgid "An empty list defaults to the primary screen."
 msgstr ""
 
-#: src/main.cpp:470
+#: src/main.cpp:466
 #, fuzzy
 msgid "Flip left view vertically when fullscreen."
 msgstr "widok \"flip\" z lewej w pionie."
 
-#: src/main.cpp:471
+#: src/main.cpp:467
 #, fuzzy
 msgid "Flop left view horizontally when fullscreen."
 msgstr "widok \"flop\" z lewej w poziomie."
 
-#: src/main.cpp:472
+#: src/main.cpp:468
 #, fuzzy
 msgid "Flip right view vertically when fullscreen."
 msgstr "widok \"flip\" z prawej w pionie."
 
-#: src/main.cpp:473
+#: src/main.cpp:469
 #, fuzzy
 msgid "Flop right view horizontally when fullscreen."
 msgstr "widok \"flop\" z prawej w poziomie."
 
-#: src/main.cpp:474
+#: src/main.cpp:470
+msgid "Use DLP 3-D Ready Sync when fullscreen."
+msgstr ""
+
+#: src/main.cpp:471
 msgid "Set zoom for wide videos (0=off to 1=full)."
 msgstr ""
 
-#: src/main.cpp:475
+#: src/main.cpp:472
 msgid "Crop video to given aspect ratio (0:0=off)."
 msgstr ""
 
-#: src/main.cpp:476
+#: src/main.cpp:473
 #, fuzzy
 msgid "Center window on screen."
 msgstr "Wypośrodkuj obszar video na monitorze."
 
-#: src/main.cpp:477
+#: src/main.cpp:474
 #, fuzzy
 msgid "Set subtitle encoding."
 msgstr "kodek napisów"
 
-#: src/main.cpp:478
+#: src/main.cpp:475
 #, fuzzy
 msgid "Set subtitle font name."
 msgstr "Zastąp czcionkę napisu."
 
-#: src/main.cpp:479
+#: src/main.cpp:476
 #, fuzzy
 msgid "Set subtitle font size."
 msgstr "Zastąp rozmiar czcioni napisu."
 
-#: src/main.cpp:480
+#: src/main.cpp:477
 #, fuzzy
 msgid "Set subtitle scale factor."
 msgstr "Zastąp współczynnik skali napisu."
 
-#: src/main.cpp:481
+#: src/main.cpp:478
 msgid "Set subtitle color, in [AA]RRGGBB format."
 msgstr ""
 
-#: src/main.cpp:482
+#: src/main.cpp:479
+msgid "Set subtitle shadow, -1=default, 0=off, 1=on."
+msgstr ""
+
+#: src/main.cpp:480
 msgid "Subtitle parallax adjustment (-1 to +1)."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:481
 msgid "Parallax adjustment (-1 to +1)."
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:482
 msgid "Crosstalk leak level (0 to 1)."
 msgstr ""
 
-#: src/main.cpp:485
+#: src/main.cpp:483
 msgid "Comma-separated values for R,G,B."
 msgstr ""
 
-#: src/main.cpp:486
+#: src/main.cpp:484
 msgid "Amount of ghostbusting to apply (0 to 1)."
 msgstr ""
 
-#: src/main.cpp:487
+#: src/main.cpp:485
 msgid "Benchmark mode (no audio, show fps)."
 msgstr ""
 
-#: src/main.cpp:488
+#: src/main.cpp:486
 msgid "Frame rate divisor for display refresh rate."
 msgstr ""
 
-#: src/main.cpp:489
+#: src/main.cpp:487
 msgid "Default is 0 for benchmark mode, 1 otherwise."
 msgstr ""
 
-#: src/main.cpp:490
+#: src/main.cpp:488
 msgid "Loop the input media."
 msgstr ""
 
-#: src/main.cpp:492
+#: src/main.cpp:489
+msgid "Set SDI output format."
+msgstr ""
+
+#: src/main.cpp:491
 msgid "Interactive control:"
 msgstr ""
 
-#: src/main.cpp:493
+#: src/main.cpp:492
 #, fuzzy
 msgid "Leave fullscreen mode, or quit."
 msgstr "Kiedy w trybie \"pełnego ekranu\","
 
-#: src/main.cpp:494
+#: src/main.cpp:493
 #, fuzzy
 msgid "Quit."
 msgstr "&Zakończ..."
 
-#: src/main.cpp:515
+#: src/main.cpp:514
 msgid "Seek according to horizontal click position."
 msgstr ""
 
-#: src/main.cpp:523
+#: src/main.cpp:522
 msgid "No audio devices known."
 msgstr ""
 
-#: src/main.cpp:595
+#: src/main.cpp:594
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Opcja testowa: audio i synchronizacja czasu wyłączona."
 
-#: src/main.cpp:729
+#: src/main.cpp:608
+#, c-format
+msgid "Unknown mode %s."
+msgstr ""
+
+#: src/main.cpp:740
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Ta wersja bino została skompilowana bez obsługi LIRC."
 
 #. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:935
+#: src/media_data.cpp:1051
 #, c-format
 msgid "%dx%d, %.3g:1"
 msgstr "%dx%d, %.3g:1"
 
 #. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:1066
+#: src/media_data.cpp:1182
 #, c-format
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d ch., %g kHz, %d bit"
 
-#: src/media_input.cpp:282
+#: src/media_input.cpp:281
 #, c-format
 msgid "Video %s: %s"
 msgstr "Video %s : %s"
 
-#: src/media_input.cpp:287
+#: src/media_input.cpp:286
 msgid "No video."
 msgstr "Brak video."
 
-#: src/media_input.cpp:293
+#: src/media_input.cpp:292
 #, c-format
 msgid "Audio %s: %s"
 msgstr "Audio %s : %s"
 
-#: src/media_input.cpp:298
+#: src/media_input.cpp:297
 msgid "No audio."
 msgstr "Brak audio."
 
-#: src/media_input.cpp:304
+#: src/media_input.cpp:303
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr "Napisy %s : %s"
 
-#: src/media_input.cpp:309
+#: src/media_input.cpp:308
 msgid "No subtitle."
 msgstr "Brak napisów."
 
-#: src/media_input.cpp:311
+#: src/media_input.cpp:310
 #, c-format
 msgid "Duration: %g seconds"
 msgstr "Czas trwania: %g sekund"
 
-#: src/media_input.cpp:314
+#: src/media_input.cpp:313
 #, c-format
 msgid "Stereo layout: %s"
 msgstr "Układ stereo: %s"
@@ -1680,146 +1796,146 @@
 msgid "default"
 msgstr "domyślne"
 
-#: src/media_object.cpp:832
+#: src/media_object.cpp:836
 #, c-format
 msgid "%s: Cannot read stream info: %s"
 msgstr "%s: Nie można odczytać strumienia info: %s"
 
-#: src/media_object.cpp:876
+#: src/media_object.cpp:880
 #, c-format
 msgid "%s stream %d: Cannot open %s: %s"
 msgstr "%s strumień %d : Nie można otworzyć %s : %s"
 
-#: src/media_object.cpp:877
+#: src/media_object.cpp:881
 msgid "video codec"
 msgstr "kodek video"
 
-#: src/media_object.cpp:878
+#: src/media_object.cpp:882
 msgid "audio codec"
 msgstr "kodek audio"
 
-#: src/media_object.cpp:879
+#: src/media_object.cpp:883
 msgid "subtitle codec"
 msgstr "kodek napisów"
 
-#: src/media_object.cpp:880
+#: src/media_object.cpp:884
 msgid "data"
 msgstr "dane"
 
-#: src/media_object.cpp:881
+#: src/media_object.cpp:885
 msgid "codec not supported"
 msgstr "nie wspierany kodek"
 
-#: src/media_object.cpp:891
+#: src/media_object.cpp:895
 #, c-format
 msgid "%s video stream %d: Invalid frame size."
 msgstr "%s strumień video %d: Zły rozmiar ramki."
 
-#: src/media_object.cpp:935
+#: src/media_object.cpp:939
 #, c-format
 msgid "%s video stream %d: Cannot initialize conversion context."
 msgstr ""
 "%s strumień video %d: Nie można zainicjować konwersji zależnej od kontekstu."
 
-#: src/media_object.cpp:998
+#: src/media_object.cpp:1002
 #, c-format
 msgid "Video stream %d: %s / %s, %g seconds"
 msgstr "Strumień video %d: %s / %s, %g sekund"
 
-#: src/media_object.cpp:1002
+#: src/media_object.cpp:1006
 #, c-format
 msgid "Using up to %d threads for decoding."
 msgstr "Użyj do %d wątków do dekodowania."
 
-#: src/media_object.cpp:1007
+#: src/media_object.cpp:1011
 #, c-format
 msgid "Audio stream %d: %s / %s, %g seconds"
 msgstr "Strumień audio %d: %s / %s, %g sekund"
 
-#: src/media_object.cpp:1014
+#: src/media_object.cpp:1018
 #, c-format
 msgid "Subtitle stream %d: %s / %s, %g seconds"
 msgstr "Napisy %d: %s / %s, %g sekund"
 
-#: src/media_object.cpp:1021
+#: src/media_object.cpp:1025
 msgid "No usable streams."
 msgstr "Brak użytecznych strumieni."
 
-#: src/media_object.cpp:1302 src/media_object.cpp:1332
-#: src/media_object.cpp:1362
+#: src/media_object.cpp:1306 src/media_object.cpp:1336
+#: src/media_object.cpp:1366
 #, c-format
 msgid "%s: Cannot duplicate packet."
 msgstr "%s: Nie mogę skopiować pakietu."
 
-#: src/media_object.cpp:1456
+#: src/media_object.cpp:1460
 #, fuzzy, c-format
 msgid "%s video stream %d: Dropping %dx%d frame"
 msgstr "%s strumień video %d: Zły rozmiar ramki."
 
-#: src/media_object.cpp:1919
+#: src/media_object.cpp:1923
 #, c-format
 msgid "%s: Seeking failed."
 msgstr "%s: Przesuwanie zakończone niepowodzeniem ."
 
-#: src/player.cpp:434
+#: src/player.cpp:437
 #, fuzzy, c-format
 msgid "Video: delay %g seconds/%g frames; dropping next frame."
 msgstr "Video: późnienie %g sekund; odrzucanie następnej ramki."
 
-#: src/player.cpp:450
+#: src/player.cpp:453
 #, c-format
 msgid "FPS: %.2f"
 msgstr "FPS : %.2f"
 
-#: src/player_equalizer.cpp:116
+#: src/player_equalizer.cpp:117
 msgid "Reading input frame failed."
 msgstr "Odczytywanie wejściowej ramki zakończony niepowodzeniem."
 
-#: src/player_equalizer.cpp:165 src/video_output_qt.cpp:590
-#: src/video_output_qt.cpp:597
+#: src/player_equalizer.cpp:166 src/video_output_qt.cpp:613
+#: src/video_output_qt.cpp:620
 msgid "Waiting for subtitle renderer initialization..."
 msgstr "Oczekiwanie na inicjację renderowania napisów..."
 
-#: src/player_equalizer.cpp:250
+#: src/player_equalizer.cpp:251
 msgid "Init data mapping failed."
 msgstr "Inicjowanie mapowanych danych nie powiodło się."
 
-#: src/player_equalizer.cpp:251
+#: src/player_equalizer.cpp:252
 msgid "Frame data mapping failed."
 msgstr "Mapowanie danych ramki nie powiodło się."
 
-#: src/player_equalizer.cpp:252
+#: src/player_equalizer.cpp:253
 msgid "Video player initialization failed."
 msgstr "Inicjacja odtwarzacza nie powiodła się."
 
-#: src/player_equalizer.cpp:253
+#: src/player_equalizer.cpp:254
 msgid "Need at least OpenGL 2.1."
 msgstr "Minimalna wymagana wersja OpenGL to 2.1."
 
-#: src/player_equalizer.cpp:430
+#: src/player_equalizer.cpp:431
 msgid "No canvas in Equalizer configuration."
 msgstr "Brak obrazu w konfiguracji korektora."
 
-#: src/player_equalizer.cpp:437
+#: src/player_equalizer.cpp:438
 #, fuzzy, c-format
 msgid "Equalizer canvas: %gx%g, aspect ratio %g:1"
 msgstr "%gx%g, proporcja obrazu %g:1"
 
-#: src/player_equalizer.cpp:922 src/video_output_qt.cpp:560
+#: src/player_equalizer.cpp:926 src/video_output_qt.cpp:583
 msgid ""
 "This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
 "objects."
 msgstr "Ta implementacja OpenGL 2.1 nie obsługuje obiektów \"framebuffer\"."
 
-#: src/player_equalizer.cpp:1105
+#: src/player_equalizer.cpp:1107
 msgid "Equalizer initialization failed."
 msgstr "Inicjacja korektora nie powiodła się."
 
-#: src/player_equalizer.cpp:1113
+#: src/player_equalizer.cpp:1115
 msgid "Cannot get equalizer configuration."
 msgstr "Nie można pobrać konfiguracji korektora."
 
-#: src/player_equalizer.cpp:1127
+#: src/player_equalizer.cpp:1132
 msgid "Equalizer configuration initialization failed."
 msgstr "Inicjacja konfiguracji korektora zakończona niepowodzeniem."
 
@@ -1831,83 +1947,88 @@
 msgid "Cannot initialize LibASS renderer."
 msgstr "Nie można zainicjować renderowania LibASS."
 
-#: src/subtitle_renderer.cpp:398
+#: src/subtitle_renderer.cpp:404
 msgid "Cannot initialize LibASS track."
 msgstr "Nie można zainicjować ścieżki LibASS."
 
-#: src/subtitle_renderer.cpp:409
+#: src/subtitle_renderer.cpp:415
 #, c-format
 msgid "Subtitle character set conversion failed: %s"
 msgstr "Ustawienie kodowania konwersji napisów zakończone niepowodzeniem: %s"
 
-#: src/video_output.cpp:145
+#: src/video_output.cpp:347
 #, c-format
 msgid "OpenGL error 0x%04X."
 msgstr "OpenGL błąd 0x%04X."
 
-#: src/video_output.cpp:203
+#: src/video_output.cpp:359
+#, fuzzy, c-format
+msgid "OpenGL Framebuffer status error 0x%04X."
+msgstr "OpenGL błąd 0x%04X."
+
+#: src/video_output.cpp:407
 #, c-format
 msgid "OpenGL %s '%s': compiler warning:"
 msgstr "OpenGL %s '%s': ostrzeżenie kompilatora:"
 
-#: src/video_output.cpp:204 src/video_output.cpp:209
+#: src/video_output.cpp:408 src/video_output.cpp:413
 msgid "vertex shader"
 msgstr "vertex shader"
 
-#: src/video_output.cpp:204 src/video_output.cpp:209
+#: src/video_output.cpp:408 src/video_output.cpp:413
 msgid "fragment shader"
 msgstr "fragment shader"
 
-#: src/video_output.cpp:208
+#: src/video_output.cpp:412
 #, c-format
 msgid "OpenGL %s '%s': compilation failed."
 msgstr "OpenGL %s '%s': kompilacja zakończona niepowodzeniem."
 
-#: src/video_output.cpp:211 src/video_output.cpp:288
+#: src/video_output.cpp:415 src/video_output.cpp:492
 msgid "unknown error"
 msgstr "nieznany błąd"
 
-#: src/video_output.cpp:284
+#: src/video_output.cpp:488
 #, c-format
 msgid "OpenGL program '%s': linker warning:"
 msgstr "OpenGL program '%s': ostrzeżenie linkowania:"
 
-#: src/video_output.cpp:287
+#: src/video_output.cpp:491
 #, c-format
 msgid "OpenGL program '%s': linking failed."
 msgstr "OpenGL program '%s': linkowanie zakończone niepowodzeniem."
 
-#: src/video_output.cpp:563 src/video_output.cpp:675
+#: src/video_output.cpp:1494 src/video_output.cpp:1635
 msgid "Cannot create a PBO buffer."
 msgstr "Nie można utworzyć buforu PBO."
 
-#: src/video_output_qt.cpp:555
+#: src/video_output_qt.cpp:578
 #, c-format
 msgid "Cannot initialize GLEW: %s"
 msgstr "Nie można zainicjować biblioteki GLEW: %s"
 
-#: src/video_output_qt.cpp:588
+#: src/video_output_qt.cpp:611
 msgid "Please wait"
 msgstr "Proszę czekać"
 
-#: src/video_output_qt.cpp:643
+#: src/video_output_qt.cpp:671
 #, fuzzy
 msgid "Cannot get valid OpenGL context."
 msgstr "Nie można ustawić formatu OpenGL."
 
-#: src/video_output_qt.cpp:654
+#: src/video_output_qt.cpp:682
 msgid "The display does not support OpenGL stereo mode."
 msgstr "Nie obsługiwany tryb stereo OpenGL."
 
-#: src/video_output_qt.cpp:659
+#: src/video_output_qt.cpp:687
 msgid "Cannot set OpenGL context format."
 msgstr "Nie można ustawić formatu OpenGL."
 
-#: src/video_output_qt.cpp:752
+#: src/video_output_qt.cpp:780
 msgid "Cannot suspend screensaver."
 msgstr "Nie można wstrzymać działania \"screensaver'a\"."
 
-#: src/video_output_qt.cpp:767
+#: src/video_output_qt.cpp:795
 msgid "Cannot resume screensaver."
 msgstr "Nie można wznowić działania \"screensaver'a\""

bino-1.3.2.tar.xz/po/ru.gmo -> bino-1.3.3.tar.xz/po/ru.gmo Changed

bino-1.3.2.tar.xz/po/ru.po -> bino-1.3.3.tar.xz/po/ru.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-03-16 19:49+0100\n"
+"POT-Creation-Date: 2012-05-01 15:05+0200\n"
 "PO-Revision-Date: 2011-08-28 01:00+0600\n"
 "Last-Translator: Alexey Osipov <simba@lerlan.ru>\n"
 "Language-Team: \n"
@@ -88,13 +88,13 @@
 msgid "Too many arguments."
 msgstr "Слишком много параметров."
 
-#: src/base/str.cpp:236
+#: src/base/str.cpp:267
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Невозможно преобразовать строку в %s."
 
-#: src/base/str.cpp:455 src/base/str.cpp:473 src/base/str.cpp:483
-#: src/base/str.cpp:494 src/base/str.cpp:499
+#: 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."
@@ -121,8 +121,8 @@
 msgstr "Устройства OpenAL не доступны."
 
 #: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
-#: src/media_data.cpp:1067 src/media_data.cpp:1090 src/media_data.cpp:1128
-#: src/media_data.cpp:1133
+#: src/media_data.cpp:1183 src/media_data.cpp:1206 src/media_data.cpp:1244
+#: src/media_data.cpp:1249
 msgid "unknown"
 msgstr "неизвестно"
 
@@ -188,244 +188,256 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Невозможно получить из очереди буферы источника OpenAL."
 
-#: src/dispatch.cpp:156
+#: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
+#: src/main.cpp:361 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
+#, fuzzy, c-format
+msgid "%s: invalid command '%s'"
+msgstr "От LIRC получена некорректная команда '%s'."
+
+#: src/dispatch.cpp:166
 msgid "Cannot connect to X server."
 msgstr "Невозможно присоединиться к X серверу."
 
-#: src/dispatch.cpp:171
+#: src/dispatch.cpp:182
 msgid "No video to play."
 msgstr "Нет видео для воспроизведения."
 
-#: src/dispatch.cpp:411 src/player_equalizer.cpp:84
+#: src/dispatch.cpp:437 src/player_equalizer.cpp:85
 msgid "No video streams found."
 msgstr "Видео дорожек не найдено."
 
-#: src/dispatch.cpp:428
+#: src/dispatch.cpp:454
 msgid "Cannot set requested stereo layout: incompatible media."
 msgstr ""
 "Невозможно установить требуемую стерео раскладку: неподходящий носитель."
 
-#: src/dispatch.cpp:443
+#: src/dispatch.cpp:469
 #, c-format
 msgid "Video stream %d not found."
 msgstr "Видео дорожка %d не найдена."
 
-#: src/dispatch.cpp:449
+#: src/dispatch.cpp:475
 #, c-format
 msgid "Audio stream %d not found."
 msgstr "Аудио дорожка %d не найдена."
 
-#: src/dispatch.cpp:457
+#: src/dispatch.cpp:483
 #, c-format
 msgid "Subtitle stream %d not found."
 msgstr "Дорожка субтитров %d не найдена."
 
-#: src/dispatch.cpp:529 src/main.cpp:736
+#: src/dispatch.cpp:555 src/main.cpp:748
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Эта версия Bino была собрана без поддержки Equalizer."
 
-#: src/gui.cpp:101
+#: src/gui.cpp:107
 msgid "Video:"
 msgstr "Видео:"
 
-#: src/gui.cpp:102
+#: src/gui.cpp:108
 msgid "Select the video stream."
 msgstr "Выберите видео дорожку."
 
-#: src/gui.cpp:108
+#: src/gui.cpp:114
 msgid "Audio:"
 msgstr "Аудио:"
 
-#: src/gui.cpp:109
+#: src/gui.cpp:115
 msgid "Select the audio stream."
 msgstr "Выберите аудио дорожку."
 
-#: src/gui.cpp:115
+#: src/gui.cpp:121
 msgid "Subtitle:"
 msgstr "Субтитры:"
 
-#: src/gui.cpp:116
+#: src/gui.cpp:122
 msgid "Select the subtitle stream."
 msgstr "Выберите дорожку субтитров."
 
-#: src/gui.cpp:127 src/media_input.cpp:277
+#: src/gui.cpp:133 src/media_input.cpp:276
 msgid "Input:"
 msgstr "Источник:"
 
-#: src/gui.cpp:128
+#: src/gui.cpp:134
 msgid "Set the 3D layout of the video stream."
 msgstr "Укажите 3D раскладку исходного видеофайла."
 
-#: src/gui.cpp:132
+#: src/gui.cpp:138
 msgid "2D"
 msgstr "2D"
 
-#: src/gui.cpp:133
+#: src/gui.cpp:139
 msgid "Separate streams, left first"
 msgstr "Отдельные видеофайлы, сначала левый"
 
-#: src/gui.cpp:134
+#: src/gui.cpp:140
 msgid "Separate streams, right first"
 msgstr "Отдельные видеофайлы, сначала правый"
 
-#: src/gui.cpp:135
+#: src/gui.cpp:141
 #, fuzzy
 msgid "Alternating, left first"
 msgstr "Отдельные видеофайлы, сначала левый"
 
-#: src/gui.cpp:136
+#: src/gui.cpp:142
 #, fuzzy
 msgid "Alternating, right first"
 msgstr "Отдельные видеофайлы, сначала правый"
 
-#: src/gui.cpp:137 src/gui.cpp:161
+#: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2095 src/gui.cpp:2124
 msgid "Top/bottom"
 msgstr "Сверху/снизу"
 
-#: src/gui.cpp:138 src/gui.cpp:162
+#: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2096 src/gui.cpp:2125
 msgid "Top/bottom, half height"
 msgstr "Сверху/снизу, в половину высоты"
 
-#: src/gui.cpp:139
+#: src/gui.cpp:145
 msgid "Bottom/top"
 msgstr "Снизу/сверху"
 
-#: src/gui.cpp:140
+#: src/gui.cpp:146
 msgid "Bottom/top, half height"
 msgstr "Снизу/сверху, в половину высоты"
 
-#: src/gui.cpp:141 src/gui.cpp:163
+#: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2097 src/gui.cpp:2126
 msgid "Left/right"
 msgstr "Слева/справа"
 
-#: src/gui.cpp:142 src/gui.cpp:164
+#: src/gui.cpp:148 src/gui.cpp:170 src/gui.cpp:2098 src/gui.cpp:2127
 msgid "Left/right, half width"
 msgstr "Слева/справа, в половину ширины"
 
-#: src/gui.cpp:143
+#: src/gui.cpp:149
 msgid "Right/left"
 msgstr "Справа/слева"
 
-#: src/gui.cpp:144
+#: src/gui.cpp:150
 msgid "Right/left, half width"
 msgstr "Справа/слева, в половину ширины"
 
-#: src/gui.cpp:145 src/gui.cpp:165
+#: src/gui.cpp:151 src/gui.cpp:171 src/gui.cpp:2099 src/gui.cpp:2128
 msgid "Even/odd rows"
 msgstr "Четные/нечетные ряды"
 
-#: src/gui.cpp:146
+#: src/gui.cpp:152
 msgid "Odd/even rows"
 msgstr "Нечетные/четные ряды"
 
-#: src/gui.cpp:152
+#: src/gui.cpp:158
 msgid "Output:"
 msgstr "Режим:"
 
-#: src/gui.cpp:153
+#: src/gui.cpp:159
 msgid "Set the 3D output type for your display."
 msgstr "Укажите 3D режим для вашего дисплея."
 
-#: src/gui.cpp:157
+#: src/gui.cpp:163 src/gui.cpp:2093 src/gui.cpp:2122
 msgid "Left view"
 msgstr "Левый видеоряд"
 
-#: src/gui.cpp:158
+#: src/gui.cpp:164 src/gui.cpp:2094 src/gui.cpp:2123
 msgid "Right view"
 msgstr "Правый видеоряд"
 
-#: src/gui.cpp:159
+#: src/gui.cpp:165
 msgid "OpenGL stereo"
 msgstr "Стерео OpenGL"
 
-#: src/gui.cpp:160
+#: src/gui.cpp:166
 msgid "Left/right view alternating"
 msgstr ""
 
-#: src/gui.cpp:166
+#: src/gui.cpp:172 src/gui.cpp:2100 src/gui.cpp:2129
 msgid "Even/odd columns"
 msgstr "Четные/нечетные столбцы"
 
-#: src/gui.cpp:167
+#: src/gui.cpp:173 src/gui.cpp:2101 src/gui.cpp:2130
 msgid "Checkerboard pattern"
 msgstr "В шахматном порядке"
 
-#: src/gui.cpp:168
+#: src/gui.cpp:174
 msgid "HDMI frame packing mode"
 msgstr "Режим упаковки кадров HDMI"
 
-#: src/gui.cpp:169
+#: src/gui.cpp:175 src/gui.cpp:2102 src/gui.cpp:2131
 msgid "Red/cyan glasses, monochrome method"
 msgstr "Красно-голубые очки, черно-белый режим"
 
-#: src/gui.cpp:170
+#: src/gui.cpp:176 src/gui.cpp:2103 src/gui.cpp:2132
 msgid "Red/cyan glasses, half-color method"
 msgstr "Красно-голубые очки, режим половины цветности"
 
-#: src/gui.cpp:171
+#: src/gui.cpp:177 src/gui.cpp:2104 src/gui.cpp:2133
 msgid "Red/cyan glasses, full-color method"
 msgstr "Красно-голубые очки, полноцветный режим"
 
-#: src/gui.cpp:172
+#: src/gui.cpp:178 src/gui.cpp:2105 src/gui.cpp:2134
 msgid "Red/cyan glasses, high-quality Dubois method"
 msgstr "Красно-голубые очки, высококачественный метод Дюбуа"
 
-#: src/gui.cpp:173
+#: src/gui.cpp:179 src/gui.cpp:2106 src/gui.cpp:2135
 msgid "Green/magenta glasses, monochrome method"
 msgstr "Зелёно-пурпурные очки, черно-белый режим"
 
-#: src/gui.cpp:174
+#: src/gui.cpp:180 src/gui.cpp:2107 src/gui.cpp:2136
 msgid "Green/magenta glasses, half-color method"
 msgstr "Зелёно-пурпурные очки, режим половины цветности"
 
-#: src/gui.cpp:175
+#: src/gui.cpp:181 src/gui.cpp:2108 src/gui.cpp:2137
 msgid "Green/magenta glasses, full-color method"
 msgstr "Зелёно-пурпурные очки, полноцветный режим"
 
-#: src/gui.cpp:176
+#: src/gui.cpp:182 src/gui.cpp:2109 src/gui.cpp:2138
 msgid "Green/magenta glasses, high-quality Dubois method"
 msgstr "Зелёно-пурпурные очки, высококачественный метод Дюбуа"
 
-#: src/gui.cpp:177
+#: src/gui.cpp:183 src/gui.cpp:2110 src/gui.cpp:2139
 msgid "Amber/blue glasses, monochrome method"
 msgstr "Янтарно-синие очки, черно-белый режим"
 
-#: src/gui.cpp:178
+#: src/gui.cpp:184 src/gui.cpp:2111 src/gui.cpp:2140
 msgid "Amber/blue glasses, half-color method"
 msgstr "Янтарно-синие очки, режим половины цветности"
 
-#: src/gui.cpp:179
+#: src/gui.cpp:185 src/gui.cpp:2112 src/gui.cpp:2141
 msgid "Amber/blue glasses, full-color method"
 msgstr "Янтарно-синие очки, полноцветный режим"
 
-#: src/gui.cpp:180
+#: src/gui.cpp:186 src/gui.cpp:2113 src/gui.cpp:2142
 msgid "Amber/blue glasses, high-quality Dubois method"
 msgstr "Янтарно-синие очки, высококачественный метод Дюбуа"
 
-#: src/gui.cpp:181
+#: src/gui.cpp:187 src/gui.cpp:2114 src/gui.cpp:2143
 msgid "Red/green glasses, monochrome method"
 msgstr "Красно-зелёные очки, черно-белый режим"
 
-#: src/gui.cpp:182
+#: src/gui.cpp:188 src/gui.cpp:2115 src/gui.cpp:2144
 msgid "Red/blue glasses, monochrome method"
 msgstr "Красно-синие очки, черно-белый режим"
 
-#: src/gui.cpp:186
+#: src/gui.cpp:192
 msgid "Swap left/right"
 msgstr "Наоборот"
 
-#: src/gui.cpp:187
+#: src/gui.cpp:193
 msgid ""
 "Swap the left and right view. Use this if the 3D effect seems wrong."
 msgstr ""
 "Поменять местами левый и правый видеоряды. Включите, если 3D эффект "
 "кажется неправильным."
 
-#: src/gui.cpp:467
+#: src/gui.cpp:471 src/gui.cpp:1676
 msgid "Off"
 msgstr "Выключено"
 
-#: src/gui.cpp:694
+#: src/gui.cpp:702
 msgid ""
 "This slider shows the progress during video playback, and can be used to "
 "seek in the video."
@@ -433,36 +445,36 @@
 "Этот ползунок показывает позицию воспроизведения и может быть использован "
 "для перемотки."
 
-#: src/gui.cpp:701
+#: src/gui.cpp:709
 msgid "Elapsed / total time."
 msgstr "Прошло / всего времени."
 
-#: src/gui.cpp:708
+#: src/gui.cpp:716
 #, fuzzy
 msgid "Toggle audio mute."
 msgstr "Включить/выключить режим повтора."
 
-#: src/gui.cpp:713
+#: src/gui.cpp:721
 msgid "Adjust audio volume."
 msgstr ""
 
-#: src/gui.cpp:725
+#: src/gui.cpp:733
 msgid "Play."
 msgstr "Воспроизведение."
 
-#: src/gui.cpp:729
+#: src/gui.cpp:737
 msgid "Pause."
 msgstr "Пауза."
 
-#: src/gui.cpp:733
+#: src/gui.cpp:741
 msgid "Stop."
 msgstr "Стоп."
 
-#: src/gui.cpp:738
+#: src/gui.cpp:746
 msgid "Toggle loop mode."
 msgstr "Включить/выключить режим повтора."
 
-#: src/gui.cpp:745
+#: src/gui.cpp:753
 msgid ""
 "Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
 "f key."
@@ -470,151 +482,159 @@
 "Перейти в полноэкранный режим. Вы можете покинуть полноэкранный режим "
 "путем нажатия клавиши f."
 
-#: src/gui.cpp:751
+#: src/gui.cpp:759
 msgid "Center the video area on your screen."
 msgstr "Расположить видео по центру экрана."
 
-#: src/gui.cpp:758
+#: src/gui.cpp:766
 msgid "Seek backward 10 minutes."
 msgstr "Перемотать на 10 минут назад."
 
-#: src/gui.cpp:763
+#: src/gui.cpp:771
 msgid "Seek backward 1 minute."
 msgstr "Перемотать на 1 минуту назад."
 
-#: src/gui.cpp:769
+#: src/gui.cpp:777
 msgid "Seek backward 10 seconds."
 msgstr "Перемотать на 10 секунд назад."
 
-#: src/gui.cpp:775
+#: src/gui.cpp:783
 msgid "Seek forward 10 seconds."
 msgstr "Перемотать на 10 секунд вперед."
 
-#: src/gui.cpp:780
+#: src/gui.cpp:788
 msgid "Seek forward 1 minute."
 msgstr "Перемотать на 1 минуту вперед."
 
-#: src/gui.cpp:786
+#: src/gui.cpp:794
 msgid "Seek forward 10 minutes."
 msgstr "Перемотать на 10 минут вперед."
 
-#: src/gui.cpp:1047
+#: src/gui.cpp:1055
 msgid "Fullscreen/Multiscreen Settings"
 msgstr "Полноэкранный и многоэкранный режим"
 
-#: src/gui.cpp:1049
+#: src/gui.cpp:1057
 msgid "Configure fullscreen mode:"
 msgstr "Настройки полноэкранного режима:"
 
-#: src/gui.cpp:1050
+#: src/gui.cpp:1058
 msgid "Select the screens to use in fullscreen mode."
 msgstr "Выберите экраны для полноэкранного режима."
 
-#: src/gui.cpp:1052
+#: src/gui.cpp:1060
 msgid "Single screen:"
 msgstr "Один экран:"
 
-#: src/gui.cpp:1053
+#: src/gui.cpp:1061
 msgid "Use a single screen for fullscreen mode."
 msgstr "Использовать один экран для полноэкранного режима."
 
-#: src/gui.cpp:1056
+#: src/gui.cpp:1064
 msgid "Primary screen"
 msgstr "Главный экран"
 
-#: src/gui.cpp:1059 src/gui.cpp:1070 src/gui.cpp:1071
+#: src/gui.cpp:1067 src/gui.cpp:1078 src/gui.cpp:1079
 #, c-format
 msgid "Screen %d"
 msgstr "Экран %d"
 
-#: src/gui.cpp:1062
+#: src/gui.cpp:1070
 msgid "Dual screen:"
 msgstr "Два экрана:"
 
-#: src/gui.cpp:1063
+#: src/gui.cpp:1071
 msgid "Use two screens for fullscreen mode."
 msgstr "Использовать два экрана для полноэкранного режима."
 
-#: src/gui.cpp:1075
+#: src/gui.cpp:1083
 msgid "Multi screen:"
 msgstr "Много экранов:"
 
-#: src/gui.cpp:1076
+#: src/gui.cpp:1084
 msgid "Use multiple screens for fullscreen mode."
 msgstr "Использовать много экранов для полноэкранного режима"
 
-#: src/gui.cpp:1078
+#: src/gui.cpp:1086
 msgid "Comma-separated list of screens to use for fullscreen mode."
 msgstr "Список экранов для полноэкранного режима, разделенных запятыми."
 
-#: src/gui.cpp:1081
+#: src/gui.cpp:1089
 msgid "When in fullscreen mode,"
 msgstr "Когда в полноэкранном режиме,"
 
-#: src/gui.cpp:1082
+#: src/gui.cpp:1090
 msgid "Set special left/right view handling for fullscreen mode."
 msgstr ""
 "Включить специальную обработку левого и правого видеорядов в "
 "полноэкранном режиме."
 
-#: src/gui.cpp:1084
+#: src/gui.cpp:1092
 msgid "flip left view vertically."
 msgstr "отразить левый видеоряд вертикально."
 
-#: src/gui.cpp:1086
+#: src/gui.cpp:1094
 msgid "flop left view horizontally."
 msgstr "отразить левый видеоряд горизонтально."
 
-#: src/gui.cpp:1088
+#: src/gui.cpp:1096
 msgid "flip right view vertically."
 msgstr "отразить правый видеоряд вертикально."
 
-#: src/gui.cpp:1090
+#: src/gui.cpp:1098
 msgid "flop right view horizontally."
 msgstr "отразить правый видеоряд горизонтально."
 
-#: src/gui.cpp:1093
+#: src/gui.cpp:1101
+msgid "use DLP(R) 3-D Ready Sync"
+msgstr ""
+
+#: src/gui.cpp:1102
+msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
+msgstr ""
+
+#: src/gui.cpp:1104
 #, fuzzy
 msgid "inhibit the screensaver"
 msgstr "Невозможно включить хранитель экрана."
 
-#: src/gui.cpp:1094
+#: src/gui.cpp:1105
 #, fuzzy
 msgid "Inhibit the screensaver during fullscreen playback."
 msgstr "Выберите экраны для полноэкранного режима."
 
-#: src/gui.cpp:1096 src/gui.cpp:1258 src/gui.cpp:1393 src/gui.cpp:1463
-#: src/gui.cpp:1541 src/gui.cpp:1652 src/gui.cpp:1928 src/gui.cpp:2108
-#: src/gui.cpp:2778 src/gui.cpp:2825 src/gui.cpp:3114
+#: src/gui.cpp:1107 src/gui.cpp:1273 src/gui.cpp:1408 src/gui.cpp:1478
+#: src/gui.cpp:1556 src/gui.cpp:1680 src/gui.cpp:1948 src/gui.cpp:2147
+#: src/gui.cpp:2625 src/gui.cpp:3324 src/gui.cpp:3371 src/gui.cpp:3677
 msgid "OK"
 msgstr "OK"
 
-#: src/gui.cpp:1211
+#: src/gui.cpp:1226
 msgid "Display Color Adjustments"
 msgstr "Настройки цветности"
 
-#: src/gui.cpp:1213
+#: src/gui.cpp:1228
 msgid "Contrast:"
 msgstr "Контрастность:"
 
-#: src/gui.cpp:1224
+#: src/gui.cpp:1239
 msgid "Brightness:"
 msgstr "Яркость:"
 
-#: src/gui.cpp:1235
+#: src/gui.cpp:1250
 msgid "Hue:"
 msgstr "Оттенок:"
 
-#: src/gui.cpp:1246
+#: src/gui.cpp:1261
 msgid "Saturation:"
 msgstr "Насыщенность:"
 
-#: src/gui.cpp:1364
+#: src/gui.cpp:1379
 msgid "Display Crosstalk Calibration"
 msgstr "Уровни перекрестных помех"
 
 #. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/gui.cpp:1367
+#: src/gui.cpp:1382
 msgid ""
 "Please read the manual to find out how to measure the crosstalk "
 "levels of your display."
@@ -622,144 +642,161 @@
 "Пожалуйста прочтите инструкцию, чтобы узнать, как измерить "
 "уровень перекрестных помех."
 
-#: src/gui.cpp:1371
+#: src/gui.cpp:1386
 msgid "Red:"
 msgstr "Красный:"
 
-#: src/gui.cpp:1378
+#: src/gui.cpp:1393
 msgid "Green:"
 msgstr "Зеленый:"
 
-#: src/gui.cpp:1385
+#: src/gui.cpp:1400
 msgid "Blue:"
 msgstr "Синий:"
 
-#: src/gui.cpp:1441
+#: src/gui.cpp:1456
 msgid "Zoom for wide videos"
 msgstr ""
 
-#: src/gui.cpp:1444
+#: src/gui.cpp:1459
 msgid ""
 "Set zoom level for videos that are wider than the screen: 0: Show "
 "full video width. 1: Use full screen height.</p"
 msgstr ""
 
-#: src/gui.cpp:1448
+#: src/gui.cpp:1463
 msgid "Zoom:"
 msgstr ""
 
-#: src/gui.cpp:1449
+#: src/gui.cpp:1464
 msgid "Set the zoom level for videos that are wider than the screen"
 msgstr ""
 
-#: src/gui.cpp:1507
+#: src/gui.cpp:1522
 #, fuzzy
 msgid "Audio Settings"
 msgstr "Настройки субтитров"
 
-#: src/gui.cpp:1509
+#: src/gui.cpp:1524
 #, fuzzy
 msgid "Audio device:"
 msgstr "аудио кодек"
 
-#: src/gui.cpp:1510
+#: src/gui.cpp:1525
 msgid ""
 "Select the audio device. This will take effect for the next started "
 "video."
 msgstr ""
 
-#: src/gui.cpp:1514 src/gui.cpp:2063
+#: src/gui.cpp:1529 src/gui.cpp:2563
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/gui.cpp:1531
+#: src/gui.cpp:1546
 msgid "Audio delay (ms):"
 msgstr ""
 
-#: src/gui.cpp:1532
+#: src/gui.cpp:1547
 msgid ""
 "Set an audio delay, in milliseconds. This is useful if audio and video "
 "are not in sync."
 msgstr ""
 
-#: src/gui.cpp:1589
+#: src/gui.cpp:1604
 msgid "Subtitle Settings"
 msgstr "Настройки субтитров"
 
-#: src/gui.cpp:1591
-msgid "These settings apply to soft subtitles, but not to bitmaps."
+#: src/gui.cpp:1607
+#, fuzzy
+msgid ""
+"These settings apply only to soft subtitles, not to bitmaps. Some "
+"changes require a restart of the video to take effect."
 msgstr "Данные настройки применяются только для текстовых субтитров."
 
-#: src/gui.cpp:1593
+#: src/gui.cpp:1610
 msgid "Encoding:"
 msgstr "Кодировка:"
 
-#: src/gui.cpp:1594
+#: src/gui.cpp:1611
 msgid "Set the subtitle character set encoding."
 msgstr "Выберите кодировку символов в субтитрах."
 
-#: src/gui.cpp:1609
+#: src/gui.cpp:1626
 msgid "Override font:"
 msgstr "Переопределить шрифт:"
 
-#: src/gui.cpp:1610
+#: src/gui.cpp:1627
 msgid "Override the subtitle font family."
 msgstr "Переопределение шрифта субтитров, указанного в файле субтитров."
 
-#: src/gui.cpp:1619
+#: src/gui.cpp:1636
 msgid "Override font size:"
 msgstr "Переопределить размер шрифта:"
 
-#: src/gui.cpp:1620
+#: src/gui.cpp:1637
 msgid "Override the subtitle font size."
 msgstr ""
 "Переопределение размера шрифта субтитров, указанного в файле субтитров.</"
 "p>"
 
-#: src/gui.cpp:1630
+#: src/gui.cpp:1647
 msgid "Override scale factor:"
 msgstr "Переопределить коэффициент масштаба:"
 
-#: src/gui.cpp:1631
+#: src/gui.cpp:1648
 msgid "Override the subtitle scale factor."
 msgstr ""
 "Переопределение коэффициента масштаба субтитров, указанного в файле "
 "субтитров."
 
-#: src/gui.cpp:1642
+#: src/gui.cpp:1659
 msgid "Override color:"
 msgstr "Переопределить цвет:"
 
-#: src/gui.cpp:1643
+#: src/gui.cpp:1660
 msgid "Override the subtitle color."
 msgstr "Переопределение цвета субтитров, указанного в файле субтитров."
 
-#: src/gui.cpp:1866
+#: src/gui.cpp:1669
+#, fuzzy
+msgid "Override shadow:"
+msgstr "Переопределить шрифт:"
+
+#: src/gui.cpp:1670
+#, fuzzy
+msgid "Override the subtitle shadow."
+msgstr "Переопределение цвета субтитров, указанного в файле субтитров."
+
+#: src/gui.cpp:1675
+msgid "On"
+msgstr ""
+
+#: src/gui.cpp:1886
 #, fuzzy
 msgid "Video Settings"
 msgstr "Настройки субтитров"
 
-#: src/gui.cpp:1868
+#: src/gui.cpp:1888
 #, fuzzy
 msgid "Crop to aspect ratio:"
 msgstr "%gx%g, соотношение сторон %g:1"
 
-#: src/gui.cpp:1869
+#: src/gui.cpp:1889
 #, fuzzy
 msgid ""
 "Set the real aspect ratio of the video, so that borders can be cropped.</"
 "p>"
 msgstr "Укажите 3D раскладку исходного видеофайла."
 
-#: src/gui.cpp:1872
+#: src/gui.cpp:1892
 msgid "Do not crop"
 msgstr ""
 
-#: src/gui.cpp:1885
+#: src/gui.cpp:1905
 msgid "Parallax:"
 msgstr "Параллакс:"
 
-#: src/gui.cpp:1886
+#: src/gui.cpp:1906
 msgid ""
 "Adjust parallax, from -1 to +1. This changes the separation of left and "
 "right view, and thus the perceived distance of the scene."
@@ -768,11 +805,11 @@
 "между левым и правым видеорядами и, таким образом, ощущаемую удаленность "
 "сцены."
 
-#: src/gui.cpp:1899
+#: src/gui.cpp:1919
 msgid "Subtitle parallax:"
 msgstr "Параллакс субтитров:"
 
-#: src/gui.cpp:1900
+#: src/gui.cpp:1920
 msgid ""
 "Adjust subtitle parallax, from -1 to +1. This changes the perceived "
 "distance of the subtitles."
@@ -780,11 +817,11 @@
 "Корректировка параллакса субтитров, от -1 до +1. Позволяет изменить "
 "ощущаемую удаленность субтитров."
 
-#: src/gui.cpp:1913
+#: src/gui.cpp:1933
 msgid "Ghostbusting:"
 msgstr "Подавление перекрестных помех:"
 
-#: src/gui.cpp:1914
+#: src/gui.cpp:1934
 msgid ""
 "Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
 "the crosstalk levels of your display first. Note that crosstalk ghostbusting "
@@ -795,37 +832,78 @@
 "Имейте ввиду, что подавление перекрестных помех не работает с анаглифными "
 "очками."
 
-#: src/gui.cpp:2059
-msgid "Open device"
+#: src/gui.cpp:2078
+#, fuzzy
+msgid "SDI Output Settings"
+msgstr "Настройки субтитров"
+
+#: src/gui.cpp:2080
+msgid "SDI Output Format:"
+msgstr ""
+
+#: src/gui.cpp:2081
+#, fuzzy
+msgid "Select output format used for SDI output."
+msgstr "Укажите 3D режим для вашего дисплея."
+
+#: src/gui.cpp:2089
+msgid "Left stereo mode:"
+msgstr ""
+
+#: src/gui.cpp:2090
+#, fuzzy
+msgid "Select stereo mode used for left SDI output."
+msgstr "Выберите экраны для полноэкранного режима."
+
+#: src/gui.cpp:2118
+msgid "Right stereo mode:"
+msgstr ""
+
+#: src/gui.cpp:2119
+msgid "Select stereo mode used for right SDI output."
+msgstr ""
+
+#: src/gui.cpp:2559
+#, fuzzy
+msgid "Open device(s)"
 msgstr "Открыть устройство"
 
-#: src/gui.cpp:2062
+#: src/gui.cpp:2562
 msgid "Choose a device type."
 msgstr "Выберите тип устройства."
 
-#: src/gui.cpp:2064 src/media_object.cpp:801
+#: src/gui.cpp:2564 src/media_object.cpp:801
 msgid "Firewire"
 msgstr "Firewire"
 
-#: src/gui.cpp:2065 src/media_object.cpp:802
+#: src/gui.cpp:2565 src/media_object.cpp:802
 msgid "X11"
 msgstr "X11"
 
-#: src/gui.cpp:2067 src/gui.cpp:2070
+#: src/gui.cpp:2568 src/gui.cpp:2571
 msgid "Choose a device."
 msgstr "Выберите устройство."
 
-#: src/gui.cpp:2073
+#: src/gui.cpp:2574
 msgid "Set the X11 device string. Refer to the manual for details."
 msgstr ""
 "Введите строку устройства X11. За подробностями обратитесь к документации."
 ""
 
-#: src/gui.cpp:2082
+#: src/gui.cpp:2590
+msgid "First device:"
+msgstr ""
+
+#: src/gui.cpp:2591
+#, fuzzy
+msgid "Second device:"
+msgstr "Открыть устройство"
+
+#: src/gui.cpp:2595
 msgid "Request frame size"
 msgstr "Размер кадра"
 
-#: src/gui.cpp:2083
+#: src/gui.cpp:2596
 msgid ""
 "Request a specific frame size from the device, e.g. 640x480. The device "
 "must support this frame size. Some devices require a frame size to be "
@@ -835,11 +913,11 @@
 "Устройство должно поддерживать этот размер кадра. Некоторые устройства "
 "требуют явного указания размера кадра."
 
-#: src/gui.cpp:2094
+#: src/gui.cpp:2607
 msgid "Request frame rate"
 msgstr "Частота кадров"
 
-#: src/gui.cpp:2095
+#: src/gui.cpp:2608
 msgid ""
 "Request a specific frame rate from the device, e.g. 25/1. The device must "
 "support this frame rate. Some devices require a frame rate to be selected.</"
@@ -849,250 +927,268 @@
 "Устройство должно поддерживать эту частоту кадров. Некоторые устройства "
 "требуют явного указания частоты кадров."
 
-#: src/gui.cpp:2106 src/gui.cpp:2824
+#: src/gui.cpp:2619
+#, fuzzy
+msgid "Request MJPEG format"
+msgstr "Частота кадров"
+
+#: src/gui.cpp:2620
+msgid ""
+"Request MJPEG data from the input device. The device may ignore this "
+"request."
+msgstr ""
+
+#: src/gui.cpp:2623 src/gui.cpp:3370
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/gui.cpp:2377
+#: src/gui.cpp:2918
 msgid "&File"
 msgstr "&Файл"
 
-#: src/gui.cpp:2378
+#: src/gui.cpp:2919
 #, fuzzy
 msgid "&Open file(s)..."
 msgstr "Открыть файлы"
 
-#: src/gui.cpp:2383
+#: src/gui.cpp:2924
 #, fuzzy
 msgid "Open &URL(s)..."
 msgstr "Открыть &URL..."
 
-#: src/gui.cpp:2387
-msgid "Open &device..."
+#: src/gui.cpp:2928
+#, fuzzy
+msgid "Open &device(s)..."
 msgstr "Открыть &устройство..."
 
-#: src/gui.cpp:2402
+#: src/gui.cpp:2943
 msgid "&Clear recent files"
 msgstr ""
 
-#: src/gui.cpp:2410
+#: src/gui.cpp:2951
 msgid "&Quit..."
 msgstr "&Выход..."
 
-#: src/gui.cpp:2416
+#: src/gui.cpp:2957
 msgid "&Preferences"
 msgstr "&Настройки"
 
-#: src/gui.cpp:2419
+#: src/gui.cpp:2960
 msgid "&Fullscreen Settings..."
 msgstr "Настройки &полноэкранного режима..."
 
-#: src/gui.cpp:2422
+#: src/gui.cpp:2963
 msgid "Display &Color Adjustments..."
 msgstr "Настройки &цветности..."
 
-#: src/gui.cpp:2425
+#: src/gui.cpp:2966
 msgid "Display Cross&talk Calibration..."
 msgstr "&Уровни перекрестных помех..."
 
-#: src/gui.cpp:2429
+#: src/gui.cpp:2970
 msgid "&Zoom for wide videos..."
 msgstr ""
 
-#: src/gui.cpp:2433
+#: src/gui.cpp:2974
 #, fuzzy
 msgid "&Audio Settings..."
 msgstr "Настройки &субтитров..."
 
-#: src/gui.cpp:2437
+#: src/gui.cpp:2978
 msgid "&Subtitle Settings..."
 msgstr "Настройки &субтитров..."
 
-#: src/gui.cpp:2441
+#: src/gui.cpp:2982
 #, fuzzy
 msgid "Current &Video Settings..."
 msgstr "Настройки стерео..."
 
-#: src/gui.cpp:2444
+#: src/gui.cpp:2987
+#, fuzzy
+msgid "SDI &Output Settings..."
+msgstr "Настройки &субтитров..."
+
+#: src/gui.cpp:2991
 msgid "&Help"
 msgstr "&Помощь"
 
-#: src/gui.cpp:2445
+#: src/gui.cpp:2992
 msgid "&Manual..."
 msgstr "Сп&равка..."
 
-#: src/gui.cpp:2450
+#: src/gui.cpp:2997
 msgid "&Website..."
 msgstr "Ве&б-сайт..."
 
-#: src/gui.cpp:2454
+#: src/gui.cpp:3001
 msgid "&Keyboard Shortcuts"
 msgstr "&Горячие клавиши"
 
-#: src/gui.cpp:2458
+#: src/gui.cpp:3005
 msgid "&About"
 msgstr "О програ&мме"
 
-#: src/gui.cpp:2771
+#: src/gui.cpp:3317
 msgid "Tip"
 msgstr ""
 
-#: src/gui.cpp:2774
+#: src/gui.cpp:3320
 msgid ""
 "You can select and open multiple files at once.This is useful for "
 "example if you have extra subtitle files, or if left and right view are "
 "stored in separate files."
 msgstr ""
 
-#: src/gui.cpp:2777
+#: src/gui.cpp:3323
 msgid "Do not show this message again."
 msgstr ""
 
-#: src/gui.cpp:2794
+#: src/gui.cpp:3340
 msgid "Open files"
 msgstr "Открыть файлы"
 
-#: src/gui.cpp:2818
+#: src/gui.cpp:3364
 #, fuzzy
 msgid "Open URL(s)"
 msgstr "Открыть URL"
 
-#: src/gui.cpp:2819
+#: src/gui.cpp:3365
 msgid "URL(s):"
 msgstr ""
 
-#: src/gui.cpp:2820
+#: src/gui.cpp:3366
 msgid "Enter one or more space separated URLs."
 msgstr ""
 
-#: src/gui.cpp:3005 src/gui.cpp:3013 src/video_output_qt.cpp:234
-#: src/video_output_qt.cpp:643 src/video_output_qt.cpp:664
+#: src/gui.cpp:3568 src/gui.cpp:3576 src/video_output_qt.cpp:241
+#: src/video_output_qt.cpp:477 src/video_output_qt.cpp:659
+#: src/video_output_qt.cpp:671 src/video_output_qt.cpp:692
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/gui.cpp:3005
+#: src/gui.cpp:3568
 msgid "Cannot open manual."
 msgstr "Невозможно открыть справку."
 
-#: src/gui.cpp:3013
+#: src/gui.cpp:3576
 msgid "Cannot open website."
 msgstr "Невозможно открыть веб-сайт."
 
-#: src/gui.cpp:3021
+#: src/gui.cpp:3584
 msgid "Keyboard Shortcuts"
 msgstr "Горячие клавиши"
 
-#: src/gui.cpp:3024
+#: src/gui.cpp:3587
 #, fuzzy
 msgid "Keyboard control:"
 msgstr "Горячие клавиши"
 
-#: src/gui.cpp:3026
+#: src/gui.cpp:3589
 msgid "Stop."
 msgstr ""
 
-#: src/gui.cpp:3027 src/main.cpp:495
+#: src/gui.cpp:3590 src/main.cpp:494
 msgid "Pause / unpause."
 msgstr ""
 
-#: src/gui.cpp:3028 src/main.cpp:496
+#: src/gui.cpp:3591 src/main.cpp:495
 #, fuzzy
 msgid "Toggle fullscreen."
 msgstr "Настройки полноэкранного режима:"
 
-#: src/gui.cpp:3029 src/main.cpp:497
+#: src/gui.cpp:3592 src/main.cpp:496
 msgid "Center window."
 msgstr ""
 
-#: src/gui.cpp:3030 src/main.cpp:498
+#: src/gui.cpp:3593 src/main.cpp:497
 #, fuzzy
 msgid "Swap left/right eye."
 msgstr "Наоборот"
 
-#: src/gui.cpp:3031 src/main.cpp:499
+#: src/gui.cpp:3594 src/main.cpp:498
 msgid "Cycle through available video streams."
 msgstr ""
 
-#: src/gui.cpp:3032 src/main.cpp:500
+#: src/gui.cpp:3595 src/main.cpp:499
 msgid "Cycle through available audio streams."
 msgstr ""
 
-#: src/gui.cpp:3033 src/main.cpp:501
+#: src/gui.cpp:3596 src/main.cpp:500
 #, fuzzy
 msgid "Cycle through available subtitle streams."
 msgstr "Выберите дорожку субтитров."
 
-#: src/gui.cpp:3034 src/main.cpp:502
+#: src/gui.cpp:3597 src/main.cpp:501
 msgid "Adjust contrast."
 msgstr ""
 
-#: src/gui.cpp:3035 src/main.cpp:503
+#: src/gui.cpp:3598 src/main.cpp:502
 #, fuzzy
 msgid "Adjust brightness."
 msgstr "Яркость:"
 
-#: src/gui.cpp:3036 src/main.cpp:504
+#: src/gui.cpp:3599 src/main.cpp:503
 msgid "Adjust hue."
 msgstr ""
 
-#: src/gui.cpp:3037 src/main.cpp:505
+#: src/gui.cpp:3600 src/main.cpp:504
 #, fuzzy
 msgid "Adjust saturation."
 msgstr "Насыщенность:"
 
-#: src/gui.cpp:3038 src/main.cpp:506
+#: src/gui.cpp:3601 src/main.cpp:505
 #, fuzzy
 msgid "Adjust parallax."
 msgstr "Параллакс субтитров:"
 
-#: src/gui.cpp:3039 src/main.cpp:507
+#: src/gui.cpp:3602 src/main.cpp:506
 #, fuzzy
 msgid "Adjust ghostbusting."
 msgstr "Подавление перекрестных помех:"
 
-#: src/gui.cpp:3040 src/main.cpp:508
+#: src/gui.cpp:3603 src/main.cpp:507
 msgid "Adjust zoom for wide videos."
 msgstr ""
 
-#: src/gui.cpp:3041 src/main.cpp:509
+#: src/gui.cpp:3604 src/main.cpp:508
 msgid "Adjust audio volume."
 msgstr ""
 
-#: src/gui.cpp:3042 src/main.cpp:510
+#: src/gui.cpp:3605 src/main.cpp:509
 msgid "Toggle audio mute."
 msgstr ""
 
-#: src/gui.cpp:3043 src/main.cpp:511
+#: src/gui.cpp:3606 src/main.cpp:510
 msgid "Step a single video frame forward."
 msgstr ""
 
-#: src/gui.cpp:3044 src/main.cpp:512
+#: src/gui.cpp:3607 src/main.cpp:511
 msgid "Seek 10 seconds backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3045 src/main.cpp:513
+#: src/gui.cpp:3608 src/main.cpp:512
 msgid "Seek 1 minute backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3046 src/main.cpp:514
+#: src/gui.cpp:3609 src/main.cpp:513
 msgid "Seek 10 minutes backward / forward."
 msgstr ""
 
-#: src/gui.cpp:3047 src/main.cpp:516
+#: src/gui.cpp:3610 src/main.cpp:515
 msgid "Media keys should work as expected."
 msgstr ""
 
-#: src/gui.cpp:3063
+#: src/gui.cpp:3626
 #, c-format
 msgid "About %s"
 msgstr "О %s"
 
-#: src/gui.cpp:3069
+#: src/gui.cpp:3632
 #, c-format
 msgid "The %s 3D video player"
 msgstr "3D видео плеер %s"
 
-#: src/gui.cpp:3074
+#: src/gui.cpp:3637
 #, fuzzy, c-format
 msgid ""
 "%s version %s.Copyright (C) 2012 the Bino developers.This "
@@ -1108,27 +1204,27 @@
 "ЛИБО ГАРАНТИЙ, за исключением предусмотренных законом.Для получения "
 "подробной информации об этом ПО посетите <a href=\"%s\">%s</a>."
 
-#: src/gui.cpp:3086 src/main.cpp:384
+#: src/gui.cpp:3649 src/main.cpp:378
 msgid "Platform:"
 msgstr "Платформа:"
 
-#: src/gui.cpp:3087 src/main.cpp:386
+#: src/gui.cpp:3650 src/main.cpp:380
 msgid "Libraries used:"
 msgstr "Используемые библиотеки:"
 
-#: src/gui.cpp:3109
+#: src/gui.cpp:3672
 msgid "About"
 msgstr "О программе"
 
-#: src/gui.cpp:3110
+#: src/gui.cpp:3673
 msgid "Libraries"
 msgstr "Библиотеки"
 
-#: src/gui.cpp:3111
+#: src/gui.cpp:3674
 msgid "Team"
 msgstr "Команда"
 
-#: src/gui.cpp:3112
+#: src/gui.cpp:3675
 msgid "License"
 msgstr "Лицензия"
 
@@ -1166,23 +1262,17 @@
 msgid "Cannot get command for LIRC code."
 msgstr "Невозможно получить команду для LIRC кода."
 
-#: src/main.cpp:367 src/media_object.cpp:821 src/media_object.cpp:1286
-#: src/video_output.cpp:212
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: src/main.cpp:379
+#: src/main.cpp:373
 #, c-format
 msgid "%s version %s"
 msgstr "%s версия %s"
 
-#: src/main.cpp:380
+#: src/main.cpp:374
 #, fuzzy
 msgid "Copyright (C) 2012 the Bino developers."
 msgstr "Copyright (C) 2011 Разработчики Bino."
 
-#: src/main.cpp:381
+#: src/main.cpp:375
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -1194,476 +1284,502 @@
 
 #. TRANSLATORS: This is the --help text. Please keep the line length limited.
 #. * The --help output should look good with a line width of 80 characters.
-#: src/main.cpp:399
+#: src/main.cpp:393
 msgid "Usage:"
 msgstr ""
 
-#: src/main.cpp:401
+#: src/main.cpp:395
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:402
+#: src/main.cpp:396
 msgid "Print help."
 msgstr ""
 
-#: src/main.cpp:403
+#: src/main.cpp:397
 msgid "Print version."
 msgstr ""
 
-#: src/main.cpp:404
+#: src/main.cpp:398
 msgid "Do not use the GUI, just show a plain window."
 msgstr ""
 
-#: src/main.cpp:405
+#: src/main.cpp:399
 msgid "Append all log messages to the given file."
 msgstr ""
 
-#: src/main.cpp:406
+#: src/main.cpp:400
 msgid "Set log level (debug/info/warning/error/quiet)."
 msgstr ""
 
-#: src/main.cpp:407
+#: src/main.cpp:401
 msgid "Print a list of known audio devices and exit."
 msgstr ""
 
-#: src/main.cpp:408
+#: src/main.cpp:402
 msgid "Use audio device number N (N=0 is the default)."
 msgstr ""
 
-#: src/main.cpp:409
+#: src/main.cpp:403
 msgid "Delay audio by D milliseconds. Default is 0."
 msgstr ""
 
-#: src/main.cpp:410
+#: src/main.cpp:404
 msgid "Set audio volume (0 to 1). Default is 1."
 msgstr ""
 
-#: src/main.cpp:411
+#: src/main.cpp:405
 #, fuzzy
 msgid "Mute audio."
 msgstr "Нет аудио."
 
-#: src/main.cpp:412
+#: src/main.cpp:406
 msgid "Type of input device: default, firewire, x11."
 msgstr ""
 
-#: src/main.cpp:413
+#: src/main.cpp:407
 #, fuzzy
 msgid "Request frame size WxH from input device."
 msgstr "Размер кадра"
 
-#: src/main.cpp:414
+#: src/main.cpp:408
 #, fuzzy
 msgid "Request frame rate N/D from input device."
 msgstr "Частота кадров"
 
-#: src/main.cpp:415
+#: src/main.cpp:409
+msgid "Request device format 'default' or 'mjpeg'."
+msgstr ""
+
+#: src/main.cpp:410
+#, fuzzy
+msgid "Read commands from a file."
+msgstr "От LIRC получена некорректная команда '%s'."
+
+#: src/main.cpp:411
 #, fuzzy
 msgid "Use the given LIRC configuration file."
 msgstr "Невозможно прочитать конфигурацию LIRC из файла %s."
 
-#: src/main.cpp:416
+#: src/main.cpp:412
 msgid "This option can be used more than once."
 msgstr ""
 
-#: src/main.cpp:417
+#: src/main.cpp:413
 msgid "Select video stream (1-n, depending on input)."
 msgstr ""
 
-#: src/main.cpp:418
+#: src/main.cpp:414
 msgid "Select audio stream (1-n, depending on input)."
 msgstr ""
 
-#: src/main.cpp:419
+#: src/main.cpp:415
 #, fuzzy
 msgid "Select subtitle stream (0-n, dep. on input)."
 msgstr "Выберите дорожку субтитров."
 
-#: src/main.cpp:420
+#: src/main.cpp:416
 msgid "Select input type (default autodetect):"
 msgstr ""
 
-#: src/main.cpp:421
+#: src/main.cpp:417
 #, fuzzy
 msgid "Single view."
 msgstr "Правый видеоряд"
 
-#: src/main.cpp:422
+#: src/main.cpp:418
 #, fuzzy
 msgid "Left/right separate streams, left first."
 msgstr "Отдельные видеофайлы, сначала левый"
 
-#: src/main.cpp:423
+#: src/main.cpp:419
 #, fuzzy
 msgid "Left/right separate streams, right first."
 msgstr "Отдельные видеофайлы, сначала правый"
 
-#: src/main.cpp:424
+#: src/main.cpp:420
 #, fuzzy
 msgid "Left/right alternating, left first."
 msgstr "Отдельные видеофайлы, сначала левый"
 
-#: src/main.cpp:425
+#: src/main.cpp:421
 #, fuzzy
 msgid "Left/right alternating, right first."
 msgstr "Отдельные видеофайлы, сначала правый"
 
-#: src/main.cpp:426 src/main.cpp:441
+#: src/main.cpp:422 src/main.cpp:437
 msgid "Left top, right bottom."
 msgstr ""
 
-#: src/main.cpp:427 src/main.cpp:442
+#: src/main.cpp:423 src/main.cpp:438
 #, fuzzy
 msgid "Left top, right bottom, half height."
 msgstr "Сверху/снизу, в половину высоты"
 
-#: src/main.cpp:428
+#: src/main.cpp:424
 msgid "Left bottom, right top."
 msgstr ""
 
-#: src/main.cpp:429
+#: src/main.cpp:425
 #, fuzzy
 msgid "Left bottom, right top, half height."
 msgstr "Снизу/сверху, в половину высоты"
 
-#: src/main.cpp:430 src/main.cpp:443
+#: src/main.cpp:426 src/main.cpp:439
 msgid "Left left, right right."
 msgstr ""
 
-#: src/main.cpp:431 src/main.cpp:444
+#: src/main.cpp:427 src/main.cpp:440
 #, fuzzy
 msgid "Left left, right right, half width."
 msgstr "Слева/справа, в половину ширины"
 
-#: src/main.cpp:432
+#: src/main.cpp:428
 #, fuzzy
 msgid "Left right, right left."
 msgstr "Слева/справа, в половину ширины"
 
-#: src/main.cpp:433
+#: src/main.cpp:429
 #, fuzzy
 msgid "Left right, right left, half width."
 msgstr "Слева/справа, в половину ширины"
 
-#: src/main.cpp:434 src/main.cpp:445
+#: src/main.cpp:430 src/main.cpp:441
 msgid "Left even rows, right odd rows."
 msgstr ""
 
-#: src/main.cpp:435
+#: src/main.cpp:431
 msgid "Left odd rows, right even rows."
 msgstr ""
 
-#: src/main.cpp:436
+#: src/main.cpp:432
 msgid "Select output type:"
 msgstr ""
 
-#: src/main.cpp:437
+#: src/main.cpp:433
 #, fuzzy
 msgid "OpenGL quad-buffered stereo."
 msgstr "Стерео OpenGL"
 
-#: src/main.cpp:438
+#: src/main.cpp:434
 #, fuzzy
 msgid "Left and right view alternating."
 msgstr "отразить правый видеоряд вертикально."
 
-#: src/main.cpp:439
+#: src/main.cpp:435
 msgid "Only left."
 msgstr ""
 
-#: src/main.cpp:440
+#: src/main.cpp:436
 msgid "Only right."
 msgstr ""
 
-#: src/main.cpp:446
+#: src/main.cpp:442
 msgid "Left even columns, right odd columns."
 msgstr ""
 
-#: src/main.cpp:447
+#: src/main.cpp:443
 #, fuzzy
 msgid "Left and right in checkerboard pattern."
 msgstr "В шахматном порядке"
 
-#: src/main.cpp:448
+#: src/main.cpp:444
 #, fuzzy
 msgid "HDMI frame packing mode."
 msgstr "Режим упаковки кадров HDMI"
 
-#: src/main.cpp:449
+#: src/main.cpp:445
 #, fuzzy
 msgid "Red/cyan anaglyph, monochrome method."
 msgstr "Красно-голубые очки, черно-белый режим"
 
-#: src/main.cpp:450
+#: src/main.cpp:446
 #, fuzzy
 msgid "Red/cyan anaglyph, half color method."
 msgstr "Красно-голубые очки, режим половины цветности"
 
-#: src/main.cpp:451
+#: src/main.cpp:447
 #, fuzzy
 msgid "Red/cyan anaglyph, full color method."
 msgstr "Красно-голубые очки, полноцветный режим"
 
-#: src/main.cpp:452
+#: src/main.cpp:448
 #, fuzzy
 msgid "Red/cyan anaglyph, Dubois method."
 msgstr "Красно-голубые очки, высококачественный метод Дюбуа"
 
-#: src/main.cpp:453
+#: src/main.cpp:449
 #, fuzzy
 msgid "Green/magenta anaglyph, monochrome method."
 msgstr "Зелёно-пурпурные очки, черно-белый режим"
 
-#: src/main.cpp:454
+#: src/main.cpp:450
 #, fuzzy
 msgid "Green/magenta anaglyph, half color method."
 msgstr "Зелёно-пурпурные очки, режим половины цветности"
 
-#: src/main.cpp:455
+#: src/main.cpp:451
 #, fuzzy
 msgid "Green/magenta anaglyph, full color method."
 msgstr "Зелёно-пурпурные очки, полноцветный режим"
 
-#: src/main.cpp:456
+#: src/main.cpp:452
 #, fuzzy
 msgid "Green/magenta anaglyph, Dubois method."
 msgstr "Зелёно-пурпурные очки, высококачественный метод Дюбуа"
 
-#: src/main.cpp:457
+#: src/main.cpp:453
 #, fuzzy
 msgid "Amber/blue anaglyph, monochrome method."
 msgstr "Янтарно-синие очки, черно-белый режим"
 
-#: src/main.cpp:458
+#: src/main.cpp:454
 #, fuzzy
 msgid "Amber/blue anaglyph, half color method."
 msgstr "Янтарно-синие очки, режим половины цветности"
 
-#: src/main.cpp:459
+#: src/main.cpp:455
 #, fuzzy
 msgid "Amber/blue anaglyph, full color method."
 msgstr "Янтарно-синие очки, полноцветный режим"
 
-#: src/main.cpp:460
+#: src/main.cpp:456
 #, fuzzy
 msgid "Amber/blue anaglyph, Dubois method."
 msgstr "Янтарно-синие очки, высококачественный метод Дюбуа"
 
-#: src/main.cpp:461
+#: src/main.cpp:457
 #, fuzzy
 msgid "Red/green anaglyph, monochrome method."
 msgstr "Красно-зелёные очки, черно-белый режим"
 
-#: src/main.cpp:462
+#: src/main.cpp:458
 #, fuzzy
 msgid "Red/blue anaglyph, monochrome method."
 msgstr "Красно-синие очки, черно-белый режим"
 
-#: src/main.cpp:463
+#: src/main.cpp:459
 msgid "Multi-display via Equalizer (2D setup)."
 msgstr ""
 
-#: src/main.cpp:464
+#: src/main.cpp:460
 msgid "Multi-display via Equalizer (3D setup)."
 msgstr ""
 
-#: src/main.cpp:465
+#: src/main.cpp:461
 #, fuzzy
 msgid "Swap left/right view."
 msgstr "Наоборот"
 
-#: src/main.cpp:466
+#: src/main.cpp:462
 #, fuzzy
 msgid "Fullscreen."
 msgstr "Два экрана:"
 
-#: src/main.cpp:467
+#: src/main.cpp:463
 #, fuzzy
 msgid "Use the listed screens in fullscreen mode."
 msgstr "Использовать много экранов для полноэкранного режима"
 
-#: src/main.cpp:468
+#: src/main.cpp:464
 msgid "Screen numbers start with 1."
 msgstr ""
 
-#: src/main.cpp:469
+#: src/main.cpp:465
 msgid "An empty list defaults to the primary screen."
 msgstr ""
 
-#: src/main.cpp:470
+#: src/main.cpp:466
 #, fuzzy
 msgid "Flip left view vertically when fullscreen."
 msgstr "отразить левый видеоряд вертикально."
 
-#: src/main.cpp:471
+#: src/main.cpp:467
 #, fuzzy
 msgid "Flop left view horizontally when fullscreen."
 msgstr "отразить левый видеоряд горизонтально."
 
-#: src/main.cpp:472
+#: src/main.cpp:468
 #, fuzzy
 msgid "Flip right view vertically when fullscreen."
 msgstr "отразить правый видеоряд вертикально."
 
-#: src/main.cpp:473
+#: src/main.cpp:469
 #, fuzzy
 msgid "Flop right view horizontally when fullscreen."
 msgstr "отразить правый видеоряд горизонтально."
 
-#: src/main.cpp:474
+#: src/main.cpp:470
+msgid "Use DLP 3-D Ready Sync when fullscreen."
+msgstr ""
+
+#: src/main.cpp:471
 msgid "Set zoom for wide videos (0=off to 1=full)."
 msgstr ""
 
-#: src/main.cpp:475
+#: src/main.cpp:472
 msgid "Crop video to given aspect ratio (0:0=off)."
 msgstr ""
 
-#: src/main.cpp:476
+#: src/main.cpp:473
 #, fuzzy
 msgid "Center window on screen."
 msgstr "Расположить видео по центру экрана."
 
-#: src/main.cpp:477
+#: src/main.cpp:474
 #, fuzzy
 msgid "Set subtitle encoding."
 msgstr "кодек субтитров"
 
-#: src/main.cpp:478
+#: src/main.cpp:475
 #, fuzzy
 msgid "Set subtitle font name."
 msgstr "Переопределение шрифта субтитров, указанного в файле субтитров."
 
-#: src/main.cpp:479
+#: src/main.cpp:476
 #, fuzzy
 msgid "Set subtitle font size."
 msgstr ""
 "Переопределение размера шрифта субтитров, указанного в файле субтитров.</"
 "p>"
 
-#: src/main.cpp:480
+#: src/main.cpp:477
 #, fuzzy
 msgid "Set subtitle scale factor."
 msgstr ""
 "Переопределение коэффициента масштаба субтитров, указанного в файле "
 "субтитров."
 
-#: src/main.cpp:481
+#: src/main.cpp:478
 msgid "Set subtitle color, in [AA]RRGGBB format."
 msgstr ""
 
-#: src/main.cpp:482
+#: src/main.cpp:479
+msgid "Set subtitle shadow, -1=default, 0=off, 1=on."
+msgstr ""
+
+#: src/main.cpp:480
 msgid "Subtitle parallax adjustment (-1 to +1)."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:481
 msgid "Parallax adjustment (-1 to +1)."
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:482
 msgid "Crosstalk leak level (0 to 1)."
 msgstr ""
 
-#: src/main.cpp:485
+#: src/main.cpp:483
 msgid "Comma-separated values for R,G,B."
 msgstr ""
 
-#: src/main.cpp:486
+#: src/main.cpp:484
 msgid "Amount of ghostbusting to apply (0 to 1)."
 msgstr ""
 
-#: src/main.cpp:487
+#: src/main.cpp:485
 msgid "Benchmark mode (no audio, show fps)."
 msgstr ""
 
-#: src/main.cpp:488
+#: src/main.cpp:486
 msgid "Frame rate divisor for display refresh rate."
 msgstr ""
 
-#: src/main.cpp:489
+#: src/main.cpp:487
 msgid "Default is 0 for benchmark mode, 1 otherwise."
 msgstr ""
 
-#: src/main.cpp:490
+#: src/main.cpp:488
 msgid "Loop the input media."
 msgstr ""
 
-#: src/main.cpp:492
+#: src/main.cpp:489
+msgid "Set SDI output format."
+msgstr ""
+
+#: src/main.cpp:491
 msgid "Interactive control:"
 msgstr ""
 
-#: src/main.cpp:493
+#: src/main.cpp:492
 #, fuzzy
 msgid "Leave fullscreen mode, or quit."
 msgstr "Когда в полноэкранном режиме,"
 
-#: src/main.cpp:494
+#: src/main.cpp:493
 #, fuzzy
 msgid "Quit."
 msgstr "&Выход..."
 
-#: src/main.cpp:515
+#: src/main.cpp:514
 msgid "Seek according to horizontal click position."
 msgstr ""
 
-#: src/main.cpp:523
+#: src/main.cpp:522
 msgid "No audio devices known."
 msgstr ""
 
-#: src/main.cpp:595
+#: src/main.cpp:594
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr ""
 "Режим оценки производительности: воспроизведение аудио отключено, "
 "воспроизведение видео с максимально-возможной скоростью."
 
-#: src/main.cpp:729
+#: src/main.cpp:608
+#, c-format
+msgid "Unknown mode %s."
+msgstr ""
+
+#: src/main.cpp:740
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Эта версия Bino была собрана без поддержки LIRC."
 
 #. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:935
+#: src/media_data.cpp:1051
 #, c-format
 msgid "%dx%d, %.3g:1"
 msgstr "%dx%d, %.3g:1"
 
 #. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:1066
+#: src/media_data.cpp:1182
 #, c-format
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d к., %g кГц, %d бит"
 
-#: src/media_input.cpp:282
+#: src/media_input.cpp:281
 #, c-format
 msgid "Video %s: %s"
 msgstr "Видео %s: %s"
 
-#: src/media_input.cpp:287
+#: src/media_input.cpp:286
 msgid "No video."
 msgstr "Нет видео."
 
-#: src/media_input.cpp:293
+#: src/media_input.cpp:292
 #, c-format
 msgid "Audio %s: %s"
 msgstr "Аудио %s: %s"
 
-#: src/media_input.cpp:298
+#: src/media_input.cpp:297
 msgid "No audio."
 msgstr "Нет аудио."
 
-#: src/media_input.cpp:304
+#: src/media_input.cpp:303
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr "Субтитры %s: %s"
 
-#: src/media_input.cpp:309
+#: src/media_input.cpp:308
 msgid "No subtitle."
 msgstr "Нет субтитров."
 
-#: src/media_input.cpp:311
+#: src/media_input.cpp:310
 #, c-format
 msgid "Duration: %g seconds"
 msgstr "Продолжительность: %g секунд"
 
-#: src/media_input.cpp:314
+#: src/media_input.cpp:313
 #, c-format
 msgid "Stereo layout: %s"
 msgstr "Стерео раскладка: %s"
@@ -1692,146 +1808,146 @@
 msgid "default"
 msgstr "default"
 
-#: src/media_object.cpp:832
+#: src/media_object.cpp:836
 #, c-format
 msgid "%s: Cannot read stream info: %s"
 msgstr "%s: Невозможно прочитать информацию о дорожке: %s"
 
-#: src/media_object.cpp:876
+#: src/media_object.cpp:880
 #, c-format
 msgid "%s stream %d: Cannot open %s: %s"
 msgstr "%s дорожка %d: Невозможно открыть %s: %s"
 
-#: src/media_object.cpp:877
+#: src/media_object.cpp:881
 msgid "video codec"
 msgstr "видео кодек"
 
-#: src/media_object.cpp:878
+#: src/media_object.cpp:882
 msgid "audio codec"
 msgstr "аудио кодек"
 
-#: src/media_object.cpp:879
+#: src/media_object.cpp:883
 msgid "subtitle codec"
 msgstr "кодек субтитров"
 
-#: src/media_object.cpp:880
+#: src/media_object.cpp:884
 msgid "data"
 msgstr "данные"
 
-#: src/media_object.cpp:881
+#: src/media_object.cpp:885
 msgid "codec not supported"
 msgstr "кодек не поддерживается"
 
-#: src/media_object.cpp:891
+#: src/media_object.cpp:895
 #, c-format
 msgid "%s video stream %d: Invalid frame size."
 msgstr "%s видео дорожка %d: Неверный размер кадра."
 
-#: src/media_object.cpp:935
+#: src/media_object.cpp:939
 #, c-format
 msgid "%s video stream %d: Cannot initialize conversion context."
 msgstr "%s видео дорожка %d: Невозможно инициализировать кодек."
 
-#: src/media_object.cpp:998
+#: src/media_object.cpp:1002
 #, c-format
 msgid "Video stream %d: %s / %s, %g seconds"
 msgstr "Видео дорожка %d: %s / %s, %g секунд"
 
-#: src/media_object.cpp:1002
+#: src/media_object.cpp:1006
 #, c-format
 msgid "Using up to %d threads for decoding."
 msgstr "Используем максимум %d потоков для декодирования."
 
-#: src/media_object.cpp:1007
+#: src/media_object.cpp:1011
 #, c-format
 msgid "Audio stream %d: %s / %s, %g seconds"
 msgstr "Аудио дорожка %d: %s / %s, %g секунд"
 
-#: src/media_object.cpp:1014
+#: src/media_object.cpp:1018
 #, c-format
 msgid "Subtitle stream %d: %s / %s, %g seconds"
 msgstr "Дорожка субтитров %d: %s / %s, %g секунд"
 
-#: src/media_object.cpp:1021
+#: src/media_object.cpp:1025
 msgid "No usable streams."
 msgstr "Нет подходящих дорожек."
 
-#: src/media_object.cpp:1302 src/media_object.cpp:1332
-#: src/media_object.cpp:1362
+#: src/media_object.cpp:1306 src/media_object.cpp:1336
+#: src/media_object.cpp:1366
 #, c-format
 msgid "%s: Cannot duplicate packet."
 msgstr "%s: Невозможно создать копию пакета."
 
-#: src/media_object.cpp:1456
+#: src/media_object.cpp:1460
 #, fuzzy, c-format
 msgid "%s video stream %d: Dropping %dx%d frame"
 msgstr "%s видео дорожка %d: Неверный размер кадра."
 
-#: src/media_object.cpp:1919
+#: src/media_object.cpp:1923
 #, c-format
 msgid "%s: Seeking failed."
 msgstr "%s: Перемотка не удалась."
 
-#: src/player.cpp:434
+#: src/player.cpp:437
 #, fuzzy, c-format
 msgid "Video: delay %g seconds/%g frames; dropping next frame."
 msgstr "Видео: задержка %g секунд; пропускаем следующий кадр."
 
-#: src/player.cpp:450
+#: src/player.cpp:453
 #, c-format
 msgid "FPS: %.2f"
 msgstr "FPS: %.2f"
 
-#: src/player_equalizer.cpp:116
+#: src/player_equalizer.cpp:117
 msgid "Reading input frame failed."
 msgstr "Чтение исходного кадра не удалось."
 
-#: src/player_equalizer.cpp:165 src/video_output_qt.cpp:590
-#: src/video_output_qt.cpp:597
+#: src/player_equalizer.cpp:166 src/video_output_qt.cpp:613
+#: src/video_output_qt.cpp:620
 msgid "Waiting for subtitle renderer initialization..."
 msgstr "Инициализация визуализатора субтитров..."
 
-#: src/player_equalizer.cpp:250
+#: src/player_equalizer.cpp:251
 msgid "Init data mapping failed."
 msgstr "Подготовка разметки данных не удалась."
 
-#: src/player_equalizer.cpp:251
+#: src/player_equalizer.cpp:252
 msgid "Frame data mapping failed."
 msgstr "Разметка данных кадра не удалась."
 
-#: src/player_equalizer.cpp:252
+#: src/player_equalizer.cpp:253
 msgid "Video player initialization failed."
 msgstr "Ошибка инициализации видео плеера."
 
-#: src/player_equalizer.cpp:253
+#: src/player_equalizer.cpp:254
 msgid "Need at least OpenGL 2.1."
 msgstr "Необходим как минимум OpenGL 2.1."
 
-#: src/player_equalizer.cpp:430
+#: src/player_equalizer.cpp:431
 msgid "No canvas in Equalizer configuration."
 msgstr "В конфигурации Equalizer отсутствует полотно."
 
-#: src/player_equalizer.cpp:437
+#: src/player_equalizer.cpp:438
 #, fuzzy, c-format
 msgid "Equalizer canvas: %gx%g, aspect ratio %g:1"
 msgstr "%gx%g, соотношение сторон %g:1"
 
-#: src/player_equalizer.cpp:922 src/video_output_qt.cpp:560
+#: src/player_equalizer.cpp:926 src/video_output_qt.cpp:583
 msgid ""
 "This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
 "objects."
 msgstr ""
 "Данная реализация OpenGL не поддерживает OpenGL 2.1 и объекты во фреймбуфере."
 
-#: src/player_equalizer.cpp:1105
+#: src/player_equalizer.cpp:1107
 msgid "Equalizer initialization failed."
 msgstr "Ошибка инициализации Equalizer."
 
-#: src/player_equalizer.cpp:1113
+#: src/player_equalizer.cpp:1115
 msgid "Cannot get equalizer configuration."
 msgstr "Невозможно получить конфигурацию Equalizer."
 
-#: src/player_equalizer.cpp:1127
+#: src/player_equalizer.cpp:1132
 msgid "Equalizer configuration initialization failed."
 msgstr "Ошибка инициализации конфигурации Equalizer."
 
@@ -1843,83 +1959,88 @@
 msgid "Cannot initialize LibASS renderer."
 msgstr "Невозможно инициализировать отрисовщик LibASS."
 
-#: src/subtitle_renderer.cpp:398
+#: src/subtitle_renderer.cpp:404
 msgid "Cannot initialize LibASS track."
 msgstr "Невозможно инициализировать дорожку LibASS."
 
-#: src/subtitle_renderer.cpp:409
+#: src/subtitle_renderer.cpp:415
 #, c-format
 msgid "Subtitle character set conversion failed: %s"
 msgstr "Ошибка преобразования кодировки субтитров: %s"
 
-#: src/video_output.cpp:145
+#: src/video_output.cpp:347
 #, c-format
 msgid "OpenGL error 0x%04X."
 msgstr "Ошибка OpenGL 0x%04X."
 
-#: src/video_output.cpp:203
+#: src/video_output.cpp:359
+#, fuzzy, c-format
+msgid "OpenGL Framebuffer status error 0x%04X."
+msgstr "Ошибка OpenGL 0x%04X."
+
+#: src/video_output.cpp:407
 #, c-format
 msgid "OpenGL %s '%s': compiler warning:"
 msgstr "OpenGL %s '%s': предупреждение компилятора:"
 
-#: src/video_output.cpp:204 src/video_output.cpp:209
+#: src/video_output.cpp:408 src/video_output.cpp:413
 msgid "vertex shader"
 msgstr "вершинный шейдер"
 
-#: src/video_output.cpp:204 src/video_output.cpp:209
+#: src/video_output.cpp:408 src/video_output.cpp:413
 msgid "fragment shader"
 msgstr "фрагментный шейдер"
 
-#: src/video_output.cpp:208
+#: src/video_output.cpp:412
 #, c-format
 msgid "OpenGL %s '%s': compilation failed."
 msgstr "OpenGL %s '%s': ошибка компиляции."
 
-#: src/video_output.cpp:211 src/video_output.cpp:288
+#: src/video_output.cpp:415 src/video_output.cpp:492
 msgid "unknown error"
 msgstr "неизвестная ошибка"
 
-#: src/video_output.cpp:284
+#: src/video_output.cpp:488
 #, c-format
 msgid "OpenGL program '%s': linker warning:"
 msgstr "OpenGL программа '%s': предупреждение компоновщика:"
 
-#: src/video_output.cpp:287
+#: src/video_output.cpp:491
 #, c-format
 msgid "OpenGL program '%s': linking failed."
 msgstr "OpenGL программа '%s': ошибка компоновки."
 
-#: src/video_output.cpp:563 src/video_output.cpp:675
+#: src/video_output.cpp:1494 src/video_output.cpp:1635
 msgid "Cannot create a PBO buffer."
 msgstr "Невозможно создать буфер PBO."
 
-#: src/video_output_qt.cpp:555
+#: src/video_output_qt.cpp:578
 #, c-format
 msgid "Cannot initialize GLEW: %s"
 msgstr "Невозможно инициализировать GLEW: %s"
 
-#: src/video_output_qt.cpp:588
+#: src/video_output_qt.cpp:611
 msgid "Please wait"
 msgstr "Пожалуйста, подождите"
 
-#: src/video_output_qt.cpp:643
+#: src/video_output_qt.cpp:671
 #, fuzzy
 msgid "Cannot get valid OpenGL context."
 msgstr "Невозможно установить формат OpenGL."
 
-#: src/video_output_qt.cpp:654
+#: src/video_output_qt.cpp:682
 msgid "The display does not support OpenGL stereo mode."
 msgstr "Дисплей не поддерживает режим OpenGL стерео."
 
-#: src/video_output_qt.cpp:659
+#: src/video_output_qt.cpp:687
 msgid "Cannot set OpenGL context format."
 msgstr "Невозможно установить формат OpenGL."
 
-#: src/video_output_qt.cpp:752
+#: src/video_output_qt.cpp:780
 msgid "Cannot suspend screensaver."
 msgstr "Невозможно отключить хранитель экрана."
 
-#: src/video_output_qt.cpp:767
+#: src/video_output_qt.cpp:795
 msgid "Cannot resume screensaver."
 msgstr "Невозможно включить хранитель экрана."

bino-1.3.3.tar.xz/po/zh_cn.gmo Added

bino-1.3.3.tar.xz/po/zh_cn.po Added

@@ -0,0 +1,1932 @@
+# 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-01 15:05+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:1183 src/media_data.cpp:1206 src/media_data.cpp:1244
+#: src/media_data.cpp:1249
+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:361 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'"
+msgstr ""
+
+#: src/dispatch.cpp:166
+msgid "Cannot connect to X server."
+msgstr ""
+
+#: src/dispatch.cpp:182
+msgid "No video to play."
+msgstr "无视频可播放。"
+
+#: src/dispatch.cpp:437 src/player_equalizer.cpp:85
+msgid "No video streams found."
+msgstr "没有视频流被发现。"
+
+#: src/dispatch.cpp:454
+msgid "Cannot set requested stereo layout: incompatible media."
+msgstr ""
+
+#: src/dispatch.cpp:469
+#, c-format
+msgid "Video stream %d not found."
+msgstr "没有找到视频流 %d 。"
+
+#: src/dispatch.cpp:475
+#, c-format
+msgid "Audio stream %d not found."
+msgstr "没有找到音频流 %d 。"
+
+#: src/dispatch.cpp:483
+#, c-format
+msgid "Subtitle stream %d not found."
+msgstr "没有找到字幕 %d 。"
+
+#: src/dispatch.cpp:555 src/main.cpp:748
+msgid "This version of Bino was compiled without support for Equalizer."
+msgstr "此 Bino 版本未编译支持 Equalizer 。"
+
+#: src/gui.cpp:107
+msgid "Video:"
+msgstr "视频:"
+
+#: src/gui.cpp:108
+msgid "Select the video stream."
+msgstr "选择视频流。"
+
+#: src/gui.cpp:114
+msgid "Audio:"
+msgstr "音频:"
+
+#: src/gui.cpp:115
+msgid "Select the audio stream."
+msgstr "选择音频流。"
+
+#: src/gui.cpp:121
+msgid "Subtitle:"
+msgstr "字幕:"
+
+#: src/gui.cpp:122
+msgid "Select the subtitle stream."
+msgstr "选择字幕流。"
+
+#: src/gui.cpp:133 src/media_input.cpp:276
+msgid "Input:"
+msgstr "输入:"
+
+#: src/gui.cpp:134
+msgid "Set the 3D layout of the video stream."
+msgstr "设置 3D 视频流布局。 "
+
+#: src/gui.cpp:138
+msgid "2D"
+msgstr "2D"
+
+#: src/gui.cpp:139
+msgid "Separate streams, left first"
+msgstr "独立流，左优先"
+
+#: src/gui.cpp:140
+msgid "Separate streams, right first"
+msgstr "独立流，右优先"
+
+#: src/gui.cpp:141
+msgid "Alternating, left first"
+msgstr "交替，左优先"
+
+#: src/gui.cpp:142
+msgid "Alternating, right first"
+msgstr "交替，右优先"
+
+#: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2095 src/gui.cpp:2124
+msgid "Top/bottom"
+msgstr "上/下"
+
+#: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2096 src/gui.cpp:2125
+msgid "Top/bottom, half height"
+msgstr "上/下，半高度"
+
+#: src/gui.cpp:145
+msgid "Bottom/top"
+msgstr "下/上"
+
+#: src/gui.cpp:146
+msgid "Bottom/top, half height"
+msgstr "下/上，半高度"
+
+#: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2097 src/gui.cpp:2126
+msgid "Left/right"
+msgstr "左/右"
+
+#: src/gui.cpp:148 src/gui.cpp:170 src/gui.cpp:2098 src/gui.cpp:2127
+msgid "Left/right, half width"
+msgstr "左/右，半宽度"
+
+#: src/gui.cpp:149
+msgid "Right/left"
+msgstr "右/左"
+
+#: src/gui.cpp:150
+msgid "Right/left, half width"
+msgstr "右/左，半宽度"
+
+#: src/gui.cpp:151 src/gui.cpp:171 src/gui.cpp:2099 src/gui.cpp:2128
+msgid "Even/odd rows"
+msgstr "Even/odd rows"
+
+#: src/gui.cpp:152
+msgid "Odd/even rows"
+msgstr "Odd/even rows"
+
+#: src/gui.cpp:158
+msgid "Output:"
+msgstr "输出:"
+
+#: src/gui.cpp:159
+msgid "Set the 3D output type for your display."
+msgstr "设置您需要显示的 3D 格式。 "
+
+#: src/gui.cpp:163 src/gui.cpp:2093 src/gui.cpp:2122
+msgid "Left view"
+msgstr "左视图"
+
+#: src/gui.cpp:164 src/gui.cpp:2094 src/gui.cpp:2123
+msgid "Right view"
+msgstr "右视图"
+
+#: src/gui.cpp:165
+msgid "OpenGL stereo"
+msgstr "OpenGL 立体"
+
+#: src/gui.cpp:166
+msgid "Left/right view alternating"
+msgstr "左/右视图交替"
+
+#: src/gui.cpp:172 src/gui.cpp:2100 src/gui.cpp:2129
+msgid "Even/odd columns"
+msgstr "Even/odd columns"
+
+#: src/gui.cpp:173 src/gui.cpp:2101 src/gui.cpp:2130
+msgid "Checkerboard pattern"
+msgstr "Checkerboard pattern"
+
+#: src/gui.cpp:174
+msgid "HDMI frame packing mode"
+msgstr "HDMI 帧包装模式"
+
+#: src/gui.cpp:175 src/gui.cpp:2102 src/gui.cpp:2131
+msgid "Red/cyan glasses, monochrome method"
+msgstr "红/青眼镜，单色"
+
+#: src/gui.cpp:176 src/gui.cpp:2103 src/gui.cpp:2132
+msgid "Red/cyan glasses, half-color method"
+msgstr "红/青眼镜，半彩"
+
+#: src/gui.cpp:177 src/gui.cpp:2104 src/gui.cpp:2133
+msgid "Red/cyan glasses, full-color method"
+msgstr "红/青眼镜，全彩"
+
+#: src/gui.cpp:178 src/gui.cpp:2105 src/gui.cpp:2134
+msgid "Red/cyan glasses, high-quality Dubois method"
+msgstr "红/青眼镜，高品质 Dubois 算法"
+
+#: src/gui.cpp:179 src/gui.cpp:2106 src/gui.cpp:2135
+msgid "Green/magenta glasses, monochrome method"
+msgstr "绿/洋红眼镜，单色"
+
+#: src/gui.cpp:180 src/gui.cpp:2107 src/gui.cpp:2136
+msgid "Green/magenta glasses, half-color method"
+msgstr "绿/洋红眼镜，半彩"
+
+#: src/gui.cpp:181 src/gui.cpp:2108 src/gui.cpp:2137
+msgid "Green/magenta glasses, full-color method"
+msgstr "绿/洋红眼镜，全彩"
+
+#: src/gui.cpp:182 src/gui.cpp:2109 src/gui.cpp:2138
+msgid "Green/magenta glasses, high-quality Dubois method"
+msgstr "绿/洋红眼镜，高品质 Dubois 算法"
+
+#: src/gui.cpp:183 src/gui.cpp:2110 src/gui.cpp:2139
+msgid "Amber/blue glasses, monochrome method"
+msgstr "黄/蓝眼镜，单色"
+
+#: src/gui.cpp:184 src/gui.cpp:2111 src/gui.cpp:2140
+msgid "Amber/blue glasses, half-color method"
+msgstr "黄/蓝眼镜，半彩"
+
+#: src/gui.cpp:185 src/gui.cpp:2112 src/gui.cpp:2141
+msgid "Amber/blue glasses, full-color method"
+msgstr "黄/蓝眼镜，全彩"
+
+#: src/gui.cpp:186 src/gui.cpp:2113 src/gui.cpp:2142
+msgid "Amber/blue glasses, high-quality Dubois method"
+msgstr "黄/蓝眼镜，高品质 Dubois 算法"
+
+#: src/gui.cpp:187 src/gui.cpp:2114 src/gui.cpp:2143
+msgid "Red/green glasses, monochrome method"
+msgstr "红/绿眼镜，单色"
+
+#: src/gui.cpp:188 src/gui.cpp:2115 src/gui.cpp:2144
+msgid "Red/blue glasses, monochrome method"
+msgstr "红/蓝眼镜，单色"
+
+#: src/gui.cpp:192
+msgid "Swap left/right"
+msgstr "左右互换"
+
+#: src/gui.cpp:193
+msgid ""
+"Swap the left and right view. Use this if the 3D effect seems wrong."
+msgstr "调换左右视频观看。如果您觉得 3D 效果看起来不对，请使用它。"
+
+#: src/gui.cpp:471 src/gui.cpp:1676
+msgid "Off"
+msgstr "关闭"
+
+#: src/gui.cpp:702
+msgid ""
+"This slider shows the progress during video playback, and can be used to "
+"seek in the video."
+msgstr "此滑块显示视频播放的进度，并可以用来定位视频。"
+
+#: src/gui.cpp:709
+msgid "Elapsed / total time."
+msgstr "已播/总时间。"
+
+#: src/gui.cpp:716
+msgid "Toggle audio mute."
+msgstr "静音切换。"
+
+#: src/gui.cpp:721
+msgid "Adjust audio volume."
+msgstr "音量调节。"
+
+#: src/gui.cpp:733
+msgid "Play."
+msgstr "播放。"
+
+#: src/gui.cpp:737
+msgid "Pause."
+msgstr "暂停。"
+
+#: src/gui.cpp:741
+msgid "Stop."
+msgstr "停止。"
+
+#: src/gui.cpp:746
+msgid "Toggle loop mode."
+msgstr "切换循环模式。"
+
+#: src/gui.cpp:753
+msgid ""
+"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
+"f key."
+msgstr "切换至全屏模式。如果您想退出全屏模式请按 F 键。"
+
+#: src/gui.cpp:759
+msgid "Center the video area on your screen."
+msgstr "把视频区放在您屏幕的中间。"
+
+#: src/gui.cpp:766
+msgid "Seek backward 10 minutes."
+msgstr "后退10分钟。"
+
+#: src/gui.cpp:771
+msgid "Seek backward 1 minute."
+msgstr "后退1分钟"
+
+#: src/gui.cpp:777
+msgid "Seek backward 10 seconds."
+msgstr "后退10秒。"
+
+#: src/gui.cpp:783
+msgid "Seek forward 10 seconds."
+msgstr "前进10秒。"
+
+#: src/gui.cpp:788
+msgid "Seek forward 1 minute."
+msgstr "前进一分钟。"
+
+#: src/gui.cpp:794
+msgid "Seek forward 10 minutes."
+msgstr "前进10分钟。"
+
+#: src/gui.cpp:1055
+msgid "Fullscreen/Multiscreen Settings"
+msgstr "全屏/多屏设置"
+
+#: src/gui.cpp:1057
+msgid "Configure fullscreen mode:"
+msgstr "配置全屏模式:"
+
+#: src/gui.cpp:1058
+msgid "Select the screens to use in fullscreen mode."
+msgstr "选择全屏模式使用的屏幕。"
+
+#: src/gui.cpp:1060
+msgid "Single screen:"
+msgstr "单一屏幕:"
+
+#: src/gui.cpp:1061
+msgid "Use a single screen for fullscreen mode."
+msgstr "使用单屏的全屏模式。"
+
+#: src/gui.cpp:1064
+msgid "Primary screen"
+msgstr "主屏幕"
+
+#: src/gui.cpp:1067 src/gui.cpp:1078 src/gui.cpp:1079
+#, c-format
+msgid "Screen %d"
+msgstr "屏幕 %d"
+
+#: src/gui.cpp:1070
+msgid "Dual screen:"
+msgstr "双屏幕:"
+
+#: src/gui.cpp:1071
+msgid "Use two screens for fullscreen mode."
+msgstr "使用双屏的全屏模式。"
+
+#: src/gui.cpp:1083
+msgid "Multi screen:"
+msgstr "多屏幕:"
+
+#: src/gui.cpp:1084
+msgid "Use multiple screens for fullscreen mode."
+msgstr "使用多屏的全屏模式。"
+
+#: src/gui.cpp:1086
+msgid "Comma-separated list of screens to use for fullscreen mode."
+msgstr "使用全屏模式的屏幕列表，逗号分割。"
+
+#: src/gui.cpp:1089
+msgid "When in fullscreen mode,"
+msgstr "当处于全屏模式时，"
+
+#: src/gui.cpp:1090
+msgid "Set special left/right view handling for fullscreen mode."
+msgstr "设置特殊的左/右视图处理"
+
+#: src/gui.cpp:1092
+msgid "flip left view vertically."
+msgstr "垂直翻转左视图。"
+
+#: src/gui.cpp:1094
+msgid "flop left view horizontally."
+msgstr "水平翻转左视图。"
+
+#: src/gui.cpp:1096
+msgid "flip right view vertically."
+msgstr "垂直翻转右视图。"
+
+#: src/gui.cpp:1098
+msgid "flop right view horizontally."
+msgstr "水平翻转右视图。"
+
+#: src/gui.cpp:1101
+msgid "use DLP(R) 3-D Ready Sync"
+msgstr ""
+
+#: src/gui.cpp:1102
+msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
+msgstr ""
+
+#: src/gui.cpp:1104
+msgid "inhibit the screensaver"
+msgstr "禁止屏幕保护程序"
+
+#: src/gui.cpp:1105
+msgid "Inhibit the screensaver during fullscreen playback."
+msgstr "在全屏播放时禁止屏保"
+
+#: src/gui.cpp:1107 src/gui.cpp:1273 src/gui.cpp:1408 src/gui.cpp:1478
+#: src/gui.cpp:1556 src/gui.cpp:1680 src/gui.cpp:1948 src/gui.cpp:2147
+#: src/gui.cpp:2625 src/gui.cpp:3324 src/gui.cpp:3371 src/gui.cpp:3677
+msgid "OK"
+msgstr "确定"
+
+#: src/gui.cpp:1226
+msgid "Display Color Adjustments"
+msgstr "显示色彩调整"
+
+#: src/gui.cpp:1228
+msgid "Contrast:"
+msgstr "对比度:"
+
+#: src/gui.cpp:1239
+msgid "Brightness:"
+msgstr "亮度:"
+
+#: src/gui.cpp:1250
+msgid "Hue:"
+msgstr "色调:"
+
+#: src/gui.cpp:1261
+msgid "Saturation:"
+msgstr "饱和度:"
+
+#: src/gui.cpp:1379
+msgid "Display Crosstalk Calibration"
+msgstr ""
+
+#. TRANSLATORS: Please keep the lines short using where necessary.
+#: src/gui.cpp:1382
+msgid ""
+"Please read the manual to find out how to measure the crosstalk "
+"levels of your display."
+msgstr "请仔细阅读手册，找出如何来 平衡您的显示器的失真程度。"
+
+#: src/gui.cpp:1386
+msgid "Red:"
+msgstr "红:"
+
+#: src/gui.cpp:1393
+msgid "Green:"
+msgstr "绿:"
+
+#: src/gui.cpp:1400
+msgid "Blue:"
+msgstr "蓝:"
+
+#: src/gui.cpp:1456
+msgid "Zoom for wide videos"
+msgstr "宽视频缩放"
+
+#: src/gui.cpp:1459
+#, fuzzy
+msgid ""
+"Set zoom level for videos that are wider than the screen: 0: Show "
+"full video width. 1: Use full screen height.</p"
+msgstr ""
+"设置视频宽度超过 屏幕时的缩放值: 0:显示完整视频的宽度。 1:显示完"
+"整视频的高度。"
+
+#: src/gui.cpp:1463
+msgid "Zoom:"
+msgstr "缩放:"
+
+#: src/gui.cpp:1464
+msgid "Set the zoom level for videos that are wider than the screen"
+msgstr "设置视频宽度超过屏幕时的缩放值"
+
+#: src/gui.cpp:1522
+msgid "Audio Settings"
+msgstr "音频设置"
+
+#: src/gui.cpp:1524
+msgid "Audio device:"
+msgstr "音频设备:"
+
+#: src/gui.cpp:1525
+msgid ""
+"Select the audio device. This will take effect for the next started "
+"video."
+msgstr "选择音频设备。 在下一次开始播放时生效。"
+
+#: src/gui.cpp:1529 src/gui.cpp:2563
+msgid "Default"
+msgstr "默认"
+
+#: src/gui.cpp:1546
+msgid "Audio delay (ms):"
+msgstr "音频延迟 (毫秒):"
+
+#: src/gui.cpp:1547
+msgid ""
+"Set an audio delay, in milliseconds. This is useful if audio and video "
+"are not in sync."
+msgstr ""
+"设置音频的延迟，以毫秒为单位。 如果音频和视频不同步的话，非常有用。"
+
+#: src/gui.cpp:1604
+msgid "Subtitle Settings"
+msgstr "字幕设置"
+
+#: src/gui.cpp:1607
+msgid ""
+"These settings apply only to soft subtitles, not to bitmaps. Some "
+"changes require a restart of the video to take effect."
+msgstr ""
+
+#: src/gui.cpp:1610
+msgid "Encoding:"
+msgstr "编码:"
+
+#: src/gui.cpp:1611
+msgid "Set the subtitle character set encoding."
+msgstr "设置字幕的字符编码"
+
+#: src/gui.cpp:1626
+msgid "Override font:"
+msgstr "重载字体:"
+
+#: src/gui.cpp:1627
+msgid "Override the subtitle font family."
+msgstr "重载字幕字体名称。"
+
+#: src/gui.cpp:1636
+msgid "Override font size:"
+msgstr "重载字体大小:"
+
+#: src/gui.cpp:1637
+msgid "Override the subtitle font size."
+msgstr "重载字幕字体大小。"
+
+#: src/gui.cpp:1647
+msgid "Override scale factor:"
+msgstr "重载比例:"
+
+#: src/gui.cpp:1648
+msgid "Override the subtitle scale factor."
+msgstr "重载字幕比例。"
+
+#: src/gui.cpp:1659
+msgid "Override color:"
+msgstr "重载颜色:"
+
+#: src/gui.cpp:1660
+msgid "Override the subtitle color."
+msgstr "重载字幕颜色。"
+
+#: src/gui.cpp:1669
+#, fuzzy
+msgid "Override shadow:"
+msgstr "重载字体:"
+
+#: src/gui.cpp:1670
+#, fuzzy
+msgid "Override the subtitle shadow."
+msgstr "重载字幕颜色。"
+
+#: src/gui.cpp:1675
+msgid "On"
+msgstr ""
+
+#: src/gui.cpp:1886
+msgid "Video Settings"
+msgstr "视频设置"
+
+#: src/gui.cpp:1888
+msgid "Crop to aspect ratio:"
+msgstr "裁剪为长宽比:"
+
+#: src/gui.cpp:1889
+msgid ""
+"Set the real aspect ratio of the video, so that borders can be cropped.</"
+"p>"
+msgstr ""
+
+#: src/gui.cpp:1892
+msgid "Do not crop"
+msgstr "不裁剪"
+
+#: src/gui.cpp:1905
+msgid "Parallax:"
+msgstr "视差："
+
+#: src/gui.cpp:1906
+msgid ""
+"Adjust parallax, from -1 to +1. This changes the separation of left and "
+"right view, and thus the perceived distance of the scene."
+msgstr "调整视差，从-1到+1。通过左右视图的距离改变，改变现场的感知距离"
+
+#: src/gui.cpp:1919
+msgid "Subtitle parallax:"
+msgstr "字幕视差:"
+
+#: src/gui.cpp:1920
+msgid ""
+"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
+"distance of the subtitles."
+msgstr "调整字幕视差，从 -1 到 +1。将改变字幕的感知距离。"
+
+#: src/gui.cpp:1933
+msgid "Ghostbusting:"
+msgstr "鬼影(残影):"
+
+#: src/gui.cpp:1934
+msgid ""
+"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
+"does not work with anaglyph glasses."
+msgstr ""
+
+#: src/gui.cpp:2078
+#, fuzzy
+msgid "SDI Output Settings"
+msgstr "字幕设置"
+
+#: src/gui.cpp:2080
+msgid "SDI Output Format:"
+msgstr ""
+
+#: src/gui.cpp:2081
+#, fuzzy
+msgid "Select output format used for SDI output."
+msgstr "设置您需要显示的 3D 格式。 "
+
+#: src/gui.cpp:2089
+msgid "Left stereo mode:"
+msgstr ""
+
+#: src/gui.cpp:2090
+#, fuzzy
+msgid "Select stereo mode used for left SDI output."
+msgstr "选择全屏模式使用的屏幕。"
+
+#: src/gui.cpp:2118
+msgid "Right stereo mode:"
+msgstr ""
+
+#: src/gui.cpp:2119
+msgid "Select stereo mode used for right SDI output."
+msgstr ""
+
+#: src/gui.cpp:2559
+#, fuzzy
+msgid "Open device(s)"
+msgstr "打开设备"
+
+#: src/gui.cpp:2562
+msgid "Choose a device type."
+msgstr "选择设备类型。"
+
+#: src/gui.cpp:2564 src/media_object.cpp:801
+msgid "Firewire"
+msgstr "火线"
+
+#: src/gui.cpp:2565 src/media_object.cpp:802
+msgid "X11"
+msgstr "X11"
+
+#: src/gui.cpp:2568 src/gui.cpp:2571
+msgid "Choose a device."
+msgstr "选择设备。"
+
+#: src/gui.cpp:2574
+msgid "Set the X11 device string. Refer to the manual for details."
+msgstr "设置X11的设备字符串。详细信息，请参阅手册"
+
+#: src/gui.cpp:2590
+#, fuzzy
+msgid "First device:"
+msgstr "音频设备:"
+
+#: src/gui.cpp:2591
+#, fuzzy
+msgid "Second device:"
+msgstr "打开设备"
+
+#: src/gui.cpp:2595
+msgid "Request frame size"
+msgstr ""
+
+#: src/gui.cpp:2596
+msgid ""
+"Request a specific frame size from the device, e.g. 640x480. The device "
+"must support this frame size. Some devices require a frame size to be "
+"selected."
+msgstr ""
+
+#: src/gui.cpp:2607
+msgid "Request frame rate"
+msgstr ""
+
+#: src/gui.cpp:2608
+msgid ""
+"Request a specific frame rate from the device, e.g. 25/1. The device must "
+"support this frame rate. Some devices require a frame rate to be selected.</"
+"p>"
+msgstr ""
+
+#: src/gui.cpp:2619
+msgid "Request MJPEG format"
+msgstr ""
+
+#: src/gui.cpp:2620
+msgid ""
+"Request MJPEG data from the input device. The device may ignore this "
+"request."
+msgstr ""
+
+#: src/gui.cpp:2623 src/gui.cpp:3370
+msgid "Cancel"
+msgstr "取消"
+
+#: src/gui.cpp:2918
+msgid "&File"
+msgstr "文件(&F)"
+
+#: src/gui.cpp:2919
+msgid "&Open file(s)..."
+msgstr "打开文件(&O)..."
+
+#: src/gui.cpp:2924
+msgid "Open &URL(s)..."
+msgstr "打开链接(&U)..."
+
+#: src/gui.cpp:2928
+#, fuzzy
+msgid "Open &device(s)..."
+msgstr "打开设备(&D)"
+
+#: src/gui.cpp:2943
+msgid "&Clear recent files"
+msgstr "清除最近文件(&C)"
+
+#: src/gui.cpp:2951
+msgid "&Quit..."
+msgstr "退出(&Q)..."
+
+#: src/gui.cpp:2957
+msgid "&Preferences"
+msgstr "首选项(&P)"
+
+#: src/gui.cpp:2960
+msgid "&Fullscreen Settings..."
+msgstr "全屏设置(&F)..."
+
+#: src/gui.cpp:2963
+msgid "Display &Color Adjustments..."
+msgstr "显示色彩调整(&C)..."
+
+#: src/gui.cpp:2966
+msgid "Display Cross&talk Calibration..."
+msgstr "显示串扰校准(&T)..."
+
+#: src/gui.cpp:2970
+msgid "&Zoom for wide videos..."
+msgstr "宽视频缩放(&Z)..."
+
+#: src/gui.cpp:2974
+msgid "&Audio Settings..."
+msgstr "音频设置(&A)..."
+
+#: src/gui.cpp:2978
+msgid "&Subtitle Settings..."
+msgstr "字幕设置(&S)..."
+
+#: src/gui.cpp:2982
+msgid "Current &Video Settings..."
+msgstr "当前视频设置(&V)"
+
+#: src/gui.cpp:2987
+#, fuzzy
+msgid "SDI &Output Settings..."
+msgstr "字幕设置(&S)..."
+
+#: src/gui.cpp:2991
+msgid "&Help"
+msgstr "帮助(&H)"
+
+#: src/gui.cpp:2992
+msgid "&Manual..."
+msgstr "手册(&M)"
+
+#: src/gui.cpp:2997
+msgid "&Website..."
+msgstr "网站(&W)"
+
+#: src/gui.cpp:3001
+msgid "&Keyboard Shortcuts"
+msgstr "快捷方式(&K)"
+
+#: src/gui.cpp:3005
+msgid "&About"
+msgstr "关于(&A)"
+
+#: src/gui.cpp:3317
+msgid "Tip"
+msgstr "提示"
+
+#: src/gui.cpp:3320
+msgid ""
+"You can select and open multiple files at once.This is useful for "
+"example if you have extra subtitle files, or if left and right view are "
+"stored in separate files."
+msgstr ""
+
+#: src/gui.cpp:3323
+msgid "Do not show this message again."
+msgstr "不再显示该信息。"
+
+#: src/gui.cpp:3340
+msgid "Open files"
+msgstr "打开文件"
+
+#: src/gui.cpp:3364
+msgid "Open URL(s)"
+msgstr "打开链接"
+
+#: src/gui.cpp:3365
+msgid "URL(s):"
+msgstr "链接地址:"
+
+#: src/gui.cpp:3366
+msgid "Enter one or more space separated URLs."
+msgstr "输入一个或多个空格分隔的链接地址"
+
+#: src/gui.cpp:3568 src/gui.cpp:3576 src/video_output_qt.cpp:241
+#: src/video_output_qt.cpp:477 src/video_output_qt.cpp:659
+#: src/video_output_qt.cpp:671 src/video_output_qt.cpp:692
+msgid "Error"
+msgstr "错误"
+
+#: src/gui.cpp:3568
+msgid "Cannot open manual."
+msgstr "不能打开手册。"
+
+#: src/gui.cpp:3576
+msgid "Cannot open website."
+msgstr "不能打开网站。"
+
+#: src/gui.cpp:3584
+msgid "Keyboard Shortcuts"
+msgstr "键盘快捷键"
+
+#: src/gui.cpp:3587
+msgid "Keyboard control:"
+msgstr "键盘控制:"
+
+#: src/gui.cpp:3589
+msgid "Stop."
+msgstr "停止。"
+
+#: src/gui.cpp:3590 src/main.cpp:494
+msgid "Pause / unpause."
+msgstr "暂停/恢复"
+
+#: src/gui.cpp:3591 src/main.cpp:495
+msgid "Toggle fullscreen."
+msgstr "切换全屏。"
+
+#: src/gui.cpp:3592 src/main.cpp:496
+msgid "Center window."
+msgstr "中置窗口。"
+
+#: src/gui.cpp:3593 src/main.cpp:497
+msgid "Swap left/right eye."
+msgstr "切换左右眼。"
+
+#: src/gui.cpp:3594 src/main.cpp:498
+msgid "Cycle through available video streams."
+msgstr "切换视频流。"
+
+#: src/gui.cpp:3595 src/main.cpp:499
+msgid "Cycle through available audio streams."
+msgstr "切换音频流。"
+
+#: src/gui.cpp:3596 src/main.cpp:500
+msgid "Cycle through available subtitle streams."
+msgstr "切换字幕流。"
+
+#: src/gui.cpp:3597 src/main.cpp:501
+msgid "Adjust contrast."
+msgstr "调整对比度。"
+
+#: src/gui.cpp:3598 src/main.cpp:502
+msgid "Adjust brightness."
+msgstr "调整亮度。"
+
+#: src/gui.cpp:3599 src/main.cpp:503
+msgid "Adjust hue."
+msgstr "调整色调。"
+
+#: src/gui.cpp:3600 src/main.cpp:504
+msgid "Adjust saturation."
+msgstr "调整饱和度。"
+
+#: src/gui.cpp:3601 src/main.cpp:505
+msgid "Adjust parallax."
+msgstr "调整视差。"
+
+#: src/gui.cpp:3602 src/main.cpp:506
+msgid "Adjust ghostbusting."
+msgstr "调整鬼影(残影)。"
+
+#: src/gui.cpp:3603 src/main.cpp:507
+msgid "Adjust zoom for wide videos."
+msgstr "调整宽视频缩放。"
+
+#: src/gui.cpp:3604 src/main.cpp:508
+msgid "Adjust audio volume."
+msgstr "调整音量。"
+
+#: src/gui.cpp:3605 src/main.cpp:509
+msgid "Toggle audio mute."
+msgstr "切换静音。"
+
+#: src/gui.cpp:3606 src/main.cpp:510
+msgid "Step a single video frame forward."
+msgstr "逐帧播放。"
+
+#: src/gui.cpp:3607 src/main.cpp:511
+msgid "Seek 10 seconds backward / forward."
+msgstr "后退/前进 10 秒。"
+
+#: src/gui.cpp:3608 src/main.cpp:512
+msgid "Seek 1 minute backward / forward."
+msgstr "后退/前进 1 分钟。"
+
+#: src/gui.cpp:3609 src/main.cpp:513
+msgid "Seek 10 minutes backward / forward."
+msgstr "后退/前进 10 分钟。"
+
+#: src/gui.cpp:3610 src/main.cpp:515
+msgid "Media keys should work as expected."
+msgstr ""
+
+#: src/gui.cpp:3626
+#, c-format
+msgid "About %s"
+msgstr "关于 %s"
+
+#: src/gui.cpp:3632
+#, c-format
+msgid "The %s 3D video player"
+msgstr "%s 3D视频播放器"
+
+#: src/gui.cpp:3637
+#, c-format
+msgid ""
+"%s version %s.Copyright (C) 2012 the Bino developers.This "
+"is free software. You may redistribute copies of it under the terms of the "
+"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
+"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
+"\"%s\">%s</a> for more information on this software."
+msgstr ""
+"%s 版本 %s.Copyright (C) 2012 the Bino developers.This is "
+"free software. You may redistribute copies of it under the terms of the <a "
+"href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
+"a>. There is NO WARRANTY, to the extent permitted by law. 访问 <a "
+"href=\"%s\">%s</a> 以获得更多软件信息。"
+
+#: src/gui.cpp:3649 src/main.cpp:378
+msgid "Platform:"
+msgstr "平台:"
+
+#: src/gui.cpp:3650 src/main.cpp:380
+msgid "Libraries used:"
+msgstr "使用以下库:"
+
+#: src/gui.cpp:3672
+msgid "About"
+msgstr "关于"
+
+#: src/gui.cpp:3673
+msgid "Libraries"
+msgstr "库"
+
+#: src/gui.cpp:3674
+msgid "Team"
+msgstr "团队"
+
+#: src/gui.cpp:3675
+msgid "License"
+msgstr "许可"
+
+#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
+msgid "not used"
+msgstr "未使用"
+
+#: src/lirc.cpp:61
+msgid "Cannot initialize LIRC."
+msgstr "不能初始化 LIRC"
+
+#: src/lirc.cpp:67
+msgid "Cannot set LIRC socket properties."
+msgstr ""
+
+#: src/lirc.cpp:74
+msgid "Cannot read LIRC default configuration."
+msgstr ""
+
+#: src/lirc.cpp:89
+#, c-format
+msgid "Cannot read LIRC configuration file %s."
+msgstr ""
+
+#: src/lirc.cpp:117
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr ""
+
+#: src/lirc.cpp:131
+#, c-format
+msgid "Received invalid command '%s' from LIRC."
+msgstr ""
+
+#: src/lirc.cpp:141
+msgid "Cannot get command for LIRC code."
+msgstr ""
+
+#: src/main.cpp:373
+#, c-format
+msgid "%s version %s"
+msgstr "%s 版本 %s"
+
+#: src/main.cpp:374
+msgid "Copyright (C) 2012 the Bino developers."
+msgstr "Copyright (C) 2012 the Bino developers。"
+
+#: src/main.cpp:375
+msgid ""
+"This is free software. You may redistribute copies of it under the terms of "
+"the GNU General Public License. There is NO WARRANTY, to the extent "
+"permitted by law."
+msgstr ""
+
+#. TRANSLATORS: This is the --help text. Please keep the line length limited.
+#. * The --help output should look good with a line width of 80 characters.
+#: src/main.cpp:393
+msgid "Usage:"
+msgstr "用法："
+
+#: src/main.cpp:395
+msgid "Options:"
+msgstr "选项："
+
+#: src/main.cpp:396
+msgid "Print help."
+msgstr "显示帮助。"
+
+#: src/main.cpp:397
+msgid "Print version."
+msgstr "显示版本。"
+
+#: src/main.cpp:398
+msgid "Do not use the GUI, just show a plain window."
+msgstr "不使用 GUI，仅显示一个纯窗口。"
+
+#: src/main.cpp:399
+msgid "Append all log messages to the given file."
+msgstr "追加所有日志信息到指定文件。"
+
+#: src/main.cpp:400
+msgid "Set log level (debug/info/warning/error/quiet)."
+msgstr "设置日志级别 (debug/info/warning/error/quiet)。"
+
+#: src/main.cpp:401
+msgid "Print a list of known audio devices and exit."
+msgstr "显示已知音频设备列表并退出。"
+
+#: src/main.cpp:402
+msgid "Use audio device number N (N=0 is the default)."
+msgstr "使用音频设备编号为 N (默认 N=0 )。"
+
+#: src/main.cpp:403
+msgid "Delay audio by D milliseconds. Default is 0."
+msgstr "延迟 D 毫秒音频。默认为 0。"
+
+#: src/main.cpp:404
+msgid "Set audio volume (0 to 1). Default is 1."
+msgstr "设置音量 (0 至 1）。默认为 1。"
+
+#: src/main.cpp:405
+msgid "Mute audio."
+msgstr "静音。"
+
+#: src/main.cpp:406
+msgid "Type of input device: default, firewire, x11."
+msgstr "输入设备类型：默认，火线，X11。"
+
+#: src/main.cpp:407
+msgid "Request frame size WxH from input device."
+msgstr ""
+
+#: src/main.cpp:408
+msgid "Request frame rate N/D from input device."
+msgstr ""
+
+#: src/main.cpp:409
+msgid "Request device format 'default' or 'mjpeg'."
+msgstr ""
+
+#: src/main.cpp:410
+#, fuzzy
+msgid "Read commands from a file."
+msgstr "读取输入帧失败。"
+
+#: src/main.cpp:411
+msgid "Use the given LIRC configuration file."
+msgstr ""
+
+#: src/main.cpp:412
+msgid "This option can be used more than once."
+msgstr "此选项可多次使用。"
+
+#: src/main.cpp:413
+msgid "Select video stream (1-n, depending on input)."
+msgstr "选择视频流 (1-n，根据输入情况）。"
+
+#: src/main.cpp:414
+msgid "Select audio stream (1-n, depending on input)."
+msgstr "选择音频流 (1-n，根据输入情况）。"
+
+#: src/main.cpp:415
+msgid "Select subtitle stream (0-n, dep. on input)."
+msgstr "选择字幕流 (0-n，根据输入情况）。"
+
+#: src/main.cpp:416
+msgid "Select input type (default autodetect):"
+msgstr "选择输入类型(默认自动检测）:"
+
+#: src/main.cpp:417
+msgid "Single view."
+msgstr "单一视图"
+
+#: src/main.cpp:418
+msgid "Left/right separate streams, left first."
+msgstr ""
+
+#: src/main.cpp:419
+msgid "Left/right separate streams, right first."
+msgstr ""
+
+#: src/main.cpp:420
+msgid "Left/right alternating, left first."
+msgstr ""
+
+#: src/main.cpp:421
+msgid "Left/right alternating, right first."
+msgstr ""
+
+#: src/main.cpp:422 src/main.cpp:437
+msgid "Left top, right bottom."
+msgstr "左上，右下。"
+
+#: src/main.cpp:423 src/main.cpp:438
+msgid "Left top, right bottom, half height."
+msgstr "左上，右下，半高。"
+
+#: src/main.cpp:424
+msgid "Left bottom, right top."
+msgstr "左下，右上"
+
+#: src/main.cpp:425
+msgid "Left bottom, right top, half height."
+msgstr "左下，右上，半高。"
+
+#: src/main.cpp:426 src/main.cpp:439
+msgid "Left left, right right."
+msgstr ""
+
+#: src/main.cpp:427 src/main.cpp:440
+msgid "Left left, right right, half width."
+msgstr ""
+
+#: src/main.cpp:428
+msgid "Left right, right left."
+msgstr ""
+
+#: src/main.cpp:429
+msgid "Left right, right left, half width."
+msgstr ""
+
+#: src/main.cpp:430 src/main.cpp:441
+msgid "Left even rows, right odd rows."
+msgstr ""
+
+#: src/main.cpp:431
+msgid "Left odd rows, right even rows."
+msgstr ""
+
+#: src/main.cpp:432
+msgid "Select output type:"
+msgstr ""
+
+#: src/main.cpp:433
+msgid "OpenGL quad-buffered stereo."
+msgstr ""
+
+#: src/main.cpp:434
+msgid "Left and right view alternating."
+msgstr ""
+
+#: src/main.cpp:435
+msgid "Only left."
+msgstr "仅左边"
+
+#: src/main.cpp:436
+msgid "Only right."
+msgstr "仅右边"
+
+#: src/main.cpp:442
+msgid "Left even columns, right odd columns."
+msgstr ""
+
+#: src/main.cpp:443
+msgid "Left and right in checkerboard pattern."
+msgstr ""
+
+#: src/main.cpp:444
+msgid "HDMI frame packing mode."
+msgstr ""
+
+#: src/main.cpp:445
+msgid "Red/cyan anaglyph, monochrome method."
+msgstr ""
+
+#: src/main.cpp:446
+msgid "Red/cyan anaglyph, half color method."
+msgstr ""
+
+#: src/main.cpp:447
+msgid "Red/cyan anaglyph, full color method."
+msgstr ""
+
+#: src/main.cpp:448
+msgid "Red/cyan anaglyph, Dubois method."
+msgstr ""
+
+#: src/main.cpp:449
+msgid "Green/magenta anaglyph, monochrome method."
+msgstr ""
+
+#: src/main.cpp:450
+msgid "Green/magenta anaglyph, half color method."
+msgstr ""
+
+#: src/main.cpp:451
+msgid "Green/magenta anaglyph, full color method."
+msgstr ""
+
+#: src/main.cpp:452
+msgid "Green/magenta anaglyph, Dubois method."
+msgstr ""
+
+#: src/main.cpp:453
+msgid "Amber/blue anaglyph, monochrome method."
+msgstr ""
+
+#: src/main.cpp:454
+msgid "Amber/blue anaglyph, half color method."
+msgstr ""
+
+#: src/main.cpp:455
+msgid "Amber/blue anaglyph, full color method."
+msgstr ""
+
+#: src/main.cpp:456
+msgid "Amber/blue anaglyph, Dubois method."
+msgstr ""
+
+#: src/main.cpp:457
+msgid "Red/green anaglyph, monochrome method."
+msgstr ""
+
+#: src/main.cpp:458
+msgid "Red/blue anaglyph, monochrome method."
+msgstr ""
+
+#: src/main.cpp:459
+msgid "Multi-display via Equalizer (2D setup)."
+msgstr ""
+
+#: src/main.cpp:460
+msgid "Multi-display via Equalizer (3D setup)."
+msgstr ""
+
+#: src/main.cpp:461
+msgid "Swap left/right view."
+msgstr "切换左/右视图。"
+
+#: src/main.cpp:462
+msgid "Fullscreen."
+msgstr "全屏。"
+
+#: src/main.cpp:463
+msgid "Use the listed screens in fullscreen mode."
+msgstr "全屏模式下使用列出的屏幕。"
+
+#: src/main.cpp:464
+msgid "Screen numbers start with 1."
+msgstr "屏幕编号从 1 开始。"
+
+#: src/main.cpp:465
+msgid "An empty list defaults to the primary screen."
+msgstr ""
+
+#: src/main.cpp:466
+msgid "Flip left view vertically when fullscreen."
+msgstr ""
+
+#: src/main.cpp:467
+msgid "Flop left view horizontally when fullscreen."
+msgstr ""
+
+#: src/main.cpp:468
+msgid "Flip right view vertically when fullscreen."
+msgstr ""
+
+#: src/main.cpp:469
+msgid "Flop right view horizontally when fullscreen."
+msgstr ""
+
+#: src/main.cpp:470
+msgid "Use DLP 3-D Ready Sync when fullscreen."
+msgstr ""
+
+#: src/main.cpp:471
+msgid "Set zoom for wide videos (0=off to 1=full)."
+msgstr ""
+
+#: src/main.cpp:472
+msgid "Crop video to given aspect ratio (0:0=off)."
+msgstr ""
+
+#: src/main.cpp:473
+msgid "Center window on screen."
+msgstr "窗口置于屏幕中心。"
+
+#: src/main.cpp:474
+msgid "Set subtitle encoding."
+msgstr "设置字幕编码。"
+
+#: src/main.cpp:475
+msgid "Set subtitle font name."
+msgstr "设置字幕字体名称。"
+
+#: src/main.cpp:476
+msgid "Set subtitle font size."
+msgstr "设置字体大小。"
+
+#: src/main.cpp:477
+msgid "Set subtitle scale factor."
+msgstr ""
+
+#: src/main.cpp:478
+msgid "Set subtitle color, in [AA]RRGGBB format."
+msgstr ""
+
+#: src/main.cpp:479
+msgid "Set subtitle shadow, -1=default, 0=off, 1=on."
+msgstr ""
+
+#: src/main.cpp:480
+msgid "Subtitle parallax adjustment (-1 to +1)."
+msgstr ""
+
+#: src/main.cpp:481
+msgid "Parallax adjustment (-1 to +1)."
+msgstr ""
+
+#: src/main.cpp:482
+msgid "Crosstalk leak level (0 to 1)."
+msgstr ""
+
+#: src/main.cpp:483
+msgid "Comma-separated values for R,G,B."
+msgstr ""
+
+#: src/main.cpp:484
+msgid "Amount of ghostbusting to apply (0 to 1)."
+msgstr ""
+
+#: src/main.cpp:485
+msgid "Benchmark mode (no audio, show fps)."
+msgstr ""
+
+#: src/main.cpp:486
+msgid "Frame rate divisor for display refresh rate."
+msgstr ""
+
+#: src/main.cpp:487
+msgid "Default is 0 for benchmark mode, 1 otherwise."
+msgstr ""
+
+#: src/main.cpp:488
+msgid "Loop the input media."
+msgstr ""
+
+#: src/main.cpp:489
+msgid "Set SDI output format."
+msgstr ""
+
+#: src/main.cpp:491
+msgid "Interactive control:"
+msgstr "交互控制:"
+
+#: src/main.cpp:492
+msgid "Leave fullscreen mode, or quit."
+msgstr "离开全屏模式，或退出。"
+
+#: src/main.cpp:493
+msgid "Quit."
+msgstr "退出。"
+
+#: src/main.cpp:514
+msgid "Seek according to horizontal click position."
+msgstr ""
+
+#: src/main.cpp:522
+msgid "No audio devices known."
+msgstr "没有已知的音频设备。"
+
+#: src/main.cpp:594
+msgid "Benchmark mode: audio and time synchronization disabled."
+msgstr ""
+
+#: src/main.cpp:608
+#, c-format
+msgid "Unknown mode %s."
+msgstr ""
+
+#: src/main.cpp:740
+msgid "This version of Bino was compiled without support for LIRC."
+msgstr "此 Bino 版本未编译支持 LIRC 。"
+
+#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
+#: src/media_data.cpp:1051
+#, c-format
+msgid "%dx%d, %.3g:1"
+msgstr "%dx%d, %.3g:1"
+
+#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
+#: src/media_data.cpp:1182
+#, c-format
+msgid "%s, %d ch., %g kHz, %d bit"
+msgstr "%s, %d ch., %g kHz, %d bit"
+
+#: src/media_input.cpp:281
+#, c-format
+msgid "Video %s: %s"
+msgstr "视频 %s: %s"
+
+#: src/media_input.cpp:286
+msgid "No video."
+msgstr "无视频。"
+
+#: src/media_input.cpp:292
+#, c-format
+msgid "Audio %s: %s"
+msgstr "音频 %s: %s"
+
+#: src/media_input.cpp:297
+msgid "No audio."
+msgstr "无音频"
+
+#: src/media_input.cpp:303
+#, c-format
+msgid "Subtitle %s: %s"
+msgstr "字幕 %s: %s"
+
+#: src/media_input.cpp:308
+msgid "No subtitle."
+msgstr "无字幕。"
+
+#: src/media_input.cpp:310
+#, c-format
+msgid "Duration: %g seconds"
+msgstr "为期: %g 秒"
+
+#: src/media_input.cpp:313
+#, c-format
+msgid "Stereo layout: %s"
+msgstr "立体布局: %s"
+
+#: src/media_object.cpp:677
+#, c-format
+msgid "%s video stream %d: Unsupported stereo layout %s."
+msgstr ""
+
+#: src/media_object.cpp:715
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with %d channels."
+msgstr ""
+
+#: src/media_object.cpp:744
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with sample format %s."
+msgstr ""
+
+#: src/media_object.cpp:800
+#, c-format
+msgid "No support available for %s device."
+msgstr ""
+
+#: src/media_object.cpp:803
+msgid "default"
+msgstr "默认"
+
+#: src/media_object.cpp:836
+#, c-format
+msgid "%s: Cannot read stream info: %s"
+msgstr "%s: 不能读取流信息: %s"
+
+#: src/media_object.cpp:880
+#, c-format
+msgid "%s stream %d: Cannot open %s: %s"
+msgstr "%s 流 %d: 不能打开 %s: %s"
+
+#: src/media_object.cpp:881
+msgid "video codec"
+msgstr "视频插件"
+
+#: src/media_object.cpp:882
+msgid "audio codec"
+msgstr "音频插件"
+
+#: src/media_object.cpp:883
+msgid "subtitle codec"
+msgstr "字幕插件"
+
+#: src/media_object.cpp:884
+msgid "data"
+msgstr ""
+
+#: src/media_object.cpp:885
+msgid "codec not supported"
+msgstr "不支持该插件"
+
+#: src/media_object.cpp:895
+#, c-format
+msgid "%s video stream %d: Invalid frame size."
+msgstr ""
+
+#: src/media_object.cpp:939
+#, c-format
+msgid "%s video stream %d: Cannot initialize conversion context."
+msgstr ""
+
+#: src/media_object.cpp:1002
+#, c-format
+msgid "Video stream %d: %s / %s, %g seconds"
+msgstr "视频流 %d: %s / %s, %g 秒"
+
+#: src/media_object.cpp:1006
+#, c-format
+msgid "Using up to %d threads for decoding."
+msgstr "使用了 %d 个线程解码。"
+
+#: src/media_object.cpp:1011
+#, c-format
+msgid "Audio stream %d: %s / %s, %g seconds"
+msgstr "音频流 %d: %s / %s, %g 秒"
+
+#: src/media_object.cpp:1018
+#, c-format
+msgid "Subtitle stream %d: %s / %s, %g seconds"
+msgstr "字幕流 %d: %s / %s, %g 秒"
+
+#: src/media_object.cpp:1025
+msgid "No usable streams."
+msgstr "没有可用的流。"
+
+#: src/media_object.cpp:1306 src/media_object.cpp:1336
+#: src/media_object.cpp:1366
+#, c-format
+msgid "%s: Cannot duplicate packet."
+msgstr ""
+
+#: src/media_object.cpp:1460
+#, c-format
+msgid "%s video stream %d: Dropping %dx%d frame"
+msgstr ""
+
+#: src/media_object.cpp:1923
+#, c-format
+msgid "%s: Seeking failed."
+msgstr ""
+
+#: src/player.cpp:437
+#, c-format
+msgid "Video: delay %g seconds/%g frames; dropping next frame."
+msgstr ""
+
+#: src/player.cpp:453
+#, c-format
+msgid "FPS: %.2f"
+msgstr "FPS: %.2f"
+
+#: src/player_equalizer.cpp:117
+msgid "Reading input frame failed."
+msgstr "读取输入帧失败。"
+
+#: src/player_equalizer.cpp:166 src/video_output_qt.cpp:613
+#: src/video_output_qt.cpp:620
+msgid "Waiting for subtitle renderer initialization..."
+msgstr ""
+
+#: src/player_equalizer.cpp:251
+msgid "Init data mapping failed."
+msgstr ""
+
+#: src/player_equalizer.cpp:252
+msgid "Frame data mapping failed."
+msgstr ""
+
+#: src/player_equalizer.cpp:253
+msgid "Video player initialization failed."
+msgstr ""
+
+#: src/player_equalizer.cpp:254
+msgid "Need at least OpenGL 2.1."
+msgstr "至少需要 OpenGL 2.1。"
+
+#: src/player_equalizer.cpp:431
+msgid "No canvas in Equalizer configuration."
+msgstr ""
+
+#: src/player_equalizer.cpp:438
+#, c-format
+msgid "Equalizer canvas: %gx%g, aspect ratio %g:1"
+msgstr ""
+
+#: src/player_equalizer.cpp:926 src/video_output_qt.cpp:583
+msgid ""
+"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
+"objects."
+msgstr ""
+
+#: src/player_equalizer.cpp:1107
+msgid "Equalizer initialization failed."
+msgstr "Equalizer 初始化失败。"
+
+#: src/player_equalizer.cpp:1115
+msgid "Cannot get equalizer configuration."
+msgstr "不能获取 equalizer 配置。"
+
+#: src/player_equalizer.cpp:1132
+msgid "Equalizer configuration initialization failed."
+msgstr "Equalizer 配置初始化失败"
+
+#: src/subtitle_renderer.cpp:223
+msgid "Cannot initialize LibASS."
+msgstr "不能初始化 LibASS。"
+
+#: src/subtitle_renderer.cpp:232
+msgid "Cannot initialize LibASS renderer."
+msgstr "不能初始化 LibASS 渲染。"
+
+#: src/subtitle_renderer.cpp:404
+msgid "Cannot initialize LibASS track."
+msgstr ""
+
+#: src/subtitle_renderer.cpp:415
+#, c-format
+msgid "Subtitle character set conversion failed: %s"
+msgstr "字幕字符集转换失败: %s"
+
+#: src/video_output.cpp:347
+#, c-format
+msgid "OpenGL error 0x%04X."
+msgstr "OpenGL 错误 0x%04X。"
+
+#: src/video_output.cpp:359
+#, fuzzy, c-format
+msgid "OpenGL Framebuffer status error 0x%04X."
+msgstr "OpenGL 错误 0x%04X。"
+
+#: src/video_output.cpp:407
+#, c-format
+msgid "OpenGL %s '%s': compiler warning:"
+msgstr "OpenGL %s '%s': 编译警告:"
+
+#: src/video_output.cpp:408 src/video_output.cpp:413
+msgid "vertex shader"
+msgstr ""
+
+#: src/video_output.cpp:408 src/video_output.cpp:413
+msgid "fragment shader"
+msgstr ""
+
+#: src/video_output.cpp:412
+#, c-format
+msgid "OpenGL %s '%s': compilation failed."
+msgstr "OpenGL %s '%s': 编译失败。"
+
+#: src/video_output.cpp:415 src/video_output.cpp:492
+msgid "unknown error"
+msgstr "未知错误"
+
+#: src/video_output.cpp:488
+#, c-format
+msgid "OpenGL program '%s': linker warning:"
+msgstr ""
+
+#: src/video_output.cpp:491
+#, c-format
+msgid "OpenGL program '%s': linking failed."
+msgstr "OpenGL 程序 '%s': 连接失败。"
+
+#: src/video_output.cpp:1494 src/video_output.cpp:1635
+msgid "Cannot create a PBO buffer."
+msgstr ""
+
+#: src/video_output_qt.cpp:578
+#, c-format
+msgid "Cannot initialize GLEW: %s"
+msgstr ""
+
+#: src/video_output_qt.cpp:611
+msgid "Please wait"
+msgstr "请等待"
+
+#: src/video_output_qt.cpp:671
+msgid "Cannot get valid OpenGL context."
+msgstr ""
+
+#: src/video_output_qt.cpp:682
+msgid "The display does not support OpenGL stereo mode."
+msgstr ""
+
+#: src/video_output_qt.cpp:687
+msgid "Cannot set OpenGL context format."
+msgstr ""
+
+#: src/video_output_qt.cpp:780
+msgid "Cannot suspend screensaver."
+msgstr ""
+
+#: src/video_output_qt.cpp:795
+msgid "Cannot resume screensaver."
+msgstr ""

bino-1.3.2.tar.xz/src/Makefile.am -> bino-1.3.3.tar.xz/src/Makefile.am Changed

bino-1.3.2.tar.xz/src/Makefile.in -> bino-1.3.3.tar.xz/src/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -51,6 +51,9 @@
 @HAVE_LIBLIRCCLIENT_TRUE@am__append_5 = $(liblircclient_CFLAGS)
 @HAVE_LIBLIRCCLIENT_TRUE@am__append_6 = $(liblircclient_LIBS)
 @W32_TRUE@am__append_7 = logo/bino_logo.ico
+@HAVE_LIBXNVCTRL_TRUE@am__append_8 = NvSDIout.cpp NvSDIout.h NvSDIutils.cpp NvSDIutils.h
+@HAVE_LIBXNVCTRL_TRUE@am__append_9 = $(xnvctrl_CFLAGS)
+@HAVE_LIBXNVCTRL_TRUE@am__append_10 = $(xnvctrl_LDFLAGS) -lXNVCtrl
 subdir = src
 DIST_COMMON = $(dist_appdata_DATA) $(dist_icons16_DATA) \
 	$(dist_icons32_DATA) $(dist_icons48_DATA) $(dist_icons64_DATA) \
@@ -75,66 +78,73 @@
 PROGRAMS = $(bin_PROGRAMS)
 am__bino_SOURCES_DIST = media_data.h media_data.cpp media_object.h \
 	media_object.cpp media_input.h media_input.cpp dispatch.h \
-	dispatch.cpp video_output.h video_output.cpp video_output_qt.h \
-	video_output_qt.cpp subtitle_renderer.h subtitle_renderer.cpp \
-	audio_output.h audio_output.cpp player.h player.cpp gui.h \
-	gui.cpp lib_versions.h lib_versions.cpp main.cpp \
-	player_equalizer.h player_equalizer.cpp lirc.h lirc.cpp \
-	logo/bino_logo.ico
+	dispatch.cpp command_file.h command_file.cpp color_matrix.h \
+	color_matrix.cpp video_output.h video_output.cpp \
+	video_output_qt.h video_output_qt.cpp subtitle_renderer.h \
+	subtitle_renderer.cpp audio_output.h audio_output.cpp player.h \
+	player.cpp gui.h gui.cpp lib_versions.h lib_versions.cpp \
+	main.cpp player_equalizer.h player_equalizer.cpp lirc.h \
+	lirc.cpp logo/bino_logo.ico NvSDIout.cpp NvSDIout.h \
+	NvSDIutils.cpp NvSDIutils.h
 @HAVE_LIBEQUALIZER_TRUE@am__objects_1 = player_equalizer.$(OBJEXT)
 @HAVE_LIBLIRCCLIENT_TRUE@am__objects_2 = lirc.$(OBJEXT)
 am__dirstamp = $(am__leading_dot)dirstamp
 @W32_TRUE@am__objects_3 = logo/bino_logo.$(OBJEXT)
+@HAVE_LIBXNVCTRL_TRUE@am__objects_4 = NvSDIout.$(OBJEXT) \
+@HAVE_LIBXNVCTRL_TRUE@	NvSDIutils.$(OBJEXT)
 am_bino_OBJECTS = media_data.$(OBJEXT) media_object.$(OBJEXT) \
 	media_input.$(OBJEXT) dispatch.$(OBJEXT) \
+	command_file.$(OBJEXT) color_matrix.$(OBJEXT) \
 	video_output.$(OBJEXT) video_output_qt.$(OBJEXT) \
 	subtitle_renderer.$(OBJEXT) audio_output.$(OBJEXT) \
 	player.$(OBJEXT) gui.$(OBJEXT) lib_versions.$(OBJEXT) \
 	main.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
-	$(am__objects_3)
+	$(am__objects_3) $(am__objects_4)
 nodist_bino_OBJECTS = qt_resources-rcc.$(OBJEXT) gui-moc.$(OBJEXT) \
 	video_output_qt-moc.$(OBJEXT)
 bino_OBJECTS = $(am_bino_OBJECTS) $(nodist_bino_OBJECTS)
 am__DEPENDENCIES_1 =
 @HAVE_LIBEQUALIZER_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 @HAVE_LIBLIRCCLIENT_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+@HAVE_LIBXNVCTRL_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
 bino_DEPENDENCIES = $(top_builddir)/src/base/libbase.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3)
+	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_4)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_$(V))
-am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
 am__v_CXX_0 = @echo " CXX " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
-AM_V_CXXLD = $(am__v_CXXLD_$(V))
-am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo " CXXLD " $@;
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo " CC " $@;
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(bino_SOURCES) $(nodist_bino_SOURCES)
 DIST_SOURCES = $(am__bino_SOURCES_DIST)
@@ -166,6 +176,12 @@
 am__base_list = \
 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
 DATA = $(dist_appdata_DATA) $(dist_icons16_DATA) $(dist_icons32_DATA) \
 	$(dist_icons48_DATA) $(dist_icons64_DATA) \
 	$(dist_iconsscal_DATA)
@@ -359,14 +375,18 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+xnvctrl_CFLAGS = @xnvctrl_CFLAGS@
+xnvctrl_LDFLAGS = @xnvctrl_LDFLAGS@
 SUBDIRS = base
 bino_SOURCES = media_data.h media_data.cpp media_object.h \
 	media_object.cpp media_input.h media_input.cpp dispatch.h \
-	dispatch.cpp video_output.h video_output.cpp video_output_qt.h \
-	video_output_qt.cpp subtitle_renderer.h subtitle_renderer.cpp \
-	audio_output.h audio_output.cpp player.h player.cpp gui.h \
-	gui.cpp lib_versions.h lib_versions.cpp main.cpp \
-	$(am__append_1) $(am__append_4) $(am__append_7)
+	dispatch.cpp command_file.h command_file.cpp color_matrix.h \
+	color_matrix.cpp video_output.h video_output.cpp \
+	video_output_qt.h video_output_qt.cpp subtitle_renderer.h \
+	subtitle_renderer.cpp audio_output.h audio_output.cpp player.h \
+	player.cpp gui.h gui.cpp lib_versions.h lib_versions.cpp \
+	main.cpp $(am__append_1) $(am__append_4) $(am__append_7) \
+	$(am__append_8)
 ICONS_LOCAL_IPE = \
 	icons-local/input-layout-mono.ipe \
 	icons-local/input-layout-separate-left-right.ipe \
@@ -449,12 +469,13 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src/base $(libavformat_CFLAGS) \
 	$(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \
 	$(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglewmx_CFLAGS) \
-	$(libqtopengl_CFLAGS) $(am__append_2) $(am__append_5)
+	$(libqtopengl_CFLAGS) $(am__append_2) $(am__append_5) \
+	$(am__append_9)
 bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) $(LIBICONV) \
 	$(libavformat_LIBS) $(libavdevice_LIBS) $(libswscale_LIBS) \
 	$(libass_LIBS) $(libopenal_LIBS) $(libgl_LIBS) \
 	$(libglewmx_LIBS) $(libqtopengl_LIBS) $(am__append_3) \
-	$(am__append_6)
+	$(am__append_6) $(am__append_10)
 iconsdatadir = $(datadir)/icons/hicolor
 icons16dir = $(iconsdatadir)/16x16/apps
 icons32dir = $(iconsdatadir)/32x32/apps
@@ -554,7 +575,7 @@
 	@: > logo/$(DEPDIR)/$(am__dirstamp)
 logo/bino_logo.$(OBJEXT): logo/$(am__dirstamp) \
 	logo/$(DEPDIR)/$(am__dirstamp)
-bino$(EXEEXT): $(bino_OBJECTS) $(bino_DEPENDENCIES) 
+bino$(EXEEXT): $(bino_OBJECTS) $(bino_DEPENDENCIES) $(EXTRA_bino_DEPENDENCIES) 
 	@rm -f bino$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(bino_OBJECTS) $(bino_LDADD) $(LIBS)
 
@@ -565,7 +586,11 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NvSDIout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NvSDIutils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_output.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color_matrix.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command_file.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dispatch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-moc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui.Po@am__quote@
@@ -586,18 +611,16 @@
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 install-dist_appdataDATA: $(dist_appdata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(appdatadir)" || $(MKDIR_P) "$(DESTDIR)$(appdatadir)"
@@ -615,9 +638,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(appdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(appdatadir)" && rm -f $$files
+	dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
 install-dist_icons16DATA: $(dist_icons16_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(icons16dir)" || $(MKDIR_P) "$(DESTDIR)$(icons16dir)"
@@ -635,9 +656,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_icons16_DATA)'; test -n "$(icons16dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(icons16dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(icons16dir)" && rm -f $$files
+	dir='$(DESTDIR)$(icons16dir)'; $(am__uninstall_files_from_dir)
 install-dist_icons32DATA: $(dist_icons32_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(icons32dir)" || $(MKDIR_P) "$(DESTDIR)$(icons32dir)"
@@ -655,9 +674,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_icons32_DATA)'; test -n "$(icons32dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(icons32dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(icons32dir)" && rm -f $$files
+	dir='$(DESTDIR)$(icons32dir)'; $(am__uninstall_files_from_dir)
 install-dist_icons48DATA: $(dist_icons48_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(icons48dir)" || $(MKDIR_P) "$(DESTDIR)$(icons48dir)"
@@ -675,9 +692,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_icons48_DATA)'; test -n "$(icons48dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(icons48dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(icons48dir)" && rm -f $$files
+	dir='$(DESTDIR)$(icons48dir)'; $(am__uninstall_files_from_dir)
 install-dist_icons64DATA: $(dist_icons64_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(icons64dir)" || $(MKDIR_P) "$(DESTDIR)$(icons64dir)"
@@ -695,9 +710,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_icons64_DATA)'; test -n "$(icons64dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(icons64dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(icons64dir)" && rm -f $$files
+	dir='$(DESTDIR)$(icons64dir)'; $(am__uninstall_files_from_dir)
 install-dist_iconsscalDATA: $(dist_iconsscal_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(iconsscaldir)" || $(MKDIR_P) "$(DESTDIR)$(iconsscaldir)"
@@ -715,9 +728,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_iconsscal_DATA)'; test -n "$(iconsscaldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsscaldir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsscaldir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsscaldir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -932,10 +943,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 `test -z '$(STRIP)' || \
-	 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:

bino-1.3.3.tar.xz/src/NvSDIout.cpp Added

@@ -0,0 +1,309 @@
+/*
+ * Copyright (C) 2012
+ * Binocle <http://binocle.com/>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Written by Olivier Letz <oletz@binocle.com>.
+ */
+
+#include "config.h"
+
+#define GL_GLEXT_PROTOTYPES
+#define GLX_GLXEXT_PROTOTYPES
+#include "NvSDIout.h"
+
+#include <GL/glx.h>
+
+#include "NVCtrlLib.h"
+
+#include "gettext.h"
+#define _(string) gettext(string)
+
+#include "msg.h"
+#include "dbg.h"
+
+#include "NvSDIutils.h"
+
+#define MAX_GPUS 4
+
+#if defined __cplusplus
+extern "C" {
+#endif
+
+
+CNvSDIout::CNvSDIout() : m_bInitialized(false)
+{
+ for (int i = 0; i < 2; i++)
+ {
+ _sdi_tex[i] = 0;
+ }
+ _sdi_fbo = 0;
+}
+
+CNvSDIout::~CNvSDIout()
+{
+
+
+}
+
+void CNvSDIout::init(int videoFormat) {
+
+ assert(!m_bInitialized);
+
+ // Open X display
+ Display *dpy = glXGetCurrentDisplay();
+
+ //scan the systems for GPUs
+ HGPUNV gpuList[MAX_GPUS];
+ int num_gpus = ScanHW(dpy, gpuList);
+
+ if (num_gpus < 1) {
+ msg::err("No GPU available for sdi output");
+ return;
+ }
+
+ //grab the first GPU for now for DVP
+ HGPUNV *gpu = &gpuList[0];
+
+ OutputOptions outputOptions;
+
+ //Set the output to be the same frame rate as the input here
+ outputOptions.video_format = videoFormat;
+ outputOptions.xscreen = gpu->deviceXScreen;
+ outputOptions.data_format = NV_CTRL_GVO_DATA_FORMAT_DUAL_R8G8B8_TO_DUAL_YCRCB422;
+ outputOptions.fql = 5;
+ outputOptions.sync_source = NV_CTRL_GVO_SYNC_SOURCE_SDI;
+ outputOptions.sync_mode = NV_CTRL_GVO_SYNC_MODE_FREE_RUNNING;
+
+ setOutputOptions(dpy, outputOptions);
+ bool ret = initOutputDeviceNVCtrl();
+ if (!ret) {
+ msg::err("Unable to init sdi output");
+ return;
+ }
+
+ // Enumerate available video devices.
+ unsigned int *videoDevices;
+ int numDevices;
+
+ videoDevices = glXEnumerateVideoDevicesNV(dpy, outputOptions.xscreen, &numDevices);
+ if (!videoDevices || numDevices <= 0) {
+ XFree(videoDevices);
+ msg::err("Error: could not enumerate video devices");
+ return;
+ }
+
+ msg::inf("Number of sdi devices: %d\n", numDevices);
+
+ // Bind first video device
+ int retCode = glXBindVideoDeviceNV(dpy, 1, videoDevices[0], NULL);
+ if (retCode != Success) {
+ XFree(videoDevices);
+ msg::wrn("Error: could not bind SDI video device");
+ return;
+ }
+ // Free list of available video devices, don't need it anymore.
+ XFree(videoDevices);
+
+
+ glGenFramebuffersEXT(1, &_sdi_fbo);
+ assert(glGetError() == GL_NO_ERROR);
+
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, _sdi_fbo);
+ assert(glGetError() == GL_NO_ERROR);
+
+ for (int i = 0; i < 2; i++)
+ {
+ glGenTextures(1, &(_sdi_tex[i]));
+ glBindTexture(GL_TEXTURE_2D, _sdi_tex[i]);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB16,
+ m_videoWidth, m_videoHeight, 0, GL_RGB, GL_SHORT, NULL);
+
+ glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
+ GL_COLOR_ATTACHMENT0_EXT+i, GL_TEXTURE_2D, _sdi_tex[i], 0);
+ assert(glGetError() == GL_NO_ERROR);
+ }
+
+ GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+ if (status != status == GL_FRAMEBUFFER_COMPLETE_EXT) {
+ switch (status) {
+ case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT:
+ printf("FBO: Error: Framebuffer incomplete, incomplete attachment!\n");
+ break;
+ case GL_FRAMEBUFFER_UNSUPPORTED_EXT:
+ printf("FBO: Error: Unsupported framebuffer format!\n");
+ break;
+ case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT:
+ printf("FBO: Error: Framebuffer incomplete, missing attachment!\n");
+ break;
+ case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT:
+ printf("FBO: Error: Framebuffer incomplete, attached images must have same dimensions!\n");
+ break;
+ case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT:
+ printf("FBO: Error: Framebuffer incomplete, attached images must have same format!\n");
+ break;
+ case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT:
+ printf("FBO: Error: Framebuffer incomplete, missing draw buffer!\n");
+ break;
+ case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT:
+ printf("FBO: Error: Framebuffer incomplete, missing read buffer!\n");
+ break;
+ default:
+ printf("FBO: Unknown error 0x%X (see glext.h)!\n", status);
+ break;
+ }
+ }
+
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+ assert(glGetError() == GL_NO_ERROR);
+
+ m_bInitialized = true;
+}
+
+void CNvSDIout::deinit() {
+ m_bInitialized = false;
+
+ glDeleteFramebuffersEXT(1, &_sdi_fbo);
+ _sdi_fbo = 0;
+
+ for (int i = 0; i < 2; i++)
+ {
+ if (_sdi_tex[i] != 0)
+ {
+ glDeleteTextures(1, &(_sdi_tex[i]));
+ _sdi_tex[i] = 0;
+ }
+ }
+
+ if (Success != glXBindVideoDeviceNV(_display, 1, 0, NULL))
+ {
+ msg::wrn("Error: could not release video device");
+ }
+ destroyOutputDeviceNVCtrl();
+}
+
+void CNvSDIout::reinit(int videoFormat) {
+ deinit();
+ init(videoFormat);
+}
+
+void CNvSDIout::setOutputOptions(Display *display, const OutputOptions &outputOptions)
+{
+ _display = display;
+ m_outputOptions = outputOptions;
+}
+
+bool CNvSDIout::initOutputDeviceNVCtrl()
+{
+ int value;
+
+ // Query NV_CTRL_GVO support.
+ if (!XNVCTRLQueryAttribute(_display, m_outputOptions.xscreen, 0,
+ NV_CTRL_GVO_SUPPORTED, &value)) {
+ return false;
+ }
+
+ // Set video format
+ XNVCTRLSetAttribute(_display, m_outputOptions.xscreen, 0,
+ NV_CTRL_GVO_OUTPUT_VIDEO_FORMAT, m_outputOptions.video_format);
+
+ // Set data format format.
+ XNVCTRLSetAttribute(_display, m_outputOptions.xscreen, 0,
+ NV_CTRL_GVO_DATA_FORMAT,
+ m_outputOptions.data_format);
+ // Set sync mode
+ XNVCTRLSetAttribute(_display, m_outputOptions.xscreen, 0,
+ NV_CTRL_GVO_SYNC_MODE, m_outputOptions.sync_mode);
+
+ // Set sync source
+ XNVCTRLSetAttribute(_display, m_outputOptions.xscreen, 0,
+ NV_CTRL_GVO_SYNC_SOURCE, m_outputOptions.sync_source);
+ // Set flip queue length
+ XNVCTRLSetAttribute(_display, m_outputOptions.xscreen, 0,
+ NV_CTRL_GVO_FLIP_QUEUE_SIZE, m_outputOptions.fql);
+
+ // Enable full-range color output ([4-1019] instead of [64-940])
+ XNVCTRLSetAttribute(_display, m_outputOptions.xscreen, 0, NV_CTRL_GVO_FULL_RANGE_COLOR,
+ NV_CTRL_GVO_FULL_RANGE_COLOR_ENABLED);
+
+ XNVCTRLQueryAttribute (_display,
+ m_outputOptions.xscreen,
+ m_outputOptions.video_format,
+ NV_CTRL_GVIO_VIDEO_FORMAT_WIDTH,
+ &m_videoWidth);
+ XNVCTRLQueryAttribute (_display,
+ m_outputOptions.xscreen,
+ m_outputOptions.video_format,
+ NV_CTRL_GVIO_VIDEO_FORMAT_HEIGHT,
+ &m_videoHeight);
+
+ XFlush(_display);
+ return true;
+}
+
+bool CNvSDIout::destroyOutputDeviceNVCtrl()
+{
+ return true;
+}
+
+
+void CNvSDIout::sendTextures()
+{
+ assert(glGetError() == GL_NO_ERROR);
+ assert(m_bInitialized);
+ glPresentFrameDualFillNV(1, 0, 0, 0, GL_FRAME_NV,
+ GL_TEXTURE_2D, _sdi_tex[0],
+ GL_NONE, 0,
+ GL_TEXTURE_2D, _sdi_tex[1],
+ GL_NONE, 0);
+ assert(glGetError() == GL_NO_ERROR);
+}
+
+void CNvSDIout::startRenderingTo(int textureIndex)
+{
+ assert(m_bInitialized);
+ assert(glGetError() == GL_NO_ERROR);
+
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, _sdi_fbo);
+ assert(glGetError() == GL_NO_ERROR);
+
+ glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT + textureIndex);
+ assert(glGetError() == GL_NO_ERROR);
+}
+
+void CNvSDIout::stopRenderingTo()
+{
+ assert(m_bInitialized);
+
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+ assert(glGetError() == GL_NO_ERROR);
+}
+
+#if defined __cplusplus
+} /* extern "C" */
+#endif

bino-1.3.3.tar.xz/src/NvSDIout.h Added

@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2012
+ * Binocle <http://binocle.com/>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Written by Olivier Letz <oletz@binocle.com>.
+ */
+
+#ifndef NVSDIOUT_H
+#define NVSDIOUT_H
+
+#include <GL/glew.h>
+
+#if defined __cplusplus
+extern "C" {
+#endif
+
+typedef struct _XDisplay Display;
+
+typedef struct {
+ int video_format; 
+ int data_format;
+ int sync_mode;
+ int sync_source;
+ //int fsaa;
+ int fql;
+ int xscreen;
+} OutputOptions;
+
+class CNvSDIout
+{
+private:
+	//X stuff
+	Display *_display; // Display	
+
+	int m_videoWidth;				// Video format resolution in pixels
+	int m_videoHeight;				// Video format resolution in lines
+
+	OutputOptions m_outputOptions;
+
+	bool m_bInitialized;
+
+ GLuint _sdi_fbo; // framebuffer object to render into the sRGB texture
+ GLuint _sdi_tex[2]; // output: SRGB8 or linear RGB16 texture
+
+
+public:
+
+	CNvSDIout();
+	~CNvSDIout();
+
+	void init(int videoFormat);
+	void deinit();
+	void reinit(int videoFormat);
+
+	void sendTextures();
+
+	inline bool isInitialized() {return m_bInitialized; }
+
+	void startRenderingTo(int textureIndex);
+	void stopRenderingTo();
+
+ int width() { return m_videoWidth; }
+ int height() { return m_videoHeight; }
+
+ int getOutputFormat() { return m_outputOptions.video_format; }
+
+private:
+
+	void setOutputOptions(Display *display, const OutputOptions &outputOptions);
+	bool initOutputDeviceNVCtrl();
+	bool destroyOutputDeviceNVCtrl();
+};
+
+#if defined __cplusplus
+} /* extern "C" */
+#endif
+
+#endif

bino-1.3.3.tar.xz/src/NvSDIutils.cpp Added

@@ -0,0 +1,461 @@
+/*
+ * Copyright (C) 2012
+ * Binocle <http://binocle.com/>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Written by Olivier Letz <oletz@binocle.com>.
+ */
+
+#include "config.h"
+
+#include "NvSDIutils.h"
+
+#include <GL/glx.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <sys/time.h>
+
+#include "NVCtrlLib.h"
+#include "NVCtrl.h"
+
+#include "msg.h"
+#include "dbg.h"
+
+int
+ScanHW (Display * dpy, HGPUNV * gpuList)
+{
+ HGPUNV gpuDevice;
+ int num_gpus ;
+ int gpu ;
+ int *pData;
+ int len ;
+ char *str;
+ bool ret;
+
+ /* Get the number of gpus in the system */
+ ret = XNVCTRLQueryTargetCount (dpy, NV_CTRL_TARGET_TYPE_GPU, &num_gpus);
+ if (!ret) {
+ msg::err("Failed to query number of gpus");
+ return 1;
+ }
+ msg::inf("Number of GPUs: %d", num_gpus);
+ int num_gpusWithXScreen = 0;
+
+ for (gpu = 0; gpu < num_gpus; gpu++) {
+ msg::inf("GPU %d information:", gpu);
+ /* GPU name */
+ ret = XNVCTRLQueryTargetStringAttribute (dpy, NV_CTRL_TARGET_TYPE_GPU, gpu,	// target_id
+ 0,	// display_mask
+ NV_CTRL_STRING_PRODUCT_NAME,
+ &str);
+ if (!ret) {
+ msg::err("Failed to query gpu product name");
+ return 1;
+ }
+ msg::inf("Product Name : %s", str);
+ /* X Screens driven by this GPU */
+ ret = XNVCTRLQueryTargetBinaryData (dpy, NV_CTRL_TARGET_TYPE_GPU, gpu,	// target_id
+ 0,	// display_mask
+ NV_CTRL_BINARY_DATA_XSCREENS_USING_GPU,
+ (unsigned char **) &pData, &len);
+ if (!ret) {
+ msg::err("Failed to query list of X Screens");
+ return 1;
+ }
+ msg::inf("Number of X Screens on GPU %d : %d", gpu, pData[0]);
+ //only return GPUs that have XScreens
+ if (pData[0]) {
+ gpuDevice.deviceXScreen = pData[1];	//chose the first screen
+ strcpy (gpuDevice.deviceName, str);
+ gpuList[gpu] = gpuDevice;
+ num_gpusWithXScreen++;
+ }
+ XFree (pData);
+ }
+ return num_gpusWithXScreen;
+}
+
+//
+// Calculate fps
+//
+GLfloat
+CalcFPS ()
+{
+ static int t0 = -1;
+
+ static int count = 0;
+
+ struct timeval tv;
+
+ struct timezone tz;
+
+ static GLfloat __fps = 0.0;
+
+ int t;
+
+ gettimeofday (&tv, &tz);
+ t = (int) tv.tv_sec;
+ if (t0 < 0)
+ t0 = t;
+ count++;
+ if (t - t0 >= 5.0) {
+ GLfloat seconds = t - t0;
+
+ __fps = count / seconds;
+ t0 = t;
+ count = 0;
+ }
+ return (__fps);
+}
+
+//
+// Decode SDI input value returned.
+//
+const char *
+decodeSDISyncInputDetected (int _value)
+{
+ switch (_value) {
+ case NV_CTRL_GVO_SDI_SYNC_INPUT_DETECTED_HD:
+ return ("NV_CTRL_GVO_SDI_SYNC_INPUT_DETECTED_HD");
+ break;
+ case NV_CTRL_GVO_SDI_SYNC_INPUT_DETECTED_SD:
+ return ("NV_CTRL_GVO_SDI_SYNC_INPUT_DETECTED_SD");
+ break;
+ case NV_CTRL_GVO_SDI_SYNC_INPUT_DETECTED_NONE:
+ default:
+ return ("NV_CTRL_GVO_SDI_SYNC_INPUT_DETECTED_NONE");
+ break;
+ }				// switch
+}
+
+//
+// Decode provided signal format.
+//
+const char *
+decodeSignalFormat (int _value)
+{
+ switch (_value) {
+ case NV_CTRL_GVIO_VIDEO_FORMAT_487I_59_94_SMPTE259_NTSC:
+ return ("480i 59.94Hz (SMPTE259 - NTSC)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_576I_50_00_SMPTE259_PAL:
+ return ("576i 50.00Hz (SMPTE259 - PAL)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_720P_59_94_SMPTE296:
+ return ("720p 59.94Hz (SMPTE296)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_720P_60_00_SMPTE296:
+ return ("720p 60.00Hz (SMPTE296)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1035I_59_94_SMPTE260:
+ return ("1035i 59.94Hz (SMPTE260)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1035I_60_00_SMPTE260:
+ return ("1035i 60.00Hz (SMPTE260)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080I_50_00_SMPTE295:
+ return ("1080i 50.00Hz (SMPTE295)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080I_50_00_SMPTE274:
+ return ("1080i 50.00Hz (SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080I_59_94_SMPTE274:
+ return ("1080i 59.94Hz (SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080I_60_00_SMPTE274:
+ return ("1080i 60.00Hz (SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_23_976_SMPTE274:
+ return ("1080p 23.976Hz (SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_24_00_SMPTE274:
+ return ("1080p 24.00Hz (SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_25_00_SMPTE274:
+ return ("1080p 25.00Hz (SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_29_97_SMPTE274:
+ return ("1080p 29.97Hz (SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_30_00_SMPTE274:
+ return ("1080p 30.00Hz (SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_720P_50_00_SMPTE296:
+ return ("720p 50.00Hz (SMPTE296)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080I_48_00_SMPTE274:
+ return ("1080i 48.00Hz (SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080I_47_96_SMPTE274:
+ return ("1080i 47.96Hz (SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_720P_30_00_SMPTE296:
+ return ("720p 30.00Hz (SMPTE296)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_720P_29_97_SMPTE296:
+ return ("720p 29.97Hz (SMPTE296)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_720P_25_00_SMPTE296:
+ return ("720p 25.00Hz (SMPTE296)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_720P_24_00_SMPTE296:
+ return ("720p 24.00Hz (SMPTE296)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_720P_23_98_SMPTE296:
+ return ("720p 23.98Hz (SMPTE296)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080PSF_25_00_SMPTE274:
+ return ("1080PsF 25.00Hz (SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080PSF_29_97_SMPTE274:
+ return ("1080PsF 29.97Hz (SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080PSF_30_00_SMPTE274:
+ return ("1080PsF 30.00Hz (SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080PSF_24_00_SMPTE274:
+ return ("1080PsF 24.00Hz (SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080PSF_23_98_SMPTE274:
+ return ("1080PsF 23.98Hz (SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048P_30_00_SMPTE372:
+ return ("2048p 30.00Hz (SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048P_29_97_SMPTE372:
+ return ("2048p 29.97Hz (SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048I_60_00_SMPTE372:
+ return ("2048i 60.00Hz (SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048I_59_94_SMPTE372:
+ return ("2048i 59.94Hz (SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048P_25_00_SMPTE372:
+ return ("2048p 25.00Hz (SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048I_50_00_SMPTE372:
+ return ("2048i 50.00Hz (SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048P_24_00_SMPTE372:
+ return ("2048p 24.00Hz (SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048P_23_98_SMPTE372:
+ return ("2048p 23.98Hz (SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048I_48_00_SMPTE372:
+ return ("2048i 48.00Hz (SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048I_47_96_SMPTE372:
+ return ("2048i 47.96Hz (SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_50_00_3G_LEVEL_A_SMPTE274:
+ return ("1080p 50.00Hz (3G Level A - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_59_94_3G_LEVEL_A_SMPTE274:
+ return ("1080p 59.94Hz (3G Level A - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_60_00_3G_LEVEL_A_SMPTE274:
+ return ("1080p 60.00Hz (3G Level A - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_60_00_3G_LEVEL_B_SMPTE274:
+ return ("1080p 60.00Hz (3G Level B - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080I_60_00_3G_LEVEL_B_SMPTE274:
+ return ("1080i 60.00Hz (3G Level B - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048I_60_00_3G_LEVEL_B_SMPTE372:
+ return ("2048i 60.00Hz (3G Level B - SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_50_00_3G_LEVEL_B_SMPTE274:
+ return ("1080p 50.00Hz (3G Level B - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080I_50_00_3G_LEVEL_B_SMPTE274:
+ return ("1080i 50.00Hz (3G Level B - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048I_50_00_3G_LEVEL_B_SMPTE372:
+ return ("2048i 50.00Hz (3G Level B - SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_30_00_3G_LEVEL_B_SMPTE274:
+ return ("1080p 30.00Hz (3G Level B - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048P_30_00_3G_LEVEL_B_SMPTE372:
+ return ("2048p 30.00Hz (3G Level B - SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_25_00_3G_LEVEL_B_SMPTE274:
+ return ("1080p 25.00Hz (3G Level B - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048P_25_00_3G_LEVEL_B_SMPTE372:
+ return ("2048p 25.00Hz (3G Level B - SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_24_00_3G_LEVEL_B_SMPTE274:
+ return ("1080p 24.00Hz (3G Level B - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048P_24_00_3G_LEVEL_B_SMPTE372:
+ return ("2048p 24.00Hz (3G Level B - SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080I_48_00_3G_LEVEL_B_SMPTE274:
+ return ("1080i 48.00Hz (3G Level B - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048I_48_00_3G_LEVEL_B_SMPTE372:
+ return ("2048i 48.00Hz (3G Level B - SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_59_94_3G_LEVEL_B_SMPTE274:
+ return ("1080p 59.94Hz (3G Level B - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080I_59_94_3G_LEVEL_B_SMPTE274:
+ return ("1080i 59.94Hz (3G Level B - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048I_59_94_3G_LEVEL_B_SMPTE372:
+ return ("2048i 59.94Hz (3G Level B - SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_29_97_3G_LEVEL_B_SMPTE274:
+ return ("1080p 29.97Hz (3G Level B - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048P_29_97_3G_LEVEL_B_SMPTE372:
+ return ("2048p 29.97Hz (3G Level B - SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080P_23_98_3G_LEVEL_B_SMPTE274:
+ return ("1080p 23.98Hz (3G Level B - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048P_23_98_3G_LEVEL_B_SMPTE372:
+ return ("2048p 23.98Hz (3G Level B - SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_1080I_47_96_3G_LEVEL_B_SMPTE274:
+ return ("1080i 47.96Hz (3G Level B - SMPTE274)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_2048I_47_96_3G_LEVEL_B_SMPTE372:
+ return ("2048i 47.96Hz (3G Level B - SMPTE372)");
+ break;
+ case NV_CTRL_GVIO_VIDEO_FORMAT_NONE:
+ default:
+ return ("None");
+ break;
+ }				// switch
+}
+
+//
+// Decode provided component sampling.
+//
+const char *
+decodeComponentSampling (int _value)
+{
+ switch (_value) {
+ case NV_CTRL_GVI_COMPONENT_SAMPLING_UNKNOWN:
+ return ("NV_CTRL_GVI_COMPONENT_SAMPLING_UNKNOWN");
+ break;
+ case NV_CTRL_GVI_COMPONENT_SAMPLING_4444:
+ return ("NV_CTRL_GVI_COMPONENT_SAMPLING_4444");
+ break;
+ case NV_CTRL_GVI_COMPONENT_SAMPLING_4224:
+ return ("NV_CTRL_GVI_COMPONENT_SAMPLING_4224");
+ break;
+ case NV_CTRL_GVI_COMPONENT_SAMPLING_444:
+ return ("NV_CTRL_GVI_COMPONENT_SAMPLING_444");
+ break;
+ case NV_CTRL_GVI_COMPONENT_SAMPLING_422:
+ return ("NV_CTRL_GVI_COMPONENT_SAMPLING_422");
+ break;
+ default:
+ return ("NV_CTRL_GVI_COMPONENT_SAMPLING_UNKNOWN");
+ break;
+ }				// switch
+}
+
+//
+// Decode provided color space
+//
+const char *
+decodeColorSpace (int _value)
+{
+ switch (_value) {
+ case NV_CTRL_GVI_COLOR_SPACE_GBR:
+ return ("NV_CTRL_GVI_COLOR_SPACE_GBR");
+ break;
+ case NV_CTRL_GVI_COLOR_SPACE_GBRA:
+ return ("NV_CTRL_GVI_COLOR_SPACE_GBRA");
+ break;
+ case NV_CTRL_GVI_COLOR_SPACE_GBRD:
+ return ("NV_CTRL_GVI_COLOR_SPACE_GBRD");
+ break;
+ case NV_CTRL_GVI_COLOR_SPACE_YCBCR:
+ return ("NV_CTRL_GVI_COLOR_SPACE_YCBCR");
+ break;
+ case NV_CTRL_GVI_COLOR_SPACE_YCBCRA:
+ return ("NV_CTRL_GVI_COLOR_SPACE_YCBCRA");
+ break;
+ case NV_CTRL_GVI_COLOR_SPACE_YCBCRD:
+ return ("NV_CTRL_GVI_COLOR_SPACE_YCBCRD");
+ break;
+ case NV_CTRL_GVI_COLOR_SPACE_UNKNOWN:
+ default:
+ return ("NV_CTRL_GVI_COLOR_SPACE_UNKNOWN");
+ break;
+ }				// switch
+}
+
+//
+// Decode bits per component
+//
+const char *
+decodeBitsPerComponent (int _value)
+{
+ switch (_value) {
+ case NV_CTRL_GVI_BITS_PER_COMPONENT_UNKNOWN:
+ return ("NV_CTRL_GVI_BITS_PER_COMPONENT_UNKNOWN");
+ break;
+ case NV_CTRL_GVI_BITS_PER_COMPONENT_8:
+ return ("NV_CTRL_GVI_BITS_PER_COMPONENT_8");
+ break;
+ case NV_CTRL_GVI_BITS_PER_COMPONENT_10:
+ return ("NV_CTRL_GVI_BITS_PER_COMPONENT_10");
+ break;
+ case NV_CTRL_GVI_BITS_PER_COMPONENT_12:
+ return ("NV_CTRL_GVI_BITS_PER_COMPONENT_12");
+ break;
+ default:
+ return ("NV_CTRL_GVI_BITS_PER_COMPONENT_UNKNOWN");
+ break;
+ }				// switch
+}
+
+//
+// Decode chroma expand
+//
+const char *
+decodeChromaExpand (int _value)
+{
+ switch (_value) {
+ case NV_CTRL_GVI_CHROMA_EXPAND_FALSE:
+ return ("NV_CTRL_GVI_CHROMA_EXPAND_FALSE");
+ break;
+ case NV_CTRL_GVI_CHROMA_EXPAND_TRUE:
+ return ("NV_CTRL_GVI_CHROMA_EXPAND_TRUE");
+ break;
+ default:
+ return ("NV_CTRL_GVI_CHROMA_EXPAND_UNKNOWN");
+ break;
+ }				// switch
+}

bino-1.3.3.tar.xz/src/NvSDIutils.h Added

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2012
+ * Binocle <http://binocle.com/>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Written by Olivier Letz <oletz@binocle.com>.
+ */
+
+#ifndef NV_SDI_UTILS_H
+#define NV_SDI_UTILS_H
+
+#include <GL/glew.h>
+
+typedef struct HGPUNV
+{
+ int deviceXScreen;
+ char deviceName[256];
+} HGPUNV;
+
+
+typedef struct _XDisplay Display;
+
+int ScanHW (Display * dpy, HGPUNV * gpuList);
+const char *decodeBitsPerComponent (int _value);
+const char *decodeChromaExpand (int _value);
+const char *decodeColorSpace (int _value);
+const char *decodeComponentSampling (int _value);
+const char *decodeSignalFormat (int _value);
+const char *decodeSDISyncInputDetected (int _value);
+GLfloat CalcFPS ();
+
+#endif

bino-1.3.2.tar.xz/src/base/Makefile.in -> bino-1.3.3.tar.xz/src/base/Makefile.in Changed

bino-1.3.2.tar.xz/src/base/str.cpp -> bino-1.3.3.tar.xz/src/base/str.cpp Changed

@@ -151,6 +151,37 @@
 }
 }
 
+ /* Parse a string into tokens */
+
+ std::vector<std::string> tokens(const std::string &s, const std::string &delimiters)
+ {
+ std::vector<std::string> t;
+ size_t index = 0;
+ for (;;)
+ {
+ size_t start = s.find_first_not_of(delimiters, index);
+ if (start != std::string::npos)
+ {
+ size_t end = s.find_first_of(delimiters, start);
+ if (end == std::string::npos)
+ {
+ t.push_back(s.substr(start));
+ break;
+ }
+ else
+ {
+ t.push_back(s.substr(start, end - start));
+ index = end;
+ }
+ }
+ else
+ {
+ break;
+ }
+ }
+ return t;
+ }
+
 /* Create std::strings from all basic data types */
 
 std::string from(bool x)
@@ -253,6 +284,35 @@
 template<> double to<double>(const std::string &s) { return _to<double>(s, "double"); }
 template<> long double to<long double>(const std::string &s) { return _to<long double>(s, "long double"); }
 
+ template<typename T>
+ static inline bool _to(const std::string& s, T* x)
+ {
+ T y;
+ try {
+ y = str::to<T>(s);
+ }
+ catch (...) {
+ return false;
+ }
+ *x = y;
+ return true;
+ }
+
+ template<> bool to(const std::string& s, bool* x) { return _to(s, x); }
+ template<> bool to(const std::string& s, signed char* x) { return _to(s, x); }
+ template<> bool to(const std::string& s, unsigned char* x) { return _to(s, x); }
+ template<> bool to(const std::string& s, short* x) { return _to(s, x); }
+ template<> bool to(const std::string& s, unsigned short* x) { return _to(s, x); }
+ template<> bool to(const std::string& s, int* x) { return _to(s, x); }
+ template<> bool to(const std::string& s, unsigned int* x) { return _to(s, x); }
+ template<> bool to(const std::string& s, long* x) { return _to(s, x); }
+ template<> bool to(const std::string& s, unsigned long* x) { return _to(s, x); }
+ template<> bool to(const std::string& s, long long* x) { return _to(s, x); }
+ template<> bool to(const std::string& s, unsigned long long* x) { return _to(s, x); }
+ template<> bool to(const std::string& s, float* x) { return _to(s, x); }
+ template<> bool to(const std::string& s, double* x) { return _to(s, x); }
+ template<> bool to(const std::string& s, long double* x) { return _to(s, x); }
+
 /* Create std::strings printf-like */
 
 std::string vasprintf(const char *format, va_list args)

bino-1.3.2.tar.xz/src/base/str.h -> bino-1.3.3.tar.xz/src/base/str.h Changed

@@ -26,6 +26,7 @@
 #define STR_H
 
 #include <string>
+#include <vector>
 #include <cstdarg>
 #include <cerrno>
 #include <stdint.h>
@@ -46,6 +47,9 @@
 /* Trim a string (remove whitespace from both ends) */
 std::string trim(const std::string &s);
 
+ /* Parse a string into tokens separated by one of the characters in 'delimiters'. */
+ std::vector<std::string> tokens(const std::string &s, const std::string &delimiters);
+
 /* Create std::strings from all basic data types */
 std::string from(bool x);
 std::string from(signed char x);
@@ -78,6 +82,21 @@
 template<> float to<float>(const std::string &s);
 template<> double to<double>(const std::string &s);
 template<> long double to<long double>(const std::string &s);
+ template<typename T> bool to(const std::string& s, T* x);
+ template<> bool to(const std::string& s, bool* x);
+ template<> bool to(const std::string& s, signed char* x);
+ template<> bool to(const std::string& s, unsigned char* x);
+ template<> bool to(const std::string& s, short* x);
+ template<> bool to(const std::string& s, unsigned short* x);
+ template<> bool to(const std::string& s, int* x);
+ template<> bool to(const std::string& s, unsigned int* x);
+ template<> bool to(const std::string& s, long* x);
+ template<> bool to(const std::string& s, unsigned long* x);
+ template<> bool to(const std::string& s, long long* x);
+ template<> bool to(const std::string& s, unsigned long long* x);
+ template<> bool to(const std::string& s, float* x);
+ template<> bool to(const std::string& s, double* x);
+ template<> bool to(const std::string& s, long double* x);
 
 /* Create std::strings printf-like */
 std::string vasprintf(const char *format, va_list args) STR_AFP(1, 0);

bino-1.3.3.tar.xz/src/color_matrix.cpp Added

@@ -0,0 +1,91 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * Copyright (C) 2012
+ * Martin Lambers <marlam@marlam.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <cmath>
+
+#include "color_matrix.h"
+
+static void matmult(const float A[16], const float B[16], float result[16])
+{
+ for (int r = 0; r < 4; r++) {
+ for (int c = 0; c < 4; c++) {
+ result[r * 4 + c] =
+ A[r * 4 + 0] * B[0 * 4 + c]
+ + A[r * 4 + 1] * B[1 * 4 + c]
+ + A[r * 4 + 2] * B[2 * 4 + c]
+ + A[r * 4 + 3] * B[3 * 4 + c];
+ }
+ }
+}
+
+void get_color_matrix(float brightness, float contrast, float hue, float saturation, float matrix[16])
+{
+ /*
+ * See http://www.graficaobscura.com/matrix/index.html for the basic ideas.
+ * Note that the hue matrix is computed in a simpler way.
+ */
+
+ const float wr = 0.3086f;
+ const float wg = 0.6094f;
+ const float wb = 0.0820f;
+
+ // Brightness and Contrast
+ float b = (brightness < 0.0f ? brightness : 4.0f * brightness) + 1.0f;
+ float c = -contrast;
+ float BC[16] = {
+ b, 0.0f, 0.0f, 0.0f,
+ 0.0f, b, 0.0f, 0.0f,
+ 0.0f, 0.0f, b, 0.0f,
+ c, c, c, 1.0f
+ };
+ // Saturation
+ float s = saturation + 1.0f;
+ float S[16] = {
+ (1.0f - s) * wr + s, (1.0f - s) * wg , (1.0f - s) * wb , 0.0f,
+ (1.0f - s) * wr , (1.0f - s) * wg + s, (1.0f - s) * wb , 0.0f,
+ (1.0f - s) * wr , (1.0f - s) * wg , (1.0f - s) * wb + s, 0.0f,
+ 0.0f, 0.0f, 0.0f, 1.0f
+ };
+ // Hue
+ float n = 1.0f / sqrtf(3.0f); // normalized hue rotation axis: sqrt(3) * (1 1 1)
+ float h = hue * M_PI; // hue rotation angle
+ float hc = cosf(h);
+ float hs = sinf(h);
+ float H[16] = { // conversion of angle/axis representation to matrix representation
+ n * n * (1.0f - hc) + hc , n * n * (1.0f - hc) - n * hs, n * n * (1.0f - hc) + n * hs, 0.0f,
+ n * n * (1.0f - hc) + n * hs, n * n * (1.0f - hc) + hc , n * n * (1.0f - hc) - n * hs, 0.0f,
+ n * n * (1.0f - hc) - n * hs, n * n * (1.0f - hc) + n * hs, n * n * (1.0f - hc) + hc , 0.0f,
+ 0.0f, 0.0f, 0.0f, 1.0f
+ };
+
+ /* I
+ float I[16] = {
+ 1.0f, 0.0f, 0.0f, 0.0f,
+ 0.0f, 1.0f, 0.0f, 0.0f,
+ 0.0f, 0.0f, 1.0f, 0.0f,
+ 0.0f, 0.0f, 0.0f, 1.0f
+ };
+ */
+
+ // matrix = B * C * S * H
+ float T[16];
+ matmult(BC, S, T);
+ matmult(T, H, matrix);
+}

bino-1.3.3.tar.xz/src/color_matrix.h Added

@@ -0,0 +1,32 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * Copyright (C) 2012
+ * Martin Lambers <marlam@marlam.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef COLOR_MATRIX_H
+#define COLOR_MATRIX_H
+
+/*
+ * Returns a 4x4 row-major matrix that modifies linear RGB colors.
+ *
+ * The brightness, contrast, hue, saturation parameters are expected to
+ * be between -1 and +1, where 0 means "no change".
+ */
+void get_color_matrix(float brightness, float contrast, float hue, float saturation, float matrix[16]);
+
+#endif

bino-1.3.3.tar.xz/src/command_file.cpp Added

@@ -0,0 +1,179 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * Copyright (C) 2012
+ * Martin Lambers <marlam@marlam.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cstring>
+#include <cerrno>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include "gettext.h"
+#define _(string) gettext(string)
+
+#include "exc.h"
+#include "str.h"
+#include "timer.h"
+
+#include "command_file.h"
+
+/* Windows portability. */
+#ifndef O_NONBLOCK
+# define O_NONBLOCK 0
+#endif
+#ifndef EWOULDBLOCK
+# define EWOULDBLOCK EAGAIN
+#endif
+
+
+command_file::command_file(const std::string& filename) :
+ _filename(filename), _fd(-1)
+{
+}
+
+command_file::~command_file()
+{
+ deinit();
+}
+
+void command_file::init()
+{
+ if (_fd < 0) {
+ _fd = ::open(_filename.c_str(), O_RDONLY | O_NONBLOCK);
+ if (_fd < 0) {
+ throw exc(str::asprintf(_("%s: %s"), _filename.c_str(), ::strerror(errno)), errno);
+ }
+ _is_fifo = false;
+ struct stat statbuf;
+ if (fstat(_fd, &statbuf) == 0 && S_ISFIFO(statbuf.st_mode))
+ _is_fifo = true;
+ _linebuf.clear();
+ _wait_until_stop = false;
+ _wait_until = -1;
+ }
+}
+
+void command_file::deinit()
+{
+ if (_fd >= 0) {
+ if (::close(_fd) != 0) {
+ msg::wrn(_("%s: %s"), _filename.c_str(), ::strerror(errno));
+ }
+ _fd = -1;
+ }
+}
+
+bool command_file::is_active() const
+{
+ return (_fd >= 0 || _linebuf.size() > 0);
+}
+
+bool command_file::allow_early_quit()
+{
+ return !is_active();
+}
+
+void command_file::process_events()
+{
+ if (!is_active())
+ return;
+
+ if (_wait_until_stop && dispatch::playing())
+ return;
+
+ if (_wait_until >= 0) {
+ int64_t now = timer::get_microseconds(timer::monotonic);
+ if (now < _wait_until)
+ return;
+ }
+
+ _wait_until_stop = false;
+ _wait_until = -1;
+
+ static const size_t readbuf_size = 512;
+ static char readbuf[readbuf_size];
+
+ while (_fd >= 0) {
+ ssize_t r = ::read(_fd, readbuf, readbuf_size);
+ if (r < 0) {
+ if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ // no data to read right now; we try again later
+ break;
+ } else {
+ // an error occured
+ int errno_bak = errno;
+ deinit();
+ throw exc(str::asprintf(_("%s: %s"), _filename.c_str(), ::strerror(errno_bak)), errno_bak);
+ }
+ } else if (r == 0) {
+ // EOF. Keep a FIFO open: a writer may appear later. Close other files.
+ if (!_is_fifo)
+ deinit();
+ break;
+ } else {
+ // We have some data
+ _linebuf.append(readbuf, r);
+ }
+ }
+ std::string cmd;
+ if (_linebuf.size() > 0) {
+ size_t eol_pos = _linebuf.find_first_of('\n');
+ if (eol_pos != std::string::npos) {
+ // We have a complete command line. Execute the command,
+ // and remember the rest of the buffer (if any) for a subsequent
+ // call to this function (we execute at most one command
+ // per process_events() call).
+ cmd = _linebuf.substr(0, eol_pos);
+ _linebuf.erase(0, eol_pos + 1);
+ } else if (_fd < 0) {
+ // We have a last line without EOL. Process it.
+ cmd = _linebuf;
+ _linebuf.clear();
+ }
+ }
+ if (cmd.length() > 0) {
+ cmd = str::sanitize(str::trim(cmd));
+ if (cmd.substr(0, 4) == "wait") {
+ // This command is specific to this particular controller!
+ std::vector<std::string> tokens = str::tokens(cmd, " \t\r");
+ if (tokens.size() == 2 && tokens[0] == "wait") {
+ float seconds;
+ if (tokens[1] == "stop") {
+ _wait_until_stop = true;
+ return;
+ } else if (str::to(tokens[1], &seconds)) {
+ _wait_until = timer::get_microseconds(timer::monotonic);
+ if (seconds > 0.0f)
+ _wait_until += seconds * 1e6f;
+ return;
+ }
+ }
+ }
+ command c;
+ bool ok = dispatch::parse_command(cmd, &c);
+ if (!ok) {
+ msg::err(_("%s: invalid command '%s'"), _filename.c_str(), cmd.c_str());
+ } else {
+ send_cmd(c);
+ }
+ }
+}

bino-1.3.3.tar.xz/src/command_file.h Added

@@ -0,0 +1,60 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * Copyright (C) 2012
+ * Martin Lambers <marlam@marlam.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef COMMAND_FILE_H
+#define COMMAND_FILE_H
+
+#include <string>
+
+#include "dispatch.h"
+
+
+class command_file : public controller
+{
+private:
+ const std::string _filename;
+ int _fd;
+ bool _is_fifo;
+ std::string _linebuf;
+ bool _wait_until_stop;
+ int64_t _wait_until;
+
+ // Helper function to read a command from a string
+ bool get_command(const std::string &s, command &c);
+
+public:
+ command_file(const std::string& filename);
+ ~command_file();
+
+ /* Initialize. Throw an exception if this fails. */
+ void init();
+ /* Deinitialize. */
+ void deinit();
+
+ bool is_active() const;
+
+ /* Process events (see if there's any input on the file). */
+ virtual void process_events();
+ /* Prevent the application from quitting if there might be
+ * an additional 'open' command in the future. */
+ virtual bool allow_early_quit();
+};
+
+#endif

bino-1.3.2.tar.xz/src/dispatch.cpp -> bino-1.3.3.tar.xz/src/dispatch.cpp Changed

@@ -3,6 +3,7 @@
 *
 * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
+ * Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -21,6 +22,9 @@
 #include "config.h"
 
 #include <vector>
+#include <sstream>
+#include <cstdio>
+#include <cctype>
 #include <unistd.h>
 
 #include "gettext.h"
@@ -96,6 +100,12 @@
 /* default: do nothing */
 }
 
+bool controller::allow_early_quit()
+{
+ /* default: allow to quit when there is nothing to do */
+ return true;
+}
+
 
 dispatch::dispatch(int* argc, char** argv,
 bool equalizer, bool equalizer_3d, bool equalizer_slave_node,
@@ -167,12 +177,15 @@
 _video_output = new video_output_qt();
 }
 if ((_eq && !_eq_slave_node) || !_gui_mode) {
- if (input_data.urls.size() == 0)
- throw exc(_("No video to play."));
- std::ostringstream v;
- s11n::save(v, input_data);
- controller::send_cmd(command::open, v.str());
- controller::send_cmd(command::toggle_play);
+ if (input_data.urls.size() == 0) {
+ if (early_quit_is_allowed())
+ throw exc(_("No video to play."));
+ } else {
+ std::ostringstream v;
+ s11n::save(v, input_data);
+ controller::send_cmd(command::open, v.str());
+ controller::send_cmd(command::toggle_play);
+ }
 }
 }
 
@@ -195,22 +208,21 @@
 {
 assert(global_dispatch);
 if (global_dispatch->_playing) {
- bool more = global_dispatch->_player->run_step();
- if (!more) {
- global_dispatch->_playing = false;
- global_dispatch->_pausing = false;
- global_dispatch->notify_all(notification::play); 
- if (!global_dispatch->_gui_mode) {
- global_dispatch->notify_all(notification::quit);
- } else {
- global_dispatch->force_stop();
- }
- }
+ if (!global_dispatch->_player->run_step())
+ global_dispatch->stop_player();
 } else {
 usleep(1000);
 }
 }
 
+bool dispatch::early_quit_is_allowed() const
+{
+ for (size_t i = 0; i < _controllers.size(); i++)
+ if (!_controllers[i]->allow_early_quit())
+ return false;
+ return true;
+}
+
 void dispatch::visit_all_controllers(int action, const notification& note) const
 {
 std::vector<controller*> visited_controllers;
@@ -293,11 +305,6 @@
 return &_input_data;
 }
 
-class player* dispatch::get_player()
-{
- return _player;
-}
-
 void dispatch::set_playing(bool p)
 {
 _playing = p;
@@ -362,23 +369,38 @@
 return std::min(std::max(x, lo), hi);
 }
 
-void dispatch::force_stop()
+void dispatch::stop_player()
+{
+ bool early_quit = !_gui_mode && early_quit_is_allowed();
+ force_stop(!early_quit);
+ notify_all(notification::play);
+ if (early_quit)
+ notify_all(notification::quit);
+}
+
+void dispatch::force_stop(bool reopen_media_input)
 {
 if (_player) {
 _player->close();
- delete _player;
+ if (!_eq)
+ delete _player; // The equalizer code will delete the player object at the appropriate time
 _player = NULL;
 }
 if (_media_input) {
 // close, reopen, and reinitialize media input
 _media_input->close();
- _media_input->open(_input_data.urls, _input_data.dev_request);
- _media_input->set_stereo_layout(_parameters.stereo_layout(), _parameters.stereo_layout_swap());
- _media_input->select_video_stream(_parameters.video_stream());
- if (_media_input->audio_streams() > 0)
- _media_input->select_audio_stream(_parameters.audio_stream());
- if (_media_input->subtitle_streams() > 0 && _parameters.subtitle_stream() >= 0)
- _media_input->select_subtitle_stream(_parameters.subtitle_stream());
+ if (reopen_media_input) {
+ _media_input->open(_input_data.urls, _input_data.dev_request);
+ _media_input->set_stereo_layout(_parameters.stereo_layout(), _parameters.stereo_layout_swap());
+ _media_input->select_video_stream(_parameters.video_stream());
+ if (_media_input->audio_streams() > 0)
+ _media_input->select_audio_stream(_parameters.audio_stream());
+ if (_media_input->subtitle_streams() > 0 && _parameters.subtitle_stream() >= 0)
+ _media_input->select_subtitle_stream(_parameters.subtitle_stream());
+ } else {
+ delete _media_input;
+ _media_input = NULL;
+ }
 }
 if (_video_output) {
 _video_output->deinit();
@@ -398,9 +420,13 @@
 {
 case command::noop:
 break;
+ case command::quit:
+ force_stop(false);
+ notify_all(notification::quit);
+ break;
 // Play state
 case command::open:
- force_stop();
+ force_stop(false);
 notify_all(notification::play);
 s11n::load(p, _input_data);
 // Create media input
@@ -488,7 +514,7 @@
 notify_all(notification::open);
 break;
 case command::close:
- force_stop();
+ force_stop(false);
 notify_all(notification::play);
 notify_all(notification::open);
 break;
@@ -602,6 +628,10 @@
 _parameters.set_fullscreen_inhibit_screensaver(s11n::load<bool>(p));
 notify_all(notification::fullscreen_inhibit_screensaver);
 break;
+ case command::set_fullscreen_3d_ready_sync:
+ _parameters.set_fullscreen_3d_ready_sync(s11n::load<bool>(p));
+ notify_all(notification::fullscreen_3d_ready_sync);
+ break;
 case command::adjust_contrast:
 _parameters.set_contrast(clamp(_parameters.contrast() + s11n::load<float>(p), -1.0f, +1.0f));
 notify_all(notification::contrast);
@@ -663,58 +693,85 @@
 notify_all(notification::subtitle_size);
 break;
 case command::set_subtitle_scale:
- _parameters.set_subtitle_scale(std::max(s11n::load<float>(p), 0.0f));
+ _parameters.set_subtitle_scale(s11n::load<float>(p));
 notify_all(notification::subtitle_scale);
 break;
 case command::set_subtitle_color:
 _parameters.set_subtitle_color(s11n::load<uint64_t>(p));
 notify_all(notification::subtitle_color);
 break;
+ case command::set_subtitle_shadow:
+ _parameters.set_subtitle_shadow(s11n::load<int>(p));
+ notify_all(notification::subtitle_shadow);
+ break;
+#if HAVE_LIBXNVCTRL
+ case command::set_sdi_output_format:
+ _parameters.set_sdi_output_format(s11n::load<int>(p));
+ notify_all(notification::sdi_output_format);
+ break;
+ case command::set_sdi_output_left_stereo_mode:
+ _parameters.set_sdi_output_left_stereo_mode(static_cast<parameters::stereo_mode_t>(s11n::load<int>(p)));
+ notify_all(notification::sdi_output_left_stereo_mode);
+ break;
+ case command::set_sdi_output_right_stereo_mode:
+ _parameters.set_sdi_output_right_stereo_mode(static_cast<parameters::stereo_mode_t>(s11n::load<int>(p)));
+ notify_all(notification::sdi_output_right_stereo_mode);
+ break;
+#endif // HAVE_LIBXNVCTRL
 // Per-Video parameters
 case command::cycle_video_stream:
- if (_player && _media_input->video_streams() > 1
+ if (_media_input && _media_input->video_streams() > 1
 && parameters().stereo_layout() != parameters::layout_separate) {
 int s = parameters().video_stream() + 1;
 if (s >= _media_input->video_streams())
 s = 0;
- _parameters.set_video_stream(_player->set_video_stream(s));
+ s = _player->set_video_stream(s);
+ _parameters.set_video_stream(s);
 notify_all(notification::video_stream);
 }
 break;
 case command::set_video_stream:
- if (_player && _media_input->video_streams() > 1
+ if (_media_input && _media_input->video_streams() > 1
 && parameters().stereo_layout() != parameters::layout_separate) {
- _parameters.set_video_stream(_player->set_video_stream(s11n::load<int>(p)));
+ int s = s11n::load<int>(p);
+ s = _player->set_video_stream(s);
+ _parameters.set_video_stream(s);
 notify_all(notification::video_stream);
 }
 break;
 case command::cycle_audio_stream:
- if (_player && _media_input->audio_streams() > 1) {
+ if (_media_input && _media_input->audio_streams() > 1) {
 int s = parameters().audio_stream() + 1;
 if (s >= _media_input->audio_streams())
 s = 0;
- _parameters.set_audio_stream(_player->set_audio_stream(s));
+ s = _player->set_audio_stream(s);
+ _parameters.set_audio_stream(s);
 notify_all(notification::audio_stream);
 }
 break;
 case command::set_audio_stream:
- if (_player && _media_input->audio_streams() > 1) {
- _parameters.set_audio_stream(_player->set_audio_stream(s11n::load<int>(p)));
+ if (_media_input && _media_input->audio_streams() > 1) {
+ int s = s11n::load<int>(p);
+ s = _player->set_audio_stream(s);
+ _parameters.set_audio_stream(s);
 notify_all(notification::audio_stream);
 }
 break;
 case command::cycle_subtitle_stream:
- if (_player && _media_input->subtitle_streams() > 0) {
+ if (_media_input && _media_input->subtitle_streams() > 0) {
 int s = parameters().subtitle_stream() + 1;
 if (s >= _media_input->subtitle_streams())
 s = -1;
- _parameters.set_subtitle_stream(_player->set_subtitle_stream(s));
+ s = _player->set_subtitle_stream(s);
+ _parameters.set_subtitle_stream(s);
 notify_all(notification::subtitle_stream);
 }
 break;
 case command::set_subtitle_stream:
- if (_player && _media_input->subtitle_streams() > 0) {
- _parameters.set_subtitle_stream(_player->set_subtitle_stream(s11n::load<int>(p)));
+ if (_media_input && _media_input->subtitle_streams() > 0) {
+ int s = s11n::load<int>(p);
+ s = _player->set_subtitle_stream(s);
+ _parameters.set_subtitle_stream(s);
 notify_all(notification::subtitle_stream);
 }
 break;
@@ -800,6 +857,9 @@
 _parameters.set_audio_mute(!_parameters.audio_mute());
 notify_all(notification::audio_mute);
 break;
+ case command::update_display_pos:
+ notify_all(notification::display_pos);
+ break;
 }
 }
 
@@ -823,3 +883,333 @@
 s11n::load(iss, _pausing);
 s11n::load(iss, _position);
 }
+
+static bool parse_bool(const std::string& s, bool* x)
+{
+ if (s == "1" || s == "on" || s == "true") {
+ *x = true;
+ return true;
+ } else if (s == "0" || s == "off" || s == "false") {
+ *x = false;
+ return true;
+ } else {
+ return false;
+ }
+}
+
+static bool parse_aspect_ratio(const std::string& s, float* x)
+{
+ std::vector<std::string> tokens = str::tokens(s, ":");
+ float xn, xd;
+ if (tokens.size() == 2 && str::to(tokens[0], &xn) && str::to(tokens[1], &xd)) {
+ *x = std::min(std::max(xn / xd, 1.0f), 2.39f);
+ return true;
+ } else if (tokens.size() == 1 && str::to(s, x)) {
+ *x = std::min(std::max(*x, 1.0f), 2.39f);
+ return true;
+ } else {
+ return false;
+ }
+}
+
+static bool parse_open_input_data(const std::vector<std::string>& tokens, open_input_data* oid)
+{
+ for (size_t i = 1; i < tokens.size(); i++) {
+ if (tokens[i].length() > 2 && tokens[i].substr(0, 2) == "--") {
+ std::vector<std::string> subtokens = str::tokens(tokens[i].substr(2), "=");
+ if (subtokens.size() == 2 && subtokens[0] == "device-type") {
+ if (subtokens[1] == "none") {
+ oid->dev_request.device = device_request::no_device;
+ continue;
+ } else if (subtokens[1] == "default") {
+ oid->dev_request.device = device_request::sys_default;
+ continue;
+ } else if (subtokens[1] == "firewire") {
+ oid->dev_request.device = device_request::firewire;
+ continue;
+ } else if (subtokens[1] == "x11") {
+ oid->dev_request.device = device_request::x11;
+ continue;
+ }
+ } else if (subtokens.size() == 2 && subtokens[0] == "device-frame-size") {
+ std::vector<std::string> wh = str::tokens(subtokens[1], "x");
+ if (wh.size() == 2
+ && str::to(wh[0], &oid->dev_request.width) && oid->dev_request.width >= 0
+ && str::to(wh[1], &oid->dev_request.height) && oid->dev_request.height >= 0)
+ continue;
+ } else if (subtokens.size() == 2 && subtokens[0] == "device-frame-rate") {
+ std::vector<std::string> nd = str::tokens(subtokens[1], "/");
+ if (nd.size() == 2
+ && str::to(nd[0], &oid->dev_request.frame_rate_num) && oid->dev_request.frame_rate_num >= 0
+ && str::to(nd[1], &oid->dev_request.frame_rate_den) && oid->dev_request.frame_rate_den >= 0)
+ continue;
+ } else if (subtokens.size() == 2 && subtokens[0] == "device-format") {
+ if (subtokens[1] == "default") {
+ oid->dev_request.request_mjpeg = false;
+ continue;
+ } else if (subtokens[1] == "mjpeg") {
+ oid->dev_request.request_mjpeg = true;
+ continue;
+ }
+ }
+ return false;
+ } else {
+ // URLs use percent-encoding; see http://en.wikipedia.org/wiki/Percent_encoding
+ std::string url;
+ for (size_t j = 0; j < tokens[i].size(); j++) {
+ if (tokens[i][j] == '%') {
+ if (j + 2 < tokens[i].size()) {
+ char h0 = tokens[i][j + 1];
+ char h1 = tokens[i][j + 2];
+ int k = 0;
+ if (h0 >= '0' && h0 <= '9') {
+ k = (h0 - '0') << 4;
+ } else if (h0 >= 'a' && h0 <= 'f') {
+ k = (h0 - 'a' + 10) << 4;
+ } else if (h0 >= 'A' && h0 <= 'F') {
+ k = (h0 - 'A' + 10) << 4;
+ } else {
+ return false;
+ }
+ if (h1 >= '0' && h1 <= '9') {
+ k += (h1 - '0');
+ } else if (h1 >= 'a' && h1 <= 'f') {
+ k += (h1 - 'a' + 10);
+ } else if (h1 >= 'A' && h1 <= 'F') {
+ k += (h1 - 'A' + 10);
+ } else {
+ return false;
+ }
+ if (k <= 127 && !iscntrl(static_cast<unsigned char>(k))) {
+ url.push_back(k);
+ j += 2;
+ } else {
+ return false;
+ }
+ } else {
+ return false;
+ }
+ } else {
+ url.push_back(tokens[i][j]);
+ }
+ }
+ oid->urls.push_back(url);
+ }
+ }
+ return true;
+}
+
+bool dispatch::parse_command(const std::string& s, command* c)
+{
+ std::vector<std::string> tokens = str::tokens(s, " \t\r");
+ bool ok = true;
+ union {
+ bool b;
+ int i;
+ float f;
+ uint64_t c;
+ } p;
+ float p_crosstalk[3];
+ parameters::stereo_layout_t p_stereo_layout;
+ parameters::stereo_mode_t p_stereo_mode;
+ open_input_data p_oid;
+
+ /* Please keep this in the same order as commands are declared in dispatch.h */
+
+ if (tokens.empty() || tokens[0][0] == '#') {
+ // a comment
+ *c = command(command::noop);
+ } else if (tokens.size() == 1 && tokens[0] == "quit") {
+ *c = command(command::quit);
+ } else if (tokens.size() > 1 && tokens[0] == "open"
+ && parse_open_input_data(tokens, &p_oid)) {
+ std::ostringstream v;
+ s11n::save(v, p_oid);
+ *c = command(command::open, v.str());
+ } else if (tokens.size() == 1 && tokens[0] == "close") {
+ *c = command(command::close);
+ } else if (tokens.size() == 1 && tokens[0] == "toggle-play") {
+ *c = command(command::toggle_play);
+ } else if (tokens.size() == 1 && tokens[0] == "play") { // extra command, mainly for LIRC
+ if (!dispatch::playing())
+ *c = command(command::toggle_play);
+ else if (dispatch::pausing())
+ *c = command(command::toggle_pause);
+ else
+ *c = command(command::noop);
+ } else if (tokens.size() == 1 && tokens[0] == "stop") { // extra command, mainly for LIRC
+ if (dispatch::playing())
+ *c = command(command::toggle_play);
+ else
+ *c = command(command::noop);
+ } else if (tokens.size() == 1 && tokens[0] == "toggle-pause") {
+ *c = command(command::toggle_pause);
+ } else if (tokens.size() == 1 && tokens[0] == "pause") { // extra command, mainly for LIRC
+ if (dispatch::playing() && !dispatch::pausing())
+ *c = command(command::toggle_pause);
+ else
+ *c = command(command::noop);
+ } else if (tokens.size() == 1 && tokens[0] == "step") {
+ *c = command(command::step);
+ } else if (tokens.size() == 2 && tokens[0] == "seek"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::seek, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "set-pos"
+ && str::to(tokens[1], &p.f) && p.f >= 0.0f && p.f <= 1.0f) {
+ *c = command(command::set_pos, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "set-audio-device"
+ && str::to(tokens[1], &p.i)) {
+ *c = command(command::set_audio_device, p.i);
+ } else if (tokens.size() == 2 && tokens[0] == "set-stereo-mode"
+ && parameters::parse_stereo_mode(tokens[1], &p_stereo_mode)) {
+ *c = command(command::set_stereo_mode, static_cast<int>(p_stereo_mode));
+ } else if (tokens.size() == 2 && tokens[0] == "set-stereo-mode-swap"
+ && parse_bool(tokens[1], &p.b)) {
+ *c = command(command::set_stereo_mode_swap, p.b);
+ } else if (tokens.size() == 1 && tokens[0] == "toggle-stereo-mode-swap") {
+ *c = command(command::toggle_stereo_mode_swap);
+ } else if (tokens.size() == 4 && tokens[0] == "set-crosstalk"
+ && str::to(tokens[1], p_crosstalk + 0) && p_crosstalk[0] >= 0.0f && p_crosstalk[0] <= 1.0f
+ && str::to(tokens[2], p_crosstalk + 1) && p_crosstalk[1] >= 0.0f && p_crosstalk[1] <= 1.0f
+ && str::to(tokens[3], p_crosstalk + 2) && p_crosstalk[2] >= 0.0f && p_crosstalk[2] <= 1.0f) {
+ std::ostringstream v;
+ s11n::save(v, p_crosstalk[0]);
+ s11n::save(v, p_crosstalk[1]);
+ s11n::save(v, p_crosstalk[2]);
+ *c = command(command::set_crosstalk, v.str());
+ } else if (tokens.size() == 2 && tokens[0] == "set-fullscreen-screens"
+ && str::to(tokens[1], &p.i)) {
+ *c = command(command::set_fullscreen_screens, p.i);
+ } else if (tokens.size() == 2 && tokens[0] == "set-fullscreen-flip-left"
+ && parse_bool(tokens[1], &p.b)) {
+ *c = command(command::set_fullscreen_flip_left, p.b);
+ } else if (tokens.size() == 2 && tokens[0] == "set-fullscreen-flop-left"
+ && parse_bool(tokens[1], &p.b)) {
+ *c = command(command::set_fullscreen_flop_left, p.b);
+ } else if (tokens.size() == 2 && tokens[0] == "set-fullscreen-flip-right"
+ && parse_bool(tokens[1], &p.b)) {
+ *c = command(command::set_fullscreen_flip_right, p.b);
+ } else if (tokens.size() == 2 && tokens[0] == "set-fullscreen-flop-right"
+ && parse_bool(tokens[1], &p.b)) {
+ *c = command(command::set_fullscreen_flop_right, p.b);
+ } else if (tokens.size() == 2 && tokens[0] == "set-fullscreen-inhibit-screensaver"
+ && parse_bool(tokens[1], &p.b)) {
+ *c = command(command::set_fullscreen_inhibit_screensaver, p.b);
+ } else if (tokens.size() == 2 && tokens[0] == "set-fullscreen-3dr-sync"
+ && parse_bool(tokens[1], &p.b)) {
+ *c = command(command::set_fullscreen_3d_ready_sync, p.b);
+ } else if (tokens.size() == 2 && tokens[0] == "set-contrast"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::set_contrast, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "adjust-contrast"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::adjust_contrast, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "set-brightness"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::set_brightness, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "adjust-brightness"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::adjust_brightness, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "set-hue"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::set_hue, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "adjust-hue"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::adjust_hue, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "set-saturation"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::set_saturation, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "adjust-saturation"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::adjust_saturation, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "set-zoom"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::set_zoom, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "adjust-zoom"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::adjust_zoom, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "set-loop-mode"
+ && (tokens[1] == "off" || tokens[1] == "current")) {
+ parameters::loop_mode_t l = (tokens[1] == "off"
+ ? parameters::no_loop : parameters::loop_current);
+ *c = command(command::set_loop_mode, static_cast<int>(l));
+ } else if (tokens.size() == 2 && tokens[0] == "set-audio-delay"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::set_audio_delay, p.f);
+ } else if ((tokens.size() == 1 || tokens.size() == 2) && tokens[0] == "set-subtitle-encoding") {
+ std::ostringstream v;
+ s11n::save(v, tokens.size() > 1 ? tokens[1] : std::string(""));
+ *c = command(command::set_subtitle_encoding, v.str());
+ } else if (tokens.size() >= 1 && tokens[0] == "set-subtitle-font") {
+ // A font name can contain spaces and therefore span multiple tokens.
+ std::ostringstream v;
+ s11n::save(v, tokens.size() > 1 ? str::trim(str::trim(s).substr(17)) : std::string(""));
+ *c = command(command::set_subtitle_font, v.str());
+ } else if (tokens.size() == 2 && tokens[0] == "set-subtitle-size"
+ && str::to(tokens[1], &p.i)) {
+ *c = command(command::set_subtitle_size, p.i);
+ } else if (tokens.size() == 2 && tokens[0] == "set-subtitle-color"
+ && str::to(tokens[1], &p.c)) {
+ *c = command(command::set_subtitle_color, p.c);
+ } else if (tokens.size() == 2 && tokens[0] == "set-subtitle-shadow"
+ && str::to(tokens[1], &p.i)) {
+ *c = command(command::set_subtitle_shadow, p.i);
+ } else if (tokens.size() == 2 && tokens[0] == "set-video-stream"
+ && str::to(tokens[1], &p.i) && p.i >= 0) {
+ *c = command(command::set_video_stream, p.i);
+ } else if (tokens.size() == 1 && tokens[0] == "cycle-video-stream") {
+ *c = command(command::cycle_video_stream);
+ } else if (tokens.size() == 2 && tokens[0] == "set-audio-stream"
+ && str::to(tokens[1], &p.i) && p.i >= 0) {
+ *c = command(command::set_audio_stream, p.i);
+ } else if (tokens.size() == 1 && tokens[0] == "cycle-audio-stream") {
+ *c = command(command::cycle_audio_stream);
+ } else if (tokens.size() == 2 && tokens[0] == "set-subtitle-stream"
+ && str::to(tokens[1], &p.i) && p.i >= -1) {
+ *c = command(command::set_subtitle_stream, p.i);
+ } else if (tokens.size() == 1 && tokens[0] == "cycle-subtitle-stream") {
+ *c = command(command::cycle_subtitle_stream);
+ } else if (tokens.size() == 2 && tokens[0] == "set-stereo-layout"
+ && parameters::parse_stereo_layout(tokens[1], &p_stereo_layout)) {
+ *c = command(command::set_stereo_layout, static_cast<int>(p_stereo_layout));
+ } else if (tokens.size() == 2 && tokens[0] == "set-stereo-layout-swap"
+ && parse_bool(tokens[1], &p.b)) {
+ *c = command(command::set_stereo_layout_swap, p.b);
+ } else if (tokens.size() == 2 && tokens[0] == "set-crop-aspect-ratio"
+ && parse_aspect_ratio(tokens[1], &p.f)) {
+ *c = command(command::set_crop_aspect_ratio, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "set-parallax"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::set_parallax, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "adjust-parallax"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::adjust_parallax, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "set-ghostbust"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::set_ghostbust, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "adjust-ghostbust"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::adjust_ghostbust, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "set-subtitle-parallax"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::set_subtitle_parallax, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "adjust-subtitle-parallax"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::adjust_subtitle_parallax, p.f);
+ } else if (tokens.size() == 1 && tokens[0] == "toggle-fullscreen") {
+ *c = command(command::toggle_fullscreen);
+ } else if (tokens.size() == 1 && tokens[0] == "center") {
+ *c = command(command::center);
+ } else if (tokens.size() == 2 && tokens[0] == "set-audio-volume"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::set_audio_volume, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "adjust-audio-volume"
+ && str::to(tokens[1], &p.f)) {
+ *c = command(command::adjust_audio_volume, p.f);
+ } else if (tokens.size() == 1 && tokens[0] == "toggle-audio-mute") {
+ *c = command(command::toggle_audio_mute);
+ } else {
+ ok = false;
+ }
+ return ok;
+}

bino-1.3.2.tar.xz/src/dispatch.h -> bino-1.3.3.tar.xz/src/dispatch.h Changed

@@ -4,6 +4,7 @@
 * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 * Joe <cuchac@email.cz>
+ * Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -78,6 +79,7 @@
 enum type
 {
 noop, // no parameters
+ quit, // no parameters
 // Play state
 open, // open_input_data
 close, // no parameters
@@ -98,16 +100,17 @@
 set_fullscreen_flip_right, // bool
 set_fullscreen_flop_right, // bool
 set_fullscreen_inhibit_screensaver, // bool
- adjust_contrast, // float (relative adjustment)
+ set_fullscreen_3d_ready_sync, // bool
 set_contrast, // float (absolute value)
- adjust_brightness, // float (relative adjustment)
+ adjust_contrast, // float (relative adjustment)
 set_brightness, // float (absolute value)
- adjust_hue, // float (relative adjustment)
+ adjust_brightness, // float (relative adjustment)
 set_hue, // float (absolute value)
- adjust_saturation, // float (relative adjustment)
+ adjust_hue, // float (relative adjustment)
 set_saturation, // float (absolute value)
- adjust_zoom, // float (relative adjustment)
+ adjust_saturation, // float (relative adjustment)
 set_zoom, // float (absolute value)
+ adjust_zoom, // float (relative adjustment)
 set_loop_mode, // parameters::loop_mode_t
 set_audio_delay, // float (absolute value)
 set_subtitle_encoding, // string (encoding name)
@@ -115,28 +118,35 @@
 set_subtitle_size, // int
 set_subtitle_scale, // float
 set_subtitle_color, // uint64_t
+ set_subtitle_shadow, // int
+#if HAVE_LIBXNVCTRL
+ set_sdi_output_format, // int
+ set_sdi_output_left_stereo_mode, // parameters::stereo_mode_t
+ set_sdi_output_right_stereo_mode, // parameters::stereo_mode_t
+#endif // HAVE_LIBXNVCTRL
 // Per-Video parameters
- cycle_video_stream, // no parameters
 set_video_stream, // int
- cycle_audio_stream, // no parameters
+ cycle_video_stream, // no parameters
 set_audio_stream, // int
- cycle_subtitle_stream, // no parameters
+ cycle_audio_stream, // no parameters
 set_subtitle_stream, // int
+ cycle_subtitle_stream, // no parameters
 set_stereo_layout, // video_frame::stereo_layout
 set_stereo_layout_swap, // bool
 set_crop_aspect_ratio, // float
- adjust_parallax, // float (relative adjustment)
 set_parallax, // float (absolute value)
- adjust_ghostbust, // float (relative adjustment)
+ adjust_parallax, // float (relative adjustment)
 set_ghostbust, // float (absolute value)
- adjust_subtitle_parallax, // float (relative adjustment)
+ adjust_ghostbust, // float (relative adjustment)
 set_subtitle_parallax, // float (absolute value)
+ adjust_subtitle_parallax, // float (relative adjustment)
 // Volatile parameters
 toggle_fullscreen, // no parameters
 center, // no parameters
- adjust_audio_volume, // float (relative adjustment)
 set_audio_volume, // float (absolute value)
+ adjust_audio_volume, // float (relative adjustment)
 toggle_audio_mute, // no parameters
+ update_display_pos, // no parameters
 };
 
 type type;
@@ -216,6 +226,7 @@
 fullscreen_flip_right,
 fullscreen_flop_right,
 fullscreen_inhibit_screensaver,
+ fullscreen_3d_ready_sync,
 contrast,
 brightness,
 hue,
@@ -228,6 +239,12 @@
 subtitle_size,
 subtitle_scale,
 subtitle_color,
+ subtitle_shadow,
+#if HAVE_LIBXNVCTRL
+ sdi_output_format,
+ sdi_output_left_stereo_mode,
+ sdi_output_right_stereo_mode,
+#endif // HAVE_LIBXNVCTRL
 // Per-Video parameters
 video_stream,
 audio_stream,
@@ -243,6 +260,7 @@
 center,
 audio_volume,
 audio_mute,
+ display_pos,
 };
 
 const enum type type;
@@ -278,6 +296,12 @@
 /* The controller is asked to process events via this function. The default
 * implementation simply does nothing. */
 virtual void process_events();
+
+ /* The controller can prevent Bino from exiting when there is no video
+ * to play. In this case, the following function should return 'false'.
+ * This is intended to be used for controllers that might send another
+ * 'open' command in the future. */
+ virtual bool allow_early_quit();
 };
 
 // The dispatch (singleton).
@@ -309,8 +333,10 @@
 bool _pausing;
 float _position;
 
- void force_stop();
+ void stop_player();
+ void force_stop(bool reopen_media_input = true);
 
+ bool early_quit_is_allowed() const;
 void visit_all_controllers(int action, const notification& note) const;
 void notify_all(const notification& note);
 
@@ -354,9 +380,13 @@
 
 /* Interface for Equalizer. */
 class open_input_data* get_input_data();
- class player* get_player();
 std::string save_state() const;
 void load_state(const std::string& s);
+ void stop_eq_player() { stop_player(); }
+
+ /* Helper function for text-based controllers: parse a command from a string.
+ * Return false if this fails, otherwise store the command in c. */
+ static bool parse_command(const std::string& s, command* c);
 };
 
 #endif

bino-1.3.2.tar.xz/src/gui.cpp -> bino-1.3.3.tar.xz/src/gui.cpp Changed

@@ -7,6 +7,7 @@
 * Joe <cuchac@email.cz>
 * Daniel Schaal <farbing@web.de>
 * D. Matz <bandregent@yahoo.de>
+ * Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -80,6 +81,11 @@
 #include "msg.h"
 #include "str.h"
 
+#if HAVE_LIBXNVCTRL
+# include "NVCtrl.h"
+# include "NvSDIutils.h"
+#endif // HAVE_LIBXNVCTRL
+
 // for autoconf < 2.65:
 #ifndef PACKAGE_URL
 # define PACKAGE_URL "http://bino3d.org"
@@ -225,10 +231,8 @@
 _input_combobox->setEnabled(false);
 _output_combobox->setEnabled(false);
 _swap_checkbox->setEnabled(false);
-}
 
-in_out_widget::~in_out_widget()
-{
+ update();
 }
 
 void in_out_widget::set_stereo_layout(parameters::stereo_layout_t stereo_layout, bool stereo_layout_swap)
@@ -667,6 +671,10 @@
 _lock = true;
 switch (note.type)
 {
+ case notification::open:
+ case notification::play:
+ update();
+ break;
 case notification::video_stream:
 _video_combobox->setCurrentIndex(dispatch::parameters().video_stream());
 break;
@@ -811,13 +819,10 @@
 _seek_slider->setEnabled(false);
 _pos_label->setEnabled(false);
 
+ update();
 update_audio_widgets();
 }
 
-controls_widget::~controls_widget()
-{
-}
-
 void controls_widget::update_audio_widgets()
 {
 _lock = true;
@@ -974,6 +979,9 @@
 
 switch (note.type)
 {
+ case notification::open:
+ update();
+ break;
 case notification::play:
 b = dispatch::playing();
 _play_button->setEnabled(!b);
@@ -1090,6 +1098,9 @@
 _flop_right_box = new QCheckBox(_("flop right view horizontally."));
 _flop_right_box->setToolTip(lbl2->toolTip());
 
+ _3d_ready_sync_box = new QCheckBox(_("use DLP(R) 3-D Ready Sync"));
+ _3d_ready_sync_box->setToolTip(_("Use DLP&reg; 3-D Ready Sync for supported output modes."));
+
 _inhibit_screensaver_box = new QCheckBox(_("inhibit the screensaver"));
 _inhibit_screensaver_box->setToolTip(_("Inhibit the screensaver during fullscreen playback."));
 
@@ -1110,7 +1121,8 @@
 layout0->addWidget(_flop_left_box, 6, 0, 1, 3);
 layout0->addWidget(_flip_right_box, 7, 0, 1, 3);
 layout0->addWidget(_flop_right_box, 8, 0, 1, 3);
- layout0->addWidget(_inhibit_screensaver_box, 9, 0, 1, 3);
+ layout0->addWidget(_3d_ready_sync_box, 9, 0, 1, 3);
+ layout0->addWidget(_inhibit_screensaver_box, 10, 0, 1, 3);
 QGridLayout *layout1 = new QGridLayout();
 layout1->addWidget(ok_btn, 0, 0);
 QGridLayout *layout = new QGridLayout();
@@ -1162,6 +1174,7 @@
 _flop_left_box->setChecked(dispatch::parameters().fullscreen_flop_left());
 _flip_right_box->setChecked(dispatch::parameters().fullscreen_flip_right());
 _flop_right_box->setChecked(dispatch::parameters().fullscreen_flop_right());
+ _3d_ready_sync_box->setChecked(dispatch::parameters().fullscreen_3d_ready_sync());
 #ifdef Q_WS_X11
 _inhibit_screensaver_box->setChecked(dispatch::parameters().fullscreen_inhibit_screensaver());
 #else
@@ -1198,6 +1211,8 @@
 send_cmd(command::set_fullscreen_flop_left, _flop_left_box->isChecked());
 send_cmd(command::set_fullscreen_flip_right, _flip_right_box->isChecked());
 send_cmd(command::set_fullscreen_flop_right, _flop_right_box->isChecked());
+ // 3d ready sync
+ send_cmd(command::set_fullscreen_3d_ready_sync, _3d_ready_sync_box->isChecked());
 // inhibit_screensaver
 send_cmd(command::set_fullscreen_inhibit_screensaver, _inhibit_screensaver_box->isChecked());
 
@@ -1559,7 +1574,7 @@
 void audio_dialog::delay_changed()
 {
 if (!_lock)
- send_cmd(command::set_audio_delay, _delay_spinbox->value() * 1000);
+ send_cmd(command::set_audio_delay, static_cast<int64_t>(_delay_spinbox->value() * 1000));
 }
 
 void audio_dialog::receive_notification(const notification &note)
@@ -1588,7 +1603,9 @@
 setModal(false);
 setWindowTitle(_("Subtitle Settings"));
 
- QLabel *info_label = new QLabel(_("These settings apply to soft subtitles, but not to bitmaps."));
+ QLabel *info_label = new QLabel(_(
+ "These settings apply only to soft subtitles, not to bitmaps. "
+ "Some changes require a restart of the video to take effect."));
 
 _encoding_checkbox = new QCheckBox(_("Encoding:"));
 _encoding_checkbox->setToolTip(_("Set the subtitle character set encoding."));
@@ -1649,6 +1666,17 @@
 ? 0xffffffu : dispatch::parameters().subtitle_color());
 connect(_color_button, SIGNAL(clicked()), this, SLOT(color_button_clicked()));
 
+ _shadow_checkbox = new QCheckBox(_("Override shadow:"));
+ _shadow_checkbox->setToolTip(_("Override the subtitle shadow."));
+ _shadow_checkbox->setChecked(dispatch::parameters().subtitle_shadow() != -1);
+ connect(_shadow_checkbox, SIGNAL(stateChanged(int)), this, SLOT(shadow_changed()));
+ _shadow_combobox = new QComboBox();
+ _shadow_combobox->setToolTip(_shadow_checkbox->toolTip());
+ _shadow_combobox->addItem(_("On"));
+ _shadow_combobox->addItem(_("Off"));
+ _shadow_combobox->setCurrentIndex(dispatch::parameters().subtitle_shadow() == 0 ? 1 : 0);
+ connect(_shadow_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(shadow_changed()));
+
 QPushButton *ok_button = new QPushButton(_("OK"));
 connect(ok_button, SIGNAL(clicked()), this, SLOT(close()));
 
@@ -1664,7 +1692,9 @@
 layout->addWidget(_scale_spinbox, 4, 1);
 layout->addWidget(_color_checkbox, 5, 0);
 layout->addWidget(_color_button, 5, 1);
- layout->addWidget(ok_button, 6, 0, 1, 2);
+ layout->addWidget(_shadow_checkbox, 6, 0);
+ layout->addWidget(_shadow_combobox, 6, 1);
+ layout->addWidget(ok_button, 7, 0, 1, 2);
 setLayout(layout);
 }
 
@@ -1789,74 +1819,64 @@
 }
 }
 
+void subtitle_dialog::shadow_changed()
+{
+ if (!_lock)
+ send_cmd(command::set_subtitle_shadow, _shadow_checkbox->isChecked()
+ ? 1 - _shadow_combobox->currentIndex() : -1);
+}
+
 void subtitle_dialog::receive_notification(const notification &note)
 {
+ std::string s;
+ int i;
+ float f;
+ uint64_t c;
+
+ _lock = true;
 switch (note.type)
 {
 case notification::subtitle_encoding:
- {
- std::string encoding = dispatch::parameters().subtitle_encoding();
- _lock = true;
- _encoding_checkbox->setChecked(encoding != "");
- if (encoding != "")
- {
- _encoding_combobox->setCurrentIndex(_encoding_combobox->findText(encoding.c_str()));
- }
- _lock = false;
- }
+ s = dispatch::parameters().subtitle_encoding();
+ _encoding_checkbox->setChecked(!s.empty());
+ if (!s.empty())
+ _encoding_combobox->setCurrentIndex(_encoding_combobox->findText(s.c_str()));
 break;
 case notification::subtitle_font:
- {
- std::string font = dispatch::parameters().subtitle_font();
- _lock = true;
- _font_checkbox->setChecked(font != "");
- if (font != "")
- {
- _font_combobox->setCurrentFont(QFont(QString(font.c_str())));
- }
- _lock = false;
- }
+ s = dispatch::parameters().subtitle_font();
+ _font_checkbox->setChecked(!s.empty());
+ if (!s.empty())
+ _font_combobox->setCurrentFont(QFont(QString(s.c_str())));
 break;
 case notification::subtitle_size:
- {
- int size = dispatch::parameters().subtitle_size();
- _lock = true;
- _size_checkbox->setChecked(size > 0);
- if (size > 0)
- {
- _size_spinbox->setValue(size);
- }
- _lock = false;
- }
+ i = dispatch::parameters().subtitle_size();
+ _size_checkbox->setChecked(i > 0);
+ if (i > 0)
+ _size_spinbox->setValue(i);
 break;
 case notification::subtitle_scale:
- {
- float scale = dispatch::parameters().subtitle_scale();
- _lock = true;
- _scale_checkbox->setChecked(scale >= 0.0f);
- if (scale >= 0.0f)
- {
- _scale_spinbox->setValue(scale);
- }
- _lock = false;
- }
+ f = dispatch::parameters().subtitle_scale();
+ _scale_checkbox->setChecked(f >= 0.0f);
+ if (f >= 0.0f)
+ _scale_spinbox->setValue(f);
 break;
 case notification::subtitle_color:
- {
- uint64_t color = dispatch::parameters().subtitle_color();
- _lock = true;
- _color_checkbox->setChecked(color <= std::numeric_limits<uint32_t>::max());
- if (color <= std::numeric_limits<uint32_t>::max())
- {
- set_color_button(color);
- }
- _lock = false;
- }
+ c = dispatch::parameters().subtitle_color();
+ _color_checkbox->setChecked(c <= std::numeric_limits<uint32_t>::max());
+ if (c <= std::numeric_limits<uint32_t>::max())
+ set_color_button(c);
+ break;
+ case notification::subtitle_shadow:
+ i = dispatch::parameters().subtitle_shadow();
+ _shadow_checkbox->setChecked(i >= 0);
+ if (i >= 0)
+ _shadow_combobox->setCurrentIndex(1 - i);
 break;
 default:
 /* not handled */
 break;
 }
+ _lock = false;
 }
 
 
@@ -2048,37 +2068,530 @@
 }
 }
 
+
+sdi_output_dialog::sdi_output_dialog(QWidget *parent) : QDialog(parent),
+ _lock(false)
+{
+#if HAVE_LIBXNVCTRL
+
+ setModal(false);
+ setWindowTitle(_("SDI Output Settings"));
+
+ QLabel *sdi_output_format_label = new QLabel(_("SDI Output Format:"));
+ sdi_output_format_label->setToolTip(_("Select output format used for SDI output."));
+ _sdi_output_format_combobox = new QComboBox();
+ _sdi_output_format_combobox->setToolTip(sdi_output_format_label->toolTip());
+ for (int i=NV_CTRL_GVIO_VIDEO_FORMAT_487I_59_94_SMPTE259_NTSC; i < NV_CTRL_GVIO_VIDEO_FORMAT_2048I_47_96_SMPTE372+1; ++i) {
+ _sdi_output_format_combobox->addItem(decodeSignalFormat(i));
+ }
+ connect(_sdi_output_format_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(sdi_output_format_changed(int)));
+
+ QLabel *sdi_output_left_stereo_mode_label = new QLabel(_("Left stereo mode:"));
+ sdi_output_left_stereo_mode_label->setToolTip(_("Select stereo mode used for left SDI output."));
+ _sdi_output_left_stereo_mode_combobox = new QComboBox();
+ _sdi_output_left_stereo_mode_combobox->setToolTip(sdi_output_left_stereo_mode_label->toolTip());
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-mono-left.png"), _("Left view"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-mono-right.png"), _("Right view"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-top-bottom.png"), _("Top/bottom"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-top-bottom-half.png"), _("Top/bottom, half height"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-left-right.png"), _("Left/right"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-left-right-half.png"), _("Left/right, half width"));
+ _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"));
+ 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:"));
+ sdi_output_right_stereo_mode_label->setToolTip(_("Select stereo mode used for right SDI output."));
+ _sdi_output_right_stereo_mode_combobox = new QComboBox();
+ _sdi_output_right_stereo_mode_combobox->setToolTip(sdi_output_right_stereo_mode_label->toolTip());
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-mono-left.png"), _("Left view"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-mono-right.png"), _("Right view"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-top-bottom.png"), _("Top/bottom"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-top-bottom-half.png"), _("Top/bottom, half height"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-left-right.png"), _("Left/right"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-left-right-half.png"), _("Left/right, half width"));
+ _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"));
+ 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"));
+ ok_button->setDefault(true);
+ connect(ok_button, SIGNAL(clicked()), this, SLOT(close()));
+
+ QGridLayout *layout = new QGridLayout;
+ layout->addWidget(sdi_output_format_label, 0, 0);
+ layout->addWidget(_sdi_output_format_combobox, 0, 1, 1, 1);
+ layout->addWidget(sdi_output_left_stereo_mode_label, 1, 0);
+ layout->addWidget(_sdi_output_left_stereo_mode_combobox, 1, 1);
+ layout->addWidget(sdi_output_right_stereo_mode_label, 2, 0);
+ layout->addWidget(_sdi_output_right_stereo_mode_combobox, 2, 1);
+ layout->addWidget(ok_button, 3, 0, 1, 2);
+ setLayout(layout);
+
+ update();
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::update()
+{
+#if HAVE_LIBXNVCTRL
+ _lock = true;
+ set_sdi_output_format(dispatch::parameters().sdi_output_format());
+ set_sdi_output_left_stereo_mode(dispatch::parameters().sdi_output_left_stereo_mode());
+ set_sdi_output_right_stereo_mode(dispatch::parameters().sdi_output_right_stereo_mode());
+ _lock = false;
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::set_sdi_output_format(int val)
+{
+#if HAVE_LIBXNVCTRL
+ _sdi_output_format_combobox->setCurrentIndex(val-1);
+#else
+ (void)val;
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::set_sdi_output_left_stereo_mode(parameters::stereo_mode_t stereo_mode)
+{
+#if HAVE_LIBXNVCTRL
+ switch (stereo_mode)
+ {
+ default:
+ case parameters::mode_mono_left:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(0);
+ break;
+ case parameters::mode_mono_right:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(1);
+ break;
+ case parameters::mode_top_bottom:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(2);
+ break;
+ case parameters::mode_top_bottom_half:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(3);
+ break;
+ case parameters::mode_left_right:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(4);
+ break;
+ case parameters::mode_left_right_half:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(5);
+ break;
+ case parameters::mode_even_odd_rows:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(6);
+ break;
+ case parameters::mode_even_odd_columns:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(7);
+ break;
+ case parameters::mode_checkerboard:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(8);
+ break;
+ case parameters::mode_red_cyan_monochrome:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(9);
+ break;
+ case parameters::mode_red_cyan_half_color:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(10);
+ break;
+ case parameters::mode_red_cyan_full_color:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(11);
+ break;
+ case parameters::mode_red_cyan_dubois:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(12);
+ break;
+ case parameters::mode_green_magenta_monochrome:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(13);
+ break;
+ case parameters::mode_green_magenta_half_color:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(14);
+ break;
+ case parameters::mode_green_magenta_full_color:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(15);
+ break;
+ case parameters::mode_green_magenta_dubois:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(16);
+ break;
+ case parameters::mode_amber_blue_monochrome:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(17);
+ break;
+ case parameters::mode_amber_blue_half_color:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(18);
+ break;
+ case parameters::mode_amber_blue_full_color:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(19);
+ break;
+ case parameters::mode_amber_blue_dubois:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(20);
+ break;
+ case parameters::mode_red_green_monochrome:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(21);
+ break;
+ case parameters::mode_red_blue_monochrome:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(22);
+ break;
+ }
+#else
+ (void)stereo_mode;
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::set_sdi_output_right_stereo_mode(parameters::stereo_mode_t stereo_mode)
+{
+#if HAVE_LIBXNVCTRL
+ switch (stereo_mode)
+ {
+ default:
+ case parameters::mode_mono_left:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(0);
+ break;
+ case parameters::mode_mono_right:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(1);
+ break;
+ case parameters::mode_top_bottom:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(2);
+ break;
+ case parameters::mode_top_bottom_half:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(3);
+ break;
+ case parameters::mode_left_right:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(4);
+ break;
+ case parameters::mode_left_right_half:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(5);
+ break;
+ case parameters::mode_even_odd_rows:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(6);
+ break;
+ case parameters::mode_even_odd_columns:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(7);
+ break;
+ case parameters::mode_checkerboard:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(8);
+ break;
+ case parameters::mode_red_cyan_monochrome:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(9);
+ break;
+ case parameters::mode_red_cyan_half_color:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(10);
+ break;
+ case parameters::mode_red_cyan_full_color:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(11);
+ break;
+ case parameters::mode_red_cyan_dubois:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(12);
+ break;
+ case parameters::mode_green_magenta_monochrome:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(13);
+ break;
+ case parameters::mode_green_magenta_half_color:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(14);
+ break;
+ case parameters::mode_green_magenta_full_color:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(15);
+ break;
+ case parameters::mode_green_magenta_dubois:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(16);
+ break;
+ case parameters::mode_amber_blue_monochrome:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(17);
+ break;
+ case parameters::mode_amber_blue_half_color:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(18);
+ break;
+ case parameters::mode_amber_blue_full_color:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(19);
+ break;
+ case parameters::mode_amber_blue_dubois:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(20);
+ break;
+ case parameters::mode_red_green_monochrome:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(21);
+ break;
+ case parameters::mode_red_blue_monochrome:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(22);
+ break;
+ }
+#else
+ (void)stereo_mode;
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::sdi_output_format_changed(int val)
+{
+#if HAVE_LIBXNVCTRL
+ if (!_lock)
+ send_cmd(command::set_sdi_output_format, val+1);
+#else
+ (void)val;
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::sdi_output_left_stereo_mode_changed(int val)
+{
+#if HAVE_LIBXNVCTRL
+ parameters::stereo_mode_t stereo_mode;
+
+ switch (val)
+ {
+ case 0:
+ stereo_mode = parameters::mode_mono_left;
+ break;
+ case 1:
+ stereo_mode = parameters::mode_mono_right;
+ break;
+ case 2:
+ stereo_mode = parameters::mode_top_bottom;
+ break;
+ case 3:
+ stereo_mode = parameters::mode_top_bottom_half;
+ break;
+ case 4:
+ stereo_mode = parameters::mode_left_right;
+ break;
+ case 5:
+ stereo_mode = parameters::mode_left_right_half;
+ break;
+ case 6:
+ stereo_mode = parameters::mode_even_odd_rows;
+ break;
+ case 7:
+ stereo_mode = parameters::mode_even_odd_columns;
+ break;
+ case 8:
+ stereo_mode = parameters::mode_checkerboard;
+ break;
+ case 9:
+ stereo_mode = parameters::mode_red_cyan_monochrome;
+ break;
+ case 10:
+ stereo_mode = parameters::mode_red_cyan_half_color;
+ break;
+ case 11:
+ stereo_mode = parameters::mode_red_cyan_full_color;
+ break;
+ case 12:
+ stereo_mode = parameters::mode_red_cyan_dubois;
+ break;
+ case 13:
+ stereo_mode = parameters::mode_green_magenta_monochrome;
+ break;
+ case 14:
+ stereo_mode = parameters::mode_green_magenta_half_color;
+ break;
+ case 15:
+ stereo_mode = parameters::mode_green_magenta_full_color;
+ break;
+ case 16:
+ stereo_mode = parameters::mode_green_magenta_dubois;
+ break;
+ case 17:
+ stereo_mode = parameters::mode_amber_blue_monochrome;
+ break;
+ case 18:
+ stereo_mode = parameters::mode_amber_blue_half_color;
+ break;
+ case 19:
+ stereo_mode = parameters::mode_amber_blue_full_color;
+ break;
+ case 20:
+ stereo_mode = parameters::mode_amber_blue_dubois;
+ break;
+ case 21:
+ stereo_mode = parameters::mode_red_green_monochrome;
+ break;
+ case 22:
+ stereo_mode = parameters::mode_red_blue_monochrome;
+ break;
+ }
+
+ if (!_lock)
+ send_cmd(command::set_sdi_output_left_stereo_mode, static_cast<int>(stereo_mode));
+#else
+ (void)val;
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::sdi_output_right_stereo_mode_changed(int val)
+{
+#if HAVE_LIBXNVCTRL
+ parameters::stereo_mode_t stereo_mode;
+
+ switch (val)
+ {
+ case 0:
+ stereo_mode = parameters::mode_mono_left;
+ break;
+ case 1:
+ stereo_mode = parameters::mode_mono_right;
+ break;
+ case 2:
+ stereo_mode = parameters::mode_top_bottom;
+ break;
+ case 3:
+ stereo_mode = parameters::mode_top_bottom_half;
+ break;
+ case 4:
+ stereo_mode = parameters::mode_left_right;
+ break;
+ case 5:
+ stereo_mode = parameters::mode_left_right_half;
+ break;
+ case 6:
+ stereo_mode = parameters::mode_even_odd_rows;
+ break;
+ case 7:
+ stereo_mode = parameters::mode_even_odd_columns;
+ break;
+ case 8:
+ stereo_mode = parameters::mode_checkerboard;
+ break;
+ case 9:
+ stereo_mode = parameters::mode_red_cyan_monochrome;
+ break;
+ case 10:
+ stereo_mode = parameters::mode_red_cyan_half_color;
+ break;
+ case 11:
+ stereo_mode = parameters::mode_red_cyan_full_color;
+ break;
+ case 12:
+ stereo_mode = parameters::mode_red_cyan_dubois;
+ break;
+ case 13:
+ stereo_mode = parameters::mode_green_magenta_monochrome;
+ break;
+ case 14:
+ stereo_mode = parameters::mode_green_magenta_half_color;
+ break;
+ case 15:
+ stereo_mode = parameters::mode_green_magenta_full_color;
+ break;
+ case 16:
+ stereo_mode = parameters::mode_green_magenta_dubois;
+ break;
+ case 17:
+ stereo_mode = parameters::mode_amber_blue_monochrome;
+ break;
+ case 18:
+ stereo_mode = parameters::mode_amber_blue_half_color;
+ break;
+ case 19:
+ stereo_mode = parameters::mode_amber_blue_full_color;
+ break;
+ case 20:
+ stereo_mode = parameters::mode_amber_blue_dubois;
+ break;
+ case 21:
+ stereo_mode = parameters::mode_red_green_monochrome;
+ break;
+ case 22:
+ stereo_mode = parameters::mode_red_blue_monochrome;
+ break;
+ }
+
+ if (!_lock)
+ send_cmd(command::set_sdi_output_right_stereo_mode, static_cast<int>(stereo_mode));
+#else
+ (void)val;
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::receive_notification(const notification &note)
+{
+#if HAVE_LIBXNVCTRL
+ switch (note.type)
+ {
+ case notification::sdi_output_format:
+ update();
+ break;
+ case notification::sdi_output_left_stereo_mode:
+ update();
+ break;
+ case notification::sdi_output_right_stereo_mode:
+ update();
+ break;
+ default:
+ /* not handled */
+ break;
+ }
+#else
+ (void)note;
+#endif // HAVE_LIBXNVCTRL
+}
+
+
 open_device_dialog::open_device_dialog(
 const QStringList &default_devices,
 const QStringList &firewire_devices,
- const QString &x11_device,
+ const QStringList &last_devices,
 const device_request &dev_request,
 QWidget *parent) :
 QDialog(parent)
 {
- setWindowTitle(_("Open device"));
+ setWindowTitle(_("Open device(s)"));
 
 _type_combobox = new QComboBox();
 _type_combobox->setToolTip(_("Choose a device type."));
 _type_combobox->addItem(_("Default"));
 _type_combobox->addItem(_("Firewire"));
 _type_combobox->addItem(_("X11"));
- _default_device_combobox = new QComboBox();
- _default_device_combobox->setToolTip(_("Choose a device."));
- _default_device_combobox->addItems(default_devices);
- _firewire_device_combobox = new QComboBox();
- _firewire_device_combobox->setToolTip(_("Choose a device."));
- _firewire_device_combobox->addItems(firewire_devices);
- _x11_device_field = new QLineEdit(x11_device);
- _x11_device_field->setToolTip(_("Set the X11 device string. "
- "Refer to the manual for details."));
- _device_chooser_stack = new QStackedWidget();
- _device_chooser_stack->addWidget(_default_device_combobox);
- _device_chooser_stack->addWidget(_firewire_device_combobox);
- _device_chooser_stack->addWidget(_x11_device_field);
- connect(_type_combobox, SIGNAL(currentIndexChanged(int)), _device_chooser_stack, SLOT(setCurrentIndex(int)));
+ for (int i = 0; i < 2; i++) {
+ _default_device_combobox[i] = new QComboBox();
+ _default_device_combobox[i]->setToolTip(_("Choose a device."));
+ _default_device_combobox[i]->addItems(default_devices);
+ _firewire_device_combobox[i] = new QComboBox();
+ _firewire_device_combobox[i]->setToolTip(_("Choose a device."));
+ _firewire_device_combobox[i]->addItems(firewire_devices);
+ _x11_device_field[i] = new QLineEdit();
+ _x11_device_field[i]->setToolTip(_("Set the X11 device string. "
+ "Refer to the manual for details."));
+ _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]);
+ }
+ }
+ connect(_type_combobox, SIGNAL(currentIndexChanged(int)), _device_chooser_stack[0], SLOT(setCurrentIndex(int)));
+ connect(_type_combobox, SIGNAL(currentIndexChanged(int)), _device_chooser_stack[1], SLOT(setCurrentIndex(int)));
 _type_combobox->setCurrentIndex(dev_request.device == device_request::firewire ? 1
 : dev_request.device == device_request::x11 ? 2 : 0);
+ QLabel *first_device_label = new QLabel(_("First device:"));
+ _second_device_checkbox = new QCheckBox(_("Second device:"));
+ _second_device_checkbox->setChecked(last_devices.size() > 1);
+ _device_chooser_stack[1]->setEnabled(last_devices.size() > 1);
+ connect(_second_device_checkbox, SIGNAL(toggled(bool)), _device_chooser_stack[1], SLOT(setEnabled(bool)));
 _frame_size_groupbox = new QGroupBox(_("Request frame size"));
 _frame_size_groupbox->setToolTip(_("Request a specific frame size from the device, e.g. 640x480. "
 "The device must support this frame size. Some devices require a frame size to be selected."));
@@ -2103,6 +2616,10 @@
 _frame_rate_den_spinbox = new QSpinBox();
 _frame_rate_den_spinbox->setRange(_frame_rate_groupbox->isChecked() ? 1 : 0, 65535);
 _frame_rate_den_spinbox->setValue(dev_request.frame_rate_den);
+ _mjpeg_checkbox = new QCheckBox(_("Request MJPEG format"));
+ _mjpeg_checkbox->setToolTip(_("Request MJPEG data from the input device. "
+ "The device may ignore this request."));
+ _mjpeg_checkbox->setChecked(dev_request.request_mjpeg);
 QPushButton *cancel_btn = new QPushButton(_("Cancel"));
 connect(cancel_btn, SIGNAL(clicked()), this, SLOT(reject()));
 QPushButton *ok_btn = new QPushButton(_("OK"));
@@ -2121,11 +2638,15 @@
 
 QGridLayout *layout = new QGridLayout;
 layout->addWidget(_type_combobox, 0, 0, 1, 2);
- layout->addWidget(_device_chooser_stack, 1, 0, 1, 2);
- layout->addWidget(_frame_size_groupbox, 2, 0, 1, 2);
- layout->addWidget(_frame_rate_groupbox, 3, 0, 1, 2);
- layout->addWidget(cancel_btn, 4, 0);
- layout->addWidget(ok_btn, 4, 1);
+ layout->addWidget(first_device_label, 1, 0);
+ layout->addWidget(_device_chooser_stack[0], 1, 1);
+ layout->addWidget(_second_device_checkbox, 2, 0);
+ layout->addWidget(_device_chooser_stack[1], 2, 1);
+ layout->addWidget(_frame_size_groupbox, 3, 0, 1, 2);
+ layout->addWidget(_frame_rate_groupbox, 4, 0, 1, 2);
+ layout->addWidget(_mjpeg_checkbox, 5, 0, 1, 2);
+ layout->addWidget(cancel_btn, 6, 0);
+ layout->addWidget(ok_btn, 6, 1);
 layout->setRowStretch(1, 1);
 setLayout(layout);
 }
@@ -2146,27 +2667,34 @@
 _frame_rate_den_spinbox->setValue(checked ? 1 : 0);
 }
 
-void open_device_dialog::request(QString &device, device_request &dev_request)
+void open_device_dialog::request(QStringList &devices, device_request &dev_request)
 {
 if (_type_combobox->currentIndex() == 1)
 {
 dev_request.device = device_request::firewire;
- device = _firewire_device_combobox->currentText();
+ devices.push_back(_firewire_device_combobox[0]->currentText());
+ if (_second_device_checkbox->isChecked())
+ devices.push_back(_firewire_device_combobox[1]->currentText());
 }
 else if (_type_combobox->currentIndex() == 2)
 {
 dev_request.device = device_request::x11;
- device = _x11_device_field->text();
+ devices.push_back(_x11_device_field[0]->text());
+ if (_second_device_checkbox->isChecked())
+ devices.push_back(_x11_device_field[1]->text());
 }
 else
 {
 dev_request.device = device_request::sys_default;
- device = _default_device_combobox->currentText();
+ devices.push_back(_default_device_combobox[0]->currentText());
+ if (_second_device_checkbox->isChecked())
+ devices.push_back(_default_device_combobox[1]->currentText());
 }
 dev_request.width = _frame_size_groupbox->isChecked() ? _frame_width_spinbox->value() : 0;
 dev_request.height = _frame_size_groupbox->isChecked() ? _frame_height_spinbox->value() : 0;
 dev_request.frame_rate_num = _frame_rate_groupbox->isChecked() ? _frame_rate_num_spinbox->value() : 0;
 dev_request.frame_rate_den = _frame_rate_groupbox->isChecked() ? _frame_rate_den_spinbox->value() : 0;
+ dev_request.request_mjpeg = _mjpeg_checkbox->isChecked();
 }
 
 main_window::main_window(QSettings *settings) :
@@ -2178,6 +2706,9 @@
 _audio_dialog(NULL),
 _subtitle_dialog(NULL),
 _video_dialog(NULL),
+#if HAVE_LIBXNVCTRL
+ _sdi_output_dialog(NULL),
+#endif // HAVE_LIBXNVCTRL
 _max_recent_files(5)
 {
 // Application properties
@@ -2242,8 +2773,18 @@
 send_cmd(command::set_fullscreen_flop_right, session_params.fullscreen_flop_right());
 if (!dispatch::parameters().fullscreen_inhibit_screensaver_is_set() && !session_params.fullscreen_inhibit_screensaver_is_default())
 send_cmd(command::set_fullscreen_inhibit_screensaver, session_params.fullscreen_inhibit_screensaver());
+ if (!dispatch::parameters().fullscreen_3d_ready_sync_is_set() && !session_params.fullscreen_3d_ready_sync_is_default())
+ send_cmd(command::set_fullscreen_3d_ready_sync, session_params.fullscreen_3d_ready_sync());
 if (!dispatch::parameters().zoom_is_set() && !session_params.zoom_is_default())
 send_cmd(command::set_zoom, session_params.zoom());
+#if HAVE_LIBXNVCTRL
+ if (!dispatch::parameters().sdi_output_format_is_set() && !session_params.sdi_output_format_is_default())
+ send_cmd(command::set_sdi_output_format, session_params.sdi_output_format());
+ if (!dispatch::parameters().sdi_output_left_stereo_mode_is_set() && !session_params.sdi_output_left_stereo_mode_is_default())
+ send_cmd(command::set_sdi_output_left_stereo_mode, session_params.sdi_output_left_stereo_mode());
+ if (!dispatch::parameters().sdi_output_right_stereo_mode_is_set() && !session_params.sdi_output_right_stereo_mode_is_default())
+ send_cmd(command::set_sdi_output_right_stereo_mode, session_params.sdi_output_right_stereo_mode());
+#endif // HAVE_LIBXNVCTRL
 }
 else
 {
@@ -2384,7 +2925,7 @@
 file_open_urls_act->setIcon(get_icon("document-open"));
 connect(file_open_urls_act, SIGNAL(triggered()), this, SLOT(file_open_urls()));
 file_menu->addAction(file_open_urls_act);
- QAction *file_open_device_act = new QAction(_("Open &device..."), this);
+ QAction *file_open_device_act = new QAction(_("Open &device(s)..."), this);
 file_open_device_act->setIcon(get_icon("camera-web"));
 connect(file_open_device_act, SIGNAL(triggered()), this, SLOT(file_open_device()));
 file_menu->addAction(file_open_device_act);
@@ -2441,6 +2982,12 @@
 QAction *preferences_video_act = new QAction(_("Current &Video Settings..."), this);
 connect(preferences_video_act, SIGNAL(triggered()), this, SLOT(preferences_video()));
 preferences_menu->addAction(preferences_video_act);
+#if HAVE_LIBXNVCTRL
+ preferences_menu->addSeparator();
+ QAction *preferences_sdi_output_act = new QAction(_("SDI &Output Settings..."), this);
+ connect(preferences_sdi_output_act, SIGNAL(triggered()), this, SLOT(preferences_sdi_output()));
+ preferences_menu->addAction(preferences_sdi_output_act);
+#endif // HAVE_LIBXNVCTRL
 QMenu *help_menu = menuBar()->addMenu(_("&Help"));
 QAction *help_manual_act = new QAction(_("&Manual..."), this);
 help_manual_act->setShortcut(QKeySequence::HelpContents);
@@ -2466,10 +3013,6 @@
 // Handle Drop events
 setAcceptDrops(true);
 
- // Update widget contents
- _in_out_widget->update();
- _controls_widget->update();
-
 // Restore Mainwindow state
 _settings->beginGroup("Mainwindow");
 restoreGeometry(_settings->value("geometry").toByteArray());
@@ -2562,8 +3105,6 @@
 QApplication::quit();
 break;
 case notification::play:
- _in_out_widget->update();
- _controls_widget->update();
 if (dispatch::playing()) {
 // Force a size adjustment of the main window
 adjustSize();
@@ -2621,6 +3162,11 @@
 }
 }
 
+void main_window::moveEvent(QMoveEvent*)
+{
+ send_cmd(command::update_display_pos);
+}
+
 void main_window::closeEvent(QCloseEvent *event)
 {
 // Stop the event and play loop
@@ -2846,7 +3392,6 @@
 // Gather list of available devices
 QStringList default_devices;
 QStringList firewire_devices;
- QString x11_device;
 #ifdef Q_OS_WIN
 // libavdevice supports devices "0" through "9" in the vfwcap driver on Windows.
 // Simply list them all here since I don't know how to find out which are actually available.
@@ -2873,11 +3418,17 @@
 }
 firewire_devices << "/dev/video1394"; // TODO: this is probably not correct
 #endif
- x11_device = _settings->value("Session/device-x11", QString(":0.0+400,300")).toString();
 
 // Get saved settings
+ QStringList last_devices;
 device_request dev_request;
 _settings->beginGroup("Session");
+ last_devices = _settings->value("device-last").toStringList();
+ if (last_devices.empty() && _settings->contains("device-x11")) {
+ // For compatibility with Bino <= 1.3.2:
+ last_devices.push_back(_settings->value("device-x11").toString());
+ _settings->remove("device-x11");
+ }
 QString saved_type = _settings->value("device-type", QString("default")).toString();
 dev_request.device = (saved_type == "firewire" ? device_request::firewire
 : saved_type == "x11" ? device_request::x11 : device_request::sys_default);
@@ -2885,34 +3436,33 @@
 dev_request.height = _settings->value("device-request-frame-height", QString("0")).toInt();
 dev_request.frame_rate_num = _settings->value("device-request-frame-rate-num", QString("0")).toInt();
 dev_request.frame_rate_den = _settings->value("device-request-frame-rate-den", QString("0")).toInt();
+ dev_request.request_mjpeg = _settings->value("device-request-mjpeg", QString("0")).toInt();
 _settings->endGroup();
 
 // Run dialog
- open_device_dialog *dlg = new open_device_dialog(default_devices, firewire_devices, x11_device, dev_request, this);
+ open_device_dialog *dlg = new open_device_dialog(default_devices, firewire_devices, last_devices, dev_request, this);
 dlg->exec();
 if (dlg->result() != QDialog::Accepted)
 {
 return;
 }
- QString device;
- dlg->request(device, dev_request);
+ QStringList devices;
+ dlg->request(devices, dev_request);
 
 // Save settings
- if (dev_request.device == device_request::x11)
- {
- _settings->setValue("Session/device-x11", device);
- }
 _settings->beginGroup("Session");
+ _settings->setValue("device-last", devices);
 _settings->setValue("device-type", QString(dev_request.device == device_request::firewire ? "firewire"
 : dev_request.device == device_request::x11 ? "x11" : "default"));
 _settings->setValue("device-request-frame-width", QVariant(dev_request.width).toString());
 _settings->setValue("device-request-frame-height", QVariant(dev_request.height).toString());
 _settings->setValue("device-request-frame-rate-num", QVariant(dev_request.frame_rate_num).toString());
 _settings->setValue("device-request-frame-rate-den", QVariant(dev_request.frame_rate_den).toString());
+ _settings->setValue("device-request-mjpeg", QVariant(dev_request.request_mjpeg ? 1 : 0).toString());
 _settings->endGroup();
 
 // Open device
- open(QStringList(device), dev_request);
+ open(devices, dev_request);
 }
 
 void main_window::preferences_fullscreen()
@@ -2990,6 +3540,19 @@
 _video_dialog->activateWindow();
 }
 
+void main_window::preferences_sdi_output()
+{
+#if HAVE_LIBXNVCTRL
+ if (!_sdi_output_dialog)
+ {
+ _sdi_output_dialog = new sdi_output_dialog(this);
+ }
+ _sdi_output_dialog->show();
+ _sdi_output_dialog->raise();
+ _sdi_output_dialog->activateWindow();
+#endif // HAVE_LIBXNVCTRL
+}
+
 void main_window::help_manual()
 {
 QUrl manual_url;
@@ -3027,7 +3590,7 @@
 "<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</td><td>" + _("Swap left/right eye.") + "</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>"

bino-1.3.2.tar.xz/src/gui.h -> bino-1.3.3.tar.xz/src/gui.h Changed

@@ -6,6 +6,7 @@
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
 * Joe <cuchac@email.cz>
 * Daniel Schaal <farbing@web.de>
+ * Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -21,8 +22,10 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef PLAYER_GUI_H
-#define PLAYER_GUI_H
+#ifndef GUI_H
+#define GUI_H
+
+#include "config.h"
 
 #include <QMainWindow>
 #include <QWidget>
@@ -73,7 +76,6 @@
 
 public:
 in_out_widget(QSettings *settings, QWidget *parent);
- virtual ~in_out_widget();
 
 void update();
 
@@ -133,7 +135,6 @@
 
 public:
 controls_widget(QSettings *settings, QWidget *parent);
- virtual ~controls_widget();
 
 void update();
 virtual void receive_notification(const notification &note);
@@ -155,6 +156,7 @@
 QCheckBox* _flop_left_box;
 QCheckBox* _flip_right_box;
 QCheckBox* _flop_right_box;
+ QCheckBox* _3d_ready_sync_box;
 QCheckBox* _inhibit_screensaver_box;
 
 public:
@@ -266,6 +268,8 @@
 QDoubleSpinBox *_scale_spinbox;
 QCheckBox *_color_checkbox;
 QPushButton *_color_button;
+ QCheckBox *_shadow_checkbox;
+ QComboBox *_shadow_combobox;
 QColor _color;
 
 QList<QTextCodec *> find_codecs();
@@ -278,6 +282,7 @@
 void size_changed();
 void scale_changed();
 void color_changed();
+ void shadow_changed();
 
 public:
 subtitle_dialog(QWidget *parent);
@@ -317,22 +322,50 @@
 virtual void receive_notification(const notification &note);
 };
 
+class sdi_output_dialog : public QDialog, public controller
+{
+ Q_OBJECT
+
+private:
+ bool _lock;
+ QComboBox *_sdi_output_format_combobox;
+ QComboBox *_sdi_output_left_stereo_mode_combobox;
+ QComboBox *_sdi_output_right_stereo_mode_combobox;
+
+ void set_sdi_output_format(int val);
+ void set_sdi_output_left_stereo_mode(parameters::stereo_mode_t stereo_mode);
+ void set_sdi_output_right_stereo_mode(parameters::stereo_mode_t stereo_mode);
+
+private slots:
+ void sdi_output_format_changed(int val);
+ void sdi_output_left_stereo_mode_changed(int val);
+ void sdi_output_right_stereo_mode_changed(int val);
+
+public:
+ sdi_output_dialog(QWidget *parent);
+ void update();
+
+ virtual void receive_notification(const notification &note);
+};
+
 class open_device_dialog : public QDialog
 {
 Q_OBJECT
 
 private:
 QComboBox *_type_combobox;
- QStackedWidget *_device_chooser_stack;
- QComboBox *_default_device_combobox;
- QComboBox *_firewire_device_combobox;
- QLineEdit *_x11_device_field;
+ QStackedWidget *_device_chooser_stack[2];
+ QComboBox *_default_device_combobox[2];
+ QComboBox *_firewire_device_combobox[2];
+ QLineEdit *_x11_device_field[2];
+ QCheckBox *_second_device_checkbox;
 QGroupBox *_frame_size_groupbox;
 QSpinBox *_frame_width_spinbox;
 QSpinBox *_frame_height_spinbox;
 QGroupBox *_frame_rate_groupbox;
 QSpinBox *_frame_rate_num_spinbox;
 QSpinBox *_frame_rate_den_spinbox;
+ QCheckBox *_mjpeg_checkbox;
 
 private slots:
 void frame_size_groupbox_clicked(bool checked);
@@ -340,8 +373,8 @@
 
 public:
 open_device_dialog(const QStringList &default_devices, const QStringList &firewire_devices,
- const QString &x11_device, const device_request &dev_request, QWidget *parent);
- void request(QString &device, device_request &dev_request);
+ const QStringList &last_devices, const device_request &dev_request, QWidget *parent);
+ void request(QStringList &devices, device_request &dev_request);
 };
 
 class main_window : public QMainWindow, public controller
@@ -360,6 +393,9 @@
 audio_dialog *_audio_dialog;
 subtitle_dialog *_subtitle_dialog;
 video_dialog *_video_dialog;
+#if HAVE_LIBXNVCTRL
+ sdi_output_dialog *_sdi_output_dialog;
+#endif // HAVE_LIBXNVCTRL
 QTimer *_timer;
 std::vector<std::string> _now_playing;
 
@@ -384,6 +420,7 @@
 void preferences_audio();
 void preferences_subtitle();
 void preferences_video();
+ void preferences_sdi_output();
 void help_manual();
 void help_website();
 void help_keyboard();
@@ -395,6 +432,7 @@
 protected:
 void dragEnterEvent(QDragEnterEvent *event);
 void dropEvent(QDropEvent *event);
+ void moveEvent(QMoveEvent* event);
 void closeEvent(QCloseEvent *event);
 bool eventFilter(QObject *obj, QEvent *event);

bino-1.3.2.tar.xz/src/lirc.cpp -> bino-1.3.3.tar.xz/src/lirc.cpp Changed

@@ -126,7 +126,7 @@
         while ((e = lirc_code2char(_config, code, &cmd)) == 0 && cmd)
         {
             command c;
-            if (!get_command(cmd, c))
+            if (!dispatch::parse_command(cmd, &c))
             {
                 msg::err(str::asprintf(_("Received invalid command '%s' from LIRC."), str::sanitize(cmd).c_str()));
             }
@@ -142,123 +142,3 @@
         }
     }
 }
-
-bool lircclient::get_command(const std::string &s, command &c)
-{
-    std::string t = str::trim(s);
-    bool ok = true;
-    float parameter;
-
-    if (t == "cycle-video-stream")
-    {
-        c = command(command::cycle_video_stream);
-    }
-    else if (t == "cycle-audio-stream")
-    {
-        c = command(command::cycle_audio_stream);
-    }
-    else if (t == "cycle-subtitle-stream")
-    {
-        c = command(command::cycle_subtitle_stream);
-    }
-    else if (t == "toggle-stereo-mode-swap")
-    {
-        c = command(command::toggle_stereo_mode_swap);
-    }
-    else if (t == "toggle-fullscreen")
-    {
-        c = command(command::toggle_fullscreen);
-    }
-    else if (t == "center")
-    {
-        c = command(command::center);
-    }
-    else if (std::sscanf(t.c_str(), "zoom %f", &parameter) == 1)
-    {
-        c = command(command::adjust_zoom, parameter);
-    }
-    else if (std::sscanf(t.c_str(), "adjust-contrast %f", &parameter) == 1)
-    {
-        c = command(command::adjust_contrast, parameter);
-    }
-    else if (std::sscanf(t.c_str(), "adjust-brightness %f", &parameter) == 1)
-    {
-        c = command(command::adjust_brightness, parameter);
-    }
-    else if (std::sscanf(t.c_str(), "adjust-hue %f", &parameter) == 1)
-    {
-        c = command(command::adjust_hue, parameter);
-    }
-    else if (std::sscanf(t.c_str(), "adjust-saturation %f", &parameter) == 1)
-    {
-        c = command(command::adjust_saturation, parameter);
-    }
-    else if (std::sscanf(t.c_str(), "adjust-parallax %f", &parameter) == 1)
-    {
-        c = command(command::adjust_parallax, parameter);
-    }
-    else if (std::sscanf(t.c_str(), "adjust-subtitle-parallax %f", &parameter) == 1)
-    {
-        c = command(command::adjust_subtitle_parallax, parameter);
-    }
-    else if (std::sscanf(t.c_str(), "seek %f", &parameter) == 1)
-    {
-        c = command(command::seek, parameter);
-    }
-    else if (std::sscanf(t.c_str(), "set-pos %f", &parameter) == 1)
-    {
-        c = command(command::set_pos, parameter);
-    }
-    else if (std::sscanf(t.c_str(), "adjust-audio-volume %f", &parameter) == 1)
-    {
-        c = command(command::adjust_audio_volume, parameter);
-    }
-    else if (t == "toggle-audio-mute")
-    {
-        c = command(command::toggle_audio_mute);
-    }
-    /* The following commands need access to state. */
-    else if (t == "play")
-    {
-        if (!dispatch::playing())
-        {
-            c = command(command::toggle_play);
-        }
-        else if (dispatch::pausing())
-        {
-            c = command(command::toggle_pause);
-        }
-        else
-        {
-            c = command(command::noop);
-        }
-    }
-    else if (t == "pause")
-    {
-        if (dispatch::playing() && !dispatch::pausing())
-        {
-            c = command(command::toggle_pause);
-        }
-        else
-        {
-            c = command(command::noop);
-        }
-    }
-    else if (t == "stop")
-    {
-        if (dispatch::playing())
-        {
-            c = command(command::toggle_play);
-        }
-        else
-        {
-            c = command(command::noop);
-        }
-    }
-    /* No known command. */
-    else
-    {
-        ok = false;
-    }
-    return ok;
-}

bino-1.3.2.tar.xz/src/lirc.h -> bino-1.3.3.tar.xz/src/lirc.h Changed

bino-1.3.2.tar.xz/src/main.cpp -> bino-1.3.3.tar.xz/src/main.cpp Changed

@@ -6,6 +6,7 @@
 * Stefan Eilemann <eile@eyescale.ch>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
 * Joe <cuchac@email.cz>
+ * Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -58,11 +59,16 @@
 #if HAVE_LIBEQUALIZER
 # include "player_equalizer.h"
 #endif
+#include "command_file.h"
 #if HAVE_LIBLIRCCLIENT
 # include "lirc.h"
 #endif
 #include "lib_versions.h"
 
+#if HAVE_LIBXNVCTRL
+#include "NVCtrl.h"
+#endif // HAVE_LIBXNVCTRL
+
 
 /* Return the directory containing our locale data (translated messages). */
 static const char *localedir()
@@ -233,6 +239,13 @@
 opt::tuple<int> device_frame_rate("device-frame-rate", '\0', opt::optional,
 1, std::numeric_limits<int>::max(), std::vector<int>(2, 0), 2, "/");
 options.push_back(&device_frame_rate);
+ std::vector<std::string> device_formats;
+ device_formats.push_back("default");
+ device_formats.push_back("mjpeg");
+ opt::val<std::string> device_format("device-format", '\0', opt::optional, device_formats, "");
+ options.push_back(&device_format);
+ opt::val<std::string> read_commands("read-commands", '\0', opt::optional);
+ options.push_back(&read_commands);
 opt::val<std::string> lirc_config("lirc-config", '\0', opt::optional);
 options.push_back(&lirc_config);
 std::vector<std::string> input_modes;
@@ -259,36 +272,7 @@
 options.push_back(&audio);
 opt::val<int> subtitle("subtitle", 's', opt::optional, 0, 999, 0);
 options.push_back(&subtitle);
- std::vector<std::string> video_output_modes;
- video_output_modes.push_back("stereo");
- video_output_modes.push_back("alternating");
- video_output_modes.push_back("mono-left");
- video_output_modes.push_back("mono-right");
- video_output_modes.push_back("top-bottom");
- video_output_modes.push_back("top-bottom-half");
- video_output_modes.push_back("left-right");
- video_output_modes.push_back("left-right-half");
- video_output_modes.push_back("even-odd-rows");
- video_output_modes.push_back("even-odd-columns");
- video_output_modes.push_back("checkerboard");
- video_output_modes.push_back("hdmi-frame-pack");
- video_output_modes.push_back("red-cyan-monochrome");
- video_output_modes.push_back("red-cyan-half-color");
- video_output_modes.push_back("red-cyan-full-color");
- video_output_modes.push_back("red-cyan-dubois");
- video_output_modes.push_back("green-magenta-monochrome");
- video_output_modes.push_back("green-magenta-half-color");
- video_output_modes.push_back("green-magenta-full-color");
- video_output_modes.push_back("green-magenta-dubois");
- video_output_modes.push_back("amber-blue-monochrome");
- video_output_modes.push_back("amber-blue-half-color");
- video_output_modes.push_back("amber-blue-full-color");
- video_output_modes.push_back("amber-blue-dubois");
- video_output_modes.push_back("red-green-monochrome");
- video_output_modes.push_back("red-blue-monochrome");
- video_output_modes.push_back("equalizer");
- video_output_modes.push_back("equalizer-3d");
- opt::val<std::string> video_output_mode("output", 'o', opt::optional, video_output_modes, "");
+ opt::val<std::string> video_output_mode("output", 'o', opt::optional);
 options.push_back(&video_output_mode);
 opt::flag swap_eyes("swap-eyes", 'S', opt::optional);
 options.push_back(&swap_eyes);
@@ -304,6 +288,8 @@
 options.push_back(&fullscreen_flip_right);
 opt::flag fullscreen_flop_right("fullscreen-flop-right", '\0', opt::optional);
 options.push_back(&fullscreen_flop_right);
+ opt::flag fullscreen_3d_ready_sync("fullscreen-3d-ready-sync", '\0', opt::optional);
+ options.push_back(&fullscreen_3d_ready_sync);
 opt::val<float> zoom("zoom", 'z', opt::optional, 0.0f, 1.0f);
 options.push_back(&zoom);
 opt::tuple<float> crop_aspect_ratio("crop", 'C', opt::optional, 0.0f, 100.0f, std::vector<float>(), 2, ":");
@@ -320,6 +306,8 @@
 options.push_back(&subtitle_scale);
 opt::color subtitle_color("subtitle-color", '\0', opt::optional);
 options.push_back(&subtitle_color);
+ opt::val<int> subtitle_shadow("subtitle-shadow", '\0', opt::optional, -1, 1);
+ options.push_back(&subtitle_shadow);
 opt::val<float> subtitle_parallax("subtitle-parallax", '\0', opt::optional, -1.0f, +1.0f);
 options.push_back(&subtitle_parallax);
 opt::val<float> parallax("parallax", 'P', opt::optional, -1.0f, +1.0f);
@@ -334,6 +322,12 @@
 options.push_back(&swap_interval);
 opt::flag loop("loop", 'l', opt::optional);
 options.push_back(&loop);
+#if HAVE_LIBXNVCTRL
+ opt::val<int> sdi_output_format("sdi-output-format", '\0', opt::optional,
+ NV_CTRL_GVIO_VIDEO_FORMAT_487I_59_94_SMPTE259_NTSC,
+ NV_CTRL_GVIO_VIDEO_FORMAT_2048I_47_96_SMPTE372);
+ options.push_back(&sdi_output_format);
+#endif // HAVE_LIBXNVCTRL
 // Accept some Equalizer options. These are passed to Equalizer for interpretation.
 opt::val<std::string> eq_server("eq-server", '\0', opt::optional);
 options.push_back(&eq_server);
@@ -412,6 +406,8 @@
 + " --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'
 + " -v|--video=STREAM " + _("Select video stream (1-n, depending on input).") + '\n'
@@ -471,6 +467,7 @@
 + " --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'
@@ -479,6 +476,7 @@
 + " --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'
@@ -488,6 +486,7 @@
 + " --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'
 + '\n'
 + _("Interactive control:") + '\n'
 + " ESC " + _("Leave fullscreen mode, or quit.") + '\n'
@@ -495,7 +494,7 @@
 + " p / SPACE " + _("Pause / unpause.") + '\n'
 + " f " + _("Toggle fullscreen.") + '\n'
 + " c " + _("Center window.") + '\n'
- + " e " + _("Swap left/right eye.") + '\n'
+ + " e / F7 " + _("Swap left/right eye.") + '\n'
 + " v " + _("Cycle through available video streams.") + '\n'
 + " a " + _("Cycle through available audio streams.") + '\n'
 + " s " + _("Cycle through available subtitle streams.") + '\n'
@@ -598,18 +597,16 @@
 if (audio_device.is_set())
 controller::send_cmd(command::set_audio_device, audio_device.value() - 1);
 if (video_output_mode.is_set()) {
+ parameters::stereo_mode_t stereo_mode;
 if (video_output_mode.value() == "equalizer") {
 controller::send_cmd(command::set_stereo_mode, static_cast<int>(parameters::mode_mono_left));
- controller::send_cmd(command::set_stereo_mode_swap, false);
 } else if (video_output_mode.value() == "equalizer-3d") {
 controller::send_cmd(command::set_stereo_mode, static_cast<int>(parameters::mode_mono_left));
- controller::send_cmd(command::set_stereo_mode_swap, false);
- } else {
- parameters::stereo_mode_t stereo_mode;
- bool stereo_mode_swap;
- parameters::stereo_mode_from_string(video_output_mode.value(), stereo_mode, stereo_mode_swap);
+ } else if (parameters::parse_stereo_mode(video_output_mode.value(), &stereo_mode)) {
 controller::send_cmd(command::set_stereo_mode, static_cast<int>(stereo_mode));
- controller::send_cmd(command::set_stereo_mode_swap, stereo_mode_swap);
+ } else {
+ msg::err(_("Unknown mode %s."), video_output_mode.value().c_str());
+ return 1;
 }
 }
 if (swap_eyes.is_set())
@@ -635,6 +632,8 @@
 controller::send_cmd(command::set_fullscreen_flip_right, fullscreen_flip_right.value());
 if (fullscreen_flop_right.is_set())
 controller::send_cmd(command::set_fullscreen_flop_right, fullscreen_flop_right.value());
+ if (fullscreen_3d_ready_sync.is_set())
+ controller::send_cmd(command::set_fullscreen_3d_ready_sync, fullscreen_3d_ready_sync.value());
 if (zoom.is_set())
 controller::send_cmd(command::set_zoom, zoom.value());
 if (loop.is_set())
@@ -657,6 +656,12 @@
 controller::send_cmd(command::set_subtitle_scale, subtitle_scale.value());
 if (subtitle_color.is_set())
 controller::send_cmd(command::set_subtitle_color, static_cast<uint64_t>(subtitle_color.value()));
+ if (subtitle_shadow.is_set())
+ controller::send_cmd(command::set_subtitle_shadow, subtitle_shadow.value());
+#if HAVE_LIBXNVCTRL
+ if (sdi_output_format.is_set())
+ controller::send_cmd(command::set_sdi_output_format, sdi_output_format.value());
+#endif // HAVE_LIBXNVCTRL
 
 /* Set volatile parameters */
 if (fullscreen.is_set() && fullscreen.value())
@@ -672,7 +677,7 @@
 open_input_data input_data;
 if (device_type.value() == "") {
 input_data.dev_request.device =
- (arguments.size() == 1 && arguments[0].substr(0, 5) == "/dev/"
+ (arguments.size() >= 1 && arguments[0].substr(0, 5) == "/dev/"
 ? device_request::sys_default : device_request::no_device);
 } else {
 input_data.dev_request.device =
@@ -684,6 +689,8 @@
 input_data.dev_request.height = device_frame_size.value()[1];
 input_data.dev_request.frame_rate_num = device_frame_rate.value()[0];
 input_data.dev_request.frame_rate_den = device_frame_rate.value()[1];
+ if (device_format.value() == "mjpeg")
+ input_data.dev_request.request_mjpeg = true;
 input_data.urls = arguments;
 if (video.is_set() > 0)
 input_data.params.set_video_stream(video.value() - 1);
@@ -714,8 +721,12 @@
 input_data.params.set_subtitle_parallax(subtitle_parallax.value());
 
 int retval = 0;
+ std::vector<command_file*> command_files;
 try {
- global_dispatch.init(input_data);
+ for (size_t i = 0; i < read_commands.values().size(); i++) {
+ command_files.push_back(new command_file(read_commands.values()[i]));
+ command_files[i]->init();
+ }
 #if HAVE_LIBLIRCCLIENT
 lircclient lirc(PACKAGE, lirc_config.values());
 try {
@@ -729,6 +740,7 @@
 msg::wrn(_("This version of Bino was compiled without support for LIRC."));
 }
 #endif
+ global_dispatch.init(input_data);
 if (dispatch_equalizer) {
 #if HAVE_LIBEQUALIZER
 player_equalizer::mainloop();
@@ -748,6 +760,8 @@
 retval = 1;
 }
 
+ for (size_t i = 0; i < command_files.size(); i++)
+ delete command_files[i];
 delete qt_app;
 
 return retval;

bino-1.3.2.tar.xz/src/media_data.cpp -> bino-1.3.3.tar.xz/src/media_data.cpp Changed

@@ -5,6 +5,7 @@
 * Martin Lambers <marlam@marlam.de>
 * Joe <joe@wpj.cz>
 * D. Matz <bandregent@yahoo.de>
+ * Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -35,13 +36,18 @@
 #include "msg.h"
 #include "dbg.h"
 
+#if HAVE_LIBXNVCTRL
+#include "NVCtrl.h"
+#endif // HAVE_LIBXNVCTRL
+
 
 device_request::device_request() :
 device(no_device),
 width(0),
 height(0),
 frame_rate_num(0),
- frame_rate_den(0)
+ frame_rate_den(0),
+ request_mjpeg(false)
 {
 }
 
@@ -52,6 +58,7 @@
 s11n::save(os, height);
 s11n::save(os, frame_rate_num);
 s11n::save(os, frame_rate_den);
+ s11n::save(os, request_mjpeg);
 }
 
 void device_request::load(std::istream &is)
@@ -63,6 +70,7 @@
 s11n::load(is, height);
 s11n::load(is, frame_rate_num);
 s11n::load(is, frame_rate_den);
+ s11n::load(is, request_mjpeg);
 }
 
 
@@ -85,6 +93,7 @@
 unset_fullscreen_flip_right();
 unset_fullscreen_flop_right();
 unset_fullscreen_inhibit_screensaver();
+ unset_fullscreen_3d_ready_sync();
 unset_contrast();
 unset_brightness();
 unset_hue();
@@ -97,6 +106,12 @@
 unset_subtitle_size();
 unset_subtitle_scale();
 unset_subtitle_color();
+ unset_subtitle_shadow();
+#if HAVE_LIBXNVCTRL
+ unset_sdi_output_format();
+ unset_sdi_output_left_stereo_mode();
+ unset_sdi_output_right_stereo_mode();
+#endif // HAVE_LIBXNVCTRL
 // Per-Video parameters
 unset_video_stream();
 unset_audio_stream();
@@ -131,6 +146,7 @@
 const bool parameters::_fullscreen_flip_right_default = false;
 const bool parameters::_fullscreen_flop_right_default = false;
 const bool parameters::_fullscreen_inhibit_screensaver_default = true;
+const bool parameters::_fullscreen_3d_ready_sync_default = false;
 const float parameters::_contrast_default = 0.0f;
 const float parameters::_brightness_default = 0.0f;
 const float parameters::_hue_default = 0.0f;
@@ -143,6 +159,12 @@
 const int parameters::_subtitle_size_default = -1;
 const float parameters::_subtitle_scale_default = -1.0f;
 const uint64_t parameters::_subtitle_color_default = std::numeric_limits<uint64_t>::max();
+const int parameters::_subtitle_shadow_default = -1;
+#if HAVE_LIBXNVCTRL
+const int parameters::_sdi_output_format_default = NV_CTRL_GVIO_VIDEO_FORMAT_1080P_25_00_SMPTE274;
+const parameters::stereo_mode_t parameters::_sdi_output_left_stereo_mode_default = mode_mono_left;
+const parameters::stereo_mode_t parameters::_sdi_output_right_stereo_mode_default = mode_mono_right;
+#endif // HAVE_LIBXNVCTRL
 // Per-Video parameter defaults
 const int parameters::_video_stream_default = 0;
 const int parameters::_audio_stream_default = 0;
@@ -245,6 +267,31 @@
 }
 }
 
+bool parameters::parse_stereo_layout(const std::string& s, stereo_layout_t* stereo_layout)
+{
+ bool ok = true;
+ if (s == "mono") {
+ *stereo_layout = layout_mono;
+ } else if (s == "separate-left-right") {
+ *stereo_layout = layout_separate;
+ } else if (s == "alternating-left-right") {
+ *stereo_layout = layout_alternating;
+ } else if (s == "top-bottom") {
+ *stereo_layout = layout_top_bottom;
+ } else if (s == "top-bottom-half") {
+ *stereo_layout = layout_top_bottom_half;
+ } else if (s == "left-right") {
+ *stereo_layout = layout_left_right;
+ } else if (s == "left-right-half") {
+ *stereo_layout = layout_left_right_half;
+ } else if (s == "even-odd-rows") {
+ *stereo_layout = layout_even_odd_rows;
+ } else {
+ ok = false;
+ }
+ return ok;
+}
+
 std::string parameters::stereo_mode_to_string(stereo_mode_t stereo_mode, bool stereo_mode_swap)
 {
 std::string s;
@@ -344,64 +391,74 @@
 } else {
 t = s;
 stereo_mode_swap = false;
- } if (t == "stereo") {
- stereo_mode = mode_stereo;
- } else if (t == "alternating") {
- stereo_mode = mode_alternating;
- } else if (t == "mono-left") {
- stereo_mode = mode_mono_left;
- } else if (t == "mono-right") {
- stereo_mode = mode_mono_right;
- } else if (t == "top-bottom") {
- stereo_mode = mode_top_bottom;
- } else if (t == "top-bottom-half") {
- stereo_mode = mode_top_bottom_half;
- } else if (t == "left-right") {
- stereo_mode = mode_left_right;
- } else if (t == "left-right-half") {
- stereo_mode = mode_left_right_half;
- } else if (t == "even-odd-rows") {
- stereo_mode = mode_even_odd_rows;
- } else if (t == "even-odd-columns") {
- stereo_mode = mode_even_odd_columns;
- } else if (t == "checkerboard") {
- stereo_mode = mode_checkerboard;
- } else if (t == "hdmi-frame-pack") {
- stereo_mode = mode_hdmi_frame_pack;
- } else if (t == "red-cyan-monochrome") {
- stereo_mode = mode_red_cyan_monochrome;
- } else if (t == "red-cyan-half-color") {
- stereo_mode = mode_red_cyan_half_color;
- } else if (t == "red-cyan-full-color") {
- stereo_mode = mode_red_cyan_full_color;
- } else if (t == "red-cyan-dubois") {
- stereo_mode = mode_red_cyan_dubois;
- } else if (t == "green-magenta-monochrome") {
- stereo_mode = mode_green_magenta_monochrome;
- } else if (t == "green-magenta-half-color") {
- stereo_mode = mode_green_magenta_half_color;
- } else if (t == "green-magenta-full-color") {
- stereo_mode = mode_green_magenta_full_color;
- } else if (t == "green-magenta-dubois") {
- stereo_mode = mode_green_magenta_dubois;
- } else if (t == "amber-blue-monochrome") {
- stereo_mode = mode_amber_blue_monochrome;
- } else if (t == "amber-blue-half-color") {
- stereo_mode = mode_amber_blue_half_color;
- } else if (t == "amber-blue-full-color") {
- stereo_mode = mode_amber_blue_full_color;
- } else if (t == "amber-blue-dubois") {
- stereo_mode = mode_amber_blue_dubois;
- } else if (t == "red-green-monochrome") {
- stereo_mode = mode_red_green_monochrome;
- } else if (t == "red-blue-monochrome") {
- stereo_mode = mode_red_blue_monochrome;
- } else {
+ }
+ if (!parse_stereo_mode(t, &stereo_mode)) {
 // safe fallback
 stereo_mode = mode_mono_left;
 }
 }
 
+bool parameters::parse_stereo_mode(const std::string& s, stereo_mode_t* stereo_mode)
+{
+ bool ok = true;
+ if (s == "stereo") {
+ *stereo_mode = mode_stereo;
+ } else if (s == "alternating") {
+ *stereo_mode = mode_alternating;
+ } else if (s == "mono-left") {
+ *stereo_mode = mode_mono_left;
+ } else if (s == "mono-right") {
+ *stereo_mode = mode_mono_right;
+ } else if (s == "top-bottom") {
+ *stereo_mode = mode_top_bottom;
+ } else if (s == "top-bottom-half") {
+ *stereo_mode = mode_top_bottom_half;
+ } else if (s == "left-right") {
+ *stereo_mode = mode_left_right;
+ } else if (s == "left-right-half") {
+ *stereo_mode = mode_left_right_half;
+ } else if (s == "even-odd-rows") {
+ *stereo_mode = mode_even_odd_rows;
+ } else if (s == "even-odd-columns") {
+ *stereo_mode = mode_even_odd_columns;
+ } else if (s == "checkerboard") {
+ *stereo_mode = mode_checkerboard;
+ } else if (s == "hdmi-frame-pack") {
+ *stereo_mode = mode_hdmi_frame_pack;
+ } else if (s == "red-cyan-monochrome") {
+ *stereo_mode = mode_red_cyan_monochrome;
+ } else if (s == "red-cyan-half-color") {
+ *stereo_mode = mode_red_cyan_half_color;
+ } else if (s == "red-cyan-full-color") {
+ *stereo_mode = mode_red_cyan_full_color;
+ } else if (s == "red-cyan-dubois") {
+ *stereo_mode = mode_red_cyan_dubois;
+ } else if (s == "green-magenta-monochrome") {
+ *stereo_mode = mode_green_magenta_monochrome;
+ } else if (s == "green-magenta-half-color") {
+ *stereo_mode = mode_green_magenta_half_color;
+ } else if (s == "green-magenta-full-color") {
+ *stereo_mode = mode_green_magenta_full_color;
+ } else if (s == "green-magenta-dubois") {
+ *stereo_mode = mode_green_magenta_dubois;
+ } else if (s == "amber-blue-monochrome") {
+ *stereo_mode = mode_amber_blue_monochrome;
+ } else if (s == "amber-blue-half-color") {
+ *stereo_mode = mode_amber_blue_half_color;
+ } else if (s == "amber-blue-full-color") {
+ *stereo_mode = mode_amber_blue_full_color;
+ } else if (s == "amber-blue-dubois") {
+ *stereo_mode = mode_amber_blue_dubois;
+ } else if (s == "red-green-monochrome") {
+ *stereo_mode = mode_red_green_monochrome;
+ } else if (s == "red-blue-monochrome") {
+ *stereo_mode = mode_red_blue_monochrome;
+ } else {
+ ok = false;
+ }
+ return ok;
+}
+
 std::string parameters::loop_mode_to_string(loop_mode_t loop_mode)
 {
 if (loop_mode == loop_current) {
@@ -454,6 +511,8 @@
 s11n::save(os, _fullscreen_flop_right_set);
 s11n::save(os, _fullscreen_inhibit_screensaver);
 s11n::save(os, _fullscreen_inhibit_screensaver_set);
+ s11n::save(os, _fullscreen_3d_ready_sync);
+ s11n::save(os, _fullscreen_3d_ready_sync_set);
 s11n::save(os, _contrast);
 s11n::save(os, _contrast_set);
 s11n::save(os, _brightness);
@@ -478,6 +537,16 @@
 s11n::save(os, _subtitle_scale_set);
 s11n::save(os, _subtitle_color);
 s11n::save(os, _subtitle_color_set);
+ s11n::save(os, _subtitle_shadow);
+ s11n::save(os, _subtitle_shadow_set);
+#if HAVE_LIBXNVCTRL
+ s11n::save(os, _sdi_output_format);
+ s11n::save(os, _sdi_output_format_set);
+ s11n::save(os, static_cast<int>(_sdi_output_left_stereo_mode));
+ s11n::save(os, _sdi_output_left_stereo_mode_set);
+ s11n::save(os, static_cast<int>(_sdi_output_right_stereo_mode));
+ s11n::save(os, _sdi_output_right_stereo_mode_set);
+#endif // HAVE_LIBXNVCTRL
 // Per-Video parameters
 s11n::save(os, _video_stream);
 s11n::save(os, _video_stream_set);
@@ -543,6 +612,8 @@
 s11n::load(is, _fullscreen_flop_right_set);
 s11n::load(is, _fullscreen_inhibit_screensaver);
 s11n::load(is, _fullscreen_inhibit_screensaver_set);
+ s11n::load(is, _fullscreen_3d_ready_sync);
+ s11n::load(is, _fullscreen_3d_ready_sync_set);
 s11n::load(is, _contrast);
 s11n::load(is, _contrast_set);
 s11n::load(is, _brightness);
@@ -567,6 +638,16 @@
 s11n::load(is, _subtitle_scale_set);
 s11n::load(is, _subtitle_color);
 s11n::load(is, _subtitle_color_set);
+ s11n::load(is, _subtitle_shadow);
+ s11n::load(is, _subtitle_shadow_set);
+#if HAVE_LIBXNVCTRL
+ s11n::load(is, _sdi_output_format);
+ s11n::load(is, _sdi_output_format_set);
+ s11n::load(is, x); _sdi_output_left_stereo_mode = static_cast<stereo_mode_t>(x);
+ s11n::load(is, _sdi_output_left_stereo_mode_set);
+ s11n::load(is, x); _sdi_output_right_stereo_mode = static_cast<stereo_mode_t>(x);
+ s11n::load(is, _sdi_output_right_stereo_mode_set);
+#endif // HAVE_LIBXNVCTRL
 // Per-Video parameters
 s11n::load(is, _video_stream);
 s11n::load(is, _video_stream_set);
@@ -622,6 +703,8 @@
 s11n::save(oss, "fullscreen_flop_right", fullscreen_flop_right());
 if (!fullscreen_inhibit_screensaver_is_default())
 s11n::save(oss, "fullscreen_inhibit_screensaver", fullscreen_inhibit_screensaver());
+ if (!fullscreen_3d_ready_sync_is_default())
+ s11n::save(oss, "fullscreen_3d_ready_sync", fullscreen_3d_ready_sync());
 if (!contrast_is_default())
 s11n::save(oss, "contrast", contrast());
 if (!brightness_is_default())
@@ -646,6 +729,16 @@
 s11n::save(oss, "subtitle_scale", _subtitle_scale);
 if (!subtitle_color_is_default())
 s11n::save(oss, "subtitle_color", _subtitle_color);
+ if (!subtitle_shadow_is_default())
+ s11n::save(oss, "subtitle_shadow", _subtitle_shadow);
+#if HAVE_LIBXNVCTRL
+ if (!sdi_output_format_is_default())
+ s11n::save(oss, "sdi_output_format", sdi_output_format());
+ if (!sdi_output_left_stereo_mode_is_default())
+ s11n::save(oss, "sdi_output_left_stereo_mode", stereo_mode_to_string(sdi_output_left_stereo_mode(), false));
+ if (!sdi_output_right_stereo_mode_is_default())
+ s11n::save(oss, "sdi_output_right_stereo_mode", stereo_mode_to_string(sdi_output_right_stereo_mode(), false));
+#endif // HAVE_LIBXNVCTRL
 return oss.str();
 }
 
@@ -691,6 +784,9 @@
 } else if (name == "fullscreen_inhibit_screensaver") {
 s11n::load(value, _fullscreen_inhibit_screensaver);
 _fullscreen_inhibit_screensaver_set = true;
+ } else if (name == "fullscreen_3d_ready_sync") {
+ s11n::load(value, _fullscreen_3d_ready_sync);
+ _fullscreen_3d_ready_sync_set = true;
 } else if (name == "contrast") {
 s11n::load(value, _contrast);
 _contrast_set = true;
@@ -729,6 +825,26 @@
 } else if (name == "subtitle_color") {
 s11n::load(value, _subtitle_color);
 _subtitle_color_set = true;
+ } else if (name == "subtitle_shadow") {
+ s11n::load(value, _subtitle_shadow);
+ _subtitle_shadow_set = true;
+#if HAVE_LIBXNVCTRL
+ } else if (name == "sdi_output_format") {
+ s11n::load(value, _sdi_output_format);
+ _sdi_output_format_set = true;
+ } else if (name == "sdi_output_left_stereo_mode") {
+ std::string s;
+ bool swap_value;
+ s11n::load(value, s);
+ stereo_mode_from_string(s, _sdi_output_left_stereo_mode, swap_value);
+ _sdi_output_left_stereo_mode_set = true;
+ } else if (name == "sdi_output_right_stereo_mode") {
+ std::string s;
+ bool swap_value;
+ s11n::load(value, s);
+ stereo_mode_from_string(s, _sdi_output_right_stereo_mode, swap_value);
+ _sdi_output_right_stereo_mode_set = true;
+#endif // HAVE_LIBXNVCTRL
 }
 }
 }

bino-1.3.2.tar.xz/src/media_data.h -> bino-1.3.3.tar.xz/src/media_data.h Changed

bino-1.3.2.tar.xz/src/media_input.cpp -> bino-1.3.3.tar.xz/src/media_input.cpp Changed

@@ -111,7 +111,6 @@
 void media_input::open(const std::vector<std::string> &urls, const device_request &dev_request)
 {
 assert(urls.size() > 0);
- assert(!dev_request.is_device() || urls.size() == 1);
 
 // Open media objects
 _is_device = dev_request.is_device();
@@ -505,6 +504,15 @@
 }
 }
 }
+ // Re-set video frame template
+ parameters::stereo_layout_t stereo_layout_bak = _video_frame.stereo_layout;
+ bool stereo_layout_swap_bak = _video_frame.stereo_layout_swap;
+ int o, s;
+ get_video_stream(_active_video_stream, o, s);
+ _video_frame = _media_objects[o].video_frame_template(s);
+ _video_frame.stereo_layout = stereo_layout_bak;
+ _video_frame.stereo_layout_swap = stereo_layout_swap_bak;
+ _video_frame.set_view_dimensions();
 }
 
 void media_input::select_audio_stream(int audio_stream)
@@ -533,6 +541,8 @@
 _media_objects[i].audio_stream_set_active(j, (i == static_cast<size_t>(o) && j == s));
 }
 }
+ // Re-set audio blob template
+ _audio_blob = _media_objects[o].audio_blob_template(s);
 }
 
 void media_input::select_subtitle_stream(int subtitle_stream)
@@ -564,6 +574,11 @@
 _media_objects[i].subtitle_stream_set_active(j, (i == static_cast<size_t>(o) && j == s));
 }
 }
+ // Re-set subtitle box template
+ if (_active_subtitle_stream >= 0)
+ _subtitle_box = _media_objects[o].subtitle_box_template(s);
+ else
+ _subtitle_box = subtitle_box();
 }
 
 void media_input::start_video_frame_read()

bino-1.3.2.tar.xz/src/media_object.cpp -> bino-1.3.3.tar.xz/src/media_object.cpp Changed

bino-1.3.2.tar.xz/src/player.cpp -> bino-1.3.3.tar.xz/src/player.cpp Changed

@@ -29,6 +29,7 @@
 #define _(string) gettext(string)
 
 #include "exc.h"
+#include "dbg.h"
 #include "str.h"
 #include "msg.h"
 #include "timer.h"
@@ -54,8 +55,10 @@
 {
 double pos_min = _start_pos + global_dispatch->get_media_input()->initial_skip();
 double pos_max = pos_min + global_dispatch->get_media_input()->duration();
- double npos = (pos_max > pos_min ? (static_cast<double>(pos) - pos_min) / (pos_max - pos_min) : 0.0f);
- return npos;
+ if (pos_max > pos_min && pos >= pos_min && pos <= pos_max)
+ return (pos - pos_min) / (pos_max - pos_min);
+ else
+ return 0.0f;
 }
 
 void player::reset_playstate()
@@ -546,36 +549,44 @@
 
 int player::set_video_stream(int s)
 {
- if (s < 0 || s >= global_dispatch->get_media_input()->video_streams())
- s = 0;
+ assert(dispatch::media_input())
+ assert(s >= 0 && s < dispatch::media_input()->video_streams());
 global_dispatch->get_media_input()->select_video_stream(s);
- _seek_request = -1; // Get position right
+ if (dispatch::playing())
+ _seek_request = -1; // Get position right
 return s;
 }
 
 int player::set_audio_stream(int s)
 {
- if (s < 0 || s >= global_dispatch->get_media_input()->audio_streams())
- s = 0;
+ assert(dispatch::media_input())
+ assert(s >= 0 && s < dispatch::media_input()->audio_streams());
 global_dispatch->get_media_input()->select_audio_stream(s);
- _seek_request = -1; // Get position right
+ if (dispatch::playing())
+ _seek_request = -1; // Get position right
 return s;
 }
 
 int player::set_subtitle_stream(int s)
 {
- if (s < -1 || s >= global_dispatch->get_media_input()->subtitle_streams())
- s = -1;
+ assert(dispatch::media_input())
+ assert(s >= -1 && s < dispatch::media_input()->subtitle_streams());
 global_dispatch->get_media_input()->select_subtitle_stream(s);
- _seek_request = -1; // Get position right
+ if (dispatch::playing())
+ _seek_request = -1; // Get position right
 return s;
 }
 
 void player::set_stereo_layout(parameters::stereo_layout_t stereo_layout)
 {
 global_dispatch->get_media_input()->set_stereo_layout(stereo_layout, dispatch::parameters().stereo_layout_swap());
- if (stereo_layout == parameters::layout_separate)
- _seek_request = -1; // Get position of both streams right
+ // If the new layout is layout_separate, then seek to synchronize both video streams.
+ // If we're pausing, then seek to reload the current frame (or a near frame) and
+ // trigger an update of the display.
+ // In other cases, we can just continue to read our video and the display will
+ // update with the next frame.
+ if (stereo_layout == parameters::layout_separate || dispatch::pausing())
+ _seek_request = -1;
 }
 
 void player::set_stereo_layout_swap(bool swap)

bino-1.3.2.tar.xz/src/player.h -> bino-1.3.3.tar.xz/src/player.h Changed

bino-1.3.2.tar.xz/src/player_equalizer.cpp -> bino-1.3.3.tar.xz/src/player_equalizer.cpp Changed

@@ -58,6 +58,7 @@
  */
 
 extern dispatch* global_dispatch;
+static player_equalizer* global_player_equalizer = NULL;
 
 /*
  * player_eq_node
@@ -223,7 +224,7 @@
         std::memcpy(vp[0], viewport, 4 * sizeof(int));
         std::memcpy(vp[1], viewport, 4 * sizeof(int));
         video_output::display_current_frame(0, true, mono_right_instead_of_left,
-                x, y, w, h, vp, my_tex_coords);
+                x, y, w, h, vp, my_tex_coords, 0, 0, parameters::mode_mono_left);
     }
 };
 
@@ -459,9 +460,11 @@
         // Run player steps until we are told to do something
         bool more_steps;
         do {
-            global_dispatch->get_player()->step(&more_steps, &_eq_frame_data.seek_to,
+            global_player_equalizer->step(&more_steps, &_eq_frame_data.seek_to,
                     &_eq_frame_data.prep_frame, &_eq_frame_data.drop_frame, &_eq_frame_data.display_frame);
             dispatch::process_all_events();
+            if (!dispatch::playing())
+                more_steps = false;
         }
         while (more_steps
                 && _eq_frame_data.seek_to == -1
@@ -469,12 +472,12 @@
                 && !_eq_frame_data.drop_frame
                 && !_eq_frame_data.display_frame
                 && !dispatch::pausing());
-        if (!more_steps)
-        {
+        if (!more_steps) {
             this->exit();
+            return 0;
         }
         // Update the video state for all (it might have changed via handleEvent())
-        _eq_frame_data.subtitle = global_dispatch->get_player()->get_subtitle_box();
+        _eq_frame_data.subtitle = global_player_equalizer->get_subtitle_box();
         _eq_frame_data.dispatch_state = global_dispatch->save_state();
         // Find region of canvas to use, depending on the video aspect ratio and zoom level
         float aspect_ratio = dispatch::media_input()->video_frame_template().aspect_ratio;
@@ -565,6 +568,7 @@
                 controller::send_cmd(command::toggle_play);
                 break;
             case 'e':
+            case eq::KC_F7:
                 controller::send_cmd(command::toggle_stereo_mode_swap);
                 break;
             case 'f':
@@ -878,7 +882,7 @@
     const video_frame &get_video_frame()
     {
         if (_is_app_node)
-            return global_dispatch->get_player()->get_video_frame();
+            return global_player_equalizer->get_video_frame();
         else
             return _player.get_video_frame();
     }
@@ -1090,8 +1094,6 @@
  * player_equalizer
  */
 
-static player_equalizer* global_player_equalizer = NULL;
-
 player_equalizer::player_equalizer(int *argc, char *argv[], bool flat_screen) :
     player(), _flat_screen(flat_screen)
 {
@@ -1116,6 +1118,9 @@
 
 player_equalizer::~player_equalizer()
 {
+    eq::releaseConfig(_config);
+    eq::exit();
+    exitErrors();
     delete _node_factory;
     global_player_equalizer = NULL;
 }
@@ -1128,20 +1133,36 @@
     }
 }
 
-void player_equalizer::close()
+static bool global_quit_request;
+
+class eq_quit_controller : public controller
 {
-    _config->exit();
-    eq::releaseConfig(_config);
-    eq::exit();
-    exitErrors();
-}
+    virtual void receive_notification(const notification& note)
+    {
+        if (note.type == notification::quit)
+            global_quit_request = true;
+    }
+};
 
 void player_equalizer::mainloop()
 {
-    assert(global_player_equalizer);
-    eq_config* config = global_player_equalizer->_config;
-    while (config->isRunning()) {
-        config->startFrame();
-        config->finishFrame();
+    global_quit_request = false;
+    eq_quit_controller qc;
+    for (;;) {
+        if (!global_player_equalizer) {
+            dispatch::step();
+            dispatch::process_all_events();
+            if (global_quit_request)
+                return;
+        }
+        if (global_player_equalizer) {
+            eq_config* config = global_player_equalizer->_config;
+            while (config->isRunning()) {
+                config->startFrame();
+                config->finishFrame();
+            }
+            global_dispatch->stop_eq_player();
+            delete global_player_equalizer;
+        }
     }
 }

bino-1.3.2.tar.xz/src/player_equalizer.h -> bino-1.3.3.tar.xz/src/player_equalizer.h Changed

bino-1.3.2.tar.xz/src/subtitle_renderer.cpp -> bino-1.3.3.tar.xz/src/subtitle_renderer.cpp Changed

@@ -270,27 +270,29 @@
 return (box.format != subtitle_box::image);
 }
 
-void subtitle_renderer::prerender(const subtitle_box &box, int64_t timestamp,
+bool subtitle_renderer::prerender(const subtitle_box &box, int64_t timestamp,
 const parameters &params,
 int width, int height, float pixel_aspect_ratio,
 int &bb_x, int &bb_y, int &bb_w, int &bb_h)
 {
 assert(_initialized);
+ bool r = false;
 _fmt = box.format;
 switch (_fmt)
 {
 case subtitle_box::text:
 case subtitle_box::ass:
- prerender_ass(box, timestamp, params, width, height, pixel_aspect_ratio);
+ r = prerender_ass(box, timestamp, params, width, height, pixel_aspect_ratio);
 break;
 case subtitle_box::image:
- prerender_img(box);
+ r = prerender_img(box);
 break;
 }
 bb_x = _bb_x;
 bb_y = _bb_y;
 bb_w = _bb_w;
 bb_h = _bb_h;
+ return r;
 }
 
 void subtitle_renderer::render(uint32_t *bgra32_buffer)
@@ -345,7 +347,6 @@
 void subtitle_renderer::set_ass_parameters(const parameters &params)
 {
 std::vector<std::string> overrides;
- overrides.clear();
 if (!params.subtitle_font_is_default())
 {
 overrides.push_back(std::string("Default.Fontname=") + params.subtitle_font());
@@ -365,10 +366,15 @@
 overrides.push_back(std::string("Default.PrimaryColour=") + color_str);
 overrides.push_back(std::string("Default.SecondaryColour=") + color_str);
 }
+ if (!params.subtitle_shadow_is_default())
+ {
+ overrides.push_back(std::string("Default.Shadow=")
+ + (params.subtitle_shadow() == 0 ? "0" : "3"));
+ }
 const char *ass_overrides[overrides.size() + 1];
 for (size_t i = 0; i < overrides.size(); i++)
 {
- ass_overrides[i] = ::strdup(overrides[i].c_str());
+ ass_overrides[i] = overrides[i].c_str();
 }
 ass_overrides[overrides.size()] = NULL;
 ass_set_style_overrides(_ass_library, const_cast<char **>(ass_overrides));
@@ -376,7 +382,7 @@
 ass_process_force_style(_ass_track);
 }
 
-void subtitle_renderer::prerender_ass(const subtitle_box &box, int64_t timestamp,
+bool subtitle_renderer::prerender_ass(const subtitle_box &box, int64_t timestamp,
 const parameters &params, int width, int height, float pixel_aspect_ratio)
 {
 // Lock
@@ -441,7 +447,8 @@
 set_ass_parameters(params);
 
 // Render subtitle
- _ass_img = ass_render_frame(_ass_renderer, _ass_track, timestamp / 1000, NULL);
+ int change_detected = 0;
+ _ass_img = ass_render_frame(_ass_renderer, _ass_track, timestamp / 1000, &change_detected);
 
 // Unlock
 global_libass_mutex.unlock();
@@ -478,6 +485,7 @@
 _bb_y = min_y;
 _bb_h = max_y - min_y + 1;
 }
+ return change_detected;
 }
 
 void subtitle_renderer::render_ass(uint32_t *bgra32_buffer)
@@ -494,7 +502,7 @@
 }
 }
 
-void subtitle_renderer::prerender_img(const subtitle_box &box)
+bool subtitle_renderer::prerender_img(const subtitle_box &box)
 {
 _img_box = &box;
 // Determine bounding box
@@ -528,6 +536,7 @@
 _bb_y = min_y;
 _bb_h = max_y - min_y + 1;
 }
+ return true;
 }
 
 void subtitle_renderer::render_img(uint32_t *bgra32_buffer)

bino-1.3.2.tar.xz/src/subtitle_renderer.h -> bino-1.3.3.tar.xz/src/subtitle_renderer.h Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2011
+ * Copyright (C) 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 * Joe <cuchac@email.cz>
 *
@@ -75,13 +75,13 @@
 void set_ass_parameters(const parameters &params);
 
 // Rendering ASS and text subtitles
- void prerender_ass(const subtitle_box &box, int64_t timestamp,
+ bool prerender_ass(const subtitle_box &box, int64_t timestamp,
 const parameters &params,
 int width, int height, float pixel_aspect_ratio);
 void render_ass(uint32_t *bgra32_buffer);
 
 // Rendering bitmap subtitles
- void prerender_img(const subtitle_box &box);
+ bool prerender_img(const subtitle_box &box);
 void render_img(uint32_t *bgra32_buffer);
 
 public:
@@ -116,7 +116,9 @@
 
 // Prerender the subtitle, to determine the bounding box it will occupy.
 // The bounding box is relative to the given subtitle overlay size (width and height).
- void prerender(const subtitle_box &box, int64_t timestamp,
+ // This function returns 'false' if the subtitle does not need to be rendered
+ // because there was no change relative to the last rendered subtitle.
+ bool prerender(const subtitle_box &box, int64_t timestamp,
 const parameters &params,
 int width, int height, float pixel_aspect_ratio,
 int &bb_x, int &bb_y, int &bb_w, int &bb_h);

bino-1.3.2.tar.xz/src/video_output.cpp -> bino-1.3.3.tar.xz/src/video_output.cpp Changed

@@ -5,6 +5,7 @@
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <frederic.devernay@inrialpes.fr>
 * Joe <cuchac@email.cz>
+ * Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -36,31 +37,42 @@
 #include "msg.h"
 #include "str.h"
 #include "timer.h"
+#include "blob.h"
 #include "dbg.h"
 
+#include "color_matrix.h"
 #include "video_output.h"
 #include "video_output_color.fs.glsl.h"
 #include "video_output_render.fs.glsl.h"
 
+#if HAVE_LIBXNVCTRL
+#include "NvSDIout.h"
+#endif // HAVE_LIBXNVCTRL
 
 /* Video output overview:
 *
 * Video output happens in three steps: video data input, color correction,
 * and rendering.
 *
+ * The first two steps are performed in prepare_next_frame() once per video
+ * frame, and the third step is performed in display_current_frame() once per
+ * output frame.
+ *
+ * To be able to call prepare_next_frame() for the next video frame while
+ * display_current_frame() still uses the current video frame, we must maintain
+ * two different sets of textures: one active set, used by
+ * display_current_frame(), and one inactive set, used by prepare_next_frame().
+ *
 * Step 1: Video data input.
- * We have two texture sets for input: one holding the current video frame,
- * and one for preparing the next video frame. Each texture set has textures
- * for the left and right view. The video data is transferred to texture
- * memory using pixel buffer objects, for better performance.
+ * The original YUV or SRGB data is transferred to texture memory using pixel
+ * buffer objects, for better performance. The is one texture for the left view
+ * and, if necessary, a second texture for the right view.
 *
- * Step 2: Color correction.
- * The input data is first converted to YUV (for the common planar YUV frame
- * formats, this just means gathering of the three components from the
- * three planes). Then color adjustment in the YUV space is performed.
- * If the input data had an 8 bit value range, the result is converted to sRGB
- * and stored in an GL_SRGB texture. If the input data had a larger value range,
- * the result is converted to linear RGB and stored in an GL_RGB16 texture.
+ * Step 2: Color space conversion.
+ * This step converts the video data to SRGB color space. If the input data had
+ * an 8 bit value range, the result is stored in an GL_SRGB texture. If the
+ * input data had a larger value range (or GL_SRGB textures cannot be rendered
+ * into), the result is converted to linear RGB and stored in an GL_RGB16 texture.
 * In this color correction step, no interpolation is done, because we're
 * dealing with non-linear values, and interpolating them would lead to
 * errors. We do not store linear RGB in GL_RGB8 textures because that would
@@ -91,41 +103,231 @@
 * interpolation, too.
 */
 
+
+/*
+ * The subtitle updater:
+ * Render subtitles in a separate thread.
+ */
+
+class subtitle_updater : public thread
+{
+private:
+ // The last rendered subtitle
+ subtitle_box _last_subtitle;
+ int64_t _last_timestamp;
+ parameters _last_params;
+ int _last_outwidth;
+ int _last_outheight;
+ float _last_pixel_ar;
+ // The current subtitle to render
+ subtitle_box _subtitle;
+ int64_t _timestamp;
+ parameters _params;
+ int _outwidth;
+ int _outheight;
+ float _pixel_ar;
+ // The renderer and rendering buffer
+ subtitle_renderer* _renderer;
+ blob _buffer;
+ int _bb_x, _bb_y, _bb_w, _bb_h;
+ bool _buffer_changed;
+
+public:
+ subtitle_updater(subtitle_renderer* sr);
+
+ // Reset
+ void reset();
+ // Set all necessary information to render the next subtitle.
+ void set(const subtitle_box& subtitle, int64_t timestamp,
+ const parameters& params, int outwidth, int outheight, float pixel_ar);
+ // Start the subtitle rendering with thread::start(), which will execute the run() fuction.
+ // The wait for it to finish using the thread::finish() function.
+ virtual void run();
+ // Find out if the buffer changed, and get all required info.
+ bool get(int *outwidth, int* outheight,
+ void** ptr, int* bb_x, int* bb_y, int* bb_w, int* bb_h);
+};
+
+subtitle_updater::subtitle_updater(subtitle_renderer* renderer) :
+ _renderer(renderer)
+{
+ reset();
+}
+
+void subtitle_updater::reset()
+{
+ _last_outwidth = -1;
+ _last_outheight = -1;
+ _last_timestamp = std::numeric_limits<int64_t>::min();
+}
+
+void subtitle_updater::set(
+ const subtitle_box& subtitle, int64_t timestamp,
+ const parameters& params, int outwidth, int outheight, float pixel_ar)
+{
+ _subtitle = subtitle;
+ _timestamp = timestamp;
+ _params = params;
+ _outwidth = outwidth;
+ _outheight = outheight;
+ _pixel_ar = pixel_ar;
+}
+
+void subtitle_updater::run()
+{
+ _buffer_changed = false;
+ if (_subtitle.is_valid()
+ && (_subtitle != _last_subtitle
+ || (!_subtitle.is_constant() && _timestamp != _last_timestamp)
+ || _outwidth != _last_outwidth
+ || _outheight != _last_outheight
+ || (_pixel_ar < _last_pixel_ar || _pixel_ar > _last_pixel_ar)
+ || _params.subtitle_encoding() != _last_params.subtitle_encoding()
+ || _params.subtitle_font() != _last_params.subtitle_font()
+ || _params.subtitle_size() != _last_params.subtitle_size()
+ || (_params.subtitle_scale() < _last_params.subtitle_scale()
+ || _params.subtitle_scale() > _last_params.subtitle_scale())
+ || _params.subtitle_color() != _last_params.subtitle_color()
+ || _params.subtitle_shadow() != _last_params.subtitle_shadow())) {
+ // We have a new subtitle or a new video display size or new parameters,
+ // therefore we need to render it.
+ _buffer_changed = _renderer->prerender(
+ _subtitle, _timestamp, _params,
+ _outwidth, _outheight, _pixel_ar,
+ _bb_x, _bb_y, _bb_w, _bb_h);
+ _last_subtitle = _subtitle;
+ _last_timestamp = _timestamp;
+ _last_params = _params;
+ _last_outwidth = _outwidth;
+ _last_outheight = _outheight;
+ _last_pixel_ar = _pixel_ar;
+ }
+
+ if (_buffer_changed) {
+ size_t bufsize = _bb_w * _bb_h * sizeof(uint32_t);
+ if (_buffer.size() < bufsize)
+ _buffer.resize(bufsize);
+ _renderer->render(_buffer.ptr<uint32_t>());
+ }
+}
+
+bool subtitle_updater::get(int *outwidth, int* outheight,
+ void** ptr, int* bb_x, int* bb_y, int* bb_w, int* bb_h)
+{
+ *outwidth = _outwidth;
+ *outheight = _outheight;
+ *ptr = _buffer.ptr();
+ *bb_x = _bb_x;
+ *bb_y = _bb_y;
+ *bb_w = _bb_w;
+ *bb_h = _bb_h;
+ return _buffer_changed;
+}
+
+
+/*
+ * Local (static) helper data and functions
+ */
+
 static const float full_tex_coords[2][4][2] =
 {
 { { 0.0f, 0.0f }, { 1.0f, 0.0f }, { 1.0f, 1.0f }, { 0.0f, 1.0f } },
 { { 0.0f, 0.0f }, { 1.0f, 0.0f }, { 1.0f, 1.0f }, { 0.0f, 1.0f } }
 };
 
+static int next_multiple_of_4(int x)
+{
+ return (x / 4 + (x % 4 == 0 ? 0 : 1)) * 4;
+}
+
+static void xglKillCrlf(char* str)
+{
+ size_t l = std::strlen(str);
+ if (l > 0 && str[l - 1] == '\n')
+ str[--l] = '\0';
+ if (l > 0 && str[l - 1] == '\r')
+ str[l - 1] = '\0';
+}
+
+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)
+{
+ std::memcpy(tc, full_tex_coords[0], sizeof(tc));
+ if (crop_ar > 0.0f) {
+ if (src_ar >= crop_ar) {
+ float cutoff = (1.0f - crop_ar / src_ar) / 2.0f;
+ tc[0][0] += cutoff;
+ tc[1][0] -= cutoff;
+ tc[2][0] -= cutoff;
+ tc[3][0] += cutoff;
+ } else {
+ float cutoff = (1.0f - src_ar / crop_ar) / 2.0f;
+ tc[0][1] += cutoff;
+ tc[1][1] += cutoff;
+ tc[2][1] -= cutoff;
+ tc[3][1] -= cutoff;
+ }
+ src_ar = crop_ar;
+ }
+ if (src_ar >= dst_ar) {
+ // need black borders top and bottom
+ 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;
+ tc[2][0] -= cutoff;
+ tc[3][0] += cutoff;
+ } else {
+ // 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;
+ }
+}
+
+
+/*
+ * The video output
+ */
+
 video_output::video_output() : controller(), _initialized(false)
 {
 _input_pbo = 0;
 _input_fbo = 0;
 _active_index = 1;
- for (int i = 0; i < 2; i++)
- {
+ for (int i = 0; i < 2; i++) {
+ _input_yuv_y_tex[i] = 0;
+ _input_yuv_u_tex[i] = 0;
+ _input_yuv_v_tex[i] = 0;
+ _input_bgra32_tex[i] = 0;
 for (int j = 0; j < 2; j++)
- {
- _input_yuv_y_tex[i][j] = 0;
- _input_yuv_u_tex[i][j] = 0;
- _input_yuv_v_tex[i][j] = 0;
- _input_bgra32_tex[i][j] = 0;
- }
- _color_tex[i] = 0;
- _input_subtitle_tex[i] = 0;
- _input_subtitle_width[i] = -1;
- _input_subtitle_height[i] = -1;
- _input_subtitle_time[i] = std::numeric_limits<int64_t>::min();
+ _color_tex[i][j] = 0;
+ _subtitle_tex[i] = 0;
+ _subtitle_tex_current[i] = false;
+ _color_prg[i] = 0;
 }
- _color_prg = 0;
 _color_fbo = 0;
 _render_prg = 0;
 _render_dummy_tex = 0;
 _render_mask_tex = 0;
+ _subtitle_updater = new subtitle_updater(&_subtitle_renderer);
+#if HAVE_LIBXNVCTRL
+ _nv_sdi_output = new CNvSDIout();
+#endif // HAVE_LIBXNVCTRL
 }
 
 video_output::~video_output()
 {
+ delete _subtitle_updater;
+#if HAVE_LIBXNVCTRL
+ delete _nv_sdi_output;
+#endif // HAVE_LIBXNVCTRL
 }
 
 /**
@@ -149,13 +351,15 @@
 return true;
 }
 
-static void xglKillCrlf(char* str)
+bool video_output::xglCheckFBO(const std::string& where) const
 {
- size_t l = std::strlen(str);
- if (l > 0 && str[l - 1] == '\n')
- str[--l] = '\0';
- if (l > 0 && str[l - 1] == '\r')
- str[l - 1] = '\0';
+ GLenum e = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+ if (e != GL_FRAMEBUFFER_COMPLETE_EXT) {
+ std::string pfx = (where.length() > 0 ? where + ": " : "");
+ throw exc(pfx + str::asprintf(_("OpenGL Framebuffer status error 0x%04X."), static_cast<unsigned int>(e)));
+ return false;
+ }
+ return true;
 }
 
 /**
@@ -310,27 +514,100 @@
 }
 }
 
+bool video_output::srgb8_textures_are_color_renderable()
+{
+ bool retval = true;
+ GLuint fbo;
+ GLuint tex;
+
+ glGenFramebuffersEXT(1, &fbo);
+ glGenTextures(1, &tex);
+ glBindTexture(GL_TEXTURE_2D, tex);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8, 2, 2, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
+ GLint framebuffer_bak;
+ glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &framebuffer_bak);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo);
+ glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
+ GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, tex, 0);
+ GLenum e = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+ if (e != GL_FRAMEBUFFER_COMPLETE_EXT) {
+ retval = false;
+ }
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framebuffer_bak);
+ glDeleteFramebuffersEXT(1, &fbo);
+ glDeleteTextures(1, &tex);
+ return retval;
+}
+
+void video_output::draw_quad(float x, float y, float w, float h,
+ const float tex_coords[2][4][2],
+ const float more_tex_coords[4][2]) const
+{
+ const float (*my_tex_coords)[4][2] = (tex_coords ? tex_coords : full_tex_coords);
+
+ glBegin(GL_QUADS);
+ glTexCoord2f(my_tex_coords[0][0][0], my_tex_coords[0][0][1]);
+ glMultiTexCoord2f(GL_TEXTURE1, my_tex_coords[1][0][0], my_tex_coords[1][0][1]);
+ if (more_tex_coords) {
+ glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[0][0], more_tex_coords[0][1]);
+ }
+ glVertex2f(x, y);
+ glTexCoord2f(my_tex_coords[0][1][0], my_tex_coords[0][1][1]);
+ glMultiTexCoord2f(GL_TEXTURE1, my_tex_coords[1][1][0], my_tex_coords[1][1][1]);
+ if (more_tex_coords) {
+ glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[1][0], more_tex_coords[1][1]);
+ }
+ glVertex2f(x + w, y);
+ glTexCoord2f(my_tex_coords[0][2][0], my_tex_coords[0][2][1]);
+ glMultiTexCoord2f(GL_TEXTURE1, my_tex_coords[1][2][0], my_tex_coords[1][2][1]);
+ if (more_tex_coords) {
+ glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[2][0], more_tex_coords[2][1]);
+ }
+ glVertex2f(x + w, y + h);
+ glTexCoord2f(my_tex_coords[0][3][0], my_tex_coords[0][3][1]);
+ glMultiTexCoord2f(GL_TEXTURE1, my_tex_coords[1][3][0], my_tex_coords[1][3][1]);
+ if (more_tex_coords) {
+ glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[3][0], more_tex_coords[3][1]);
+ }
+ glVertex2f(x, y + h);
+ glEnd();
+}
 
 void video_output::init()
 {
- if (!_initialized)
- {
- /* currently nothing to do */
+ if (!_initialized) {
+#if HAVE_LIBXNVCTRL
+ _nv_sdi_output->init(_params.sdi_output_format());
+#endif // HAVE_LIBXNVCTRL
+ _full_viewport[0] = -1;
+ _full_viewport[1] = -1;
+ _full_viewport[2] = -1;
+ _full_viewport[3] = -1;
 _initialized = true;
 }
 }
 
 void video_output::deinit()
 {
- if (_initialized)
- {
+ if (_initialized) {
 clear();
- assert(xglCheckError(HERE));
- input_deinit(0);
- input_deinit(1);
- color_deinit();
+ xglCheckError(HERE);
+#if HAVE_LIBXNVCTRL
+ if (_nv_sdi_output->isInitialized()) {
+ _nv_sdi_output->deinit();
+ }
+#endif // HAVE_LIBXNVCTRL
+ input_deinit();
+ subtitle_deinit(0);
+ subtitle_deinit(1);
+ color_deinit(0);
+ color_deinit(1);
 render_deinit();
- assert(xglCheckError(HERE));
+ xglCheckError(HERE);
 _initialized = false;
 }
 }
@@ -338,47 +615,34 @@
 void video_output::set_suitable_size(int width, int height, float ar, parameters::stereo_mode_t stereo_mode)
 {
 float aspect_ratio = width * screen_pixel_aspect_ratio() / height;
- if (stereo_mode == parameters::mode_left_right)
- {
+ if (stereo_mode == parameters::mode_left_right) {
 aspect_ratio /= 2.0f;
- }
- else if (stereo_mode == parameters::mode_top_bottom
- || stereo_mode == parameters::mode_hdmi_frame_pack)
- {
+ } else if (stereo_mode == parameters::mode_top_bottom
+ || stereo_mode == parameters::mode_hdmi_frame_pack) {
 aspect_ratio *= 2.0f;
 }
 if (ar > aspect_ratio)
- {
 width *= ar / aspect_ratio;
- }
 else
- {
 height *= aspect_ratio / ar;
- }
 int max_width = screen_width() - screen_width() / 20;
 if (width > max_width)
- {
 width = max_width;
- }
 int max_height = screen_height() - screen_height() / 20;
 if (height > max_height)
- {
 height = max_height;
- }
 trigger_resize(width, height);
 }
 
-void video_output::input_init(int index, const video_frame &frame)
+void video_output::input_init(const video_frame &frame)
 {
- assert(xglCheckError(HERE));
+ xglCheckError(HERE);
 glGenBuffers(1, &_input_pbo);
 glGenFramebuffersEXT(1, &_input_fbo);
- if (frame.layout == video_frame::bgra32)
- {
- for (int i = 0; i < (frame.stereo_layout == parameters::layout_mono ? 1 : 2); i++)
- {
- glGenTextures(1, &(_input_bgra32_tex[index][i]));
- glBindTexture(GL_TEXTURE_2D, _input_bgra32_tex[index][i]);
+ if (frame.layout == video_frame::bgra32) {
+ for (int i = 0; i < (frame.stereo_layout == parameters::layout_mono ? 1 : 2); i++) {
+ glGenTextures(1, &(_input_bgra32_tex[i]));
+ glBindTexture(GL_TEXTURE_2D, _input_bgra32_tex[i]);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -386,30 +650,24 @@
 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, frame.width, frame.height,
 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
 }
- }
- else
- {
- _input_yuv_chroma_width_divisor[index] = 1;
- _input_yuv_chroma_height_divisor[index] = 1;
+ } else {
+ _input_yuv_chroma_width_divisor = 1;
+ _input_yuv_chroma_height_divisor = 1;
 bool need_chroma_filtering = false;
- if (frame.layout == video_frame::yuv422p)
- {
- _input_yuv_chroma_width_divisor[index] = 2;
+ if (frame.layout == video_frame::yuv422p) {
+ _input_yuv_chroma_width_divisor = 2;
 need_chroma_filtering = true;
- }
- else if (frame.layout == video_frame::yuv420p)
- {
- _input_yuv_chroma_width_divisor[index] = 2;
- _input_yuv_chroma_height_divisor[index] = 2;
+ } else if (frame.layout == video_frame::yuv420p) {
+ _input_yuv_chroma_width_divisor = 2;
+ _input_yuv_chroma_height_divisor = 2;
 need_chroma_filtering = true;
 }
 bool type_u8 = (frame.value_range == video_frame::u8_full || frame.value_range == video_frame::u8_mpeg);
 GLint internal_format = type_u8 ? GL_LUMINANCE8 : GL_LUMINANCE16;
 GLint type = type_u8 ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT;
- for (int i = 0; i < (frame.stereo_layout == parameters::layout_mono ? 1 : 2); i++)
- {
- glGenTextures(1, &(_input_yuv_y_tex[index][i]));
- glBindTexture(GL_TEXTURE_2D, _input_yuv_y_tex[index][i]);
+ for (int i = 0; i < (frame.stereo_layout == parameters::layout_mono ? 1 : 2); i++) {
+ glGenTextures(1, &(_input_yuv_y_tex[i]));
+ glBindTexture(GL_TEXTURE_2D, _input_yuv_y_tex[i]);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -418,368 +676,157 @@
 frame.width,
 frame.height,
 0, GL_LUMINANCE, type, NULL);
- glGenTextures(1, &(_input_yuv_u_tex[index][i]));
- glBindTexture(GL_TEXTURE_2D, _input_yuv_u_tex[index][i]);
+ glGenTextures(1, &(_input_yuv_u_tex[i]));
+ glBindTexture(GL_TEXTURE_2D, _input_yuv_u_tex[i]);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, need_chroma_filtering ? GL_LINEAR : GL_NEAREST);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, need_chroma_filtering ? GL_LINEAR : GL_NEAREST);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 glTexImage2D(GL_TEXTURE_2D, 0, internal_format,
- frame.width / _input_yuv_chroma_width_divisor[index],
- frame.height / _input_yuv_chroma_height_divisor[index],
+ frame.width / _input_yuv_chroma_width_divisor,
+ frame.height / _input_yuv_chroma_height_divisor,
 0, GL_LUMINANCE, type, NULL);
- glGenTextures(1, &(_input_yuv_v_tex[index][i]));
- glBindTexture(GL_TEXTURE_2D, _input_yuv_v_tex[index][i]);
+ glGenTextures(1, &(_input_yuv_v_tex[i]));
+ glBindTexture(GL_TEXTURE_2D, _input_yuv_v_tex[i]);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, need_chroma_filtering ? GL_LINEAR : GL_NEAREST);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, need_chroma_filtering ? GL_LINEAR : GL_NEAREST);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 glTexImage2D(GL_TEXTURE_2D, 0, internal_format,
- frame.width / _input_yuv_chroma_width_divisor[index],
- frame.height / _input_yuv_chroma_height_divisor[index],
+ frame.width / _input_yuv_chroma_width_divisor,
+ frame.height / _input_yuv_chroma_height_divisor,
 0, GL_LUMINANCE, type, NULL);
 }
 }
- assert(xglCheckError(HERE));
-}
-
-bool video_output::input_is_compatible(int index, const video_frame &current_frame)
-{
- return (_frame[index].width == current_frame.width
- && _frame[index].height == current_frame.height
- && _frame[index].layout == current_frame.layout
- && _frame[index].color_space == current_frame.color_space
- && _frame[index].value_range == current_frame.value_range
- && _frame[index].chroma_location == current_frame.chroma_location
- && _frame[index].stereo_layout == current_frame.stereo_layout);
 }
 
-void video_output::input_deinit(int index)
+void video_output::input_deinit()
 {
- assert(xglCheckError(HERE));
+ xglCheckError(HERE);
 glDeleteBuffers(1, &_input_pbo);
 _input_pbo = 0;
 glDeleteFramebuffersEXT(1, &_input_fbo);
 _input_fbo = 0;
- for (int i = 0; i < 2; i++)
- {
- if (_input_yuv_y_tex[index][i] != 0)
- {
- glDeleteTextures(1, &(_input_yuv_y_tex[index][i]));
- _input_yuv_y_tex[index][i] = 0;
- }
- if (_input_yuv_u_tex[index][i] != 0)
- {
- glDeleteTextures(1, &(_input_yuv_u_tex[index][i]));
- _input_yuv_u_tex[index][i] = 0;
+ for (int i = 0; i < 2; i++) {
+ if (_input_yuv_y_tex[i] != 0) {
+ glDeleteTextures(1, &(_input_yuv_y_tex[i]));
+ _input_yuv_y_tex[i] = 0;
 }
- if (_input_yuv_v_tex[index][i] != 0)
- {
- glDeleteTextures(1, &(_input_yuv_v_tex[index][i]));
- _input_yuv_v_tex[index][i] = 0;
+ if (_input_yuv_u_tex[i] != 0) {
+ glDeleteTextures(1, &(_input_yuv_u_tex[i]));
+ _input_yuv_u_tex[i] = 0;
 }
- if (_input_bgra32_tex[index][i] != 0)
- {
- glDeleteTextures(1, &(_input_bgra32_tex[index][i]));
- _input_bgra32_tex[index][i] = 0;
+ if (_input_yuv_v_tex[i] != 0) {
+ glDeleteTextures(1, &(_input_yuv_v_tex[i]));
+ _input_yuv_v_tex[i] = 0;
 }
- if (_input_subtitle_tex[i] != 0)
- {
- glDeleteTextures(1, &(_input_subtitle_tex[i]));
- _input_subtitle_tex[i] = 0;
+ if (_input_bgra32_tex[i] != 0) {
+ glDeleteTextures(1, &(_input_bgra32_tex[i]));
+ _input_bgra32_tex[i] = 0;
 }
- _input_subtitle_box[i] = subtitle_box();
- _input_subtitle_width[i] = -1;
- _input_subtitle_height[i] = -1;
- _input_subtitle_time[i] = std::numeric_limits<int64_t>::min();
 }
- _input_yuv_chroma_width_divisor[index] = 0;
- _input_yuv_chroma_height_divisor[index] = 0;
- _frame[index] = video_frame();
- assert(xglCheckError(HERE));
+ _input_yuv_chroma_width_divisor = 0;
+ _input_yuv_chroma_height_divisor = 0;
+ _input_last_frame = video_frame();
+ xglCheckError(HERE);
 }
 
-static int next_multiple_of_4(int x)
+bool video_output::input_is_compatible(const video_frame &current_frame)
 {
- return (x / 4 + (x % 4 == 0 ? 0 : 1)) * 4;
+ return (_input_last_frame.width == current_frame.width
+ && _input_last_frame.height == current_frame.height
+ && _input_last_frame.layout == current_frame.layout
+ && _input_last_frame.color_space == current_frame.color_space
+ && _input_last_frame.value_range == current_frame.value_range
+ && _input_last_frame.chroma_location == current_frame.chroma_location
+ && _input_last_frame.stereo_layout == current_frame.stereo_layout);
 }
 
-void video_output::prepare_next_frame(const video_frame &frame, const subtitle_box &subtitle)
+void video_output::subtitle_init(int index)
 {
- int index = (_active_index == 0 ? 1 : 0);
- if (!frame.is_valid())
- {
- _frame[index] = frame;
- return;
- }
- assert(xglCheckError(HERE));
- if (!input_is_compatible(index, frame))
- {
- input_deinit(index);
- input_init(index, frame);
- }
- _frame[index] = frame;
- int bytes_per_pixel = 4;
- GLenum format = GL_BGRA;
- GLenum type = GL_UNSIGNED_INT_8_8_8_8_REV;
- if (frame.layout != video_frame::bgra32)
- {
- bool type_u8 = (frame.value_range == video_frame::u8_full || frame.value_range == video_frame::u8_mpeg);
- bytes_per_pixel = type_u8 ? 1 : 2;
- format = GL_LUMINANCE;
- type = type_u8 ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT;
- }
- for (int i = 0; i < (frame.stereo_layout == parameters::layout_mono ? 1 : 2); i++)
- {
- for (int plane = 0; plane < (frame.layout == video_frame::bgra32 ? 1 : 3); plane++)
- {
- // Determine the texture and the dimensions
- int w = frame.width;
- int h = frame.height;
- GLuint tex;
- int row_size;
- if (frame.layout == video_frame::bgra32)
- {
- tex = _input_bgra32_tex[index][i];
- }
- else
- {
- if (plane != 0)
- {
- w /= _input_yuv_chroma_width_divisor[index];
- h /= _input_yuv_chroma_height_divisor[index];
- }
- tex = (plane == 0 ? _input_yuv_y_tex[index][i]
- : plane == 1 ? _input_yuv_u_tex[index][i]
- : _input_yuv_v_tex[index][i]);
- }
- row_size = next_multiple_of_4(w * bytes_per_pixel);
- // Get a pixel buffer object buffer for the data
- glBindBuffer(GL_PIXEL_UNPACK_BUFFER, _input_pbo);
- glBufferData(GL_PIXEL_UNPACK_BUFFER, row_size * h, NULL, GL_STREAM_DRAW);
- void *pboptr = glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
- if (!pboptr)
- {
- throw exc(_("Cannot create a PBO buffer."));
- }
- assert(reinterpret_cast<uintptr_t>(pboptr) % 4 == 0);
- // Get the plane data into the pbo
- frame.copy_plane(i, plane, pboptr);
- // Upload the data to the texture. We need to set GL_UNPACK_ROW_LENGTH for
- // misbehaving OpenGL implementations that do not seem to honor
- // GL_UNPACK_ALIGNMENT correctly in all cases (reported for Mac).
- glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
- glPixelStorei(GL_UNPACK_ROW_LENGTH, row_size / bytes_per_pixel);
- glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, tex);
- glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, format, type, NULL);
- glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
- }
+ if (_subtitle_tex[index] == 0) {
+ glGenTextures(1, &_subtitle_tex[index]);
+ glBindTexture(GL_TEXTURE_2D, _subtitle_tex[index]);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ xglCheckError(HERE);
 }
- assert(xglCheckError(HERE));
- // In the common case, the video display width and height do not change
- // between preparing a frame and rendering it, so it is benefical to update
- // to subtitle texture in this function (because other threads can do other
- // work in parallel).
- update_subtitle_tex(index, frame, subtitle, _params);
-}
-
-int video_output::video_display_width() const
-{
- assert(_viewport[0][2] > 0);
- return _viewport[0][2];
 }
 
-int video_output::video_display_height() const
+void video_output::subtitle_deinit(int index)
 {
- assert(_viewport[0][3] > 0);
- return _viewport[0][3];
+ if (_subtitle_tex[index] != 0) {
+ glDeleteTextures(1, _subtitle_tex + index);
+ _subtitle_tex[index] = 0;
+ _subtitle_tex_current[index] = false;
+ _subtitle[index] = subtitle_box();
+ }
+ _subtitle_updater->reset();
 }
 
-void video_output::update_subtitle_tex(int index, const video_frame &frame, const subtitle_box &subtitle, const parameters &params)
+void video_output::color_init(int index, const video_frame &frame)
 {
- assert(xglCheckError(HERE));
- int width = 0;
- int height = 0;
- if (subtitle.is_valid())
- {
- assert(_subtitle_renderer.is_initialized());
- if (_subtitle_renderer.render_to_display_size(subtitle))
- {
- width = video_display_width();
- height = video_display_height();
+ xglCheckError(HERE);
+ glGenFramebuffersEXT(1, &_color_fbo);
+ std::string layout_str;
+ std::string color_space_str;
+ std::string value_range_str;
+ std::string storage_str;
+ std::string chroma_offset_x_str;
+ std::string chroma_offset_y_str;
+ if (frame.layout == video_frame::bgra32) {
+ layout_str = "layout_bgra32";
+ color_space_str = "color_space_srgb";
+ value_range_str = "value_range_8bit_full";
+ storage_str = "storage_srgb";
+ } else {
+ layout_str = "layout_yuv_p";
+ if (frame.color_space == video_frame::yuv709) {
+ color_space_str = "color_space_yuv709";
+ } else {
+ color_space_str = "color_space_yuv601";
 }
- else
- {
- width = frame.width;
- height = frame.height;
- }
- }
- if (subtitle.is_valid()
- && (subtitle != _input_subtitle_box[index]
- || (!subtitle.is_constant() && frame.presentation_time != _input_subtitle_time[index])
- || width != _input_subtitle_width[index]
- || height != _input_subtitle_height[index]
- || params.subtitle_encoding() != _input_subtitle_params.subtitle_encoding()
- || params.subtitle_font() != _input_subtitle_params.subtitle_font()
- || params.subtitle_size() != _input_subtitle_params.subtitle_size()
- || (params.subtitle_scale() < _input_subtitle_params.subtitle_scale()
- || params.subtitle_scale() > _input_subtitle_params.subtitle_scale())
- || params.subtitle_color() != _input_subtitle_params.subtitle_color()))
- {
- // We have a new subtitle or a new video display size or new parameters,
- // therefore we need to render the subtitle into _input_subtitle_tex.
-
- // Regenerate an appropriate subtitle texture if necessary.
- if (_input_subtitle_tex[index] == 0
- || width != _input_subtitle_width[index]
- || height != _input_subtitle_height[index])
- {
- if (_input_subtitle_tex[index] != 0)
- {
- glDeleteTextures(1, &(_input_subtitle_tex[index]));
- }
- glGenTextures(1, &(_input_subtitle_tex[index]));
- glBindTexture(GL_TEXTURE_2D, _input_subtitle_tex[index]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8,
- width, height, 0,
- GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
- }
- // Clear the texture
- GLint framebuffer_bak;
- glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &framebuffer_bak);
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, _input_fbo);
- glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
- GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, _input_subtitle_tex[index], 0);
- glClear(GL_COLOR_BUFFER_BIT);
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framebuffer_bak);
- // Prerender the subtitle to get a bounding box
- int bb_x, bb_y, bb_w, bb_h;
- _subtitle_renderer.prerender(subtitle, frame.presentation_time, params,
- width, height, screen_pixel_aspect_ratio(),
- bb_x, bb_y, bb_w, bb_h);
- if (bb_w > 0 && bb_h > 0)
- {
- // Get a PBO buffer of appropriate size for the bounding box.
- size_t size = bb_w * bb_h * sizeof(uint32_t);
- glBindBuffer(GL_PIXEL_UNPACK_BUFFER, _input_pbo);
- glBufferData(GL_PIXEL_UNPACK_BUFFER, size, NULL, GL_STREAM_DRAW);
- void *pboptr = glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
- if (!pboptr)
- {
- throw exc(_("Cannot create a PBO buffer."));
- }
- assert(reinterpret_cast<uintptr_t>(pboptr) % 4 == 0);
- // Render the subtitle into the buffer.
- _subtitle_renderer.render(static_cast<uint32_t *>(pboptr));
- // Update the appropriate part of the texture.
- glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
- glPixelStorei(GL_UNPACK_ROW_LENGTH, bb_w);
- glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, _input_subtitle_tex[index]);
- glTexSubImage2D(GL_TEXTURE_2D, 0, bb_x, bb_y, bb_w, bb_h,
- GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
- glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
- }
- }
- _input_subtitle_box[index] = subtitle;
- _input_subtitle_width[index] = width;
- _input_subtitle_height[index] = height;
- _input_subtitle_time[index] = frame.presentation_time;
- _input_subtitle_params = params;
- assert(xglCheckError(HERE));
-}
-
-void video_output::color_init(const video_frame &frame)
-{
- assert(xglCheckError(HERE));
- glGenFramebuffersEXT(1, &_color_fbo);
- std::string layout_str;
- std::string color_space_str;
- std::string value_range_str;
- std::string storage_str;
- std::string chroma_offset_x_str;
- std::string chroma_offset_y_str;
- if (frame.layout == video_frame::bgra32)
- {
- layout_str = "layout_bgra32";
- color_space_str = "color_space_srgb";
- value_range_str = "value_range_8bit_full";
- storage_str = "storage_srgb";
- }
- else
- {
- layout_str = "layout_yuv_p";
- if (frame.color_space == video_frame::yuv709)
- {
- color_space_str = "color_space_yuv709";
- }
- else
- {
- color_space_str = "color_space_yuv601";
- }
- if (frame.value_range == video_frame::u8_full)
- {
- value_range_str = "value_range_8bit_full";
- storage_str = "storage_srgb";
- }
- else if (frame.value_range == video_frame::u8_mpeg)
- {
- value_range_str = "value_range_8bit_mpeg";
- storage_str = "storage_srgb";
- }
- else if (frame.value_range == video_frame::u10_full)
- {
- value_range_str = "value_range_10bit_full";
- storage_str = "storage_linear_rgb";
- }
- else
- {
- value_range_str = "value_range_10bit_mpeg";
- storage_str = "storage_linear_rgb";
+ if (frame.value_range == video_frame::u8_full) {
+ value_range_str = "value_range_8bit_full";
+ storage_str = "storage_srgb";
+ } else if (frame.value_range == video_frame::u8_mpeg) {
+ value_range_str = "value_range_8bit_mpeg";
+ storage_str = "storage_srgb";
+ } else if (frame.value_range == video_frame::u10_full) {
+ value_range_str = "value_range_10bit_full";
+ storage_str = "storage_linear_rgb";
+ } else {
+ value_range_str = "value_range_10bit_mpeg";
+ storage_str = "storage_linear_rgb";
 }
 chroma_offset_x_str = "0.0";
 chroma_offset_y_str = "0.0";
- if (frame.layout == video_frame::yuv422p)
- {
- if (frame.chroma_location == video_frame::left)
- {
+ if (frame.layout == video_frame::yuv422p) {
+ if (frame.chroma_location == video_frame::left) {
 chroma_offset_x_str = str::from(0.5f / static_cast<float>(frame.width
- / _input_yuv_chroma_width_divisor[_active_index]));
- }
- else if (frame.chroma_location == video_frame::topleft)
- {
+ / _input_yuv_chroma_width_divisor));
+ } else if (frame.chroma_location == video_frame::topleft) {
 chroma_offset_x_str = str::from(0.5f / static_cast<float>(frame.width
- / _input_yuv_chroma_width_divisor[_active_index]));
+ / _input_yuv_chroma_width_divisor));
 chroma_offset_y_str = str::from(0.5f / static_cast<float>(frame.height
- / _input_yuv_chroma_height_divisor[_active_index]));
+ / _input_yuv_chroma_height_divisor));
 }
- }
- else if (frame.layout == video_frame::yuv420p)
- {
- if (frame.chroma_location == video_frame::left)
- {
+ } else if (frame.layout == video_frame::yuv420p) {
+ if (frame.chroma_location == video_frame::left) {
 chroma_offset_x_str = str::from(0.5f / static_cast<float>(frame.width
- / _input_yuv_chroma_width_divisor[_active_index]));
- }
- else if (frame.chroma_location == video_frame::topleft)
- {
+ / _input_yuv_chroma_width_divisor));
+ } else if (frame.chroma_location == video_frame::topleft) {
 chroma_offset_x_str = str::from(0.5f / static_cast<float>(frame.width
- / _input_yuv_chroma_width_divisor[_active_index]));
+ / _input_yuv_chroma_width_divisor));
 chroma_offset_y_str = str::from(0.5f / static_cast<float>(frame.height
- / _input_yuv_chroma_height_divisor[_active_index]));
+ / _input_yuv_chroma_height_divisor));
 }
 }
 }
 // XXX: Hack: work around broken SRGB texture implementations
- if (std::getenv("SRGB_TEXTURES_ARE_BROKEN"))
- {
+ if (!srgb8_textures_are_color_renderable() || std::getenv("SRGB_TEXTURES_ARE_BROKEN")) {
 msg::dbg("Avoiding broken SRGB texture implementation.");
 storage_str = "storage_linear_rgb";
 }
@@ -791,12 +838,11 @@
 str::replace(color_fs_src, "$chroma_offset_x", chroma_offset_x_str);
 str::replace(color_fs_src, "$chroma_offset_y", chroma_offset_y_str);
 str::replace(color_fs_src, "$storage", storage_str);
- _color_prg = xglCreateProgram("video_output_color", "", color_fs_src);
- xglLinkProgram("video_output_color", _color_prg);
- for (int i = 0; i < (frame.stereo_layout == parameters::layout_mono ? 1 : 2); i++)
- {
- glGenTextures(1, &(_color_tex[i]));
- glBindTexture(GL_TEXTURE_2D, _color_tex[i]);
+ _color_prg[index] = xglCreateProgram("video_output_color", "", color_fs_src);
+ xglLinkProgram("video_output_color", _color_prg[index]);
+ for (int i = 0; i < (frame.stereo_layout == parameters::layout_mono ? 1 : 2); i++) {
+ glGenTextures(1, &(_color_tex[index][i]));
+ glBindTexture(GL_TEXTURE_2D, _color_tex[index][i]);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
@@ -805,66 +851,69 @@
 storage_str == "storage_srgb" ? GL_SRGB8 : GL_RGB16,
 frame.width, frame.height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
 }
- assert(xglCheckError(HERE));
+ xglCheckError(HERE);
 }
 
-void video_output::color_deinit()
+void video_output::color_deinit(int index)
 {
- assert(xglCheckError(HERE));
+ xglCheckError(HERE);
 glDeleteFramebuffersEXT(1, &_color_fbo);
 _color_fbo = 0;
- if (_color_prg != 0)
- {
- xglDeleteProgram(_color_prg);
- _color_prg = 0;
- }
- for (int i = 0; i < 2; i++)
- {
- if (_color_tex[i] != 0)
- {
- glDeleteTextures(1, &(_color_tex[i]));
- _color_tex[i] = 0;
+ if (_color_prg[index] != 0) {
+ xglDeleteProgram(_color_prg[index]);
+ _color_prg[index] = 0;
+ }
+ for (int i = 0; i < 2; i++) {
+ if (_color_tex[index][i] != 0) {
+ glDeleteTextures(1, &(_color_tex[index][i]));
+ _color_tex[index][i] = 0;
 }
 }
- _color_last_frame = video_frame();
- assert(xglCheckError(HERE));
+ _color_last_frame[index] = video_frame();
+ xglCheckError(HERE);
 }
 
-bool video_output::color_is_compatible(const video_frame &current_frame)
+bool video_output::color_is_compatible(int index, const video_frame &current_frame)
 {
- return (_color_last_frame.width == current_frame.width
- && _color_last_frame.height == current_frame.height
- && _color_last_frame.layout == current_frame.layout
- && _color_last_frame.color_space == current_frame.color_space
- && _color_last_frame.value_range == current_frame.value_range
- && _color_last_frame.chroma_location == current_frame.chroma_location
- && _color_last_frame.stereo_layout == current_frame.stereo_layout);
+ return (_color_last_frame[index].width == current_frame.width
+ && _color_last_frame[index].height == current_frame.height
+ && _color_last_frame[index].layout == current_frame.layout
+ && _color_last_frame[index].color_space == current_frame.color_space
+ && _color_last_frame[index].value_range == current_frame.value_range
+ && _color_last_frame[index].chroma_location == current_frame.chroma_location
+ && _color_last_frame[index].stereo_layout == current_frame.stereo_layout);
 }
 
 void video_output::render_init()
 {
- assert(xglCheckError(HERE));
+ xglCheckError(HERE);
 std::string mode_str = (
- _params.stereo_mode() == parameters::mode_even_odd_rows ? "mode_even_odd_rows"
- : _params.stereo_mode() == parameters::mode_even_odd_columns ? "mode_even_odd_columns"
- : _params.stereo_mode() == parameters::mode_checkerboard ? "mode_checkerboard"
- : _params.stereo_mode() == parameters::mode_red_cyan_monochrome ? "mode_red_cyan_monochrome"
- : _params.stereo_mode() == parameters::mode_red_cyan_half_color ? "mode_red_cyan_half_color"
- : _params.stereo_mode() == parameters::mode_red_cyan_full_color ? "mode_red_cyan_full_color"
- : _params.stereo_mode() == parameters::mode_red_cyan_dubois ? "mode_red_cyan_dubois"
- : _params.stereo_mode() == parameters::mode_green_magenta_monochrome ? "mode_green_magenta_monochrome"
- : _params.stereo_mode() == parameters::mode_green_magenta_half_color ? "mode_green_magenta_half_color"
- : _params.stereo_mode() == parameters::mode_green_magenta_full_color ? "mode_green_magenta_full_color"
- : _params.stereo_mode() == parameters::mode_green_magenta_dubois ? "mode_green_magenta_dubois"
- : _params.stereo_mode() == parameters::mode_amber_blue_monochrome ? "mode_amber_blue_monochrome"
- : _params.stereo_mode() == parameters::mode_amber_blue_half_color ? "mode_amber_blue_half_color"
- : _params.stereo_mode() == parameters::mode_amber_blue_full_color ? "mode_amber_blue_full_color"
- : _params.stereo_mode() == parameters::mode_amber_blue_dubois ? "mode_amber_blue_dubois"
- : _params.stereo_mode() == parameters::mode_red_green_monochrome ? "mode_red_green_monochrome"
- : _params.stereo_mode() == parameters::mode_red_blue_monochrome ? "mode_red_blue_monochrome"
+ _render_params.stereo_mode() == parameters::mode_even_odd_rows ? "mode_even_odd_rows"
+ : _render_params.stereo_mode() == parameters::mode_even_odd_columns ? "mode_even_odd_columns"
+ : _render_params.stereo_mode() == parameters::mode_checkerboard ? "mode_checkerboard"
+ : _render_params.stereo_mode() == parameters::mode_red_cyan_monochrome ? "mode_red_cyan_monochrome"
+ : _render_params.stereo_mode() == parameters::mode_red_cyan_half_color ? "mode_red_cyan_half_color"
+ : _render_params.stereo_mode() == parameters::mode_red_cyan_full_color ? "mode_red_cyan_full_color"
+ : _render_params.stereo_mode() == parameters::mode_red_cyan_dubois ? "mode_red_cyan_dubois"
+ : _render_params.stereo_mode() == parameters::mode_green_magenta_monochrome ? "mode_green_magenta_monochrome"
+ : _render_params.stereo_mode() == parameters::mode_green_magenta_half_color ? "mode_green_magenta_half_color"
+ : _render_params.stereo_mode() == parameters::mode_green_magenta_full_color ? "mode_green_magenta_full_color"
+ : _render_params.stereo_mode() == parameters::mode_green_magenta_dubois ? "mode_green_magenta_dubois"
+ : _render_params.stereo_mode() == parameters::mode_amber_blue_monochrome ? "mode_amber_blue_monochrome"
+ : _render_params.stereo_mode() == parameters::mode_amber_blue_half_color ? "mode_amber_blue_half_color"
+ : _render_params.stereo_mode() == parameters::mode_amber_blue_full_color ? "mode_amber_blue_full_color"
+ : _render_params.stereo_mode() == parameters::mode_amber_blue_dubois ? "mode_amber_blue_dubois"
+ : _render_params.stereo_mode() == parameters::mode_red_green_monochrome ? "mode_red_green_monochrome"
+ : _render_params.stereo_mode() == parameters::mode_red_blue_monochrome ? "mode_red_blue_monochrome"
 : "mode_onechannel");
+ std::string subtitle_str = (render_needs_subtitle(_render_params) ? "subtitle_enabled" : "subtitle_disabled");
+ std::string coloradjust_str = (render_needs_coloradjust(_render_params) ? "coloradjust_enabled" : "coloradjust_disabled");
+ std::string ghostbust_str = (render_needs_ghostbust(_render_params) ? "ghostbust_enabled" : "ghostbust_disabled");
 std::string render_fs_src(VIDEO_OUTPUT_RENDER_FS_GLSL_STR);
 str::replace(render_fs_src, "$mode", mode_str);
+ str::replace(render_fs_src, "$subtitle", subtitle_str);
+ str::replace(render_fs_src, "$coloradjust", coloradjust_str);
+ str::replace(render_fs_src, "$ghostbust", ghostbust_str);
 _render_prg = xglCreateProgram("video_output_render", "", render_fs_src);
 xglLinkProgram("video_output_render", _render_prg);
 uint32_t dummy_texture = 0;
@@ -878,10 +927,9 @@
 glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0,
 GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, &dummy_texture);
- if (_params.stereo_mode() == parameters::mode_even_odd_rows
- || _params.stereo_mode() == parameters::mode_even_odd_columns
- || _params.stereo_mode() == parameters::mode_checkerboard)
- {
+ if (_render_params.stereo_mode() == parameters::mode_even_odd_rows
+ || _render_params.stereo_mode() == parameters::mode_even_odd_columns
+ || _render_params.stereo_mode() == parameters::mode_checkerboard) {
 GLubyte even_odd_rows_mask[4] = { 0xff, 0xff, 0x00, 0x00 };
 GLubyte even_odd_columns_mask[4] = { 0xff, 0x00, 0xff, 0x00 };
 GLubyte checkerboard_mask[4] = { 0xff, 0x00, 0x00, 0xff };
@@ -894,81 +942,181 @@
 glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE8, 2, 2, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE,
- _params.stereo_mode() == parameters::mode_even_odd_rows ? even_odd_rows_mask
- : _params.stereo_mode() == parameters::mode_even_odd_columns ? even_odd_columns_mask
+ _render_params.stereo_mode() == parameters::mode_even_odd_rows ? even_odd_rows_mask
+ : _render_params.stereo_mode() == parameters::mode_even_odd_columns ? even_odd_columns_mask
 : checkerboard_mask);
 }
- assert(xglCheckError(HERE));
+ xglCheckError(HERE);
 }
 
 void video_output::render_deinit()
 {
- assert(xglCheckError(HERE));
- if (_render_prg != 0)
- {
+ xglCheckError(HERE);
+ if (_render_prg != 0) {
 xglDeleteProgram(_render_prg);
 _render_prg = 0;
 }
- if (_render_dummy_tex != 0)
- {
+ if (_render_dummy_tex != 0) {
 glDeleteTextures(1, &_render_dummy_tex);
 _render_dummy_tex = 0;
 }
- if (_render_mask_tex != 0)
- {
+ if (_render_mask_tex != 0) {
 glDeleteTextures(1, &_render_mask_tex);
 _render_mask_tex = 0;
 }
 _render_last_params = parameters();
- assert(xglCheckError(HERE));
+ _render_last_frame = video_frame();
+ xglCheckError(HERE);
+}
+
+bool video_output::render_needs_subtitle(const parameters& params)
+{
+ return params.subtitle_stream() != -1;
+}
+
+bool video_output::render_needs_coloradjust(const parameters& params)
+{
+ return params.contrast() < 0.0f || params.contrast() > 0.0f
+ || params.brightness() < 0.0f || params.brightness() > 0.0f
+ || params.hue() < 0.0f || params.hue() > 0.0f
+ || params.saturation() < 0.0f || params.saturation() > 0.0f;
+}
+
+bool video_output::render_needs_ghostbust(const parameters& params)
+{
+ return params.ghostbust() > 0.0f;
 }
 
 bool video_output::render_is_compatible()
 {
- return (_render_last_params.stereo_mode() == _params.stereo_mode());
+ return (_render_last_params.stereo_mode() == _render_params.stereo_mode()
+ && render_needs_subtitle(_render_last_params) == render_needs_subtitle(_render_params)
+ && render_needs_coloradjust(_render_last_params) == render_needs_coloradjust(_render_params)
+ && render_needs_ghostbust(_render_last_params) == render_needs_ghostbust(_render_params));
 }
 
-void video_output::activate_next_frame()
+int video_output::full_display_width() const
 {
- _active_index = (_active_index == 0 ? 1 : 0);
+ return _full_viewport[2];
 }
 
-void video_output::draw_quad(float x, float y, float w, float h,
- const float tex_coords[2][4][2],
- const float more_tex_coords[4][2]) const
+int video_output::full_display_height() const
 {
- const float (*my_tex_coords)[4][2] = (tex_coords ? tex_coords : full_tex_coords);
+ return _full_viewport[3];
+}
 
- glBegin(GL_QUADS);
- glTexCoord2f(my_tex_coords[0][0][0], my_tex_coords[0][0][1]);
- glMultiTexCoord2f(GL_TEXTURE1, my_tex_coords[1][0][0], my_tex_coords[1][0][1]);
- if (more_tex_coords)
- {
- glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[0][0], more_tex_coords[0][1]);
- }
- glVertex2f(x, y);
- glTexCoord2f(my_tex_coords[0][1][0], my_tex_coords[0][1][1]);
- glMultiTexCoord2f(GL_TEXTURE1, my_tex_coords[1][1][0], my_tex_coords[1][1][1]);
- if (more_tex_coords)
- {
- glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[1][0], more_tex_coords[1][1]);
- }
- glVertex2f(x + w, y);
- glTexCoord2f(my_tex_coords[0][2][0], my_tex_coords[0][2][1]);
- glMultiTexCoord2f(GL_TEXTURE1, my_tex_coords[1][2][0], my_tex_coords[1][2][1]);
- if (more_tex_coords)
- {
- glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[2][0], more_tex_coords[2][1]);
+int video_output::video_display_width() const
+{
+ assert(_viewport[0][2] > 0);
+ return _viewport[0][2];
+}
+
+int video_output::video_display_height() const
+{
+ assert(_viewport[0][3] > 0);
+ return _viewport[0][3];
+}
+
+void video_output::clear() const
+{
+ assert(xglCheckError(HERE));
+ if (context_is_stereo()) {
+ glDrawBuffer(GL_BACK_LEFT);
+ glClear(GL_COLOR_BUFFER_BIT);
+ glDrawBuffer(GL_BACK_RIGHT);
+ glClear(GL_COLOR_BUFFER_BIT);
+ } else {
+ glClear(GL_COLOR_BUFFER_BIT);
 }
- glVertex2f(x + w, y + h);
- glTexCoord2f(my_tex_coords[0][3][0], my_tex_coords[0][3][1]);
- glMultiTexCoord2f(GL_TEXTURE1, my_tex_coords[1][3][0], my_tex_coords[1][3][1]);
- if (more_tex_coords)
- {
- glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[3][0], more_tex_coords[3][1]);
+ assert(xglCheckError(HERE));
+}
+
+void video_output::reshape(int w, int h, const parameters& params)
+{
+ // Clear
+ _full_viewport[0] = 0;
+ _full_viewport[1] = 0;
+ _full_viewport[2] = w;
+ _full_viewport[3] = h;
+ _viewport[0][0] = 0;
+ _viewport[0][1] = 0;
+ _viewport[0][2] = w;
+ _viewport[0][3] = h;
+ _viewport[1][0] = 0;
+ _viewport[1][1] = 0;
+ _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;
+
+ // Compute viewport with the right aspect ratio
+ if (params.stereo_mode() == parameters::mode_left_right
+ || params.stereo_mode() == parameters::mode_left_right_half) {
+ float dst_w = w / 2;
+ float dst_h = h;
+ float dst_ar = dst_w * screen_pixel_aspect_ratio() / dst_h;
+ float src_ar = _frame[_active_index].aspect_ratio;
+ float crop_ar = params.crop_aspect_ratio();
+ if (params.stereo_mode() == parameters::mode_left_right_half) {
+ src_ar /= 2.0f;
+ crop_ar /= 2.0f;
+ }
+ 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());
+ 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]));
+ } else if (params.stereo_mode() == parameters::mode_top_bottom
+ || params.stereo_mode() == parameters::mode_top_bottom_half) {
+ float dst_w = w;
+ float dst_h = h / 2;
+ float dst_ar = dst_w * screen_pixel_aspect_ratio() / dst_h;
+ float src_ar = _frame[_active_index].aspect_ratio;
+ float crop_ar = params.crop_aspect_ratio();
+ if (params.stereo_mode() == parameters::mode_top_bottom_half) {
+ src_ar *= 2.0f;
+ crop_ar *= 2.0f;
+ }
+ 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());
+ 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]));
+ } else if (params.stereo_mode() == parameters::mode_hdmi_frame_pack) {
+ // HDMI frame packing mode has left view top, right view bottom, plus a
+ // blank area separating the two. 720p uses 30 blank lines (total: 720
+ // + 30 + 720 = 1470), 1080p uses 45 (total: 10280 + 45 + 1080 = 2205).
+ // In both cases, the blank area is 30/1470 = 45/2205 = 1/49 of the
+ // total height. See the document "High-Definition Multimedia Interface
+ // Specification Version 1.4a Extraction of 3D Signaling Portion" from
+ // hdmi.org.
+ int blank_lines = h / 49;
+ float dst_w = w;
+ float dst_h = (h - blank_lines) / 2;
+ float dst_ar = dst_w * screen_pixel_aspect_ratio() / dst_h;
+ 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());
+ 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]));
+ } else {
+ float dst_w = w;
+ float dst_h = h;
+ float dst_ar = dst_w * screen_pixel_aspect_ratio() / dst_h;
+ 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());
+ std::memcpy(_viewport[1], _viewport[0], sizeof(_viewport[1]));
+ std::memcpy(_tex_coords[1], _tex_coords[0], sizeof(_tex_coords[1]));
 }
- glVertex2f(x, y + h);
- glEnd();
 }
 
 void video_output::display_current_frame(
@@ -976,14 +1124,14 @@
 bool keep_viewport, bool mono_right_instead_of_left,
 float x, float y, float w, float h,
 const GLint viewport[2][4],
- const float tex_coords[2][4][2])
+ const float tex_coords[2][4][2],
+ int dst_width, int dst_height,
+ parameters::stereo_mode_t stereo_mode)
 {
 clear();
 const video_frame &frame = _frame[_active_index];
 if (!frame.is_valid())
- {
 return;
- }
 
 /* debug: make sure the current frame is always newer than the last one
 static int64_t last_timestamp = -1000;
@@ -992,58 +1140,50 @@
 last_timestamp = timestamp;
 */
 
- _params = dispatch::parameters();
- bool context_needs_stereo = (_params.stereo_mode() == parameters::mode_stereo);
- if (context_needs_stereo != context_is_stereo())
- {
+ _render_params = dispatch::parameters();
+ _render_params.set_stereo_mode(stereo_mode);
+ bool context_needs_stereo = (_render_params.stereo_mode() == parameters::mode_stereo);
+ if (context_needs_stereo != context_is_stereo()) {
 recreate_context(context_needs_stereo);
 return;
 }
 if (!keep_viewport
- && (frame.width != _color_last_frame.width
- || frame.height != _color_last_frame.height
- || frame.aspect_ratio < _color_last_frame.aspect_ratio
- || frame.aspect_ratio > _color_last_frame.aspect_ratio
- || _render_last_params.stereo_mode() != _params.stereo_mode()
- || _render_last_params.crop_aspect_ratio() < _params.crop_aspect_ratio()
- || _render_last_params.crop_aspect_ratio() > _params.crop_aspect_ratio()
- || _render_last_params.zoom() < _params.zoom()
- || _render_last_params.zoom() > _params.zoom()))
- {
- reshape(width(), height());
+ && (frame.width != _render_last_frame.width
+ || frame.height != _render_last_frame.height
+ || frame.aspect_ratio < _render_last_frame.aspect_ratio
+ || frame.aspect_ratio > _render_last_frame.aspect_ratio
+ || _render_last_params.stereo_mode() != _render_params.stereo_mode()
+ || _render_last_params.crop_aspect_ratio() < _render_params.crop_aspect_ratio()
+ || _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)) {
+ reshape(dst_width, dst_height, _render_params);
 }
 assert(xglCheckError(HERE));
- if (!_color_prg || !color_is_compatible(frame))
- {
- color_deinit();
- color_init(frame);
- _color_last_frame = frame;
- }
- if (!_render_prg || !render_is_compatible())
- { 
+ if (!_render_prg || !render_is_compatible()) {
 render_deinit();
 render_init();
 }
- _render_last_params = _params;
+ _render_last_params = _render_params;
+ _render_last_frame = frame;
 
 /* Use correct left and right view indices */
 
 int left = 0;
 int right = (frame.stereo_layout == parameters::layout_mono ? 0 : 1);
- if (_params.stereo_mode_swap())
- {
+ if (_render_params.stereo_mode_swap()) {
 std::swap(left, right);
 }
- if ((_params.stereo_mode() == parameters::mode_even_odd_rows
- || _params.stereo_mode() == parameters::mode_checkerboard)
- && (pos_y() + viewport[0][1]) % 2 == 0)
- {
+ if ((_render_params.stereo_mode() == parameters::mode_even_odd_rows
+ || _render_params.stereo_mode() == parameters::mode_checkerboard)
+ && (pos_y() + viewport[0][1]) % 2 == 0) {
 std::swap(left, right);
 }
- if ((_params.stereo_mode() == parameters::mode_even_odd_columns
- || _params.stereo_mode() == parameters::mode_checkerboard)
- && (pos_x() + viewport[0][0]) % 2 == 1)
- {
+ if ((_render_params.stereo_mode() == parameters::mode_even_odd_columns
+ || _render_params.stereo_mode() == parameters::mode_checkerboard)
+ && (pos_x() + viewport[0][0]) % 2 == 1) {
 std::swap(left, right);
 }
 
@@ -1052,121 +1192,31 @@
 glEnable(GL_TEXTURE_2D);
 glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
 
- /* Step 2: color-correction */
-
- GLboolean scissor_test = glIsEnabled(GL_SCISSOR_TEST);
- glDisable(GL_SCISSOR_TEST);
- glMatrixMode(GL_MODELVIEW);
- glPushMatrix();
- glLoadIdentity();
- glMatrixMode(GL_PROJECTION);
- glPushMatrix();
- glLoadIdentity();
- glViewport(0, 0, frame.width, frame.height);
- glUseProgram(_color_prg);
- if (frame.layout == video_frame::bgra32)
- {
- glUniform1i(glGetUniformLocation(_color_prg, "srgb_tex"), 0);
- }
- else
- {
- glUniform1i(glGetUniformLocation(_color_prg, "y_tex"), 0);
- glUniform1i(glGetUniformLocation(_color_prg, "u_tex"), 1);
- glUniform1i(glGetUniformLocation(_color_prg, "v_tex"), 2);
- }
- glUniform1f(glGetUniformLocation(_color_prg, "contrast"), _params.contrast());
- glUniform1f(glGetUniformLocation(_color_prg, "brightness"), _params.brightness());
- glUniform1f(glGetUniformLocation(_color_prg, "saturation"), _params.saturation());
- glUniform1f(glGetUniformLocation(_color_prg, "cos_hue"), std::cos(_params.hue() * M_PI));
- glUniform1f(glGetUniformLocation(_color_prg, "sin_hue"), std::sin(_params.hue() * M_PI));
- GLint framebuffer_bak;
- glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &framebuffer_bak);
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, _color_fbo);
- // left view: render into _color_tex[0]
- if (frame.layout == video_frame::bgra32)
- {
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, _input_bgra32_tex[_active_index][left]);
- }
- else
- {
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, _input_yuv_y_tex[_active_index][left]);
- glActiveTexture(GL_TEXTURE1);
- glBindTexture(GL_TEXTURE_2D, _input_yuv_u_tex[_active_index][left]);
- glActiveTexture(GL_TEXTURE2);
- glBindTexture(GL_TEXTURE_2D, _input_yuv_v_tex[_active_index][left]);
- }
- glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
- GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, _color_tex[0], 0);
- draw_quad(-1.0f, +1.0f, +2.0f, -2.0f);
- // right view: render into _color_tex[1]
- if (left != right)
- {
- if (frame.layout == video_frame::bgra32)
- {
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, _input_bgra32_tex[_active_index][right]);
- }
- else
- {
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, _input_yuv_y_tex[_active_index][right]);
- glActiveTexture(GL_TEXTURE1);
- glBindTexture(GL_TEXTURE_2D, _input_yuv_u_tex[_active_index][right]);
- glActiveTexture(GL_TEXTURE2);
- glBindTexture(GL_TEXTURE_2D, _input_yuv_v_tex[_active_index][right]);
- }
- glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
- GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, _color_tex[1], 0);
- draw_quad(-1.0f, +1.0f, +2.0f, -2.0f);
- }
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framebuffer_bak);
- glViewport(viewport[0][0], viewport[0][1], viewport[0][2], viewport[0][3]);
- glMatrixMode(GL_PROJECTION);
- glPopMatrix();
- glMatrixMode(GL_MODELVIEW);
- glPopMatrix();
- if (scissor_test)
- {
- glEnable(GL_SCISSOR_TEST);
- }
-
- // at this point, the left view is in _color_tex[0],
- // and the right view (if it exists) is in _color_tex[1]
- right = (left != right ? 1 : 0);
- left = 0;
-
 /* Step 3: rendering */
 
 // Apply fullscreen flipping/flopping
 float my_tex_coords[2][4][2];
 std::memcpy(my_tex_coords, tex_coords, sizeof(my_tex_coords));
- if (dispatch::parameters().fullscreen())
- {
- if (_params.fullscreen_flip_left())
- {
+ if (dispatch::parameters().fullscreen()) {
+ if (_render_params.fullscreen_flip_left()) {
 std::swap(my_tex_coords[0][0][0], my_tex_coords[0][3][0]);
 std::swap(my_tex_coords[0][0][1], my_tex_coords[0][3][1]);
 std::swap(my_tex_coords[0][1][0], my_tex_coords[0][2][0]);
 std::swap(my_tex_coords[0][1][1], my_tex_coords[0][2][1]);
 }
- if (_params.fullscreen_flop_left())
- {
+ if (_render_params.fullscreen_flop_left()) {
 std::swap(my_tex_coords[0][0][0], my_tex_coords[0][1][0]);
 std::swap(my_tex_coords[0][0][1], my_tex_coords[0][1][1]);
 std::swap(my_tex_coords[0][3][0], my_tex_coords[0][2][0]);
 std::swap(my_tex_coords[0][3][1], my_tex_coords[0][2][1]);
 }
- if (_params.fullscreen_flip_right())
- {
+ if (_render_params.fullscreen_flip_right()) {
 std::swap(my_tex_coords[1][0][0], my_tex_coords[1][3][0]);
 std::swap(my_tex_coords[1][0][1], my_tex_coords[1][3][1]);
 std::swap(my_tex_coords[1][1][0], my_tex_coords[1][2][0]);
 std::swap(my_tex_coords[1][1][1], my_tex_coords[1][2][1]);
 }
- if (_params.fullscreen_flop_right())
- {
+ if (_render_params.fullscreen_flop_right()) {
 std::swap(my_tex_coords[1][0][0], my_tex_coords[1][1][0]);
 std::swap(my_tex_coords[1][0][1], my_tex_coords[1][1][1]);
 std::swap(my_tex_coords[1][3][0], my_tex_coords[1][2][0]);
@@ -1174,70 +1224,77 @@
 }
 }
 
- // Update the subtitle texture. This only re-renders the subtitle in the
- // unlikely case that the video display area was resized between the call
- // to prepare_next_frame and now (e.g. when resizing the window in pause
- // mode while subtitles are displayed).
- update_subtitle_tex(_active_index, frame, _input_subtitle_box[_active_index], _params);
+ // XXX We may want to re-render the subtitle here, for the case that the
+ // video display area was resized or subtitle parameters were changed
+ // between the call to prepare_next_frame and now (e.g. in pause mode).
+ // However, parameter changes don't work well with LibASS because it does
+ // not forget overrides, and we would have to introduce additional logic
+ // to not rerender an old subtitle while a new subtitle was already rendered
+ // by prepare_next_frame. So for now, don't rerender subtitles here, even
+ // if that means that subtitle changes don't take effect in pause mode.
 
 glUseProgram(_render_prg);
 glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, _color_tex[left]);
- if (left != right)
- {
+ glBindTexture(GL_TEXTURE_2D, _color_tex[_active_index][left]);
+ if (left != right) {
 glActiveTexture(GL_TEXTURE1);
- glBindTexture(GL_TEXTURE_2D, _color_tex[right]);
+ glBindTexture(GL_TEXTURE_2D, _color_tex[_active_index][right]);
 }
- glActiveTexture(GL_TEXTURE2);
- glBindTexture(GL_TEXTURE_2D, (_input_subtitle_box[_active_index].is_valid()
- ? _input_subtitle_tex[_active_index] : _render_dummy_tex));
- glUniform1i(glGetUniformLocation(_render_prg, "rgb_l"), left);
- glUniform1i(glGetUniformLocation(_render_prg, "rgb_r"), right);
- glUniform1f(glGetUniformLocation(_render_prg, "parallax"), _params.parallax() * 0.05f);
- glUniform1i(glGetUniformLocation(_render_prg, "subtitle"), 2);
- glUniform1f(glGetUniformLocation(_render_prg, "subtitle_parallax"), _params.subtitle_parallax() * 0.05f);
- if (_params.stereo_mode() != parameters::mode_red_green_monochrome
- && _params.stereo_mode() != parameters::mode_red_cyan_half_color
- && _params.stereo_mode() != parameters::mode_red_cyan_full_color
- && _params.stereo_mode() != parameters::mode_red_cyan_dubois
- && _params.stereo_mode() != parameters::mode_green_magenta_monochrome
- && _params.stereo_mode() != parameters::mode_green_magenta_half_color
- && _params.stereo_mode() != parameters::mode_green_magenta_full_color
- && _params.stereo_mode() != parameters::mode_green_magenta_dubois
- && _params.stereo_mode() != parameters::mode_amber_blue_monochrome
- && _params.stereo_mode() != parameters::mode_amber_blue_half_color
- && _params.stereo_mode() != parameters::mode_amber_blue_full_color
- && _params.stereo_mode() != parameters::mode_amber_blue_dubois
- && _params.stereo_mode() != parameters::mode_red_blue_monochrome
- && _params.stereo_mode() != parameters::mode_red_cyan_monochrome)
- {
+ glUniform1i(glGetUniformLocation(_render_prg, "rgb_l"), 0);
+ glUniform1i(glGetUniformLocation(_render_prg, "rgb_r"), 1);
+ glUniform1f(glGetUniformLocation(_render_prg, "parallax"), _render_params.parallax() * 0.05f);
+ if (render_needs_subtitle(_render_params)) {
+ glActiveTexture(GL_TEXTURE2);
+ glBindTexture(GL_TEXTURE_2D, (_subtitle[_active_index].is_valid()
+ ? _subtitle_tex[_active_index] : _render_dummy_tex));
+ glUniform1i(glGetUniformLocation(_render_prg, "subtitle"), 2);
+ glUniform1f(glGetUniformLocation(_render_prg, "subtitle_parallax"), _render_params.subtitle_parallax() * 0.05f);
+ }
+ if (render_needs_coloradjust(_render_params)) {
+ float color_matrix[16];
+ get_color_matrix(_render_params.brightness(), _render_params.contrast(),
+ _render_params.hue(), _render_params.saturation(), color_matrix);
+ glUniformMatrix4fv(glGetUniformLocation(_render_prg, "color_matrix"), 1, GL_TRUE, color_matrix);
+ }
+ if (_render_params.stereo_mode() != parameters::mode_red_green_monochrome
+ && _render_params.stereo_mode() != parameters::mode_red_cyan_half_color
+ && _render_params.stereo_mode() != parameters::mode_red_cyan_full_color
+ && _render_params.stereo_mode() != parameters::mode_red_cyan_dubois
+ && _render_params.stereo_mode() != parameters::mode_green_magenta_monochrome
+ && _render_params.stereo_mode() != parameters::mode_green_magenta_half_color
+ && _render_params.stereo_mode() != parameters::mode_green_magenta_full_color
+ && _render_params.stereo_mode() != parameters::mode_green_magenta_dubois
+ && _render_params.stereo_mode() != parameters::mode_amber_blue_monochrome
+ && _render_params.stereo_mode() != parameters::mode_amber_blue_half_color
+ && _render_params.stereo_mode() != parameters::mode_amber_blue_full_color
+ && _render_params.stereo_mode() != parameters::mode_amber_blue_dubois
+ && _render_params.stereo_mode() != parameters::mode_red_blue_monochrome
+ && _render_params.stereo_mode() != parameters::mode_red_cyan_monochrome
+ && render_needs_ghostbust(_render_params)) {
 glUniform3f(glGetUniformLocation(_render_prg, "crosstalk"),
- _params.crosstalk_r() * _params.ghostbust(),
- _params.crosstalk_g() * _params.ghostbust(),
- _params.crosstalk_b() * _params.ghostbust());
+ _render_params.crosstalk_r() * _render_params.ghostbust(),
+ _render_params.crosstalk_g() * _render_params.ghostbust(),
+ _render_params.crosstalk_b() * _render_params.ghostbust());
 }
- if (_params.stereo_mode() == parameters::mode_even_odd_rows
- || _params.stereo_mode() == parameters::mode_even_odd_columns
- || _params.stereo_mode() == parameters::mode_checkerboard)
- {
+ if (_render_params.stereo_mode() == parameters::mode_even_odd_rows
+ || _render_params.stereo_mode() == parameters::mode_even_odd_columns
+ || _render_params.stereo_mode() == parameters::mode_checkerboard) {
 glUniform1i(glGetUniformLocation(_render_prg, "mask_tex"), 3);
 glUniform1f(glGetUniformLocation(_render_prg, "step_x"), 1.0f / static_cast<float>(viewport[0][2]));
 glUniform1f(glGetUniformLocation(_render_prg, "step_y"), 1.0f / static_cast<float>(viewport[0][3]));
 }
 
- if (_params.stereo_mode() == parameters::mode_stereo)
- {
+ glViewport(viewport[0][0], viewport[0][1], viewport[0][2], viewport[0][3]);
+ if (_render_params.stereo_mode() == parameters::mode_stereo) {
 glUniform1f(glGetUniformLocation(_render_prg, "channel"), 0.0f);
 glDrawBuffer(GL_BACK_LEFT);
 draw_quad(x, y, w, h, my_tex_coords);
 glUniform1f(glGetUniformLocation(_render_prg, "channel"), 1.0f);
 glDrawBuffer(GL_BACK_RIGHT);
 draw_quad(x, y, w, h, my_tex_coords);
- }
- else if (_params.stereo_mode() == parameters::mode_even_odd_rows
- || _params.stereo_mode() == parameters::mode_even_odd_columns
- || _params.stereo_mode() == parameters::mode_checkerboard)
- {
+ } else if (_render_params.stereo_mode() == parameters::mode_even_odd_rows
+ || _render_params.stereo_mode() == parameters::mode_even_odd_columns
+ || _render_params.stereo_mode() == parameters::mode_checkerboard) {
 float vpw = static_cast<float>(viewport[0][2]);
 float vph = static_cast<float>(viewport[0][3]);
 float more_tex_coords[4][2] =
@@ -1247,43 +1304,35 @@
 glActiveTexture(GL_TEXTURE3);
 glBindTexture(GL_TEXTURE_2D, _render_mask_tex);
 draw_quad(x, y, w, h, my_tex_coords, more_tex_coords);
- }
- else if (_params.stereo_mode() == parameters::mode_red_cyan_monochrome
- || _params.stereo_mode() == parameters::mode_red_cyan_half_color
- || _params.stereo_mode() == parameters::mode_red_cyan_full_color
- || _params.stereo_mode() == parameters::mode_red_cyan_dubois
- || _params.stereo_mode() == parameters::mode_green_magenta_monochrome
- || _params.stereo_mode() == parameters::mode_green_magenta_half_color
- || _params.stereo_mode() == parameters::mode_green_magenta_full_color
- || _params.stereo_mode() == parameters::mode_green_magenta_dubois
- || _params.stereo_mode() == parameters::mode_amber_blue_monochrome
- || _params.stereo_mode() == parameters::mode_amber_blue_half_color
- || _params.stereo_mode() == parameters::mode_amber_blue_full_color
- || _params.stereo_mode() == parameters::mode_amber_blue_dubois
- || _params.stereo_mode() == parameters::mode_red_green_monochrome
- || _params.stereo_mode() == parameters::mode_red_blue_monochrome)
- {
+ } else if (_render_params.stereo_mode() == parameters::mode_red_cyan_monochrome
+ || _render_params.stereo_mode() == parameters::mode_red_cyan_half_color
+ || _render_params.stereo_mode() == parameters::mode_red_cyan_full_color
+ || _render_params.stereo_mode() == parameters::mode_red_cyan_dubois
+ || _render_params.stereo_mode() == parameters::mode_green_magenta_monochrome
+ || _render_params.stereo_mode() == parameters::mode_green_magenta_half_color
+ || _render_params.stereo_mode() == parameters::mode_green_magenta_full_color
+ || _render_params.stereo_mode() == parameters::mode_green_magenta_dubois
+ || _render_params.stereo_mode() == parameters::mode_amber_blue_monochrome
+ || _render_params.stereo_mode() == parameters::mode_amber_blue_half_color
+ || _render_params.stereo_mode() == parameters::mode_amber_blue_full_color
+ || _render_params.stereo_mode() == parameters::mode_amber_blue_dubois
+ || _render_params.stereo_mode() == parameters::mode_red_green_monochrome
+ || _render_params.stereo_mode() == parameters::mode_red_blue_monochrome) {
 draw_quad(x, y, w, h, my_tex_coords);
- }
- else if ((_params.stereo_mode() == parameters::mode_mono_left && !mono_right_instead_of_left)
- || (_params.stereo_mode() == parameters::mode_alternating && display_frameno % 2 == 0))
- {
+ } else if ((_render_params.stereo_mode() == parameters::mode_mono_left && !mono_right_instead_of_left)
+ || (_render_params.stereo_mode() == parameters::mode_alternating && display_frameno % 2 == 0)) {
 glUniform1f(glGetUniformLocation(_render_prg, "channel"), 0.0f);
 draw_quad(x, y, w, h, my_tex_coords);
- }
- else if (_params.stereo_mode() == parameters::mode_mono_right
- || (_params.stereo_mode() == parameters::mode_mono_left && mono_right_instead_of_left)
- || (_params.stereo_mode() == parameters::mode_alternating && display_frameno % 2 == 1))
- {
+ } else if (_render_params.stereo_mode() == parameters::mode_mono_right
+ || (_render_params.stereo_mode() == parameters::mode_mono_left && mono_right_instead_of_left)
+ || (_render_params.stereo_mode() == parameters::mode_alternating && display_frameno % 2 == 1)) {
 glUniform1f(glGetUniformLocation(_render_prg, "channel"), 1.0f);
 draw_quad(x, y, w, h, my_tex_coords);
- }
- else if (_params.stereo_mode() == parameters::mode_left_right
- || _params.stereo_mode() == parameters::mode_left_right_half
- || _params.stereo_mode() == parameters::mode_top_bottom
- || _params.stereo_mode() == parameters::mode_top_bottom_half
- || _params.stereo_mode() == parameters::mode_hdmi_frame_pack)
- {
+ } else if (_render_params.stereo_mode() == parameters::mode_left_right
+ || _render_params.stereo_mode() == parameters::mode_left_right_half
+ || _render_params.stereo_mode() == parameters::mode_top_bottom
+ || _render_params.stereo_mode() == parameters::mode_top_bottom_half
+ || _render_params.stereo_mode() == parameters::mode_hdmi_frame_pack) {
 glUniform1f(glGetUniformLocation(_render_prg, "channel"), 0.0f);
 draw_quad(x, y, w, h, my_tex_coords);
 glViewport(viewport[1][0], viewport[1][1], viewport[1][2], viewport[1][3]);
@@ -1295,167 +1344,319 @@
 glActiveTexture(GL_TEXTURE0);
 glBindTexture(GL_TEXTURE_2D, 0);
 glDisable(GL_TEXTURE_2D);
+
+ if (_render_params.fullscreen() && _render_params.fullscreen_3d_ready_sync()
+ && (_render_params.stereo_mode() == parameters::mode_left_right
+ || _render_params.stereo_mode() == parameters::mode_left_right_half
+ || _render_params.stereo_mode() == parameters::mode_top_bottom
+ || _render_params.stereo_mode() == parameters::mode_top_bottom_half
+ || _render_params.stereo_mode() == parameters::mode_alternating)) {
+ /* DLP 3-D Ready Sync: draw colored lines to allow the projector
+ * to identify the stereo mode and the left / right views automatically. */
+ const uint32_t R = 0xffu << 16u;
+ const uint32_t G = 0xffu << 8u;
+ const uint32_t B = 0xffu;
+ int width = full_display_width();
+ int height = full_display_height();
+ // Make space in the buffer for the pixel data
+ size_t req_size = width * sizeof(uint32_t);
+ if (_3d_ready_sync_buf.size() < req_size)
+ _3d_ready_sync_buf.resize(req_size);
+ if (_render_params.stereo_mode() == parameters::mode_left_right
+ || _render_params.stereo_mode() == parameters::mode_left_right_half) {
+ uint32_t color = (display_frameno % 2 == 0 ? R : G | B);
+ for (int i = 0; i < width; i++)
+ _3d_ready_sync_buf.ptr<uint32_t>()[i] = color;
+ glWindowPos2i(0, 0);
+ glDrawPixels(width, 1, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, _3d_ready_sync_buf.ptr());
+ } else if (_render_params.stereo_mode() == parameters::mode_top_bottom
+ || _render_params.stereo_mode() == parameters::mode_top_bottom_half) {
+ uint32_t color = (display_frameno % 2 == 0 ? B : R | G);
+ for (int i = 0; i < width; i++)
+ _3d_ready_sync_buf.ptr<uint32_t>()[i] = color;
+ glWindowPos2i(0, 0);
+ glDrawPixels(width, 1, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, _3d_ready_sync_buf.ptr());
+ glWindowPos2i(0, height / 2);
+ glDrawPixels(width, 1, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, _3d_ready_sync_buf.ptr());
+ } else if (_render_params.stereo_mode() == parameters::mode_alternating) {
+ uint32_t color = (display_frameno % 4 < 2 ? G : R | B);
+ for (int i = 0; i < width; i++)
+ _3d_ready_sync_buf.ptr<uint32_t>()[i] = color;
+ glWindowPos2i(0, 0);
+ glDrawPixels(width, 1, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, _3d_ready_sync_buf.ptr());
+ }
+ }
 }
 
-void video_output::clear() const
+#if HAVE_LIBXNVCTRL
+void video_output::sdi_output(int64_t display_frameno)
 {
- assert(xglCheckError(HERE));
- if (context_is_stereo())
- {
- glDrawBuffer(GL_BACK_LEFT);
- glClear(GL_COLOR_BUFFER_BIT);
- glDrawBuffer(GL_BACK_RIGHT);
- glClear(GL_COLOR_BUFFER_BIT);
- }
- else
- {
- glClear(GL_COLOR_BUFFER_BIT);
+ if (!_nv_sdi_output->isInitialized())
+ return;
+
+ if (_nv_sdi_output->getOutputFormat() != dispatch::parameters().sdi_output_format())
+ _nv_sdi_output->reinit(dispatch::parameters().sdi_output_format());
+
+ glEnable(GL_TEXTURE_2D);
+ for (int i = 0; i < 2; ++i) {
+ // Render each image to specified texture of SDI output
+ _nv_sdi_output->startRenderingTo(i);
+
+ parameters::stereo_mode_t tmp_stereo_mode =
+ (i == 0 ? dispatch::parameters().sdi_output_left_stereo_mode() :
+ dispatch::parameters().sdi_output_right_stereo_mode());
+
+ display_current_frame(display_frameno, _nv_sdi_output->width(), _nv_sdi_output->height(), tmp_stereo_mode);
+
+ _nv_sdi_output->stopRenderingTo();
+ assert(xglCheckError(HERE));
 }
+
+ assert(xglCheckError(HERE));
+
+ // Display both textures on SDI output
+ _nv_sdi_output->sendTextures();
 assert(xglCheckError(HERE));
 }
+#endif // HAVE_LIBXNVCTRL
 
-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)
+void video_output::prepare_next_frame(const video_frame &frame, const subtitle_box &subtitle)
 {
- std::memcpy(tc, full_tex_coords[0], sizeof(tc));
- if (crop_ar > 0.0f)
- {
- if (src_ar >= crop_ar)
- {
- float cutoff = (1.0f - crop_ar / src_ar) / 2.0f;
- tc[0][0] += cutoff;
- tc[1][0] -= cutoff;
- tc[2][0] -= cutoff;
- tc[3][0] += cutoff;
- }
- else
- {
- float cutoff = (1.0f - src_ar / crop_ar) / 2.0f;
- tc[0][1] += cutoff;
- tc[1][1] += cutoff;
- tc[2][1] -= cutoff;
- tc[3][1] -= cutoff;
+ // Initialization
+ int index = (_active_index == 0 ? 1 : 0);
+ if (!frame.is_valid()) {
+ _frame[index] = frame;
+ return;
+ }
+ assert(xglCheckError(HERE));
+ if (!input_is_compatible(frame)) {
+ input_deinit();
+ input_init(frame);
+ _input_last_frame = frame;
+ }
+
+ // Start rendering the subtitle in a separate thread.
+ // In the common case, the video display width and height do not change
+ // between preparing a frame and rendering it, so it is benefical to update
+ // to subtitle texture in this function.
+ if (subtitle.is_valid()) {
+ subtitle_init(index);
+ assert(_subtitle_renderer.is_initialized());
+ int sub_outwidth, sub_outheight;
+ if (_subtitle_renderer.render_to_display_size(subtitle)) {
+ sub_outwidth = video_display_width();
+ sub_outheight = video_display_height();
+ } else {
+ sub_outwidth = frame.width;
+ sub_outheight = frame.height;
 }
- src_ar = crop_ar;
+ _subtitle_updater->set(subtitle, frame.presentation_time,
+ dispatch::parameters(), sub_outwidth, sub_outheight,
+ screen_pixel_aspect_ratio());
+ _subtitle_updater->start();
 }
- if (src_ar >= dst_ar)
- {
- // need black borders top and bottom
- 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;
- tc[2][0] -= cutoff;
- tc[3][0] += cutoff;
+
+ // Upload the frame data
+ _frame[index] = frame;
+ int bytes_per_pixel = 4;
+ GLenum format = GL_BGRA;
+ GLenum type = GL_UNSIGNED_INT_8_8_8_8_REV;
+ if (frame.layout != video_frame::bgra32) {
+ bool type_u8 = (frame.value_range == video_frame::u8_full || frame.value_range == video_frame::u8_mpeg);
+ bytes_per_pixel = type_u8 ? 1 : 2;
+ format = GL_LUMINANCE;
+ type = type_u8 ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT;
 }
- else
- {
- // 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;
+ for (int i = 0; i < (frame.stereo_layout == parameters::layout_mono ? 1 : 2); i++) {
+ for (int plane = 0; plane < (frame.layout == video_frame::bgra32 ? 1 : 3); plane++) {
+ // Determine the texture and the dimensions
+ int w = frame.width;
+ int h = frame.height;
+ GLuint tex;
+ int row_size;
+ if (frame.layout == video_frame::bgra32) {
+ tex = _input_bgra32_tex[i];
+ } else {
+ if (plane != 0) {
+ w /= _input_yuv_chroma_width_divisor;
+ h /= _input_yuv_chroma_height_divisor;
+ }
+ tex = (plane == 0 ? _input_yuv_y_tex[i]
+ : plane == 1 ? _input_yuv_u_tex[i]
+ : _input_yuv_v_tex[i]);
+ }
+ row_size = next_multiple_of_4(w * bytes_per_pixel);
+ // Get a pixel buffer object buffer for the data
+ glBindBuffer(GL_PIXEL_UNPACK_BUFFER, _input_pbo);
+ glBufferData(GL_PIXEL_UNPACK_BUFFER, row_size * h, NULL, GL_STREAM_DRAW);
+ void *pboptr = glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
+ if (!pboptr)
+ throw exc(_("Cannot create a PBO buffer."));
+ assert(reinterpret_cast<uintptr_t>(pboptr) % 4 == 0);
+ // Get the plane data into the pbo
+ frame.copy_plane(i, plane, pboptr);
+ // Upload the data to the texture. We need to set GL_UNPACK_ROW_LENGTH for
+ // misbehaving OpenGL implementations that do not seem to honor
+ // GL_UNPACK_ALIGNMENT correctly in all cases (reported for Mac).
+ glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
+ glPixelStorei(GL_UNPACK_ROW_LENGTH, row_size / bytes_per_pixel);
+ glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D, tex);
+ glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, format, type, NULL);
+ glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+ }
 }
-}
+ assert(xglCheckError(HERE));
 
-void video_output::reshape(int w, int h)
-{
- // Clear
- _viewport[0][0] = 0;
- _viewport[0][1] = 0;
- _viewport[0][2] = w;
- _viewport[0][3] = h;
- _viewport[1][0] = 0;
- _viewport[1][1] = 0;
- _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;
+ /* Step 2: color-correction */
+
+ if (!_color_prg[index] || !color_is_compatible(index, frame)) {
+ color_deinit(index);
+ color_init(index, frame);
+ _color_last_frame[index] = frame;
 }
+ int left = 0;
+ int right = (frame.stereo_layout == parameters::layout_mono ? 0 : 1);
 
- // Compute viewport with the right aspect ratio
- if (_params.stereo_mode() == parameters::mode_left_right
- || _params.stereo_mode() == parameters::mode_left_right_half)
- {
- float dst_w = w / 2;
- float dst_h = h;
- float dst_ar = dst_w * screen_pixel_aspect_ratio() / dst_h;
- float src_ar = _frame[_active_index].aspect_ratio;
- float crop_ar = _params.crop_aspect_ratio();
- if (_params.stereo_mode() == parameters::mode_left_right_half)
- {
- src_ar /= 2.0f;
- crop_ar /= 2.0f;
- }
- 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());
- 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]));
+ // Backup GL state
+ GLint framebuffer_bak;
+ glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &framebuffer_bak);
+ GLint viewport_bak[4];
+ glGetIntegerv(GL_VIEWPORT, viewport_bak);
+ GLboolean scissor_bak = glIsEnabled(GL_SCISSOR_TEST);
+ glMatrixMode(GL_MODELVIEW);
+ glPushMatrix();
+ glMatrixMode(GL_PROJECTION);
+ glPushMatrix();
+
+ glEnable(GL_TEXTURE_2D);
+ glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+ glDisable(GL_SCISSOR_TEST);
+ glMatrixMode(GL_MODELVIEW);
+ glLoadIdentity();
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+ glViewport(0, 0, frame.width, frame.height);
+ glUseProgram(_color_prg[index]);
+ if (frame.layout == video_frame::bgra32) {
+ glUniform1i(glGetUniformLocation(_color_prg[index], "srgb_tex"), 0);
+ } else {
+ glUniform1i(glGetUniformLocation(_color_prg[index], "y_tex"), 0);
+ glUniform1i(glGetUniformLocation(_color_prg[index], "u_tex"), 1);
+ glUniform1i(glGetUniformLocation(_color_prg[index], "v_tex"), 2);
 }
- else if (_params.stereo_mode() == parameters::mode_top_bottom
- || _params.stereo_mode() == parameters::mode_top_bottom_half)
- {
- float dst_w = w;
- float dst_h = h / 2;
- float dst_ar = dst_w * screen_pixel_aspect_ratio() / dst_h;
- float src_ar = _frame[_active_index].aspect_ratio;
- float crop_ar = _params.crop_aspect_ratio();
- if (_params.stereo_mode() == parameters::mode_top_bottom_half)
- {
- src_ar *= 2.0f;
- crop_ar *= 2.0f;
- }
- 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());
- std::memcpy(_viewport[1], _viewport[0], sizeof(_viewport[1]));
- _viewport[1][1] = _viewport[0][1] + h / 2;
- std::memcpy(_tex_coords[1], _tex_coords[0], sizeof(_tex_coords[1]));
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, _color_fbo);
+ // left view: render into _color_tex[index][0]
+ if (frame.layout == video_frame::bgra32) {
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D, _input_bgra32_tex[left]);
+ } else {
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D, _input_yuv_y_tex[left]);
+ glActiveTexture(GL_TEXTURE1);
+ glBindTexture(GL_TEXTURE_2D, _input_yuv_u_tex[left]);
+ glActiveTexture(GL_TEXTURE2);
+ glBindTexture(GL_TEXTURE_2D, _input_yuv_v_tex[left]);
 }
- else if (_params.stereo_mode() == parameters::mode_hdmi_frame_pack)
- {
- // HDMI frame packing mode has left view top, right view bottom, plus a
- // blank area separating the two. 720p uses 30 blank lines (total: 720
- // + 30 + 720 = 1470), 1080p uses 45 (total: 10280 + 45 + 1080 = 2205).
- // In both cases, the blank area is 30/1470 = 45/2205 = 1/49 of the
- // total height. See the document "High-Definition Multimedia Interface
- // Specification Version 1.4a Extraction of 3D Signaling Portion" from
- // hdmi.org.
- int blank_lines = h / 49;
- float dst_w = w;
- float dst_h = (h - blank_lines) / 2;
- float dst_ar = dst_w * screen_pixel_aspect_ratio() / dst_h;
- 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());
- std::memcpy(_viewport[1], _viewport[0], sizeof(_viewport[1]));
- _viewport[1][1] = _viewport[0][1] + (h - blank_lines) / 2 + blank_lines;
- std::memcpy(_tex_coords[1], _tex_coords[0], sizeof(_tex_coords[1]));
+ glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
+ GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, _color_tex[index][0], 0);
+ xglCheckFBO(HERE);
+ draw_quad(-1.0f, +1.0f, +2.0f, -2.0f);
+ // right view: render into _color_tex[index][1]
+ if (left != right) {
+ if (frame.layout == video_frame::bgra32) {
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D, _input_bgra32_tex[right]);
+ } else {
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D, _input_yuv_y_tex[right]);
+ glActiveTexture(GL_TEXTURE1);
+ glBindTexture(GL_TEXTURE_2D, _input_yuv_u_tex[right]);
+ glActiveTexture(GL_TEXTURE2);
+ glBindTexture(GL_TEXTURE_2D, _input_yuv_v_tex[right]);
+ }
+ glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
+ GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, _color_tex[index][1], 0);
+ xglCheckFBO(HERE);
+ draw_quad(-1.0f, +1.0f, +2.0f, -2.0f);
 }
- else
- {
- float dst_w = w;
- float dst_h = h;
- float dst_ar = dst_w * screen_pixel_aspect_ratio() / dst_h;
- 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());
- std::memcpy(_viewport[1], _viewport[0], sizeof(_viewport[1]));
- std::memcpy(_tex_coords[1], _tex_coords[0], sizeof(_tex_coords[1]));
+
+ // Restore GL state
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framebuffer_bak);
+ if (scissor_bak)
+ glEnable(GL_SCISSOR_TEST);
+ glViewport(viewport_bak[0], viewport_bak[1], viewport_bak[2], viewport_bak[3]);
+ glMatrixMode(GL_PROJECTION);
+ glPopMatrix();
+ glMatrixMode(GL_MODELVIEW);
+ glPopMatrix();
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D, 0);
+ glDisable(GL_TEXTURE_2D);
+
+ // Finish the subtitle updating
+ if (subtitle.is_valid()) {
+ _subtitle_updater->finish();
+ int sub_outwidth, sub_outheight;
+ void *ptr;
+ int bb_x, bb_y, bb_w, bb_h;
+ bool buffer_updated = _subtitle_updater->get(
+ &sub_outwidth, &sub_outheight,
+ &ptr, &bb_x, &bb_y, &bb_w, &bb_h);
+ if (buffer_updated || !_subtitle_tex_current[index]) {
+ // Make sure the texture has the right size
+ assert(xglCheckError(HERE));
+ GLint tex_w, tex_h;
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D, _subtitle_tex[index]);
+ glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &tex_w);
+ glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &tex_h);
+ if (tex_w != sub_outwidth || tex_h != sub_outheight) {
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, sub_outwidth, sub_outheight, 0,
+ GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
+ }
+ // Clear the texture
+ GLint framebuffer_bak;
+ glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &framebuffer_bak);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, _input_fbo);
+ glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
+ GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, _subtitle_tex[index], 0);
+ xglCheckFBO(HERE);
+ glClear(GL_COLOR_BUFFER_BIT);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framebuffer_bak);
+ // Get a PBO buffer of appropriate size for the bounding box.
+ if (bb_w > 0 && bb_h > 0) {
+ size_t size = bb_w * bb_h * sizeof(uint32_t);
+ glBindBuffer(GL_PIXEL_UNPACK_BUFFER, _input_pbo);
+ glBufferData(GL_PIXEL_UNPACK_BUFFER, size, NULL, GL_STREAM_DRAW);
+ void* pboptr = glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
+ if (!pboptr)
+ throw exc(_("Cannot create a PBO buffer."));
+ assert(reinterpret_cast<uintptr_t>(pboptr) % 4 == 0);
+ // Copy the bounding box into the buffer
+ std::memcpy(pboptr, ptr, size);
+ // Update the appropriate part of the texture.
+ glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
+ glPixelStorei(GL_UNPACK_ROW_LENGTH, bb_w);
+ glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
+ glTexSubImage2D(GL_TEXTURE_2D, 0, bb_x, bb_y, bb_w, bb_h,
+ GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
+ glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+ assert(xglCheckError(HERE));
+ }
+ }
+ _subtitle_tex_current[index] = true;
+ if (buffer_updated) {
+ _subtitle_tex_current[index == 0 ? 1 : 0] = false;
+ }
 }
+ _subtitle[index] = subtitle;
+}
+
+void video_output::activate_next_frame()
+{
+ _active_index = (_active_index == 0 ? 1 : 0);
 }
 
 int64_t video_output::time_to_next_frame_presentation() const

bino-1.3.2.tar.xz/src/video_output.h -> bino-1.3.3.tar.xz/src/video_output.h Changed

@@ -5,6 +5,7 @@
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
 * Joe <cuchac@email.cz>
+ * Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -28,11 +29,18 @@
 
 #include <GL/glew.h>
 
+#include "blob.h"
+
 #include "media_data.h"
 #include "subtitle_renderer.h"
 #include "dispatch.h"
 
 
+class subtitle_updater;
+#if HAVE_LIBXNVCTRL
+class CNvSDIout;
+#endif // HAVE_LIBXNVCTRL
+
 class video_output : public controller
 {
 private:
@@ -45,39 +53,45 @@
 int _active_index; // 0 or 1
 
 video_frame _frame[2]; // input frames (active / preparing)
- parameters _params; // current parameters for display
 // Step 1: input of video data
+ video_frame _input_last_frame; // last frame for this step
 GLuint _input_pbo; // pixel-buffer object for texture uploading
 GLuint _input_fbo; // frame-buffer object for texture clearing
- GLuint _input_yuv_y_tex[2][2]; // for yuv formats: y component
- GLuint _input_yuv_u_tex[2][2]; // for yuv formats: u component
- GLuint _input_yuv_v_tex[2][2]; // for yuv formats: v component
- GLuint _input_bgra32_tex[2][2]; // for bgra32 format
- GLuint _input_subtitle_tex[2]; // for subtitles
- subtitle_box _input_subtitle_box[2];// the subtitle box currently stored in the texture
- int _input_subtitle_width[2]; // the width of the current subtitle texture
- int _input_subtitle_height[2]; // the height of the current subtitle texture
- int64_t _input_subtitle_time[2]; // the timestamp of the current subtitle texture
- parameters _input_subtitle_params; // the parameters of the current subtitle texture
- int _input_yuv_chroma_width_divisor[2]; // for yuv formats: chroma subsampling
- int _input_yuv_chroma_height_divisor[2]; // for yuv formats: chroma subsampling
+ GLuint _input_yuv_y_tex[2]; // for yuv formats: y component
+ GLuint _input_yuv_u_tex[2]; // for yuv formats: u component
+ GLuint _input_yuv_v_tex[2]; // for yuv formats: v component
+ GLuint _input_bgra32_tex[2]; // for bgra32 format
+ int _input_yuv_chroma_width_divisor; // for yuv formats: chroma subsampling
+ int _input_yuv_chroma_height_divisor; // for yuv formats: chroma subsampling
+ subtitle_box _subtitle[2]; // the current subtitle box
+ GLuint _subtitle_tex[2]; // subtitle texture
+ bool _subtitle_tex_current[2]; // whether the subtitle tex contains the current subtitle buffer
 // Step 2: color space conversion and color correction
- video_frame _color_last_frame; // last frame for this step; used for reinitialization check
- GLuint _color_prg; // color space transformation, color adjustment
+ video_frame _color_last_frame[2]; // last frame for this step; used for reinitialization check
+ GLuint _color_prg[2]; // color space transformation, color adjustment
 GLuint _color_fbo; // framebuffer object to render into the sRGB texture
- GLuint _color_tex[2]; // output: SRGB8 or linear RGB16 texture
+ GLuint _color_tex[2][2]; // output: SRGB8 or linear RGB16 texture
 // Step 3: rendering
+ parameters _render_params; // current parameters for display
 parameters _render_last_params; // last params for this step; used for reinitialization check
+ video_frame _render_last_frame; // last frame for this step; used for reinitialization check
 GLuint _render_prg; // reads sRGB texture, renders according to _params[_active_index]
 GLuint _render_dummy_tex; // an empty subtitle texture
 GLuint _render_mask_tex; // for the masking modes even-odd-{rows,columns}, checkerboard
+ blob _3d_ready_sync_buf; // for 3-D Ready Sync pixels
 // OpenGL viewports and tex coordinates for drawing the two views of the video frame
+ GLint _full_viewport[4];
 GLint _viewport[2][4];
 float _tex_coords[2][4][2];
 
-private:
+ subtitle_updater *_subtitle_updater; // the subtitle updater thread
+#if HAVE_LIBXNVCTRL
+ CNvSDIout *_nv_sdi_output; // access the nvidia quadro sdi output card
+#endif // HAVE_LIBXNVCTRL
+
 // GL Helper functions
 bool xglCheckError(const std::string& where = std::string()) const;
+ bool xglCheckFBO(const std::string& where = std::string()) const;
 GLuint xglCompileShader(const std::string& name, GLenum type, const std::string& src) const;
 GLuint xglCreateProgram(GLuint vshader, GLuint fshader) const;
 GLuint xglCreateProgram(const std::string& name,
@@ -85,35 +99,39 @@
 void xglLinkProgram(const std::string& name, const GLuint prg) const;
 void xglDeleteProgram(GLuint prg) const;
 
+ bool srgb8_textures_are_color_renderable();
+
 void draw_quad(float x, float y, float w, float h,
 const float tex_coords[2][4][2] = NULL,
 const float more_tex_coords[4][2] = NULL) const;
 
 // Step 1: initialize/deinitialize, and check if reinitialization is necessary
- void input_init(int index, const video_frame &frame);
- void input_deinit(int index);
- bool input_is_compatible(int index, const video_frame &current_frame);
+ void input_init(const video_frame &frame);
+ void input_deinit();
+ bool input_is_compatible(const video_frame &current_frame);
+ void subtitle_init(int index);
+ void subtitle_deinit(int index);
 // Step 2: initialize/deinitialize, and check if reinitialization is necessary
- void color_init(const video_frame &frame);
- void color_deinit();
- bool color_is_compatible(const video_frame &current_frame);
+ void color_init(int index, const video_frame &frame);
+ void color_deinit(int index);
+ bool color_is_compatible(int index, const video_frame &current_frame);
 // Step 3: initialize/deinitialize, and check if reinitialization is necessary
 void render_init();
 void render_deinit();
+ bool render_needs_subtitle(const parameters& params);
+ bool render_needs_coloradjust(const parameters& params);
+ bool render_needs_ghostbust(const parameters& params);
 bool render_is_compatible();
 
- // Update the subtitle texture with the given subtitle and according to the
- // current video display width and height.
- void update_subtitle_tex(int index, const video_frame &frame, const subtitle_box &subtitle, const parameters &params);
-
 protected:
 subtitle_renderer _subtitle_renderer;
 
 virtual GLEWContext* glewGetContext() const = 0;
 
- // Get total size of the video display area. For single window output, this
- // is the same as the current viewport. The Equalizer video output can override
- // this function.
+ // Get the total viewport size.
+ int full_display_width() const;
+ int full_display_height() const;
+ // Get size of the viewport area that is used for video. This is overridable for Equalizer.
 virtual int video_display_width() const;
 virtual int video_display_height() const;
 
@@ -122,7 +140,7 @@
 virtual void trigger_resize(int w, int h) = 0; // Trigger a resize the video area
 
 void clear() const; // Clear the video area
- void reshape(int w, int h); // Call this when the video area was resized
+ void reshape(int w, int h, const parameters& params = dispatch::parameters()); // Call this when the video area was resized
 
 /* Get screen properties (fixed) */
 virtual int screen_width() const = 0; // in pixels
@@ -137,16 +155,30 @@
 
 /* Display the current frame.
 * The first version is used by Equalizer, which needs to set some special properties.
- * The second version is for everyone else.
+ * The second version is used by NVIDIA SDI output.
+ * The third version is for everyone else.
 * TODO: This function needs to handle interlaced frames! */
 void display_current_frame(int64_t display_frameno, bool keep_viewport, bool mono_right_instead_of_left,
 float x, float y, float w, float h,
- const GLint viewport[2][4], const float tex_coords[2][4][2]);
+ const GLint viewport[2][4], const float tex_coords[2][4][2],
+ int dst_width, int dst_height,
+ parameters::stereo_mode_t stereo_mode);
+ void display_current_frame(int64_t display_frameno, int dst_width, int dst_height, parameters::stereo_mode_t stereo_mode)
+ {
+ display_current_frame(display_frameno, false, false, -1.0f, -1.0f, 2.0f, 2.0f,
+ _viewport, _tex_coords, dst_width, dst_height, stereo_mode);
+ }
 void display_current_frame(int64_t display_frameno = 0)
 {
- display_current_frame(display_frameno, false, false, -1.0f, -1.0f, 2.0f, 2.0f, _viewport, _tex_coords);
+ display_current_frame(display_frameno, false, false, -1.0f, -1.0f, 2.0f, 2.0f,
+ _viewport, _tex_coords, video_display_width(), video_display_height(),
+ dispatch::parameters().stereo_mode());
 }
 
+#if HAVE_LIBXNVCTRL
+ void sdi_output(int64_t display_frameno = 0);
+#endif // HAVE_LIBXNVCTRL
+
 public:
 /* Constructor, Destructor */
 video_output();

bino-1.3.2.tar.xz/src/video_output_color.fs.glsl -> bino-1.3.3.tar.xz/src/video_output_color.fs.glsl Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010-2011
+ * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -52,12 +52,6 @@
 uniform sampler2D srgb_tex;
 #endif
 
-uniform float contrast;
-uniform float brightness;
-uniform float saturation;
-uniform float cos_hue;
-uniform float sin_hue;
-
 /* The YUV triplets used internally in this shader use the following
 * conventions:
 * - All three components are in the range [0,1]
@@ -67,18 +61,6 @@
 * - The color space is either the one defined in ITU.BT-601 or the one
 * defined in ITU.BT-709. */
 
-#if defined(layout_bgra32)
-vec3 srgb_to_yuv(vec3 srgb)
-{
- // According to ITU.BT-601 (see formulas in Sec. 2.5.1 and 2.5.2)
- mat3 m = mat3(
- 0.299, -0.168736, 0.5,
- 0.587, -0.331264, -0.418688,
- 0.114, 0.5, -0.081312);
- return m * srgb + vec3(0.0, 0.5, 0.5);
-}
-#endif
-
 vec3 yuv_to_srgb(vec3 yuv)
 {
 // Convert the MPEG range to the full range for each component, if necessary
@@ -120,42 +102,26 @@
 }
 #endif
 
-vec3 adjust_yuv(vec3 yuv)
-{
- // Adapted from http://www.silicontrip.net/~mark/lavtools/yuvadjust.c
- // (Copyright 2002 Alfonso Garcia-Patiño Barbolani, released under GPLv2 or later)
-
- // brightness and contrast
- float ay = (yuv.x - 0.5) * (contrast + 1.0) + brightness + 0.5;
- // hue and saturation
- float au = (cos_hue * (yuv.y - 0.5) - sin_hue * (yuv.z - 0.5)) * (saturation + 1.0) + 0.5;
- float av = (sin_hue * (yuv.y - 0.5) + cos_hue * (yuv.z - 0.5)) * (saturation + 1.0) + 0.5;
-
- return vec3(ay, au, av);
-}
-
-vec3 get_yuv(vec2 tex_coord)
+vec3 get_srgb(vec2 tex_coord)
 {
 #if defined(layout_bgra32)
- return srgb_to_yuv(texture2D(srgb_tex, tex_coord).xyz);
+ return texture2D(srgb_tex, tex_coord).xyz;
 #elif defined(value_range_8bit_full) || defined(value_range_8bit_mpeg)
- return vec3(
- texture2D(y_tex, tex_coord).x,
- texture2D(u_tex, tex_coord + vec2(chroma_offset_x, chroma_offset_y)).x,
- texture2D(v_tex, tex_coord + vec2(chroma_offset_x, chroma_offset_y)).x);
+ return yuv_to_srgb(vec3(
+ texture2D(y_tex, tex_coord).x,
+ texture2D(u_tex, tex_coord + vec2(chroma_offset_x, chroma_offset_y)).x,
+ texture2D(v_tex, tex_coord + vec2(chroma_offset_x, chroma_offset_y)).x));
 #else
- return (65535.0 / 1023.0) * vec3(
- texture2D(y_tex, tex_coord).x,
- texture2D(u_tex, tex_coord + vec2(chroma_offset_x, chroma_offset_y)).x,
- texture2D(v_tex, tex_coord + vec2(chroma_offset_x, chroma_offset_y)).x);
+ return yuv_to_srgb((65535.0 / 1023.0) * vec3(
+ texture2D(y_tex, tex_coord).x,
+ texture2D(u_tex, tex_coord + vec2(chroma_offset_x, chroma_offset_y)).x,
+ texture2D(v_tex, tex_coord + vec2(chroma_offset_x, chroma_offset_y)).x));
 #endif
 }
 
 void main()
 {
- vec3 yuv = get_yuv(gl_TexCoord[0].xy);
- vec3 adjusted_yuv = adjust_yuv(yuv);
- vec3 srgb = yuv_to_srgb(adjusted_yuv);
+ vec3 srgb = get_srgb(gl_TexCoord[0].xy);
 #if defined(storage_srgb)
 gl_FragColor = vec4(srgb, 1.0);
 #else

bino-1.3.2.tar.xz/src/video_output_qt.cpp -> bino-1.3.3.tar.xz/src/video_output_qt.cpp Changed

bino-1.3.2.tar.xz/src/video_output_qt.h -> bino-1.3.3.tar.xz/src/video_output_qt.h Changed

@@ -50,27 +50,20 @@
     video_output_qt* _vo_qt;
     video_output_qt_widget* _vo_qt_widget;
     bool _render;
-    bool _resize;
     int _w, _h;
-    mutex _action_mutex;
-    condition _action_cond;
+    mutex _wait_mutex;
+    condition _wait_cond;
     bool _action_activate;
     bool _action_prepare;
+    bool _action_finished;
+    bool _redisplay;
     video_frame _next_frame;
     subtitle_box _next_subtitle;
     bool _failure;
     exc _e;
-
     // The display frame number
     int64_t _display_frameno;
 
-    // For estimation of next display frame presentation time
-    mutex _pt_mutex;
-    static const int _pts = 5;
-    int64_t _pt[_pts];
-    int _ptc;
-    int _pti;
-
 public:
     gl_thread(video_output_qt* vo_qt, video_output_qt_widget* vo_qt_widget);
 
@@ -82,6 +75,7 @@
     void resize(int w, int h);
     void activate_next_frame();
     void prepare_next_frame(const video_frame &frame, const subtitle_box &subtitle);
+    void redisplay();
 
     int64_t time_to_next_frame_presentation();
 
@@ -120,6 +114,7 @@
 
     void start_rendering();
     void stop_rendering();
+    void redisplay();
     class gl_thread* gl_thread()
     {
         return &_gl_thread;
@@ -134,7 +129,7 @@
     virtual bool event(QEvent* e) { return QWidget::event(e); }
 # endif
 #endif
-    virtual void paintEvent(QPaintEvent*) {}
+    virtual void paintEvent(QPaintEvent* event);
     virtual void resizeEvent(QResizeEvent* event);
     virtual void keyPressEvent(QKeyEvent *event);
     virtual void mouseReleaseEvent(QMouseEvent *event);
@@ -159,6 +154,7 @@
 signals:
 protected:
     virtual QSize sizeHint() const;
+    virtual void moveEvent(QMoveEvent* event);
     virtual void closeEvent(QCloseEvent *event);
     virtual void receive_notification(const notification& note);
 };

bino-1.3.2.tar.xz/src/video_output_render.fs.glsl -> bino-1.3.3.tar.xz/src/video_output_render.fs.glsl Changed

@@ -41,12 +41,34 @@
 // mode_checkerboard
 #define $mode
 
+// subtitle_enabled
+// subtitle_disabled
+#define $subtitle
+
+// coloradjust_enabled
+// coloradjust_disabled
+#define $coloradjust
+
+// ghostbust_enabled
+// ghostbust_disabled
+#define $ghostbust
+
 uniform sampler2D rgb_l;
 uniform sampler2D rgb_r;
 uniform float parallax;
 
+#if defined(subtitle_enabled)
 uniform sampler2D subtitle;
 uniform float subtitle_parallax;
+#endif
+
+#if defined(coloradjust_enabled)
+uniform mat4 color_matrix;
+#endif
+
+#if defined(ghostbust_enabled) && (defined(mode_onechannel) || defined(mode_even_odd_rows) || defined(mode_even_odd_columns) || defined(mode_checkerboard))
+uniform vec3 crosstalk;
+#endif
 
 #if defined(mode_onechannel)
 uniform float channel;  // 0.0 for left, 1.0 for right
@@ -58,9 +80,6 @@
 uniform float step_y;
 #endif
 
-#if defined(mode_onechannel) || defined(mode_even_odd_rows) || defined(mode_even_odd_columns) || defined(mode_checkerboard)
-uniform vec3 crosstalk;
-#endif
 
 #if defined(mode_red_cyan_monochrome) || defined(mode_red_cyan_half_color) || defined(mode_green_magenta_monochrome) || defined(mode_green_magenta_half_color) || defined(mode_amber_blue_monochrome) || defined(mode_amber_blue_half_color) || defined(mode_red_green_monochrome) || defined(mode_red_blue_monochrome)
 float srgb_to_lum(vec3 srgb)
@@ -95,36 +114,52 @@
 }
 
 #if defined(mode_onechannel) || defined(mode_even_odd_rows) || defined(mode_even_odd_columns) || defined(mode_checkerboard)
+#  if defined(ghostbust_enabled)
 vec3 ghostbust(vec3 original, vec3 other)
 {
     return original + crosstalk - (other + original) * crosstalk;
 }
+#  else
+#    define ghostbust(original, other) original
+#  endif
 #endif
 
-vec3 tex_l(vec2 texcoord)
+#if defined(coloradjust_enabled)
+vec3 adjust_color(vec3 rgb)
 {
-    return texture2D(rgb_l, texcoord + vec2(parallax, 0.0)).rgb;
+    vec4 rgbw = color_matrix * vec4(rgb, 1.0);
+    float w = max(rgbw.w, 0.0001);
+    return clamp(rgbw.rgb / w, 0.0, 1.0);
 }
+#else
+#  define adjust_color(rgb) rgb
+#endif
 
+vec3 tex_l(vec2 texcoord)
+{
+    return adjust_color(texture2D(rgb_l, texcoord + vec2(parallax, 0.0)).rgb);
+}
 vec3 tex_r(vec2 texcoord)
 {
-    return texture2D(rgb_r, texcoord - vec2(parallax, 0.0)).rgb;
+    return adjust_color(texture2D(rgb_r, texcoord - vec2(parallax, 0.0)).rgb);
 }
 
+#if defined(subtitle_enabled)
 vec4 sub_l(vec2 texcoord)
 {
     return texture2D(subtitle, vec2(texcoord.x + subtitle_parallax, 1.0 - texcoord.y));
 }
-
 vec4 sub_r(vec2 texcoord)
 {
     return texture2D(subtitle, vec2(texcoord.x - subtitle_parallax, 1.0 - texcoord.y));
 }
-
 vec3 blend_subtitle(vec3 rgb, vec4 sub)
 {
     return mix(rgb, sub.rgb, sub.a);
 }
+#else
+#  define blend_subtitle(rgb, sub) rgb
+#endif
 
 void main()
 {