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 10

bino.changes Changed

bino.spec Changed

bino-1.1.3.tar.bz2/AUTHORS -> bino-1.2.1.tar.bz2/AUTHORS Changed

bino-1.1.3.tar.bz2/ChangeLog -> bino-1.2.1.tar.bz2/ChangeLog Changed

@@ -1,3 +1,446 @@
+commit 87f080ccaf37d97ad9a7959100e5241f44f71638
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-10-10 21:17:25 +0200
+
+ Update AUTHORS.
+
+ AUTHORS | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 6e0dc435c3b8ef8a9ffab8bc9e07db8d6ba4d7a2
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-10-10 21:17:13 +0200
+
+ Bump version to 1.2.1.
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 95ed4ddc4a8327396162d5781b6200d070360768
+Author: Daniel Schaal <farbing@web.de>
+Date: 2011-10-09 13:56:07 +0200
+
+ GUI: save and restore geometry of the MainWindow.
+
+ src/player_qt.cpp | 12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+commit ea31318eb7d3862aee627164e19eb5557e4881b6
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-10-08 19:00:53 +0200
+
+ GUI: Fix all preferences dialogs to work when no video is opened.
+
+ src/player_qt.cpp | 127 +++++++++++++++++++++++++++++++++++-----------------
+ src/player_qt.h | 8 ++-
+ 2 files changed, 90 insertions(+), 45 deletions(-)
+
+commit 0d1688e876c7acc8a8bae9a42e2930e4932b2a7a
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-10-07 06:52:07 +0200
+
+ Media object: tweak video width/height determination.
+ 
+ This adds a workaround for certain video streams where the width/height values
+ reported originally (after avformat_open_input()) differ from those reported
+ after avcodec_open(). This seems to happen mostly with 1920x1088 vs 1920x1088.
+ See also <http://ffmpeg.org/pipermail/libav-user/2011-October/000715.html>.
+
+ src/media_object.cpp | 27 +++++++++++++++++++++++++--
+ src/media_object.h | 2 +-
+ 2 files changed, 26 insertions(+), 3 deletions(-)
+
+commit a7e9e5372d8ad35185bd6291997cc943fb940408
+Author: Daniel Schaal <farbing@web.de>
+Date: 2011-10-01 08:58:50 +0200
+
+ Install html documentation in ${htmldir}.
+
+ doc/Makefile.am | 2 +-
+ src/Makefile.am | 2 +-
+ src/player_qt.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 11509a922d6fdd2789dd4c30c1ce4a1a4a58a0fd
+Author: Daniel Schaal <farbing@web.de>
+Date: 2011-10-01 08:56:47 +0200
+
+ Use minus sign instead of hyphen in man page.
+
+ doc/bino.1 | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 2b0a8a739c356083ca9c880baba48a6bfc7a0123
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-09-21 06:42:25 +0200
+
+ Windows: reenable czech translation in installer.
+
+ pkg/w32/bino.nsi | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 72b8750ca7376d92b39e647ba547b8f24087aef2
+Author: Joe <cuchac@email.cz>
+Date: 2011-09-21 06:41:36 +0200
+
+ Update cs.po.
+
+ po/LINGUAS | 2 +-
+ po/cs.po | 790 +++++++++++++++++++++++++++++++++++++++---------------------
+ 2 files changed, 522 insertions(+), 270 deletions(-)
+
+commit 273d89b639bb49c1917b3a71ad0c2964534798ca
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-09-08 20:12:35 +0200
+
+ Translate menu entry.
+ 
+ This translates the GenericName entry using the translatable string
+ "The %s 3D video player" so that translations can be copied from the
+ *.po files.
+
+ src/bino.desktop | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit a1858665238f7b2b285b1ea585d339aa8cf3b5e0
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-09-08 20:05:33 +0200
+
+ Temporarily disable cs.po.
+
+ pkg/w32/bino.nsi | 6 +++---
+ po/LINGUAS | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 1bf0fb86253d1b5242acd6fb8a6d401415b3916f
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-09-08 20:01:13 +0200
+
+ Add README.FreeBSD.
+
+ Makefile.am | 2 +-
+ README.FreeBSD | 1 +
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit d84f6f9cce8835587fc1b2b20351027886579019
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-09-08 07:20:37 +0200
+
+ Fix mode of icon and menu cache files.
+ 
+ These should now be mode 644, like all installed files.
+
+ src/Makefile.am | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 8507c307eb9f509c3de2bef412b20b364b510393
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-09-08 06:59:18 +0200
+
+ configure.ac: tell which libraries/tools are optional and which are required.
+
+ configure.ac | 32 ++++++++++++++++----------------
+ 1 files changed, 16 insertions(+), 16 deletions(-)
+
+commit 13ae41235212eaf6f1f059f7341c053f7bc9a750
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-09-08 06:50:30 +0200
+
+ Install icons and add a menu entry.
+ 
+ This uses the freedesktop.org standards.
+
+ configure.ac | 8 +
+ src/Makefile.am | 31 +-
+ src/bino.desktop | 11 +
+ src/logo/16x16/bino.png | Bin 0 -> 714 bytes
+ src/logo/32x32/bino.png | Bin 0 -> 1698 bytes
+ src/logo/48x48/bino.png | Bin 0 -> 2554 bytes
+ src/logo/64x64/bino.png | Bin 0 -> 3914 bytes
+ src/logo/bino_logo_small.svg | 1011 ------------------------------------
+ src/logo/bino_logo_small_16x16.png | Bin 714 -> 0 bytes
+ src/logo/bino_logo_small_32x32.png | Bin 1698 -> 0 bytes
+ src/logo/bino_logo_small_48x48.png | Bin 2554 -> 0 bytes
+ src/logo/bino_logo_small_64x64.png | Bin 3914 -> 0 bytes
+ src/logo/scalable/bino.svg | 1011 ++++++++++++++++++++++++++++++++++++
+ src/player_qt.cpp | 2 +-
+ src/video_output_qt.cpp | 2 +-
+ 15 files changed, 1056 insertions(+), 1020 deletions(-)
+
+commit f87b79ee7fa4482f38b794ed098cdd4047f8a0ce
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-09-06 21:37:50 +0200
+
+ configure.ac: remove obsolete code.
+ 
+ This should habe been part of commit 615fbd75811aea46c3423ed628d5fd0ee054ff6c
+ but was forgotten...
+
+ configure.ac | 6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+commit 3711bcff8d42b7ab8cdf7949085aa2ff79fb82ab
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-09-06 21:30:08 +0200
+
+ Bump version to 1.2.0.
+
+ AUTHORS | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 615fbd75811aea46c3423ed628d5fd0ee054ff6c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-09-06 20:44:24 +0200
+
+ configure.ac: improve check for X11 requirement.
+ 
+ This partially reverts commit b04d5201dad34f0bf181413d3027371bb6f8f46b:
+ now the old approach for testing the X11 requirement is used again, but with

bino-1.1.3.tar.bz2/Makefile.am -> bino-1.2.1.tar.bz2/Makefile.am Changed

bino-1.1.3.tar.bz2/Makefile.in -> bino-1.2.1.tar.bz2/Makefile.in Changed

@@ -136,7 +136,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
-CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -151,6 +150,7 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -192,6 +192,7 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+UPDATE_DESKTOP_DATABASE = @UPDATE_DESKTOP_DATABASE@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -234,6 +235,8 @@
 install_sh = @install_sh@
 libEqualizer_CFLAGS = @libEqualizer_CFLAGS@
 libEqualizer_LIBS = @libEqualizer_LIBS@
+libX11_CFLAGS = @libX11_CFLAGS@
+libX11_LIBS = @libX11_LIBS@
 libass_CFLAGS = @libass_CFLAGS@
 libass_LIBS = @libass_LIBS@
 libavdevice_CFLAGS = @libavdevice_CFLAGS@
@@ -242,6 +245,8 @@
 libavformat_LIBS = @libavformat_LIBS@
 libdir = @libdir@
 libexecdir = @libexecdir@
+libgl_CFLAGS = @libgl_CFLAGS@
+libgl_LIBS = @libgl_LIBS@
 libglew_CFLAGS = @libglew_CFLAGS@
 libglew_LIBS = @libglew_LIBS@
 liblircclient_CFLAGS = @liblircclient_CFLAGS@
@@ -279,8 +284,9 @@
 # Make a W32 installer using NSIS
 
 # Make a package for Mac OS X
-EXTRA_DIST = README.MacOSX README.Windows pkg/w32/bino.nsi \
-	pkg/w32/notes.txt pkg/macosx/README pkg/macosx/Bino.icns
+EXTRA_DIST = README.Linux README.FreeBSD README.MacOSX README.Windows \
+	pkg/w32/bino.nsi pkg/w32/notes.txt pkg/macosx/README \
+	pkg/macosx/Bino.icns
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

bino-1.2.1.tar.bz2/README.FreeBSD Added

bino-1.2.1.tar.bz2/README.Linux Added

@@ -0,0 +1,19 @@
+The free graphics drivers shipped with recent Linux kernel + Mesa + X.org
+combinations mostly work fine with Bino. Proprietary graphics drivers work too,
+but are *not* required!
+
+However, some free graphics drivers (especially older versions) still have some
+limitations. Here is a list of known problems:
+
+- Older drivers for Intel GMA and i965 graphics chips seem to cause Bino to crash.
+  This has been reported for Ubuntu 10.04 and 10.10, but it seems to be fixed in
+  11.04.
+
+- Bino relies on OpenGL SRGB textures for proper scaling of video frames.
+  Unfortunately some free graphics drivers (notably those for ATI cards) have
+  broken support for such textures. As a result, the video appears far too bright.
+  If this happens to you, you can set the environment variable
+  SRGB_TEXTURES_ARE_BROKEN, and Bino will work around that problem.  
+  See also these bug reports:
+  https://bugs.freedesktop.org/show_bug.cgi?id=32323
+  https://bugs.freedesktop.org/show_bug.cgi?id=36965

bino-1.1.3.tar.bz2/README.Windows -> bino-1.2.1.tar.bz2/README.Windows Changed

bino-1.1.3.tar.bz2/config.h.in -> bino-1.2.1.tar.bz2/config.h.in Changed

bino-1.1.3.tar.bz2/configure -> bino-1.2.1.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for Bino 1.1.3.
+# Generated by GNU Autoconf 2.67 for Bino 1.2.1.
 #
 # Report bugs to <bino-list@nongnu.org>.
 #
@@ -552,8 +552,8 @@
 # Identity of this package.
 PACKAGE_NAME='Bino'
 PACKAGE_TARNAME='bino'
-PACKAGE_VERSION='1.1.3'
-PACKAGE_STRING='Bino 1.1.3'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='Bino 1.2.1'
 PACKAGE_BUGREPORT='bino-list@nongnu.org'
 PACKAGE_URL='http://bino3d.org/'
 
@@ -599,22 +599,28 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+UPDATE_DESKTOP_DATABASE
+GTK_UPDATE_ICON_CACHE
 HAVE_LIBLIRCCLIENT_FALSE
 HAVE_LIBLIRCCLIENT_TRUE
 liblircclient_LIBS
 liblircclient_CFLAGS
+libgl_LIBS
+libgl_CFLAGS
 HAVE_LIBEQUALIZER_FALSE
 HAVE_LIBEQUALIZER_TRUE
 libglew_LIBS
 libglew_CFLAGS
 libEqualizer_LIBS
 libEqualizer_CFLAGS
+libX11_LIBS
+libX11_CFLAGS
 ac_ct_MOC
-MOC
 ac_ct_RCC
-RCC
 libqtopengl_LIBS
 libqtopengl_CFLAGS
+MOC
+RCC
 libopenal_LIBS
 libopenal_CFLAGS
 libass_LIBS
@@ -632,10 +638,7 @@
 LTLIBINTL
 LIBINTL
 INTLLIBS
-LTLIBICONV
-LIBICONV
 INTL_MACOSX_LIBS
-CXXCPP
 XGETTEXT_EXTRA_OPTIONS
 MSGMERGE
 XGETTEXT_015
@@ -646,6 +649,8 @@
 MSGFMT
 GETTEXT_MACRO_VERSION
 USE_NLS
+LTLIBICONV
+LIBICONV
 W32_FALSE
 W32_TRUE
 HAVE_MAKENSIS_FALSE
@@ -761,10 +766,10 @@
 enable_dependency_tracking
 enable_silent_rules
 enable_debug
-enable_nls
 with_gnu_ld
 enable_rpath
 with_libiconv_prefix
+enable_nls
 with_libintl_prefix
 with_equalizer
 with_liblircclient
@@ -781,7 +786,6 @@
 CXX
 CXXFLAGS
 CCC
-CXXCPP
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
@@ -795,16 +799,22 @@
 libass_LIBS
 libopenal_CFLAGS
 libopenal_LIBS
-libqtopengl_CFLAGS
-libqtopengl_LIBS
 RCC
 MOC
+libqtopengl_CFLAGS
+libqtopengl_LIBS
+libX11_CFLAGS
+libX11_LIBS
 libEqualizer_CFLAGS
 libEqualizer_LIBS
 libglew_CFLAGS
 libglew_LIBS
+libgl_CFLAGS
+libgl_LIBS
 liblircclient_CFLAGS
-liblircclient_LIBS'
+liblircclient_LIBS
+GTK_UPDATE_ICON_CACHE
+UPDATE_DESKTOP_DATABASE'
 
 
 # Initialize some variables set by options.
@@ -1347,7 +1357,7 @@
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.
 cat <<_ACEOF
