Packman Build Service PMBS

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

Changes of Revision 8

bino.changes Changed

bino.spec Changed

bino-1.1.0.tar.bz2/TODO Deleted

bino-1.1.0.tar.bz2/AUTHORS -> bino-1.1.1.tar.bz2/AUTHORS Changed

bino-1.1.0.tar.bz2/ChangeLog -> bino-1.1.1.tar.bz2/ChangeLog Changed

@@ -1,3 +1,324 @@
+commit d30c7a85846580bc73b7549e47042acf75c7bc44
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-22 11:26:21 +0200
+
+    Bump version to 1.1.1.
+
+ AUTHORS      |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 58e277bfe7ad601f366be4901e6cfa8d78d7c3f6
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-22 10:50:21 +0200
+
+    Remove TODO file. All entries are now in the bug tracker.
+
+ Makefile.am |    2 +-
+ TODO        |   32 --------------------------------
+ 2 files changed, 1 insertions(+), 33 deletions(-)
+
+commit 90bea74c2aef13667baa2a25215c45d89bdcfc53
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-21 13:39:43 +0200
+
+    Windows: update and simplify build instructions.
+
+ README.Windows |  100 ++++----------------------------------------------------
+ 1 files changed, 7 insertions(+), 93 deletions(-)
+
+commit 8df7a6f1bd994002a4dca6e7d7112e012434228d
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-21 13:37:48 +0200
+
+    Fix a few compiler warnings for gcc-4.6.0.
+
+ src/media_data.cpp   |    2 +-
+ src/media_object.cpp |    3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+commit 9a54a2debee9d17d7ff16bfef2a0ebf5f0172e8c
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-20 15:35:33 +0200
+
+    configure: add -pthread option only if the compiler supports it.
+
+ configure.ac |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 569e6657c5a0d5473d24be9e57754621dbfab8c2
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-19 20:52:39 +0200
+
+    Player: properly announce play state when starting in non-GUI mode.
+    
+    This fixes bug #33351, reported and diagnosed by Robert Pliszko.
+
+ src/player.cpp          |    1 +
+ src/video_output_qt.cpp |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 5188292ae04f90fe4ff39451b57f97fc21151b77
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-18 21:30:07 +0200
+
+    Fix compilation with older gcc releases.
+
+ src/video_output.cpp |   24 ++++++++++++++++--------
+ 1 files changed, 16 insertions(+), 8 deletions(-)
+
+commit d7a2566be5606fc288d23d9ffe8a86e5686c6472
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-18 06:51:50 +0200
+
+    GUI: stop timer before exiting.
+
+ src/player_qt.cpp |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 178d4e6f5cedecd08b961a745470ec6a0decc391
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-18 06:42:31 +0200
+
+    LIRC: fix crash on command "play" when there is no input data.
+
+ src/player.h      |    4 ++++
+ src/player_qt.cpp |    2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit aa2aa2d9837cb9e8bbe31ed11c6f94bda149c86f
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-17 21:26:46 +0200
+
+    LIRC: improve the set of commands, and make it work when the player is stopped.
+
+ doc/bino.texi     |   10 ++++---
+ src/lirc.cpp      |   74 +++++++++++++++++++++++++++++++++++++++++++++-------
+ src/lirc.h        |    8 +++++
+ src/player_qt.cpp |   32 +++++++++++++----------
+ src/player_qt.h   |    1 +
+ 5 files changed, 97 insertions(+), 28 deletions(-)
+
+commit 8adf956ff09de1df7f6a3e92a9f0a54ea2c3abc7
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-17 19:56:27 +0200
+
+    Add flexible fullscreen modes with support for multiple screens.
+
+ NEWS                            |    2 +-
+ doc/bino.1                      |   15 ++-
+ doc/bino.texi                   |   29 +++--
+ src/controller.h                |   12 ++-
+ src/main.cpp                    |   50 +++++++-
+ src/media_data.cpp              |   38 +++++-
+ src/media_data.h                |    6 +-
+ src/player.cpp                  |   47 +++++++-
+ src/player_equalizer.cpp        |    1 +
+ src/player_qt.cpp               |  246 ++++++++++++++++++++++++++++++++++-----
+ src/video_output.cpp            |   99 +++++++++++-----
+ src/video_output.h              |    1 +
+ src/video_output_qt.cpp         |   78 +++++++++++--
+ src/video_output_qt.h           |    5 +-
+ src/video_output_render.fs.glsl |   32 +++---
+ 15 files changed, 539 insertions(+), 122 deletions(-)
+
+commit 96ab59272883a1c94227dec88b9198e676ea73c8
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-17 10:52:19 +0200
+
+    Base module opt: allow empty tuples.
+
+ src/base/opt.h |   33 ++++++++++++++++++---------------
+ 1 files changed, 18 insertions(+), 15 deletions(-)
+
+commit 559aa8e9305f894d08d730e8eb25b820c21e083d
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-16 06:41:17 +0200
+
+    GUI: re-establish keyboard focus after leaving fullscreen mode.
+
+ src/video_output_qt.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit e4a297e02b45e4d2bfef14240ad50e244ea80bbf
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-15 21:08:31 +0200
+
+    Manual: improve section on LIRC support.
+
+ doc/bino.texi |   31 ++++++++++++++++---------------
+ 1 files changed, 16 insertions(+), 15 deletions(-)
+
+commit 457da87669bc20ac51e9e0b71415387cb8b925bb
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-14 11:44:00 +0200
+
+    GUI: focus the Play button after opening a file.
+
+ src/player_qt.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 9bb0d74d8eb6647ef2b01c029ec1e6c30a8957a8
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-14 11:18:11 +0200
+
+    Change parallax adjustment border behaviour.
+    
+    Previously the image was extended using the edge color, which was seen as
+    strange (bug #33277). Now black is used instead for video areas that are
+    not available.
+
+ src/video_output.cpp |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ddaa4a614bd9ca866e54fd5ee4ea5ff09bf937b2
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-14 11:08:46 +0200
+
+    GUI: fix/improve keyboard focus behaviour.
+    
+    Now the video area always re-grabs the keyboard focus if it loses it.
+    Drawback: you cannot navigate e.g. through video output methods with the
+    keyboards anymore; this only works with the mouse.
+
+ src/player_qt.cpp       |    8 ++++++--
+ src/player_qt.h         |    1 +
+ src/video_output_qt.cpp |   16 +++++++++++++---
+ src/video_output_qt.h   |    4 ++++
+ 4 files changed, 24 insertions(+), 5 deletions(-)
+
+commit 9ba0c8922b596d35f5e65cd97d7fe034c244c83b
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-05-14 10:39:17 +0200
+
+    GUI: allow double click to toggle fullscreen.
+
+ src/video_output_qt.cpp |   18 ++++++++++++++++++
+ src/video_output_qt.h   |    2 ++
+ 2 files changed, 20 insertions(+), 0 deletions(-)
+

bino-1.1.0.tar.bz2/Makefile.am -> bino-1.1.1.tar.bz2/Makefile.am Changed

bino-1.1.0.tar.bz2/Makefile.in -> bino-1.1.1.tar.bz2/Makefile.in Changed

@@ -46,7 +46,7 @@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure $(top_srcdir)/pkg/macosx/Info.plist.in \
-	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS TODO \
+	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS \
 	build-aux/config.guess build-aux/config.rpath \
 	build-aux/config.sub build-aux/depcomp build-aux/install-sh \
 	build-aux/mdate-sh build-aux/missing
@@ -243,6 +243,8 @@
 libexecdir = @libexecdir@
 libglew_CFLAGS = @libglew_CFLAGS@
 libglew_LIBS = @libglew_LIBS@
+liblircclient_CFLAGS = @liblircclient_CFLAGS@
+liblircclient_LIBS = @liblircclient_LIBS@
 libopenal_CFLAGS = @libopenal_CFLAGS@
 libopenal_LIBS = @libopenal_LIBS@
 libqtopengl_CFLAGS = @libqtopengl_CFLAGS@
@@ -276,7 +278,7 @@
 # Make a W32 installer using NSIS
 
 # Make a package for Mac OS X
-EXTRA_DIST = TODO README.MacOSX README.Windows pkg/w32/bino.nsi \
+EXTRA_DIST = README.MacOSX README.Windows pkg/w32/bino.nsi \
 	pkg/w32/notes.txt pkg/macosx/README pkg/macosx/Bino.icns
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

bino-1.1.0.tar.bz2/NEWS -> bino-1.1.1.tar.bz2/NEWS Changed

bino-1.1.0.tar.bz2/README.Windows -> bino-1.1.1.tar.bz2/README.Windows Changed

@@ -5,22 +5,15 @@
 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 following is known to work with Mingw-cross-env 2.20 installed in
+The following is known to work with Mingw-cross-env 2.21 installed in
 /path/to/mce:
 
-0. Update some Mingw-cross-env packages
-
-   LibASS and FFmpeg are too old or not yet available in Mingw-cross-env. This
-   will likely be fixed in a future version. In the meantime, please copy the
-   files libass.mk and ffmpeg.mk (attached below) into /path/to/mce/src.
-
-1. Build the required libraries in Mingw-cross-env:
+1. Build the required Mingw-cross-env packages:
 
    $ cd /path/to/mce
-   $ make gettext pthreads ffmpeg libass openal glew qt
+   $ make gettext pthreads ffmpeg libass openal glew qt nsis
 
-   If you want to build a Bino installer later, you need to build nsis, too:
-   $ make 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/mce/usr/bin:$PATH"
@@ -31,95 +24,16 @@
    $ ./configure --host=i686-pc-mingw32
    $ make
 
-   Optionally build the installer (if nsis was built in Mingw-cross-env):
+   Optionally build the installer (requires nsis):
    $ make package-w32
 
 The installer will install the binary, the manual, and translations along with
 start menu entries, and provide uninstall functionality.
 
 You can also copy just the bino.exe binary from the src subdirectory to any
-Windows machine. In that case, if you want to have access to translations and
-the manual, keep the following directory structure:
+Windows machine. If you want to have access to translations and the manual, keep
+the following directory structure:
 c:\<path_to_bino>\bin\bino.exe
 c:\<path_to_bino>\doc\bino.html
 c:\<path_to_bino>\doc\<image_files...>
 c:\<path_to_bino>\locale\<lang>\LC_MESSAGES\bino.mo
-
-8<---- libass.mk -------------------------------------------------------------
-
-PKG             := libass
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.9.11
-$(PKG)_CHECKSUM := 6f69f6c4474c649de4fd7913b050bfd4cf8110cb
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_WEBSITE  := http://code.google.com/p/libass/
-$(PKG)_URL      := http://libass.googlecode.com/files/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc freetype fontconfig
-
-define $(PKG)_UPDATE
-    wget -q -O- 'http://code.google.com/p/libass/downloads/list?sort=-uploaded' | \
-    $(SED) -n 's,.*libass-$[0-9][^<]*$\.tar.bz2,\1,p' | \
-    head -1
-endef
-
-define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
-	--disable-png \
-	--disable-enca \
-	--enable-fontconfig
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
-endef
-
-8<---- ffmpeg.mk -------------------------------------------------------------
-
-PKG             := ffmpeg
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.7-rc1
-$(PKG)_CHECKSUM := d15c005f46483fbfc3b678cb1c89123762b56b82
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_WEBSITE  := http://www.ffmpeg.org/
-$(PKG)_URL      := http://www.ffmpeg.org/releases/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc bzip2 lame libvpx opencore-amr sdl speex theora vorbis x264 xvidcore zlib
-
-define $(PKG)_UPDATE
-    wget -q -O- 'http://www.ffmpeg.org/download.html' | \
-    $(SED) -n 's,.*ffmpeg-$[0-9][^>]*$\.tar.*,\1,p' | \
-    head -1
-endef
-
-define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
-        --cross-prefix='$(TARGET)'- \
-        --enable-cross-compile \
-        --arch=i686 \
-        --target-os=mingw32 \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
-        --disable-debug \
-        --disable-doc \
-        --enable-memalign-hack \
-        --enable-gpl \
-        --enable-version3 \
-        --disable-nonfree \
-        --enable-postproc \
-        --enable-libspeex \
-        --enable-libtheora \
-        --enable-libvorbis \
-        --enable-libmp3lame \
-        --enable-libxvid \
-        --disable-libfaac \
-        --enable-libopencore-amrnb \
-        --enable-libopencore-amrwb \
-        --enable-libx264 \
-        --enable-libvpx \
-        --disable-pthreads \
-        --enable-w32threads
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
-endef

bino-1.1.0.tar.bz2/config.h.in -> bino-1.1.1.tar.bz2/config.h.in Changed

bino-1.1.0.tar.bz2/configure -> bino-1.1.1.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for Bino 1.1.0.
+# Generated by GNU Autoconf 2.67 for Bino 1.1.1.
 #
 # Report bugs to <bino-list@nongnu.org>.
 #
@@ -552,8 +552,8 @@
 # Identity of this package.
 PACKAGE_NAME='Bino'
 PACKAGE_TARNAME='bino'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='Bino 1.1.0'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='Bino 1.1.1'
 PACKAGE_BUGREPORT='bino-list@nongnu.org'
 PACKAGE_URL='http://bino.nongnu.org/'
 
@@ -599,6 +599,10 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+HAVE_LIBLIRCCLIENT_FALSE
+HAVE_LIBLIRCCLIENT_TRUE
+liblircclient_LIBS
+liblircclient_CFLAGS
 HAVE_LIBEQUALIZER_FALSE
 HAVE_LIBEQUALIZER_TRUE
 libglew_LIBS
@@ -762,6 +766,7 @@
 with_libiconv_prefix
 with_libintl_prefix
 with_equalizer
+with_liblircclient
 '
       ac_precious_vars='build_alias
 host_alias
@@ -796,7 +801,9 @@
 libEqualizer_CFLAGS
 libEqualizer_LIBS
 libglew_CFLAGS
-libglew_LIBS'
+libglew_LIBS
+liblircclient_CFLAGS
+liblircclient_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1339,7 +1346,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.1.0 to adapt to many kinds of systems.
+\`configure' configures Bino 1.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1410,7 +1417,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Bino 1.1.0:";;
+     short | recursive ) echo "Configuration of Bino 1.1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1435,8 +1442,10 @@
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir
-  --with-equalizer        Enable multi-display support via Equalizer (disabled
+  --without-equalizer     Disable multi-display support via Equalizer (enabled
                           by default)
+  --without-liblircclient Disable remote control support via liblircclient
+                          (enabled by default)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1488,6 +1497,10 @@
               C compiler flags for libglew, overriding pkg-config
   libglew_LIBS
               linker flags for libglew, overriding pkg-config
+  liblircclient_CFLAGS
+              C compiler flags for liblircclient, overriding pkg-config
+  liblircclient_LIBS
+              linker flags for liblircclient, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1556,7 +1569,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Bino configure 1.1.0
+Bino configure 1.1.1
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2088,7 +2101,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Bino $as_me 1.1.0, which was
+It was created by Bino $as_me 1.1.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -4539,7 +4552,7 @@
 
 # Define the identity of the package.
  PACKAGE='bino'
- VERSION='1.1.0'
+ VERSION='1.1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5881,8 +5894,27 @@
 fi
 done
 
+CPPFLAGS_bak="$CPPFLAGS"
+LDFLAGS_bak="$LDFLAGS"
 CPPFLAGS="-pthread $CPPFLAGS"
 LDFLAGS="-pthread $LDFLAGS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  CPPFLAGS="$CPPFLAGS_bak"; LDFLAGS="$LDFLAGS_bak"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
@@ -8409,6 +8441,7 @@
 done
 
 
+LIBASS_PKGCONFIG_VERSION="\"\""
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libass" >&5
@@ -8485,8 +8518,15 @@
 $as_echo "$as_me: WARNING: $libopenal_PKG_ERRORS" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libass is provided by LibASS; Debian package: libass-dev" >&5
 $as_echo "$as_me: WARNING: libass is provided by LibASS; Debian package: libass-dev" >&2;}
+else
+    LIBASS_PKGCONFIG_VERSION="\"`$PKG_CONFIG --modversion libass`\""
 fi
 
+cat >>confdefs.h <<_ACEOF
+#define LIBASS_PKGCONFIG_VERSION $LIBASS_PKGCONFIG_VERSION
+_ACEOF
+
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libopenal" >&5
@@ -8850,9 +8890,9 @@
 
 # Check whether --with-equalizer was given.
 if test "${with_equalizer+set}" = set; then :
-  withval=$with_equalizer; if test "$withval" = "yes"; then equalizer="yes"; else equalizer="no "; fi
+  withval=$with_equalizer; if test "$withval" = "yes"; then equalizer="yes"; else equalizer="no"; fi
 else
-  equalizer="no"
+  equalizer="yes"
 fi
 
 if test "$equalizer" = "yes"; then
@@ -8932,8 +8972,10 @@
 $as_echo "$as_me: WARNING: $libEqualizer_PKG_ERRORS" >&2;}
         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libEqualizer is provided by Equalizer" >&5
 $as_echo "$as_me: WARNING: libEqualizer is provided by Equalizer" >&2;}
+	equalizer="no"
     fi
-else
+fi
+if test "$equalizer" = "no"; then
     HAVE_LIBEQUALIZER=0
 
 pkg_failed=no
@@ -9027,6 +9069,118 @@
 fi
 
 
+LIBLIRCCLIENT_PKGCONFIG_VERSION="\"\""
+
+# Check whether --with-liblircclient was given.

bino-1.1.0.tar.bz2/configure.ac -> bino-1.1.1.tar.bz2/configure.ac Changed

@@ -22,7 +22,7 @@
 
 dnl Autotools init stuff
 AC_PREREQ([2.65])
-AC_INIT([Bino], [1.1.0], [bino-list@nongnu.org], [bino], [http://bino.nongnu.org/])
+AC_INIT([Bino], [1.1.1], [bino-list@nongnu.org], [bino], [http://bino.nongnu.org/])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
@@ -72,8 +72,11 @@
 AC_SEARCH_LIBS([clock_gettime], [rt])
 AC_SEARCH_LIBS([pthread_create], [pthread])
 AC_CHECK_FUNCS([backtrace clock_gettime sigaction vasprintf wcwidth])
+CPPFLAGS_bak="$CPPFLAGS"
+LDFLAGS_bak="$LDFLAGS"
 CPPFLAGS="-pthread $CPPFLAGS"
 LDFLAGS="-pthread $LDFLAGS"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [], [CPPFLAGS="$CPPFLAGS_bak"; LDFLAGS="$LDFLAGS_bak"])
 
 dnl Gettext
 AM_GNU_GETTEXT([external])
@@ -108,12 +111,16 @@
 AC_CHECK_FUNCS([sysconf])
 
 dnl libass
+LIBASS_PKGCONFIG_VERSION="\"\""
 PKG_CHECK_MODULES([libass], [libass >= 0.9.9], [HAVE_LIBASS=1], [HAVE_LIBASS=0])
 if test "$HAVE_LIBASS" != "1"; then
     AC_MSG_WARN([library libass not found:])
     AC_MSG_WARN([$libopenal_PKG_ERRORS])
     AC_MSG_WARN([libass is provided by LibASS; Debian package: libass-dev])
+else
+    LIBASS_PKGCONFIG_VERSION="\"`$PKG_CONFIG --modversion libass`\""
 fi
+AC_DEFINE_UNQUOTED([LIBASS_PKGCONFIG_VERSION], [$LIBASS_PKGCONFIG_VERSION], [libass version])
 
 dnl OpenAL
 PKG_CHECK_MODULES([libopenal], [openal >= 0.0], [HAVE_LIBOPENAL=1], [HAVE_LIBOPENAL=0])
@@ -140,16 +147,18 @@
 dnl Equalizer
 dnl We assume that Equalizer includes GLEW. If we don't use Equalizer, we need GLEW separately.
 AC_ARG_WITH([equalizer],
-    [AS_HELP_STRING([--with-equalizer], [Enable multi-display support via Equalizer (disabled by default)])],
-    [if test "$withval" = "yes"; then equalizer="yes"; else equalizer="no "; fi], [equalizer="no"])
+    [AS_HELP_STRING([--without-equalizer], [Disable multi-display support via Equalizer (enabled by default)])],
+    [if test "$withval" = "yes"; then equalizer="yes"; else equalizer="no"; fi], [equalizer="yes"])
 if test "$equalizer" = "yes"; then
     PKG_CHECK_MODULES([libEqualizer], [Equalizer >= 0.9.3], [HAVE_LIBEQUALIZER=1], [HAVE_LIBEQUALIZER=0])
     if test "$HAVE_LIBEQUALIZER" != "1"; then
         AC_MSG_WARN([library libEqualizer not found:])
         AC_MSG_WARN([$libEqualizer_PKG_ERRORS])
         AC_MSG_WARN([libEqualizer is provided by Equalizer])
+	equalizer="no"
     fi
-else
+fi
+if test "$equalizer" = "no"; then
     HAVE_LIBEQUALIZER=0
     dnl glew
     PKG_CHECK_MODULES([libglew], [glew >= 1.5.0], [HAVE_LIBGLEW=1], [HAVE_LIBGLEW=0])
@@ -162,6 +171,28 @@
 AC_DEFINE_UNQUOTED([HAVE_LIBEQUALIZER], [$HAVE_LIBEQUALIZER], [Have Equalizer?])
 AM_CONDITIONAL([HAVE_LIBEQUALIZER], [test "$HAVE_LIBEQUALIZER" = "1"])
 
+dnl LIRC
+LIBLIRCCLIENT_PKGCONFIG_VERSION="\"\""
+AC_ARG_WITH([liblircclient],
+    [AS_HELP_STRING([--without-liblircclient], [Disable remote control support via liblircclient (enabled by default)])],
+    [if test "$withval" = "yes"; then lirc="yes"; else lirc="no"; fi], [lirc="yes"])
+if test "$lirc" = "yes"; then
+    PKG_CHECK_MODULES([liblircclient], [liblircclient0 >= 0.0], [HAVE_LIBLIRCCLIENT=1], [HAVE_LIBLIRCCLIENT=0])
+    if test "$HAVE_LIBLIRCCLIENT" != "1"; then
+        AC_MSG_WARN([library liblircclient not found:])
+        AC_MSG_WARN([$liblircclient_PKG_ERRORS])
+        AC_MSG_WARN([liblircclient is provided by LIRC; Debian package: liblircclient-dev])
+	lirc="no"
+    else
+        LIBLIRCCLIENT_PKGCONFIG_VERSION="\"`$PKG_CONFIG --modversion liblircclient0`\""
+    fi
+else
+    HAVE_LIBLIRCCLIENT=0
+fi
+AC_DEFINE_UNQUOTED([HAVE_LIBLIRCCLIENT], [$HAVE_LIBLIRCCLIENT], [Have liblircclient?])
+AC_DEFINE_UNQUOTED([LIBLIRCCLIENT_PKGCONFIG_VERSION], [$LIBLIRCCLIENT_PKGCONFIG_VERSION], [liblircclient version])
+AM_CONDITIONAL([HAVE_LIBLIRCCLIENT], [test "$HAVE_LIBLIRCCLIENT" = "1"])
+
 dnl Check if all libraries were found
 if test "$HAVE_LIBAVFORMAT" != "1" \
     -o "$HAVE_LIBAVDEVICE" != "1" \
@@ -170,7 +201,8 @@
     -o "$HAVE_LIBOPENAL" != "1" \
     -o "$HAVE_LIBQTOPENGL" != "1" \
     -o $ "$equalizer" = "yes" -a "$HAVE_LIBEQUALIZER" != "1" $ \
-    -o $ "$HAVE_LIBEQUALIZER" != "1" -a "$HAVE_LIBGLEW" != "1" $ ; then
+    -o $ "$HAVE_LIBEQUALIZER" != "1" -a "$HAVE_LIBGLEW" != "1" $ \
+    -o $ "$lirc" = "yes" -a "$HAVE_LIBLIRCCLIENT" != "1" $ ; then
     AC_MSG_ERROR([One or more libraries were not found. See messages above.])
 fi
 
@@ -183,3 +215,9 @@
 	pkg/macosx/Info.plist	\
 	])
 AC_OUTPUT
+
+dnl Print configuration for user to check
+echo "Configuration:"
+echo "NLS:           $USE_NLS"
+echo "Equalizer:     $equalizer"
+echo "liblircclient: $lirc"

bino-1.1.0.tar.bz2/doc/Makefile.in -> bino-1.1.1.tar.bz2/doc/Makefile.in Changed

bino-1.1.0.tar.bz2/doc/bino.1 -> bino-1.1.1.tar.bz2/doc/bino.1 Changed

@@ -38,6 +38,8 @@
 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 "\-\-lirc\-config=\fIFILE\fP"
+Use the given LIRC configuration file. This option can be used more than once.
 .IP "\-v|\-\-video=\fISTREAM\fP"
 Select video stream (1-n, depending on the input).
 .IP "\-a|\-\-audio=\fISTREAM\fP"
@@ -171,9 +173,18 @@
 Swap left/right view.
 .IP "\-f|\-\-fullscreen"
 Fullscreen.
-.IP "\-\-fullscreen\-screen=\fIN\fP"
-Use screen \fIN\fP in fullscreen mode. The default \fIN\fP=0 uses the primary
-screen of the desktop.
+.IP "\-\-fullscreen\-screens=[\fIS0\fP[,\fIS1\fP[,...]]]"
+Use the listed screens \fIS0\fP, ..., \fISn\fP in fullscreen mode. Screen numbers
+start with 1. If the list is empty, the primary screen will be used (this is the
+default).
+.IP "\-\-fullscreen\-flip\-left"
+Flip left view vertically when in fullscreen mode.
+.IP "\-\-fullscreen\-flop\-left"
+Flop left view horizontally when in fullscreen mode.
+.IP "\-\-fullscreen\-flip\-right"
+Flip right view vertically when in fullscreen mode.
+.IP "\-\-fullscreen\-flop\-right"
+Flop right view horizontally when in fullscreen mode.
 .IP "\-c|\-\-center"
 Center window on screen.
 .IP "\-\-subtitle\-encoding=\fIENC\fP"

bino-1.1.0.tar.bz2/doc/bino.html -> bino-1.1.1.tar.bz2/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 8 May 2011 for version
+This manual was last updated 17 May 2011 for version
 1.1.0 of Bino.
 
 Copyright (C) 2011
@@ -45,7 +45,7 @@
 
 <h2 class="unnumbered">Bino</h2>
 
-<p>This manual was last updated 8 May 2011 for version
+<p>This manual was last updated 17 May 2011 for version
 1.1.0 of Bino.
 
    <p>Copyright &copy; 2011
@@ -69,8 +69,9 @@
 <li><a accesskey="4" href="#Output-Techniques">Output Techniques</a>
 <li><a accesskey="5" href="#File-Name-Conventions">File Name Conventions</a>
 <li><a accesskey="6" href="#Interactive-Control">Interactive Control</a>
-<li><a accesskey="7" href="#Crosstalk-Ghostbusting">Crosstalk Ghostbusting</a>
-<li><a accesskey="8" href="#Multi-Display-Support">Multi Display Support</a>
+<li><a accesskey="7" href="#Camera-Devices">Camera Devices</a>
+<li><a accesskey="8" href="#Crosstalk-Ghostbusting">Crosstalk Ghostbusting</a>
+<li><a accesskey="9" href="#Advanced-Multi-Display-Support">Advanced Multi Display Support</a>
 </ul>
 
 <div class="node">
@@ -122,6 +123,7 @@
 <br><dt>&lsquo;<samp><span class="samp">--device-type=</span><var>TYPE</var></samp>&rsquo;<dd>Type of input device: <var>default</var>, <var>firewire</var>, or <var>x11</var>. 
 <br><dt>&lsquo;<samp><span class="samp">--device-frame-size=</span><var>W</var><span class="samp">x</span><var>H</var></samp>&rsquo;<dd>If the input is a device, request the given frame size, e.g. 640x480. 
 <br><dt>&lsquo;<samp><span class="samp">--device-frame-rate=</span><var>N</var><span class="samp">/</span><var>D</var></samp>&rsquo;<dd>If the input is a device, request the given frame rate, e.g. 25/1. 
+<br><dt>&lsquo;<samp><span class="samp">--lirc-config=</span><var>FILE</var></samp>&rsquo;<dd>Use the given LIRC configuration file. This option can be used more than once. 
 <br><dt>&lsquo;<samp><span class="samp">-v</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--video=</span><var>STREAM</var></samp>&rsquo;<dd>Select video stream (1-n, depending on the input). 
 <br><dt>&lsquo;<samp><span class="samp">-a</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--audio=</span><var>STREAM</var></samp>&rsquo;<dd>Select audio stream (1-n, depending on the input). 
 <br><dt>&lsquo;<samp><span class="samp">-s</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--subtitle=</span><var>STREAM</var></samp>&rsquo;<dd>Select subtitle stream (1-n, depending on the input). 
@@ -129,8 +131,13 @@
 <br><dt>&lsquo;<samp><span class="samp">-o</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--output=</span><var>TYPE</var></samp>&rsquo;<dd>Select output type. See <a href="#Output-Techniques">Output Techniques</a>. 
 <br><dt>&lsquo;<samp><span class="samp">-S</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--swap-eyes</span></samp>&rsquo;<dd>Swap left/right view. 
 <br><dt>&lsquo;<samp><span class="samp">-f</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--fullscreen</span></samp>&rsquo;<dd>Fullscreen. 
-<br><dt>&lsquo;<samp><span class="samp">--fullscreen-screen=</span><var>N</var></samp>&rsquo;<dd>Use screen <var>N</var> in fullscreen mode. The default <var>N</var> uses the primary
-screen of the desktop. 
+<br><dt>&lsquo;<samp><span class="samp">--fullscreen-screens=[</span><var>S0</var><span class="samp">[,</span><var>S1</var><span class="samp">[,...]]]</span></samp>&rsquo;<dd>Use the listed screens <var>S0</var>, <small class="dots">...</small>, <var>Sn</var> in fullscreen mode. Screen
+numbers start with 1. If the list is empty, the primary screen will be used
+(this is the default). 
+<br><dt>&lsquo;<samp><span class="samp">--fullscreen-flip-left</span></samp>&rsquo;<dd>Flip left view vertically when in fullscreen mode. 
+<br><dt>&lsquo;<samp><span class="samp">--fullscreen-flop-left</span></samp>&rsquo;<dd>Flop left view horizontally when in fullscreen mode. 
+<br><dt>&lsquo;<samp><span class="samp">--fullscreen-flip-right</span></samp>&rsquo;<dd>Flip right view vertically when in fullscreen mode. 
+<br><dt>&lsquo;<samp><span class="samp">--fullscreen-flop-right</span></samp>&rsquo;<dd>Flop right view horizontally when in fullscreen mode. 
 <br><dt>&lsquo;<samp><span class="samp">-c</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--center</span></samp>&rsquo;<dd>Center window on screen. 
 <br><dt>&lsquo;<samp><span class="samp">--subtitle-encoding=</span><var>ENC</var></samp>&rsquo;<dd>Set subtitle encoding. 
 <br><dt>&lsquo;<samp><span class="samp">--subtitle-font=</span><var>FONT</var></samp>&rsquo;<dd>Set subtitle font name. 
@@ -261,7 +268,7 @@
 <div class="node">
 <a name="Interactive-Control"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Crosstalk-Ghostbusting">Crosstalk Ghostbusting</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#Camera-Devices">Camera Devices</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#File-Name-Conventions">File Name Conventions</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 
@@ -269,6 +276,8 @@
 
 <h2 class="chapter">6 Interactive Control</h2>
 
+<h3 class="section">6.1 Keyboard Shortcuts</h3>
+
 <p>Bino reacts on a number of keyboard shortcuts during playback.
 
    <p>Make sure that the video area has the keyboard focus before using these
@@ -297,16 +306,86 @@
 <br><dt><kbd>Mouse click</kbd><dd>Seek according to the horizontal click position. 
 </dl>
 
+<h3 class="section">6.2 Remote Controls</h3>
+
+<p>Bino supports remote controls via <a href="http://www.lirc.org/">LIRC</a>.
+
+   <p>Use the client name &lsquo;<samp><span class="samp">bino</span></samp>&rsquo; in your LIRC configuration. The default LIRC
+configuration file usually is <code>~/.lircrc</code>. You can use the
+&lsquo;<samp><span class="samp">--lirc-config</span></samp>&rsquo; option to use one or more custom LIRC configuration files
+instead.
+
+   <p>The following commands are available:
+
+     <dl>
+<dt>&lsquo;<samp><span class="samp">play</span></samp>&rsquo;<dd>Start playback, or switch of pause mode. 
+<br><dt>&lsquo;<samp><span class="samp">pause</span></samp>&rsquo;<dd>When playing, go into pause mode. 
+<br><dt>&lsquo;<samp><span class="samp">stop</span></samp>&rsquo;<dd>Stop playback. 
+<br><dt>&lsquo;<samp><span class="samp">cycle-video-stream</span></samp>&rsquo;<dd>Cycle through available video streams. 
+<br><dt>&lsquo;<samp><span class="samp">cycle-audio-stream</span></samp>&rsquo;<dd>Cycle through available audio streams. 
+<br><dt>&lsquo;<samp><span class="samp">cycle-subtitle-stream</span></samp>&rsquo;<dd>Cycle through available subtitle streams. 
+<br><dt>&lsquo;<samp><span class="samp">toggle-stereo-mode-swap</span></samp>&rsquo;<dd>Swap left/right eye. 
+<br><dt>&lsquo;<samp><span class="samp">toggle-fullscreen</span></samp>&rsquo;<dd>Toggle fullscreen. 
+<br><dt>&lsquo;<samp><span class="samp">center</span></samp>&rsquo;<dd>Center window. 
+<br><dt>&lsquo;<samp><span class="samp">adjust-contrast </span><var>delta</var></samp>&rsquo;<dd>Adjust contrast by adding <var>delta</var>, e.g. -0.05 or +0.05. 
+<br><dt>&lsquo;<samp><span class="samp">adjust-brightness </span><var>delta</var></samp>&rsquo;<dd>Adjust brightness by adding <var>delta</var>, e.g. -0.05 or +0.05. 
+<br><dt>&lsquo;<samp><span class="samp">adjust-hue </span><var>delta</var></samp>&rsquo;<dd>Adjust hue by adding <var>delta</var>, e.g. -0.05 or +0.05. 
+<br><dt>&lsquo;<samp><span class="samp">adjust-saturation </span><var>delta</var></samp>&rsquo;<dd>Adjust saturation by adding <var>delta</var>, e.g. -0.05 or +0.05. 
+<br><dt>&lsquo;<samp><span class="samp">adjust-parallax </span><var>delta</var></samp>&rsquo;<dd>Adjust parallax by adding <var>delta</var>, e.g. -0.01 or +0.01. 
+<br><dt>&lsquo;<samp><span class="samp">adjust-subtitle-parallax </span><var>delta</var></samp>&rsquo;<dd>Adjust contrast by adding <var>delta</var>, e.g. -0.01 or +0.01. 
+<br><dt>&lsquo;<samp><span class="samp">seek </span><var>delta</var></samp>&rsquo;<dd>Seek by the given number of seconds relative to the current position.  For
+example -60.0 seeks backwards one minute, and +60.0 seeks forward one minute. 
+<br><dt>&lsquo;<samp><span class="samp">set-pos </span><var>pos</var></samp>&rsquo;<dd>Seek by setting an absolute position in the stream, with <var>pos</var> between 0 and
+1. For example, to seek to the middle of the video, use 0.5. 
+</dl>
+
+   <p>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="Camera-Devices"></a>
+<p><hr>
+Next:&nbsp;<a rel="next" accesskey="n" href="#Crosstalk-Ghostbusting">Crosstalk Ghostbusting</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">7 Camera Devices</h2>
+
+<p>Bino supports the following types of camera devices:
+     <ul>
+<li><var>default</var>: the system-specific default device type.<br>
+This is video4linux2 on GNU/Linux, bktr on BSD and Mac OS, and VfW on Windows. 
+This should work for all webcams and similar camera devices. 
+<li><var>firewire</var>: Firewire devices. 
+<li><var>x11</var>: X11-grabber pseudo devices.<br>
+This device type allows to capture part of an X11 screen as a video. It
+requires the user to select a specific frame size and frame rate. The device
+name is of the form
+<code>[</code><var>hostname</var><code>]:</code><var>display</var><code>.</code><var>screen</var><code>[+</code><var>x</var><code>,</code><var>y</var><code>]</code>. For example,
+<code>smith:0.0+160,120</code> would capture from X11 display <code>:0.0</code> on host
+<code>smith</code>, starting at position <code>160,120</code>. 
+</ul>
+
+   <p>Note: for <var>firewire</var> and <var>x11</var> devices to work, your FFmpeg libraries
+must have <var>libdc1394</var> and <var>x11grab</var> enabled, which is not the default.
+
 <div class="node">
 <a name="Crosstalk-Ghostbusting"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Multi-Display-Support">Multi Display Support</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Interactive-Control">Interactive Control</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#Advanced-Multi-Display-Support">Advanced Multi Display Support</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#Camera-Devices">Camera Devices</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 
 </div>
 
-<h2 class="chapter">7 Crosstalk Ghostbusting</h2>
+<h2 class="chapter">8 Crosstalk Ghostbusting</h2>
 
 <p>Many stereoscopic display devices suffer from crosstalk between the left and
 right view. This results in ghosting artifacts that can degrade the viewing
@@ -353,32 +432,32 @@
    <p>The remaining crosstalk should optimally be 0%.
 
 <div class="node">
-<a name="Multi-Display-Support"></a>
+<a name="Advanced-Multi-Display-Support"></a>
 <p><hr>
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#Crosstalk-Ghostbusting">Crosstalk Ghostbusting</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 
 </div>
 
-<h2 class="chapter">8 Multi Display Support</h2>
+<h2 class="chapter">9 Advanced Multi Display Support</h2>
 
-<p>Bino supports multi-display output via the Equalizer framework.
+<p>Bino supports distributed multi-display output via the Equalizer framework.
 
    <p>This is how it works:
 
-<h3 class="section">8.1 Building Bino with Equalizer Support</h3>
+<h3 class="section">9.1 Building Bino with Equalizer Support</h3>
 
 <p>First, install Equalizer 0.9.3 (also known as 1.0-beta) or later. See
 <a href="http://www.equalizergraphics.com/">http://www.equalizergraphics.com/</a>.  Verify that it works by running the
 included eqHello example.
 
-   <p>Then, build Bino with Equalizer support by using the <samp><span class="option">--with-equalizer</span></samp>
-configure option.
-<pre class="example">     $ ./configure --with-equalizer
+   <p>Then, build Bino with Equalizer support. The output of configure should contain
+the following line:
+<pre class="example">     Equalizer: yes
 </pre>
    <p>Now you need an Equalizer configuration file for your display setup.
 
-<h3 class="section">8.2 Configuring Equalizer and Starting Bino</h3>
+<h3 class="section">9.2 Configuring Equalizer and Starting Bino</h3>

bino-1.1.0.tar.bz2/doc/bino.info -> bino-1.1.1.tar.bz2/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 8 May 2011 for version 1.1.0 of Bino.
+This manual was last updated 17 May 2011 for version 1.1.1 of Bino.
 
    Copyright (C) 2011 Martin Lambers (<marlam@marlam.de>), Stefan
 Eilemann (<eile@eyescale.ch>), Frédéric Devernay
@@ -23,7 +23,7 @@
 Bino
 ****
 
-This manual was last updated 8 May 2011 for version 1.1.0 of Bino.
+This manual was last updated 17 May 2011 for version 1.1.1 of Bino.
 
    Copyright (C) 2011 Martin Lambers (<marlam@marlam.de>), Stefan
 Eilemann (<eile@eyescale.ch>), Frédéric Devernay
@@ -42,8 +42,9 @@
 * Output Techniques::
 * File Name Conventions::
 * Interactive Control::
+* Camera Devices::
 * Crosstalk Ghostbusting::
-* Multi Display Support::
+* Advanced Multi Display Support::
 
 &#x1f;
 File: bino.info,  Node: Overview,  Next: Invocation,  Prev: Top,  Up: Top
@@ -98,6 +99,10 @@
 `--device-frame-rate=N/D'
      If the input is a device, request the given frame rate, e.g. 25/1.
 
+`--lirc-config=FILE'
+     Use the given LIRC configuration file. This option can be used
+     more than once.
+
 `-v'
 `--video=STREAM'
      Select video stream (1-n, depending on the input).
@@ -126,9 +131,22 @@
 `--fullscreen'
      Fullscreen.
 
-`--fullscreen-screen=N'
-     Use screen N in fullscreen mode. The default N uses the primary
-     screen of the desktop.
+`--fullscreen-screens=[S0[,S1[,...]]]'
+     Use the listed screens S0, ..., SN in fullscreen mode. Screen
+     numbers start with 1. If the list is empty, the primary screen
+     will be used (this is the default).
+
+`--fullscreen-flip-left'
+     Flip left view vertically when in fullscreen mode.
+
+`--fullscreen-flop-left'
+     Flop left view horizontally when in fullscreen mode.
+
+`--fullscreen-flip-right'
+     Flip right view vertically when in fullscreen mode.
+
+`--fullscreen-flop-right'
+     Flop right view horizontally when in fullscreen mode.
 
 `-c'
 `--center'
@@ -376,11 +394,14 @@
      MONO
 
 &#x1f;
-File: bino.info,  Node: Interactive Control,  Next: Crosstalk Ghostbusting,  Prev: File Name Conventions,  Up: Top
+File: bino.info,  Node: Interactive Control,  Next: Camera Devices,  Prev: File Name Conventions,  Up: Top
 
 6 Interactive Control
 *********************
 
+6.1 Keyboard Shortcuts
+======================
+
 Bino reacts on a number of keyboard shortcuts during playback.
 
    Make sure that the video area has the keyboard focus before using
@@ -464,10 +485,110 @@
 `Mouse click'
      Seek according to the horizontal click position.
 
+6.2 Remote Controls
+===================
+
+Bino supports remote controls via LIRC (http://www.lirc.org/).
+
+   Use the client name `bino' in your LIRC configuration. The default
+LIRC configuration file usually is `~/.lircrc'. You can use the
+`--lirc-config' option to use one or more custom LIRC configuration
+files instead.
+
+   The following commands are available:
+
+`play'
+     Start playback, or switch of pause mode.
+
+`pause'
+     When playing, go into pause mode.
+
+`stop'
+     Stop playback.
+
+`cycle-video-stream'
+     Cycle through available video streams.
+
+`cycle-audio-stream'
+     Cycle through available audio streams.
+
+`cycle-subtitle-stream'
+     Cycle through available subtitle streams.
+
+`toggle-stereo-mode-swap'
+     Swap left/right eye.
+
+`toggle-fullscreen'
+     Toggle fullscreen.
+
+`center'
+     Center window.
+
+`adjust-contrast DELTA'
+     Adjust contrast by adding DELTA, e.g. -0.05 or +0.05.
+
+`adjust-brightness DELTA'
+     Adjust brightness by adding DELTA, e.g. -0.05 or +0.05.
+
+`adjust-hue DELTA'
+     Adjust hue by adding DELTA, e.g. -0.05 or +0.05.
+
+`adjust-saturation DELTA'
+     Adjust saturation by adding DELTA, e.g. -0.05 or +0.05.
+
+`adjust-parallax DELTA'
+     Adjust parallax by adding DELTA, e.g. -0.01 or +0.01.
+
+`adjust-subtitle-parallax DELTA'
+     Adjust contrast by adding DELTA, e.g. -0.01 or +0.01.
+
+`seek DELTA'
+     Seek by the given number of seconds relative to the current
+     position.  For example -60.0 seeks backwards one minute, and +60.0
+     seeks forward one minute.
+
+`set-pos POS'
+     Seek by setting an absolute position in the stream, with POS
+     between 0 and 1. For example, to seek to the middle of the video,
+     use 0.5.
+
+   Example LIRC configuration file excerpt:
+     begin
+       remote = ...
+       button = ...
+       prog   = bino
+       config = adjust-brightness +0.05
+     end
+
+&#x1f;
+File: bino.info,  Node: Camera Devices,  Next: Crosstalk Ghostbusting,  Prev: Interactive Control,  Up: Top
+
+7 Camera Devices
+****************
+
+Bino supports the following types of camera devices:
+   * DEFAULT: the system-specific default device type.
+     This is video4linux2 on GNU/Linux, bktr on BSD and Mac OS, and VfW
+     on Windows.  This should work for all webcams and similar camera
+     devices.
+
+   * FIREWIRE: Firewire devices.
+
+   * X11: X11-grabber pseudo devices.
+     This device type allows to capture part of an X11 screen as a
+     video. It requires the user to select a specific frame size and
+     frame rate. The device name is of the form
+     `[HOSTNAME]:DISPLAY.SCREEN[+X,Y]'. For example,
+     `smith:0.0+160,120' would capture from X11 display `:0.0' on host
+     `smith', starting at position `160,120'.
+
+   Note: for FIREWIRE and X11 devices to work, your FFmpeg libraries
+must have LIBDC1394 and X11GRAB enabled, which is not the default.
+
 &#x1f;
-File: bino.info,  Node: Crosstalk Ghostbusting,  Next: Multi Display Support,  Prev: Interactive Control,  Up: Top
+File: bino.info,  Node: Crosstalk Ghostbusting,  Next: Advanced Multi Display Support,  Prev: Camera Devices,  Up: Top
 
-7 Crosstalk Ghostbusting
+8 Crosstalk Ghostbusting
 ************************
 
 Many stereoscopic display devices suffer from crosstalk between the
@@ -514,29 +635,30 @@
    The remaining crosstalk should optimally be 0%.
 
 &#x1f;
-File: bino.info,  Node: Multi Display Support,  Prev: Crosstalk Ghostbusting,  Up: Top

bino-1.1.0.tar.bz2/doc/bino.texi -> bino-1.1.1.tar.bz2/doc/bino.texi Changed

@@ -59,8 +59,9 @@
 * Output Techniques::
 * File Name Conventions::
 * Interactive Control::
+* Camera Devices::
 * Crosstalk Ghostbusting::
-* Multi Display Support::
+* Advanced Multi Display Support::
 @end menu
 
 @node Overview
@@ -105,6 +106,8 @@
 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 --lirc-config=@var{FILE}
+Use the given LIRC configuration file. This option can be used more than once.
 @item -v
 @itemx --video=@var{STREAM}
 Select video stream (1-n, depending on the input).
@@ -126,9 +129,18 @@
 @item -f
 @itemx --fullscreen
 Fullscreen.
-@item --fullscreen-screen=@var{N}
-Use screen @var{N} in fullscreen mode. The default @var{N} uses the primary
-screen of the desktop.
+@item --fullscreen-screens=[@var{S0}[,@var{S1}[,@dots{}]]]
+Use the listed screens @var{S0}, @dots{}, @var{Sn} in fullscreen mode. Screen
+numbers start with 1. If the list is empty, the primary screen will be used
+(this is the default).
+@item --fullscreen-flip-left
+Flip left view vertically when in fullscreen mode.
+@item --fullscreen-flop-left
+Flop left view horizontally when in fullscreen mode.
+@item --fullscreen-flip-right
+Flip right view vertically when in fullscreen mode.
+@item --fullscreen-flop-right
+Flop right view horizontally when in fullscreen mode.
 @item -c
 @itemx --center
 Center window on screen.
@@ -314,6 +326,8 @@
 @node Interactive Control
 @chapter Interactive Control
 
+@section Keyboard Shortcuts
+
 Bino reacts on a number of keyboard shortcuts during playback.
 
 Make sure that the video area has the keyboard focus before using these
@@ -371,6 +385,88 @@
 Seek according to the horizontal click position.
 @end table
 
+@section Remote Controls
+
+Bino supports remote controls via @url{http://www.lirc.org/,LIRC}.
+
+Use the client name @samp{bino} in your LIRC configuration. The default LIRC
+configuration file usually is @code{~/.lircrc}. You can use the
+@samp{--lirc-config} option to use one or more custom LIRC configuration files
+instead.
+
+The following commands are available:
+
+@table @samp
+@item play
+Start playback, or switch of 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-stereo-mode-swap
+Swap left/right eye.
+@item toggle-fullscreen
+Toggle fullscreen.
+@item center
+Center window.
+@item adjust-contrast @var{delta}
+Adjust contrast by adding @var{delta}, e.g. -0.05 or +0.05.
+@item adjust-brightness @var{delta}
+Adjust brightness by adding @var{delta}, e.g. -0.05 or +0.05.
+@item adjust-hue @var{delta}
+Adjust hue by adding @var{delta}, e.g. -0.05 or +0.05.
+@item adjust-saturation @var{delta}
+Adjust saturation by adding @var{delta}, e.g. -0.05 or +0.05.
+@item adjust-parallax @var{delta}
+Adjust parallax by adding @var{delta}, e.g. -0.01 or +0.01.
+@item adjust-subtitle-parallax @var{delta}
+Adjust contrast by adding @var{delta}, e.g. -0.01 or +0.01.
+@item seek @var{delta}
+Seek by the given number of seconds relative to the current position.  For
+example -60.0 seeks backwards one minute, and +60.0 seeks forward one minute.
+@item set-pos @var{pos}
+Seek by setting an absolute position in the stream, with @var{pos} between 0 and
+1. For example, to seek to the middle of the video, use 0.5.
+@end table
+
+Example LIRC configuration file excerpt:
+@example
+begin
+  remote = ...
+  button = ...
+  prog   = bino
+  config = adjust-brightness +0.05
+end
+@end example
+
+
+@node Camera Devices
+@chapter Camera Devices
+
+Bino supports the following types of camera devices:
+@itemize
+@item @var{default}: the system-specific default device type.@*
+This is video4linux2 on GNU/Linux, bktr on BSD and Mac OS, and VfW on Windows.
+This should work for all webcams and similar camera devices.
+@item @var{firewire}: Firewire devices.
+@item @var{x11}: X11-grabber pseudo devices.@*
+This device type allows to capture part of an X11 screen as a video. It
+requires the user to select a specific frame size and frame rate. The device
+name is of the form
+@code{[@var{hostname}]:@var{display}.@var{screen}[+@var{x},@var{y}]}. For example,
+@code{smith:0.0+160,120} would capture from X11 display @code{:0.0} on host
+@code{smith}, starting at position @code{160,120}.
+@end itemize
+
+Note: for @var{firewire} and @var{x11} devices to work, your FFmpeg libraries
+must have @var{libdc1394} and @var{x11grab} enabled, which is not the default.
+
 @node Crosstalk Ghostbusting
 @chapter Crosstalk Ghostbusting
 
@@ -421,10 +517,10 @@
 @end example
 The remaining crosstalk should optimally be 0%.
 
-@node Multi Display Support
-@chapter Multi Display Support
+@node Advanced Multi Display Support
+@chapter Advanced Multi Display Support
 
-Bino supports multi-display output via the Equalizer framework.
+Bino supports distributed multi-display output via the Equalizer framework.
 
 This is how it works:
 
@@ -434,10 +530,10 @@
 @url{http://www.equalizergraphics.com/}.  Verify that it works by running the
 included eqHello example.
 
-Then, build Bino with Equalizer support by using the @option{--with-equalizer}
-configure option.
+Then, build Bino with Equalizer support. The output of configure should contain
+the following line:
 @example
-$ ./configure --with-equalizer
+Equalizer: yes
 @end example
 
 Now you need an Equalizer configuration file for your display setup.

bino-1.1.0.tar.bz2/doc/stamp-vti -> bino-1.1.1.tar.bz2/doc/stamp-vti Changed

bino-1.1.0.tar.bz2/doc/version.texi -> bino-1.1.1.tar.bz2/doc/version.texi Changed

bino-1.1.0.tar.bz2/po/bino.pot -> bino-1.1.1.tar.bz2/po/bino.pot Changed

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: bino 1.1.0\n"
+"Project-Id-Version: bino 1.1.1\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2011-05-09 05:18+0200\n"
+"POT-Creation-Date: 2011-05-22 11:26+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:209
+#: src/base/str.cpp:226
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr ""
 
-#: src/base/str.cpp:378 src/base/str.cpp:396 src/base/str.cpp:406
-#: src/base/str.cpp:417
+#: src/base/str.cpp:395 src/base/str.cpp:413 src/base/str.cpp:423
+#: src/base/str.cpp:434
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr ""
@@ -134,105 +134,104 @@
 msgid "Cannot get time."
 msgstr ""
 
-#: src/audio_output.cpp:63
+#: src/audio_output.cpp:61
 msgid "No OpenAL device available."
 msgstr ""
 
-#: src/audio_output.cpp:68
+#: src/audio_output.cpp:66
 msgid "No OpenAL context available."
 msgstr ""
 
-#: src/audio_output.cpp:79
+#: src/audio_output.cpp:77
 msgid "Cannot create OpenAL buffers."
 msgstr ""
 
-#: src/audio_output.cpp:88
+#: src/audio_output.cpp:86
 msgid "Cannot create OpenAL source."
 msgstr ""
 
-#: src/audio_output.cpp:101
+#: src/audio_output.cpp:99
 msgid "Cannot set OpenAL source parameters."
 msgstr ""
 
-#: src/audio_output.cpp:155
+#: src/audio_output.cpp:153
 msgid "Cannot check OpenAL source state."
 msgstr ""
 
-#: src/audio_output.cpp:162
+#: src/audio_output.cpp:160
 msgid "Cannot restart OpenAL source playback."
 msgstr ""
 
-#: src/audio_output.cpp:315
+#: src/audio_output.cpp:313
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr ""
 
-#: src/audio_output.cpp:342
+#: src/audio_output.cpp:340
 msgid "Cannot buffer initial OpenAL data."
 msgstr ""
 
-#: src/audio_output.cpp:356
+#: src/audio_output.cpp:354
 msgid "Cannot buffer OpenAL data."
 msgstr ""
 
-#: src/audio_output.cpp:381
+#: src/audio_output.cpp:379
 msgid "Cannot start OpenAL source playback."
 msgstr ""
 
-#: src/audio_output.cpp:395
+#: src/audio_output.cpp:393
 msgid "Cannot pause OpenAL source playback."
 msgstr ""
 
-#: src/audio_output.cpp:404
+#: src/audio_output.cpp:402
 msgid "Cannot unpause OpenAL source playback."
 msgstr ""
 
-#: src/audio_output.cpp:413
+#: src/audio_output.cpp:411
 msgid "Cannot stop OpenAL source playback."
 msgstr ""
 
-#: src/audio_output.cpp:424
+#: src/audio_output.cpp:422
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr ""
 
-#: src/lib_versions.cpp:89 src/lib_versions.cpp:122 src/lib_versions.cpp:161
-#: src/media_data.cpp:422 src/media_data.cpp:445 src/media_data.cpp:483
-#: src/media_data.cpp:488
+#: src/lib_versions.cpp:123 src/lib_versions.cpp:162 src/media_data.cpp:422
+#: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
 msgid "unknown"
 msgstr ""
 
-#: src/lib_versions.cpp:185
+#: src/lib_versions.cpp:186 src/lib_versions.cpp:198
 msgid "not used"
 msgstr ""
 
-#: src/main.cpp:275
+#: src/main.cpp:288
 #, c-format
 msgid "%s version %s"
 msgstr ""
 
-#: src/main.cpp:276
+#: src/main.cpp:289
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr ""
 
-#: src/main.cpp:277
+#: src/main.cpp:290
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
 "permitted by law."
 msgstr ""
 
-#: src/main.cpp:280 src/player_qt.cpp:2660
+#: src/main.cpp:293 src/player_qt.cpp:2859
 msgid "Platform:"
 msgstr ""
 
-#: src/main.cpp:282 src/player_qt.cpp:2661
+#: src/main.cpp:295 src/player_qt.cpp:2860
 msgid "Libraries used:"
 msgstr ""
 
 #. TRANSLATORS: This is the --help text. Translate only the description,
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
-#: src/main.cpp:294
+#: src/main.cpp:307
 #, c-format
 msgid ""
 "Usage:\n"
@@ -243,13 +242,14 @@
 "  --version                Print version.\n"
 "  -n|--no-gui              Do not use the GUI, just show a plain window.\n"
 "  -L|--log-level=LEVEL     Set log level (debug/info/warning/error/quiet).\n"
-"  --device-type=TYPE       Type of input device: default, firewire, or x11.\n"
+"  --device-type=TYPE       Type of input device: default, firewire, x11.\n"
 "  --device-frame-size=WxH  Request frame size WxH from input device.\n"
 "  --device-frame-rate=N/D  Request frame rate N/D from input device.\n"
+"  --lirc-config=FILE       Use the given LIRC configuration file. This\n"
+"                           option can be used more than once.\n"
 "  -v|--video=STREAM        Select video stream (1-n, depending on input).\n"
 "  -a|--audio=STREAM        Select audio stream (1-n, depending on input).\n"
-"  -s|--subtitle=STREAM     Select subtitle stream (0-n, depending on "
-"input).\n"
+"  -s|--subtitle=STREAM     Select subtitle stream (0-n, dep. on input).\n"
 "  -i|--input=TYPE          Select input type (default autodetect):\n"
 "    mono                     Single view.\n"
 "    separate-left-right      Left/right separate streams, left first.\n"
@@ -294,8 +294,13 @@
 "    equalizer-3d             Multi-display via Equalizer (3D setup).\n"
 "  -S|--swap-eyes           Swap left/right view.\n"
 "  -f|--fullscreen          Fullscreen.\n"
-"  --fullscreen-screen=N    Use screen N for fullscreen mode. The default\n"
-"                           N=0 uses the primary screen of the desktop.\n"
+"  --fullscreen-screens=    Use the listed screens in fullscreen mode.\n"
+"     [S0[,S1[,...]]]       Screen numbers start with 1. The default\n"
+"                           (empty list) is to use the primary screen.\n"
+"  --fullscreen-flip-left   Flip left view vertically when fullscreen.\n"
+"  --fullscreen-flop-left   Flop left view horizontally when fullscreen.\n"
+"  --fullscreen-flip-right  Flip right view vertically when fullscreen.\n"
+"  --fullscreen-flop-right  Flop right view horizontally when fullscreen.\n"
 "  -c|--center              Center window on screen.\n"
 "  --subtitle-encoding=ENC  Set subtitle encoding.\n"
 "  --subtitle-font=FONT     Set subtitle font name.\n"
@@ -332,15 +337,19 @@
 "  Mouse click              Seek according to horizontal click position."
 msgstr ""
 
-#: src/main.cpp:517
+#: src/main.cpp:560
 msgid "Benchmark mode: audio and time synchronization disabled."

bino-1.1.0.tar.bz2/po/cs.gmo -> bino-1.1.1.tar.bz2/po/cs.gmo Changed

bino-1.1.0.tar.bz2/po/cs.po -> bino-1.1.1.tar.bz2/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: 2011-05-09 05:18+0200\n"
+"POT-Creation-Date: 2011-05-22 11:26+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:209
+#: src/base/str.cpp:226
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Nelze převést text do %s."
 
-#: src/base/str.cpp:378 src/base/str.cpp:396 src/base/str.cpp:406
-#: src/base/str.cpp:417
+#: src/base/str.cpp:395 src/base/str.cpp:413 src/base/str.cpp:423
+#: src/base/str.cpp:434
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Nelze převést %s to %s."
@@ -135,87 +135,86 @@
 msgid "Cannot get time."
 msgstr "Nelze získat aktuální čas."
 
-#: src/audio_output.cpp:63
+#: src/audio_output.cpp:61
 msgid "No OpenAL device available."
 msgstr "Není k dispozici žádné OpenAL zařízení."
 
-#: src/audio_output.cpp:68
+#: src/audio_output.cpp:66
 msgid "No OpenAL context available."
 msgstr "Není k dispozici žádný OpenAL kontext."
 
-#: src/audio_output.cpp:79
+#: src/audio_output.cpp:77
 msgid "Cannot create OpenAL buffers."
 msgstr "Nelze vytvořit OpenAL buffer."
 
-#: src/audio_output.cpp:88
+#: src/audio_output.cpp:86
 msgid "Cannot create OpenAL source."
 msgstr "Nelze vytvořit OpenAL zdroj."
 
-#: src/audio_output.cpp:101
+#: src/audio_output.cpp:99
 msgid "Cannot set OpenAL source parameters."
 msgstr "Nelze nastavit parametry OpenAL."
 
-#: src/audio_output.cpp:155
+#: src/audio_output.cpp:153
 msgid "Cannot check OpenAL source state."
 msgstr "Nelze ověřit stav OpenAL zdroje."
 
-#: src/audio_output.cpp:162
+#: src/audio_output.cpp:160
 msgid "Cannot restart OpenAL source playback."
 msgstr "Nelze znovu spustit přehrávání OpeanAL zdroje."
 
-#: src/audio_output.cpp:315
+#: src/audio_output.cpp:313
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr "Neexistuje vhodný OpenAL format pro daný audio formát %s."
 
-#: src/audio_output.cpp:342
+#: src/audio_output.cpp:340
 msgid "Cannot buffer initial OpenAL data."
 msgstr "Nelze načíst počáteční data OpenAL."
 
-#: src/audio_output.cpp:356
+#: src/audio_output.cpp:354
 msgid "Cannot buffer OpenAL data."
 msgstr "Nelze načíst OpenAL data."
 
-#: src/audio_output.cpp:381
+#: src/audio_output.cpp:379
 msgid "Cannot start OpenAL source playback."
 msgstr "Nelze začít přehrávat OpeanAL zdroj."
 
-#: src/audio_output.cpp:395
+#: src/audio_output.cpp:393
 msgid "Cannot pause OpenAL source playback."
 msgstr "Nelze přerušit přehrávání OpeanAL zdroje."
 
-#: src/audio_output.cpp:404
+#: src/audio_output.cpp:402
 msgid "Cannot unpause OpenAL source playback."
 msgstr "Nelze pokračovat v přehrávání OpeanAL zdroje."
 
-#: src/audio_output.cpp:413
+#: src/audio_output.cpp:411
 msgid "Cannot stop OpenAL source playback."
 msgstr "Nelze zastavit přehrávání OpeanAL zdroje."
 
-#: src/audio_output.cpp:424
+#: src/audio_output.cpp:422
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Nelze odpojit buffery OpeanAL zdroje."
 
-#: src/lib_versions.cpp:89 src/lib_versions.cpp:122 src/lib_versions.cpp:161
-#: src/media_data.cpp:422 src/media_data.cpp:445 src/media_data.cpp:483
-#: src/media_data.cpp:488
+#: src/lib_versions.cpp:123 src/lib_versions.cpp:162 src/media_data.cpp:422
+#: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
 msgid "unknown"
 msgstr "neznámá"
 
-#: src/lib_versions.cpp:185
+#: src/lib_versions.cpp:186 src/lib_versions.cpp:198
 msgid "not used"
 msgstr "nevyužívá se"
 
-#: src/main.cpp:275
+#: src/main.cpp:288
 #, c-format
 msgid "%s version %s"
 msgstr "%s verze %s"
 
-#: src/main.cpp:276
+#: src/main.cpp:289
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr "Copyright (C) 2011 Bino vývojáři."
 
-#: src/main.cpp:277
+#: src/main.cpp:290
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -226,18 +225,18 @@
 "že bude užitečný, avšak BEZ JAKÉKOLI ZÁRUKY; neposkytují se ani odvozené "
 "záruky PRODEJNOSTI anebo VHODNOSTI PRO URČITÝ ÚČEL."
 
-#: src/main.cpp:280 src/player_qt.cpp:2660
+#: src/main.cpp:293 src/player_qt.cpp:2859
 msgid "Platform:"
 msgstr "Platforma:"
 
-#: src/main.cpp:282 src/player_qt.cpp:2661
+#: src/main.cpp:295 src/player_qt.cpp:2860
 msgid "Libraries used:"
 msgstr "Použité knihovny:"
 
 #. TRANSLATORS: This is the --help text. Translate only the description,
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
-#: src/main.cpp:294
+#: src/main.cpp:307
 #, fuzzy, c-format
 msgid ""
 "Usage:\n"
@@ -248,13 +247,14 @@
 "  --version                Print version.\n"
 "  -n|--no-gui              Do not use the GUI, just show a plain window.\n"
 "  -L|--log-level=LEVEL     Set log level (debug/info/warning/error/quiet).\n"
-"  --device-type=TYPE       Type of input device: default, firewire, or x11.\n"
+"  --device-type=TYPE       Type of input device: default, firewire, x11.\n"
 "  --device-frame-size=WxH  Request frame size WxH from input device.\n"
 "  --device-frame-rate=N/D  Request frame rate N/D from input device.\n"
+"  --lirc-config=FILE       Use the given LIRC configuration file. This\n"
+"                           option can be used more than once.\n"
 "  -v|--video=STREAM        Select video stream (1-n, depending on input).\n"
 "  -a|--audio=STREAM        Select audio stream (1-n, depending on input).\n"
-"  -s|--subtitle=STREAM     Select subtitle stream (0-n, depending on "
-"input).\n"
+"  -s|--subtitle=STREAM     Select subtitle stream (0-n, dep. on input).\n"
 "  -i|--input=TYPE          Select input type (default autodetect):\n"
 "    mono                     Single view.\n"
 "    separate-left-right      Left/right separate streams, left first.\n"
@@ -299,8 +299,13 @@
 "    equalizer-3d             Multi-display via Equalizer (3D setup).\n"
 "  -S|--swap-eyes           Swap left/right view.\n"
 "  -f|--fullscreen          Fullscreen.\n"
-"  --fullscreen-screen=N    Use screen N for fullscreen mode. The default\n"
-"                           N=0 uses the primary screen of the desktop.\n"
+"  --fullscreen-screens=    Use the listed screens in fullscreen mode.\n"
+"     [S0[,S1[,...]]]       Screen numbers start with 1. The default\n"
+"                           (empty list) is to use the primary screen.\n"
+"  --fullscreen-flip-left   Flip left view vertically when fullscreen.\n"
+"  --fullscreen-flop-left   Flop left view horizontally when fullscreen.\n"
+"  --fullscreen-flip-right  Flip right view vertically when fullscreen.\n"
+"  --fullscreen-flop-right  Flop right view horizontally when fullscreen.\n"
 "  -c|--center              Center window on screen.\n"
 "  --subtitle-encoding=ENC  Set subtitle encoding.\n"
 "  --subtitle-font=FONT     Set subtitle font name.\n"
@@ -428,15 +433,20 @@
 "  page up, page down       Přeskoč 10 minut dopředu / zpět.\n"
 "  Stisk myši               Přeskoč vzhledem k horizontální pozici myši."
 
-#: src/main.cpp:517
+#: src/main.cpp:560
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Testovací režim, synchronizace zvuku a času je vypnuta."

bino-1.1.0.tar.bz2/po/de.gmo -> bino-1.1.1.tar.bz2/po/de.gmo Changed

bino-1.1.0.tar.bz2/po/de.po -> bino-1.1.1.tar.bz2/po/de.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: 2011-05-09 05:18+0200\n"
+"POT-Creation-Date: 2011-05-22 11:26+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:209
+#: src/base/str.cpp:226
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Kann Zeichenkette nicht zu %s konvertieren."
 
-#: src/base/str.cpp:378 src/base/str.cpp:396 src/base/str.cpp:406
-#: src/base/str.cpp:417
+#: src/base/str.cpp:395 src/base/str.cpp:413 src/base/str.cpp:423
+#: src/base/str.cpp:434
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Kann %s nicht zu %s konvertieren."
@@ -132,87 +132,86 @@
 msgid "Cannot get time."
 msgstr "Kann Zeit nicht abfragen."
 
-#: src/audio_output.cpp:63
+#: src/audio_output.cpp:61
 msgid "No OpenAL device available."
 msgstr "Kein OpenAL Gerät verfügbar."
 
-#: src/audio_output.cpp:68
+#: src/audio_output.cpp:66
 msgid "No OpenAL context available."
 msgstr "Kein OpenAL Kontext verfügbar."
 
-#: src/audio_output.cpp:79
+#: src/audio_output.cpp:77
 msgid "Cannot create OpenAL buffers."
 msgstr "Kann OpenAL Puffer nicht erzeugen."
 
-#: src/audio_output.cpp:88
+#: src/audio_output.cpp:86
 msgid "Cannot create OpenAL source."
 msgstr "Kann OpenAL Quelle nicht erzeugen."
 
-#: src/audio_output.cpp:101
+#: src/audio_output.cpp:99
 msgid "Cannot set OpenAL source parameters."
 msgstr "Kann OpenAL Quellenparameter nicht setzen."
 
-#: src/audio_output.cpp:155
+#: src/audio_output.cpp:153
 msgid "Cannot check OpenAL source state."
 msgstr "Kann OpenAL Quellenzustand nicht abfragen."
 
-#: src/audio_output.cpp:162
+#: src/audio_output.cpp:160
 msgid "Cannot restart OpenAL source playback."
 msgstr "Kann das Abspielen der OpenAL Quelle nicht neu starten."
 
-#: src/audio_output.cpp:315
+#: src/audio_output.cpp:313
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr "Kein OpenAL Format vorhanden für das Audioformat %s."
 
-#: src/audio_output.cpp:342
+#: src/audio_output.cpp:340
 msgid "Cannot buffer initial OpenAL data."
 msgstr "Kann initiale OpenAL Daten nicht puffern."
 
-#: src/audio_output.cpp:356
+#: src/audio_output.cpp:354
 msgid "Cannot buffer OpenAL data."
 msgstr "Kann OpenAL Daten nicht puffern."
 
-#: src/audio_output.cpp:381
+#: src/audio_output.cpp:379
 msgid "Cannot start OpenAL source playback."
 msgstr "Kann das Abspielen der OpenAL Quelle nicht starten."
 
-#: src/audio_output.cpp:395
+#: src/audio_output.cpp:393
 msgid "Cannot pause OpenAL source playback."
 msgstr "Kann das Abspielen der OpenAL Quelle nicht unterbrechen."
 
-#: src/audio_output.cpp:404
+#: src/audio_output.cpp:402
 msgid "Cannot unpause OpenAL source playback."
 msgstr "Kann das Abspielen der OpenAL Quelle nicht fortsetzen."
 
-#: src/audio_output.cpp:413
+#: src/audio_output.cpp:411
 msgid "Cannot stop OpenAL source playback."
 msgstr "Kann das Abspielen der OpenAL Quelle nicht stoppen."
 
-#: src/audio_output.cpp:424
+#: src/audio_output.cpp:422
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Kann OpenAL Quellenpuffer nicht aus Warteschlange entfernen."
 
-#: src/lib_versions.cpp:89 src/lib_versions.cpp:122 src/lib_versions.cpp:161
-#: src/media_data.cpp:422 src/media_data.cpp:445 src/media_data.cpp:483
-#: src/media_data.cpp:488
+#: src/lib_versions.cpp:123 src/lib_versions.cpp:162 src/media_data.cpp:422
+#: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
 msgid "unknown"
 msgstr "unbekannt"
 
-#: src/lib_versions.cpp:185
+#: src/lib_versions.cpp:186 src/lib_versions.cpp:198
 msgid "not used"
 msgstr "nicht benutzt"
 
-#: src/main.cpp:275
+#: src/main.cpp:288
 #, c-format
 msgid "%s version %s"
 msgstr "%s Version %s"
 
-#: src/main.cpp:276
+#: src/main.cpp:289
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr "Copyright (C) 2011 Bino Entwickler."
 
-#: src/main.cpp:277
+#: src/main.cpp:290
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -221,18 +220,18 @@
 "Dies ist freie Software. Du kannst Kopien davon verteilen unter den "
 "Bedingungen der GNU General Public License. Es gibt keine Garantie."
 
-#: src/main.cpp:280 src/player_qt.cpp:2660
+#: src/main.cpp:293 src/player_qt.cpp:2859
 msgid "Platform:"
 msgstr "Plattform:"
 
-#: src/main.cpp:282 src/player_qt.cpp:2661
+#: src/main.cpp:295 src/player_qt.cpp:2860
 msgid "Libraries used:"
 msgstr "Benutzte Bibliotheken:"
 
 #. TRANSLATORS: This is the --help text. Translate only the description,
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
-#: src/main.cpp:294
+#: src/main.cpp:307
 #, fuzzy, c-format
 msgid ""
 "Usage:\n"
@@ -243,13 +242,14 @@
 "  --version                Print version.\n"
 "  -n|--no-gui              Do not use the GUI, just show a plain window.\n"
 "  -L|--log-level=LEVEL     Set log level (debug/info/warning/error/quiet).\n"
-"  --device-type=TYPE       Type of input device: default, firewire, or x11.\n"
+"  --device-type=TYPE       Type of input device: default, firewire, x11.\n"
 "  --device-frame-size=WxH  Request frame size WxH from input device.\n"
 "  --device-frame-rate=N/D  Request frame rate N/D from input device.\n"
+"  --lirc-config=FILE       Use the given LIRC configuration file. This\n"
+"                           option can be used more than once.\n"
 "  -v|--video=STREAM        Select video stream (1-n, depending on input).\n"
 "  -a|--audio=STREAM        Select audio stream (1-n, depending on input).\n"
-"  -s|--subtitle=STREAM     Select subtitle stream (0-n, depending on "
-"input).\n"
+"  -s|--subtitle=STREAM     Select subtitle stream (0-n, dep. on input).\n"
 "  -i|--input=TYPE          Select input type (default autodetect):\n"
 "    mono                     Single view.\n"
 "    separate-left-right      Left/right separate streams, left first.\n"
@@ -294,8 +294,13 @@
 "    equalizer-3d             Multi-display via Equalizer (3D setup).\n"
 "  -S|--swap-eyes           Swap left/right view.\n"
 "  -f|--fullscreen          Fullscreen.\n"
-"  --fullscreen-screen=N    Use screen N for fullscreen mode. The default\n"
-"                           N=0 uses the primary screen of the desktop.\n"
+"  --fullscreen-screens=    Use the listed screens in fullscreen mode.\n"
+"     [S0[,S1[,...]]]       Screen numbers start with 1. The default\n"
+"                           (empty list) is to use the primary screen.\n"
+"  --fullscreen-flip-left   Flip left view vertically when fullscreen.\n"
+"  --fullscreen-flop-left   Flop left view horizontally when fullscreen.\n"
+"  --fullscreen-flip-right  Flip right view vertically when fullscreen.\n"
+"  --fullscreen-flop-right  Flop right view horizontally when fullscreen.\n"
 "  -c|--center              Center window on screen.\n"
 "  --subtitle-encoding=ENC  Set subtitle encoding.\n"
 "  --subtitle-font=FONT     Set subtitle font name.\n"
@@ -421,16 +426,22 @@
 "  Seite rauf, Seite runter Spule 10 Minuten zurück / vor.\n"
 "  Mausklick                Spule zur Stelle der horizontalen Klickposition."
 
-#: src/main.cpp:517
+#: src/main.cpp:560
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Benchmark Modus: Audio und Videosynchronisation deaktiviert."

bino-1.1.0.tar.bz2/po/fr.gmo -> bino-1.1.1.tar.bz2/po/fr.gmo Changed

bino-1.1.0.tar.bz2/po/fr.po -> bino-1.1.1.tar.bz2/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: 2011-05-09 05:18+0200\n"
+"POT-Creation-Date: 2011-05-22 11:26+0200\n"
 "PO-Revision-Date: 2011-04-21 16:48+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:209
+#: src/base/str.cpp:226
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Impossible de convertir la chaîne de caractères en %s."
 
-#: src/base/str.cpp:378 src/base/str.cpp:396 src/base/str.cpp:406
-#: src/base/str.cpp:417
+#: src/base/str.cpp:395 src/base/str.cpp:413 src/base/str.cpp:423
+#: src/base/str.cpp:434
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Impossible de convertir %s en %s."
@@ -135,87 +135,86 @@
 msgid "Cannot get time."
 msgstr "Impossible d'obtenir l'heure."
 
-#: src/audio_output.cpp:63
+#: src/audio_output.cpp:61
 msgid "No OpenAL device available."
 msgstr "Aucun périphérique OpenAL disponible."
 
-#: src/audio_output.cpp:68
+#: src/audio_output.cpp:66
 msgid "No OpenAL context available."
 msgstr "Aucun contexte OpenAL disponible."
 
-#: src/audio_output.cpp:79
+#: src/audio_output.cpp:77
 msgid "Cannot create OpenAL buffers."
 msgstr "Impossible de tcréer les tampons OpenAL."
 
-#: src/audio_output.cpp:88
+#: src/audio_output.cpp:86
 msgid "Cannot create OpenAL source."
 msgstr "Impossible de créer la source OpenAL."
 
-#: src/audio_output.cpp:101
+#: src/audio_output.cpp:99
 msgid "Cannot set OpenAL source parameters."
 msgstr "Impossible de régler les paramètres de la source OpenAL."
 
-#: src/audio_output.cpp:155
+#: src/audio_output.cpp:153
 msgid "Cannot check OpenAL source state."
 msgstr "Impossible de vérifier l'état de la source OpenAL."
 
-#: src/audio_output.cpp:162
+#: src/audio_output.cpp:160
 msgid "Cannot restart OpenAL source playback."
 msgstr "Impossible de redémarrer la lecture de la source OpenAL."
 
-#: src/audio_output.cpp:315
+#: src/audio_output.cpp:313
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr "Aucun format OpenAL disponible pour le format de données audio %s."
 
-#: src/audio_output.cpp:342
+#: src/audio_output.cpp:340
 msgid "Cannot buffer initial OpenAL data."
 msgstr "Impossible de mettre les données initiales OpenAL en mémoire tampon."
 
-#: src/audio_output.cpp:356
+#: src/audio_output.cpp:354
 msgid "Cannot buffer OpenAL data."
 msgstr "Impossible de mettre les données OpenAL en mémoire tampon."
 
-#: src/audio_output.cpp:381
+#: src/audio_output.cpp:379
 msgid "Cannot start OpenAL source playback."
 msgstr "Impossible de démarrer la lecture de la source OpenAL."
 
-#: src/audio_output.cpp:395
+#: src/audio_output.cpp:393
 msgid "Cannot pause OpenAL source playback."
 msgstr "Impossible de mettre en pause la source OpenAL."
 
-#: src/audio_output.cpp:404
+#: src/audio_output.cpp:402
 msgid "Cannot unpause OpenAL source playback."
 msgstr "Impossible de quitter la pause de la source OpenAL."
 
-#: src/audio_output.cpp:413
+#: src/audio_output.cpp:411
 msgid "Cannot stop OpenAL source playback."
 msgstr "Impossible d'arrêter la lecture de la source OpenAL."
 
-#: src/audio_output.cpp:424
+#: src/audio_output.cpp:422
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Impossible de vider la queue de tampons de la source OpenAL."
 
-#: src/lib_versions.cpp:89 src/lib_versions.cpp:122 src/lib_versions.cpp:161
-#: src/media_data.cpp:422 src/media_data.cpp:445 src/media_data.cpp:483
-#: src/media_data.cpp:488
+#: src/lib_versions.cpp:123 src/lib_versions.cpp:162 src/media_data.cpp:422
+#: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/lib_versions.cpp:185
+#: src/lib_versions.cpp:186 src/lib_versions.cpp:198
 msgid "not used"
 msgstr "inutilisé"
 
-#: src/main.cpp:275
+#: src/main.cpp:288
 #, c-format
 msgid "%s version %s"
 msgstr "%s version %s"
 
-#: src/main.cpp:276
+#: src/main.cpp:289
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr "Copyright (C) 2011 les développeurs Bino."
 
-#: src/main.cpp:277
+#: src/main.cpp:290
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -225,18 +224,18 @@
 "termes de la GNU General Public License. Il n'y a AUCUNE GARANTIE, dans les "
 "limites autorisées par la loi."
 
-#: src/main.cpp:280 src/player_qt.cpp:2660
+#: src/main.cpp:293 src/player_qt.cpp:2859
 msgid "Platform:"
 msgstr "Plateforme :"
 
-#: src/main.cpp:282 src/player_qt.cpp:2661
+#: src/main.cpp:295 src/player_qt.cpp:2860
 msgid "Libraries used:"
 msgstr "Bibliothèques utilisées :"
 
 #. TRANSLATORS: This is the --help text. Translate only the description,
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
-#: src/main.cpp:294
+#: src/main.cpp:307
 #, fuzzy, c-format
 msgid ""
 "Usage:\n"
@@ -247,13 +246,14 @@
 "  --version                Print version.\n"
 "  -n|--no-gui              Do not use the GUI, just show a plain window.\n"
 "  -L|--log-level=LEVEL     Set log level (debug/info/warning/error/quiet).\n"
-"  --device-type=TYPE       Type of input device: default, firewire, or x11.\n"
+"  --device-type=TYPE       Type of input device: default, firewire, x11.\n"
 "  --device-frame-size=WxH  Request frame size WxH from input device.\n"
 "  --device-frame-rate=N/D  Request frame rate N/D from input device.\n"
+"  --lirc-config=FILE       Use the given LIRC configuration file. This\n"
+"                           option can be used more than once.\n"
 "  -v|--video=STREAM        Select video stream (1-n, depending on input).\n"
 "  -a|--audio=STREAM        Select audio stream (1-n, depending on input).\n"
-"  -s|--subtitle=STREAM     Select subtitle stream (0-n, depending on "
-"input).\n"
+"  -s|--subtitle=STREAM     Select subtitle stream (0-n, dep. on input).\n"
 "  -i|--input=TYPE          Select input type (default autodetect):\n"
 "    mono                     Single view.\n"
 "    separate-left-right      Left/right separate streams, left first.\n"
@@ -298,8 +298,13 @@
 "    equalizer-3d             Multi-display via Equalizer (3D setup).\n"
 "  -S|--swap-eyes           Swap left/right view.\n"
 "  -f|--fullscreen          Fullscreen.\n"
-"  --fullscreen-screen=N    Use screen N for fullscreen mode. The default\n"
-"                           N=0 uses the primary screen of the desktop.\n"
+"  --fullscreen-screens=    Use the listed screens in fullscreen mode.\n"
+"     [S0[,S1[,...]]]       Screen numbers start with 1. The default\n"
+"                           (empty list) is to use the primary screen.\n"
+"  --fullscreen-flip-left   Flip left view vertically when fullscreen.\n"
+"  --fullscreen-flop-left   Flop left view horizontally when fullscreen.\n"
+"  --fullscreen-flip-right  Flip right view vertically when fullscreen.\n"
+"  --fullscreen-flop-right  Flop right view horizontally when fullscreen.\n"
 "  -c|--center              Center window on screen.\n"
 "  --subtitle-encoding=ENC  Set subtitle encoding.\n"
 "  --subtitle-font=FONT     Set subtitle font name.\n"
@@ -442,15 +447,20 @@
 "  Mouse click              Aller à la position définie par l'abscisse du "
 "clic."
 
-#: src/main.cpp:517
+#: src/main.cpp:560
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Mode banc d'essai: audio et synchronisation temporelle désactivés."

bino-1.1.0.tar.bz2/po/pl.gmo -> bino-1.1.1.tar.bz2/po/pl.gmo Changed

bino-1.1.0.tar.bz2/po/pl.po -> bino-1.1.1.tar.bz2/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: 2011-05-09 05:18+0200\n"
+"POT-Creation-Date: 2011-05-22 11:26+0200\n"
 "PO-Revision-Date: 2011-04-20 11:14+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:209
+#: src/base/str.cpp:226
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Nie można skonwertować tekstu do %s."
 
-#: src/base/str.cpp:378 src/base/str.cpp:396 src/base/str.cpp:406
-#: src/base/str.cpp:417
+#: src/base/str.cpp:395 src/base/str.cpp:413 src/base/str.cpp:423
+#: src/base/str.cpp:434
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Nie można skonwertować %s do %s."
@@ -138,87 +138,86 @@
 msgid "Cannot get time."
 msgstr "Nie można pobrać czasu."
 
-#: src/audio_output.cpp:63
+#: src/audio_output.cpp:61
 msgid "No OpenAL device available."
 msgstr "Urządzenie OpenAL jest niedostępne."
 
-#: src/audio_output.cpp:68
+#: src/audio_output.cpp:66
 msgid "No OpenAL context available."
 msgstr "Brak kontekstu OpenAL."
 
-#: src/audio_output.cpp:79
+#: src/audio_output.cpp:77
 msgid "Cannot create OpenAL buffers."
 msgstr "Nie można stworzyć buforów dla OpenAL."
 
-#: src/audio_output.cpp:88
+#: src/audio_output.cpp:86
 msgid "Cannot create OpenAL source."
 msgstr "Nie można utworzyć źródła dla OpenAL."
 
-#: src/audio_output.cpp:101
+#: src/audio_output.cpp:99
 msgid "Cannot set OpenAL source parameters."
 msgstr "Nie można ustawić parametrów dla OpenAL."
 
-#: src/audio_output.cpp:155
+#: src/audio_output.cpp:153
 msgid "Cannot check OpenAL source state."
 msgstr "Nie można określić stanu OpenAL."
 
-#: src/audio_output.cpp:162
+#: src/audio_output.cpp:160
 msgid "Cannot restart OpenAL source playback."
 msgstr "Nie można zrestartować źródła odtwarzania OpenAL."
 
-#: src/audio_output.cpp:315
+#: src/audio_output.cpp:313
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr "Nie ma dostępnego formatu OpenAL dla danych audio %s."
 
-#: src/audio_output.cpp:342
+#: src/audio_output.cpp:340
 msgid "Cannot buffer initial OpenAL data."
 msgstr "Nie można zainicjować buforów dla danych OpenAL."
 
-#: src/audio_output.cpp:356
+#: src/audio_output.cpp:354
 msgid "Cannot buffer OpenAL data."
 msgstr "Nie można buforować danych OpenAL."
 
-#: src/audio_output.cpp:381
+#: src/audio_output.cpp:379
 msgid "Cannot start OpenAL source playback."
 msgstr "Nie można uruchomić odtwarzania źródła OpenAL."
 
-#: src/audio_output.cpp:395
+#: src/audio_output.cpp:393
 msgid "Cannot pause OpenAL source playback."
 msgstr "Nie można wstrzymać odtwarzania źródła OpenAL."
 
-#: src/audio_output.cpp:404
+#: src/audio_output.cpp:402
 msgid "Cannot unpause OpenAL source playback."
 msgstr "Nie można ponownie uruchomić odtwarzania źródła OpenAL."
 
-#: src/audio_output.cpp:413
+#: src/audio_output.cpp:411
 msgid "Cannot stop OpenAL source playback."
 msgstr "Nie można zatrzymać odtwarzania źródła OpenAL."
 
-#: src/audio_output.cpp:424
+#: src/audio_output.cpp:422
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Nie można odkolejkować źródła buforów OpenAL."
 
-#: src/lib_versions.cpp:89 src/lib_versions.cpp:122 src/lib_versions.cpp:161
-#: src/media_data.cpp:422 src/media_data.cpp:445 src/media_data.cpp:483
-#: src/media_data.cpp:488
+#: src/lib_versions.cpp:123 src/lib_versions.cpp:162 src/media_data.cpp:422
+#: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
 msgid "unknown"
 msgstr "nieznany"
 
-#: src/lib_versions.cpp:185
+#: src/lib_versions.cpp:186 src/lib_versions.cpp:198
 msgid "not used"
 msgstr "nie używany"
 
-#: src/main.cpp:275
+#: src/main.cpp:288
 #, c-format
 msgid "%s version %s"
 msgstr "%s wersja %s"
 
-#: src/main.cpp:276
+#: src/main.cpp:289
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr "Copyright (C) 2011 deweloperzy Bino."
 
-#: src/main.cpp:277
+#: src/main.cpp:290
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -228,18 +227,18 @@
 "the GNU General Public License. There is NO WARRANTY, to the extent "
 "permitted by law."
 
-#: src/main.cpp:280 src/player_qt.cpp:2660
+#: src/main.cpp:293 src/player_qt.cpp:2859
 msgid "Platform:"
 msgstr "Platforma:"
 
-#: src/main.cpp:282 src/player_qt.cpp:2661
+#: src/main.cpp:295 src/player_qt.cpp:2860
 msgid "Libraries used:"
 msgstr "Użyte biblioteki:"
 
 #. TRANSLATORS: This is the --help text. Translate only the description,
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
-#: src/main.cpp:294
+#: src/main.cpp:307
 #, fuzzy, c-format
 msgid ""
 "Usage:\n"
@@ -250,13 +249,14 @@
 "  --version                Print version.\n"
 "  -n|--no-gui              Do not use the GUI, just show a plain window.\n"
 "  -L|--log-level=LEVEL     Set log level (debug/info/warning/error/quiet).\n"
-"  --device-type=TYPE       Type of input device: default, firewire, or x11.\n"
+"  --device-type=TYPE       Type of input device: default, firewire, x11.\n"
 "  --device-frame-size=WxH  Request frame size WxH from input device.\n"
 "  --device-frame-rate=N/D  Request frame rate N/D from input device.\n"
+"  --lirc-config=FILE       Use the given LIRC configuration file. This\n"
+"                           option can be used more than once.\n"
 "  -v|--video=STREAM        Select video stream (1-n, depending on input).\n"
 "  -a|--audio=STREAM        Select audio stream (1-n, depending on input).\n"
-"  -s|--subtitle=STREAM     Select subtitle stream (0-n, depending on "
-"input).\n"
+"  -s|--subtitle=STREAM     Select subtitle stream (0-n, dep. on input).\n"
 "  -i|--input=TYPE          Select input type (default autodetect):\n"
 "    mono                     Single view.\n"
 "    separate-left-right      Left/right separate streams, left first.\n"
@@ -301,8 +301,13 @@
 "    equalizer-3d             Multi-display via Equalizer (3D setup).\n"
 "  -S|--swap-eyes           Swap left/right view.\n"
 "  -f|--fullscreen          Fullscreen.\n"
-"  --fullscreen-screen=N    Use screen N for fullscreen mode. The default\n"
-"                           N=0 uses the primary screen of the desktop.\n"
+"  --fullscreen-screens=    Use the listed screens in fullscreen mode.\n"
+"     [S0[,S1[,...]]]       Screen numbers start with 1. The default\n"
+"                           (empty list) is to use the primary screen.\n"
+"  --fullscreen-flip-left   Flip left view vertically when fullscreen.\n"
+"  --fullscreen-flop-left   Flop left view horizontally when fullscreen.\n"
+"  --fullscreen-flip-right  Flip right view vertically when fullscreen.\n"
+"  --fullscreen-flop-right  Flop right view horizontally when fullscreen.\n"
 "  -c|--center              Center window on screen.\n"
 "  --subtitle-encoding=ENC  Set subtitle encoding.\n"
 "  --subtitle-font=FONT     Set subtitle font name.\n"
@@ -436,15 +441,20 @@
 "  page up, page down       Przesuń 10 minut do tyłu / do przodu.\n"
 "  Mouse click              Przesuń zgodnie z pozycją myszki na suwaku czasu.."
 
-#: src/main.cpp:517
+#: src/main.cpp:560
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Opcja testowa: audio i synchronizacja czasu wyłączona."

bino-1.1.0.tar.bz2/po/ru.gmo -> bino-1.1.1.tar.bz2/po/ru.gmo Changed

bino-1.1.0.tar.bz2/po/ru.po -> bino-1.1.1.tar.bz2/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: 2011-05-09 05:18+0200\n"
+"POT-Creation-Date: 2011-05-22 11:26+0200\n"
 "PO-Revision-Date: 2011-04-19 11:52+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:209
+#: src/base/str.cpp:226
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Невозможно преобразовать строку в %s."
 
-#: src/base/str.cpp:378 src/base/str.cpp:396 src/base/str.cpp:406
-#: src/base/str.cpp:417
+#: src/base/str.cpp:395 src/base/str.cpp:413 src/base/str.cpp:423
+#: src/base/str.cpp:434
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Невозможно преобразовать %s в %s."
@@ -132,87 +132,86 @@
 msgid "Cannot get time."
 msgstr "Невозможно получить время."
 
-#: src/audio_output.cpp:63
+#: src/audio_output.cpp:61
 msgid "No OpenAL device available."
 msgstr "Устройства OpenAL не доступны."
 
-#: src/audio_output.cpp:68
+#: src/audio_output.cpp:66
 msgid "No OpenAL context available."
 msgstr "Контекст OpenAL не доступен."
 
-#: src/audio_output.cpp:79
+#: src/audio_output.cpp:77
 msgid "Cannot create OpenAL buffers."
 msgstr "Невозможно создать буферы OpenAL."
 
-#: src/audio_output.cpp:88
+#: src/audio_output.cpp:86
 msgid "Cannot create OpenAL source."
 msgstr "Невозможно создать источник OpenAL."
 
-#: src/audio_output.cpp:101
+#: src/audio_output.cpp:99
 msgid "Cannot set OpenAL source parameters."
 msgstr "Невозможно установить параметры источника OpenAL."
 
-#: src/audio_output.cpp:155
+#: src/audio_output.cpp:153
 msgid "Cannot check OpenAL source state."
 msgstr "Невозможно проверить состояние источника OpenAL."
 
-#: src/audio_output.cpp:162
+#: src/audio_output.cpp:160
 msgid "Cannot restart OpenAL source playback."
 msgstr "Невозможно возобновить воспроизведение источника OpenAL."
 
-#: src/audio_output.cpp:315
+#: src/audio_output.cpp:313
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr "Для формата аудио %s не найдено подходящих форматов OpenAL."
 
-#: src/audio_output.cpp:342
+#: src/audio_output.cpp:340
 msgid "Cannot buffer initial OpenAL data."
 msgstr "Невозможно буферизировать начальные данные OpenAL."
 
-#: src/audio_output.cpp:356
+#: src/audio_output.cpp:354
 msgid "Cannot buffer OpenAL data."
 msgstr "Невозможно буферизировать данные OpenAL."
 
-#: src/audio_output.cpp:381
+#: src/audio_output.cpp:379
 msgid "Cannot start OpenAL source playback."
 msgstr "Невозможно начать воспроизведение источника OpenAL."
 
-#: src/audio_output.cpp:395
+#: src/audio_output.cpp:393
 msgid "Cannot pause OpenAL source playback."
 msgstr "Невозможно приостановить воспроизведение источника OpenAL."
 
-#: src/audio_output.cpp:404
+#: src/audio_output.cpp:402
 msgid "Cannot unpause OpenAL source playback."
 msgstr "Невозможно возобновить воспроизведение источника OpenAL."
 
-#: src/audio_output.cpp:413
+#: src/audio_output.cpp:411
 msgid "Cannot stop OpenAL source playback."
 msgstr "Невозможно остановить воспроизведение источника OpenAL."
 
-#: src/audio_output.cpp:424
+#: src/audio_output.cpp:422
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Невозможно получить из очереди буферы источника OpenAL."
 
-#: src/lib_versions.cpp:89 src/lib_versions.cpp:122 src/lib_versions.cpp:161
-#: src/media_data.cpp:422 src/media_data.cpp:445 src/media_data.cpp:483
-#: src/media_data.cpp:488
+#: src/lib_versions.cpp:123 src/lib_versions.cpp:162 src/media_data.cpp:422
+#: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
 msgid "unknown"
 msgstr "неизвестно"
 
-#: src/lib_versions.cpp:185
+#: src/lib_versions.cpp:186 src/lib_versions.cpp:198
 msgid "not used"
 msgstr "не используется"
 
-#: src/main.cpp:275
+#: src/main.cpp:288
 #, c-format
 msgid "%s version %s"
 msgstr "%s версия %s"
 
-#: src/main.cpp:276
+#: src/main.cpp:289
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr "Copyright (C) 2011 Разработчики Bino."
 
-#: src/main.cpp:277
+#: src/main.cpp:290
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -222,18 +221,18 @@
 "требованиям лицензии GNU General Public License. Программное обеспечение "
 "поставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, за исключением предусмотренных законом."
 
-#: src/main.cpp:280 src/player_qt.cpp:2660
+#: src/main.cpp:293 src/player_qt.cpp:2859
 msgid "Platform:"
 msgstr "Платформа:"
 
-#: src/main.cpp:282 src/player_qt.cpp:2661
+#: src/main.cpp:295 src/player_qt.cpp:2860
 msgid "Libraries used:"
 msgstr "Используемые библиотеки:"
 
 #. TRANSLATORS: This is the --help text. Translate only the description,
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
-#: src/main.cpp:294
+#: src/main.cpp:307
 #, fuzzy, c-format
 msgid ""
 "Usage:\n"
@@ -244,13 +243,14 @@
 "  --version                Print version.\n"
 "  -n|--no-gui              Do not use the GUI, just show a plain window.\n"
 "  -L|--log-level=LEVEL     Set log level (debug/info/warning/error/quiet).\n"
-"  --device-type=TYPE       Type of input device: default, firewire, or x11.\n"
+"  --device-type=TYPE       Type of input device: default, firewire, x11.\n"
 "  --device-frame-size=WxH  Request frame size WxH from input device.\n"
 "  --device-frame-rate=N/D  Request frame rate N/D from input device.\n"
+"  --lirc-config=FILE       Use the given LIRC configuration file. This\n"
+"                           option can be used more than once.\n"
 "  -v|--video=STREAM        Select video stream (1-n, depending on input).\n"
 "  -a|--audio=STREAM        Select audio stream (1-n, depending on input).\n"
-"  -s|--subtitle=STREAM     Select subtitle stream (0-n, depending on "
-"input).\n"
+"  -s|--subtitle=STREAM     Select subtitle stream (0-n, dep. on input).\n"
 "  -i|--input=TYPE          Select input type (default autodetect):\n"
 "    mono                     Single view.\n"
 "    separate-left-right      Left/right separate streams, left first.\n"
@@ -295,8 +295,13 @@
 "    equalizer-3d             Multi-display via Equalizer (3D setup).\n"
 "  -S|--swap-eyes           Swap left/right view.\n"
 "  -f|--fullscreen          Fullscreen.\n"
-"  --fullscreen-screen=N    Use screen N for fullscreen mode. The default\n"
-"                           N=0 uses the primary screen of the desktop.\n"
+"  --fullscreen-screens=    Use the listed screens in fullscreen mode.\n"
+"     [S0[,S1[,...]]]       Screen numbers start with 1. The default\n"
+"                           (empty list) is to use the primary screen.\n"
+"  --fullscreen-flip-left   Flip left view vertically when fullscreen.\n"
+"  --fullscreen-flop-left   Flop left view horizontally when fullscreen.\n"
+"  --fullscreen-flip-right  Flip right view vertically when fullscreen.\n"
+"  --fullscreen-flop-right  Flop right view horizontally when fullscreen.\n"
 "  -c|--center              Center window on screen.\n"
 "  --subtitle-encoding=ENC  Set subtitle encoding.\n"
 "  --subtitle-font=FONT     Set subtitle font name.\n"
@@ -421,17 +426,22 @@
 "  page up, page down  Перемотать на 10 минут назад / вперед.\n"
 "  Щелчок мышью        Перемотать по горизонтальному положению курсора."
 
-#: src/main.cpp:517
+#: src/main.cpp:560
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr ""
 "Режим оценки производительности: воспроизведение аудио отключено, "

bino-1.1.0.tar.bz2/src/Makefile.am -> bino-1.1.1.tar.bz2/src/Makefile.am Changed

bino-1.1.0.tar.bz2/src/Makefile.in -> bino-1.1.1.tar.bz2/src/Makefile.in Changed

@@ -48,7 +48,10 @@
 @HAVE_LIBEQUALIZER_TRUE@am__append_3 = $(libEqualizer_LIBS)
 @HAVE_LIBEQUALIZER_FALSE@am__append_4 = $(libglew_CFLAGS)
 @HAVE_LIBEQUALIZER_FALSE@am__append_5 = $(libglew_LIBS)
-@W32_TRUE@am__append_6 = logo/bino_logo.ico
+@HAVE_LIBLIRCCLIENT_TRUE@am__append_6 = lirc.h lirc.cpp
+@HAVE_LIBLIRCCLIENT_TRUE@am__append_7 = $(liblircclient_CFLAGS)
+@HAVE_LIBLIRCCLIENT_TRUE@am__append_8 = $(liblircclient_LIBS)
+@W32_TRUE@am__append_9 = logo/bino_logo.ico
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -72,29 +75,33 @@
 	subtitle_renderer.h subtitle_renderer.cpp audio_output.h \
 	audio_output.cpp player.h player.cpp player_qt.h player_qt.cpp \
 	qt_app.h qt_app.cpp lib_versions.h lib_versions.cpp main.cpp \
-	player_equalizer.h player_equalizer.cpp logo/bino_logo.ico
+	player_equalizer.h player_equalizer.cpp lirc.h lirc.cpp \
+	logo/bino_logo.ico
 @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_2 = logo/bino_logo.$(OBJEXT)
+@W32_TRUE@am__objects_3 = logo/bino_logo.$(OBJEXT)
 am_bino_OBJECTS = media_data.$(OBJEXT) media_object.$(OBJEXT) \
 	media_input.$(OBJEXT) controller.$(OBJEXT) \
 	video_output.$(OBJEXT) video_output_qt.$(OBJEXT) xgl.$(OBJEXT) \
 	subtitle_renderer.$(OBJEXT) audio_output.$(OBJEXT) \
 	player.$(OBJEXT) player_qt.$(OBJEXT) qt_app.$(OBJEXT) \
 	lib_versions.$(OBJEXT) main.$(OBJEXT) $(am__objects_1) \
-	$(am__objects_2)
+	$(am__objects_2) $(am__objects_3)
 nodist_bino_OBJECTS = qt_resources-rcc.$(OBJEXT) \
 	player_qt-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_LIBEQUALIZER_FALSE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+@HAVE_LIBLIRCCLIENT_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_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
@@ -289,6 +296,8 @@
 libexecdir = @libexecdir@
 libglew_CFLAGS = @libglew_CFLAGS@
 libglew_LIBS = @libglew_LIBS@
+liblircclient_CFLAGS = @liblircclient_CFLAGS@
+liblircclient_LIBS = @liblircclient_LIBS@
 libopenal_CFLAGS = @libopenal_CFLAGS@
 libopenal_LIBS = @libopenal_LIBS@
 libqtopengl_CFLAGS = @libqtopengl_CFLAGS@
@@ -324,7 +333,7 @@
 	subtitle_renderer.h subtitle_renderer.cpp audio_output.h \
 	audio_output.cpp player.h player.cpp player_qt.h player_qt.cpp \
 	qt_app.h qt_app.cpp lib_versions.h lib_versions.cpp main.cpp \
-	$(am__append_1) $(am__append_6)
+	$(am__append_1) $(am__append_6) $(am__append_9)
 ICONS = \
 	icons/application-exit.png \
 	icons/applications-internet.png \
@@ -371,11 +380,12 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src/base $(libavformat_CFLAGS) \
 	$(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \
 	$(libopenal_CFLAGS) $(libglew_CFLAGS) $(libqtopengl_CFLAGS) \
-	$(am__append_2) $(am__append_4)
+	$(am__append_2) $(am__append_4) $(am__append_7)
 bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) \
 	$(libavformat_LIBS) $(libavdevice_LIBS) $(libswscale_LIBS) \
 	$(libass_LIBS) $(libopenal_LIBS) $(libglew_LIBS) \
-	$(libqtopengl_LIBS) $(am__append_3) $(am__append_5)
+	$(libqtopengl_LIBS) $(am__append_3) $(am__append_5) \
+	$(am__append_8)
 moc_verbose = $(moc_verbose_$(V))
 moc_verbose_ = $(moc_verbose_$(AM_DEFAULT_VERBOSITY))
 moc_verbose_0 = @echo "  MOC   " $@;
@@ -476,6 +486,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_output.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/controller.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_versions.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lirc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/media_data.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/media_input.Po@am__quote@

bino-1.1.0.tar.bz2/src/audio_output.cpp -> bino-1.1.1.tar.bz2/src/audio_output.cpp Changed

bino-1.1.0.tar.bz2/src/audio_output.h -> bino-1.1.1.tar.bz2/src/audio_output.h Changed

bino-1.1.0.tar.bz2/src/base/Makefile.in -> bino-1.1.1.tar.bz2/src/base/Makefile.in Changed

bino-1.1.0.tar.bz2/src/base/opt.h -> bino-1.1.1.tar.bz2/src/base/opt.h Changed

@@ -480,29 +480,32 @@
         {
             std::istringstream is(argument);
             std::vector<T> vv;
-            do
+            if (argument.length() > 0)
             {
-                T v;
-                is >> v;
-                if (is.fail())
+                do
                 {
-                    return false;
-                }
-                vv.push_back(v);
-                if (!is.eof())
-                {
-                    for (size_t i = 0; i < _separator.length(); i++)
+                    T v;
+                    is >> v;
+                    if (is.fail())
+                    {
+                        return false;
+                    }
+                    vv.push_back(v);
+                    if (!is.eof())
                     {
-                        char c;
-                        is.get(c);
-                        if (is.fail() || c != _separator[i])
+                        for (size_t i = 0; i < _separator.length(); i++)
                         {
-                            return false;
+                            char c;
+                            is.get(c);
+                            if (is.fail() || c != _separator[i])
+                            {
+                                return false;
+                            }
                         }
                     }
                 }
+                while (!is.eof());
             }
-            while (!is.eof());
             if (_size_is_fixed && vv.size() != _fixed_size)
             {
                 return false;

bino-1.1.0.tar.bz2/src/base/str.cpp -> bino-1.1.1.tar.bz2/src/base/str.cpp Changed

bino-1.1.0.tar.bz2/src/base/str.h -> bino-1.1.1.tar.bz2/src/base/str.h Changed

bino-1.1.0.tar.bz2/src/controller.cpp -> bino-1.1.1.tar.bz2/src/controller.cpp Changed

@@ -23,27 +23,39 @@
 #include <vector>
 
 #include "exc.h"
+#include "dbg.h"
 #include "msg.h"
 #include "timer.h"
+#include "thread.h"
 
 #include "controller.h"
 #include "player.h"
 
 
 // The single player instance
-extern player *global_player;
-extern std::vector<controller *> global_controllers;
+static player *global_player;
 
-controller::controller(bool receive_notifications) throw ()
+// The list of registered controllers
+static std::vector<controller *> global_controllers;
+static unsigned int global_controllers_version;
+static mutex global_controllers_mutex;
+
+// Note about thread safety:
+// Only the constructor and destructor are thread safe (by using a lock on the
+// global_controllers vector).  The visitation of controllers and the actions
+// performed as a result are supposed to happen inside a single thread.
+
+controller::controller() throw ()
 {
-    if (receive_notifications)
-    {
-        global_controllers.push_back(this);
-    }
+    global_controllers_mutex.lock();
+    global_controllers.push_back(this);
+    global_controllers_version++;
+    global_controllers_mutex.unlock();
 }
 
 controller::~controller()
 {
+    global_controllers_mutex.lock();
     for (size_t i = 0; i < global_controllers.size(); i++)
     {
         if (global_controllers[i] == this)
@@ -52,6 +64,8 @@
             break;
         }
     }
+    global_controllers_version++;
+    global_controllers_mutex.unlock();
 }
 
 void controller::send_cmd(const command &cmd)
@@ -66,3 +80,93 @@
 {
     /* default: ignore the notification */
 }
+
+void controller::process_events()
+{
+    /* default: do nothing */
+}
+
+void *controller::get_global_player()
+{
+    return global_player;
+}
+
+void controller::set_global_player(void *p)
+{
+    assert(!p || !global_player);       // there can be at most one global player
+    global_player = static_cast<player *>(p);
+}
+
+void controller::visit_all_controllers(int action, const notification &note)
+{
+    std::vector<controller *> visited_controllers;
+    visited_controllers.reserve(global_controllers.size());
+
+    // First, try to visit all controllers in one row without extra checks. This
+    // only works as long as controllers do not vanish or appear as a result of
+    // the function we call. This is the common case.
+    unsigned int controllers_version = global_controllers_version;
+    for (size_t i = 0; i < global_controllers.size(); i++)
+    {
+        controller *c = global_controllers[i];
+        if (action == 0)
+        {
+            c->process_events();
+        }
+        else
+        {
+            c->receive_notification(note);
+        }
+        visited_controllers.push_back(c);
+        if (controllers_version != global_controllers_version)
+        {
+            break;
+        }
+    }
+    // If some controllers vanished or appeared, we need to redo the loop and
+    // check for each controller if it was visited before. This is costly, but
+    // it happens seldomly.
+    while (controllers_version != global_controllers_version)
+    {
+        controllers_version = global_controllers_version;
+        for (size_t i = 0; i < global_controllers.size(); i++)
+        {
+            controller *c = global_controllers[i];
+            bool visited = false;
+            for (size_t j = 0; j < visited_controllers.size(); j++)
+            {
+                if (visited_controllers[j] == c)
+                {
+                    visited = true;
+                    break;
+                }
+            }
+            if (!visited)
+            {
+                if (action == 0)
+                {
+                    c->process_events();
+                }
+                else
+                {
+                    c->receive_notification(note);
+                }
+                visited_controllers.push_back(c);
+                if (controllers_version != global_controllers_version)
+                {
+                    break;
+                }
+            }
+        }
+    }
+}
+
+void controller::process_all_events()
+{
+    visit_all_controllers(0, notification(notification::play));
+}
+
+void controller::notify_all(const notification &note)
+{
+    visit_all_controllers(1, note);
+}

bino-1.1.0.tar.bz2/src/controller.h -> bino-1.1.1.tar.bz2/src/controller.h Changed

@@ -49,6 +49,7 @@
 public:
     enum type
     {
+        noop,                           // no parameters
         toggle_play,                    // no parameters
         toggle_pause,                   // no parameters
         cycle_video_stream,             // no parameters
@@ -85,12 +86,21 @@
         seek,                           // float (relative adjustment)
         set_pos,                        // float (absolute position)
         set_loop_mode,                  // parameters::loop_mode_t
-        set_fullscreen_screen,          // int
+        set_fullscreen_screens,         // int
+        set_fullscreen_flip_left,       // int
+        set_fullscreen_flop_left,       // int
+        set_fullscreen_flip_right,      // int
+        set_fullscreen_flop_right,      // int
     };
     
     type type;
     std::string param;
 
+    command() :
+        type(noop)
+    {
+    }
+
     command(enum type t) :
         type(t)
     {
@@ -150,7 +160,11 @@
         subtitle_parallax,      // float
         pos,                    // float
         loop_mode,              // parameters::loop_mode_t
-        fullscreen_screen,      // int
+        fullscreen_screens,     // int
+        fullscreen_flip_left,   // int
+        fullscreen_flop_left,   // int
+        fullscreen_flip_right,  // int
+        fullscreen_flop_right,  // int
     };
     
     type type;
@@ -222,22 +236,42 @@
 
 class controller
 {
+private:
+    static void visit_all_controllers(int action, const notification &note);
+
 public:
-    /* A controller usually receives notifications, but may choose not to, e.g. when it
-     * never will react on any notification anyway. */
-    controller(bool receive_notifications = true) throw ();
+    controller() throw ();
     virtual ~controller();
 
-    /* Send a command to the player. */
+    /* The controller uses this function to send a command to the player. */
     void send_cmd(const command &cmd);
-    void send_cmd(enum command::type t) { send_cmd(command(t)); }                               // convenience wrapper
-    void send_cmd(enum command::type t, int p) { send_cmd(command(t, p)); }                     // convenience wrapper
-    void send_cmd(enum command::type t, float p) { send_cmd(command(t, p)); }                   // convenience wrapper
-    void send_cmd(enum command::type t, const std::string &p) { send_cmd(command(t, p)); }      // convenience wrapper
+    // Convenience wrappers:
+    void send_cmd(enum command::type t) { send_cmd(command(t)); }
+    void send_cmd(enum command::type t, int p) { send_cmd(command(t, p)); }
+    void send_cmd(enum command::type t, float p) { send_cmd(command(t, p)); }
+    void send_cmd(enum command::type t, const std::string &p) { send_cmd(command(t, p)); }
 
-    /* Receive notifications via this function. The default implementation
-     * simply ignores the notification. */
+    /* The controller receives notifications via this function. The default
+     * implementation simply ignores the notification. */
     virtual void receive_notification(const notification &note);
+
+    /* The controller is asked to process events via this function. The default
+     * implementation simply does nothing. */
+    virtual void process_events();
+
+    /* The following functions can be used by command dispatchers to handle all
+     * controller-related tasks: managing the global player object, and notifying
+     * registered controllers. */
+    static void *get_global_player();
+    static void set_global_player(void *p);
+    static void process_all_events();
+    static void notify_all(const notification &note);
+    // Convenience wrappers:
+    static void notify_all(enum notification::type t, bool p, bool c) { notify_all(notification(t, p, c)); }
+    static void notify_all(enum notification::type t, int p, int c) { notify_all(notification(t, p, c)); }
+    static void notify_all(enum notification::type t, float p, float c) { notify_all(notification(t, p, c)); }
+    static void notify_all(enum notification::type t, uint64_t p, uint64_t c) { notify_all(notification(t, p, c)); }
+    static void notify_all(enum notification::type t, const std::string &p, const std::string &c) { notify_all(notification(t, p, c)); }
 };
 
 #endif

bino-1.1.0.tar.bz2/src/lib_versions.cpp -> bino-1.1.1.tar.bz2/src/lib_versions.cpp Changed

@@ -61,6 +61,7 @@
 static std::vector<std::string> opengl_v;
 static std::vector<std::string> glew_v;
 static std::vector<std::string> equalizer_v;
+static std::vector<std::string> lircclient_v;
 static std::vector<std::string> qt_v;
 
 static void ffmpeg_versions()
@@ -86,7 +87,7 @@
 {
     if (libass_v.size() == 0)
     {
-        libass_v.push_back(_("unknown"));
+        libass_v.push_back(LIBASS_PKGCONFIG_VERSION);
     }
 }
 
@@ -187,6 +188,18 @@
     }
 }
 
+static void lircclient_versions()
+{
+    if (lircclient_v.size() == 0)
+    {
+#if HAVE_LIBLIRCCLIENT
+        lircclient_v.push_back(LIBLIRCCLIENT_PKGCONFIG_VERSION);
+#else
+        lircclient_v.push_back(_("not used"));
+#endif
+    }
+}
+
 static void qt_versions()
 {
     if (qt_v.size() == 0)
@@ -203,6 +216,7 @@
     opengl_versions();
     glew_versions();
     equalizer_versions();
+    lircclient_versions();
     qt_versions();
 
     std::vector<std::string> v;
@@ -245,6 +259,12 @@
             v.push_back(std::string("<br>") + equalizer_v[i]);
         }
         v.push_back("</li>");
+        v.push_back("<li><a href=\"http://www.lirc.org/\">LIRC Client</a>");
+        for (size_t i = 0; i < lircclient_v.size(); i++)
+        {
+            v.push_back(std::string("<br>") + lircclient_v[i]);
+        }
+        v.push_back("</li>");
         v.push_back("<li><a href=\"http://qt.nokia.com/\">Qt</a>");
         for (size_t i = 0; i < qt_v.size(); i++)
         {
@@ -285,6 +305,11 @@
         {
             v.push_back(std::string("    ") + equalizer_v[i]);
         }
+        v.push_back("LIRC Client:");
+        for (size_t i = 0; i < lircclient_v.size(); i++)
+        {
+            v.push_back(std::string("    ") + lircclient_v[i]);
+        }
         v.push_back("Qt:");
         for (size_t i = 0; i < qt_v.size(); i++)
         {

bino-1.1.1.tar.bz2/src/lirc.cpp Added

@@ -0,0 +1,275 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * Copyright (C) 2011
+ * 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 <cstdlib>
+#include <cstdio>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include "gettext.h"
+#define _(string) gettext(string)
+
+#include "exc.h"
+#include "str.h"
+#include "msg.h"
+
+#include "lirc.h"
+
+
+lircclient::lircclient(
+        const std::string &client_name,
+        const std::vector<std::string> &conf_files) :
+    controller(),
+    _client_name(client_name),
+    _conf_files(conf_files),
+    _initialized(false),
+    _playing(false),
+    _pausing(false)
+{
+}
+
+lircclient::~lircclient()
+{
+    deinit();
+}
+
+void lircclient::init()
+{
+    if (!_initialized)
+    {
+        int socket_flags;
+        _socket = lirc_init(const_cast<char *>(_client_name.c_str()), msg::level() == msg::DBG ? 1 : 0);
+        if (_socket == -1)
+        {
+            throw exc(_("Cannot initialize LIRC."));
+        }
+        if ((socket_flags = fcntl(_socket, F_GETFL)) < 0
+                || fcntl(_socket, F_SETFL, socket_flags | O_NONBLOCK) < 0)
+        {
+            lirc_deinit();
+            throw exc(_("Cannot set LIRC socket properties."));
+        }
+        if (_conf_files.size() == 0)
+        {
+            if (lirc_readconfig(NULL, &_config, NULL) != 0)
+            {
+                lirc_deinit();
+                throw exc(_("Cannot read LIRC default configuration."));
+            }
+        }
+        else
+        {
+            _config = NULL;
+            for (size_t i = 0; i < _conf_files.size(); i++)
+            {
+                if (lirc_readconfig(const_cast<char *>(_conf_files[i].c_str()), &_config, NULL) != 0)
+                {
+                    if (_config)
+                    {
+                        lirc_freeconfig(_config);
+                    }
+                    lirc_deinit();
+                    throw exc(str::asprintf(_("Cannot read LIRC configuration file %s."), _conf_files[i].c_str()));
+                }
+            }
+        }
+        _initialized = true;
+    }
+}
+
+void lircclient::deinit()
+{
+    if (_initialized)
+    {
+        lirc_freeconfig(_config);
+        lirc_deinit();
+        _initialized = false;
+    }
+}
+
+void lircclient::receive_notification(const notification &note)
+{
+    std::istringstream current(note.current);
+
+    switch (note.type)
+    {
+    case notification::play:
+        s11n::load(current, _playing);
+        if (!_playing)
+        {
+            _pausing = false;
+        }
+        break;
+    case notification::pause:
+        s11n::load(current, _pausing);
+        break;
+    default:
+        break;
+    }
+}
+
+void lircclient::process_events()
+{
+    if (_initialized)
+    {
+        char *code;
+        char *cmd;
+        int e;
+
+        if ((e = lirc_nextcode(&code)) != 0)
+        {
+            msg::err(_("Cannot get LIRC event; disabling LIRC support."));
+            deinit();
+            return;
+        }
+        if (!code)
+        {
+            /* No event currently available */
+            return;
+        }
+        while ((e = lirc_code2char(_config, code, &cmd)) == 0 && cmd)
+        {
+            command c;
+            if (!get_command(cmd, c))
+            {
+                msg::err(str::asprintf(_("Received invalid command '%s' from LIRC."), str::sanitize(cmd).c_str()));
+            }
+            else
+            {
+                send_cmd(c);
+            }
+        }
+        std::free(code);
+        if (e != 0)
+        {
+            msg::wrn(_("Cannot get command for LIRC code."));
+        }
+    }
+}
+
+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(), "adjust-contrast %f", &parameter) == 1)

bino-1.1.1.tar.bz2/src/lirc.h Added

@@ -0,0 +1,64 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * Copyright (C) 2011
+ * 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 LIRC_H
+#define LIRC_H
+
+#include <string>
+#include <vector>
+
+#include <lirc/lirc_client.h>
+
+#include "controller.h"
+
+
+class lircclient : public controller
+{
+private:
+    const std::string _client_name;
+    const std::vector<std::string> _conf_files;
+    bool _initialized;
+    int _socket;
+    struct lirc_config *_config;
+
+    // Current player state; required for some commands
+    bool _playing;
+    bool _pausing;
+
+    // Helper function to read a command from a string
+    bool get_command(const std::string &s, command &c);
+
+public:
+    lircclient(const std::string &client_name, const std::vector<std::string> &conf_files);
+    ~lircclient();
+    
+    /* Initialize LIRC. Throw an exception if this fails. */
+    void init();
+    /* Deinitialize. */
+    void deinit();
+
+    /* Receive notifications to keep track of required state. */
+    virtual void receive_notification(const notification &note);
+
+    /* Process LIRC events. */
+    virtual void process_events();
+};
+
+#endif

bino-1.1.0.tar.bz2/src/main.cpp -> bino-1.1.1.tar.bz2/src/main.cpp Changed

@@ -47,6 +47,9 @@
 #if HAVE_LIBEQUALIZER
 # include "player_equalizer.h"
 #endif
+#if HAVE_LIBLIRCCLIENT
+# include "lirc.h"
+#endif
 #include "qt_app.h"
 #include "lib_versions.h"
 
@@ -161,6 +164,8 @@
     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);
+    opt::val<std::string> lirc_config("lirc-config", '\0', opt::optional);
+    options.push_back(&lirc_config);
     std::vector<std::string> input_modes;
     input_modes.push_back("mono");
     input_modes.push_back("separate-left-right");
@@ -217,8 +222,16 @@
     options.push_back(&swap_eyes);
     opt::flag fullscreen("fullscreen", 'f', opt::optional);
     options.push_back(&fullscreen);
-    opt::val<int> fullscreen_screen("fullscreen-screen", '\0', opt::optional, 0, 999, parameters().fullscreen_screen);
-    options.push_back(&fullscreen_screen);
+    opt::tuple<int> fullscreen_screens("fullscreen-screens", '\0', opt::optional, 1, 16);
+    options.push_back(&fullscreen_screens);
+    opt::flag fullscreen_flip_left("fullscreen-flip-left", '\0', opt::optional);
+    options.push_back(&fullscreen_flip_left);
+    opt::flag fullscreen_flop_left("fullscreen-flop-left", '\0', opt::optional);
+    options.push_back(&fullscreen_flop_left);
+    opt::flag fullscreen_flip_right("fullscreen-flip-right", '\0', opt::optional);
+    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 center("center", 'c', opt::optional);
     options.push_back(&center);
     opt::val<std::string> subtitle_encoding("subtitle-encoding", '\0', opt::optional, parameters().subtitle_encoding);
@@ -299,12 +312,14 @@
                     "  --version                Print version.\n"
                     "  -n|--no-gui              Do not use the GUI, just show a plain window.\n"
                     "  -L|--log-level=LEVEL     Set log level (debug/info/warning/error/quiet).\n"
-                    "  --device-type=TYPE       Type of input device: default, firewire, or x11.\n"
+                    "  --device-type=TYPE       Type of input device: default, firewire, x11.\n"
                     "  --device-frame-size=WxH  Request frame size WxH from input device.\n"
                     "  --device-frame-rate=N/D  Request frame rate N/D from input device.\n"
+                    "  --lirc-config=FILE       Use the given LIRC configuration file. This\n"
+                    "                           option can be used more than once.\n"
                     "  -v|--video=STREAM        Select video stream (1-n, depending on input).\n"
                     "  -a|--audio=STREAM        Select audio stream (1-n, depending on input).\n"
-                    "  -s|--subtitle=STREAM     Select subtitle stream (0-n, depending on input).\n"
+                    "  -s|--subtitle=STREAM     Select subtitle stream (0-n, dep. on input).\n"
                     "  -i|--input=TYPE          Select input type (default autodetect):\n"
                     "    mono                     Single view.\n"
                     "    separate-left-right      Left/right separate streams, left first.\n"
@@ -349,8 +364,13 @@
                     "    equalizer-3d             Multi-display via Equalizer (3D setup).\n"
                     "  -S|--swap-eyes           Swap left/right view.\n"
                     "  -f|--fullscreen          Fullscreen.\n"
-                    "  --fullscreen-screen=N    Use screen N for fullscreen mode. The default\n"
-                    "                           N=0 uses the primary screen of the desktop.\n"
+                    "  --fullscreen-screens=    Use the listed screens in fullscreen mode.\n"
+                    "     [S0[,S1[,...]]]       Screen numbers start with 1. The default\n"
+                    "                           (empty list) is to use the primary screen.\n"
+                    "  --fullscreen-flip-left   Flip left view vertically when fullscreen.\n"
+                    "  --fullscreen-flop-left   Flop left view horizontally when fullscreen.\n"
+                    "  --fullscreen-flip-right  Flip right view vertically when fullscreen.\n"
+                    "  --fullscreen-flop-right  Flop right view horizontally when fullscreen.\n"
                     "  -c|--center              Center window on screen.\n"
                     "  --subtitle-encoding=ENC  Set subtitle encoding.\n"
                     "  --subtitle-font=FONT     Set subtitle font name.\n"
@@ -495,7 +515,30 @@
     }
     init_data.params.stereo_mode_swap = swap_eyes.value();
     init_data.fullscreen = fullscreen.value();
