Packman Build Service PMBS

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 +++++

bino-1.3.2.tar.xz/Makefile.in -> bino-1.3.3.tar.xz/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.
@@ -64,11 +64,11 @@
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = pkg/macosx/Info.plist
 CONFIG_CLEAN_VPATH_FILES =
-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   " $@;
-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 = @
 SOURCES =
 DIST_SOURCES =
@@ -91,9 +91,11 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^$[^/]*$/.*$$,\1,'; \
@@ -122,6 +124,8 @@
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -279,6 +283,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+xnvctrl_CFLAGS = @xnvctrl_CFLAGS@
+xnvctrl_LDFLAGS = @xnvctrl_LDFLAGS@
 SUBDIRS = po src doc
 ACLOCAL_AMFLAGS = -I m4
 
@@ -292,7 +298,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -328,10 +334,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -556,7 +560,11 @@
 	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__remove_distdir)
 
 dist-lzma: distdir
@@ -564,7 +572,7 @@
 	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -595,6 +603,8 @@
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -614,6 +624,7 @@
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -642,8 +653,16 @@
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -674,10 +693,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:
@@ -764,8 +788,8 @@
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
+	dist-hook dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dvi install-dvi-am \

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.
 #

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

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

@@ -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.
@@ -58,11 +58,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-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   " $@;
-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 = @
 SOURCES =
 DIST_SOURCES =
@@ -101,6 +101,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; }; \
+  }
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
@@ -262,6 +268,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+xnvctrl_CFLAGS = @xnvctrl_CFLAGS@
+xnvctrl_LDFLAGS = @xnvctrl_LDFLAGS@
 man_MANS = bino.1
 info_TEXINFOS = bino.texi
 ICONS_LOCAL = \
@@ -544,9 +552,7 @@
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-dist_htmlDATA: $(dist_html_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
@@ -564,9 +570,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(htmldir)" && rm -f $$files
+	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -637,10 +641,15 @@
 
 installcheck: installcheck-am
 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:
@@ -699,13 +708,14 @@
 	for p in $$list; do \
 	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  $(am__strip_dir) \
-	  if test -d "$$d$$p"; then \
+	  d2=$$d$$p; \
+	  if test -d "$$d2"; then \
 	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
 	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-	    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-	    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
+	    echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
 	  else \
-	    list2="$$list2 $$d$$p"; \
+	    list2="$$list2 $$d2"; \
 	  fi; \
 	done; \
 	test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
@@ -737,8 +747,13 @@
 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
 	@$(POST_INSTALL)
-	@if (install-info --version && \
-	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
+	@am__run_installinfo=yes; \
+	case $$AM_UPDATE_INFO_DIR in \
+	  n|no|NO) am__run_installinfo=no;; \
+	  *) (install-info --version) >/dev/null 2>&1 \
+	       || am__run_installinfo=no;; \
+	esac; \
+	if test $$am__run_installinfo = yes; then \
 	  list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \

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.

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'

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

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

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

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

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

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

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

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'"

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 $@ $<

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;

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:

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

@@ -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.
@@ -59,11 +59,11 @@
 LIBRARIES = $(noinst_LIBRARIES)
 AR = ar
 ARFLAGS = cru
-AM_V_AR = $(am__v_AR_$(V))
-am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
 am__v_AR_0 = @echo " AR " $@;
-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 = @
 libbase_a_AR = $(AR) $(ARFLAGS)
 libbase_a_LIBADD =
@@ -77,27 +77,27 @@
 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 " $@;
 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 = $(libbase_a_SOURCES)
 DIST_SOURCES = $(libbase_a_SOURCES)
@@ -260,6 +260,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+xnvctrl_CFLAGS = @xnvctrl_CFLAGS@
+xnvctrl_LDFLAGS = @xnvctrl_LDFLAGS@
 noinst_LIBRARIES = libbase.a
 libbase_a_SOURCES = \
 	str.h str.cpp \