-\`configure' configures Bino 1.1.3 to adapt to many kinds of systems.
+\`configure' configures Bino 1.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1418,7 +1428,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of Bino 1.1.3:";;
+ short | recursive ) echo "Configuration of Bino 1.2.1:";;
 esac
 cat <<\_ACEOF
 
@@ -1432,8 +1442,8 @@
 --enable-silent-rules less verbose build output (undo: `make V=1')
 --disable-silent-rules verbose build output (undo: `make V=0')
 --enable-debug Enable debugging checks. Disabled by default.
- --disable-nls do not use Native Language Support
 --disable-rpath do not hardcode runtime library paths
+ --disable-nls do not use Native Language Support
 
 Optional Packages:
 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1459,7 +1469,6 @@
 CPP C preprocessor
 CXX C++ compiler command
 CXXFLAGS C++ compiler flags
- CXXCPP C++ preprocessor
 PKG_CONFIG path to pkg-config utility
 PKG_CONFIG_PATH
 directories to add to pkg-config's search path
@@ -1484,12 +1493,15 @@
 C compiler flags for libopenal, overriding pkg-config
 libopenal_LIBS
 linker flags for libopenal, overriding pkg-config
+ RCC rcc command
+ MOC moc command
 libqtopengl_CFLAGS
 C compiler flags for libqtopengl, overriding pkg-config
 libqtopengl_LIBS
 linker flags for libqtopengl, overriding pkg-config
- RCC rcc command
- MOC moc command
+ libX11_CFLAGS
+ C compiler flags for libX11, overriding pkg-config
+ libX11_LIBS linker flags for libX11, overriding pkg-config
 libEqualizer_CFLAGS
 C compiler flags for libEqualizer, overriding pkg-config
 libEqualizer_LIBS
@@ -1498,10 +1510,17 @@
 C compiler flags for libglew, overriding pkg-config
 libglew_LIBS
 linker flags for libglew, overriding pkg-config
+ libgl_CFLAGS
+ C compiler flags for libgl, overriding pkg-config
+ libgl_LIBS linker flags for libgl, overriding pkg-config
 liblircclient_CFLAGS
 C compiler flags for liblircclient, overriding pkg-config
 liblircclient_LIBS
 linker flags for liblircclient, overriding pkg-config
+ GTK_UPDATE_ICON_CACHE
+ gtk-update-icon-cache command
+ UPDATE_DESKTOP_DATABASE
+ update-desktop-database command
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1570,7 +1589,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-Bino configure 1.1.3
+Bino configure 1.2.1
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2062,20 +2081,21 @@
 
 } # ac_fn_cxx_check_func

bino-1.1.3.tar.bz2/configure.ac -> bino-1.2.1.tar.bz2/configure.ac Changed

@@ -22,7 +22,7 @@
 
 dnl Autotools init stuff
 AC_PREREQ([2.65])
-AC_INIT([Bino], [1.1.3], [bino-list@nongnu.org], [bino], [http://bino3d.org/])
+AC_INIT([Bino], [1.2.1], [bino-list@nongnu.org], [bino], [http://bino3d.org/])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
@@ -52,7 +52,7 @@
 fi
 AC_CHECK_TOOL([MAKENSIS], [makensis], [:])
 if test "$MAKENSIS" = ":"; then
- AC_MSG_WARN([makensis not found: you will not be able to create a W32 installer])
+ AC_MSG_WARN([optional tool makensis not found])
 fi
 else
 MAKENSIS=":"
@@ -80,12 +80,18 @@
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [], [CPPFLAGS="$CPPFLAGS_bak"; LDFLAGS="$LDFLAGS_bak"])
 
 dnl Gettext
+AC_LANG_PUSH([C])
+AM_ICONV([])
+if test "$am_cv_func_iconv" != "yes"; then
+ AC_MSG_WARN([required library libiconv not found])
+fi
 AM_GNU_GETTEXT([external])
+AC_LANG_POP([C])
 
 dnl pkg-config (required to detect libraries)
 PKG_PROG_PKG_CONFIG([])
 if test -z "$PKG_CONFIG"; then
- AC_MSG_WARN([pkg-config not found])
+ AC_MSG_WARN([required tool pkg-config not found])
 AC_MSG_WARN([required libraries cannot be detected])
 AC_MSG_WARN([please install pkg-config; Debian package: pkg-config])
 fi
@@ -93,19 +99,19 @@
 dnl FFmpeg
 PKG_CHECK_MODULES([libavformat], [libavformat >= 52.110.0 libavcodec libavutil], [HAVE_LIBAVFORMAT=1], [HAVE_LIBAVFORMAT=0])
 if test "$HAVE_LIBAVFORMAT" != "1"; then
- AC_MSG_WARN([library libavformat >= 52.110.0 not found:])
+ AC_MSG_WARN([required library libavformat >= 52.110.0 not found:])
 AC_MSG_WARN([$libavformat_PKG_ERRORS])
 AC_MSG_WARN([libavformat >= 52.110.0 is provided by libav >= 0.7 or FFmpeg >= 0.7])
 fi
 PKG_CHECK_MODULES([libavdevice], [libavdevice >= 52.5.0], [HAVE_LIBAVDEVICE=1], [HAVE_LIBAVDEVICE=0])
 if test "$HAVE_LIBAVDEVICE" != "1"; then
- AC_MSG_WARN([library libavdevice >= 52.5.0 not found:])
+ AC_MSG_WARN([required library libavdevice >= 52.5.0 not found:])
 AC_MSG_WARN([$libavdevice_PKG_ERRORS])
 AC_MSG_WARN([libavdevice >= 52.5.0 is provided by libav >= 0.7 or FFmpeg >= 0.7])
 fi
 PKG_CHECK_MODULES([libswscale], [libswscale >= 0.14.1 libavutil], [HAVE_LIBSWSCALE=1], [HAVE_LIBSWSCALE=0])
 if test "$HAVE_LIBSWSCALE" != "1"; then
- AC_MSG_WARN([library libswscale >= 0.14.1 not found:])
+ AC_MSG_WARN([required library libswscale >= 0.14.1 not found:])
 AC_MSG_WARN([$libswscale_PKG_ERRORS])
 AC_MSG_WARN([libswscale >= 0.14.1 is provided by libav >= 0.7 or FFmpeg >= 0.7])
 fi
@@ -115,7 +121,7 @@
 LIBASS_PKGCONFIG_VERSION="\"\""
 PKG_CHECK_MODULES([libass], [libass >= 0.9.9], [HAVE_LIBASS=1], [HAVE_LIBASS=0])
 if test "$HAVE_LIBASS" != "1"; then
- AC_MSG_WARN([library libass not found:])
+ AC_MSG_WARN([required library libass not found:])
 AC_MSG_WARN([$libopenal_PKG_ERRORS])
 AC_MSG_WARN([libass is provided by LibASS; Debian package: libass-dev])
 else
@@ -126,24 +132,55 @@
 dnl OpenAL
 PKG_CHECK_MODULES([libopenal], [openal >= 0.0], [HAVE_LIBOPENAL=1], [HAVE_LIBOPENAL=0])
 if test "$HAVE_LIBOPENAL" != "1"; then
- AC_MSG_WARN([library libopenal not found:])
+ AC_MSG_WARN([required library libopenal not found:])
 AC_MSG_WARN([$libopenal_PKG_ERRORS])
 AC_MSG_WARN([libopenal is provided by OpenAL; Debian package: libopenal-dev])
 fi
 
 dnl Qt
+RCC=""
+AC_ARG_VAR([RCC], [rcc command])
+MOC=""
+AC_ARG_VAR([MOC], [moc command])
 PKG_CHECK_MODULES([libqtopengl], [QtOpenGL >= 0.0], [HAVE_LIBQTOPENGL=1], [HAVE_LIBQTOPENGL=0])
 if test "$HAVE_LIBQTOPENGL" != "1"; then
- AC_MSG_WARN([library QtOpenGL not found:])
+ AC_MSG_WARN([required library QtOpenGL not found:])
 AC_MSG_WARN([$libqtopengl_PKG_ERRORS])
 AC_MSG_WARN([QtOpenGL is provided by Qt; Debian package: libqt4-opengl-dev])
+else
+ AC_CHECK_TOOLS([RCC], [rcc-qt4 rcc])
+ AC_CHECK_TOOLS([MOC], [moc-qt4 moc])
+ if test -z "$RCC" -o -z "$MOC"; then
+ AC_MSG_WARN([required tools rcc and/or moc not found; QtOpenGL not usable])
+ HAVE_LIBQTOPENGL="0"
+ fi
+fi
+if test "$HAVE_LIBQTOPENGL" = "1"; then
+ dnl When running on X11, we need to link with -lX11 explicitly since we use X functions directly
+ AC_MSG_CHECKING([whether we need to link with X11])
+ CPPFLAGS_BAK="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $libqtopengl_CFLAGS"
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[
+	 #include <QGLWidget>
+	 #ifndef Q_WS_X11
+	 error: No X11
+	 #endif]],
+	[[int x = 0;]])],
+	[NEED_LIBX11="yes"],[NEED_LIBX11="no"])
+ CPPFLAGS="$CPPFLAGS_BAK"
+ AC_MSG_RESULT([$NEED_LIBX11])
+ if test "$NEED_LIBX11" = "yes"; then
+ PKG_CHECK_MODULES([libX11], [x11 >= 0.0], [HAVE_LIBX11=1], [HAVE_LIBX11=0])
+ if test "$HAVE_LIBX11" != "1"; then
+ AC_MSG_WARN([required library libX11 not found:])
+ AC_MSG_WARN([$libX11_PKG_ERRORS])
+ else
+ libqtopengl_CFLAGS="$libqtopengl_CFLAGS $libX11_CFLAGS"
+ libqtopengl_LIBS="$libqtopengl_LIBS $libX11_LIBS"
+ fi
+ fi
 fi
-RCC=""
-AC_ARG_VAR([RCC], [rcc command])
-AC_CHECK_TOOLS([RCC], [rcc-qt4 rcc])
-MOC=""
-AC_ARG_VAR([MOC], [moc command])
-AC_CHECK_TOOLS([MOC], [moc-qt4 moc])
 
 dnl Equalizer
 dnl We assume that Equalizer includes GLEW. If we don't use Equalizer, we need GLEW separately.
@@ -153,7 +190,7 @@
 if test "$equalizer" = "yes"; then
 PKG_CHECK_MODULES([libEqualizer], [Equalizer >= 0.9.3], [HAVE_LIBEQUALIZER=1], [HAVE_LIBEQUALIZER=0])
 if test "$HAVE_LIBEQUALIZER" != "1"; then
- AC_MSG_WARN([library libEqualizer not found:])
+ AC_MSG_WARN([optional library libEqualizer not found:])
 AC_MSG_WARN([$libEqualizer_PKG_ERRORS])
 AC_MSG_WARN([libEqualizer is provided by Equalizer])
 	equalizer="no"
@@ -164,7 +201,7 @@
 dnl glew
 PKG_CHECK_MODULES([libglew], [glew >= 1.5.0], [HAVE_LIBGLEW=1], [HAVE_LIBGLEW=0])
 if test "$HAVE_LIBGLEW" != "1"; then
- AC_MSG_WARN([library libglew >= 1.5.0 not found:])
+ AC_MSG_WARN([required library libglew >= 1.5.0 not found:])
 AC_MSG_WARN([$libglew_PKG_ERRORS])
 AC_MSG_WARN([libglew is provided by glew; Debian package: libglew-dev])
 fi
@@ -172,6 +209,12 @@
 AC_DEFINE_UNQUOTED([HAVE_LIBEQUALIZER], [$HAVE_LIBEQUALIZER], [Have Equalizer?])
 AM_CONDITIONAL([HAVE_LIBEQUALIZER], [test "$HAVE_LIBEQUALIZER" = "1"])
 
+dnl OpenGL
+dnl We need to explicitly link with OpenGL since we use its functions directly.
+dnl However, this is most probably not necessary on Windows and Mac OS X (for now),
+dnl so we just use a pkg-config check and ignore a failure.
+PKG_CHECK_MODULES([libgl], [gl >= 0.0], [HAVE_LIBGL=1], [HAVE_LIBGL=0])
+
 dnl LIRC
 LIBLIRCCLIENT_PKGCONFIG_VERSION="\"\""
 AC_ARG_WITH([liblircclient],
@@ -180,7 +223,7 @@
 if test "$lirc" = "yes"; then
 PKG_CHECK_MODULES([liblircclient], [liblircclient0 >= 0.0], [HAVE_LIBLIRCCLIENT=1], [HAVE_LIBLIRCCLIENT=0])
 if test "$HAVE_LIBLIRCCLIENT" != "1"; then
- AC_MSG_WARN([library liblircclient not found:])
+ AC_MSG_WARN([optional library liblircclient not found:])
 AC_MSG_WARN([$liblircclient_PKG_ERRORS])
 AC_MSG_WARN([liblircclient is provided by LIRC; Debian package: liblircclient-dev])
 	lirc="no"
@@ -194,8 +237,17 @@
 AC_DEFINE_UNQUOTED([LIBLIRCCLIENT_PKGCONFIG_VERSION], [$LIBLIRCCLIENT_PKGCONFIG_VERSION], [liblircclient version])
 AM_CONDITIONAL([HAVE_LIBLIRCCLIENT], [test "$HAVE_LIBLIRCCLIENT" = "1"])
 
+dnl Icon and Menu tools. It is ok if these are missing.
+GTK_UPDATE_ICON_CACHE=""
+AC_ARG_VAR([GTK_UPDATE_ICON_CACHE], [gtk-update-icon-cache command])
+AC_CHECK_PROGS([GTK_UPDATE_ICON_CACHE], [gtk-update-icon-cache])
+UPDATE_DESKTOP_DATABASE=""
+AC_ARG_VAR([UPDATE_DESKTOP_DATABASE], [update-desktop-database command])
+AC_CHECK_PROGS([UPDATE_DESKTOP_DATABASE], [update-desktop-database])
+
 dnl Check if all libraries were found
-if test "$HAVE_LIBAVFORMAT" != "1" \
+if test "$am_cv_func_iconv" != "yes" \
+ -o "$HAVE_LIBAVFORMAT" != "1" \
 -o "$HAVE_LIBAVDEVICE" != "1" \
 -o "$HAVE_LIBSWSCALE" != "1" \
 -o "$HAVE_LIBASS" != "1" \

bino-1.1.3.tar.bz2/doc/Makefile.am -> bino-1.2.1.tar.bz2/doc/Makefile.am Changed

bino-1.1.3.tar.bz2/doc/Makefile.in -> bino-1.2.1.tar.bz2/doc/Makefile.in Changed

@@ -36,7 +36,7 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = doc
-DIST_COMMON = $(bino_TEXINFOS) $(dist_doc_DATA) $(srcdir)/Makefile.am \
+DIST_COMMON = $(bino_TEXINFOS) $(dist_html_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/stamp-vti \
 	$(srcdir)/version.texi
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -72,7 +72,7 @@
 MAKEINFOHTML = $(MAKEINFO) --html
 DVIPS = dvips
 am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" \
-	"$(DESTDIR)$(docdir)"
+	"$(DESTDIR)$(htmldir)"
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -97,7 +97,7 @@
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
-DATA = $(dist_doc_DATA)
+DATA = $(dist_html_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -112,7 +112,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
-CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -127,6 +126,7 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -168,6 +168,7 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+UPDATE_DESKTOP_DATABASE = @UPDATE_DESKTOP_DATABASE@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -210,6 +211,8 @@
 install_sh = @install_sh@
 libEqualizer_CFLAGS = @libEqualizer_CFLAGS@
 libEqualizer_LIBS = @libEqualizer_LIBS@
+libX11_CFLAGS = @libX11_CFLAGS@
+libX11_LIBS = @libX11_LIBS@
 libass_CFLAGS = @libass_CFLAGS@
 libass_LIBS = @libass_LIBS@
 libavdevice_CFLAGS = @libavdevice_CFLAGS@
@@ -218,6 +221,8 @@
 libavformat_LIBS = @libavformat_LIBS@
 libdir = @libdir@
 libexecdir = @libexecdir@
+libgl_CFLAGS = @libgl_CFLAGS@
+libgl_LIBS = @libgl_LIBS@
 libglew_CFLAGS = @libglew_CFLAGS@
 libglew_LIBS = @libglew_LIBS@
 liblircclient_CFLAGS = @liblircclient_CFLAGS@
@@ -291,7 +296,7 @@
 
 bino_TEXINFOS = bino.texi $(IMAGES)
 AM_MAKEINFOHTMLFLAGS = --no-split
-dist_doc_DATA = bino.html $(IMAGES)
+dist_html_DATA = bino.html $(IMAGES)
 EXTRA_DIST = $(man_MANS)
 all: all-am
 
@@ -531,26 +536,26 @@
 	test -z "$$files" || { \
 	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
 	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
-install-dist_docDATA: $(dist_doc_DATA)
+install-dist_htmlDATA: $(dist_html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
-	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
+	@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
 	done
 
-uninstall-dist_docDATA:
+uninstall-dist_htmlDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+	@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(docdir)" && rm -f $$files
+	echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(htmldir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -608,7 +613,7 @@
 check: check-am
 all-am: Makefile $(INFO_DEPS) $(MANS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"; do \
+	for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(htmldir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -656,7 +661,7 @@
 
 info-am: $(INFO_DEPS)
 
-install-data-am: install-dist_docDATA install-info-am install-man
+install-data-am: install-dist_htmlDATA install-info-am install-man
 
 install-dvi: install-dvi-am
 
@@ -777,7 +782,7 @@
 
 ps-am: $(PSS)
 
-uninstall-am: uninstall-dist_docDATA uninstall-dvi-am \
+uninstall-am: uninstall-dist_htmlDATA uninstall-dvi-am \
 	uninstall-html-am uninstall-info-am uninstall-man \
 	uninstall-pdf-am uninstall-ps-am
 
@@ -788,7 +793,7 @@
 .PHONY: all all-am check check-am clean clean-aminfo clean-generic \
 	dist-info distclean distclean-generic distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-dist_docDATA install-dvi \
+	install-data-am install-dist_htmlDATA install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-man1 install-pdf install-pdf-am install-ps \
@@ -796,7 +801,7 @@
 	installdirs maintainer-clean maintainer-clean-aminfo \
 	maintainer-clean-generic maintainer-clean-vti mostlyclean \
 	mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-dist_docDATA \
+	pdf-am ps ps-am uninstall uninstall-am uninstall-dist_htmlDATA \
 	uninstall-dvi-am uninstall-html-am uninstall-info-am \
 	uninstall-man uninstall-man1 uninstall-pdf-am uninstall-ps-am

bino-1.1.3.tar.bz2/doc/bino.1 -> bino-1.2.1.tar.bz2/doc/bino.1 Changed

bino-1.1.3.tar.bz2/doc/bino.html -> bino-1.2.1.tar.bz2/doc/bino.html Changed

@@ -1,14 +1,14 @@
 <html lang="en">
 <head>
-<title>Bino 1.1.3</title>
+<title>Bino 1.2.1</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="Bino 1.1.3">
+<meta name="description" content="Bino 1.2.1">
 <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.1.3</h1>
+<h1 class="settitle">Bino 1.2.1</h1>
 <div class="node">
 <a name="Top"></a>
 <hr>
@@ -45,8 +45,8 @@
 
 <h2 class="unnumbered">Bino</h2>
 
-This manual was last updated 14 August 2011 for version
-1.1.3 of Bino.
+This manual was last updated 10 October 2011 for version
+1.2.1 of Bino.
 
 Copyright &copy; 2011
 Martin Lambers (<a href="mailto:marlam@marlam.de">marlam@marlam.de</a>),
@@ -124,11 +124,16 @@
 through stereopsis.
 
 The left and right view of a stereoscopic video can be stored using different
-layouts. Bino supports all commonly used layouts. See <a href="#Input-Layouts">Input Layouts</a>.
+layouts. Sometimes the two views are stored as two separate video streams, but
+most often both views are packed into a single video stream and need to be
+unpacked by the video player. Bino supports all commonly used layouts. 
+See <a href="#Input-Layouts">Input Layouts</a>.
 
- To display a stereoscopic video, the left and right view have to be prepared
-in a special way depending on the output display technique. Bino supports a
-wide variety of display techniques. See <a href="#Output-Techniques">Output Techniques</a>.
+ To display a stereoscopic video, the left and right view have to be prepared in
+a special way so that the left eye sees the left view and the right eye sees
+the right view. Different display techniques use different approaches to
+achieve this separation of the two views. Bino supports a wide variety of such
+techniques. See <a href="#Output-Techniques">Output Techniques</a>.
 
 <div class="node">
 <a name="Invocation"></a>
@@ -220,53 +225,53 @@
 <h3 class="section">3.2 Supported Input Layouts</h3>
 
 <dl>
-<dt><var>mono</var><dd>Single view (2D). 
+<dt><var>mono</var><dd>Single view (2D conventional video). 
 <img src="input-layout-mono.png" alt="input-layout-mono.png">
- <dt><var>separate-left-right</var><dd>Left/right view in separate streams, left first. 
+ <dt><var>separate-left-right</var><dd>Separate streams: left view first, right view second. 
 <img src="input-layout-separate-left-right.png" alt="input-layout-separate-left-right.png">
- <dt><var>separate-right-left</var><dd>Left/right view in separate streams, right first. 
+ <dt><var>separate-right-left</var><dd>Separate streams: right view first, left view second. 
 <img src="input-layout-separate-right-left.png" alt="input-layout-separate-right-left.png">
- <dt><var>top-bottom</var><dd>Left view top, right view bottom. 
+ <dt><var>top-bottom</var><dd>Single stream: left view top, right view bottom. 
 <img src="input-layout-top-bottom.png" alt="input-layout-top-bottom.png">
- <dt><var>top-bottom-half</var><dd>Left view top, right view bottom, half height. 
+ <dt><var>top-bottom-half</var><dd>Single stream: left view top, right view bottom, both with half height. 
 <img src="input-layout-top-bottom-half.png" alt="input-layout-top-bottom-half.png">
- <dt><var>bottom-top</var><dd>Left view bottom, right view top. 
+ <dt><var>bottom-top</var><dd>Single stream: right view top, left view bottom. 
 <img src="input-layout-bottom-top.png" alt="input-layout-bottom-top.png">
- <dt><var>bottom-top-half</var><dd>Left view bottom, right view top, half height. 
+ <dt><var>bottom-top-half</var><dd>Single stream: right view top, left view bottom, both with half height. 
 <img src="input-layout-bottom-top-half.png" alt="input-layout-bottom-top-half.png">
- <dt><var>left-right</var><dd>Left view left, right view right. 
+ <dt><var>left-right</var><dd>Single stream: left view left, right view right. 
 <img src="input-layout-left-right.png" alt="input-layout-left-right.png">
- <dt><var>left-right-half</var><dd>Left view left, right view right, half width. 
+ <dt><var>left-right-half</var><dd>Single stream: left view left, right view right, both with half width. 
 <img src="input-layout-left-right-half.png" alt="input-layout-left-right-half.png">
- <dt><var>right-left</var><dd>Left view right, right view left. 
+ <dt><var>right-left</var><dd>Single stream: right view left, left view right. 
 <img src="input-layout-right-left.png" alt="input-layout-right-left.png">
- <dt><var>right-left-half</var><dd>Left view right, right view left, half width. 
+ <dt><var>right-left-half</var><dd>Single stream: right view left, left view right, both with half width. 
 <img src="input-layout-right-left-half.png" alt="input-layout-right-left-half.png">
- <dt><var>even-odd-rows</var><dd>Left view even rows, right view odd rows. 
+ <dt><var>even-odd-rows</var><dd>Single stream: left view in even rows, right view in odd rows. 
 <img src="input-layout-even-odd-rows.png" alt="input-layout-even-odd-rows.png">
- <dt><var>odd-even-rows</var><dd>Left view odd rows, right view even rows. 
+ <dt><var>odd-even-rows</var><dd>Single stream: right view in even rows, left view in odd rows. 
 <img src="input-layout-odd-even-rows.png" alt="input-layout-odd-even-rows.png">
 </dl>
 
 <h3 class="section">3.3 File Name Conventions</h3>
 
-<a name="File-Name-Conventions"></a>If the meta data stored in a file does not indicate its stereoscopic layout,
-Bino tries to guess it by looking at the last part of the file name before
-the file name extension (<samp>.ext</samp>).
+<a name="File-Name-Conventions"></a>If the meta data stored in a file does not indicate the input layout, Bino
+tries to guess it by looking at the last part of the file name before the file
+name extension (<samp>.ext</samp>).
 
 The following file name forms are recognized:
 <dl>
-<dt><samp>*-lr.ext</samp><dd><var>left-right</var>
- <dt><samp>*-lrh.ext</samp><dt><samp>*-lrq.ext</samp><dd><var>left-right-half</var>
- <dt><samp>*-rl.ext</samp><dd><var>right-left</var>
- <dt><samp>*-rlh.ext</samp><dt><samp>*-rlq.ext</samp><dd><var>right-left-half</var>
- <dt><samp>*-tb.ext</samp><dt><samp>*-ab.ext</samp><dd><var>top-bottom</var>
- <dt><samp>*-tbh.ext</samp><dt><samp>*-abq.ext</samp><dd><var>top-bottom-half</var>
- <dt><samp>*-bt.ext</samp><dt><samp>*-ba.ext</samp><dd><var>bottom-top</var>
- <dt><samp>*-bth.ext</samp><dt><samp>*-baq.ext</samp><dd><var>bottom-top-half</var>
- <dt><samp>*-eo.ext</samp><dt><samp>*-eoq.ext</samp><dt><samp>*-3dir.ext</samp><dd><var>even-odd-rows</var>
- <dt><samp>*-oe.ext</samp><dt><samp>*-oeq.ext</samp><dt><samp>*-3di.ext</samp><dd><var>odd-even-rows</var>
- <dt><samp>*-2d.ext</samp><dd><var>mono</var>
+<dt><samp>*-lr.ext</samp><dd>Input layout <var>left-right</var>. 
+ <dt><samp>*-lrh.ext</samp><dt><samp>*-lrq.ext</samp><dd>Input layout <var>left-right-half</var>. 
+ <dt><samp>*-rl.ext</samp><dd>Input layout <var>right-left</var>. 
+ <dt><samp>*-rlh.ext</samp><dt><samp>*-rlq.ext</samp><dd>Input layout <var>right-left-half</var>. 
+ <dt><samp>*-tb.ext</samp><dt><samp>*-ab.ext</samp><dd>Input layout <var>top-bottom</var>. 
+ <dt><samp>*-tbh.ext</samp><dt><samp>*-abq.ext</samp><dd>Input layout <var>top-bottom-half</var>. 
+ <dt><samp>*-bt.ext</samp><dt><samp>*-ba.ext</samp><dd>Input layout <var>bottom-top</var>. 
+ <dt><samp>*-bth.ext</samp><dt><samp>*-baq.ext</samp><dd>Input layout <var>bottom-top-half</var>. 
+ <dt><samp>*-eo.ext</samp><dt><samp>*-eoq.ext</samp><dt><samp>*-3dir.ext</samp><dd>Input layout <var>even-odd-rows</var>. 
+ <dt><samp>*-oe.ext</samp><dt><samp>*-oeq.ext</samp><dt><samp>*-3di.ext</samp><dd>Input layout <var>odd-even-rows</var>. 
+ <dt><samp>*-2d.ext</samp><dd>Input layout <var>mono</var>. 
 </dl>
 
 <div class="node">
@@ -284,27 +289,35 @@
 
 The left and right view of a stereoscopic video need to be displayed in a way
 that ensures that the left view is only seen by the left eye of the user and
-the right view is only seen by the right view. There are many different
-techniques to achieve this, and Bino supports most of them.
+the right view is only seen by the right eye. There are many different
+techniques to achieve this separation of left and right view, and Bino supports
+most of them.
 
 With some display techniques, some part of the right view may also seen by the
 left eye and vice versa. This is called crosstalk and leads to ghosting
-artefacts which reduce image quality. For some display types, Bino can reduce
+artefacts that reduce image quality. For some display types, Bino can reduce
 such artefacts. See <a href="#Crosstalk-Ghostbusting">Crosstalk Ghostbusting</a>.
 
- One of the simplest output technique are anaglyph glasses. These use color
-filters to separate the left and right view. Anaglyph glasses are cheap and
-work with every display, but the image quality is low.
+ One of the simplest output techniques is anaglyph glasses. Such glasses use
+color filters to separate the left and right view. Anaglyph glasses are cheap
+and work with every display, but the view separation and color reproduction are
+of relatively low quality. Still, depending on the video material, Bino can
+achieve high quality results using the
+<a href="http://www.site.uottawa.ca/~edubois/anaglyph/">Dubois method</a> to produce
+video output for anaglyph glasses.
 
 With OpenGL, the default method to display stereoscopic 3D content is OpenGL
-quad buffered stereo, often used with shutter glasses. However, graphics card
-manufacturers tend to enable this output technique only on expensive high end
-hardware.
+quad buffered stereo, often used with active shutter glasses. However, graphics
+card manufacturers tend to enable this output technique only on expensive high
+end hardware.
 
- Most types of 3D computer displays expect left and right view packed in a
+ Many 3D computer displays use polarized glasses to separate left and right
+view, and some autostereoscopic displays do not require any glasses at all. 
+Most of these 3D computer displays expect left and right view packed in a
 single video frame, e.g. on top of each other or next to each other or
-partitioned into even and odd pixel lines or columns. Refer to the manual of
-your display to find out which output technique is required.
+partitioned into even and odd pixel lines or columns. Bino supports all
+variants of such modes; refer to the manual of your display to find out which
+mode is required.
 
 Another common way to display 3D stereoscopic content is to use two
 conventional 2D displays or projectors for the left and right view and combine
@@ -312,7 +325,7 @@
 polarized glasses. This is supported in Bino using multiscreen output. 
 See <a href="#Basic-Multi-Display-Support">Basic Multi Display Support</a>.
 
- For more complex setups such as powerwalls or virtual reality installations
+ For more complex setups, such as powerwalls or virtual reality installations
 driven by render clusters, Bino supports distributed video rendering via
 Equalizer. See <a href="#Advanced-Multi-Display-Support">Advanced Multi Display Support</a>.
 
@@ -328,17 +341,17 @@
 <img src="output-type-mono-right.png" alt="output-type-mono-right.png">

bino-1.1.3.tar.bz2/doc/bino.info -> bino-1.2.1.tar.bz2/doc/bino.info Changed

@@ -1,7 +1,7 @@
 This is ../../sources/bino/doc/bino.info, produced by makeinfo version
 4.13 from ../../sources/bino/doc/bino.texi.
 
-This manual was last updated 14 August 2011 for version 1.1.3 of Bino.
+This manual was last updated 10 October 2011 for version 1.2.1 of Bino.
 
 Copyright (C) 2011 Martin Lambers (<marlam@marlam.de>), Stefan
 Eilemann (<eile@eyescale.ch>), Frédéric Devernay
@@ -23,7 +23,7 @@
 Bino
 ****
 
-This manual was last updated 14 August 2011 for version 1.1.3 of Bino.
+This manual was last updated 10 October 2011 for version 1.2.1 of Bino.
 
 Copyright (C) 2011 Martin Lambers (<marlam@marlam.de>), Stefan
 Eilemann (<eile@eyescale.ch>), Frédéric Devernay
@@ -56,13 +56,16 @@
 depth perception through stereopsis.
 
 The left and right view of a stereoscopic video can be stored using
-different layouts. Bino supports all commonly used layouts. *Note Input
-Layouts::.
+different layouts. Sometimes the two views are stored as two separate
+video streams, but most often both views are packed into a single video
+stream and need to be unpacked by the video player. Bino supports all
+commonly used layouts. *Note Input Layouts::.
 
 To display a stereoscopic video, the left and right view have to be
-prepared in a special way depending on the output display technique.
-Bino supports a wide variety of display techniques. *Note Output
-Techniques::.
+prepared in a special way so that the left eye sees the left view and
+the right eye sees the right view. Different display techniques use
+different approaches to achieve this separation of the two views. Bino
+supports a wide variety of such techniques. *Note Output Techniques::.
 
 &#x1f;
 File: bino.info, Node: Invocation, Next: Input Layouts, Prev: Introduction, Up: Top
@@ -224,82 +227,111 @@
 ===========================
 
 MONO
- Single view (2D).
+ Single view (2D conventional video).
+ &#x0;&#x8;[image src="input-layout-mono.png"&#x0;&#x8;]
+
 SEPARATE-LEFT-RIGHT
- Left/right view in separate streams, left first.
+ Separate streams: left view first, right view second.
+ &#x0;&#x8;[image src="input-layout-separate-left-right.png"&#x0;&#x8;]
+
 SEPARATE-RIGHT-LEFT
- Left/right view in separate streams, right first.
+ Separate streams: right view first, left view second.
+ &#x0;&#x8;[image src="input-layout-separate-right-left.png"&#x0;&#x8;]
+
 TOP-BOTTOM
- Left view top, right view bottom.
+ Single stream: left view top, right view bottom.
+ &#x0;&#x8;[image src="input-layout-top-bottom.png"&#x0;&#x8;]
+
 TOP-BOTTOM-HALF
- Left view top, right view bottom, half height.
+ Single stream: left view top, right view bottom, both with half
+ height.
+ &#x0;&#x8;[image src="input-layout-top-bottom-half.png"&#x0;&#x8;]
+
 BOTTOM-TOP
- Left view bottom, right view top.
+ Single stream: right view top, left view bottom.
+ &#x0;&#x8;[image src="input-layout-bottom-top.png"&#x0;&#x8;]
+
 BOTTOM-TOP-HALF
- Left view bottom, right view top, half height.
+ Single stream: right view top, left view bottom, both with half
+ height.
+ &#x0;&#x8;[image src="input-layout-bottom-top-half.png"&#x0;&#x8;]
+
 LEFT-RIGHT
- Left view left, right view right.
+ Single stream: left view left, right view right.
+ &#x0;&#x8;[image src="input-layout-left-right.png"&#x0;&#x8;]
+
 LEFT-RIGHT-HALF
- Left view left, right view right, half width.
+ Single stream: left view left, right view right, both with half
+ width.
+ &#x0;&#x8;[image src="input-layout-left-right-half.png"&#x0;&#x8;]
+
 RIGHT-LEFT
- Left view right, right view left.
+ Single stream: right view left, left view right.
+ &#x0;&#x8;[image src="input-layout-right-left.png"&#x0;&#x8;]
+
 RIGHT-LEFT-HALF
- Left view right, right view left, half width.
+ Single stream: right view left, left view right, both with half
+ width.
+ &#x0;&#x8;[image src="input-layout-right-left-half.png"&#x0;&#x8;]
+
 EVEN-ODD-ROWS
- Left view even rows, right view odd rows.
+ Single stream: left view in even rows, right view in odd rows.
+ &#x0;&#x8;[image src="input-layout-even-odd-rows.png"&#x0;&#x8;]
+
 ODD-EVEN-ROWS
- Left view odd rows, right view even rows.
+ Single stream: right view in even rows, left view in odd rows.
+ &#x0;&#x8;[image src="input-layout-odd-even-rows.png"&#x0;&#x8;]
 
 3.3 File Name Conventions
 =========================
 
-If the meta data stored in a file does not indicate its stereoscopic
-layout, Bino tries to guess it by looking at the last part of the file
-name before the file name extension (`.ext').
+If the meta data stored in a file does not indicate the input layout,
+Bino tries to guess it by looking at the last part of the file name
+before the file name extension (`.ext').
 
 The following file name forms are recognized:
 `*-lr.ext'
- LEFT-RIGHT
+ Input layout LEFT-RIGHT.
 
 `*-lrh.ext'
 `*-lrq.ext'
- LEFT-RIGHT-HALF
+ Input layout LEFT-RIGHT-HALF.
 
 `*-rl.ext'
- RIGHT-LEFT
+ Input layout RIGHT-LEFT.
 
 `*-rlh.ext'
 `*-rlq.ext'
- RIGHT-LEFT-HALF
+ Input layout RIGHT-LEFT-HALF.
 
 `*-tb.ext'
 `*-ab.ext'
- TOP-BOTTOM
+ Input layout TOP-BOTTOM.
 
 `*-tbh.ext'
 `*-abq.ext'
- TOP-BOTTOM-HALF
+ Input layout TOP-BOTTOM-HALF.
 
 `*-bt.ext'
 `*-ba.ext'
- BOTTOM-TOP
+ Input layout BOTTOM-TOP.
 
 `*-bth.ext'
 `*-baq.ext'
- BOTTOM-TOP-HALF
+ Input layout BOTTOM-TOP-HALF.
 
 `*-eo.ext'
 `*-eoq.ext'
 `*-3dir.ext'
- EVEN-ODD-ROWS
+ Input layout EVEN-ODD-ROWS.
 
 `*-oe.ext'
 `*-oeq.ext'
 `*-3di.ext'
- ODD-EVEN-ROWS
+ Input layout ODD-EVEN-ROWS.
 
 `*-2d.ext'
- MONO
+ Input layout MONO.
 
 &#x1f;
 File: bino.info, Node: Output Techniques, Next: Interactive Control, Prev: Input Layouts, Up: Top
@@ -312,29 +344,35 @@
 
 The left and right view of a stereoscopic video need to be displayed in
 a way that ensures that the left view is only seen by the left eye of
-the user and the right view is only seen by the right view. There are
-many different techniques to achieve this, and Bino supports most of
-them.
+the user and the right view is only seen by the right eye. There are
+many different techniques to achieve this separation of left and right
+view, and Bino supports most of them.
 
 With some display techniques, some part of the right view may also
 seen by the left eye and vice versa. This is called crosstalk and leads
-to ghosting artefacts which reduce image quality. For some display
+to ghosting artefacts that reduce image quality. For some display
 types, Bino can reduce such artefacts. *Note Crosstalk Ghostbusting::.
 
- One of the simplest output technique are anaglyph glasses. These use
-color filters to separate the left and right view. Anaglyph glasses are
-cheap and work with every display, but the image quality is low.
+ One of the simplest output techniques is anaglyph glasses. Such

bino-1.1.3.tar.bz2/doc/bino.texi -> bino-1.2.1.tar.bz2/doc/bino.texi Changed

@@ -74,11 +74,16 @@
 through stereopsis.
 
 The left and right view of a stereoscopic video can be stored using different
-layouts. Bino supports all commonly used layouts. @xref{Input Layouts}.
+layouts. Sometimes the two views are stored as two separate video streams, but
+most often both views are packed into a single video stream and need to be
+unpacked by the video player. Bino supports all commonly used layouts.
+@xref{Input Layouts}.
 
-To display a stereoscopic video, the left and right view have to be prepared
-in a special way depending on the output display technique. Bino supports a
-wide variety of display techniques. @xref{Output Techniques}.
+To display a stereoscopic video, the left and right view have to be prepared in
+a special way so that the left eye sees the left view and the right eye sees
+the right view. Different display techniques use different approaches to
+achieve this separation of the two views. Bino supports a wide variety of such
+techniques. @xref{Output Techniques}.
 
 @node Invocation
 @chapter Invocation
@@ -202,87 +207,87 @@
 
 @table @var
 @item mono
-Single view (2D).@*
+Single view (2D conventional video).@*
 @image{input-layout-mono,,,,png}
 @item separate-left-right
-Left/right view in separate streams, left first.@*
+Separate streams: left view first, right view second.@*
 @image{input-layout-separate-left-right,,,,png}
 @item separate-right-left
-Left/right view in separate streams, right first.@*
+Separate streams: right view first, left view second.@*
 @image{input-layout-separate-right-left,,,,png}
 @item top-bottom
-Left view top, right view bottom.@*
+Single stream: left view top, right view bottom.@*
 @image{input-layout-top-bottom,,,,png}
 @item top-bottom-half
-Left view top, right view bottom, half height.@*
+Single stream: left view top, right view bottom, both with half height.@*
 @image{input-layout-top-bottom-half,,,,png}
 @item bottom-top
-Left view bottom, right view top.@*
+Single stream: right view top, left view bottom.@*
 @image{input-layout-bottom-top,,,,png}
 @item bottom-top-half
-Left view bottom, right view top, half height.@*
+Single stream: right view top, left view bottom, both with half height.@*
 @image{input-layout-bottom-top-half,,,,png}
 @item left-right
-Left view left, right view right.@*
+Single stream: left view left, right view right.@*
 @image{input-layout-left-right,,,,png}
 @item left-right-half
-Left view left, right view right, half width.@*
+Single stream: left view left, right view right, both with half width.@*
 @image{input-layout-left-right-half,,,,png}
 @item right-left
-Left view right, right view left.@*
+Single stream: right view left, left view right.@*
 @image{input-layout-right-left,,,,png}
 @item right-left-half
-Left view right, right view left, half width.@*
+Single stream: right view left, left view right, both with half width.@*
 @image{input-layout-right-left-half,,,,png}
 @item even-odd-rows
-Left view even rows, right view odd rows.@*
+Single stream: left view in even rows, right view in odd rows.@*
 @image{input-layout-even-odd-rows,,,,png}
 @item odd-even-rows
-Left view odd rows, right view even rows.@*
+Single stream: right view in even rows, left view in odd rows.@*
 @image{input-layout-odd-even-rows,,,,png}
 @end table
 
 @section File Name Conventions
 @anchor{File Name Conventions}
 
-If the meta data stored in a file does not indicate its stereoscopic layout,
-Bino tries to guess it by looking at the last part of the file name before
-the file name extension (@file{.ext}).
+If the meta data stored in a file does not indicate the input layout, Bino
+tries to guess it by looking at the last part of the file name before the file
+name extension (@file{.ext}).
 
 The following file name forms are recognized:
 @table @file
 @item *-lr.ext
-@var{left-right}
+Input layout @var{left-right}.
 @item *-lrh.ext
 @itemx *-lrq.ext
-@var{left-right-half}
+Input layout @var{left-right-half}.
 @item *-rl.ext
-@var{right-left}
+Input layout @var{right-left}.
 @item *-rlh.ext
 @itemx *-rlq.ext
-@var{right-left-half}
+Input layout @var{right-left-half}.
 @item *-tb.ext
 @itemx *-ab.ext
-@var{top-bottom}
+Input layout @var{top-bottom}.
 @item *-tbh.ext
 @itemx *-abq.ext
-@var{top-bottom-half}
+Input layout @var{top-bottom-half}.
 @item *-bt.ext
 @itemx *-ba.ext
-@var{bottom-top}
+Input layout @var{bottom-top}.
 @item *-bth.ext
 @itemx *-baq.ext
-@var{bottom-top-half}
+Input layout @var{bottom-top-half}.
 @item *-eo.ext
 @itemx *-eoq.ext
 @itemx *-3dir.ext
-@var{even-odd-rows}
+Input layout @var{even-odd-rows}.
 @item *-oe.ext
 @itemx *-oeq.ext
 @itemx *-3di.ext
-@var{odd-even-rows}
+Input layout @var{odd-even-rows}.
 @item *-2d.ext
-@var{mono}
+Input layout @var{mono}.
 @end table
 
 
@@ -293,27 +298,35 @@
 
 The left and right view of a stereoscopic video need to be displayed in a way
 that ensures that the left view is only seen by the left eye of the user and
-the right view is only seen by the right view. There are many different
-techniques to achieve this, and Bino supports most of them.
+the right view is only seen by the right eye. There are many different
+techniques to achieve this separation of left and right view, and Bino supports
+most of them.
 
 With some display techniques, some part of the right view may also seen by the
 left eye and vice versa. This is called crosstalk and leads to ghosting
-artefacts which reduce image quality. For some display types, Bino can reduce
+artefacts that reduce image quality. For some display types, Bino can reduce
 such artefacts. @xref{Crosstalk Ghostbusting}.
 
-One of the simplest output technique are anaglyph glasses. These use color
-filters to separate the left and right view. Anaglyph glasses are cheap and
-work with every display, but the image quality is low.
+One of the simplest output techniques is anaglyph glasses. Such glasses use
+color filters to separate the left and right view. Anaglyph glasses are cheap
+and work with every display, but the view separation and color reproduction are
+of relatively low quality. Still, depending on the video material, Bino can
+achieve high quality results using the
+@url{http://www.site.uottawa.ca/~edubois/anaglyph/,Dubois method} to produce
+video output for anaglyph glasses.
 
 With OpenGL, the default method to display stereoscopic 3D content is OpenGL
-quad buffered stereo, often used with shutter glasses. However, graphics card
-manufacturers tend to enable this output technique only on expensive high end
-hardware.
+quad buffered stereo, often used with active shutter glasses. However, graphics
+card manufacturers tend to enable this output technique only on expensive high
+end hardware.
 
-Most types of 3D computer displays expect left and right view packed in a
+Many 3D computer displays use polarized glasses to separate left and right
+view, and some autostereoscopic displays do not require any glasses at all.
+Most of these 3D computer displays expect left and right view packed in a
 single video frame, e.g. on top of each other or next to each other or
-partitioned into even and odd pixel lines or columns. Refer to the manual of
-your display to find out which output technique is required.
+partitioned into even and odd pixel lines or columns. Bino supports all
+variants of such modes; refer to the manual of your display to find out which
+mode is required.
 
 Another common way to display 3D stereoscopic content is to use two
 conventional 2D displays or projectors for the left and right view and combine
@@ -321,7 +334,7 @@
 polarized glasses. This is supported in Bino using multiscreen output.
 @xref{Basic Multi Display Support}.
 
-For more complex setups such as powerwalls or virtual reality installations
+For more complex setups, such as powerwalls or virtual reality installations
 driven by render clusters, Bino supports distributed video rendering via
 Equalizer. @xref{Advanced Multi Display Support}.
 
@@ -341,22 +354,22 @@
 Left view top, right view bottom.@*
 @image{output-type-top-bottom,,,,png}
 @item top-bottom-half
-Left view top, right view bottom, half height.@*
+Left view top, right view bottom, both with half height.@*
 @image{output-type-top-bottom-half,,,,png}

bino-1.1.3.tar.bz2/doc/stamp-vti -> bino-1.2.1.tar.bz2/doc/stamp-vti Changed

bino-1.1.3.tar.bz2/doc/version.texi -> bino-1.2.1.tar.bz2/doc/version.texi Changed

bino-1.1.3.tar.bz2/po/POTFILES.in -> bino-1.2.1.tar.bz2/po/POTFILES.in Changed

bino-1.1.3.tar.bz2/po/bino.pot -> bino-1.2.1.tar.bz2/po/bino.pot Changed

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: bino 1.1.3\n"
+"Project-Id-Version: bino 1.2.1\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2011-08-14 01:38+0200\n"
+"POT-Creation-Date: 2011-10-10 21:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -131,7 +131,7 @@
 msgid "Cannot cancel thread: %s"
 msgstr ""
 
-#: src/base/timer.cpp:52 src/base/timer.cpp:64 src/base/timer.cpp:78
+#: src/base/timer.cpp:69 src/base/timer.cpp:81 src/base/timer.cpp:95
 msgid "Cannot get time."
 msgstr ""
 
@@ -196,15 +196,45 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr ""
 
-#: src/lib_versions.cpp:121 src/lib_versions.cpp:155 src/media_data.cpp:422
+#: src/lib_versions.cpp:121 src/lib_versions.cpp:158 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:179 src/lib_versions.cpp:191
+#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
 msgid "not used"
 msgstr ""
 
+#: src/lirc.cpp:63
+msgid "Cannot initialize LIRC."
+msgstr ""
+
+#: src/lirc.cpp:69
+msgid "Cannot set LIRC socket properties."
+msgstr ""
+
+#: src/lirc.cpp:76
+msgid "Cannot read LIRC default configuration."
+msgstr ""
+
+#: src/lirc.cpp:91
+#, c-format
+msgid "Cannot read LIRC configuration file %s."
+msgstr ""
+
+#: src/lirc.cpp:140
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr ""
+
+#: src/lirc.cpp:154
+#, c-format
+msgid "Received invalid command '%s' from LIRC."
+msgstr ""
+
+#: src/lirc.cpp:164
+msgid "Cannot get command for LIRC code."
+msgstr ""
+
 #: src/main.cpp:325
 #, c-format
 msgid "%s version %s"
@@ -221,11 +251,11 @@
 "permitted by law."
 msgstr ""
 
-#: src/main.cpp:330 src/player_qt.cpp:2903
+#: src/main.cpp:330 src/player_qt.cpp:2958
 msgid "Platform:"
 msgstr ""
 
-#: src/main.cpp:332 src/player_qt.cpp:2904
+#: src/main.cpp:332 src/player_qt.cpp:2959
 msgid "Libraries used:"
 msgstr ""
 
@@ -370,155 +400,160 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr ""
 
-#: src/media_input.cpp:286 src/player_qt.cpp:187
+#: src/media_input.cpp:277 src/player_qt.cpp:187
 msgid "Input:"
 msgstr ""
 
-#: src/media_input.cpp:291
+#: src/media_input.cpp:282
 #, c-format
 msgid "Video %s: %s"
 msgstr ""
 
-#: src/media_input.cpp:296
+#: src/media_input.cpp:287
 msgid "No video."
 msgstr ""
 
-#: src/media_input.cpp:302
+#: src/media_input.cpp:293
 #, c-format
 msgid "Audio %s: %s"
 msgstr ""
 
-#: src/media_input.cpp:307
+#: src/media_input.cpp:298
 msgid "No audio."
 msgstr ""
 
-#: src/media_input.cpp:313
+#: src/media_input.cpp:304
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr ""
 
-#: src/media_input.cpp:318
+#: src/media_input.cpp:309
 msgid "No subtitle."
 msgstr ""
 
-#: src/media_input.cpp:320
+#: src/media_input.cpp:311
 #, c-format
 msgid "Duration: %g seconds"
 msgstr ""
 
-#: src/media_input.cpp:323
+#: src/media_input.cpp:314
 #, c-format
 msgid "Stereo layout: %s"
 msgstr ""
 
-#: src/media_object.cpp:608
+#: src/media_object.cpp:371
+#, c-format
+msgid "%s video stream %d: Using frame size %dx%d instead of %dx%d."
+msgstr ""
+
+#: src/media_object.cpp:624
 #, c-format
 msgid "%s video stream %d: Unsupported stereo layout %s."
 msgstr ""
 
-#: src/media_object.cpp:646
+#: src/media_object.cpp:662
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with %d channels."
 msgstr ""
 
-#: src/media_object.cpp:675
+#: src/media_object.cpp:691
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with sample format %s."
 msgstr ""
 
-#: src/media_object.cpp:728
+#: src/media_object.cpp:744
 #, c-format
 msgid "No support available for %s device."
 msgstr ""
 
-#: src/media_object.cpp:729 src/player_qt.cpp:1788
+#: src/media_object.cpp:745 src/player_qt.cpp:1831
 msgid "Firewire"
 msgstr ""
 
-#: src/media_object.cpp:730 src/player_qt.cpp:1789
+#: src/media_object.cpp:746 src/player_qt.cpp:1832
 msgid "X11"
 msgstr ""
 
-#: src/media_object.cpp:731
+#: src/media_object.cpp:747
 msgid "default"
 msgstr ""
 
-#: src/media_object.cpp:749 src/media_object.cpp:1189 src/xgl.cpp:297
+#: src/media_object.cpp:765 src/media_object.cpp:1218 src/xgl.cpp:297
 #, c-format
 msgid "%s: %s"
 msgstr ""
 
-#: src/media_object.cpp:760
+#: src/media_object.cpp:776
 #, c-format
 msgid "%s: Cannot read stream info: %s"
 msgstr ""
 
-#: src/media_object.cpp:786
+#: src/media_object.cpp:816
 #, c-format
 msgid "%s stream %d: Cannot open %s: %s"
 msgstr ""
 
-#: src/media_object.cpp:787

bino-1.1.3.tar.bz2/po/cs.gmo -> bino-1.2.1.tar.bz2/po/cs.gmo Changed

bino-1.1.3.tar.bz2/po/cs.po -> bino-1.2.1.tar.bz2/po/cs.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2011-08-14 01:38+0200\n"
+"POT-Creation-Date: 2011-10-10 21:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Joe <cuchac@email.cz>\n"
 "Language-Team: none\n"
@@ -128,11 +128,11 @@
 msgstr "Nelze se spojit s vláknem: %s"
 
 #: src/base/thread.cpp:182
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot cancel thread: %s"
-msgstr "Nelze vytvořit vlákno: %s"
+msgstr "Nelze zrušit vlákno: %s"
 
-#: src/base/timer.cpp:52 src/base/timer.cpp:64 src/base/timer.cpp:78
+#: src/base/timer.cpp:69 src/base/timer.cpp:81 src/base/timer.cpp:95
 msgid "Cannot get time."
 msgstr "Nelze získat aktuální čas."
 
@@ -197,15 +197,45 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Nelze odpojit buffery OpeanAL zdroje."
 
-#: src/lib_versions.cpp:121 src/lib_versions.cpp:155 src/media_data.cpp:422
+#: src/lib_versions.cpp:121 src/lib_versions.cpp:158 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:179 src/lib_versions.cpp:191
+#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
 msgid "not used"
 msgstr "nevyužívá se"
 
+#: src/lirc.cpp:63
+msgid "Cannot initialize LIRC."
+msgstr "Nemohu inicializovat LIRC."
+
+#: src/lirc.cpp:69
+msgid "Cannot set LIRC socket properties."
+msgstr "Nelze nastavit parametry LIRC socketu."
+
+#: src/lirc.cpp:76
+msgid "Cannot read LIRC default configuration."
+msgstr "Nelze získat výchozí nastavení LIRC."
+
+#: src/lirc.cpp:91
+#, c-format
+msgid "Cannot read LIRC configuration file %s."
+msgstr "Nelze přečíst LIRC konfigurační soubor %s."
+
+#: src/lirc.cpp:140
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr "Nelze získat událost z LIRC; vypínám podporu LIRC."
+
+#: src/lirc.cpp:154
+#, c-format
+msgid "Received invalid command '%s' from LIRC."
+msgstr "Obdržen neplatný příkaz '%s' z LIRC."
+
+#: src/lirc.cpp:164
+msgid "Cannot get command for LIRC code."
+msgstr "Nelze získat příkaz pro daný LIRC kód."
+
 #: src/main.cpp:325
 #, c-format
 msgid "%s version %s"
@@ -226,11 +256,11 @@
 "ž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:330 src/player_qt.cpp:2903
+#: src/main.cpp:330 src/player_qt.cpp:2958
 msgid "Platform:"
 msgstr "Platforma:"
 
-#: src/main.cpp:332 src/player_qt.cpp:2904
+#: src/main.cpp:332 src/player_qt.cpp:2959
 msgid "Libraries used:"
 msgstr "Použité knihovny:"
 
@@ -238,7 +268,7 @@
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
 #: src/main.cpp:344
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage:\n"
 " %s [option...] [file...]\n"
@@ -350,8 +380,15 @@
 " --version Vytiskni verzi.\n"
 " -n|--no-gui Nepoužívej grafické rozhraní, pouze zobraz holé "
 "okno.\n"
-" -l|--log-level=LEVEL Co se bude logovat (debug/info/warning/error/"
+" -L|--log-level=LEVEL Co se bude logovat (debug/info/warning/error/"
 "quiet).\n"
+" --device-type=TYPE Typ vstupního zařízení: default, firewire, x11.\n"
+" --device-frame-size=WxH Požadovaná velikost snímku SÍRKAxVÝSKA ze "
+"vstupního zařízení.\n"
+" --device-frame-rate=N/D Požadovaná obnovovací frekvence CITATEL/"
+"JMENOVATEL ze vstupního zařízení.\n"
+" --lirc-config=FILE Použij daný LIRC konfigurační soubor. Tato\n"
+" volba může být použita vícekrát.\n"
 " -v|--video=STREAM Vyber video stopu(1-n, záleží na vstupu).\n"
 " -a|--audio=STREAM Vyber zvukovou stopu (1-n, záleží na vstupu).\n"
 " -s|--subtitle=STREAM Vyber stopu titulků (0-n, záleží na vstupu).\n"
@@ -400,6 +437,15 @@
 " equalizer-3d Více monitorů použitím Equalizer (3D scéna).\n"
 " -S|--swap-eyes Prohoď levou/pravou.\n"
 " -f|--fullscreen Celá obrazovka.\n"
+" --fullscreen-screens= Použij vyjmenované obrazovky v celoobrazovkovém "
+"režimu.\n"
+" [S0[,S1[,...]]] Císla obrazovek začínají číslem 1. Výchozí\n"
+" (prázdný seznam) znamená použít primární "
+"obrazovku.\n"
+" --fullscreen-flip-left Překlop levý obraz vertikálně.\n"
+" --fullscreen-flop-left Překlop levý obraz horizontálně.\n"
+" --fullscreen-flip-right Překlop pravý obraz vertikálně.\n"
+" --fullscreen-flop-right Překlop pravýobraz horizontálně.\n"
 " -c|--center Vycentruj okno na středu monitoru.\n"
 " --subtitle-encoding=ENC Nastav kódování titulků.\n"
 " --subtitle-font=FONT Nastav písmo titulků.\n"
@@ -412,6 +458,7 @@
 " hodnoty pro kanály R,G,B.\n"
 " -G|--ghostbust=VAL Ghostbusting (0 to 1).\n"
 " -b|--benchmark Test výkonu (bez zvuk, zobrazuje fps).\n"
+" -l|--loop Přehrávej vstupní soubor ve smýčce.\n"
 "\n"
 "Interaktivní ovládání:\n"
 " ESC Opustit celoobrazovkový režim, nebo ukončit.\n"
@@ -439,18 +486,16 @@
 msgstr "Testovací režim, synchronizace zvuku a času je vypnuta."
 
 #: src/main.cpp:614
-#, fuzzy
 msgid "This version of Bino was compiled without support for LIRC."
-msgstr "Tato verze Bina byla zkompilována bez podpory knihovny Equalizer."
+msgstr "Tato verze Bina byla zkompilována bez podpory knihovny LIRC."
 
 #: src/main.cpp:627
 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:634
-#, fuzzy
 msgid "Cannot connect to X server."
-msgstr "Nelze převést %s to %s."
+msgstr "Nelze se připojit k X serveru."
 
 #: src/main.cpp:650
 msgid "No video to play."
@@ -468,156 +513,160 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d ch., %g kHz, %d bit"
 
-#: src/media_input.cpp:286 src/player_qt.cpp:187
+#: src/media_input.cpp:277 src/player_qt.cpp:187
 msgid "Input:"
 msgstr "Vstup:"
 
-#: src/media_input.cpp:291
+#: src/media_input.cpp:282
 #, c-format
 msgid "Video %s: %s"
 msgstr "Video %s: %s"
 
-#: src/media_input.cpp:296
+#: src/media_input.cpp:287
 msgid "No video."
 msgstr "Žádná video stopa."
 
-#: src/media_input.cpp:302
+#: src/media_input.cpp:293
 #, c-format
 msgid "Audio %s: %s"
 msgstr "Zvuk %s: %s"
 
-#: src/media_input.cpp:307
+#: src/media_input.cpp:298
 msgid "No audio."
 msgstr "Žádná zvuková stopa."
 
-#: src/media_input.cpp:313
+#: src/media_input.cpp:304
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr "Titulky %s: %s"
 
-#: src/media_input.cpp:318
+#: src/media_input.cpp:309
 msgid "No subtitle."
 msgstr "Žádné titulky."
 
-#: src/media_input.cpp:320

bino-1.1.3.tar.bz2/po/de.gmo -> bino-1.2.1.tar.bz2/po/de.gmo Changed

bino-1.1.3.tar.bz2/po/de.po -> bino-1.2.1.tar.bz2/po/de.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: bino 1.1.1\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2011-08-14 01:38+0200\n"
+"POT-Creation-Date: 2011-10-10 21:25+0200\n"
 "PO-Revision-Date: 2011-04-10 17:23+0200\n"
 "Last-Translator: Martin Lambers <marlam@marlam.de>\n"
 "Language-Team: none\n"
@@ -129,7 +129,7 @@
 msgid "Cannot cancel thread: %s"
 msgstr "Kann Thread nicht abbrechen: %s"
 
-#: src/base/timer.cpp:52 src/base/timer.cpp:64 src/base/timer.cpp:78
+#: src/base/timer.cpp:69 src/base/timer.cpp:81 src/base/timer.cpp:95
 msgid "Cannot get time."
 msgstr "Kann Zeit nicht abfragen."
 
@@ -194,15 +194,46 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Kann OpenAL Quellenpuffer nicht aus Warteschlange entfernen."
 
-#: src/lib_versions.cpp:121 src/lib_versions.cpp:155 src/media_data.cpp:422
+#: src/lib_versions.cpp:121 src/lib_versions.cpp:158 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:179 src/lib_versions.cpp:191
+#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
 msgid "not used"
 msgstr "nicht benutzt"
 
+#: src/lirc.cpp:63
+msgid "Cannot initialize LIRC."
+msgstr "Kann LIRC nicht initialisieren."
+
+#
+#: src/lirc.cpp:69
+msgid "Cannot set LIRC socket properties."
+msgstr "Kann LIRC Parameter nicht setzen."
+
+#: src/lirc.cpp:76
+msgid "Cannot read LIRC default configuration."
+msgstr "Kann LIRC Standardkonfiguration nicht lesen."
+
+#: src/lirc.cpp:91
+#, c-format
+msgid "Cannot read LIRC configuration file %s."
+msgstr "Kann LIRC Konfigurationsdatei %s nicht lesen."
+
+#: src/lirc.cpp:140
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr "Kann LIRC Ereignis nicht lesen; schalte LIRC ab."
+
+#: src/lirc.cpp:154
+#, c-format
+msgid "Received invalid command '%s' from LIRC."
+msgstr "Ungültiges Kommando '%s' von LIRC erhalten."
+
+#: src/lirc.cpp:164
+msgid "Cannot get command for LIRC code."
+msgstr "Kann kein Kommando für LIRC Code bekommen."
+
 #: src/main.cpp:325
 #, c-format
 msgid "%s version %s"
@@ -221,11 +252,11 @@
 "Dies ist freie Software. Du kannst Kopien davon verteilen unter den "
 "Bedingungen der GNU General Public License. Es gibt keine Garantie."
 
-#: src/main.cpp:330 src/player_qt.cpp:2903
+#: src/main.cpp:330 src/player_qt.cpp:2958
 msgid "Platform:"
 msgstr "Plattform:"
 
-#: src/main.cpp:332 src/player_qt.cpp:2904
+#: src/main.cpp:332 src/player_qt.cpp:2959
 msgid "Libraries used:"
 msgstr "Benutzte Bibliotheken:"
 
@@ -472,155 +503,160 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d Kan., %g kHz, %d bit"
 
-#: src/media_input.cpp:286 src/player_qt.cpp:187
+#: src/media_input.cpp:277 src/player_qt.cpp:187
 msgid "Input:"
 msgstr "Eingabe:"
 
-#: src/media_input.cpp:291
+#: src/media_input.cpp:282
 #, c-format
 msgid "Video %s: %s"
 msgstr "Video %s: %s"
 
-#: src/media_input.cpp:296
+#: src/media_input.cpp:287
 msgid "No video."
 msgstr "Kein Video."
 
-#: src/media_input.cpp:302
+#: src/media_input.cpp:293
 #, c-format
 msgid "Audio %s: %s"
 msgstr "Audio %s: %s"
 
-#: src/media_input.cpp:307
+#: src/media_input.cpp:298
 msgid "No audio."
 msgstr "Kein Audio."
 
-#: src/media_input.cpp:313
+#: src/media_input.cpp:304
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr "Untertitel %s: %s"
 
-#: src/media_input.cpp:318
+#: src/media_input.cpp:309
 msgid "No subtitle."
 msgstr "Kein Untertitel."
 
-#: src/media_input.cpp:320
+#: src/media_input.cpp:311
 #, c-format
 msgid "Duration: %g seconds"
 msgstr "Dauer: %g Sekunden"
 
-#: src/media_input.cpp:323
+#: src/media_input.cpp:314
 #, c-format
 msgid "Stereo layout: %s"
 msgstr "Stereolayout: %s"
 
-#: src/media_object.cpp:608
+#: src/media_object.cpp:371
+#, fuzzy, c-format
+msgid "%s video stream %d: Using frame size %dx%d instead of %dx%d."
+msgstr "%s Videokanal %d: Ungültige Bildgröße."
+
+#: src/media_object.cpp:624
 #, c-format
 msgid "%s video stream %d: Unsupported stereo layout %s."
 msgstr "%s Videokanal %d: Stereolayout %s wird nicht unterstützt."
 
-#: src/media_object.cpp:646
+#: src/media_object.cpp:662
 #, 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."
 
-#: src/media_object.cpp:675
+#: src/media_object.cpp:691
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with sample format %s."
 msgstr "%s Audiokanal %d: Kann Audiodaten mit Sampleformat %s nicht benutzen."
 
-#: src/media_object.cpp:728
+#: src/media_object.cpp:744
 #, c-format
 msgid "No support available for %s device."
 msgstr "Unterstüztung für %s Geräte nicht verfügbar."
 
-#: src/media_object.cpp:729 src/player_qt.cpp:1788
+#: src/media_object.cpp:745 src/player_qt.cpp:1831
 msgid "Firewire"
 msgstr "Firewire"
 
-#: src/media_object.cpp:730 src/player_qt.cpp:1789
+#: src/media_object.cpp:746 src/player_qt.cpp:1832
 msgid "X11"
 msgstr "X11"
 
-#: src/media_object.cpp:731
+#: src/media_object.cpp:747
 msgid "default"
 msgstr "Standard"
 
-#: src/media_object.cpp:749 src/media_object.cpp:1189 src/xgl.cpp:297
+#: src/media_object.cpp:765 src/media_object.cpp:1218 src/xgl.cpp:297
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: src/media_object.cpp:760
+#: src/media_object.cpp:776
 #, c-format
 msgid "%s: Cannot read stream info: %s"
 msgstr "%s: Kann Informationen über Kanal nicht lesen: %s"
 
-#: src/media_object.cpp:786
+#: src/media_object.cpp:816
 #, c-format
 msgid "%s stream %d: Cannot open %s: %s"
 msgstr "%s Kanal %d: Kann %s nicht öffnen: %s"
 
-#: src/media_object.cpp:787
+#: src/media_object.cpp:817
 msgid "video codec"

bino-1.1.3.tar.bz2/po/fr.gmo -> bino-1.2.1.tar.bz2/po/fr.gmo Changed

bino-1.1.3.tar.bz2/po/fr.po -> bino-1.2.1.tar.bz2/po/fr.po Changed

@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2011-08-14 01:38+0200\n"
-"PO-Revision-Date: 2011-04-21 16:48+0200\n"
+"POT-Creation-Date: 2011-10-10 21:25+0200\n"
+"PO-Revision-Date: 2011-08-28 17:34+0200\n"
 "Last-Translator: Frédéric Devernay <>\n"
 "Language-Team: French\n"
 "Language: fr\n"
@@ -128,11 +128,11 @@
 msgstr "Impossible de rejoindre le thread: %s"
 
 #: src/base/thread.cpp:182
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot cancel thread: %s"
-msgstr "Impossible de créer le thread: %s"
+msgstr "Impossible d'annuler le thread: %s"
 
-#: src/base/timer.cpp:52 src/base/timer.cpp:64 src/base/timer.cpp:78
+#: src/base/timer.cpp:69 src/base/timer.cpp:81 src/base/timer.cpp:95
 msgid "Cannot get time."
 msgstr "Impossible d'obtenir l'heure."
 
@@ -197,15 +197,45 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Impossible de vider la queue de tampons de la source OpenAL."
 
-#: src/lib_versions.cpp:121 src/lib_versions.cpp:155 src/media_data.cpp:422
+#: src/lib_versions.cpp:121 src/lib_versions.cpp:158 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:179 src/lib_versions.cpp:191
+#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
 msgid "not used"
 msgstr "inutilisé"
 
+#: src/lirc.cpp:63
+msgid "Cannot initialize LIRC."
+msgstr "Impossible d'initialiser LIRC."
+
+#: src/lirc.cpp:69
+msgid "Cannot set LIRC socket properties."
+msgstr "Impossible de régler les paramètres de socket LIRC."
+
+#: src/lirc.cpp:76
+msgid "Cannot read LIRC default configuration."
+msgstr "Impossible de lire la configuration par défaut de LIRC."
+
+#: src/lirc.cpp:91
+#, c-format
+msgid "Cannot read LIRC configuration file %s."
+msgstr "Impossible de lire le fichier de configuration LIRC %s."
+
+#: src/lirc.cpp:140
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr "Impossible de lire l'événement LIRC ; désactivation du support LIRC."
+
+#: src/lirc.cpp:154
+#, c-format
+msgid "Received invalid command '%s' from LIRC."
+msgstr "Commande LIRC '%s' invalide."
+
+#: src/lirc.cpp:164
+msgid "Cannot get command for LIRC code."
+msgstr "Commande non disponible pour le code LIRC."
+
 #: src/main.cpp:325
 #, c-format
 msgid "%s version %s"
@@ -225,11 +255,11 @@
 "termes de la GNU General Public License. Il n'y a AUCUNE GARANTIE, dans les "
 "limites autorisées par la loi."
 
-#: src/main.cpp:330 src/player_qt.cpp:2903
+#: src/main.cpp:330 src/player_qt.cpp:2958
 msgid "Platform:"
 msgstr "Plateforme :"
 
-#: src/main.cpp:332 src/player_qt.cpp:2904
+#: src/main.cpp:332 src/player_qt.cpp:2959
 msgid "Libraries used:"
 msgstr "Bibliothèques utilisées :"
 
@@ -237,7 +267,7 @@
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
 #: src/main.cpp:344
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage:\n"
 " %s [option...] [file...]\n"
@@ -349,8 +379,17 @@
 " --version Afficher la version.\n"
 " -n|--no-gui Ne pas utiliser l'IHM, afficher une fenêtre "
 "simple.\n"
-" -l|--log-level=LEVEL Niveau de détail du journal (debug/info/warning/"
+" -L|--log-level=LEVEL Niveau de détail du journal (debug/info/warning/"
 "error/quiet).\n"
+" --device-type=TYPE Type de périphérique d'entrée: default, firewire, "
+"x11.\\n\"\n"
+" --device-frame-size=WxH Demande la résolution WxH au périphérique "
+"d'entrée.\\n\"\n"
+" --device-frame-rate=N/D Demande le taux de rafraichissement N/D au "
+"périphérique d'entrée.\\n\"\n"
+" --lirc-config=FILE Utilise le fichier de configuration LIRC donné. "
+"Cette\\n\"\n"
+" option peut être utilisée plusieurs fois.\\n\"\n"
 " -v|--video=STREAM Sélectionner le flux vidéo (1-n, selon "
 "l'entrée).\n"
 " -a|--audio=STREAM Sélectionner le flux audio (1-n, selon "
@@ -409,6 +448,14 @@
 "3D).\n"
 " -S|--swap-eyes Echanger les vues gauche et droite.\n"
 " -f|--fullscreen Plein écran.\n"
+" --fullscreen-screens= Utiliser les écrans désignés pour le plein "
+"écran.\n"
+" [S0[,S1[,...]]] La numérotation commence à 1. Utilisation\n"
+" de l'écran primaire par défaut.\n"
+" --fullscreen-flip-left Flip vertical de la vue gauche en plein écran.\n"
+" --fullscreen-flop-left Flop horizontal de la vue gauche en plein écran.\n"
+" --fullscreen-flip-right Flip vertical de la vue droite en plein écran.\n"
+" --fullscreen-flop-right Flop horizontal de la vue droite en plein écran.\n"
 " -c|--center Centrer la fenêtre sur l'écran.\n"
 " --subtitle-encoding=ENC Régler l'encodage des sous-titres.\n"
 " --subtitle-font=FONT Régler le nom de la fonte des sous-titres.\n"
@@ -426,10 +473,11 @@
 "à 1).\n"
 " -b|--benchmark Mode banc d'essai (pas d'audio, afficher les "
 "fps).\n"
+" -l|--loop Lecture en bloucle.\n"
 "\n"
 "Contrôle interactif :\n"
-" q or ESC Quitter.\n"
-" p or SPACE Pause / continuer.\n"
+" q ou ESC Quitter.\n"
+" p ou ESPACE Pause / continuer.\n"
 " f Basculer le mode plein écran.\n"
 " c Centrer la fenêtre.\n"
 " e Echanger les yeux droit et gauche.\n"
@@ -442,10 +490,10 @@
 " 7, 8 Ajuster la saturation.\n"
 " <, > Ajuster la parallaxe.\n"
 " (, ) Ajuster le ghostbusting.\n"
-" left, right Avancer/reculer de 10 secondes.\n"
-" up, down Avancer/reculer de 1 minute.\n"
-" page up, page down Avancer/reculer de 10 minutes.\n"
-" Mouse click Aller à la position définie par l'abscisse du "
+" gauche, droite Avancer/reculer de 10 secondes.\n"
+" haut, bas Avancer/reculer de 1 minute.\n"
+" page prec., page suiv. Avancer/reculer de 10 minutes.\n"
+" Clic souris Aller à la position définie par l'abscisse du "
 "clic."
 
 #: src/main.cpp:597
@@ -453,18 +501,16 @@
 msgstr "Mode banc d'essai: audio et synchronisation temporelle désactivés."
 
 #: src/main.cpp:614
-#, fuzzy
 msgid "This version of Bino was compiled without support for LIRC."
-msgstr "Cette version de Bino a été compilée sans le support Equalizer."
+msgstr "Cette version de Bino a été compilée sans le support LIRC."
 
 #: src/main.cpp:627
 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:634
-#, fuzzy
 msgid "Cannot connect to X server."
-msgstr "Impossible de convertir %s en %s."
+msgstr "Impossible de se connecter au serveur X."
 
 #: src/main.cpp:650
 msgid "No video to play."
@@ -482,157 +528,161 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d ch., %g kHz, %d bit"
 
-#: src/media_input.cpp:286 src/player_qt.cpp:187
+#: src/media_input.cpp:277 src/player_qt.cpp:187
 msgid "Input:"
 msgstr "Entrée :"
 
-#: src/media_input.cpp:291
+#: src/media_input.cpp:282
 #, c-format
 msgid "Video %s: %s"
 msgstr "Vidéo %s : %s"
 
-#: src/media_input.cpp:296
+#: src/media_input.cpp:287
 msgid "No video."
 msgstr "Aucune vidéo."

bino-1.1.3.tar.bz2/po/pl.gmo -> bino-1.2.1.tar.bz2/po/pl.gmo Changed

bino-1.1.3.tar.bz2/po/pl.po -> bino-1.2.1.tar.bz2/po/pl.po Changed

@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.3\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2011-08-14 01:38+0200\n"
-"PO-Revision-Date: 2011-04-20 11:14+0100\n"
+"POT-Creation-Date: 2011-10-10 21:25+0200\n"
+"PO-Revision-Date: 2011-08-31 10:48+0100\n"
 "Last-Translator: Robert Pliszko <plesken@systems-design.eu>\n"
 "Language-Team: Bino Developers <bino-list@nongnu.org>\n"
 "Language: pl\n"
@@ -131,11 +131,11 @@
 msgstr "Nie można podłączyć się do wątku: %s"
 
 #: src/base/thread.cpp:182
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot cancel thread: %s"
-msgstr "Nie można utworzyć wątku: %s"
+msgstr "Nie można anulować wyjątku: %s"
 
-#: src/base/timer.cpp:52 src/base/timer.cpp:64 src/base/timer.cpp:78
+#: src/base/timer.cpp:69 src/base/timer.cpp:81 src/base/timer.cpp:95
 msgid "Cannot get time."
 msgstr "Nie można pobrać czasu."
 
@@ -200,15 +200,45 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Nie można odkolejkować źródła buforów OpenAL."
 
-#: src/lib_versions.cpp:121 src/lib_versions.cpp:155 src/media_data.cpp:422
+#: src/lib_versions.cpp:121 src/lib_versions.cpp:158 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:179 src/lib_versions.cpp:191
+#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
 msgid "not used"
 msgstr "nie używany"
 
+#: src/lirc.cpp:63
+msgid "Cannot initialize LIRC."
+msgstr "Nie można zainicjować LIRC."
+
+#: src/lirc.cpp:69
+msgid "Cannot set LIRC socket properties."
+msgstr "Nie można ustawić właściwości gniazda LIRC."
+
+#: src/lirc.cpp:76
+msgid "Cannot read LIRC default configuration."
+msgstr "Nie można odczytać konfiguracji domyślnej LIRC."
+
+#: src/lirc.cpp:91
+#, c-format
+msgid "Cannot read LIRC configuration file %s."
+msgstr "Nie można odczytać pliku konfiguracyjnego LIRC %s."
+
+#: src/lirc.cpp:140
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr "Nie można pobrać zdarzenia; wyłączenie obsługi LIRC."
+
+#: src/lirc.cpp:154
+#, c-format
+msgid "Received invalid command '%s' from LIRC."
+msgstr "Błędna odebrana komenda LIRC '%s'."
+
+#: src/lirc.cpp:164
+msgid "Cannot get command for LIRC code."
+msgstr "Nie można pobrać komendy z LIRC."
+
 #: src/main.cpp:325
 #, c-format
 msgid "%s version %s"
@@ -228,11 +258,11 @@
 "the GNU General Public License. There is NO WARRANTY, to the extent "
 "permitted by law."
 
-#: src/main.cpp:330 src/player_qt.cpp:2903
+#: src/main.cpp:330 src/player_qt.cpp:2958
 msgid "Platform:"
 msgstr "Platforma:"
 
-#: src/main.cpp:332 src/player_qt.cpp:2904
+#: src/main.cpp:332 src/player_qt.cpp:2959
 msgid "Libraries used:"
 msgstr "Użyte biblioteki:"
 
@@ -240,7 +270,7 @@
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
 #: src/main.cpp:344
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage:\n"
 " %s [option...] [file...]\n"
@@ -351,8 +381,16 @@
 " --help Wyświetla pomoc.\n"
 " --version Wyświetla wersję.\n"
 " -n|--no-gui Nie używaj GUI, tylko pokazuje okno.\n"
-" -l|--log-level=LEVEL Ustaw poziom logów (debug/info/warning/error/"
+" -L|--log-level=LEVEL Ustaw poziom logów (debug/info/warning/error/"
 "quiet).\n"
+" --device-type=TYPE Typ wejściowego urządzenia: default, firewire, "
+"x11.\n"
+" --device-frame-size=WxH Wymagany rozmiar ramki WxH z urządzenia "
+"wejściowego.\n"
+" --device-frame-rate=N/D Wymagana wartość odświeżania ramki N/D z "
+"urządzenia wejściowego.\n"
+" --lirc-config=FILE Użyj podanego pliku konfiguracyjnego. Ta\n"
+" opcja może być użyta więcej niż jeden raz.\n"
 " -v|--video=STREAM Wybierz strumień video (1-n, zależnie od "
 "wejścia).\n"
 " -a|--audio=STREAM Wybierz strumień audio (1-n, zależnie od "
@@ -407,6 +445,17 @@
 " equalizer-3d Multi-display via Equalizer (ustawianie 3D).\n"
 " -S|--swap-eyes Zamiana widoku lewy/prawy.\n"
 " -f|--fullscreen Pełny ekran.\n"
+" --fullscreen-screens= Użycie podanych ekranów w opcji pełnego ekranu.\n"
+" [S0[,S1[,...]]] Numery ekranów zaczynając od 1. Domyślnie\n"
+" (pusta lista) używany jest pierwszy ekran.\n"
+" --fullscreen-flip-left Widok \"flip\" z lewej w pionie w trybie "
+"\"pełnego ekranu\".\n"
+" --fullscreen-flop-left Widok \"flop\" z lewej w poziomie w trybie "
+"\"pełnego ekranu\".\n"
+" --fullscreen-flip-right Widok \"flip\" z prawej w pionie w trybie "
+"\"pełnego ekranu\".\n"
+" --fullscreen-flop-right Widok \"flop\" z prawej w poziomie w trybie "
+"\"pełnego ekranu\".\n"
 " -c|--center Wycentrowanie.\n"
 " --subtitle-encoding=ENC Ustaw kodowanie napisów.\n"
 " --subtitle-font=FONT Ustaw nazwę fontów.\n"
@@ -420,11 +469,12 @@
 " wartości dla kanałów the R,G,B.\n"
 " -G|--ghostbust=VAL Suma zwróconych \"duchów\" (0 do 1).\n"
 " -b|--benchmark Tryb Benchmark (bez audio, pokazuje fps).\n"
+" -l|--loop Pętla mediów wejściowych.\n"
 "\n"
 "Kontrola interaktywna:\n"
-" ESC Opuszczenie trybu pełnego ekranu, lub wyjście.\n"
-" q Wyjście.\n"
-" p lub SPACE Pauza / wyłączenie pauzy.\n"
+" ESC \tOpuszczenie trybu pełnego ekranu, lub wyjście.\n"
+" q\t\t\tWyjście.\n"
+" p lub SPACE Pauza / wyłączenie pauzy.\n"
 " f Przełącznik do trybu pełnego ekranu.\n"
 " c Wypośrodkowanie.\n"
 " e Zamiana lewe/prawe oko.\n"
@@ -447,18 +497,16 @@
 msgstr "Opcja testowa: audio i synchronizacja czasu wyłączona."
 
 #: src/main.cpp:614
-#, fuzzy
 msgid "This version of Bino was compiled without support for LIRC."
-msgstr "Ta wersja bino została skompilowana bez obsługi korektora."
+msgstr "Ta wersja bino została skompilowana bez obsługi LIRC."
 
 #: src/main.cpp:627
 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:634
-#, fuzzy
 msgid "Cannot connect to X server."
-msgstr "Nie można skonwertować %s do %s."
+msgstr "Nie można połączyć się z X serwerem."
 
 #: src/main.cpp:650
 msgid "No video to play."
@@ -476,156 +524,161 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d ch., %g kHz, %d bit"
 
-#: src/media_input.cpp:286 src/player_qt.cpp:187
+#: src/media_input.cpp:277 src/player_qt.cpp:187
 msgid "Input:"
 msgstr "Wejście:"
 
-#: src/media_input.cpp:291
+#: src/media_input.cpp:282
 #, c-format
 msgid "Video %s: %s"
-msgstr "Video %s: %s"
+msgstr "Video %s : %s"
 
-#: src/media_input.cpp:296
+#: src/media_input.cpp:287
 msgid "No video."
 msgstr "Brak video."
 
-#: src/media_input.cpp:302
+#: src/media_input.cpp:293
 #, c-format
 msgid "Audio %s: %s"
-msgstr "Audio %s: %s"
+msgstr "Audio %s : %s"
 
-#: src/media_input.cpp:307
+#: src/media_input.cpp:298

bino-1.1.3.tar.bz2/po/ru.gmo -> bino-1.2.1.tar.bz2/po/ru.gmo Changed

bino-1.1.3.tar.bz2/po/ru.po -> bino-1.2.1.tar.bz2/po/ru.po Changed

@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2011-08-14 01:38+0200\n"
-"PO-Revision-Date: 2011-04-19 11:52+0600\n"
+"POT-Creation-Date: 2011-10-10 21:25+0200\n"
+"PO-Revision-Date: 2011-08-28 01:00+0600\n"
 "Last-Translator: Alexey Osipov <simba@lerlan.ru>\n"
 "Language-Team: \n"
 "Language: ru\n"
@@ -125,11 +125,11 @@
 msgstr "Невозможно присоединиться к потоку: %s"
 
 #: src/base/thread.cpp:182
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot cancel thread: %s"
-msgstr "Невозможно создать поток: %s"
+msgstr "Невозможно отменить поток: %s"
 
-#: src/base/timer.cpp:52 src/base/timer.cpp:64 src/base/timer.cpp:78
+#: src/base/timer.cpp:69 src/base/timer.cpp:81 src/base/timer.cpp:95
 msgid "Cannot get time."
 msgstr "Невозможно получить время."
 
@@ -194,15 +194,45 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Невозможно получить из очереди буферы источника OpenAL."
 
-#: src/lib_versions.cpp:121 src/lib_versions.cpp:155 src/media_data.cpp:422
+#: src/lib_versions.cpp:121 src/lib_versions.cpp:158 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:179 src/lib_versions.cpp:191
+#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
 msgid "not used"
 msgstr "не используется"
 
+#: src/lirc.cpp:63
+msgid "Cannot initialize LIRC."
+msgstr "Невозможно инициализировать LIRC."
+
+#: src/lirc.cpp:69
+msgid "Cannot set LIRC socket properties."
+msgstr "Невозможно установить параметры LIRC сокета."
+
+#: src/lirc.cpp:76
+msgid "Cannot read LIRC default configuration."
+msgstr "Невозможно прочитать конфигурацию LIRC по умолчанию."
+
+#: src/lirc.cpp:91
+#, c-format
+msgid "Cannot read LIRC configuration file %s."
+msgstr "Невозможно прочитать конфигурацию LIRC из файла %s."
+
+#: src/lirc.cpp:140
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr "Невозможно получить событие LIRC; отключаю поддержку LIRC."
+
+#: src/lirc.cpp:154
+#, c-format
+msgid "Received invalid command '%s' from LIRC."
+msgstr "От LIRC получена некорректная команда '%s'."
+
+#: src/lirc.cpp:164
+msgid "Cannot get command for LIRC code."
+msgstr "Невозможно получить команду для LIRC кода."
+
 #: src/main.cpp:325
 #, c-format
 msgid "%s version %s"
@@ -222,11 +252,11 @@
 "требованиям лицензии GNU General Public License. Программное обеспечение "
 "поставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, за исключением предусмотренных законом."
 
-#: src/main.cpp:330 src/player_qt.cpp:2903
+#: src/main.cpp:330 src/player_qt.cpp:2958
 msgid "Platform:"
 msgstr "Платформа:"
 
-#: src/main.cpp:332 src/player_qt.cpp:2904
+#: src/main.cpp:332 src/player_qt.cpp:2959
 msgid "Libraries used:"
 msgstr "Используемые библиотеки:"
 
@@ -234,7 +264,7 @@
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
 #: src/main.cpp:344
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage:\n"
 " %s [option...] [file...]\n"
@@ -345,7 +375,12 @@
 " --help Показать помощь.\n"
 " --version Показать версию.\n"
 " -n|--no-gui Не использовать GUI, использовать обычное окно.\n"
-" -l|--log-level=LEVEL Уровень логов (debug/info/warning/error/quiet).\n"
+" -L|--log-level=LEVEL Уровень логов (debug/info/warning/error/quiet).\n"
+" --device-type=TYPE Тип устройства ввода: default, firewire, x11.\n"
+" --device-frame-size=WxH Потребовать от устройства размер кадра WxH.\n"
+" --device-frame-rate=N/D Потребовать от устройства частоту кадров N/D.\n"
+" --lirc-config=FILE Использовать указанный файл конфигурации LIRC.\n"
+" Эта опция может использоваться много раз.\n"
 " -v|--video=STREAM Видео дорожка (1-n, по наличию в файлах).\n"
 " -a|--audio=STREAM Аудио дорожка (1-n, по наличию в файлах).\n"
 " -s|--subtitle=STREAM Дорожка субтитров (0-n, по наличию в файлах).\n"
@@ -393,6 +428,14 @@
 " equalizer-3d Много-дисплейный 3D режим через Equalizer.\n"
 " -S|--swap-eyes Поменять левый и правый видеоряды.\n"
 " -f|--fullscreen Полноэкранный режим.\n"
+" --fullscreen-screens= Экраны для полноэкранного режима.\n"
+" [S0[,S1[,...]]] Номера экранов начинаются с 1. По умолчанию\n"
+" (если список пуст) используется главный экран.\n"
+" В полноэкранном режиме:\n"
+" --fullscreen-flip-left Отразить левый вид по вертикали.\n"
+" --fullscreen-flop-left Отразить левый вид по горизонтали.\n"
+" --fullscreen-flip-right Отразить правый вид по вертикали.\n"
+" --fullscreen-flop-right Отразить правый вид по горизонтали.\n"
 " -c|--center Расположить окно по центру экрана.\n"
 " --subtitle-encoding=ENC Кодировка субтитров.\n"
 " --subtitle-font=FONT Шрифт субтитров.\n"
@@ -405,6 +448,7 @@
 " для каналов R, G, B, разделенные запятыми.\n"
 " -G|--ghostbust=VAL Сила подавления перекрестных помех (0 -- 1).\n"
 " -b|--benchmark Измерение производительности (FPS, без аудио).\n"
+" -l|--loop Зациклить воспроизведение.\n"
 "\n"
 "Интерактивное управление:\n"
 " ESC Покинуть полноэкранный режим или выйти.\n"
@@ -434,18 +478,16 @@
 "воспроизведение видео с максимально-возможной скоростью."
 
 #: src/main.cpp:614
-#, fuzzy
 msgid "This version of Bino was compiled without support for LIRC."
-msgstr "Эта версия Bino была собрана без поддержки Equalizer."
+msgstr "Эта версия Bino была собрана без поддержки LIRC."
 
 #: src/main.cpp:627
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Эта версия Bino была собрана без поддержки Equalizer."
 
 #: src/main.cpp:634
-#, fuzzy
 msgid "Cannot connect to X server."
-msgstr "Невозможно преобразовать %s в %s."
+msgstr "Невозможно присоединиться к X серверу."
 
 #: src/main.cpp:650
 msgid "No video to play."
@@ -463,156 +505,160 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d к., %g кГц, %d бит"
 
-#: src/media_input.cpp:286 src/player_qt.cpp:187
+#: src/media_input.cpp:277 src/player_qt.cpp:187
 msgid "Input:"
 msgstr "Источник:"
 
-#: src/media_input.cpp:291
+#: src/media_input.cpp:282
 #, c-format
 msgid "Video %s: %s"
 msgstr "Видео %s: %s"
 
-#: src/media_input.cpp:296
+#: src/media_input.cpp:287
 msgid "No video."
 msgstr "Нет видео."
 
-#: src/media_input.cpp:302
+#: src/media_input.cpp:293
 #, c-format
 msgid "Audio %s: %s"
 msgstr "Аудио %s: %s"
 
-#: src/media_input.cpp:307
+#: src/media_input.cpp:298
 msgid "No audio."
 msgstr "Нет аудио."
 
-#: src/media_input.cpp:313
+#: src/media_input.cpp:304
 #, c-format
 msgid "Subtitle %s: %s"
 msgstr "Субтитры %s: %s"
 
-#: src/media_input.cpp:318
+#: src/media_input.cpp:309
 msgid "No subtitle."
 msgstr "Нет субтитров."
 
-#: src/media_input.cpp:320
+#: src/media_input.cpp:311
 #, c-format

bino-1.1.3.tar.bz2/src/Makefile.am -> bino-1.2.1.tar.bz2/src/Makefile.am Changed

@@ -55,7 +55,6 @@
 	icons-local/output-type-red-blue.ipe \
 	icons-local/output-type-stereo.ipe
 
-
 ICONS = \
 	icons/application-exit.png \
 	icons/applications-internet.png \
@@ -81,11 +80,6 @@
 	logo/bino_logo.ico \
 	logo/bino_logo.png \
 	logo/bino_logo.svg \
-	logo/bino_logo_small.svg \
-	logo/bino_logo_small_16x16.png \
-	logo/bino_logo_small_32x32.png \
-	logo/bino_logo_small_48x48.png \
-	logo/bino_logo_small_64x64.png \
 	icons/COPYING \
 	icons/README \
 	icons-local/README \
@@ -97,7 +91,7 @@
 	echo '<file alias="AUTHORS">$(top_srcdir)/AUTHORS</file>'; \
 	echo '<file alias="LICENSE">$(top_srcdir)/COPYING</file>'; \
 	echo '<file alias="logo/bino_logo.png">$(top_srcdir)/src/logo/bino_logo.png</file>'; \
-	echo '<file alias="logo/bino_logo_small_64x64.png">$(top_srcdir)/src/logo/bino_logo_small_64x64.png</file>'; \
+	echo '<file alias="logo/64x64/bino.png">$(top_srcdir)/src/logo/64x64/bino.png</file>'; \
 	for icon in $(ICONS); do echo '<file alias="'"$${icon}"'">$(top_srcdir)/src/'"$${icon}"'</file>'; done; \
 	echo '</qresource>'; \
 	echo '</RCC>') > $@
@@ -116,23 +110,20 @@
 
 CLEANFILES = $(BUILT_SOURCES)
 
-DEFS += -DDOCDIR=\"$(docdir)\" -DLOCALEDIR=\"$(localedir)\"
+DEFS += -DHTMLDIR=\"$(htmldir)\" -DLOCALEDIR=\"$(localedir)\"
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/base \
 	$(libavformat_CFLAGS) $(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \
-	$(libopenal_CFLAGS) $(libglew_CFLAGS) $(libqtopengl_CFLAGS)
+	$(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglew_CFLAGS) $(libqtopengl_CFLAGS)
 
-bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) \
+bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) $(LIBICONV) \
 	$(libavformat_LIBS) $(libavdevice_LIBS) $(libswscale_LIBS) $(libass_LIBS) \
-	$(libopenal_LIBS) $(libglew_LIBS) $(libqtopengl_LIBS)
+	$(libopenal_LIBS) $(libgl_LIBS) $(libglew_LIBS) $(libqtopengl_LIBS)
 
 if HAVE_LIBEQUALIZER
 bino_SOURCES += player_equalizer.h player_equalizer.cpp
 AM_CPPFLAGS += $(libEqualizer_CFLAGS) -DGLEW_MX
 bino_LDADD += $(libEqualizer_LIBS)
-else
-AM_CPPFLAGS += $(libglew_CFLAGS)
-bino_LDADD += $(libglew_LIBS)
 endif
 
 if HAVE_LIBLIRCCLIENT
@@ -147,6 +138,29 @@
 	$(AM_V_GEN)echo "IDI_ICON1 ICON DISCARDABLE \"$<\"" | $(WINDRES) -o $@
 endif
 
+iconsdatadir = $(datadir)/icons/hicolor
+icons16dir = $(iconsdatadir)/16x16/apps
+icons32dir = $(iconsdatadir)/32x32/apps
+icons48dir = $(iconsdatadir)/48x48/apps
+icons64dir = $(iconsdatadir)/64x64/apps
+iconsscaldir = $(iconsdatadir)/scalable/apps
+dist_icons16_DATA = logo/16x16/bino.png
+dist_icons32_DATA = logo/32x32/bino.png
+dist_icons48_DATA = logo/48x48/bino.png
+dist_icons64_DATA = logo/64x64/bino.png
+dist_iconsscal_DATA = logo/scalable/bino.svg
+update-icon-cache:
+	test -n "$(DESTDIR)" -o -z "$(GTK_UPDATE_ICON_CACHE)" || (umask 022 && $(GTK_UPDATE_ICON_CACHE) -q -f -t "$(iconsdatadir)")
+
+appdatadir = $(datadir)/applications
+dist_appdata_DATA = bino.desktop
+update-desktop-database:
+	test -n "$(DESTDIR)" -o -z "$(UPDATE_DESKTOP_DATABASE)" || (umask 022 && $(UPDATE_DESKTOP_DATABASE) "$(appdatadir)")
+
+install-data-hook: update-icon-cache update-desktop-database
+uninstall-hook: update-icon-cache update-desktop-database
+
+
 moc_verbose = $(moc_verbose_$(V))
 moc_verbose_ = $(moc_verbose_$(AM_DEFAULT_VERBOSITY))
 moc_verbose_0 = @echo " MOC " $@;

bino-1.1.3.tar.bz2/src/Makefile.in -> bino-1.2.1.tar.bz2/src/Makefile.in Changed

@@ -22,6 +22,7 @@
 # permitted in any medium without royalty provided the copyright notice and this
 # notice are preserved. This file is offered as-is, without any warranty.
 
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -46,14 +47,15 @@
 @HAVE_LIBEQUALIZER_TRUE@am__append_1 = player_equalizer.h player_equalizer.cpp
 @HAVE_LIBEQUALIZER_TRUE@am__append_2 = $(libEqualizer_CFLAGS) -DGLEW_MX
 @HAVE_LIBEQUALIZER_TRUE@am__append_3 = $(libEqualizer_LIBS)
-@HAVE_LIBEQUALIZER_FALSE@am__append_4 = $(libglew_CFLAGS)
-@HAVE_LIBEQUALIZER_FALSE@am__append_5 = $(libglew_LIBS)
-@HAVE_LIBLIRCCLIENT_TRUE@am__append_6 = lirc.h lirc.cpp
-@HAVE_LIBLIRCCLIENT_TRUE@am__append_7 = $(liblircclient_CFLAGS)
-@HAVE_LIBLIRCCLIENT_TRUE@am__append_8 = $(liblircclient_LIBS)
-@W32_TRUE@am__append_9 = logo/bino_logo.ico
+@HAVE_LIBLIRCCLIENT_TRUE@am__append_4 = lirc.h lirc.cpp
+@HAVE_LIBLIRCCLIENT_TRUE@am__append_5 = $(liblircclient_CFLAGS)
+@HAVE_LIBLIRCCLIENT_TRUE@am__append_6 = $(liblircclient_LIBS)
+@W32_TRUE@am__append_7 = logo/bino_logo.ico
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_appdata_DATA) $(dist_icons16_DATA) \
+	$(dist_icons32_DATA) $(dist_icons48_DATA) $(dist_icons64_DATA) \
+	$(dist_iconsscal_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
@@ -66,7 +68,10 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdatadir)" \
+	"$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons32dir)" \
+	"$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(icons64dir)" \
+	"$(DESTDIR)$(iconsscaldir)"
 PROGRAMS = $(bin_PROGRAMS)
 am__bino_SOURCES_DIST = media_data.h media_data.cpp media_object.h \
 	media_object.cpp media_input.h media_input.cpp controller.h \