-    init_data.params.fullscreen_screen = fullscreen_screen.value();
+    if (fullscreen_screens.values().size() > 0)
+    {
+        init_data.params.fullscreen_screens = 0;
+        for (size_t i = 0; i < fullscreen_screens.value().size(); i++)
+        {
+            init_data.params.fullscreen_screens |= (1 << (fullscreen_screens.value()[i] - 1));
+        }
+    }
+    if (fullscreen_flip_left.values().size() > 0)
+    {
+        init_data.params.fullscreen_flip_left = fullscreen_flip_left.value();
+    }
+    if (fullscreen_flop_left.values().size() > 0)
+    {
+        init_data.params.fullscreen_flop_left = fullscreen_flop_left.value();
+    }
+    if (fullscreen_flip_right.values().size() > 0)
+    {
+        init_data.params.fullscreen_flip_right = fullscreen_flip_right.value();
+    }
+    if (fullscreen_flop_right.values().size() > 0)
+    {
+        init_data.params.fullscreen_flop_right = fullscreen_flop_right.value();
+    }
     init_data.center = center.value();
     init_data.params.subtitle_encoding = subtitle_encoding.value();
     init_data.params.subtitle_font = subtitle_font.value();
@@ -518,6 +561,23 @@
     }
     init_data.params.loop_mode = (loop.value() ? parameters::loop_current : parameters::no_loop);
 
