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 7

bino.changes Changed

bino.spec Changed

bino-backport-qvariant.patch Changed

@@ -1,6 +1,6 @@
---- src/player_qt.cpp.orig	2011-02-23 20:09:13.000000000 +0100
-+++ src/player_qt.cpp	2011-02-23 20:17:50.000000000 +0100
-@@ -1257,31 +1257,31 @@
+--- src/player_qt.cpp.orig	2011-05-10 09:31:04.000000000 +0200
++++ src/player_qt.cpp	2011-05-10 09:32:17.000000000 +0200
+@@ -1856,31 +1856,31 @@
 _settings->beginGroup("Session");
 if (!(_init_data.params.contrast >= -1.0f && _init_data.params.contrast <= +1.0f))
 {
@@ -37,16 +37,27 @@
 - _init_data.params.crosstalk_b = _settings->value("crosstalk_b", QString("0")).toFloat();
 + _init_data.params.crosstalk_b = _settings->value("crosstalk_b", QString("0")).toString().toFloat();
 }
- _settings->endGroup();
- _init_data.params.set_defaults();
-@@ -1644,8 +1644,8 @@
- _init_data.video_stream = std::max(0, std::min(_init_data.video_stream, _player->get_media_input().video_streams() - 1));
- _init_data.audio_stream = QVariant(_settings->value("audio-stream", QVariant(_init_data.audio_stream)).toString()).toInt();
+ if (_init_data.params.subtitle_encoding.length() == 1 && _init_data.params.subtitle_encoding[0] == '\0')
+ {
+@@ -1896,7 +1896,7 @@
+ }
+ if (_init_data.params.subtitle_scale < 0.0f)
+ {
+- _init_data.params.subtitle_scale = _settings->value("subtitle-scale", QString("-1")).toFloat();
++ _init_data.params.subtitle_scale = _settings->value("subtitle-scale", QString("-1")).toString().toFloat();
+ }
+ if (_init_data.params.subtitle_color > std::numeric_limits<uint32_t>::max())
+ {
+@@ -2349,9 +2349,9 @@
 _init_data.audio_stream = std::max(0, std::min(_init_data.audio_stream, _player->get_media_input().audio_streams() - 1));
+ _init_data.subtitle_stream = QVariant(_settings->value("subtitle-stream", QVariant(_init_data.subtitle_stream)).toString()).toInt();
+ _init_data.subtitle_stream = std::max(-1, std::min(_init_data.subtitle_stream, _player->get_media_input().subtitle_streams() - 1));
 - _init_data.params.parallax = QVariant(_settings->value("parallax", QVariant(_init_data.params.parallax)).toString()).toFloat();
 - _init_data.params.ghostbust = QVariant(_settings->value("ghostbust", QVariant(_init_data.params.ghostbust)).toString()).toFloat();
+- _init_data.params.subtitle_parallax = QVariant(_settings->value("subtitle-parallax", QVariant(_init_data.params.parallax)).toString()).toFloat();
 + _init_data.params.parallax = QVariant(_settings->value("parallax", QVariant(_init_data.params.parallax)).toString()).toString().toFloat();
 + _init_data.params.ghostbust = QVariant(_settings->value("ghostbust", QVariant(_init_data.params.ghostbust)).toString()).toString().toFloat();
- // Get stereo mode for this video
++ _init_data.params.subtitle_parallax = QVariant(_settings->value("subtitle-parallax", QVariant(_init_data.params.parallax)).toString()).toString().toFloat();
 _settings->endGroup();
+ // Get stereo mode
 QString mode_fallback = QString(parameters::stereo_mode_to_string(

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

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

@@ -1,3 +1,332 @@
+commit 36a492daf65e307fad898e417c08a727ad8d74b5
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-09 05:16:29 +0200
+
+ NEWS, AUTHORS: update for 1.1.0.
+
+ AUTHORS | 4 ++--
+ NEWS | 4 ++++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit e976ad8d72e3cca1e7d3bccc51ac60e9b27388e1
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-09 05:05:10 +0200
+
+ GUI: improve tool tips in File->Open device dialog.
+
+ src/player_qt.cpp | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 44429232f229faf2cedd98b6e250f42793dc8a95
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-09 04:57:26 +0200
+
+ GUI: improve check for OS in Help->Manual.
+
+ src/player_qt.cpp | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 664bb1b048eab85690ba0b23585a29d56ade9ae9
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-09 04:54:56 +0200
+
+ GUI: improve screen selector for fullscreen mode.
+
+ src/player_qt.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 324298fd9bbb2a2f105f49077de87c01f6f38bb2
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-08 21:49:33 +0200
+
+ GUI: make fullscreen button available as soon as a file is opened.
+
+ src/player_qt.cpp | 8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 2b680bb8b8e6296458222599a5382c0164d3de1f
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-08 17:41:14 +0200
+
+ GUI: make fullscreen button checkable.
+ 
+ This is necessary since the button may now be visible even in fullscreen mode,
+ when fullscreen mode uses a different screen.
+
+ src/player_qt.cpp | 17 ++++++++++++++++-
+ 1 files changed, 16 insertions(+), 1 deletions(-)
+
+commit 78e93223cb08a18c6a915f928bbd14aa7e445c1f
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-08 17:34:00 +0200
+
+ GUI: always remember fullscreen screen setting.
+
+ src/player_qt.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 5b768874c5c8a0052c6f7ba77d48950595bcb2b7
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-08 17:23:37 +0200
+
+ Fullscreen screen selector: minor fix when the number of screens changes between runs.
+
+ src/player_qt.cpp | 9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+commit 5826178a17f9bda0b2849cc4735e6d7dd2287caa
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-08 17:17:00 +0200
+
+ Allow to select the screen for fullscreen mode.
+
+ doc/bino.1 | 3 ++
+ doc/bino.texi | 3 ++
+ src/controller.h | 2 +
+ src/main.cpp | 5 ++++
+ src/media_data.cpp | 9 +++++++-
+ src/media_data.h | 1 +
+ src/player.cpp | 11 ++++++++-
+ src/player_equalizer.cpp | 4 +-
+ src/player_qt.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++++++
+ src/player_qt.h | 1 +
+ src/video_output.h | 4 +-
+ src/video_output_qt.cpp | 15 +++++++++++--
+ src/video_output_qt.h | 4 +-
+ 13 files changed, 100 insertions(+), 12 deletions(-)
+
+commit 1066898f46ebfbd7db6cd6fb5f385963bc91c272
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-08 14:40:09 +0200
+
+ GUI: properly open devices that were given on the command line.
+
+ src/player_qt.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 81008dd5af11dac86650faf48087fb8cfbf09c82
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-08 14:28:45 +0200
+
+ GUI: fix cancel / ok button order in File->Open URL.
+
+ src/player_qt.cpp | 9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+commit bef1512d149922f51b14c7315af9033f1df8998f
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-08 14:26:21 +0200
+
+ Add support for more device types (firewire, x11).
+ 
+ Firewire support is currently untested.
+
+ doc/bino.1 | 2 +
+ doc/bino.texi | 2 +
+ src/main.cpp | 23 +++++-
+ src/media_data.h | 3 +-
+ src/media_object.cpp | 193 +++++++++++++++++++++++++++-----------------------
+ src/player_qt.cpp | 101 ++++++++++++++++++++-------
+ src/player_qt.h | 10 ++-
+ 7 files changed, 215 insertions(+), 119 deletions(-)
+
+commit 9c9ffca87aa43ba98b46052fcabd188f67d65b2d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-08 12:29:56 +0200
+
+ Device support: allow to request specific frame size and frame rate.
+
+ doc/bino.1 | 4 ++
+ doc/bino.texi | 4 ++
+ src/main.cpp | 16 +++++-
+ src/media_data.cpp | 30 ++++++++++
+ src/media_data.h | 30 ++++++++++
+ src/media_input.cpp | 8 ++--
+ src/media_input.h | 2 +-
+ src/media_object.cpp | 28 ++++++++--
+ src/media_object.h | 2 +-
+ src/player.cpp | 8 ++--
+ src/player.h | 2 +-
+ src/player_qt.cpp | 148 +++++++++++++++++++++++++++++++++++++++-----------
+ src/player_qt.h | 24 ++++++++-
+ 13 files changed, 258 insertions(+), 48 deletions(-)
+
+commit e83b858eaad24e611fe2918b1d5ce1e2005f3a8c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-08 12:17:50 +0200
+
+ List libavdevice version in library version information.
+
+ src/lib_versions.cpp | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit b5946dadb1e2f33fcde964d65ede7e37816eb6fe
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-07 18:20:35 +0200
+
+ Media object: minimize the impact of camera device support.
+ 
+ Use parameters only if strictly necessary.
+
+ src/media_object.cpp | 14 +++++++++-----
+ 1 files changed, 9 insertions(+), 5 deletions(-)
+
+commit 5ff881cc1a334825d7b277f255b489706868732b
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-07 18:13:12 +0200
+
+ Media object: fix camera device support for Windows and BSD.
+ 
+ The BSD code is still untested.
+
+ src/media_object.cpp | 15 ++++++++++++++-
+ 1 files changed, 14 insertions(+), 1 deletions(-)
+
+commit bf6de50910c563ebbb1571d5b3cab67b1e592310
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-07 16:13:12 +0200
+
+ configure.ac: re-add search for libpthread, required for MinGW.
+ 
+ This partially reverts ee5bf86e505f4a8489df6f8b6b399671823c5220.
+
+ configure.ac | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit a04749b3db8c033986b5421aca472ee5fcfd072d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-05-07 16:11:02 +0200
+

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

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

bino-1.0.0.tar.bz2/TODO -> bino-1.1.0.tar.bz2/TODO Changed

bino-1.0.0.tar.bz2/aclocal.m4 -> bino-1.1.0.tar.bz2/aclocal.m4 Changed

bino-1.0.0.tar.bz2/configure -> bino-1.1.0.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.0.0.
+# Generated by GNU Autoconf 2.67 for Bino 1.1.0.
 #
 # Report bugs to <bino-list@nongnu.org>.
 #
@@ -552,8 +552,8 @@
 # Identity of this package.
 PACKAGE_NAME='Bino'
 PACKAGE_TARNAME='bino'
-PACKAGE_VERSION='1.0.0'
-PACKAGE_STRING='Bino 1.0.0'
+PACKAGE_VERSION='1.1.0'
+PACKAGE_STRING='Bino 1.1.0'
 PACKAGE_BUGREPORT='bino-list@nongnu.org'
 PACKAGE_URL='http://bino.nongnu.org/'
 
@@ -617,6 +617,8 @@
 libass_CFLAGS
 libswscale_LIBS
 libswscale_CFLAGS
+libavdevice_LIBS
+libavdevice_CFLAGS
 libavformat_LIBS
 libavformat_CFLAGS
 PKG_CONFIG_LIBDIR
@@ -779,6 +781,8 @@
 PKG_CONFIG_LIBDIR
 libavformat_CFLAGS
 libavformat_LIBS
+libavdevice_CFLAGS
+libavdevice_LIBS
 libswscale_CFLAGS
 libswscale_LIBS
 libass_CFLAGS
@@ -1335,7 +1339,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.0.0 to adapt to many kinds of systems.
+\`configure' configures Bino 1.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1406,7 +1410,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of Bino 1.0.0:";;
+ short | recursive ) echo "Configuration of Bino 1.1.0:";;
 esac
 cat <<\_ACEOF
 
@@ -1455,6 +1459,10 @@
 C compiler flags for libavformat, overriding pkg-config
 libavformat_LIBS
 linker flags for libavformat, overriding pkg-config
+ libavdevice_CFLAGS
+ C compiler flags for libavdevice, overriding pkg-config
+ libavdevice_LIBS
+ linker flags for libavdevice, overriding pkg-config
 libswscale_CFLAGS
 C compiler flags for libswscale, overriding pkg-config
 libswscale_LIBS
@@ -1548,7 +1556,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-Bino configure 1.0.0
+Bino configure 1.1.0
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2080,7 +2088,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.0.0, which was
+It was created by Bino $as_me 1.1.0, which was
 generated by GNU Autoconf 2.67. Invocation command line was
 
 $ $0 $@
@@ -4531,7 +4539,7 @@
 
 # Define the identity of the package.
 PACKAGE='bino'
- VERSION='1.0.0'
+ VERSION='1.1.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5873,6 +5881,8 @@
 fi
 done
 
+CPPFLAGS="-pthread $CPPFLAGS"
+LDFLAGS="-pthread $LDFLAGS"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
@@ -8235,6 +8245,83 @@
 fi
 
 pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libavdevice" >&5
+$as_echo_n "checking for libavdevice... " >&6; }
+
+if test -n "$libavdevice_CFLAGS"; then
+ pkg_cv_libavdevice_CFLAGS="$libavdevice_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavdevice >= 52.4.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libavdevice >= 52.4.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_libavdevice_CFLAGS=`$PKG_CONFIG --cflags "libavdevice >= 52.4.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$libavdevice_LIBS"; then
+ pkg_cv_libavdevice_LIBS="$libavdevice_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavdevice >= 52.4.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libavdevice >= 52.4.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_libavdevice_LIBS=`$PKG_CONFIG --libs "libavdevice >= 52.4.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+	 libavdevice_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavdevice >= 52.4.0" 2>&1`
+ else
+	 libavdevice_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavdevice >= 52.4.0" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$libavdevice_PKG_ERRORS" >&5
+
+	HAVE_LIBAVDEVICE=0
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_LIBAVDEVICE=0
+else
+	libavdevice_CFLAGS=$pkg_cv_libavdevice_CFLAGS
+	libavdevice_LIBS=$pkg_cv_libavdevice_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_LIBAVDEVICE=1
+fi
+if test "$HAVE_LIBAVDEVICE" != "1"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: library libavdevice >= 52.4.0 not found:" >&5
+$as_echo "$as_me: WARNING: library libavdevice >= 52.4.0 not found:" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $libavdevice_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $libavdevice_PKG_ERRORS" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libavdevice >= 52.4.0 is provided by FFmpeg >= 0.7-rc1" >&5
+$as_echo "$as_me: WARNING: libavdevice >= 52.4.0 is provided by FFmpeg >= 0.7-rc1" >&2;}
+fi
+
+pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libswscale" >&5
 $as_echo_n "checking for libswscale... " >&6; }
 
@@ -8941,6 +9028,7 @@
 
 
 if test "$HAVE_LIBAVFORMAT" != "1" \
+ -o "$HAVE_LIBAVDEVICE" != "1" \
 -o "$HAVE_LIBSWSCALE" != "1" \
 -o "$HAVE_LIBASS" != "1" \
 -o "$HAVE_LIBOPENAL" != "1" \
@@ -9491,7 +9579,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Bino $as_me 1.0.0, which was
+This file was extended by Bino $as_me 1.1.0, which was

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

@@ -22,7 +22,7 @@
 
 dnl Autotools init stuff
 AC_PREREQ([2.65])
-AC_INIT([Bino], [1.0.0], [bino-list@nongnu.org], [bino], [http://bino.nongnu.org/])
+AC_INIT([Bino], [1.1.0], [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,6 +72,8 @@
 AC_SEARCH_LIBS([clock_gettime], [rt])
 AC_SEARCH_LIBS([pthread_create], [pthread])
 AC_CHECK_FUNCS([backtrace clock_gettime sigaction vasprintf wcwidth])
+CPPFLAGS="-pthread $CPPFLAGS"
+LDFLAGS="-pthread $LDFLAGS"
 
 dnl Gettext
 AM_GNU_GETTEXT([external])
@@ -91,6 +93,12 @@
     AC_MSG_WARN([$libavformat_PKG_ERRORS])
     AC_MSG_WARN([libavformat >= 52.108.0 is provided by FFmpeg >= 0.7-rc1])
 fi
+PKG_CHECK_MODULES([libavdevice], [libavdevice >= 52.4.0], [HAVE_LIBAVDEVICE=1], [HAVE_LIBAVDEVICE=0])
+if test "$HAVE_LIBAVDEVICE" != "1"; then
+    AC_MSG_WARN([library libavdevice >= 52.4.0 not found:])
+    AC_MSG_WARN([$libavdevice_PKG_ERRORS])
+    AC_MSG_WARN([libavdevice >= 52.4.0 is provided by FFmpeg >= 0.7-rc1])
+fi
 PKG_CHECK_MODULES([libswscale], [libswscale >= 0.13.0 libavutil], [HAVE_LIBSWSCALE=1], [HAVE_LIBSWSCALE=0])
 if test "$HAVE_LIBSWSCALE" != "1"; then
     AC_MSG_WARN([library libswscale >= 0.13.0 not found:])
@@ -156,6 +164,7 @@
 
 dnl Check if all libraries were found
 if test "$HAVE_LIBAVFORMAT" != "1" \
+    -o "$HAVE_LIBAVDEVICE" != "1" \
     -o "$HAVE_LIBSWSCALE" != "1" \
     -o "$HAVE_LIBASS" != "1" \
     -o "$HAVE_LIBOPENAL" != "1" \

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

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

@@ -29,9 +29,15 @@
 .IP "\-n|\-\-no\-gui"
 Do not use the GUI, just play the given input in a plain window using the
 parameters given on the command line.
-.IP "\-l|\-\-log\-level=\fILEVEL\fP"
+.IP "\-L|\-\-log\-level=\fILEVEL\fP"
 Select log level:
 \fIdebug\fP, \fIinfo\fP, \fIwarning\fP, \fIerror\fP, or \fIquiet\fP.
+.IP "\-\-device\-type=\fITYPE\fP"
+Type of input device: \fIdefault\fP, \fIfirewire\fP, or \fIx11\fP.
+.IP "\-\-device\-frame\-size=\fIW\fPx\fIH\fP"
+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 "\-v|\-\-video=\fISTREAM\fP"
 Select video stream (1-n, depending on the input).
 .IP "\-a|\-\-audio=\fISTREAM\fP"
@@ -165,6 +171,9 @@
 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 "\-c|\-\-center"
 Center window on screen.
 .IP "\-\-subtitle\-encoding=\fIENC\fP"
@@ -188,6 +197,8 @@
 .IP "\-b|\-\-benchmark"
 Benchmark mode: no audio, no time synchronization, output of frames-per-second
 measurements.
+.IP "\-l|\-\-loop"
+Loop the input media.
 .SH INTERACTIVE CONTROL
 .IP "ESC"
 Leave fullscreen mode, or quit when in window mode.

bino-1.0.0.tar.bz2/doc/bino.html -> bino-1.1.0.tar.bz2/doc/bino.html Changed

@@ -1,14 +1,14 @@
 <html lang="en">
 <head>
-<title>Bino 1.0.0</title>
+<title>Bino 1.1.0</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="Bino 1.0.0">
+<meta name="description" content="Bino 1.1.0">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 </style>
 </head>
 <body>
-<h1 class="settitle">Bino 1.0.0</h1>
+<h1 class="settitle">Bino 1.1.0</h1>
 <div class="node">
 <a name="Top"></a>
 <hr>
@@ -45,8 +45,8 @@
 
 <h2 class="unnumbered">Bino</h2>
 
-This manual was last updated 24 April 2011 for version
-1.0.0 of Bino.
+This manual was last updated 8 May 2011 for version
+1.1.0 of Bino.
 
 Copyright &copy; 2011
 Martin Lambers (<a href="mailto:marlam@marlam.de">marlam@marlam.de</a>),
@@ -117,8 +117,11 @@
 <dt>&lsquo;<samp>--version</samp>&rsquo;<dd>Print version. 
 <dt>&lsquo;<samp>-n</samp>&rsquo;<dt>&lsquo;<samp>--no-gui</samp>&rsquo;<dd>Do not use the GUI, just play the given input in a plain window using the
 parameters given on the command line. 
- <dt>&lsquo;<samp>-l</samp>&rsquo;<dt>&lsquo;<samp>--log-level=<var>LEVEL</var></samp>&rsquo;<dd>Select log level: <var>debug</var>, <var>info</var>, <var>warning</var>, <var>error</var>, or
+ <dt>&lsquo;<samp>-L</samp>&rsquo;<dt>&lsquo;<samp>--log-level=<var>LEVEL</var></samp>&rsquo;<dd>Select log level: <var>debug</var>, <var>info</var>, <var>warning</var>, <var>error</var>, or
 <var>quiet</var>. 
+ <dt>&lsquo;<samp>--device-type=<var>TYPE</var></samp>&rsquo;<dd>Type of input device: <var>default</var>, <var>firewire</var>, or <var>x11</var>. 
+ <dt>&lsquo;<samp>--device-frame-size=<var>W</var>x<var>H</var></samp>&rsquo;<dd>If the input is a device, request the given frame size, e.g. 640x480. 
+ <dt>&lsquo;<samp>--device-frame-rate=<var>N</var>/<var>D</var></samp>&rsquo;<dd>If the input is a device, request the given frame rate, e.g. 25/1. 
 <dt>&lsquo;<samp>-v</samp>&rsquo;<dt>&lsquo;<samp>--video=<var>STREAM</var></samp>&rsquo;<dd>Select video stream (1-n, depending on the input). 
 <dt>&lsquo;<samp>-a</samp>&rsquo;<dt>&lsquo;<samp>--audio=<var>STREAM</var></samp>&rsquo;<dd>Select audio stream (1-n, depending on the input). 
 <dt>&lsquo;<samp>-s</samp>&rsquo;<dt>&lsquo;<samp>--subtitle=<var>STREAM</var></samp>&rsquo;<dd>Select subtitle stream (1-n, depending on the input). 
@@ -126,6 +129,8 @@
 <dt>&lsquo;<samp>-o</samp>&rsquo;<dt>&lsquo;<samp>--output=<var>TYPE</var></samp>&rsquo;<dd>Select output type. See <a href="#Output-Techniques">Output Techniques</a>. 
 <dt>&lsquo;<samp>-S</samp>&rsquo;<dt>&lsquo;<samp>--swap-eyes</samp>&rsquo;<dd>Swap left/right view. 
 <dt>&lsquo;<samp>-f</samp>&rsquo;<dt>&lsquo;<samp>--fullscreen</samp>&rsquo;<dd>Fullscreen. 
+ <dt>&lsquo;<samp>--fullscreen-screen=<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. 
 <dt>&lsquo;<samp>-c</samp>&rsquo;<dt>&lsquo;<samp>--center</samp>&rsquo;<dd>Center window on screen. 
 <dt>&lsquo;<samp>--subtitle-encoding=<var>ENC</var></samp>&rsquo;<dd>Set subtitle encoding. 
 <dt>&lsquo;<samp>--subtitle-font=<var>FONT</var></samp>&rsquo;<dd>Set subtitle font name. 
@@ -138,6 +143,7 @@
 <dt>&lsquo;<samp>-G</samp>&rsquo;<dt>&lsquo;<samp>--ghostbust=<var>VAL</var></samp>&rsquo;<dd>Amount of crosstalk ghostbusting to apply (0 to 1). 
 <dt>&lsquo;<samp>-b</samp>&rsquo;<dt>&lsquo;<samp>--benchmark</samp>&rsquo;<dd>Benchmark mode: no audio, no time synchronization, output of frames-per-second
 measurements. 
+ <dt>&lsquo;<samp>-l</samp>&rsquo;<dt>&lsquo;<samp>--loop</samp>&rsquo;<dd>Loop the input media. 
 </dl>
 
 <div class="node">

bino-1.0.0.tar.bz2/doc/bino.info -> bino-1.1.0.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 24 April 2011 for version 1.0.0 of Bino.
+This manual was last updated 8 May 2011 for version 1.1.0 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 24 April 2011 for version 1.0.0 of Bino.
+This manual was last updated 8 May 2011 for version 1.1.0 of Bino.
 
 Copyright (C) 2011 Martin Lambers (<marlam@marlam.de>), Stefan
 Eilemann (<eile@eyescale.ch>), Frédéric Devernay
@@ -84,10 +84,20 @@
 Do not use the GUI, just play the given input in a plain window
 using the parameters given on the command line.
 
-`-l'
+`-L'
 `--log-level=LEVEL'
 Select log level: DEBUG, INFO, WARNING, ERROR, or QUIET.
 
+`--device-type=TYPE'
+ Type of input device: DEFAULT, FIREWIRE, or X11.
+
+`--device-frame-size=WxH'
+ If the input is a device, request the given frame size, e.g.
+ 640x480.
+
+`--device-frame-rate=N/D'
+ If the input is a device, request the given frame rate, e.g. 25/1.
+
 `-v'
 `--video=STREAM'
 Select video stream (1-n, depending on the input).
@@ -116,6 +126,10 @@
 `--fullscreen'
 Fullscreen.
 
+`--fullscreen-screen=N'
+ Use screen N in fullscreen mode. The default N uses the primary
+ screen of the desktop.
+
 `-c'
 `--center'
 Center window on screen.
@@ -156,6 +170,10 @@
 Benchmark mode: no audio, no time synchronization, output of
 frames-per-second measurements.
 
+`-l'
+`--loop'
+ Loop the input media.
+
 &#x1f;
 File: bino.info, Node: Input Layouts, Next: Output Techniques, Prev: Invocation, Up: Top
 
@@ -801,15 +819,15 @@
 
 &#x1f;
 Tag Table:
-Node: Top&#x7f;768
-Node: Overview&#x7f;1523
-Node: Invocation&#x7f;2187
-Node: Input Layouts&#x7f;3879
-Node: Output Techniques&#x7f;5113
-Node: File Name Conventions&#x7f;7534
-Node: Interactive Control&#x7f;8383
-Node: Crosstalk Ghostbusting&#x7f;9557
-Node: Multi Display Support&#x7f;11637
+Node: Top&#x7f;765
+Node: Overview&#x7f;1517
+Node: Invocation&#x7f;2181
+Node: Input Layouts&#x7f;4319
+Node: Output Techniques&#x7f;5553
+Node: File Name Conventions&#x7f;7974
+Node: Interactive Control&#x7f;8823
+Node: Crosstalk Ghostbusting&#x7f;9997
+Node: Multi Display Support&#x7f;12077
 &#x1f;
 End Tag Table

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

@@ -95,10 +95,16 @@
 @itemx --no-gui
 Do not use the GUI, just play the given input in a plain window using the
 parameters given on the command line.
-@item -l
+@item -L
 @itemx --log-level=@var{LEVEL}
 Select log level: @var{debug}, @var{info}, @var{warning}, @var{error}, or
 @var{quiet}.
+@item --device-type=@var{TYPE}
+Type of input device: @var{default}, @var{firewire}, or @var{x11}.
+@item --device-frame-size=@var{W}x@var{H}
+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 -v
 @itemx --video=@var{STREAM}
 Select video stream (1-n, depending on the input).
@@ -120,6 +126,9 @@
 @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 -c
 @itemx --center
 Center window on screen.
@@ -148,6 +157,9 @@
 @itemx --benchmark
 Benchmark mode: no audio, no time synchronization, output of frames-per-second
 measurements.
+@item -l
+@itemx --loop
+Loop the input media.
 @end table
 
 @node Input Layouts

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

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

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

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: bino 1.0.0\n"
+"Project-Id-Version: bino 1.1.0\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2011-04-28 11:03+0200\n"
+"POT-Creation-Date: 2011-05-09 05:18+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"
@@ -22,12 +22,12 @@
 msgid "Caught signal %d (%s). Aborting."
 msgstr ""
 
-#: src/base/dbg.cpp:58
+#: src/base/dbg.cpp:57
 msgid "Unexpected exception."
 msgstr ""
 
 #. TRANSLATORS: %s will be a mail address.
-#: src/base/dbg.cpp:146
+#: src/base/dbg.cpp:145
 #, c-format
 msgid "Report bugs to <%s>."
 msgstr ""
@@ -195,44 +195,44 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr ""
 
-#: src/lib_versions.cpp:85 src/lib_versions.cpp:118 src/lib_versions.cpp:157
-#: src/media_data.cpp:392 src/media_data.cpp:415 src/media_data.cpp:453
-#: src/media_data.cpp:458
+#: 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
 msgid "unknown"
 msgstr ""
 
-#: src/lib_versions.cpp:181
+#: src/lib_versions.cpp:185
 msgid "not used"
 msgstr ""
 
-#: src/main.cpp:259
+#: src/main.cpp:275
 #, c-format
 msgid "%s version %s"
 msgstr ""
 
-#: src/main.cpp:260
+#: src/main.cpp:276
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr ""
 
-#: src/main.cpp:261
+#: src/main.cpp:277
 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:264 src/player_qt.cpp:2359
+#: src/main.cpp:280 src/player_qt.cpp:2660
 msgid "Platform:"
 msgstr ""
 
-#: src/main.cpp:266 src/player_qt.cpp:2360
+#: src/main.cpp:282 src/player_qt.cpp:2661
 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:278
+#: src/main.cpp:294
 #, c-format
 msgid ""
 "Usage:\n"
@@ -242,7 +242,10 @@
 " --help Print help.\n"
 " --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"
+" -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-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"
 " -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 "
@@ -291,6 +294,8 @@
 " 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"
 " -c|--center Center window on screen.\n"
 " --subtitle-encoding=ENC Set subtitle encoding.\n"
 " --subtitle-font=FONT Set subtitle font name.\n"
@@ -303,6 +308,7 @@
 " values for the R,G,B channels.\n"
 " -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
 " -b|--benchmark Benchmark mode (no audio, show fps).\n"
+" -l|--loop Loop the input media.\n"
 "\n"
 "Interactive control:\n"
 " ESC Leave fullscreen mode, or quit.\n"
@@ -326,199 +332,216 @@
 " Mouse click Seek according to horizontal click position."
 msgstr ""
 
-#: src/main.cpp:477
+#: src/main.cpp:517
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr ""
 
-#: src/main.cpp:489
+#: src/main.cpp:530
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr ""
 
-#: src/main.cpp:506
+#: src/main.cpp:547
 msgid "No video to play."
 msgstr ""
 
 #. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:263
+#: src/media_data.cpp:293
 #, c-format
 msgid "%dx%d, %.3g:1"
 msgstr ""
 
 #. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:391
+#: src/media_data.cpp:421
 #, c-format
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr ""
 
-#: src/media_input.cpp:284 src/player_qt.cpp:170
+#: src/media_input.cpp:286 src/player_qt.cpp:171
 msgid "Input:"
 msgstr ""
 
-#: src/media_input.cpp:289
+#: src/media_input.cpp:291
 #, c-format
 msgid "Video %s: %s"
 msgstr ""
 
-#: src/media_input.cpp:294
+#: src/media_input.cpp:296
 msgid "No video."
 msgstr ""
 
-#: src/media_input.cpp:300
+#: src/media_input.cpp:302
 #, c-format
 msgid "Audio %s: %s"
 msgstr ""
 
-#: src/media_input.cpp:305
+#: src/media_input.cpp:307
 msgid "No audio."
 msgstr ""
 
-#: src/media_input.cpp:311
+#: src/media_input.cpp:313
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr ""
 
-#: src/media_input.cpp:316
+#: src/media_input.cpp:318
 msgid "No subtitle."
 msgstr ""
 
-#: src/media_input.cpp:318
+#: src/media_input.cpp:320
 #, c-format
 msgid "Duration: %g seconds"
 msgstr ""
 
-#: src/media_input.cpp:321
+#: src/media_input.cpp:323
 #, c-format
 msgid "Stereo layout: %s"
 msgstr ""
 
-#: src/media_object.cpp:584
+#: src/media_object.cpp:587
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with %d channels."
 msgstr ""

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

bino-1.0.0.tar.bz2/po/cs.po -> bino-1.1.0.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-04-28 11:03+0200\n"
+"POT-Creation-Date: 2011-05-09 05:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Joe <cuchac@email.cz>\n"
 "Language-Team: none\n"
@@ -23,12 +23,12 @@
 msgid "Caught signal %d (%s). Aborting."
 msgstr "Obdržn signál %d (%s). Ukončuji se."
 
-#: src/base/dbg.cpp:58
+#: src/base/dbg.cpp:57
 msgid "Unexpected exception."
 msgstr "Neočekávaná výjimka."
 
 #. TRANSLATORS: %s will be a mail address.
-#: src/base/dbg.cpp:146
+#: src/base/dbg.cpp:145
 #, c-format
 msgid "Report bugs to <%s>."
 msgstr "Chyby hlaste na <%s>."
@@ -196,26 +196,26 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Nelze odpojit buffery OpeanAL zdroje."
 
-#: src/lib_versions.cpp:85 src/lib_versions.cpp:118 src/lib_versions.cpp:157
-#: src/media_data.cpp:392 src/media_data.cpp:415 src/media_data.cpp:453
-#: src/media_data.cpp:458
+#: 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
 msgid "unknown"
 msgstr "neznámá"
 
-#: src/lib_versions.cpp:181
+#: src/lib_versions.cpp:185
 msgid "not used"
 msgstr "nevyužívá se"
 
-#: src/main.cpp:259
+#: src/main.cpp:275
 #, c-format
 msgid "%s version %s"
 msgstr "%s verze %s"
 
-#: src/main.cpp:260
+#: src/main.cpp:276
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr "Copyright (C) 2011 Bino vývojáři."
 
-#: src/main.cpp:261
+#: src/main.cpp:277
 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,19 +226,19 @@
 "ž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:264 src/player_qt.cpp:2359
+#: src/main.cpp:280 src/player_qt.cpp:2660
 msgid "Platform:"
 msgstr "Platforma:"
 
-#: src/main.cpp:266 src/player_qt.cpp:2360
+#: src/main.cpp:282 src/player_qt.cpp:2661
 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:278
-#, c-format
+#: src/main.cpp:294
+#, fuzzy, c-format
 msgid ""
 "Usage:\n"
 " %s [option...] [file...]\n"
@@ -247,7 +247,10 @@
 " --help Print help.\n"
 " --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"
+" -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-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"
 " -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 "
@@ -296,6 +299,8 @@
 " 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"
 " -c|--center Center window on screen.\n"
 " --subtitle-encoding=ENC Set subtitle encoding.\n"
 " --subtitle-font=FONT Set subtitle font name.\n"
@@ -308,6 +313,7 @@
 " values for the R,G,B channels.\n"
 " -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
 " -b|--benchmark Benchmark mode (no audio, show fps).\n"
+" -l|--loop Loop the input media.\n"
 "\n"
 "Interactive control:\n"
 " ESC Leave fullscreen mode, or quit.\n"
@@ -422,199 +428,216 @@
 " 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:477
+#: src/main.cpp:517
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Testovací režim, synchronizace zvuku a času je vypnuta."
 
-#: src/main.cpp:489
+#: src/main.cpp:530
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Tato verze Bina byla zkompilována bez podpory knihovny Equalizer."
 
-#: src/main.cpp:506
+#: src/main.cpp:547
 msgid "No video to play."
 msgstr "Nenalezeno žádné video."
 
 #. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:263
+#: src/media_data.cpp:293
 #, c-format
 msgid "%dx%d, %.3g:1"
 msgstr "%dx%d, %.3g:1"
 
 #. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:391
+#: src/media_data.cpp:421
 #, c-format
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d ch., %g kHz, %d bit"
 
-#: src/media_input.cpp:284 src/player_qt.cpp:170
+#: src/media_input.cpp:286 src/player_qt.cpp:171
 msgid "Input:"
 msgstr "Vstup:"
 
-#: src/media_input.cpp:289
+#: src/media_input.cpp:291
 #, c-format
 msgid "Video %s: %s"
 msgstr "Video %s: %s"
 
-#: src/media_input.cpp:294
+#: src/media_input.cpp:296
 msgid "No video."
 msgstr "Žádná video stopa."
 
-#: src/media_input.cpp:300
+#: src/media_input.cpp:302
 #, c-format
 msgid "Audio %s: %s"
 msgstr "Zvuk %s: %s"
 
-#: src/media_input.cpp:305
+#: src/media_input.cpp:307
 msgid "No audio."
 msgstr "Žádná zvuková stopa."
 
-#: src/media_input.cpp:311
+#: src/media_input.cpp:313
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr "Titulky %s: %s"
 
-#: src/media_input.cpp:316
+#: src/media_input.cpp:318
 msgid "No subtitle."
 msgstr "Žádné titulky."
 
-#: src/media_input.cpp:318
+#: src/media_input.cpp:320
 #, c-format
 msgid "Duration: %g seconds"
 msgstr "Délka: %g sekund"
 
-#: src/media_input.cpp:321
+#: src/media_input.cpp:323
 #, c-format
 msgid "Stereo layout: %s"
 msgstr "Stereo režim: %s"
 
-#: src/media_object.cpp:584
+#: src/media_object.cpp:587
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with %d channels."
 msgstr "%s zvuková stopa %d: Nemohu přehrát zvukovou stopu s %d kanály."

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

bino-1.0.0.tar.bz2/po/de.po -> bino-1.1.0.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-04-28 11:03+0200\n"
+"POT-Creation-Date: 2011-05-09 05:18+0200\n"
 "PO-Revision-Date: 2011-04-10 17:23+0200\n"
 "Last-Translator: Martin Lambers <marlam@marlam.de>\n"
 "Language-Team: none\n"
@@ -20,12 +20,12 @@
 msgid "Caught signal %d (%s). Aborting."
 msgstr "Signal %d (%s) erhalten. Breche ab."
 
-#: src/base/dbg.cpp:58
+#: src/base/dbg.cpp:57
 msgid "Unexpected exception."
 msgstr "Unerwartete Ausnahme."
 
 #. TRANSLATORS: %s will be a mail address.
-#: src/base/dbg.cpp:146
+#: src/base/dbg.cpp:145
 #, c-format
 msgid "Report bugs to <%s>."
 msgstr "Melde Fehler an <%s>."
@@ -193,26 +193,26 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Kann OpenAL Quellenpuffer nicht aus Warteschlange entfernen."
 
-#: src/lib_versions.cpp:85 src/lib_versions.cpp:118 src/lib_versions.cpp:157
-#: src/media_data.cpp:392 src/media_data.cpp:415 src/media_data.cpp:453
-#: src/media_data.cpp:458
+#: 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
 msgid "unknown"
 msgstr "unbekannt"
 
-#: src/lib_versions.cpp:181
+#: src/lib_versions.cpp:185
 msgid "not used"
 msgstr "nicht benutzt"
 
-#: src/main.cpp:259
+#: src/main.cpp:275
 #, c-format
 msgid "%s version %s"
 msgstr "%s Version %s"
 
-#: src/main.cpp:260
+#: src/main.cpp:276
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr "Copyright (C) 2011 Bino Entwickler."
 
-#: src/main.cpp:261
+#: src/main.cpp:277
 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,19 +221,19 @@
 "Dies ist freie Software. Du kannst Kopien davon verteilen unter den "
 "Bedingungen der GNU General Public License. Es gibt keine Garantie."
 
-#: src/main.cpp:264 src/player_qt.cpp:2359
+#: src/main.cpp:280 src/player_qt.cpp:2660
 msgid "Platform:"
 msgstr "Plattform:"
 
-#: src/main.cpp:266 src/player_qt.cpp:2360
+#: src/main.cpp:282 src/player_qt.cpp:2661
 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:278
-#, c-format
+#: src/main.cpp:294
+#, fuzzy, c-format
 msgid ""
 "Usage:\n"
 " %s [option...] [file...]\n"
@@ -242,7 +242,10 @@
 " --help Print help.\n"
 " --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"
+" -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-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"
 " -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 "
@@ -291,6 +294,8 @@
 " 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"
 " -c|--center Center window on screen.\n"
 " --subtitle-encoding=ENC Set subtitle encoding.\n"
 " --subtitle-font=FONT Set subtitle font name.\n"
@@ -303,6 +308,7 @@
 " values for the R,G,B channels.\n"
 " -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
 " -b|--benchmark Benchmark mode (no audio, show fps).\n"
+" -l|--loop Loop the input media.\n"
 "\n"
 "Interactive control:\n"
 " ESC Leave fullscreen mode, or quit.\n"
@@ -415,200 +421,217 @@
 " Seite rauf, Seite runter Spule 10 Minuten zurück / vor.\n"
 " Mausklick Spule zur Stelle der horizontalen Klickposition."
 
-#: src/main.cpp:477
+#: src/main.cpp:517
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Benchmark Modus: Audio und Videosynchronisation deaktiviert."
 
-#: src/main.cpp:489
+#: src/main.cpp:530
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr ""
 "Diese Version von Bino wurde ohne Unterstützung für Equalizer erstellt."
 
-#: src/main.cpp:506
+#: src/main.cpp:547
 msgid "No video to play."
 msgstr "Kein Video abzuspielen."
 
 #. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:263
+#: src/media_data.cpp:293
 #, c-format
 msgid "%dx%d, %.3g:1"
 msgstr "%dx%d, %.3g:1"
 
 #. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:391
+#: src/media_data.cpp:421
 #, c-format
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d Kan., %g kHz, %d bit"
 
-#: src/media_input.cpp:284 src/player_qt.cpp:170
+#: src/media_input.cpp:286 src/player_qt.cpp:171
 msgid "Input:"
 msgstr "Eingabe:"
 
-#: src/media_input.cpp:289
+#: src/media_input.cpp:291
 #, c-format
 msgid "Video %s: %s"
 msgstr "Video %s: %s"
 
-#: src/media_input.cpp:294
+#: src/media_input.cpp:296
 msgid "No video."
 msgstr "Kein Video."
 
-#: src/media_input.cpp:300
+#: src/media_input.cpp:302
 #, c-format
 msgid "Audio %s: %s"
 msgstr "Audio %s: %s"
 
-#: src/media_input.cpp:305
+#: src/media_input.cpp:307
 msgid "No audio."
 msgstr "Kein Audio."
 
-#: src/media_input.cpp:311
+#: src/media_input.cpp:313
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr "Untertitel %s: %s"
 
-#: src/media_input.cpp:316
+#: src/media_input.cpp:318
 msgid "No subtitle."
 msgstr "Kein Untertitel."
 
-#: src/media_input.cpp:318
+#: src/media_input.cpp:320
 #, c-format
 msgid "Duration: %g seconds"
 msgstr "Dauer: %g Sekunden"
 
-#: src/media_input.cpp:321
+#: src/media_input.cpp:323
 #, c-format
 msgid "Stereo layout: %s"
 msgstr "Stereolayout: %s"
 
-#: src/media_object.cpp:584
+#: src/media_object.cpp:587
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with %d channels."
 msgstr "%s Audiokanal %d: Kann Audiodaten mit %d Kanälen nicht benutzen."

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

bino-1.0.0.tar.bz2/po/fr.po -> bino-1.1.0.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-04-28 11:03+0200\n"
+"POT-Creation-Date: 2011-05-09 05:18+0200\n"
 "PO-Revision-Date: 2011-04-21 16:48+0200\n"
 "Last-Translator: Frédéric Devernay <>\n"
 "Language-Team: French\n"
@@ -23,12 +23,12 @@
 msgid "Caught signal %d (%s). Aborting."
 msgstr "Signal %d (%s) reçu. Abandon."
 
-#: src/base/dbg.cpp:58
+#: src/base/dbg.cpp:57
 msgid "Unexpected exception."
 msgstr "Exception inattendue"
 
 #. TRANSLATORS: %s will be a mail address.
-#: src/base/dbg.cpp:146
+#: src/base/dbg.cpp:145
 #, c-format
 msgid "Report bugs to <%s>."
 msgstr "Signalez les bugs à <%s>."
@@ -196,26 +196,26 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Impossible de vider la queue de tampons de la source OpenAL."
 
-#: src/lib_versions.cpp:85 src/lib_versions.cpp:118 src/lib_versions.cpp:157
-#: src/media_data.cpp:392 src/media_data.cpp:415 src/media_data.cpp:453
-#: src/media_data.cpp:458
+#: 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
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/lib_versions.cpp:181
+#: src/lib_versions.cpp:185
 msgid "not used"
 msgstr "inutilisé"
 
-#: src/main.cpp:259
+#: src/main.cpp:275
 #, c-format
 msgid "%s version %s"
 msgstr "%s version %s"
 
-#: src/main.cpp:260
+#: src/main.cpp:276
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr "Copyright (C) 2011 les développeurs Bino."
 
-#: src/main.cpp:261
+#: src/main.cpp:277
 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,19 +225,19 @@
 "termes de la GNU General Public License. Il n'y a AUCUNE GARANTIE, dans les "
 "limites autorisées par la loi."
 
-#: src/main.cpp:264 src/player_qt.cpp:2359
+#: src/main.cpp:280 src/player_qt.cpp:2660
 msgid "Platform:"
 msgstr "Plateforme :"
 
-#: src/main.cpp:266 src/player_qt.cpp:2360
+#: src/main.cpp:282 src/player_qt.cpp:2661
 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:278
-#, c-format
+#: src/main.cpp:294
+#, fuzzy, c-format
 msgid ""
 "Usage:\n"
 " %s [option...] [file...]\n"
@@ -246,7 +246,10 @@
 " --help Print help.\n"
 " --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"
+" -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-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"
 " -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 "
@@ -295,6 +298,8 @@
 " 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"
 " -c|--center Center window on screen.\n"
 " --subtitle-encoding=ENC Set subtitle encoding.\n"
 " --subtitle-font=FONT Set subtitle font name.\n"
@@ -307,6 +312,7 @@
 " values for the R,G,B channels.\n"
 " -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
 " -b|--benchmark Benchmark mode (no audio, show fps).\n"
+" -l|--loop Loop the input media.\n"
 "\n"
 "Interactive control:\n"
 " ESC Leave fullscreen mode, or quit.\n"
@@ -436,201 +442,218 @@
 " Mouse click Aller à la position définie par l'abscisse du "
 "clic."
 
-#: src/main.cpp:477
+#: src/main.cpp:517
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Mode banc d'essai: audio et synchronisation temporelle désactivés."
 
-#: src/main.cpp:489
+#: src/main.cpp:530
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Cette version de Bino a été compilée sans le support Equalizer."
 
-#: src/main.cpp:506
+#: src/main.cpp:547
 msgid "No video to play."
 msgstr "Aucune vidéo à jouer."
 
 #. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:263
+#: src/media_data.cpp:293
 #, c-format
 msgid "%dx%d, %.3g:1"
 msgstr "%dx%d, %.3g:1"
 
 #. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:391
+#: src/media_data.cpp:421
 #, c-format
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d ch., %g kHz, %d bit"
 
-#: src/media_input.cpp:284 src/player_qt.cpp:170
+#: src/media_input.cpp:286 src/player_qt.cpp:171
 msgid "Input:"
 msgstr "Entrée :"
 
-#: src/media_input.cpp:289
+#: src/media_input.cpp:291
 #, c-format
 msgid "Video %s: %s"
 msgstr "Vidéo %s : %s"
 
-#: src/media_input.cpp:294
+#: src/media_input.cpp:296
 msgid "No video."
 msgstr "Aucune vidéo."
 
-#: src/media_input.cpp:300
+#: src/media_input.cpp:302
 #, c-format
 msgid "Audio %s: %s"
 msgstr "Audio %s : %s"
 
-#: src/media_input.cpp:305
+#: src/media_input.cpp:307
 msgid "No audio."
 msgstr "Pas d'audio."
 
-#: src/media_input.cpp:311
+#: src/media_input.cpp:313
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr "Sous-titres %s : %s"
 
-#: src/media_input.cpp:316
+#: src/media_input.cpp:318
 msgid "No subtitle."
 msgstr "Aucun sous-titre."
 
-#: src/media_input.cpp:318
+#: src/media_input.cpp:320
 #, c-format
 msgid "Duration: %g seconds"
 msgstr "Durée : %g secondes"
 
-#: src/media_input.cpp:321
+#: src/media_input.cpp:323
 #, c-format
 msgid "Stereo layout: %s"
 msgstr "Mode stéréo : %s"
 
-#: src/media_object.cpp:584
+#: src/media_object.cpp:587
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with %d channels."
 msgstr "%s flux audio %d : Impossible de gérer de l'audio à %d canaux."

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

bino-1.0.0.tar.bz2/po/pl.po -> bino-1.1.0.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-04-28 11:03+0200\n"
+"POT-Creation-Date: 2011-05-09 05:18+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"
@@ -26,12 +26,12 @@
 msgid "Caught signal %d (%s). Aborting."
 msgstr "Niedozwolony sygnał %d (%s). Zatrzymywanie."
 
-#: src/base/dbg.cpp:58
+#: src/base/dbg.cpp:57
 msgid "Unexpected exception."
 msgstr "Niespodziewany wyjątek."
 
 #. TRANSLATORS: %s will be a mail address.
-#: src/base/dbg.cpp:146
+#: src/base/dbg.cpp:145
 #, c-format
 msgid "Report bugs to <%s>."
 msgstr "Raportuj błędy do <%s>."
@@ -199,26 +199,26 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Nie można odkolejkować źródła buforów OpenAL."
 
-#: src/lib_versions.cpp:85 src/lib_versions.cpp:118 src/lib_versions.cpp:157
-#: src/media_data.cpp:392 src/media_data.cpp:415 src/media_data.cpp:453
-#: src/media_data.cpp:458
+#: 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
 msgid "unknown"
 msgstr "nieznany"
 
-#: src/lib_versions.cpp:181
+#: src/lib_versions.cpp:185
 msgid "not used"
 msgstr "nie używany"
 
-#: src/main.cpp:259
+#: src/main.cpp:275
 #, c-format
 msgid "%s version %s"
 msgstr "%s wersja %s"
 
-#: src/main.cpp:260
+#: src/main.cpp:276
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr "Copyright (C) 2011 deweloperzy Bino."
 
-#: src/main.cpp:261
+#: src/main.cpp:277
 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,19 +228,19 @@
 "the GNU General Public License. There is NO WARRANTY, to the extent "
 "permitted by law."
 
-#: src/main.cpp:264 src/player_qt.cpp:2359
+#: src/main.cpp:280 src/player_qt.cpp:2660
 msgid "Platform:"
 msgstr "Platforma:"
 
-#: src/main.cpp:266 src/player_qt.cpp:2360
+#: src/main.cpp:282 src/player_qt.cpp:2661
 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:278
-#, c-format
+#: src/main.cpp:294
+#, fuzzy, c-format
 msgid ""
 "Usage:\n"
 " %s [option...] [file...]\n"
@@ -249,7 +249,10 @@
 " --help Print help.\n"
 " --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"
+" -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-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"
 " -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 "
@@ -298,6 +301,8 @@
 " 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"
 " -c|--center Center window on screen.\n"
 " --subtitle-encoding=ENC Set subtitle encoding.\n"
 " --subtitle-font=FONT Set subtitle font name.\n"
@@ -310,6 +315,7 @@
 " values for the R,G,B channels.\n"
 " -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
 " -b|--benchmark Benchmark mode (no audio, show fps).\n"
+" -l|--loop Loop the input media.\n"
 "\n"
 "Interactive control:\n"
 " ESC Leave fullscreen mode, or quit.\n"
@@ -430,200 +436,217 @@
 " 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:477
+#: src/main.cpp:517
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Opcja testowa: audio i synchronizacja czasu wyłączona."
 
-#: src/main.cpp:489
+#: src/main.cpp:530
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Ta wersja bino została skompilowana bez obsługi korektora."
 
-#: src/main.cpp:506
+#: src/main.cpp:547
 msgid "No video to play."
 msgstr "Brak video do odtwarzania."
 
 #. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:263
+#: src/media_data.cpp:293
 #, c-format
 msgid "%dx%d, %.3g:1"
 msgstr "%dx%d, %.3g:1"
 
 #. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:391
+#: src/media_data.cpp:421
 #, c-format
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d ch., %g kHz, %d bit"
 
-#: src/media_input.cpp:284 src/player_qt.cpp:170
+#: src/media_input.cpp:286 src/player_qt.cpp:171
 msgid "Input:"
 msgstr "Wejście:"
 
-#: src/media_input.cpp:289
+#: src/media_input.cpp:291
 #, c-format
 msgid "Video %s: %s"
 msgstr "Video %s: %s"
 
-#: src/media_input.cpp:294
+#: src/media_input.cpp:296
 msgid "No video."
 msgstr "Brak video."
 
-#: src/media_input.cpp:300
+#: src/media_input.cpp:302
 #, c-format
 msgid "Audio %s: %s"
 msgstr "Audio %s: %s"
 
-#: src/media_input.cpp:305
+#: src/media_input.cpp:307
 msgid "No audio."
 msgstr "Brak audio."
 
-#: src/media_input.cpp:311
+#: src/media_input.cpp:313
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr "Napisy %s: %s"
 
-#: src/media_input.cpp:316
+#: src/media_input.cpp:318
 msgid "No subtitle."
 msgstr "Brak napisów."
 
-#: src/media_input.cpp:318
+#: src/media_input.cpp:320
 #, c-format
 msgid "Duration: %g seconds"
 msgstr "Czas trwania: %g sekund"
 
-#: src/media_input.cpp:321
+#: src/media_input.cpp:323
 #, c-format
 msgid "Stereo layout: %s"
 msgstr "Układ stereo: %s"
 
-#: src/media_object.cpp:584
+#: src/media_object.cpp:587
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with %d channels."
 msgstr "%s strumień audio %d: Nie można obsłużyć audio z %d kanałem/ami."

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

bino-1.0.0.tar.bz2/po/ru.po -> bino-1.1.0.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-04-28 11:03+0200\n"
+"POT-Creation-Date: 2011-05-09 05:18+0200\n"
 "PO-Revision-Date: 2011-04-19 11:52+0600\n"
 "Last-Translator: Alexey Osipov <simba@lerlan.ru>\n"
 "Language-Team: \n"
@@ -20,12 +20,12 @@
 msgid "Caught signal %d (%s). Aborting."
 msgstr "Остановка по сигналу %d (%s)."
 
-#: src/base/dbg.cpp:58
+#: src/base/dbg.cpp:57
 msgid "Unexpected exception."
 msgstr "Непредвиденное исключение."
 
 #. TRANSLATORS: %s will be a mail address.
-#: src/base/dbg.cpp:146
+#: src/base/dbg.cpp:145
 #, c-format
 msgid "Report bugs to <%s>."
 msgstr "Сообщения об ошибках принимаются по адресу <%s>."
@@ -193,26 +193,26 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Невозможно получить из очереди буферы источника OpenAL."
 
-#: src/lib_versions.cpp:85 src/lib_versions.cpp:118 src/lib_versions.cpp:157
-#: src/media_data.cpp:392 src/media_data.cpp:415 src/media_data.cpp:453
-#: src/media_data.cpp:458
+#: 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
 msgid "unknown"
 msgstr "неизвестно"
 
-#: src/lib_versions.cpp:181
+#: src/lib_versions.cpp:185
 msgid "not used"
 msgstr "не используется"
 
-#: src/main.cpp:259
+#: src/main.cpp:275
 #, c-format
 msgid "%s version %s"
 msgstr "%s версия %s"
 
-#: src/main.cpp:260
+#: src/main.cpp:276
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr "Copyright (C) 2011 Разработчики Bino."
 
-#: src/main.cpp:261
+#: src/main.cpp:277
 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,19 +222,19 @@
 "требованиям лицензии GNU General Public License. Программное обеспечение "
 "поставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, за исключением предусмотренных законом."
 
-#: src/main.cpp:264 src/player_qt.cpp:2359
+#: src/main.cpp:280 src/player_qt.cpp:2660
 msgid "Platform:"
 msgstr "Платформа:"
 
-#: src/main.cpp:266 src/player_qt.cpp:2360
+#: src/main.cpp:282 src/player_qt.cpp:2661
 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:278
-#, c-format
+#: src/main.cpp:294
+#, fuzzy, c-format
 msgid ""
 "Usage:\n"
 " %s [option...] [file...]\n"
@@ -243,7 +243,10 @@
 " --help Print help.\n"
 " --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"
+" -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-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"
 " -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 "
@@ -292,6 +295,8 @@
 " 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"
 " -c|--center Center window on screen.\n"
 " --subtitle-encoding=ENC Set subtitle encoding.\n"
 " --subtitle-font=FONT Set subtitle font name.\n"
@@ -304,6 +309,7 @@
 " values for the R,G,B channels.\n"
 " -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
 " -b|--benchmark Benchmark mode (no audio, show fps).\n"
+" -l|--loop Loop the input media.\n"
 "\n"
 "Interactive control:\n"
 " ESC Leave fullscreen mode, or quit.\n"
@@ -415,202 +421,219 @@
 " page up, page down Перемотать на 10 минут назад / вперед.\n"
 " Щелчок мышью Перемотать по горизонтальному положению курсора."
 
-#: src/main.cpp:477
+#: src/main.cpp:517
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr ""
 "Режим оценки производительности: воспроизведение аудио отключено, "
 "воспроизведение видео с максимально-возможной скоростью."
 
-#: src/main.cpp:489
+#: src/main.cpp:530
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Эта версия Bino была собрана без поддержки Equalizer."
 
-#: src/main.cpp:506
+#: src/main.cpp:547
 msgid "No video to play."
 msgstr "Нет видео для воспроизведения."
 
 #. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:263
+#: src/media_data.cpp:293
 #, c-format
 msgid "%dx%d, %.3g:1"
 msgstr "%dx%d, %.3g:1"
 
 #. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:391
+#: src/media_data.cpp:421
 #, c-format
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d к., %g кГц, %d бит"
 
-#: src/media_input.cpp:284 src/player_qt.cpp:170
+#: src/media_input.cpp:286 src/player_qt.cpp:171
 msgid "Input:"
 msgstr "Источник:"
 
-#: src/media_input.cpp:289
+#: src/media_input.cpp:291
 #, c-format
 msgid "Video %s: %s"
 msgstr "Видео %s: %s"
 
-#: src/media_input.cpp:294
+#: src/media_input.cpp:296
 msgid "No video."
 msgstr "Нет видео."
 
-#: src/media_input.cpp:300
+#: src/media_input.cpp:302
 #, c-format
 msgid "Audio %s: %s"
 msgstr "Аудио %s: %s"
 
-#: src/media_input.cpp:305
+#: src/media_input.cpp:307
 msgid "No audio."
 msgstr "Нет аудио."
 
-#: src/media_input.cpp:311
+#: src/media_input.cpp:313
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr "Субтитры %s: %s"
 
-#: src/media_input.cpp:316
+#: src/media_input.cpp:318
 msgid "No subtitle."
 msgstr "Нет субтитров."
 
-#: src/media_input.cpp:318
+#: src/media_input.cpp:320
 #, c-format
 msgid "Duration: %g seconds"
 msgstr "Продолжительность: %g секунд"
 
-#: src/media_input.cpp:321
+#: src/media_input.cpp:323
 #, c-format
 msgid "Stereo layout: %s"
 msgstr "Стерео раскладка: %s"
 
-#: src/media_object.cpp:584
+#: src/media_object.cpp:587
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with %d channels."

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

@@ -28,12 +28,14 @@
 ICONS = \
 	icons/application-exit.png \
 	icons/applications-internet.png \
+        icons/camera-web.png \
 	icons/document-open.png \
 	icons/help-about.png \
 	icons/help-contents.png \
 	icons/media-playback-pause.png \
 	icons/media-playback-start.png \
 	icons/media-playback-stop.png \
+	icons/media-playlist-repeat.png \
 	icons/media-seek-backward.png \
 	icons/media-seek-forward.png \
 	icons/preferences-desktop-keyboard.png \
@@ -84,11 +86,11 @@
 DEFS += -DDOCDIR=\"$(docdir)\" -DLOCALEDIR=\"$(localedir)\"
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/base \
-	$(libavformat_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \
+	$(libavformat_CFLAGS) $(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \
 	$(libopenal_CFLAGS) $(libglew_CFLAGS) $(libqtopengl_CFLAGS)
 
 bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) \
-	$(libavformat_LIBS) $(libswscale_LIBS) $(libass_LIBS) \
+	$(libavformat_LIBS) $(libavdevice_LIBS) $(libswscale_LIBS) $(libass_LIBS) \
 	$(libopenal_LIBS) $(libglew_LIBS) $(libqtopengl_LIBS)
 
 if HAVE_LIBEQUALIZER

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

@@ -93,8 +93,8 @@
 	$(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_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -281,6 +281,8 @@
 libEqualizer_LIBS = @libEqualizer_LIBS@
 libass_CFLAGS = @libass_CFLAGS@
 libass_LIBS = @libass_LIBS@
+libavdevice_CFLAGS = @libavdevice_CFLAGS@
+libavdevice_LIBS = @libavdevice_LIBS@
 libavformat_CFLAGS = @libavformat_CFLAGS@
 libavformat_LIBS = @libavformat_LIBS@
 libdir = @libdir@
@@ -326,12 +328,14 @@
 ICONS = \
 	icons/application-exit.png \
 	icons/applications-internet.png \
+        icons/camera-web.png \
 	icons/document-open.png \
 	icons/help-about.png \
 	icons/help-contents.png \
 	icons/media-playback-pause.png \
 	icons/media-playback-start.png \
 	icons/media-playback-stop.png \
+	icons/media-playlist-repeat.png \
 	icons/media-seek-backward.png \
 	icons/media-seek-forward.png \
 	icons/preferences-desktop-keyboard.png \
@@ -365,13 +369,13 @@
 BUILT_SOURCES = $(nodist_bino_SOURCES)
 CLEANFILES = $(BUILT_SOURCES)
 AM_CPPFLAGS = -I$(top_srcdir)/src/base $(libavformat_CFLAGS) \
-	$(libswscale_CFLAGS) $(libass_CFLAGS) $(libopenal_CFLAGS) \
-	$(libglew_CFLAGS) $(libqtopengl_CFLAGS) $(am__append_2) \
-	$(am__append_4)
+	$(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \
+	$(libopenal_CFLAGS) $(libglew_CFLAGS) $(libqtopengl_CFLAGS) \
+	$(am__append_2) $(am__append_4)
 bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) \
-	$(libavformat_LIBS) $(libswscale_LIBS) $(libass_LIBS) \
-	$(libopenal_LIBS) $(libglew_LIBS) $(libqtopengl_LIBS) \
-	$(am__append_3) $(am__append_5)
+	$(libavformat_LIBS) $(libavdevice_LIBS) $(libswscale_LIBS) \
+	$(libass_LIBS) $(libopenal_LIBS) $(libglew_LIBS) \
+	$(libqtopengl_LIBS) $(am__append_3) $(am__append_5)
 moc_verbose = $(moc_verbose_$(V))
 moc_verbose_ = $(moc_verbose_$(AM_DEFAULT_VERBOSITY))
 moc_verbose_0 = @echo "  MOC   " $@;

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

bino-1.0.0.tar.bz2/src/base/dbg.cpp -> bino-1.1.0.tar.bz2/src/base/dbg.cpp Changed

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

bino-1.1.0.tar.bz2/src/icons/camera-web.png Added

bino-1.1.0.tar.bz2/src/icons/media-playlist-repeat.png Added

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

@@ -24,6 +24,7 @@
 {
 #define __STDC_CONSTANT_MACROS
 #include <libavformat/avformat.h>
+#include <libavdevice/avdevice.h>
 #include <libavcodec/avcodec.h>
 #include <libswscale/swscale.h>
 }
@@ -69,6 +70,9 @@
 ffmpeg_v.push_back(str::asprintf("libavformat %d.%d.%d / %d.%d.%d",
 LIBAVFORMAT_VERSION_MAJOR, LIBAVFORMAT_VERSION_MINOR, LIBAVFORMAT_VERSION_MICRO,
 avformat_version() >> 16, avformat_version() >> 8 & 0xff, avformat_version() & 0xff));
+ ffmpeg_v.push_back(str::asprintf("libavdevice %d.%d.%d / %d.%d.%d",
+ LIBAVDEVICE_VERSION_MAJOR, LIBAVDEVICE_VERSION_MINOR, LIBAVDEVICE_VERSION_MICRO,
+ avdevice_version() >> 16, avdevice_version() >> 8 & 0xff, avdevice_version() & 0xff));
 ffmpeg_v.push_back(str::asprintf("libavcodec %d.%d.%d / %d.%d.%d",
 LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO,
 avcodec_version() >> 16, avcodec_version() >> 8 & 0xff, avcodec_version() & 0xff));

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

@@ -147,8 +147,20 @@
 log_levels.push_back("warning");
 log_levels.push_back("error");
 log_levels.push_back("quiet");
- opt::val<std::string> log_level("log-level", 'l', opt::optional, log_levels, "");
+ opt::val<std::string> log_level("log-level", 'L', opt::optional, log_levels, "");
 options.push_back(&log_level);
+ std::vector<std::string> device_types;
+ device_types.push_back("default");
+ device_types.push_back("firewire");
+ device_types.push_back("x11");
+ opt::val<std::string> device_type("device-type", '\0', opt::optional, device_types, "");
+ options.push_back(&device_type);
+ opt::tuple<int> device_frame_size("device-frame-size", '\0', opt::optional,
+ 1, std::numeric_limits<int>::max(), std::vector<int>(2, 0), 2, "x");
+ options.push_back(&device_frame_size);
+ opt::tuple<int> device_frame_rate("device-frame-rate", '\0', opt::optional,
+ 1, std::numeric_limits<int>::max(), std::vector<int>(2, 0), 2, "/");
+ options.push_back(&device_frame_rate);
 std::vector<std::string> input_modes;
 input_modes.push_back("mono");
 input_modes.push_back("separate-left-right");
@@ -205,6 +217,8 @@
 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::flag center("center", 'c', opt::optional);
 options.push_back(&center);
 opt::val<std::string> subtitle_encoding("subtitle-encoding", '\0', opt::optional, parameters().subtitle_encoding);
@@ -228,6 +242,8 @@
 options.push_back(&ghostbust);
 opt::flag benchmark("benchmark", 'b', opt::optional);
 options.push_back(&benchmark);
+ opt::flag loop("loop", 'l', opt::optional);
+ options.push_back(&loop);
 // Accept some Equalizer options. These are passed to Equalizer for interpretation.
 opt::val<std::string> eq_server("eq-server", '\0', opt::optional);
 options.push_back(&eq_server);
@@ -282,7 +298,10 @@
 " --help Print help.\n"
 " --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"
+ " -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-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"
 " -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"
@@ -330,6 +349,8 @@
 " 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"
 " -c|--center Center window on screen.\n"
 " --subtitle-encoding=ENC Set subtitle encoding.\n"
 " --subtitle-font=FONT Set subtitle font name.\n"
@@ -342,6 +363,7 @@
 " values for the R,G,B channels.\n"
 " -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
 " -b|--benchmark Benchmark mode (no audio, show fps).\n"
+ " -l|--loop Loop the input media.\n"
 "\n"
 "Interactive control:\n"
 " ESC Leave fullscreen mode, or quit.\n"
@@ -415,6 +437,23 @@
 {
 init_data.log_level = msg::REQ;
 }
+ if (device_type.value() == "")
+ {
+ init_data.dev_request.device =
+ (arguments.size() == 1 && arguments[0].substr(0, 5) == "/dev/"
+ ? device_request::sys_default : device_request::no_device);
+ }
+ else
+ {
+ init_data.dev_request.device =
+ (device_type.value() == "firewire" ? device_request::firewire
+ : device_type.value() == "x11" ? device_request::x11
+ : device_request::sys_default);
+ }
+ init_data.dev_request.width = device_frame_size.value()[0];
+ init_data.dev_request.height = device_frame_size.value()[1];
+ init_data.dev_request.frame_rate_num = device_frame_rate.value()[0];
+ init_data.dev_request.frame_rate_den = device_frame_rate.value()[1];
 init_data.urls = arguments;
 init_data.video_stream = video.value() - 1;
 init_data.audio_stream = audio.value() - 1;
@@ -456,6 +495,7 @@
 }
 init_data.params.stereo_mode_swap = swap_eyes.value();
 init_data.fullscreen = fullscreen.value();
+ init_data.params.fullscreen_screen = fullscreen_screen.value();
 init_data.center = center.value();
 init_data.params.subtitle_encoding = subtitle_encoding.value();
 init_data.params.subtitle_font = subtitle_font.value();
@@ -476,6 +516,7 @@
 {
 msg::inf(_("Benchmark mode: audio and time synchronization disabled."));
 }
+ init_data.params.loop_mode = (loop.value() ? parameters::loop_current : parameters::no_loop);
 
 int retval = 0;
 player *player = NULL;

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

@@ -35,6 +35,36 @@
 #include "dbg.h"
 
 
+device_request::device_request() :
+ device(no_device),
+ width(0),
+ height(0),
+ frame_rate_num(0),
+ frame_rate_den(0)
+{
+}
+
+void device_request::save(std::ostream &os) const
+{
+ s11n::save(os, static_cast<int>(device));
+ s11n::save(os, width);
+ s11n::save(os, height);
+ s11n::save(os, frame_rate_num);
+ s11n::save(os, frame_rate_den);
+}
+
+void device_request::load(std::istream &is)
+{
+ int x;
+ s11n::load(is, x);
+ device = static_cast<device_t>(x);
+ s11n::load(is, width);
+ s11n::load(is, height);
+ s11n::load(is, frame_rate_num);
+ s11n::load(is, frame_rate_den);
+}
+
+
 video_frame::video_frame() :
 raw_width(-1),
 raw_height(-1),
@@ -540,7 +570,9 @@
 subtitle_size(std::numeric_limits<int>::min()),
 subtitle_scale(-1.0f),
 subtitle_color(std::numeric_limits<uint64_t>::max()),
- subtitle_parallax(std::numeric_limits<float>::quiet_NaN())
+ subtitle_parallax(std::numeric_limits<float>::quiet_NaN()),
+ loop_mode(no_loop),
+ fullscreen_screen(-1)
 {
 }
 
@@ -606,6 +638,10 @@
 {
 subtitle_parallax = 0.0f;
 }
+ if (fullscreen_screen < 0)
+ {
+ fullscreen_screen = 0;
+ }
 }
 
 std::string parameters::stereo_mode_to_string(stereo_mode_t stereo_mode, bool stereo_mode_swap)
@@ -836,6 +872,8 @@
 s11n::save(os, subtitle_scale);
 s11n::save(os, subtitle_color);
 s11n::save(os, subtitle_parallax);
+ s11n::save(os, static_cast<int>(loop_mode));
+ s11n::save(os, fullscreen_screen);
 }
 
 void parameters::load(std::istream &is)
@@ -859,4 +897,7 @@
 s11n::load(is, subtitle_scale);
 s11n::load(is, subtitle_color);
 s11n::load(is, subtitle_parallax);
+ s11n::load(is, x);
+ loop_mode = static_cast<loop_mode_t>(x);
+ s11n::load(is, fullscreen_screen);
 }

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

@@ -28,6 +28,37 @@
 #include "s11n.h"
 
 
+class device_request : public s11n
+{
+public:
+    typedef enum
+    {
+        no_device,      // No device request.
+        sys_default,    // Request for system default video device type.
+        firewire,       // Request for a firefire video device.
+        x11,            // Request for an X11 grabber.
+    } device_t;
+
+    device_t device;    // The device type.
+    int width;          // Request frames of the given width (0 means default).
+    int height;         // Request frames of the given height (0 means default).
+    int frame_rate_num; // Request a specific frame rate (0/0 means default).
+    int frame_rate_den; // For example 1/25, 1/30, ...
+
+    // Constructor
+    device_request();
+
+    // Is this a request for a device?
+    bool is_device() const
+    {
+        return device != no_device;
+    }
+
+    // Serialization
+    void save(std::ostream &os) const;
+    void load(std::istream &is);
+};
+
 class video_frame
 {
 public:
@@ -270,6 +301,12 @@
         red_blue_monochrome,            // Red/blue anaglyph, monochrome method
     } stereo_mode_t;
 
+    typedef enum
+    {
+        no_loop,                        // Do not loop.
+        loop_current,                   // Loop the current media input.
+    } loop_mode_t;
+
     stereo_mode_t stereo_mode;          // Stereo mode
     bool stereo_mode_swap;              // Swap left and right view
     float parallax;                     // Parallax adjustment, -1 .. +1
@@ -287,6 +324,8 @@
     float subtitle_scale;               // Scale factor
     uint64_t subtitle_color;            // Subtitle color in uint32_t bgra32 format, > UINT32_MAX means keep default
     float subtitle_parallax;            // Subtitle parallax adjustment, -1 .. +1
+    loop_mode_t loop_mode;              // Current loop behaviour.
+    int fullscreen_screen;              // Screen to use in fullscreen mode: 0 (primary screen), 1, 2, ...
 
     // Constructor
     parameters();

bino-1.0.0.tar.bz2/src/media_input.cpp -> bino-1.1.0.tar.bz2/src/media_input.cpp Changed

bino-1.0.0.tar.bz2/src/media_input.h -> bino-1.1.0.tar.bz2/src/media_input.h Changed

@@ -31,6 +31,7 @@
 class media_input
 {
 private:
+ bool _is_device; // Whether this is a device (e.g. a camera)
 std::string _id; // ID of this input: URL0[/URL1[/URL2[...]]]
 std::vector<media_object> _media_objects; // The media objects that are combined into one input
 std::vector<std::string> _tag_names; // Meta data: tag names
@@ -68,9 +69,10 @@
 media_input();
 ~media_input();
 
- /* Open this input by combining the media objects at the given URLS. */
+ /* Open this input by combining the media objects at the given URLS.
+ * A device can only have a single URL. */
 
- void open(const std::vector<std::string> &urls);
+ void open(const std::vector<std::string> &urls, const device_request &dev_request = device_request());
 
 /* Get information */
 
@@ -78,6 +80,7 @@
 const std::string &id() const;
 
 // Metadata
+ bool is_device() const;
 size_t tags() const;
 const std::string &tag_name(size_t i) const;
 const std::string &tag_value(size_t i) const;

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

@@ -26,6 +26,7 @@
 {
 #define __STDC_CONSTANT_MACROS
 #include <libavformat/avformat.h>
+#include <libavdevice/avdevice.h>
 #include <libavcodec/avcodec.h>
 #include <libswscale/swscale.h>
 }
@@ -62,11 +63,12 @@
 {
 private:
 const std::string _url;
+ const bool _is_device;
 struct ffmpeg_stuff *_ffmpeg;
 bool _eof;
 
 public:
- read_thread(const std::string &url, struct ffmpeg_stuff *ffmpeg);
+ read_thread(const std::string &url, bool is_device, struct ffmpeg_stuff *ffmpeg);
 void run();
 void reset();
 bool eof() const
@@ -315,6 +317,7 @@
 
 media_object::media_object() : _ffmpeg(NULL)
 {
+ avdevice_register_all();
 av_register_all();
 switch (msg::level())
 {
@@ -628,20 +631,95 @@
 }
 }
 
-void media_object::open(const std::string &url)
+void media_object::open(const std::string &url, const device_request &dev_request)
 {
 assert(!_ffmpeg);
 
 _url = url;
+ _is_device = dev_request.is_device();
 _ffmpeg = new struct ffmpeg_stuff;
- _ffmpeg->reader = new read_thread(_url, _ffmpeg);
+ _ffmpeg->reader = new read_thread(_url, _is_device, _ffmpeg);
 int e;
 
- if ((e = av_open_input_file(&_ffmpeg->format_ctx, _url.c_str(), NULL, 0, NULL)) != 0)
+ /* Set format and parameters for device input */
+ AVInputFormat *iformat;
+ AVFormatParameters iparams;
+ bool use_iparams = false;
+ switch (dev_request.device)
+ {
+ case device_request::firewire:
+ iformat = av_find_input_format("libdc1394");
+ break;
+ case device_request::x11:
+ iformat = av_find_input_format("x11grab");
+ break;
+ case device_request::sys_default:
+#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;
+#elif defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined __APPLE__
+ 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;
+ iparams.time_base.den = 25;
+ use_iparams = true;
+#else
+ iformat = av_find_input_format("video4linux2");
+ // video4linux2 can use default parameters.
+#endif
+ break;
+ case device_request::no_device:
+ iformat = NULL;
+ break;
+ }
+ if (_is_device && !iformat)
+ {
+ throw exc(str::asprintf(_("No support available for %s device."),
+ dev_request.device == device_request::firewire ? _("Firewire")
+ : dev_request.device == device_request::x11 ? _("X11")
+ : _("default")));
+ }
+ if (_is_device
+ && ((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;
+ }
+ if (dev_request.width != 0 && dev_request.height != 0)
+ {
+ iparams.width = dev_request.width;
+ iparams.height = dev_request.height;
+ }
+ if (dev_request.frame_rate_num != 0 && dev_request.frame_rate_den != 0)
+ {
+ iparams.time_base.den = dev_request.frame_rate_num;
+ iparams.time_base.num = dev_request.frame_rate_den;
+ }
+ }
+
+ /* Open the input */
+ if ((e = av_open_input_file(&_ffmpeg->format_ctx, _url.c_str(), iformat, 0,
+ use_iparams ? &iparams : NULL)) != 0)
 {
 throw exc(str::asprintf(_("%s: %s"),
 _url.c_str(), my_av_strerror(e).c_str()));
 }
+ if (_is_device)
+ {
+ // For a camera device, do not read ahead multiple packets, to avoid a startup delay.
+ _ffmpeg->format_ctx->max_analyze_duration = 0;
+ }
 if ((e = av_find_stream_info(_ffmpeg->format_ctx)) < 0)
 {
 throw exc(str::asprintf(_("%s: Cannot read stream info: %s"),
@@ -1037,8 +1115,8 @@
 _ffmpeg->format_ctx);
 }
 
-read_thread::read_thread(const std::string &url, struct ffmpeg_stuff *ffmpeg) :
- _url(url), _ffmpeg(ffmpeg), _eof(false)
+read_thread::read_thread(const std::string &url, bool is_device, struct ffmpeg_stuff *ffmpeg) :
+ _url(url), _is_device(is_device), _ffmpeg(ffmpeg), _eof(false)
 {
 }
 
@@ -1047,9 +1125,11 @@
 while (!_eof)
 {
 // We need another packet if the number of queued packets for an active stream is below a threshold.
- const size_t video_stream_low_threshold = 2; // Often, 1 packet results in one video frame
- const size_t audio_stream_low_threshold = 5; // Often, 3-4 packets are needed for one buffer fill
- const size_t subtitle_stream_low_threshold = 1; // Just a guess
+ // For files, we often want to read ahead to avoid i/o waits. For devices, we do not want to read
+ // ahead to avoid latency.
+ const size_t video_stream_low_threshold = (_is_device ? 1 : 2); // Often, 1 packet results in one video frame
+ const size_t audio_stream_low_threshold = (_is_device ? 1 : 5); // Often, 3-4 packets are needed for one buffer fill
+ const size_t subtitle_stream_low_threshold = (_is_device ? 1 : 1); // Just a guess
 bool need_another_packet = false;
 for (size_t i = 0; !need_another_packet && i < _ffmpeg->video_streams.size(); i++)
 {
@@ -1065,8 +1145,8 @@
 if (_ffmpeg->format_ctx->streams[_ffmpeg->audio_streams[i]]->discard == AVDISCARD_DEFAULT)
 {
 _ffmpeg->audio_packet_queue_mutexes[i].lock();
- need_another_packet = _ffmpeg->audio_packet_queues[i].size() < audio_stream_low_threshold;
- _ffmpeg->audio_packet_queue_mutexes[i].unlock();
+ need_another_packet = _ffmpeg->audio_packet_queues[i].size() < audio_stream_low_threshold;
+ _ffmpeg->audio_packet_queue_mutexes[i].unlock();
 }
 }
 for (size_t i = 0; !need_another_packet && i < _ffmpeg->subtitle_streams.size(); i++)
@@ -1702,113 +1782,120 @@
 
 void media_object::close()
 {
- try
- {
- // Stop decoder threads
- for (size_t i = 0; i < _ffmpeg->video_decode_threads.size(); i++)
- {
- _ffmpeg->video_decode_threads[i].finish();
- }
- for (size_t i = 0; i < _ffmpeg->audio_decode_threads.size(); i++)
- {
- _ffmpeg->audio_decode_threads[i].finish();
- }
- for (size_t i = 0; i < _ffmpeg->subtitle_decode_threads.size(); i++)
- {
- _ffmpeg->subtitle_decode_threads[i].finish();
- }
- // Stop reading packets
- _ffmpeg->reader->finish();
- }
- catch (...)
- {
- }
- for (size_t i = 0; i < _ffmpeg->video_frames.size(); i++)
- {
- av_free(_ffmpeg->video_frames[i]);
- }
- for (size_t i = 0; i < _ffmpeg->video_out_frames.size(); i++)
- {
- av_free(_ffmpeg->video_out_frames[i]);
- }
- for (size_t i = 0; i < _ffmpeg->video_buffers.size(); i++)

bino-1.0.0.tar.bz2/src/media_object.h -> bino-1.1.0.tar.bz2/src/media_object.h Changed

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

@@ -43,6 +43,7 @@
 
 player_init_data::player_init_data() :
 log_level(msg::INF),
+ dev_request(),
 urls(),
 video_stream(0),
 audio_stream(0),
@@ -67,6 +68,7 @@
 void player_init_data::save(std::ostream &os) const
 {
 s11n::save(os, static_cast<int>(log_level));
+ s11n::save(os, dev_request);
 s11n::save(os, urls);
 s11n::save(os, video_stream);
 s11n::save(os, audio_stream);
@@ -88,6 +90,7 @@
 int x;
 s11n::load(is, x);
 log_level = static_cast<msg::level_t>(x);
+ s11n::load(is, dev_request);
 s11n::load(is, urls);
 s11n::load(is, video_stream);
 s11n::load(is, audio_stream);
@@ -200,7 +203,7 @@
 
 // Create media input
 _media_input = new media_input();
- _media_input->open(init_data.urls);
+ _media_input->open(init_data.urls, init_data.dev_request);
 if (_media_input->video_streams() == 0)
 {
 throw exc(_("No video streams found."));
@@ -288,7 +291,7 @@
 _params.stereo_mode);
 if (init_data.fullscreen)
 {
- _video_output->enter_fullscreen();
+ _video_output->enter_fullscreen(_params.fullscreen_screen);
 }
 if (init_data.center)
 {
@@ -516,7 +519,15 @@
 else
 {
 msg::dbg("End of video stream.");
- stop_playback();
+ if (_params.loop_mode == parameters::loop_current)
+ {
+ _set_pos_request = 0.0f;
+ *more_steps = true;
+ }
+ else
+ {
+ stop_playback();
+ }
 return 0;
 }
 }
@@ -592,7 +603,15 @@
 if (!blob.is_valid())
 {
 msg::dbg("End of audio stream.");
- stop_playback();
+ if (_params.loop_mode == parameters::loop_current)
+ {
+ _set_pos_request = 0.0f;
+ *more_steps = true;
+ }
+ else
+ {
+ stop_playback();
+ }
 return 0;
 }
 _audio_pos = blob.presentation_time;
@@ -612,11 +631,12 @@
 }
 
 int64_t allowable_sleep = 0;
- if (_master_time_current >= _video_pos || _benchmark)
+ if (_master_time_current >= _video_pos || _benchmark || _media_input->is_device())
 {
 // Output current video frame
 _drop_next_frame = false;
- if (_master_time_current - _video_pos > _media_input->video_frame_duration() * 75 / 100 && !_benchmark)
+ if (_master_time_current - _video_pos > _media_input->video_frame_duration() * 75 / 100
+ && !_benchmark && !_media_input->is_device())
 {
 msg::wrn(_("Video: delay %g seconds; dropping next frame."), (_master_time_current - _video_pos) / 1e6f);
 _drop_next_frame = true;
@@ -868,7 +888,7 @@
 flag = false;
 if (_video_output)
 {
- flag = _video_output->toggle_fullscreen();
+ flag = _video_output->toggle_fullscreen(_params.fullscreen_screen);
 }
 notify(notification::fullscreen, flag, !flag);
 break;
@@ -1050,6 +1070,23 @@
 _set_pos_request = param;
 /* notify when request is fulfilled */
 break;
+ case command::set_loop_mode:
+ {
+ int old_loop_mode = static_cast<int>(_params.loop_mode);
+ int loop_mode;
+ s11n::load(p, loop_mode);
+ _params.loop_mode = static_cast<parameters::loop_mode_t>(loop_mode);
+ parameters_changed = true;
+ notify(notification::loop_mode, old_loop_mode, loop_mode);
+ }
+ break;
+ case command::set_fullscreen_screen:
+ {
+ int old_screen = _params.fullscreen_screen;
+ s11n::load(p, _params.fullscreen_screen);
+ notify(notification::fullscreen_screen, old_screen, _params.fullscreen_screen);
+ break;
+ }
 }
 
 if (parameters_changed && _video_output)

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

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

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

@@ -55,6 +55,7 @@
 #include <QRegExp>
 #include <QMap>
 #include <QColorDialog>
+#include <QDesktopWidget>
 
 #include "gettext.h"
 #define _(string) gettext(string)
@@ -720,7 +721,7 @@
 }
 
 
-controls_widget::controls_widget(QSettings *settings, QWidget *parent)
+controls_widget::controls_widget(QSettings *settings, QWidget *parent, const player_init_data &init_data)
 : QWidget(parent), _lock(false), _settings(settings), _playing(false)
 {
 QGridLayout *layout = new QGridLayout;
@@ -730,7 +731,7 @@
 _seek_slider->setRange(0, 2000);
 _seek_slider->setTracking(false);
 connect(_seek_slider, SIGNAL(valueChanged(int)), this, SLOT(seek_slider_changed()));
- layout->addWidget(_seek_slider, 0, 0, 1, 13);
+ layout->addWidget(_seek_slider, 0, 0, 1, 15);
 _play_button = new QPushButton(get_icon("media-playback-start"), "");
 _play_button->setToolTip(_("Play."));
 connect(_play_button, SIGNAL(pressed()), this, SLOT(play_pressed()));
@@ -744,58 +745,68 @@
 connect(_stop_button, SIGNAL(pressed()), this, SLOT(stop_pressed()));
 layout->addWidget(_stop_button, 1, 2);
 layout->addWidget(new QWidget, 1, 3);
+ _loop_button = new QPushButton(get_icon("media-playlist-repeat"), "");
+ _loop_button->setToolTip(_("Toggle loop mode."));
+ _loop_button->setCheckable(true);
+ _loop_button->setChecked(init_data.params.loop_mode != parameters::no_loop);
+ connect(_loop_button, SIGNAL(toggled(bool)), this, SLOT(loop_pressed()));
+ layout->addWidget(_loop_button, 1, 4);
+ layout->addWidget(new QWidget, 1, 5);
 _fullscreen_button = new QPushButton(get_icon("view-fullscreen"), "");
 _fullscreen_button->setToolTip(_("Switch to fullscreen mode. "
 "You can leave fullscreen mode by pressing the f key."));
+ _fullscreen_button->setCheckable(true);
 connect(_fullscreen_button, SIGNAL(pressed()), this, SLOT(fullscreen_pressed()));
- layout->addWidget(_fullscreen_button, 1, 4);
+ layout->addWidget(_fullscreen_button, 1, 6);
 _center_button = new QPushButton(get_icon("view-restore"), "");
 _center_button->setToolTip(_("Center the video area on your screen."));
 connect(_center_button, SIGNAL(pressed()), this, SLOT(center_pressed()));
- layout->addWidget(_center_button, 1, 5);
- layout->addWidget(new QWidget, 1, 6);
+ layout->addWidget(_center_button, 1, 7);
+ layout->addWidget(new QWidget, 1, 8);
 _bbb_button = new QPushButton(get_icon("media-seek-backward"), "");
 _bbb_button->setFixedSize(_bbb_button->minimumSizeHint());
 _bbb_button->setIconSize(_bbb_button->iconSize() * 12 / 10);
 _bbb_button->setToolTip(_("Seek backward 10 minutes."));
 connect(_bbb_button, SIGNAL(pressed()), this, SLOT(bbb_pressed()));
- layout->addWidget(_bbb_button, 1, 7);
+ layout->addWidget(_bbb_button, 1, 9);
 _bb_button = new QPushButton(get_icon("media-seek-backward"), "");
 _bb_button->setFixedSize(_bb_button->minimumSizeHint());
 _bb_button->setToolTip(_("Seek backward 1 minute."));
 connect(_bb_button, SIGNAL(pressed()), this, SLOT(bb_pressed()));
- layout->addWidget(_bb_button, 1, 8);
+ layout->addWidget(_bb_button, 1, 10);
 _b_button = new QPushButton(get_icon("media-seek-backward"), "");
 _b_button->setFixedSize(_b_button->minimumSizeHint());
 _b_button->setIconSize(_b_button->iconSize() * 8 / 10);
 _b_button->setToolTip(_("Seek backward 10 seconds."));
 connect(_b_button, SIGNAL(pressed()), this, SLOT(b_pressed()));
- layout->addWidget(_b_button, 1, 9);
+ layout->addWidget(_b_button, 1, 11);
 _f_button = new QPushButton(get_icon("media-seek-forward"), "");
 _f_button->setFixedSize(_f_button->minimumSizeHint());
 _f_button->setIconSize(_f_button->iconSize() * 8 / 10);
 _f_button->setToolTip(_("Seek forward 10 seconds."));
 connect(_f_button, SIGNAL(pressed()), this, SLOT(f_pressed()));
- layout->addWidget(_f_button, 1, 10);
+ layout->addWidget(_f_button, 1, 12);
 _ff_button = new QPushButton(get_icon("media-seek-forward"), "");
 _ff_button->setFixedSize(_ff_button->minimumSizeHint());
 _ff_button->setToolTip(_("Seek forward 1 minute."));
 connect(_ff_button, SIGNAL(pressed()), this, SLOT(ff_pressed()));
- layout->addWidget(_ff_button, 1, 11);
+ layout->addWidget(_ff_button, 1, 13);
 _fff_button = new QPushButton(get_icon("media-seek-forward"), "");
 _fff_button->setFixedSize(_fff_button->minimumSizeHint());
 _fff_button->setIconSize(_fff_button->iconSize() * 12 / 10);
 _fff_button->setToolTip(_("Seek forward 10 minutes."));
 connect(_fff_button, SIGNAL(pressed()), this, SLOT(fff_pressed()));
- layout->addWidget(_fff_button, 1, 12);
+ layout->addWidget(_fff_button, 1, 14);
 layout->setRowStretch(0, 0);
 layout->setColumnStretch(3, 1);
- layout->setColumnStretch(6, 1);
+ layout->setColumnStretch(5, 1);
+ layout->setColumnStretch(8, 1);
 setLayout(layout);
 
 _play_button->setEnabled(false);
 _pause_button->setEnabled(false);
 _stop_button->setEnabled(false);
+ _loop_button->setEnabled(false);
 _fullscreen_button->setEnabled(false);
 _center_button->setEnabled(false);
 _bbb_button->setEnabled(false);
@@ -833,9 +844,19 @@
 send_cmd(command::toggle_play);
 }
 
+void controls_widget::loop_pressed()
+{
+ int loop_mode = static_cast<int>(_loop_button->isChecked()
+ ? parameters::loop_current : parameters::no_loop);
+ send_cmd(command::set_loop_mode, loop_mode);
+}
+
 void controls_widget::fullscreen_pressed()
 {
- send_cmd(command::toggle_fullscreen);
+ if (!_lock)
+ {
+ send_cmd(command::toggle_fullscreen);
+ }
 }
 
 void controls_widget::center_pressed()
@@ -885,6 +906,8 @@
 {
 if (have_valid_input)
 {
+ _loop_button->setEnabled(true);
+ _fullscreen_button->setEnabled(true);
 receive_notification(notification(notification::play, !playing, playing));
 }
 else
@@ -893,6 +916,7 @@
 _play_button->setEnabled(false);
 _pause_button->setEnabled(false);
 _stop_button->setEnabled(false);
+ _loop_button->setEnabled(false);
 _fullscreen_button->setEnabled(false);
 _center_button->setEnabled(false);
 _bbb_button->setEnabled(false);
@@ -920,7 +944,12 @@
 _play_button->setEnabled(!flag);
 _pause_button->setEnabled(flag);
 _stop_button->setEnabled(flag);
- _fullscreen_button->setEnabled(flag);
+ if (flag && _fullscreen_button->isChecked())
+ {
+ _lock = true;
+ send_cmd(command::toggle_fullscreen);
+ _lock = false;
+ }
 _center_button->setEnabled(flag);
 _bbb_button->setEnabled(flag);
 _bb_button->setEnabled(flag);
@@ -947,6 +976,13 @@
 _seek_slider->setValue(qRound(value * 2000.0f));
 _lock = false;
 }
+ break;
+ case notification::fullscreen:
+ s11n::load(current, flag);
+ _lock = true;
+ _fullscreen_button->setChecked(!flag);
+ _lock = false;
+ break;
 default:
 break;
 }
@@ -1680,6 +1716,126 @@
 }
 }
 
+open_device_dialog::open_device_dialog(
+ const QStringList &default_devices,
+ const QStringList &firewire_devices,
+ const QString &x11_device,
+ const device_request &dev_request,
+ QWidget *parent) :
+ QDialog(parent)
+{
+ setWindowTitle(_("Open device"));
+
+ _type_combobox = new QComboBox();
+ _type_combobox->setToolTip(_("Choose a device type."));
+ _type_combobox->addItem(_("Default"));
+ _type_combobox->addItem(_("Firewire"));
+ _type_combobox->addItem(_("X11"));
+ _default_device_combobox = new QComboBox();
+ _default_device_combobox->setToolTip(_("Choose a device."));
+ _default_device_combobox->addItems(default_devices);
+ _firewire_device_combobox = new QComboBox();
+ _firewire_device_combobox->setToolTip(_("Choose a device."));
+ _firewire_device_combobox->addItems(firewire_devices);
+ _x11_device_field = new QLineEdit(x11_device);
+ _x11_device_field->setToolTip(_("Set the X11 device string. "
+ "Refer to the FFmpeg documentation on the x11grab device for details."));
+ _device_chooser_stack = new QStackedWidget();

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

@@ -35,6 +35,8 @@
 #include <QTimer>
 #include <QSettings>
 #include <QDialog>
+#include <QGroupBox>
+#include <QStackedWidget>
 
 #include "controller.h"
 #include "video_output_qt.h"
@@ -117,6 +119,7 @@
 QPushButton *_play_button;
 QPushButton *_pause_button;
 QPushButton *_stop_button;
+ QPushButton *_loop_button;
 QPushButton *_fullscreen_button;
 QPushButton *_center_button;
 QPushButton *_bbb_button;
@@ -132,6 +135,7 @@
 void play_pressed();
 void pause_pressed();
 void stop_pressed();
+ void loop_pressed();
 void fullscreen_pressed();
 void center_pressed();
 void bbb_pressed();
@@ -143,7 +147,7 @@
 void seek_slider_changed();
 
 public:
- controls_widget(QSettings *settings, QWidget *parent);
+ controls_widget(QSettings *settings, QWidget *parent, const player_init_data &init_data);
 virtual ~controls_widget();
 
 void update(const player_init_data &init_data, bool have_valid_input, bool playing);
@@ -264,6 +268,32 @@
 virtual void receive_notification(const notification &note);
 };
 
+class open_device_dialog : public QDialog
+{
+ Q_OBJECT
+
+private:
+ QComboBox *_type_combobox;
+ QStackedWidget *_device_chooser_stack;
+ QComboBox *_default_device_combobox;
+ QComboBox *_firewire_device_combobox;
+ QLineEdit *_x11_device_field;
+ QGroupBox *_frame_size_groupbox;
+ QSpinBox *_frame_width_spinbox;
+ QSpinBox *_frame_height_spinbox;
+ QGroupBox *_frame_rate_groupbox;
+ QSpinBox *_frame_rate_num_spinbox;
+ QSpinBox *_frame_rate_den_spinbox;
+
+private slots:
+ void frame_size_groupbox_clicked(bool checked);
+ void frame_rate_groupbox_clicked(bool checked);
+
+public:
+ open_device_dialog(const QStringList &default_devices, const QStringList &firewire_devices,
+ const QString &x11_device, const device_request &dev_request, QWidget *parent);
+ void request(QString &device, device_request &dev_request);
+};
 
 class main_window : public QMainWindow, public controller
 {
@@ -286,17 +316,19 @@
 
 QString current_file_hash();
 bool open_player();
- void open(QStringList urls);
+ void open(QStringList urls, const device_request &dev_request = device_request());
 
 private slots:
 void move_event();
 void playloop_step();
 void file_open();
 void file_open_url();
+ void file_open_device();
 void preferences_colors();
 void preferences_crosstalk();
 void preferences_subtitle();
 void preferences_stereoscopic();
+ void preferences_fullscreen();
 void help_manual();
 void help_website();
 void help_keyboard();

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

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

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

@@ -492,7 +492,7 @@
 }
 }
 
-void video_output_qt::enter_fullscreen()
+void video_output_qt::enter_fullscreen(int screen)
 {
 if (!_fullscreen)
 {
@@ -504,11 +504,20 @@
 _container_widget->setWindowState(_widget->windowState() | Qt::WindowFullScreen);
 _container_widget->setCursor(Qt::BlankCursor);
 _container_widget->show();
+ if (screen != 0)
+ {
+ screen--;
+ if (screen < QApplication::desktop()->screenCount())
+ {
+ QRect screen_res = QApplication::desktop()->screenGeometry(screen);
+ _container_widget->move(QPoint(screen_res.x(), screen_res.y()));
+ }
+ }
 _widget->setFocus(Qt::OtherFocusReason);
 }
 }
 
-bool video_output_qt::toggle_fullscreen()
+bool video_output_qt::toggle_fullscreen(int screen)
 {
 if (_fullscreen)
 {
@@ -516,7 +525,7 @@
 }
 else
 {
- enter_fullscreen();
+ enter_fullscreen(screen);
 }
 return _fullscreen;
 }

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