@@ -92,15 +97,14 @@
 bino_OBJECTS = $(am_bino_OBJECTS) $(nodist_bino_OBJECTS)
 am__DEPENDENCIES_1 =
 @HAVE_LIBEQUALIZER_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-@HAVE_LIBEQUALIZER_FALSE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
-@HAVE_LIBLIRCCLIENT_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
+@HAVE_LIBLIRCCLIENT_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
 bino_DEPENDENCIES = $(top_builddir)/src/base/libbase.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
-	$(am__DEPENDENCIES_4)
+	$(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
@@ -141,6 +145,30 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+DATA = $(dist_appdata_DATA) $(dist_icons16_DATA) $(dist_icons32_DATA) \
+	$(dist_icons48_DATA) $(dist_icons64_DATA) \
+	$(dist_iconsscal_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
 distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -188,11 +216,10 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
-CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@ -DDOCDIR=\"$(docdir)\" -DLOCALEDIR=\"$(localedir)\"
+DEFS = @DEFS@ -DHTMLDIR=\"$(htmldir)\" -DLOCALEDIR=\"$(localedir)\"
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -203,6 +230,7 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -244,6 +272,7 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+UPDATE_DESKTOP_DATABASE = @UPDATE_DESKTOP_DATABASE@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -286,6 +315,8 @@
 install_sh = @install_sh@
 libEqualizer_CFLAGS = @libEqualizer_CFLAGS@
 libEqualizer_LIBS = @libEqualizer_LIBS@
+libX11_CFLAGS = @libX11_CFLAGS@
+libX11_LIBS = @libX11_LIBS@
 libass_CFLAGS = @libass_CFLAGS@
 libass_LIBS = @libass_LIBS@
 libavdevice_CFLAGS = @libavdevice_CFLAGS@
@@ -294,6 +325,8 @@
 libavformat_LIBS = @libavformat_LIBS@
 libdir = @libdir@
 libexecdir = @libexecdir@
+libgl_CFLAGS = @libgl_CFLAGS@
+libgl_LIBS = @libgl_LIBS@
 libglew_CFLAGS = @libglew_CFLAGS@
 libglew_LIBS = @libglew_LIBS@
 liblircclient_CFLAGS = @liblircclient_CFLAGS@
@@ -333,7 +366,7 @@
 	subtitle_renderer.h subtitle_renderer.cpp audio_output.h \
 	audio_output.cpp player.h player.cpp player_qt.h player_qt.cpp \
 	lib_versions.h lib_versions.cpp main.cpp $(am__append_1) \
-	$(am__append_6) $(am__append_9)
+	$(am__append_4) $(am__append_7)
 ICONS_LOCAL_IPE = \
 	icons-local/input-layout-mono.ipe \
 	icons-local/input-layout-separate-left-right.ipe \
@@ -390,11 +423,6 @@
 	logo/bino_logo.ico \
 	logo/bino_logo.png \
 	logo/bino_logo.svg \
-	logo/bino_logo_small.svg \
-	logo/bino_logo_small_16x16.png \
-	logo/bino_logo_small_32x32.png \
-	logo/bino_logo_small_48x48.png \
-	logo/bino_logo_small_64x64.png \
 	icons/COPYING \
 	icons/README \
 	icons-local/README \
@@ -412,13 +440,25 @@
 CLEANFILES = $(BUILT_SOURCES)
 AM_CPPFLAGS = -I$(top_srcdir)/src/base $(libavformat_CFLAGS) \
 	$(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \
-	$(libopenal_CFLAGS) $(libglew_CFLAGS) $(libqtopengl_CFLAGS) \
-	$(am__append_2) $(am__append_4) $(am__append_7)
-bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) \
+	$(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglew_CFLAGS) \
+	$(libqtopengl_CFLAGS) $(am__append_2) $(am__append_5)
+bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) $(LIBICONV) \
 	$(libavformat_LIBS) $(libavdevice_LIBS) $(libswscale_LIBS) \
-	$(libass_LIBS) $(libopenal_LIBS) $(libglew_LIBS) \
-	$(libqtopengl_LIBS) $(am__append_3) $(am__append_5) \
-	$(am__append_8)
+	$(libass_LIBS) $(libopenal_LIBS) $(libgl_LIBS) $(libglew_LIBS) \
+	$(libqtopengl_LIBS) $(am__append_3) $(am__append_6)
+iconsdatadir = $(datadir)/icons/hicolor
+icons16dir = $(iconsdatadir)/16x16/apps
+icons32dir = $(iconsdatadir)/32x32/apps
+icons48dir = $(iconsdatadir)/48x48/apps
+icons64dir = $(iconsdatadir)/64x64/apps
+iconsscaldir = $(iconsdatadir)/scalable/apps
+dist_icons16_DATA = logo/16x16/bino.png
+dist_icons32_DATA = logo/32x32/bino.png
+dist_icons48_DATA = logo/48x48/bino.png
+dist_icons64_DATA = logo/64x64/bino.png
+dist_iconsscal_DATA = logo/scalable/bino.svg
+appdatadir = $(datadir)/applications
+dist_appdata_DATA = bino.desktop
 moc_verbose = $(moc_verbose_$(V))
 moc_verbose_ = $(moc_verbose_$(AM_DEFAULT_VERBOSITY))
 moc_verbose_0 = @echo " MOC " $@;
@@ -550,6 +590,126 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+install-dist_appdataDATA: $(dist_appdata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(appdatadir)" || $(MKDIR_P) "$(DESTDIR)$(appdatadir)"

bino-1.1.3.tar.bz2/src/base/Makefile.in -> bino-1.2.1.tar.bz2/src/base/Makefile.in Changed

@@ -117,7 +117,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
-CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -132,6 +131,7 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -173,6 +173,7 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+UPDATE_DESKTOP_DATABASE = @UPDATE_DESKTOP_DATABASE@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -215,6 +216,8 @@
 install_sh = @install_sh@
 libEqualizer_CFLAGS = @libEqualizer_CFLAGS@
 libEqualizer_LIBS = @libEqualizer_LIBS@
+libX11_CFLAGS = @libX11_CFLAGS@
+libX11_LIBS = @libX11_LIBS@
 libass_CFLAGS = @libass_CFLAGS@
 libass_LIBS = @libass_LIBS@
 libavdevice_CFLAGS = @libavdevice_CFLAGS@
@@ -223,6 +226,8 @@
 libavformat_LIBS = @libavformat_LIBS@
 libdir = @libdir@
 libexecdir = @libexecdir@
+libgl_CFLAGS = @libgl_CFLAGS@
+libgl_LIBS = @libgl_LIBS@
 libglew_CFLAGS = @libglew_CFLAGS@
 libglew_LIBS = @libglew_LIBS@
 liblircclient_CFLAGS = @liblircclient_CFLAGS@

bino-1.1.3.tar.bz2/src/base/str.cpp -> bino-1.2.1.tar.bz2/src/base/str.cpp Changed

bino-1.1.3.tar.bz2/src/base/timer.cpp -> bino-1.2.1.tar.bz2/src/base/timer.cpp Changed

@@ -37,16 +37,33 @@
 #ifdef HAVE_CLOCK_GETTIME
 
     struct timespec time;
-    int r = clock_gettime(
-              t == realtime ? CLOCK_REALTIME
-            : t == monotonic ? 
-# ifdef CLOCK_MONOTONIC_RAW
-                               CLOCK_MONOTONIC_RAW
-# else
-                               CLOCK_MONOTONIC
-# endif
-            : t == process_cpu ? CLOCK_PROCESS_CPUTIME_ID
-            : CLOCK_THREAD_CPUTIME_ID, &time);
+    int r;
+    if (t == realtime)
+    {
+        r = clock_gettime(CLOCK_REALTIME, &time);
+    }
+    else if (t == monotonic)
+    {
+        r = clock_gettime(CLOCK_MONOTONIC, &time);
+    }
+    else if (t == process_cpu)
+    {
+#ifdef CLOCK_PROCESS_CPUTIME_ID
+        r = clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time);
+#else
+        r = -1;
+        errno = ENOSYS;
+#endif
+    }
+    else // t == thread_cpu
+    {
+#ifdef CLOCK_THREAD_CPUTIME_ID
+        r = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &time);
+#else
+        r = -1;
+        errno = ENOSYS;
+#endif
+    }
     if (r != 0)
     {
         throw exc(_("Cannot get time."), errno);

bino-1.2.1.tar.bz2/src/bino.desktop Added

bino-1.1.3.tar.bz2/src/lib_versions.cpp -> bino-1.2.1.tar.bz2/src/lib_versions.cpp Changed

bino-1.2.1.tar.bz2/src/logo/16x16 Added

bino-1.2.1.tar.bz2/src/logo/16x16/bino.png Changed

bino-1.2.1.tar.bz2/src/logo/32x32 Added

bino-1.2.1.tar.bz2/src/logo/32x32/bino.png Changed

bino-1.2.1.tar.bz2/src/logo/48x48 Added

bino-1.2.1.tar.bz2/src/logo/48x48/bino.png Changed

bino-1.2.1.tar.bz2/src/logo/64x64 Added

bino-1.2.1.tar.bz2/src/logo/64x64/bino.png Changed

bino-1.2.1.tar.bz2/src/logo/scalable Added

bino-1.2.1.tar.bz2/src/logo/scalable/bino.svg Changed

bino-1.1.3.tar.bz2/src/main.cpp -> bino-1.2.1.tar.bz2/src/main.cpp Changed

bino-1.1.3.tar.bz2/src/media_input.cpp -> bino-1.2.1.tar.bz2/src/media_input.cpp Changed

@@ -50,51 +50,42 @@
 {
 assert(stream < video_streams());
 
- for (size_t i = 0; i < _media_objects.size(); i++)
+ size_t i = 0;
+ while (_media_objects[i].video_streams() < stream + 1)
 {
- if (_media_objects[i].video_streams() < stream + 1)
- {
- stream -= _media_objects[i].video_streams();
- continue;
- }
- media_object = i;
- media_object_video_stream = stream;
- break;
+ stream -= _media_objects[i].video_streams();
+ i++;
 }
+ media_object = i;
+ media_object_video_stream = stream;
 }
 
 void media_input::get_audio_stream(int stream, int &media_object, int &media_object_audio_stream) const
 {
 assert(stream < audio_streams());
 
- for (size_t i = 0; i < _media_objects.size(); i++)
+ size_t i = 0;
+ while (_media_objects[i].audio_streams() < stream + 1)
 {
- if (_media_objects[i].audio_streams() < stream + 1)
- {
- stream -= _media_objects[i].audio_streams();
- continue;
- }
- media_object = i;
- media_object_audio_stream = stream;
- break;
+ stream -= _media_objects[i].audio_streams();
+ i++;
 }
+ media_object = i;
+ media_object_audio_stream = stream;
 }
 
 void media_input::get_subtitle_stream(int stream, int &media_object, int &media_object_subtitle_stream) const
 {
 assert(stream < subtitle_streams());
 
- for (size_t i = 0; i < _media_objects.size(); i++)
+ size_t i = 0;
+ while (_media_objects[i].subtitle_streams() < stream + 1)
 {
- if (_media_objects[i].subtitle_streams() < stream + 1)
- {
- stream -= _media_objects[i].subtitle_streams();
- continue;
- }
- media_object = i;
- media_object_subtitle_stream = stream;
- break;
+ stream -= _media_objects[i].subtitle_streams();
+ i++;
 }
+ media_object = i;
+ media_object_subtitle_stream = stream;
 }
 
 // Get the basename of an URL (just the file name, without leading paths)

bino-1.1.3.tar.bz2/src/media_object.cpp -> bino-1.2.1.tar.bz2/src/media_object.cpp Changed

@@ -350,7 +350,7 @@
 }
 }
 