+#if HAVE_LIBLIRCCLIENT
+    lircclient lirc(PACKAGE, lirc_config.values());
+    try
+    {
+        lirc.init();
+    }
+    catch (std::exception &e)
+    {
+        msg::wrn("%s", e.what());
+    }
+#else
+    if (lirc_config.values().size() > 0)
+    {
+        msg::wrn(_("This version of Bino was compiled without support for LIRC."));
+    }
+#endif
+
     int retval = 0;
     player *player = NULL;
     try
@@ -562,5 +622,9 @@
         delete player;
     }
 
+#if HAVE_LIBLIRCCLIENT
+    lirc.deinit();
+#endif
+
     return retval;
 }

bino-1.1.0.tar.bz2/src/media_data.cpp -> bino-1.1.1.tar.bz2/src/media_data.cpp Changed

@@ -425,7 +425,7 @@
 
 std::string audio_blob::format_name() const
 {
-    const char *sample_format_name;
+    const char *sample_format_name = "";
     switch (sample_format)
     {
     case u8:
@@ -572,7 +572,11 @@
     subtitle_color(std::numeric_limits<uint64_t>::max()),
     subtitle_parallax(std::numeric_limits<float>::quiet_NaN()),
     loop_mode(no_loop),
-    fullscreen_screen(-1)
+    fullscreen_screens(-1),
+    fullscreen_flip_left(-1),
+    fullscreen_flop_left(-1),
+    fullscreen_flip_right(-1),
+    fullscreen_flop_right(-1)
 {
 }
 
@@ -638,9 +642,25 @@
     {
         subtitle_parallax = 0.0f;
     }
-    if (fullscreen_screen < 0)
+    if (fullscreen_screens < 0)
     {
-        fullscreen_screen = 0;
+        fullscreen_screens = 0;
+    }
+    if (fullscreen_flip_left < 0)
+    {
+        fullscreen_flip_left = 0;
+    }
+    if (fullscreen_flop_left < 0)
+    {
+        fullscreen_flop_left = 0;
+    }
+    if (fullscreen_flip_right < 0)
+    {
+        fullscreen_flip_right = 0;
+    }
+    if (fullscreen_flop_right < 0)
+    {
+        fullscreen_flop_right = 0;
     }
 }
 
@@ -873,7 +893,11 @@
     s11n::save(os, subtitle_color);
     s11n::save(os, subtitle_parallax);
     s11n::save(os, static_cast<int>(loop_mode));
-    s11n::save(os, fullscreen_screen);
+    s11n::save(os, fullscreen_screens);
+    s11n::save(os, fullscreen_flip_left);
+    s11n::save(os, fullscreen_flop_left);
+    s11n::save(os, fullscreen_flip_right);
+    s11n::save(os, fullscreen_flop_right);
 }
 
 void parameters::load(std::istream &is)