@@ -311,7 +313,7 @@
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libbase.a: $(libbase_a_OBJECTS) $(libbase_a_DEPENDENCIES) 
+libbase.a: $(libbase_a_OBJECTS) $(libbase_a_DEPENDENCIES) $(EXTRA_libbase_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libbase.a
 	$(AM_V_AR)$(libbase_a_AR) libbase.a $(libbase_a_OBJECTS) $(libbase_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libbase.a
@@ -334,18 +336,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) '$<'`
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -443,10 +443,15 @@
 
 installcheck: installcheck-am
 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.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));

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())));
- }

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 =

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") {

bino-1.3.2.tar.xz/src/media_data.h -> bino-1.3.3.tar.xz/src/media_data.h 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
@@ -46,6 +47,7 @@
 int height; // Request frames of the given height (0 means default).
 int frame_rate_num; // Request a specific frame rate (0/0 means default).
 int frame_rate_den; // For example 1/25, 1/30, ...
+ bool request_mjpeg; // Request MJPEG format from device
 
 // Constructor
 device_request();
@@ -80,6 +82,7 @@
 // Convert the stereo layout to and from a string representation
 static std::string stereo_layout_to_string(stereo_layout_t stereo_layout, bool stereo_layout_swap);
 static void stereo_layout_from_string(const std::string &s, stereo_layout_t &stereo_layout, bool &stereo_layout_swap);
+ static bool parse_stereo_layout(const std::string& s, stereo_layout_t* stereo_layout);
 
 // Stereo mode: the output mode for left and right view
 typedef enum {
@@ -114,6 +117,7 @@
 // Convert the stereo mode to and from a string representation
 static std::string stereo_mode_to_string(stereo_mode_t stereo_mode, bool stereo_mode_swap);
 static void stereo_mode_from_string(const std::string &s, stereo_mode_t &stereo_mode, bool &stereo_mode_swap);
+ static bool parse_stereo_mode(const std::string& s, stereo_mode_t* stereo_mode);
 
 typedef enum {
 no_loop, // Do not loop.
@@ -169,6 +173,7 @@
 PARAMETER(bool, fullscreen_flip_right) // Flip right view vertically in fullscreen mode
 PARAMETER(bool, fullscreen_flop_right) // Flop right view horizontally in fullscreen mode
 PARAMETER(bool, fullscreen_inhibit_screensaver) // Inhibit screensaver when in fullscreen mode
+ PARAMETER(bool, fullscreen_3d_ready_sync) // Use DLP 3-D Ready Sync in fullscreen mode
 PARAMETER(float, contrast) // Contrast adjustment, -1 .. +1
 PARAMETER(float, brightness) // Brightness adjustment, -1 .. +1
 PARAMETER(float, hue) // Hue adjustment, -1 .. +1
@@ -181,6 +186,12 @@
 PARAMETER(int, subtitle_size) // Subtitle point size, -1 means keep default
 PARAMETER(float, subtitle_scale) // Scale factor
 PARAMETER(uint64_t, subtitle_color) // Subtitle color in uint32_t bgra32 format, > UINT32_MAX means keep default
+ PARAMETER(int, subtitle_shadow) // Subtitle shadow, -1 = default, 0 = force off, 1 = force on
+#if HAVE_LIBXNVCTRL
+ PARAMETER(int, sdi_output_format) // SDI output format
+ PARAMETER(stereo_mode_t, sdi_output_left_stereo_mode) // SDI output left stereo mode
+ PARAMETER(stereo_mode_t, sdi_output_right_stereo_mode) // SDI output right stereo mode
+#endif // HAVE_LIBXNVCTRL
 // Per-Video parameters
 PARAMETER(int, video_stream) // Video stream index
 PARAMETER(int, audio_stream) // Audio stream index, or -1 if there is no audio stream
@@ -375,12 +386,17 @@
 // Constructor, Destructor
 subtitle_box();
 
- // Comparison. This assumes that two subtitle boxes are identical when they
- // have the same presentation times.
+ // Comparison.
 bool operator==(const subtitle_box &box) const
 {
- return (presentation_start_time == box.presentation_start_time
- && presentation_stop_time == box.presentation_stop_time);
+ if (!is_valid() && !box.is_valid()) {
+ return true;
+ } else if (format == image) {
+ return (presentation_start_time == box.presentation_start_time
+ && presentation_stop_time == box.presentation_stop_time);
+ } else {
+ return style == box.style && str == box.str;
+ }
 }
 bool operator!=(const subtitle_box &box) const
 {

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)
+{

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

@@ -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
@@ -65,10 +66,11 @@
 gl_thread::gl_thread(video_output_qt* vo_qt, video_output_qt_widget* vo_qt_widget) :
 _vo_qt(vo_qt), _vo_qt_widget(vo_qt_widget),
 _render(false),
- _resize(false),
 _action_activate(false),
 _action_prepare(false),
- _failure(false)
+ _action_finished(false),
+ _failure(false),
+ _display_frameno(0)
 {
 }
 
@@ -81,35 +83,45 @@
 
 void gl_thread::set_render(bool r)
 {
+ _redisplay = r;
 _render = r;
- _display_frameno = 0;
- _pti = 0;
- _ptc = 0;
 }
 
 void gl_thread::resize(int w, int h)
 {
 _w = w;
 _h = h;
- _resize = true;
 }
 
 void gl_thread::activate_next_frame()
 {
- _action_mutex.lock();
+ if (_failure)
+ return;
+ _wait_mutex.lock();
+ _action_finished = false;
 _action_activate = true;
- _action_cond.wait(_action_mutex);
- _action_mutex.unlock();
+ _wait_cond.wait(_wait_mutex);
+ _action_finished = true;
+ _wait_mutex.unlock();
 }
 
 void gl_thread::prepare_next_frame(const video_frame &frame, const subtitle_box &subtitle)
 {
- _action_mutex.lock();
+ if (_failure)
+ return;
+ _wait_mutex.lock();
 _next_subtitle = subtitle;
 _next_frame = frame;
+ _action_finished = false;
 _action_prepare = true;
- _action_cond.wait(_action_mutex);
- _action_mutex.unlock();
+ _wait_cond.wait(_wait_mutex);
+ _action_finished = true;
+ _wait_mutex.unlock();
+}
+
+void gl_thread::redisplay()
+{
+ _redisplay = true;
 }
 
 void gl_thread::run()
@@ -119,22 +131,6 @@
 _vo_qt_widget->makeCurrent();
 assert(QGLContext::currentContext() == _vo_qt_widget->context());
 while (_render) {
- _action_mutex.lock();
- if (_action_activate) {
- _vo_qt->video_output::activate_next_frame();
- _action_activate = false;
- _action_cond.wake_one();
- }
- if (_action_prepare) {
- _vo_qt->video_output::prepare_next_frame(_next_frame, _next_subtitle);
- _action_prepare = false;
- _action_cond.wake_one();
- }
- _action_mutex.unlock();
- if (_resize) {
- _vo_qt->reshape(_w, _h);
- _resize = false;
- }
 #ifdef Q_WS_X11
 GLuint counter;
 if (GLXEW_SGI_video_sync && glXGetVideoSyncSGI(&counter) == 0)
@@ -144,17 +140,40 @@
 #else
 _display_frameno++;
 #endif
- _vo_qt->display_current_frame(_display_frameno);
- _vo_qt_widget->swapBuffers();
- // When the buffer swap returns, the current frame is just now presented on screen.
- _pt_mutex.lock();
- _pt[_pti] = timer::get_microseconds(timer::monotonic);
- _pti++;
- if (_pti >= _pts)
- _pti = 0;
- if (_ptc < _pts)
- _ptc++;
- _pt_mutex.unlock();
+ // In alternating mode, we should always present both left and right view of
+ // a stereo video frame before advancing to the next video frame. This means we
+ // can only switch video frames every other output frame.
+ if (dispatch::parameters().stereo_mode() != parameters::mode_alternating
+ || _display_frameno % 2 == 0) {
+ if (_action_activate) {
+ _vo_qt->video_output::activate_next_frame();
+ _action_activate = false;
+ _wait_cond.wake_one();
+ _redisplay = true;
+ }
+ }
+ if (_action_prepare) {
+ _vo_qt->video_output::prepare_next_frame(_next_frame, _next_subtitle);
+ _action_prepare = false;
+ _wait_cond.wake_one();
+ }
+ if (_w > 0 && _h > 0
+ && (_vo_qt->full_display_width() != _w
+ || _vo_qt->full_display_height() != _h)) {
+ _vo_qt->reshape(_w, _h);
+ _redisplay = true;
+ }
+ if (_redisplay || dispatch::parameters().stereo_mode() == parameters::mode_alternating) {
+ _redisplay = false;
+ _vo_qt->display_current_frame(_display_frameno);
+#if HAVE_LIBXNVCTRL
+ _vo_qt->sdi_output(_display_frameno);
+#endif // HAVE_LIBXNVCTRL
+ _vo_qt_widget->swapBuffers();
+ } else {
+ // do not busy loop
+ usleep(1000);
+ }
 }
 }
 catch (std::exception& e) {
@@ -162,31 +181,19 @@
 _render = false;
 _failure = true;
 }
+ if (_action_activate || _action_prepare) {
+ while (!_action_finished)
+ _wait_cond.wake_one();
+ }
 _vo_qt_widget->doneCurrent();
 }
 
 int64_t gl_thread::time_to_next_frame_presentation()
 {
- if (_ptc < _pts) // no reliable data yet; assume immediate display
- return 0;
- _pt_mutex.lock();
- int last_pti = _pti == 0 ? _pts - 1 : _pti - 1;
- int64_t last_pt = _pt[last_pti];
- int64_t presentation_duration = 0;
- for (int i = 0; i < _pts - 1; i++) {
- int cpti = _pti - i - 1;
- if (cpti < 0)
- cpti += _pts;
- int ppti = cpti - 1;
- if (ppti < 0)
- ppti = _pts - 1;
- assert(_pt[cpti] - _pt[ppti] >= 0);
- presentation_duration += _pt[cpti] - _pt[ppti];
- }
- presentation_duration /= _pts - 1;
- _pt_mutex.unlock();
- int64_t now = timer::get_microseconds(timer::monotonic);
- return last_pt + presentation_duration - now;
+ // TODO: return a good estimate of the number of microseconds that will
+ // pass until the next buffer swap completes. For now, just assume that
+ // the next frame will display immediately.
+ return 0;
 }
 
 /* The GL widget */
@@ -250,6 +257,16 @@
 _timer.stop();
 }
 
+void video_output_qt_widget::redisplay()
+{
+ _gl_thread.redisplay();

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()
 {

Changes of Revision 12