-void media_object::set_video_frame_template(int index)
+void media_object::set_video_frame_template(int index, int width_before_avcodec_open, int height_before_avcodec_open)
 {
 AVStream *video_stream = _ffmpeg->format_ctx->streams[_ffmpeg->video_streams[index]];
 AVCodecContext *video_codec_ctx = _ffmpeg->video_codec_ctxs[index];
@@ -359,6 +359,22 @@
 // Dimensions and aspect ratio
 video_frame_template.raw_width = video_codec_ctx->width;
 video_frame_template.raw_height = video_codec_ctx->height;
+ // XXX Use width/height values from before avcodec_open() if they
+ // differ and seem safe to use. See also media_object::open().
+ if (width_before_avcodec_open >= 1
+ && height_before_avcodec_open >= 1
+ && width_before_avcodec_open <= video_codec_ctx->width
+ && height_before_avcodec_open <= video_codec_ctx->height
+ && (width_before_avcodec_open != video_codec_ctx->width
+ || height_before_avcodec_open != video_codec_ctx->height))
+ {
+ msg::wrn(_("%s video stream %d: Using frame size %dx%d instead of %dx%d."),
+ _url.c_str(), index + 1,
+ width_before_avcodec_open, height_before_avcodec_open,
+ video_codec_ctx->width, video_codec_ctx->height);
+ video_frame_template.raw_width = width_before_avcodec_open;
+ video_frame_template.raw_height = height_before_avcodec_open;
+ }
 int ar_num = 1;
 int ar_den = 1;
 int ar_snum = video_stream->sample_aspect_ratio.num;
@@ -779,6 +795,20 @@
 _ffmpeg->format_ctx->streams[i]->discard = AVDISCARD_ALL; // ignore by default; user must activate streams
 AVCodecContext *codec_ctx = _ffmpeg->format_ctx->streams[i]->codec;
 AVCodec *codec = NULL;
+ // XXX: Sometimes the reported width and height for a video stream change after avcodec_open(),
+ // but the original values seem to be correct. This seems to happen mostly with 1920x1080 video
+ // that later is reported as 1920x1088, which results in a gray bar displayed at the bottom of
+ // the frame. FFplay is also affected. As a workaround, we keep the original values here and use
+ // them later in set_video_frame_template().
+ int width_before_avcodec_open = codec_ctx->width;
+ int height_before_avcodec_open = codec_ctx->height;
+ if (_ffmpeg->format_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+ {
+ // Activate multithreaded decoding. This must be done before opening the codec; see
+ // http://lists.gnu.org/archive/html/bino-list/2011-08/msg00019.html
+ codec_ctx->thread_count = video_decoding_threads();
+ }
+ // Find and open the codec. CODEC_ID_TEXT is a special case: it has no decoder since it is unencoded raw data.
 if (_ffmpeg->format_ctx->streams[i]->codec->codec_id != CODEC_ID_TEXT
 && (!(codec = avcodec_find_decoder(_ffmpeg->format_ctx->streams[i]->codec->codec_id))
 || (e = avcodec_open(codec_ctx, codec)) < 0))
@@ -802,10 +832,9 @@
 _url.c_str(), j + 1));
 }
 _ffmpeg->video_codecs.push_back(codec);