@@ -899,5 +923,9 @@
     s11n::load(is, subtitle_parallax);
     s11n::load(is, x);
     loop_mode = static_cast<loop_mode_t>(x);
-    s11n::load(is, fullscreen_screen);
+    s11n::load(is, fullscreen_screens);
+    s11n::load(is, fullscreen_flip_left);
+    s11n::load(is, fullscreen_flop_left);
+    s11n::load(is, fullscreen_flip_right);
+    s11n::load(is, fullscreen_flop_right);
 }

bino-1.1.0.tar.bz2/src/media_data.h -> bino-1.1.1.tar.bz2/src/media_data.h Changed

bino-1.1.0.tar.bz2/src/media_object.cpp -> bino-1.1.1.tar.bz2/src/media_object.cpp Changed

@@ -642,13 +642,17 @@
     int e;
 
     /* Set format and parameters for device input */
-    AVInputFormat *iformat;
+    AVInputFormat *iformat = NULL;
     AVFormatParameters iparams;
+    std::memset(&iparams, 0, sizeof(iparams));
+    iparams.pix_fmt = PIX_FMT_NONE;
     bool use_iparams = false;
     switch (dev_request.device)
     {
     case device_request::firewire:
         iformat = av_find_input_format("libdc1394");
+        // libdc1394 requires pix_fmt = PIX_FMT_NONE to choose a suitable default pixel format.
+        use_iparams = true;
         break;
     case device_request::x11:
         iformat = av_find_input_format("x11grab");
@@ -657,7 +661,6 @@
 #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
         iformat = av_find_input_format("vfwcap");
         // vfwcap requires a time_base parameter. Set the default to 1/25.
-        std::memset(&iparams, 0, sizeof(iparams));
         iparams.time_base.num = 1;
         iparams.time_base.den = 25;
         use_iparams = true;
@@ -665,7 +668,6 @@
         iformat = av_find_input_format("bktr");
         // bktr requires width, height, time_base parameters.
         // Set the defaults to 640x480 and 1/25.
-        std::memset(&iparams, 0, sizeof(iparams));
         iparams.width = 640;
         iparams.height = 480;
         iparams.time_base.num = 1;
@@ -677,7 +679,6 @@
 #endif
         break;
     case device_request::no_device:
-        iformat = NULL;
         break;
     }
     if (_is_device && !iformat)
@@ -691,11 +692,7 @@
             && ((dev_request.width != 0 && dev_request.height != 0)
                 || (dev_request.frame_rate_num != 0 && dev_request.frame_rate_den != 0)))
     {
-        if (!use_iparams)
-        {
-            std::memset(&iparams, 0, sizeof(iparams));
-            use_iparams = true;
-        }
+        use_iparams = true;
         if (dev_request.width != 0 && dev_request.height != 0)
         {
             iparams.width = dev_request.width;

bino-1.1.0.tar.bz2/src/player.cpp -> bino-1.1.1.tar.bz2/src/player.cpp Changed

@@ -110,12 +110,6 @@
 }
 
 
-// The single player instance
-player *global_player = NULL;
-
-// The registered controllers
-std::vector<controller *> global_controllers;
-
 player::player(type t) :
     _media_input(NULL), _audio_output(NULL), _video_output(NULL)
 {
@@ -128,9 +122,9 @@
 
 player::~player()
 {
-    if (global_player == this)
+    if (controller::get_global_player() == this)
     {
-        global_player = NULL;
+        controller::set_global_player(NULL);
     }
     delete _media_input;
     delete _audio_output;
@@ -172,7 +166,7 @@
             _audio_output->stop();
         }
     }
-    notify(notification::play, true, false);
+    controller::notify_all(notification::play, true, false);
 }
 
 video_output *player::create_video_output()