- _ffmpeg->video_codec_ctxs[j]->thread_count = video_decoding_threads();
 // Determine frame template.
 _ffmpeg->video_frame_templates.push_back(video_frame());
- set_video_frame_template(j);
+ set_video_frame_template(j, width_before_avcodec_open, height_before_avcodec_open);
 // Allocate things required for decoding
 _ffmpeg->video_packets.push_back(AVPacket());
 av_init_packet(&(_ffmpeg->video_packets[j]));

bino-1.1.3.tar.bz2/src/media_object.h -> bino-1.2.1.tar.bz2/src/media_object.h Changed

bino-1.1.3.tar.bz2/src/player_equalizer.cpp -> bino-1.2.1.tar.bz2/src/player_equalizer.cpp Changed

bino-1.1.3.tar.bz2/src/player_qt.cpp -> bino-1.2.1.tar.bz2/src/player_qt.cpp Changed

@@ -1045,8 +1045,8 @@
 }
 
 
-color_dialog::color_dialog(const parameters &params, QWidget *parent) : QDialog(parent),
- _lock(false)
+color_dialog::color_dialog(parameters *params, QWidget *parent) : QDialog(parent),
+ _params(params), _lock(false)
 {
 setModal(false);
 setWindowTitle(_("Display Color Adjustments"));
@@ -1054,44 +1054,44 @@
 QLabel *c_label = new QLabel(_("Contrast:"));
 _c_slider = new QSlider(Qt::Horizontal);
 _c_slider->setRange(-1000, 1000);
- _c_slider->setValue(params.contrast * 1000.0f);
+ _c_slider->setValue(params->contrast * 1000.0f);
 connect(_c_slider, SIGNAL(valueChanged(int)), this, SLOT(c_slider_changed(int)));
 _c_spinbox = new QDoubleSpinBox();
 _c_spinbox->setRange(-1.0, +1.0);
- _c_spinbox->setValue(params.contrast);
+ _c_spinbox->setValue(params->contrast);
 _c_spinbox->setDecimals(2);
 _c_spinbox->setSingleStep(0.01);
 connect(_c_spinbox, SIGNAL(valueChanged(double)), this, SLOT(c_spinbox_changed(double)));
 QLabel *b_label = new QLabel(_("Brightness:"));
 _b_slider = new QSlider(Qt::Horizontal);
 _b_slider->setRange(-1000, 1000);
- _b_slider->setValue(params.brightness * 1000.0f);
+ _b_slider->setValue(params->brightness * 1000.0f);
 connect(_b_slider, SIGNAL(valueChanged(int)), this, SLOT(b_slider_changed(int)));
 _b_spinbox = new QDoubleSpinBox();
 _b_spinbox->setRange(-1.0, +1.0);
- _b_spinbox->setValue(params.brightness);
+ _b_spinbox->setValue(params->brightness);
 _b_spinbox->setDecimals(2);
 _b_spinbox->setSingleStep(0.01);
 connect(_b_spinbox, SIGNAL(valueChanged(double)), this, SLOT(b_spinbox_changed(double)));
 QLabel *h_label = new QLabel(_("Hue:"));
 _h_slider = new QSlider(Qt::Horizontal);
 _h_slider->setRange(-1000, 1000);
- _h_slider->setValue(params.hue * 1000.0f);
+ _h_slider->setValue(params->hue * 1000.0f);
 connect(_h_slider, SIGNAL(valueChanged(int)), this, SLOT(h_slider_changed(int)));
 _h_spinbox = new QDoubleSpinBox();
 _h_spinbox->setRange(-1.0, +1.0);
- _h_spinbox->setValue(params.hue);
+ _h_spinbox->setValue(params->hue);
 _h_spinbox->setDecimals(2);
 _h_spinbox->setSingleStep(0.01);
 connect(_h_spinbox, SIGNAL(valueChanged(double)), this, SLOT(h_spinbox_changed(double)));
 QLabel *s_label = new QLabel(_("Saturation:"));
 _s_slider = new QSlider(Qt::Horizontal);
 _s_slider->setRange(-1000, 1000);
- _s_slider->setValue(params.saturation * 1000.0f);
+ _s_slider->setValue(params->saturation * 1000.0f);
 connect(_s_slider, SIGNAL(valueChanged(int)), this, SLOT(s_slider_changed(int)));
 _s_spinbox = new QDoubleSpinBox();
 _s_spinbox->setRange(-1.0, +1.0);
- _s_spinbox->setValue(params.saturation);
+ _s_spinbox->setValue(params->saturation);
 _s_spinbox->setDecimals(2);
 _s_spinbox->setSingleStep(0.01);
 connect(_s_spinbox, SIGNAL(valueChanged(double)), this, SLOT(s_spinbox_changed(double)));
@@ -1120,6 +1120,10 @@
 {
 if (!_lock)
 {
+ _params->contrast = val / 1000.0f;
+ _lock = true;
+ _c_spinbox->setValue(val / 1000.0f);
+ _lock = false;
 send_cmd(command::set_contrast, val / 1000.0f);
 }
 }
@@ -1128,6 +1132,10 @@
 {
 if (!_lock)
 {
+ _params->contrast = val;
+ _lock = true;
+ _c_slider->setValue(val * 1000.0);
+ _lock = false;
 send_cmd(command::set_contrast, static_cast<float>(val));
 }
 }
@@ -1136,6 +1144,10 @@
 {
 if (!_lock)
 {
+ _params->brightness = val / 1000.0f;
+ _lock = true;
+ _b_spinbox->setValue(val / 1000.0f);
+ _lock = false;
 send_cmd(command::set_brightness, val / 1000.0f);
 }
 }
@@ -1144,6 +1156,10 @@
 {
 if (!_lock)
 {
+ _params->brightness = val;
+ _lock = true;
+ _b_slider->setValue(val * 1000.0);
+ _lock = false;
 send_cmd(command::set_brightness, static_cast<float>(val));
 }
 }
@@ -1152,6 +1168,10 @@
 {
 if (!_lock)
 {
+ _params->hue = val / 1000.0f;
+ _lock = true;
+ _h_spinbox->setValue(val / 1000.0f);
+ _lock = false;
 send_cmd(command::set_hue, val / 1000.0f);
 }
 }
@@ -1160,6 +1180,10 @@
 {
 if (!_lock)
 {
+ _params->hue = val;
+ _lock = true;
+ _h_slider->setValue(val * 1000.0);
+ _lock = false;
 send_cmd(command::set_hue, static_cast<float>(val));
 }
 }
@@ -1168,6 +1192,10 @@
 {
 if (!_lock)
 {
+ _params->saturation = val / 1000.0f;
+ _lock = true;
+ _s_spinbox->setValue(val / 1000.0f);
+ _lock = false;
 send_cmd(command::set_saturation, val / 1000.0f);
 }
 }
@@ -1176,6 +1204,10 @@
 {
 if (!_lock)
 {
+ _params->saturation = val;
+ _lock = true;
+ _s_slider->setValue(val * 1000.0);
+ _lock = false;
 send_cmd(command::set_saturation, static_cast<float>(val));
 }
 }
@@ -1223,7 +1255,7 @@
 
 
 crosstalk_dialog::crosstalk_dialog(parameters *params, QWidget *parent) : QDialog(parent),
- _lock(false), _params(params)
+ _params(params), _lock(false)
 {
 setModal(false);
 setWindowTitle(_("Display Crosstalk Calibration"));
@@ -1274,17 +1306,14 @@
 {
 if (!_lock)
 {
+ _params->crosstalk_r = _r_spinbox->value();
+ _params->crosstalk_g = _g_spinbox->value();
+ _params->crosstalk_b = _b_spinbox->value();
 std::ostringstream v;
 s11n::save(v, static_cast<float>(_r_spinbox->value()));
 s11n::save(v, static_cast<float>(_g_spinbox->value()));
 s11n::save(v, static_cast<float>(_b_spinbox->value()));
 send_cmd(command::set_crosstalk, v.str());
- /* Also set crosstalk levels in init data, because this must also work in
- * the absence of a player that interpretes the above command (i.e. when
- * no video is currently playing */
- _params->crosstalk_r = _r_spinbox->value();
- _params->crosstalk_g = _g_spinbox->value();
- _params->crosstalk_b = _b_spinbox->value();
 }
 }
 
@@ -1461,12 +1490,10 @@
 {
 std::string encoding = _encoding_checkbox->isChecked()
 ? _encoding_combobox->currentText().toStdString() : "";
+ _params->subtitle_encoding = encoding;
 std::ostringstream v;
 s11n::save(v, encoding);
 send_cmd(command::set_subtitle_encoding, v.str());
- /* Also set in init data, because this must also work in the absence of a player
- * that interpretes the above command (i.e. when no video is currently playing). */
- _params->subtitle_encoding = encoding;
 }
 }
 
@@ -1477,12 +1504,10 @@
 std::string font = _font_checkbox->isChecked()
 ? _font_combobox->currentFont().family().toLocal8Bit().constData()
 : "";

bino-1.1.3.tar.bz2/src/player_qt.h -> bino-1.2.1.tar.bz2/src/player_qt.h Changed

@@ -162,6 +162,7 @@
     Q_OBJECT
 
 private:
+    parameters *_params;
     bool _lock;
     QDoubleSpinBox *_c_spinbox;
     QSlider *_c_slider;
@@ -183,7 +184,7 @@
     void s_spinbox_changed(double val);
 
 public:
-    color_dialog(const parameters &params, QWidget *parent);
+    color_dialog(parameters *params, QWidget *parent);
 
     virtual void receive_notification(const notification &note);
 };