@@ -187,11 +181,7 @@
 
 void player::make_master()
 {
-    if (global_player)
-    {
-        throw exc(_("Cannot create a second master player."));
-    }
-    global_player = this;
+    controller::set_global_player(this);
 }
 
 void player::open(const player_init_data &init_data)
@@ -291,13 +281,13 @@
                 _params.stereo_mode);
         if (init_data.fullscreen)
         {
-            _video_output->enter_fullscreen(_params.fullscreen_screen);
+            _video_output->enter_fullscreen(_params.fullscreen_screens);
         }
         if (init_data.center)
         {
             _video_output->center();
         }
-        _video_output->process_events();
+        controller::process_all_events();
     }
 }
 
@@ -479,7 +469,7 @@
             _master_time_pos = _video_pos;
             _current_pos = _video_pos;
         }
-        notify(notification::pos, normalize_pos(old_pos), normalize_pos(_current_pos));
+        controller::notify_all(notification::pos, normalize_pos(old_pos), normalize_pos(_current_pos));
         _need_frame_now = false;
         _need_frame_soon = true;
         _previous_frame_dropped = false;
@@ -501,7 +491,7 @@
                 _pause_start = timer::get_microseconds(timer::monotonic);
             }
             _in_pause = true;
-            notify(notification::pause, false, true);
+            controller::notify_all(notification::pause, false, true);
         }
         *more_steps = true;
         return 1000;    // allow some sleep in pause mode
@@ -552,7 +542,7 @@
             _master_time_start += (_video_pos - _master_time_pos);
             _master_time_pos = _video_pos;
             _current_pos = _video_pos;
-            notify(notification::pos, normalize_pos(_current_pos), normalize_pos(_current_pos));
+            controller::notify_all(notification::pos, normalize_pos(_current_pos), normalize_pos(_current_pos));
         }
         _need_frame_now = false;
         _need_frame_soon = true;
@@ -588,7 +578,7 @@
                 _master_time_start += timer::get_microseconds(timer::monotonic) - _pause_start;
             }
             _in_pause = false;
-            notify(notification::pause, true, false);
+            controller::notify_all(notification::pause, true, false);
         }
 
         if (_audio_output)
@@ -620,7 +610,7 @@
                 _audio_output->data(blob);
                 _media_input->start_audio_blob_read(_audio_output->required_update_data_size());
                 _current_pos = _audio_pos;
-                notify(notification::pos, normalize_pos(_current_pos), normalize_pos(_current_pos));
+                controller::notify_all(notification::pos, normalize_pos(_current_pos), normalize_pos(_current_pos));
             }
         }
         else
@@ -705,7 +695,7 @@
         _video_output->activate_next_frame();
     }
 
-    _video_output->process_events();
+    controller::process_all_events();
     if (allowed_sleep > 0)
     {
         usleep(allowed_sleep);
@@ -716,6 +706,7 @@
 
 void player::run()
 {
+    controller::notify_all(notification::play, false, true);
     while (run_step());
 }
 
@@ -753,6 +744,8 @@
 
     switch (cmd.type)
     {
+    case command::noop:
+        break;
     case command::toggle_play:
         _quit_request = true;
         /* notify when request is fulfilled */
@@ -760,7 +753,7 @@
     case command::toggle_stereo_mode_swap:
         _params.stereo_mode_swap = !_params.stereo_mode_swap;
         parameters_changed = true;
-        notify(notification::stereo_mode_swap, !_params.stereo_mode_swap, _params.stereo_mode_swap);
+        controller::notify_all(notification::stereo_mode_swap, !_params.stereo_mode_swap, _params.stereo_mode_swap);
         break;
     case command::cycle_video_stream:
         if (_media_input->video_streams() > 1
@@ -773,7 +766,7 @@
                 newstream = 0;
             }
             _media_input->select_video_stream(newstream);
-            notify(notification::video_stream, oldstream, newstream);
+            controller::notify_all(notification::video_stream, oldstream, newstream);
             _seek_request = -1;         // Get position right
         }
         break;
@@ -791,7 +784,7 @@
             if (newstream != oldstream)
             {
                 _media_input->select_video_stream(newstream);
-                notify(notification::video_stream, oldstream, newstream);
+                controller::notify_all(notification::video_stream, oldstream, newstream);
                 _seek_request = -1;     // Get position right
             }
         }
@@ -806,7 +799,7 @@
                 newstream = 0;
             }
             _media_input->select_audio_stream(newstream);
-            notify(notification::audio_stream, oldstream, newstream);
+            controller::notify_all(notification::audio_stream, oldstream, newstream);
             _seek_request = -1;         // Get position right
         }
         break;
@@ -823,7 +816,7 @@
             if (newstream != oldstream)
             {
                 _media_input->select_audio_stream(newstream);
-                notify(notification::audio_stream, oldstream, newstream);
+                controller::notify_all(notification::audio_stream, oldstream, newstream);
                 _seek_request = -1;     // Get position right
             }
         }
@@ -838,7 +831,7 @@
                 newstream = -1;
             }
             _media_input->select_subtitle_stream(newstream);
-            notify(notification::subtitle_stream, oldstream, newstream);
+            controller::notify_all(notification::subtitle_stream, oldstream, newstream);
             _seek_request = -1;         // Get position right
         }
         break;
@@ -855,7 +848,7 @@
             if (newstream != oldstream)
             {
                 _media_input->select_subtitle_stream(newstream);
-                notify(notification::subtitle_stream, oldstream, newstream);
+                controller::notify_all(notification::subtitle_stream, oldstream, newstream);
                 _seek_request = -1;     // Get position right
             }
         }
@@ -888,16 +881,16 @@
         flag = false;
         if (_video_output)

bino-1.1.0.tar.bz2/src/player.h -> bino-1.1.1.tar.bz2/src/player.h Changed

@@ -29,7 +29,6 @@
 #include "msg.h"
 #include "s11n.h"
 
-#include "controller.h"
 #include "media_data.h"
 #include "media_input.h"
 #include "audio_output.h"
@@ -170,14 +169,6 @@
         return *_media_input;
     }
 
-    // Send a notification to the controllers (with some convenience wrappers)
-    void notify(const notification &note);
-    void notify(enum notification::type t, bool p, bool c) { notify(notification(t, p, c)); }
-    void notify(enum notification::type t, int p, int c) { notify(notification(t, p, c)); }
-    void notify(enum notification::type t, float p, float c) { notify(notification(t, p, c)); }
-    void notify(enum notification::type t, uint64_t p, uint64_t c) { notify(notification(t, p, c)); }
-    void notify(enum notification::type t, const std::string &p, const std::string &c) { notify(notification(t, p, c)); }
-
 public:
     /* Constructor/destructor.
      * Only a single player instance can exist. The constructor throws an
@@ -189,6 +180,10 @@
     virtual void open(const player_init_data &init_data);
 
     /* Get information about input and output parameters */
+    bool has_media_input() const
+    {
+        return _media_input;
+    }
     const media_input &get_media_input() const
     {
         return *_media_input;

bino-1.1.0.tar.bz2/src/player_equalizer.cpp -> bino-1.1.1.tar.bz2/src/player_equalizer.cpp Changed

bino-1.1.0.tar.bz2/src/player_qt.cpp -> bino-1.1.1.tar.bz2/src/player_qt.cpp Changed

@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include <limits>
+#include <unistd.h>
 
 #include <QCoreApplication>
 #include <QApplication>
@@ -56,6 +57,8 @@
 #include <QMap>
 #include <QColorDialog>
 #include <QDesktopWidget>
+#include <QRadioButton>
+#include <QRegExpValidator>
 
 #include "gettext.h"
 #define _(string) gettext(string)
@@ -95,9 +98,9 @@
 
 void player_qt_internal::receive_cmd(const command &cmd)
 {
-    if (cmd.type == command::toggle_play && !_playing)
+    if (cmd.type == command::toggle_play && has_media_input() && !_playing)
     {
-        notify(notification::play, false, true);
+        controller::notify_all(notification::play, false, true);
     }
     else if (_playing)
     {
@@ -119,6 +122,16 @@
     return _video_output;
 }
 
+video_output_qt *player_qt_internal::get_video_output()
+{
+    return _video_output;
+}
+
+bool player_qt_internal::is_playing() const
+{
+    return _playing;
+}
+
 bool player_qt_internal::playloop_step()
 {
     return run_step();
@@ -126,7 +139,7 @@
 
 void player_qt_internal::force_stop()
 {
-    notify(notification::play, false, false);
+    controller::notify_all(notification::play, false, false);
 }
 
 void player_qt_internal::move_event()
@@ -906,6 +919,7 @@
 {
     if (have_valid_input)
     {
+        _play_button->setDefault(true);
         _loop_button->setEnabled(true);
         _fullscreen_button->setEnabled(true);
         receive_notification(notification(notification::play, !playing, playing));
@@ -1739,7 +1753,7 @@
     _firewire_device_combobox->addItems(firewire_devices);
     _x11_device_field = new QLineEdit(x11_device);
     _x11_device_field->setToolTip(_("<p>Set the X11 device string. "
-                "Refer to the FFmpeg documentation on the x11grab device for details.</p>"));
+                "Refer to the manual for details.</p>"));
     _device_chooser_stack = new QStackedWidget();
     _device_chooser_stack->addWidget(_default_device_combobox);
     _device_chooser_stack->addWidget(_firewire_device_combobox);
@@ -1903,9 +1917,25 @@
         _init_data.params.subtitle_color = _settings->value("subtitle-color",
                 QString(str::from(std::numeric_limits<uint64_t>::max()).c_str())).toULongLong();
     }
-    if (_init_data.params.fullscreen_screen < 0)
+    if (_init_data.params.fullscreen_screens < 0)
+    {
+        _init_data.params.fullscreen_screens = _settings->value("fullscreen-screens", QString("-1")).toInt();
+    }
+    if (_init_data.params.fullscreen_flip_left < 0)
+    {
+        _init_data.params.fullscreen_flip_left = _settings->value("fullscreen-flip-left", QString("-1")).toInt();
+    }
+    if (_init_data.params.fullscreen_flop_left < 0)
+    {
+        _init_data.params.fullscreen_flop_left = _settings->value("fullscreen-flop-left", QString("-1")).toInt();
+    }
+    if (_init_data.params.fullscreen_flip_right < 0)
     {
-        _init_data.params.fullscreen_screen = _settings->value("fullscreen-screen", QString("-1")).toInt();
+        _init_data.params.fullscreen_flip_right = _settings->value("fullscreen-flip-right", QString("-1")).toInt();
+    }
+    if (_init_data.params.fullscreen_flop_right < 0)
+    {
+        _init_data.params.fullscreen_flop_right = _settings->value("fullscreen-flop-right", QString("-1")).toInt();
     }
     _settings->endGroup();
     _init_data.params.set_defaults();
@@ -1953,6 +1983,9 @@
     QMenu *preferences_menu = menuBar()->addMenu(_("&Preferences"));
     // note: whenever the preferences menu becomes a preferences panel, don't forget
     // to preferences_act->setMenuRole(QAction::PreferencesRole) on the menu item
+    QAction *preferences_fullscreen_act = new QAction(_("&Fullscreen Settings..."), this);
+    connect(preferences_fullscreen_act, SIGNAL(triggered()), this, SLOT(preferences_fullscreen()));
+    preferences_menu->addAction(preferences_fullscreen_act);
     QAction *preferences_colors_act = new QAction(_("Display &Color Adjustments..."), this);
     connect(preferences_colors_act, SIGNAL(triggered()), this, SLOT(preferences_colors()));
     preferences_menu->addAction(preferences_colors_act);
@@ -1967,10 +2000,6 @@
     QAction *preferences_stereoscopic_act = new QAction(_("Stereoscopic Video Settings..."), this);
     connect(preferences_stereoscopic_act, SIGNAL(triggered()), this, SLOT(preferences_stereoscopic()));
     preferences_menu->addAction(preferences_stereoscopic_act);
-    preferences_menu->addSeparator();
-    QAction *preferences_fullscreen_act = new QAction(_("Fullscreen Settings..."), this);
-    connect(preferences_fullscreen_act, SIGNAL(triggered()), this, SLOT(preferences_fullscreen()));
-    preferences_menu->addAction(preferences_fullscreen_act);
     QMenu *help_menu = menuBar()->addMenu(_("&Help"));
     QAction *help_manual_act = new QAction(_("&Manual..."), this);
     help_manual_act->setShortcut(QKeySequence::HelpContents);
@@ -2014,6 +2043,9 @@
         }
         open(urls, init_data.dev_request);
     }
+
+    // Start the event and play loop
+    _timer->start(0);
 }
 
 main_window::~main_window()
@@ -2091,13 +2123,7 @@
             _in_out_widget->update(_init_data, true, true);
             _controls_widget->update(_init_data, true, true);
             // Give the keyboard focus to the video widget
-            _video_container_widget->setFocus(Qt::OtherFocusReason);
-            // Start the play loop
-            _timer->start(0);
-        }
-        else
-        {
-            _timer->stop();
+            _player->get_video_output()->grab_focus();
         }
         break;
 
@@ -2198,8 +2224,24 @@
         }
         break;
 
-    case notification::fullscreen_screen:
-        s11n::load(current, _init_data.params.fullscreen_screen);
+    case notification::fullscreen_screens:
+        s11n::load(current, _init_data.params.fullscreen_screens);
+        break;
+
+    case notification::fullscreen_flip_left:
+        s11n::load(current, _init_data.params.fullscreen_flip_left);
+        break;
+
+    case notification::fullscreen_flop_left:
+        s11n::load(current, _init_data.params.fullscreen_flop_left);
+        break;
+
+    case notification::fullscreen_flip_right:
+        s11n::load(current, _init_data.params.fullscreen_flip_right);
+        break;
+
+    case notification::fullscreen_flop_right:
+        s11n::load(current, _init_data.params.fullscreen_flop_right);
         break;
 
     case notification::pause:
@@ -2250,6 +2292,8 @@
 
 void main_window::closeEvent(QCloseEvent *event)
 {
+    // Stop the event and play loop
+    _timer->stop();
     // Remember the Session preferences
     _settings->beginGroup("Session");
     _settings->setValue("contrast", QVariant(_init_data.params.contrast).toString());
@@ -2264,7 +2308,11 @@
     _settings->setValue("subtitle-size", QVariant(_init_data.params.subtitle_size).toString());
     _settings->setValue("subtitle-scale", QVariant(_init_data.params.subtitle_scale).toString());
     _settings->setValue("subtitle-color", QVariant(static_cast<qulonglong>(_init_data.params.subtitle_color)).toString());
-    _settings->setValue("fullscreen-screen", QVariant(_init_data.params.fullscreen_screen).toString());
+    _settings->setValue("fullscreen-screens", QVariant(_init_data.params.fullscreen_screens).toString());
+    _settings->setValue("fullscreen-flip-left", QVariant(_init_data.params.fullscreen_flip_left).toString());
+    _settings->setValue("fullscreen-flop-left", QVariant(_init_data.params.fullscreen_flop_left).toString());
+    _settings->setValue("fullscreen-flip-right", QVariant(_init_data.params.fullscreen_flip_right).toString());
+    _settings->setValue("fullscreen-flop-right", QVariant(_init_data.params.fullscreen_flop_right).toString());
     _settings->endGroup();
     event->accept();
 }
@@ -2293,31 +2341,32 @@
 
 void main_window::playloop_step()
 {
-    if (_stop_request)

bino-1.1.0.tar.bz2/src/player_qt.h -> bino-1.1.1.tar.bz2/src/player_qt.h Changed

bino-1.1.0.tar.bz2/src/video_output.cpp -> bino-1.1.1.tar.bz2/src/video_output.cpp Changed

@@ -85,9 +85,7 @@
  * interpolation, too.
  */
 
-video_output::video_output(bool receive_notifications) :
-    controller(receive_notifications),
-    _initialized(false)
+video_output::video_output() : controller(), _initialized(false)
 {
     // XXX: Hack: work around broken SRGB texture implementations
     _srgb_textures_are_broken = std::getenv("SRGB_TEXTURES_ARE_BROKEN");
@@ -577,8 +575,8 @@
         glBindTexture(GL_TEXTURE_2D, _color_srgb_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_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+        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,
                 _srgb_textures_are_broken ? GL_RGB8 : GL_SRGB8,
                 frame.width, frame.height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
@@ -726,16 +724,38 @@
     trigger_update();
 }
 
-static void draw_quad(float x, float y, float w, float h)
+static void draw_quad(float x, float y, float w, float h,
+        const float tex_coords[2][4][2],
+        const float more_tex_coords[4][2] = NULL)
 {
     glBegin(GL_QUADS);
-    glTexCoord2f(0.0f, 0.0f);
+    glTexCoord2f(tex_coords[0][0][0], tex_coords[0][0][1]);
+    glMultiTexCoord2f(GL_TEXTURE1, tex_coords[1][0][0], tex_coords[1][0][1]);
+    if (more_tex_coords)
+    {
+        glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[0][0], more_tex_coords[0][1]);
+    }
     glVertex2f(x, y);
-    glTexCoord2f(1.0f, 0.0f);
+    glTexCoord2f(tex_coords[0][1][0], tex_coords[0][1][1]);
+    glMultiTexCoord2f(GL_TEXTURE1, tex_coords[1][1][0], tex_coords[1][1][1]);
+    if (more_tex_coords)
+    {
+        glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[1][0], more_tex_coords[1][1]);
+    }
     glVertex2f(x + w, y);
-    glTexCoord2f(1.0f, 1.0f);
+    glTexCoord2f(tex_coords[0][2][0], tex_coords[0][2][1]);
+    glMultiTexCoord2f(GL_TEXTURE1, tex_coords[1][2][0], tex_coords[1][2][1]);
+    if (more_tex_coords)
+    {
+        glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[2][0], more_tex_coords[2][1]);
+    }
     glVertex2f(x + w, y + h);
-    glTexCoord2f(0.0f, 1.0f);
+    glTexCoord2f(tex_coords[0][3][0], tex_coords[0][3][1]);
+    glMultiTexCoord2f(GL_TEXTURE1, tex_coords[1][3][0], tex_coords[1][3][1]);
+    if (more_tex_coords)
+    {
+        glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[3][0], more_tex_coords[3][1]);
+    }
     glVertex2f(x, y + h);
     glEnd();
 }
@@ -800,6 +820,11 @@
 
     glEnable(GL_TEXTURE_2D);
     glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+    float 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 } }
+    };
 
     /* Step 2: color-correction */
 