@@ -193,11 +194,11 @@
     Q_OBJECT
 
 private:
+    parameters *_params;
     bool _lock;
     QDoubleSpinBox *_r_spinbox;
     QDoubleSpinBox *_g_spinbox;
     QDoubleSpinBox *_b_spinbox;
-    parameters *_params;
 
 private slots:
     void spinbox_changed();
@@ -249,6 +250,7 @@
     Q_OBJECT
 
 private:
+    parameters *_params;
     bool _lock;
     QDoubleSpinBox *_p_spinbox;
     QSlider *_p_slider;
@@ -266,7 +268,7 @@
     void g_spinbox_changed(double val);
 
 public:
-    stereoscopic_dialog(const parameters &params, QWidget *parent);
+    stereoscopic_dialog(parameters *params, QWidget *parent);
 
     virtual void receive_notification(const notification &note);
 };

bino-1.1.3.tar.bz2/src/video_output.cpp -> bino-1.2.1.tar.bz2/src/video_output.cpp Changed

bino-1.1.3.tar.bz2/src/video_output_qt.cpp -> bino-1.2.1.tar.bz2/src/video_output_qt.cpp Changed

@@ -235,7 +235,7 @@
 
 video_container_widget::video_container_widget(QWidget *parent) : QWidget(parent), _w(64), _h(64)
 {
-    setWindowIcon(QIcon(":logo/bino_logo_small_64x64.png"));
+    setWindowIcon(QIcon(":logo/bino/64x64/bino.png"));
     // Set minimum size > 0 so that the container is always visible
     setMinimumSize(_w, _h);
     // Set suitable size policy
@@ -393,6 +393,13 @@
 void video_output_qt::create_widget()
 {
     _widget = new video_output_qt_widget(this, _format, _container_widget);
+    if (!_widget->context()->isValid())
+    {
+        // TODO: replace the error message with a better one once the freeze
+        // of translatable strings is over.
+        QMessageBox::critical(_widget, _("Error"), _("Cannot set OpenGL context format."));
+        std::exit(1);
+    }
     QObject::connect(_container_widget, SIGNAL(move_event()), _widget, SLOT(move_event()));
     if ((_format.doubleBuffer() && !_widget->format().doubleBuffer())
             || (_format.stereo() && !_widget->format().stereo()))
@@ -413,7 +420,7 @@
         catch (std::exception &e)
         {
             QMessageBox::critical(_widget, _("Error"), e.what());
-            abort();
+            std::exit(1);
         }
     }
     QGridLayout *container_layout = new QGridLayout();
@@ -671,6 +678,8 @@
             /* According to the Qt documentation, it should be sufficient to call activateWindow()
              * to make a X11 window active when using Qt::X11BypassWindowManagerHint, but this
              * does not work for me (Ubuntu 11.04 Gnome-2D desktop). This is a workaround. */
+            /* Note that using X11 functions directly means that we have to link with libX11
+             * explicitly; see configure.ac. */
             QApplication::syncX();      // just for safety; not sure if it is necessary
             XSetInputFocus(QX11Info::display(), _container_widget->winId(), RevertToParent, CurrentTime);
             XFlush(QX11Info::display());