@@ -846,7 +871,7 @@
     }
     glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
             GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, _color_srgb_tex[0], 0);
-    draw_quad(-1.0f, +1.0f, +2.0f, -2.0f);
+    draw_quad(-1.0f, +1.0f, +2.0f, -2.0f, tex_coords);
     // right view: render into _color_srgb_tex[1]
     if (left != right)
     {
@@ -866,7 +891,7 @@
         }
         glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
                 GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, _color_srgb_tex[1], 0);
-        draw_quad(-1.0f, +1.0f, +2.0f, -2.0f);
+        draw_quad(-1.0f, +1.0f, +2.0f, -2.0f, tex_coords);
     }
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
     glViewport(viewport[0][0], viewport[0][1], viewport[0][2], viewport[0][3]);
@@ -886,6 +911,39 @@
 
     /* Step 3: rendering */
 
+    // Apply fullscreen flipping/flopping
+    if (fullscreen())
+    {
+        if (_params.fullscreen_flip_left)
+        {
+            std::swap(tex_coords[0][0][0], tex_coords[0][3][0]);
+            std::swap(tex_coords[0][0][1], tex_coords[0][3][1]);
+            std::swap(tex_coords[0][1][0], tex_coords[0][2][0]);
+            std::swap(tex_coords[0][1][1], tex_coords[0][2][1]);
+        }
+        if (_params.fullscreen_flop_left)
+        {
+            std::swap(tex_coords[0][0][0], tex_coords[0][1][0]);
+            std::swap(tex_coords[0][0][1], tex_coords[0][1][1]);
+            std::swap(tex_coords[0][3][0], tex_coords[0][2][0]);
+            std::swap(tex_coords[0][3][1], tex_coords[0][2][1]);
+        }
+        if (_params.fullscreen_flip_right)
+        {
+            std::swap(tex_coords[1][0][0], tex_coords[1][3][0]);
+            std::swap(tex_coords[1][0][1], tex_coords[1][3][1]);
+            std::swap(tex_coords[1][1][0], tex_coords[1][2][0]);
+            std::swap(tex_coords[1][1][1], tex_coords[1][2][1]);
+        }
+        if (_params.fullscreen_flop_right)
+        {
+            std::swap(tex_coords[1][0][0], tex_coords[1][1][0]);
+            std::swap(tex_coords[1][0][1], tex_coords[1][1][1]);
+            std::swap(tex_coords[1][3][0], tex_coords[1][2][0]);
+            std::swap(tex_coords[1][3][1], tex_coords[1][2][1]);
+        }
+    }
+
     // Update the subtitle texture. This only re-renders the subtitle in the
     // unlikely case that the video display area was resized between the call
     // to prepare_next_frame and now (e.g. when resizing the window in pause
@@ -941,10 +999,10 @@
     {
         glUniform1f(glGetUniformLocation(_render_prg, "channel"), 0.0f);
         glDrawBuffer(GL_BACK_LEFT);
-        draw_quad(x, y, w, h);
+        draw_quad(x, y, w, h, tex_coords);
         glUniform1f(glGetUniformLocation(_render_prg, "channel"), 1.0f);
         glDrawBuffer(GL_BACK_RIGHT);
-        draw_quad(x, y, w, h);
+        draw_quad(x, y, w, h, tex_coords);
     }
     else if (_params.stereo_mode == parameters::even_odd_rows
             || _params.stereo_mode == parameters::even_odd_columns
@@ -952,22 +1010,13 @@
     {
         float vpw = static_cast<float>(viewport[0][2]);
         float vph = static_cast<float>(viewport[0][3]);
+        float more_tex_coords[4][2] =
+        {
+            { 0.0f, 0.0f }, { vpw / 2.0f, 0.0f }, { vpw / 2.0f, vph / 2.0f }, { 0.0f, vph / 2.0f }
+        };
         glActiveTexture(GL_TEXTURE3);
         glBindTexture(GL_TEXTURE_2D, _render_mask_tex);
-        glBegin(GL_QUADS);
-        glTexCoord2f(0.0f, 0.0f);
-        glMultiTexCoord2f(GL_TEXTURE1, 0.0f, 0.0f);
-        glVertex2f(x, y);
-        glTexCoord2f(1.0f, 0.0f);
-        glMultiTexCoord2f(GL_TEXTURE1, vpw / 2.0f, 0.0f);
-        glVertex2f(x + w, y);
-        glTexCoord2f(1.0f, 1.0f);
-        glMultiTexCoord2f(GL_TEXTURE1, vpw / 2.0f, vph / 2.0f);
-        glVertex2f(x + w, y + h);
-        glTexCoord2f(0.0f, 1.0f);
-        glMultiTexCoord2f(GL_TEXTURE1, 0.0f, vph / 2.0f);
-        glVertex2f(x, y + h);
-        glEnd();
+        draw_quad(x, y, w, h, tex_coords, more_tex_coords);
     }
     else if (_params.stereo_mode == parameters::red_cyan_monochrome
             || _params.stereo_mode == parameters::red_cyan_half_color
@@ -984,19 +1033,19 @@
             || _params.stereo_mode == parameters::red_green_monochrome
             || _params.stereo_mode == parameters::red_blue_monochrome)
     {
-        draw_quad(x, y, w, h);
+        draw_quad(x, y, w, h, tex_coords);
     }
     else if (_params.stereo_mode == parameters::mono_left
             && !mono_right_instead_of_left)
     {
         glUniform1f(glGetUniformLocation(_render_prg, "channel"), 0.0f);
-        draw_quad(x, y, w, h);
+        draw_quad(x, y, w, h, tex_coords);
     }
     else if (_params.stereo_mode == parameters::mono_right
             || (_params.stereo_mode == parameters::mono_left && mono_right_instead_of_left))
     {
         glUniform1f(glGetUniformLocation(_render_prg, "channel"), 1.0f);
-        draw_quad(x, y, w, h);
+        draw_quad(x, y, w, h, tex_coords);
     }
     else if (_params.stereo_mode == parameters::left_right
             || _params.stereo_mode == parameters::left_right_half

bino-1.1.0.tar.bz2/src/video_output.h -> bino-1.1.1.tar.bz2/src/video_output.h Changed

bino-1.1.0.tar.bz2/src/video_output_qt.cpp -> bino-1.1.1.tar.bz2/src/video_output_qt.cpp Changed

@@ -38,6 +38,10 @@
 #include <QIcon>
 #include <QMessageBox>
 #include <QPalette>
+#ifdef Q_WS_X11
+# include <QX11Info>
+# include <X11/Xlib.h>
+#endif
 
 #include "gettext.h"
 #define _(string) gettext(string)
@@ -211,6 +215,16 @@
     _vo->mouse_set_pos(std::max(std::min(static_cast<float>(event->posF().x()) / this->width(), 1.0f), 0.0f));
 }
 
+void video_output_qt_widget::mouseDoubleClickEvent(QMouseEvent *)
+{
+    _vo->mouse_toggle_fullscreen();
+}
+
+void video_output_qt_widget::focusOutEvent(QFocusEvent *)
+{
+    setFocus(Qt::OtherFocusReason);
+}
+
 
 /* Our own video container widget, used in case that the video_output_qt
  * constructor is called without an external container widget. */
@@ -254,7 +268,7 @@
 /* The video_output_qt class */
 
 video_output_qt::video_output_qt(bool benchmark, video_container_widget *container_widget) :
-    video_output(true),
+    video_output(),
     _qt_app_owner(false),
     _container_widget(container_widget),
     _container_is_external(container_widget != NULL),
@@ -406,12 +420,25 @@
         // Disabled in fullscreen and GUI mode
         return;
     }
-    if (_playing || !_container_is_external)
+    if (_playing)
     {
         send_cmd(command::set_pos, dest);
     }
 }
 
+void video_output_qt::mouse_toggle_fullscreen()
+{
+    if (!_container_is_external)
+    {
+        // Disabled in non-GUI mode
+        return;
+    }
+    if (_playing)
+    {
+        send_cmd(command::toggle_fullscreen);
+    }
+}
+
 void video_output_qt::move_event()
 {
     if (_widget)
@@ -420,6 +447,14 @@
     }
 }
 
+void video_output_qt::grab_focus()
+{
+    if (_widget)
+    {
+        _widget->setFocus(Qt::OtherFocusReason);
+    }
+}
+
 bool video_output_qt::supports_stereo() const
 {
     QGLFormat fmt = _format;
@@ -475,6 +510,11 @@
     return _widget->mapToGlobal(QPoint(0, 0)).y();
 }
 
+bool video_output_qt::fullscreen()
+{
+    return _fullscreen;
+}
+
 void video_output_qt::center()
 {
     if (!_fullscreen)
@@ -488,11 +528,10 @@
                 dest_screen_pos_x - window_offset_x,
                 dest_screen_pos_y - window_offset_y,
                 _widget->window()->width(), _widget->window()->height());
-        _widget->setFocus(Qt::OtherFocusReason);
     }
 }
 
-void video_output_qt::enter_fullscreen(int screen)
+void video_output_qt::enter_fullscreen(int screens)
 {
     if (!_fullscreen)
     {
@@ -501,23 +540,66 @@
         {
             _container_widget->setWindowFlags(Qt::Window);
         }
-        _container_widget->setWindowState(_widget->windowState() | Qt::WindowFullScreen);
-        _container_widget->setCursor(Qt::BlankCursor);
-        _container_widget->show();
-        if (screen != 0)
+        // Determine combined geometry of the chosen screens.
+        QRect geom(0, 0, 0, 0);
+        int screen_count = 0;
+        for (int i = 0; i < std::min(QApplication::desktop()->screenCount(), 16); i++)
         {
-            screen--;
-            if (screen < QApplication::desktop()->screenCount())
+            if (screens & (1 << i))
             {
-                QRect screen_res = QApplication::desktop()->screenGeometry(screen);
-                _container_widget->move(QPoint(screen_res.x(), screen_res.y()));
+                if (screen_count == 0)
+                {
+                    geom = QApplication::desktop()->screenGeometry(i);
+                }
+                else
+                {
+                    geom = geom.united(QApplication::desktop()->screenGeometry(i));
+                }
+                screen_count++;
             }
         }
-        _widget->setFocus(Qt::OtherFocusReason);
+        if (screen_count <= 1)
+        {
+            // The single screen case is supported by Qt.
+            _container_widget->setWindowState(_widget->windowState() | Qt::WindowFullScreen);
+            if (screen_count == 1)
+            {
+                // Set the chosen screen
+                _container_widget->setGeometry(geom);
+            }
+            _container_widget->setCursor(Qt::BlankCursor);
+            _container_widget->show();
+        }
+        else
+        {
+            // In the dual and multi screen cases we need to bypass the window manager
+            // on X11 because Qt does not support _NET_WM_FULLSCREEN_MONITORS, and thus
+            // the window manager would always restrict the fullscreen window to one screen.
+            // Note: it may be better to set _NET_WM_FULLSCREEN_MONITORS ourselves, but that
+            // would also require the window manager to support this extension...
+            _container_widget->setWindowFlags(_container_widget->windowFlags()
+                    | Qt::X11BypassWindowManagerHint
+                    | Qt::WindowStaysOnTopHint);
+            _container_widget->setWindowState(_widget->windowState() | Qt::WindowFullScreen);
+            _container_widget->setGeometry(geom);
+            _container_widget->setCursor(Qt::BlankCursor);
+            _container_widget->show();
+            _container_widget->raise();
+            _container_widget->activateWindow();
+#ifdef Q_WS_X11
+            /* According to the Qt documentation, it should be sufficient to call activateWindow()
+             * to make a X11 window active when using Qt::X11BypassWindowManagerHint, but this
+             * does not work for me (Ubuntu 11.04 Gnome-2D desktop). This is a workaround. */
+            QApplication::syncX();      // just for safety; not sure if it is necessary
+            XSetInputFocus(QX11Info::display(), _container_widget->winId(), RevertToParent, CurrentTime);
+            XFlush(QX11Info::display());
+#endif
+            grab_focus();
+        }
     }
 }
 
-bool video_output_qt::toggle_fullscreen(int screen)
+bool video_output_qt::toggle_fullscreen(int screens)
 {
     if (_fullscreen)
     {
@@ -525,7 +607,7 @@
     }
     else
     {
-        enter_fullscreen(screen);
+        enter_fullscreen(screens);
     }
     return _fullscreen;
 }
@@ -539,10 +621,13 @@
         {
             _container_widget->setWindowFlags(Qt::Widget);
         }
+        _container_widget->setWindowFlags(_container_widget->windowFlags()
+                & ~Qt::X11BypassWindowManagerHint
+                & ~Qt::WindowStaysOnTopHint);
         _container_widget->setWindowState(_widget->windowState() & ~Qt::WindowFullScreen);
         _container_widget->setCursor(Qt::ArrowCursor);
         _container_widget->show();

bino-1.1.0.tar.bz2/src/video_output_qt.h -> bino-1.1.1.tar.bz2/src/video_output_qt.h Changed

@@ -54,6 +54,8 @@
     virtual void moveEvent(QMoveEvent *event);
     virtual void keyPressEvent(QKeyEvent *event);
     virtual void mouseReleaseEvent(QMouseEvent *event);
+    virtual void mouseDoubleClickEvent(QMouseEvent *event);
+    virtual void focusOutEvent(QFocusEvent *event);
 };
 
 /* Public interface. You can use this as a video container widget, to
@@ -91,6 +93,7 @@
 
     void create_widget();
     void mouse_set_pos(float dest);
+    void mouse_toggle_fullscreen();
 
 protected:
     virtual void make_context_current();
@@ -114,6 +117,9 @@
      * (even-odd-*, checkerboard). */
     void move_event();
 
+    /* Grab the keyboard focus for the video widget, to enable keyboard shortcuts */
+    void grab_focus();
+
     virtual void init();
     virtual void deinit();
 
@@ -125,11 +131,12 @@
     virtual int height();
     virtual int pos_x();
     virtual int pos_y();
+    virtual bool fullscreen();
 
     virtual void center();
-    virtual void enter_fullscreen(int screen);
+    virtual void enter_fullscreen(int screens);
     virtual void exit_fullscreen();
-    virtual bool toggle_fullscreen(int screen);
+    virtual bool toggle_fullscreen(int screens);
 
     virtual void process_events();

bino-1.1.0.tar.bz2/src/video_output_render.fs.glsl -> bino-1.1.1.tar.bz2/src/video_output_render.fs.glsl Changed

@@ -137,7 +137,7 @@
 #if defined(mode_onechannel)
 
     vec3 l = blend_subtitle(tex_l(gl_TexCoord[0].xy), sub_l(gl_TexCoord[0].xy));
-    vec3 r = blend_subtitle(tex_r(gl_TexCoord[0].xy), sub_r(gl_TexCoord[0].xy));
+    vec3 r = blend_subtitle(tex_r(gl_TexCoord[1].xy), sub_r(gl_TexCoord[1].xy));
     srgb = rgb_to_srgb(ghostbust(mix(l, r, channel), mix(r, l, channel)));
 
 #elif defined(mode_even_odd_rows) || defined(mode_even_odd_columns) || defined(mode_checkerboard)
@@ -154,24 +154,24 @@
      *    drivers seem to use extremely low precision arithmetic in the shaders; too low for reliable pixel
      *    position computations.
      */
-    float m = texture2D(mask_tex, gl_TexCoord[1].xy).x;
+    float m = texture2D(mask_tex, gl_TexCoord[2].xy).x;
 # if defined(mode_even_odd_rows)
     vec3 rgb0_l = tex_l(gl_TexCoord[0].xy - vec2(0.0, step_y));
     vec3 rgb1_l = tex_l(gl_TexCoord[0].xy);
     vec3 rgb2_l = tex_l(gl_TexCoord[0].xy + vec2(0.0, step_y));
     vec3 rgbc_l = (rgb0_l + 2.0 * rgb1_l + rgb2_l) / 4.0;
-    vec3 rgb0_r = tex_r(gl_TexCoord[0].xy - vec2(0.0, step_y));
-    vec3 rgb1_r = tex_r(gl_TexCoord[0].xy);
-    vec3 rgb2_r = tex_r(gl_TexCoord[0].xy + vec2(0.0, step_y));
+    vec3 rgb0_r = tex_r(gl_TexCoord[1].xy - vec2(0.0, step_y));
+    vec3 rgb1_r = tex_r(gl_TexCoord[1].xy);
+    vec3 rgb2_r = tex_r(gl_TexCoord[1].xy + vec2(0.0, step_y));
     vec3 rgbc_r = (rgb0_r + 2.0 * rgb1_r + rgb2_r) / 4.0;
 # elif defined(mode_even_odd_columns)
     vec3 rgb0_l = tex_l(gl_TexCoord[0].xy - vec2(step_x, 0.0));
     vec3 rgb1_l = tex_l(gl_TexCoord[0].xy);
     vec3 rgb2_l = tex_l(gl_TexCoord[0].xy + vec2(step_x, 0.0));
     vec3 rgbc_l = (rgb0_l + 2.0 * rgb1_l + rgb2_l) / 4.0;
-    vec3 rgb0_r = tex_r(gl_TexCoord[0].xy - vec2(step_x, 0.0));
-    vec3 rgb1_r = tex_r(gl_TexCoord[0].xy);
-    vec3 rgb2_r = tex_r(gl_TexCoord[0].xy + vec2(step_x, 0.0));
+    vec3 rgb0_r = tex_r(gl_TexCoord[1].xy - vec2(step_x, 0.0));
+    vec3 rgb1_r = tex_r(gl_TexCoord[1].xy);
+    vec3 rgb2_r = tex_r(gl_TexCoord[1].xy + vec2(step_x, 0.0));
     vec3 rgbc_r = (rgb0_r + 2.0 * rgb1_r + rgb2_r) / 4.0;
 # elif defined(mode_checkerboard)
     vec3 rgb0_l = tex_l(gl_TexCoord[0].xy - vec2(0.0, step_y));
@@ -180,15 +180,15 @@
     vec3 rgb3_l = tex_l(gl_TexCoord[0].xy + vec2(step_x, 0.0));
     vec3 rgb4_l = tex_l(gl_TexCoord[0].xy + vec2(0.0, step_y));
     vec3 rgbc_l = (rgb0_l + rgb1_l + 4.0 * rgb2_l + rgb3_l + rgb4_l) / 8.0;
-    vec3 rgb0_r = tex_r(gl_TexCoord[0].xy - vec2(0.0, step_y));
-    vec3 rgb1_r = tex_r(gl_TexCoord[0].xy - vec2(step_x, 0.0));
-    vec3 rgb2_r = tex_r(gl_TexCoord[0].xy);
-    vec3 rgb3_r = tex_r(gl_TexCoord[0].xy + vec2(step_x, 0.0));
-    vec3 rgb4_r = tex_r(gl_TexCoord[0].xy + vec2(0.0, step_y));
+    vec3 rgb0_r = tex_r(gl_TexCoord[1].xy - vec2(0.0, step_y));
+    vec3 rgb1_r = tex_r(gl_TexCoord[1].xy - vec2(step_x, 0.0));
+    vec3 rgb2_r = tex_r(gl_TexCoord[1].xy);
+    vec3 rgb3_r = tex_r(gl_TexCoord[1].xy + vec2(step_x, 0.0));
+    vec3 rgb4_r = tex_r(gl_TexCoord[1].xy + vec2(0.0, step_y));
     vec3 rgbc_r = (rgb0_r + rgb1_r + 4.0 * rgb2_r + rgb3_r + rgb4_r) / 8.0;
 # endif
     vec3 rgbcs_l = blend_subtitle(rgbc_l, sub_l(gl_TexCoord[0].xy));
-    vec3 rgbcs_r = blend_subtitle(rgbc_r, sub_r(gl_TexCoord[0].xy));
+    vec3 rgbcs_r = blend_subtitle(rgbc_r, sub_r(gl_TexCoord[1].xy));
     srgb = rgb_to_srgb(ghostbust(mix(rgbcs_r, rgbcs_l, m), mix(rgbcs_l, rgbcs_r, m)));
 
 #elif defined(mode_red_cyan_dubois) || defined(mode_green_magenta_dubois) || defined(mode_amber_blue_dubois)
@@ -199,7 +199,7 @@
     // According to the author, the matrices below are intended to be applied to linear RGB values,
     // and are designed for CRT displays.
     vec3 l = blend_subtitle(tex_l(gl_TexCoord[0].xy), sub_l(gl_TexCoord[0].xy));
-    vec3 r = blend_subtitle(tex_r(gl_TexCoord[0].xy), sub_r(gl_TexCoord[0].xy));
+    vec3 r = blend_subtitle(tex_r(gl_TexCoord[1].xy), sub_r(gl_TexCoord[1].xy));
 # if defined(mode_red_cyan_dubois)
     // Source of this matrix: http://www.site.uottawa.ca/~edubois/anaglyph/LeastSquaresHowToPhotoshop.pdf
     mat3 m0 = mat3(
@@ -236,7 +236,7 @@
 #else // lower quality anaglyph methods
 
     vec3 l = rgb_to_srgb(blend_subtitle(tex_l(gl_TexCoord[0].xy), sub_l(gl_TexCoord[0].xy)));
-    vec3 r = rgb_to_srgb(blend_subtitle(tex_r(gl_TexCoord[0].xy), sub_r(gl_TexCoord[0].xy)));
+    vec3 r = rgb_to_srgb(blend_subtitle(tex_r(gl_TexCoord[1].xy), sub_r(gl_TexCoord[1].xy)));
 # if defined(mode_red_cyan_monochrome)
     srgb = vec3(srgb_to_lum(l), srgb_to_lum(r), srgb_to_lum(r));
 # elif defined(mode_red_cyan_half_color)