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 18

bino.changes Changed

bino.spec Changed

@@ -13,8 +13,12 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 
+%if 0%{?suse_version} > 1210
+%define _with_equalizer 1
+%endif
+
 Name:           bino
-Version:        1.4.4
+Version:        1.6.0
 Release:        0
 Summary:        Video Player with 3D and Multi-Display Video Support
 Source:         http://download-mirror.savannah.gnu.org/releases/bino/bino-%{version}.tar.xz
@@ -35,6 +39,10 @@
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  update-desktop-files
 BuildRequires:  xz
+%if 0%{?with_equalizer}
+BuildRequires:  equalizer-devel
+BuildRequires:  Mesa-libGL-devel
+%endif
 Requires:       %install_info_prereq
 
 %description
@@ -52,7 +60,10 @@
 export LDFLAGS="%{optflags} -zmuldefs"
 %endif
 %configure \
-    --disable-silent-rules 
+    --disable-silent-rules \
+    %if 0%{?with_equalizer}
+    --with-equalizer
+    %endif
 
 %__make %{?_smp_flags}
 
@@ -61,7 +72,7 @@
 
 %__rm -rf "%{buildroot}%{_datadir}/doc"
 
-%suse_update_desktop_file -r "%{name}" AudioVideo Player
+%suse_update_desktop_file -r "%{name}" AudioVideo Video Player
 %find_lang "%{name}" || echo -n >"%{name}.lang"
 
 %post
@@ -80,6 +91,9 @@
 %doc %{_infodir}/bino.info%{ext_info}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/*/*/apps/bino.*
+%if 0%{?suse_version} == 1110
+%exclude %{_datadir}/locale/zh_cn
+%endif
 
 %changelog

_service:download_files:bino-1.4.4.tar.xz/AUTHORS -> _service:download_files:bino-1.6.0.tar.xz/AUTHORS Changed

_service:download_files:bino-1.4.4.tar.xz/ChangeLog -> _service:download_files:bino-1.6.0.tar.xz/ChangeLog Changed

@@ -1,14 +1,174 @@
-commit 0716d8b316ef0799976375c9a52632ecb89e9ab5
+commit 8476381a9817c51f7c535463111db1eb1f6272c3
 Author: Martin Lambers <marlam@marlam.de>
-Date: 2013-11-18 19:42:07 +0100
+Date: 2014-09-19 19:53:18 +0200
 
- Bump version to 1.4.4.
+ Avoid the unreliable QKeySequence::Quit, use Ctrl+Q explicitly.
 
- AUTHORS | 2 +-
- configure.ac | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ src/gui.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 002c39111723e036fd98a3f265f24934c9b2d57c
+Author: Frank Hill <hxf.prc@gmail.com>
+Date: 2014-09-16 22:21:14 +0200
+
+ Update Simplified Chinese Translation.
+
+ po/zh_cn.po | 68 +++++++++++++++++++++++++++++++++-----------------------------------
+ 1 file changed, 33 insertions(+), 35 deletions(-)
+
+commit e2ebd326c18ba8a42ec4179643ea0ed7e492e0d2
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2014-09-11 21:14:29 +0200
+
+ Update NEWS.
+
+ NEWS | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit ef3a314ba733b5cebe72d1fac46d367208b0625b
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2014-09-11 21:14:18 +0200
+
+ Update README.Windows.
+
+ README.Windows | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 948a55cc3de2a000f0f856b86c38b49b6a114469
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2014-09-11 19:57:00 +0200
+
+ Update de.po.
+
+ po/de.po | 831 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
+ 1 file changed, 425 insertions(+), 406 deletions(-)
+
+commit 6758337bd133f4a7f5be8d20850d3c3186ee84d1
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2014-09-11 19:46:00 +0200
+
+ Update gettext files to 0.19.x.
+
+ build-aux/config.rpath | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------
+ po/Makefile.in.in | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
+ po/Rules-quot | 15 +++++++++++++--
+ 3 files changed, 121 insertions(+), 67 deletions(-)
+
+commit 323155686afd7d514e7a8b384f0edd975a22ae06
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2014-09-11 19:34:19 +0200
+
+ Bump version to 1.6.0, and update copyright messages.
+
+ AUTHORS | 4 ++--
+ configure.ac | 2 +-
+ doc/bino.1 | 4 ++--
+ doc/bino.texi | 2 +-
+ po/bg.po | 8 ++++----
+ po/cs.po | 10 +++++-----
+ po/de.po | 10 +++++-----
+ po/fr.po | 10 +++++-----
+ po/pl.po | 10 +++++-----
+ po/ru.po | 10 +++++-----
+ po/zh_cn.po | 10 +++++-----
+ src/gui.cpp | 4 ++--
+ src/main.cpp | 4 ++--
+ 13 files changed, 44 insertions(+), 44 deletions(-)
+
+commit a0b37a84f5464cffb3ebe52cac1c73cf4d476632
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2014-04-29 14:55:09 +0200
+
+ Fix building with latest Equalizer version.
+
+ src/player_equalizer.cpp | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+commit f78c6a1593e91f56e10b28662786e311316ec444
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2014-03-08 19:31:16 +0100
+
+ Remove obsolete workaround for NVIDIA driver bug.
+ 
+ The workaround seems to make problems for other platforms or drivers.
+
+ src/video_output_qt.cpp | 17 +----------------
+ 1 file changed, 1 insertion(+), 16 deletions(-)
+
+commit 44debf880ab1139c509ee361fa27b34f6aa2daed
+Author: Frank Hill <hxf.prc@gmail.com>
+Date: 2014-03-05 19:47:31 +0100
+
+ Update Simplified Chinese Translation.
 
-commit 0b89600080b1b84a454a50749a7c8cf2e33555a2
+ po/zh_cn.po | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+commit 8c55e62aed46f1c682ffd9e932a8efe95c1aebbc
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2014-02-24 10:08:06 +0100
+
+ Add configure flag --with-qt-version to choose Qt version 4 or 5. Version 4 remains the default for now.
+
+ configure.ac | 39 +++++++++++++++++++++++----------------
+ 1 file changed, 23 insertions(+), 16 deletions(-)
+
+commit 1dbaef648c93631cc9b8c21acaf4d261d662ca35
+Author: Frank Hill <hxf.prc@gmail.com>
+Date: 2014-01-16 18:00:53 +0100
+
+ Update Simplified Chinese translation.
+
+ po/zh_cn.po | 843 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------
+ 1 file changed, 431 insertions(+), 412 deletions(-)
+
+commit 14a170787be2f7c6980828ef480d0401379b0b76
+Author: Vittorio Giovara <vittorio.giovara@gmail.com>
+Date: 2013-12-18 16:03:07 +0100
+
+ replace r_frame_rate istances for newer lavfo compatibility
+
+ src/media_object.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 78023424d4cf42927681e6a6835d219ef7d6609c
+Author: Vittorio Giovara <vittorio.giovara@gmail.com>
+Date: 2014-01-07 02:35:03 +0100
+
+ use av_frame_alloc() instead of avcodec_alloc_frame() when available
+
+ src/media_object.cpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+commit 46015fce280e51e49866a9b2d9cbbaae794b882c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2014-01-05 16:27:16 +0100
+
+ Add copyright information and credits for last two patches.
+
+ AUTHORS | 1 +
+ src/media_object.cpp | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+commit e79519e7b426bbef45b80b06bacf007593738c55
+Author: Vittorio Giovara <vittorio.giovara@gmail.com>
+Date: 2013-12-18 16:03:09 +0100
+
+ deprecate lowres usage for newer lavc compatibility
+
+ src/media_object.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+commit 50b7109633fab4a2e6e76c2fd3f00b08158a268f
+Author: Vittorio Giovara <vittorio.giovara@gmail.com>
+Date: 2013-12-18 16:03:06 +0100
+
+ update CodecId istances for newer lavc compatibility
+
+ src/media_object.cpp | 21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
+
+commit 2d3ea1ef0f1ab8c6b739522b43bd05500ec632e8
 Author: Martin Lambers <marlam@marlam.de>
 Date: 2013-11-18 19:39:16 +0100
 
@@ -20,36 +180,26 @@
 src/media_object.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 381a8c2cff519b459d20f0cb10f587582f02ce70
+commit 26e0b964572b59a303aa8673dc6d224798298048
 Author: Martin Lambers <marlam@marlam.de>
-Date: 2013-11-11 20:59:31 +0100
+Date: 2013-11-12 08:29:41 +0100
 
- Autotools update.
+ Makefile.am: cosmetic adjustment for newer automake
 
- .gitignore | 1 +
- INSTALL | 8 ++++----
- 2 files changed, 5 insertions(+), 4 deletions(-)
+ src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)

_service:download_files:bino-1.4.4.tar.xz/INSTALL -> _service:download_files:bino-1.6.0.tar.xz/INSTALL Changed

_service:download_files:bino-1.4.4.tar.xz/Makefile.in -> _service:download_files:bino-1.6.0.tar.xz/Makefile.in Changed

_service:download_files:bino-1.4.4.tar.xz/NEWS -> _service:download_files:bino-1.6.0.tar.xz/NEWS Changed

_service:download_files:bino-1.4.4.tar.xz/README.Windows -> _service:download_files:bino-1.6.0.tar.xz/README.Windows Changed

_service:download_files:bino-1.4.4.tar.xz/aclocal.m4 -> _service:download_files:bino-1.6.0.tar.xz/aclocal.m4 Changed

@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.14 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
@@ -21,7 +21,7 @@
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
 # gettext.m4 serial 66 (gettext-0.18.2)
-dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -423,7 +423,7 @@
 AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
 
 # iconv.m4 serial 18 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -692,7 +692,7 @@
 ])
 
 # intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -749,7 +749,7 @@
 ])
 
 # lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -869,7 +869,7 @@
 ])
 
 # lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -1647,7 +1647,7 @@
 ])
 
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -1872,7 +1872,7 @@
 ])
 
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -2064,8 +2064,63 @@
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# po.m4 serial 21 (gettext-0.18.3)
-dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+ [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+ [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
+# po.m4 serial 22 (gettext-0.19)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -2096,7 +2151,7 @@
 
 dnl Release version of the gettext macros. This is used to ensure that
 dnl the gettext macros and po/Makefile.in.in are in sync.
- AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
 
 dnl Perform the following tests also if --disable-nls has been given,
 dnl because they are needed for "make dist" to work.
@@ -2519,7 +2574,7 @@
 ])
 
 # progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -2625,7 +2680,7 @@
 [am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14], [],
+m4_if([$1], [1.14.1], [],
 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -2641,7 +2696,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -3163,7 +3218,8 @@
 END
 AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
 fi
-fi])
+fi
+])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further

_service:download_files:bino-1.4.4.tar.xz/build-aux/config.guess -> _service:download_files:bino-1.6.0.tar.xz/build-aux/config.guess Changed

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2013-06-10'
+timestamp='2014-03-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@
 	LIBC=gnu
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 	;;
 esac
 
@@ -826,7 +826,7 @@
 *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
- i*:MSYS*:*)
+ *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
 i*:windows32*:*)
@@ -969,10 +969,10 @@
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
- or1k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
 	exit ;;
- or32:Linux:*:*)
+ or32:Linux:*:* | or1k*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 padre:Linux:*:*)
@@ -1260,16 +1260,26 @@
 	if test "$UNAME_PROCESSOR" = unknown ; then
 	 UNAME_PROCESSOR=powerpc
 	fi
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	 then
-		case $UNAME_PROCESSOR in
-		 i386) UNAME_PROCESSOR=x86_64 ;;
-		 powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		esac
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		 grep IS_64BIT_ARCH >/dev/null
+		then
+		 case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		 esac
+		fi
 	 fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	 # Avoid executing cc on OS X 10.9, as it ships with a stub
+	 # that puts up a graphical alert prompting to install
+	 # developer tools. Any system running Mac OS X 10.7 or
+	 # later (Darwin 11 and later) is required to have a 64-bit
+	 # processor. This is not true of the ARM version of Darwin
+	 # that Apple uses in portable devices.
+	 UNAME_PROCESSOR=x86_64
 	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
@@ -1361,154 +1371,6 @@
 	exit ;;
 esac
 
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach $[0-9]*$.*/\1/p') 2>/dev/null`;
- if (version < 4)
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
-
- if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-# include <sys/param.h>
-# if defined (BSD)
-# if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-# else
-# if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# endif
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# else
- printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)

_service:download_files:bino-1.4.4.tar.xz/build-aux/config.rpath -> _service:download_files:bino-1.6.0.tar.xz/build-aux/config.rpath Changed

@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-# Copyright 1996-2010 Free Software Foundation, Inc.
+# Copyright 1996-2014 Free Software Foundation, Inc.
 # Taken from GNU libtool, 2001
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -25,7 +25,7 @@
 # known workaround is to choose shorter directory names for the build
 # directory and/or the installation directory.
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 shrext=.so
@@ -57,13 +57,6 @@
 aix*)
 wl='-Wl,'
 ;;
- darwin*)
- case $cc_basename in
- xlc*)
- wl='-Wl,'
- ;;
- esac
- ;;
 mingw* | cygwin* | pw32* | os2* | cegcc*)
 ;;
 hpux9* | hpux10* | hpux11*)
@@ -72,9 +65,7 @@
 irix5* | irix6* | nonstopux*)
 wl='-Wl,'
 ;;
- newsos6)
- ;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
 case $cc_basename in
 ecc*)
 wl='-Wl,'
@@ -85,17 +76,26 @@
 lf95*)
 wl='-Wl,'
 ;;
- pgcc | pgf77 | pgf90)
+ nagfor*)
+ wl='-Wl,-Wl,,'
+ ;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
 wl='-Wl,'
 ;;
 ccc*)
 wl='-Wl,'
 ;;
+ xl* | bgxl* | bgf* | mpixl*)
+ wl='-Wl,'
+ ;;
 como)
 wl='-lopt='
 ;;
 *)
 case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ F* | *Sun*Fortran*)
+ wl=
+ ;;
 *Sun\ C*)
 wl='-Wl,'
 ;;
@@ -103,13 +103,24 @@
 ;;
 esac
 ;;
+ newsos6)
+ ;;
+ *nto* | *qnx*)
+ ;;
 osf3* | osf4* | osf5*)
 wl='-Wl,'
 ;;
 rdos*)
 ;;
 solaris*)
- wl='-Wl,'
+ case $cc_basename in
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+ wl='-Qoption ld '
+ ;;
+ *)
+ wl='-Wl,'
+ ;;
+ esac
 ;;
 sunos4*)
 wl='-Qoption ld '
@@ -171,15 +182,14 @@
 fi
 ;;
 amigaos*)
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
- # to version 4, is to share data among multiple programs linked
- # with the same dynamic library. Since this doesn't match the
- # behavior of shared libraries on other platforms, we cannot use
- # them.
- ld_shlibs=no
+ case "$host_cpu" in
+ powerpc)
+ ;;
+ m68k)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+ esac
 ;;
 beos*)
 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -198,11 +208,13 @@
 ld_shlibs=no
 fi
 ;;
+ haiku*)
+ ;;
 interix[3-9]*)
 hardcode_direct=no
 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 ;;
- gnu* | linux* | k*bsd*-gnu)
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 :
 else
@@ -325,10 +337,14 @@
 fi
 ;;
 amigaos*)
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- # see comment about different semantics on the GNU ld section
- ld_shlibs=no
+ case "$host_cpu" in
+ powerpc)
+ ;;
+ m68k)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+ esac
 ;;
 bsdi[45]*)
 ;;
@@ -342,29 +358,16 @@
 ;;
 darwin* | rhapsody*)
 hardcode_direct=no
- if test "$GCC" = yes ; then
+ if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
 :
 else
- case $cc_basename in
- xlc*)
- ;;
- *)
- ld_shlibs=no
- ;;
- esac
+ ld_shlibs=no
 fi
 ;;
 dgux*)
 hardcode_libdir_flag_spec='-L$libdir'
 ;;
- freebsd1*)
- ld_shlibs=no
- ;;
- freebsd2.2*)
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- ;;
- freebsd2*)
+ freebsd2.[01]*)
 hardcode_direct=yes
 hardcode_minus_L=yes
 ;;
@@ -420,6 +423,8 @@
 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 hardcode_libdir_separator=:
 ;;
+ *nto* | *qnx*)
+ ;;
 openbsd*)
 if test -f /usr/libexec/ld.so; then
 hardcode_direct=yes
@@ -515,7 +520,12 @@
 library_names_spec='$libname$shrext'
 ;;

_service:download_files:bino-1.4.4.tar.xz/build-aux/config.sub -> _service:download_files:bino-1.6.0.tar.xz/build-aux/config.sub Changed

_service:download_files:bino-1.4.4.tar.xz/build-aux/missing -> _service:download_files:bino-1.6.0.tar.xz/build-aux/missing Changed

_service:download_files:bino-1.4.4.tar.xz/config.h.in -> _service:download_files:bino-1.6.0.tar.xz/config.h.in Changed

@@ -32,21 +32,6 @@
 don't. */
 #undef HAVE_DECL_OPTRESET
 
-/* Define to 1 if you have the `fdatasync' function. */
-#undef HAVE_FDATASYNC
-
-/* Define to 1 if you have the `fnmatch' function. */
-#undef HAVE_FNMATCH
-
-/* Define to 1 if you have the `fseeko' function. */
-#undef HAVE_FSEEKO
-
-/* Define to 1 if you have the `ftello' function. */
-#undef HAVE_FTELLO
-
-/* Define to 1 if you have the `getpwuid' function. */
-#undef HAVE_GETPWUID
-
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
@@ -65,15 +50,9 @@
 /* Have NVIDIA libXNVCtrl for Quadro SDI output? */
 #undef HAVE_LIBXNVCTRL
 
-/* Define to 1 if you have the `link' function. */
-#undef HAVE_LINK
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to 1 if you have the `mmap' function. */
-#undef HAVE_MMAP
-
 /* Define to 1 if you have the `nl_langinfo' function. */
 #undef HAVE_NL_LANGINFO
 
@@ -83,12 +62,6 @@
 /* Define to 1 if you have the <NVCtrl.h> header file. */
 #undef HAVE_NVCTRL_H
 
-/* Define to 1 if you have the `posix_fadvise' function. */
-#undef HAVE_POSIX_FADVISE
-
-/* Define to 1 if you have the `readdir_r' function. */
-#undef HAVE_READDIR_R
-
 /* Define to 1 if you have the `sigaction' function. */
 #undef HAVE_SIGACTION
 
@@ -104,9 +77,6 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `symlink' function. */
-#undef HAVE_SYMLINK
-
 /* Define to 1 if you have the `sysconf' function. */
 #undef HAVE_SYSCONF
 
@@ -125,6 +95,9 @@
 /* Define to 1 if you have the `wcswidth' function. */
 #undef HAVE_WCSWIDTH
 
+/* Whether we are running on X11 */
+#undef HAVE_X11
+
 /* Define as const if the declaration of iconv() needs const. */
 #undef ICONV_CONST

_service:download_files:bino-1.4.4.tar.xz/configure -> _service:download_files:bino-1.6.0.tar.xz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Bino 1.4.4.
+# Generated by GNU Autoconf 2.69 for Bino 1.6.0.
 #
 # Report bugs to <bino-list@nongnu.org>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='Bino'
 PACKAGE_TARNAME='bino'
-PACKAGE_VERSION='1.4.4'
-PACKAGE_STRING='Bino 1.4.4'
+PACKAGE_VERSION='1.6.0'
+PACKAGE_STRING='Bino 1.6.0'
 PACKAGE_BUGREPORT='bino-list@nongnu.org'
 PACKAGE_URL='http://bino3d.org/'
 
@@ -812,6 +812,7 @@
 with_libiconv_prefix
 enable_nls
 with_libintl_prefix
+with_qt_version
 with_equalizer
 with_xnvctrl
 with_liblircclient
@@ -1400,7 +1401,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.4.4 to adapt to many kinds of systems.
+\`configure' configures Bino 1.6.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1471,7 +1472,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of Bino 1.4.4:";;
+ short | recursive ) echo "Configuration of Bino 1.6.0:";;
 esac
 cat <<\_ACEOF
 
@@ -1498,6 +1499,8 @@
 --without-libiconv-prefix don't search for libiconv in includedir and libdir
 --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
 --without-libintl-prefix don't search for libintl in includedir and libdir
+ --with-qt-version Choose Qt version. Currently 4 or 5; 4 is the
+ default.
 --without-equalizer Disable multi-display support via Equalizer (enabled
 by default)
 --with-xnvctrl Enable NVIDIA Quadro SDI output (disabled by
@@ -1639,7 +1642,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-Bino configure 1.4.4
+Bino configure 1.6.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1972,56 +1975,56 @@
 
 } # ac_fn_cxx_try_run
 
-# ac_fn_cxx_check_decl LINENO SYMBOL VAR INCLUDES
-# -----------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_cxx_check_decl ()
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- as_decl_name=`echo $2|sed 's/ *(.*//'`
- as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+ }; then :
+ ac_retval=0
 else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-#ifndef $as_decl_name
-#ifdef __cplusplus
- (void) $as_decl_use;
-#else
- (void) $as_decl_name;
-#endif
-#endif
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	ac_retval=1
 fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
 
-} # ac_fn_cxx_check_decl
+} # ac_fn_cxx_try_link
 
-# ac_fn_cxx_try_link LINENO
-# -------------------------
+# ac_fn_c_try_link LINENO
+# -----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
+ac_fn_c_try_link ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 rm -f conftest.$ac_objext conftest$ac_exeext
@@ -2041,7 +2044,7 @@
 fi
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
 } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
@@ -2062,12 +2065,12 @@
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 
-} # ac_fn_cxx_try_link
+} # ac_fn_c_try_link
 
-# ac_fn_cxx_check_func LINENO FUNC VAR
-# ------------------------------------
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_cxx_check_func ()
+ac_fn_c_check_func ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
@@ -2116,7 +2119,7 @@
 return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval "$3=yes"
 else
 eval "$3=no"
@@ -2129,53 +2132,120 @@
 $as_echo "$ac_res" >&6; }
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

_service:download_files:bino-1.4.4.tar.xz/configure.ac -> _service:download_files:bino-1.6.0.tar.xz/configure.ac Changed

@@ -4,7 +4,7 @@
 dnl
 dnl This file is part of bino, a 3D video player.
 dnl
-dnl Copyright (C) 2010, 2011, 2012, 2013
+dnl Copyright (C) 2010, 2011, 2012, 2013, 2014
 dnl Martin Lambers <marlam@marlam.de>
 dnl Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
 dnl Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
@@ -24,7 +24,7 @@
 
 dnl Autotools init stuff
 AC_PREREQ([2.63])
-AC_INIT([Bino], [1.4.4], [bino-list@nongnu.org], [bino], [http://bino3d.org/])
+AC_INIT([Bino], [1.6.0], [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])
@@ -41,6 +41,16 @@
 AC_LANG([C++])
 AC_C_BIGENDIAN
 
+dnl Check if the C++ compiler works. Autoconf will not do that for us!?
+AC_MSG_CHECKING([whether the C++ compiler works])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])], [COMPILER_WORKS=1], [COMPILER_WORKS=0])
+if test "$COMPILER_WORKS" = "1"; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([The C++ compiler was not found or does not work.])
+fi
+
 dnl Useful definitions
 AC_DEFINE_UNQUOTED([PLATFORM], ["${target}"], [Platform triplet])
 
@@ -77,7 +87,24 @@
 AC_DEFINE_UNQUOTED([NDEBUG], [1], [Define to 1 to disable assertions and other debugging checks.])
 fi
 
-dnl Feature checks needed by the base module
+dnl Feature checks needed by the base modules
+AC_LANG_PUSH([C])
+dnl - dbg
+AC_CHECK_FUNCS([backtrace sigaction])
+dnl - endianness
+dnl AC_C_BIGENDIAN
+dnl - fio
+dnl case "${target}" in *-*-mingw*) LIBS="$LIBS -lshlwapi" ;; esac
+dnl AC_CHECK_FUNCS([fdatasync fnmatch fseeko ftello getpwuid link mmap posix_fadvise readdir_r symlink])
+dnl - opt
+case "${target}" in *-*-mingw*) CPPFLAGS="$CPPFLAGS -D_BSD_SOURCE" ;; esac
+AC_CHECK_DECLS([optreset], [], [], [#include <getopt.h>])
+dnl - str
+AM_ICONV([])
+AC_CHECK_FUNCS([nl_langinfo vasprintf wcswidth])
+dnl - sys
+dnl AC_CHECK_FUNCS([nanosleep sysconf sched_yield])
+dnl - thread
 AC_MSG_CHECKING([for GCC atomic builtins])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
 [[int b, x = 0; b = __sync_bool_compare_and_swap(&x, 0, 1);]])],
@@ -88,15 +115,16 @@
 AC_MSG_RESULT([no])
 AC_MSG_ERROR([GCC atomic builtins not found. Please use a newer compiler.])
 fi
-AC_CHECK_DECLS([optreset], [#include <getopt.h>])
-AC_SEARCH_LIBS([clock_gettime], [rt])
 AC_SEARCH_LIBS([pthread_create], [pthread])
-AC_CHECK_FUNCS([backtrace clock_gettime fdatasync fnmatch fseeko ftello getpwuid link mmap nl_langinfo posix_fadvise readdir_r sigaction symlink sysconf vasprintf wcswidth])
 CPPFLAGS_bak="$CPPFLAGS"
 LDFLAGS_bak="$LDFLAGS"
 CPPFLAGS="-pthread $CPPFLAGS"
 LDFLAGS="-pthread $LDFLAGS"
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [], [CPPFLAGS="$CPPFLAGS_bak"; LDFLAGS="$LDFLAGS_bak"])
+dnl - timer
+AC_SEARCH_LIBS([clock_gettime], [rt])
+AC_CHECK_FUNCS([clock_gettime])
+AC_LANG_POP([C])
 
 dnl Gettext
 AC_LANG_PUSH([C])
@@ -162,41 +190,47 @@
 fi
 
 dnl Qt
+qt_version=""
+AC_ARG_WITH([qt-version],
+ [AS_HELP_STRING([--with-qt-version], [Choose Qt version. Currently 4 or 5; 4 is the default.])],
+ [qt_version="$withval"], [qt_version="4"])
+if test "$qt_version" != "4" -a "$qt_version" != "5"; then
+ AC_MSG_WARN([unknown Qt version requested, falling back to Qt 4.])
+ qt_version="4"
+fi
 AC_ARG_VAR([RCC], [rcc command])
 AC_ARG_VAR([MOC], [moc command])
-PKG_CHECK_MODULES([libqtopengl], [QtOpenGL >= 4.6], [HAVE_LIBQTOPENGL=1], [HAVE_LIBQTOPENGL=0])
-if test "$HAVE_LIBQTOPENGL" != "1"; then
- 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
- if test -z "$RCC"; then
- AC_CHECK_TOOLS([RCC], [rcc-qt4 rcc])
- fi
- if test -z "$MOC"; then
- AC_CHECK_TOOLS([MOC], [moc-qt4 moc])
- fi
- 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"
+if test "$qt_version" = "4"; then
+ PKG_CHECK_MODULES([libqtopengl], [QtOpenGL >= 4.6], [HAVE_LIBQTOPENGL=1], [HAVE_LIBQTOPENGL=0])
+ if test "$HAVE_LIBQTOPENGL" != "1"; then
+ AC_MSG_WARN([required library QtOpenGL not found:])
+ AC_MSG_WARN([$libqtopengl_PKG_ERRORS])
+ AC_MSG_WARN([QtOpenGL is provided by Qt])
+ else
+ if test -z "$RCC"; then
+ AC_CHECK_TOOLS([RCC], [rcc-qt4 rcc])
+ fi
+ if test -z "$MOC"; then
+ AC_CHECK_TOOLS([MOC], [moc-qt4 moc])
+ fi
 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])
+ dnl Check if we are running on X11. Needed for GLXEW.
+ AC_MSG_CHECKING([whether Qt uses 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"])
+ #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])
+ dnl With Qt4, we use X11 functions directly, and thus need to link with -lX11
 if test "$NEED_LIBX11" = "yes"; then
+ AC_DEFINE([HAVE_X11], [1], [Whether we are running on X11])
 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:])
@@ -205,6 +239,41 @@
 libqtopengl_CFLAGS="$libqtopengl_CFLAGS $libX11_CFLAGS"
 libqtopengl_LIBS="$libqtopengl_LIBS $libX11_LIBS"
 fi
+ else
+ AC_DEFINE([HAVE_X11], [0], [Whether we are running on X11])
+ fi
+else
+ PKG_CHECK_MODULES([libqtopengl], [Qt5OpenGL >= 5.1], [HAVE_LIBQTOPENGL=1], [HAVE_LIBQTOPENGL=0])
+ if test -z "$RCC"; then
+ AC_CHECK_TOOLS([RCC], [rcc-qt5 rcc])
+ fi
+ if test -z "$MOC"; then
+ AC_CHECK_TOOLS([MOC], [moc-qt5 moc])
+ fi
+ dnl Qt5 on Linux requires -fPIE / -pie with gcc, but does not record this fact
+ dnl in the pkg-config files (which is a bug in my opinion). Work around that.
+ AC_MSG_CHECKING([whether Qt needs -fPIE and -pie])
+ if test -n "`$PKG_CONFIG --variable=qt_config Qt5Core | $GREP reduce_relocations`"; then
+ AC_MSG_RESULT([yes])
+ CXXFLAGS="$CXXFLAGS -fPIE"
+ LDFLAGS="$LDFLAGS -pie"
+ else
+ AC_MSG_RESULT([no])
+ fi
+ dnl Check if we are running on X11. Needed for GLXEW.
+ AC_MSG_CHECKING([whether Qt uses X11])
+ if test -n "`$PKG_CONFIG --variable=qt_config Qt5Core | $GREP xcb`"; then
+ AC_DEFINE([HAVE_X11], [1], [Whether we are running on X11])
+ AC_MSG_RESULT([yes])
+ else
+ AC_DEFINE([HAVE_X11], [0], [Whether we are running on X11])
+ AC_MSG_RESULT([no])
+ fi
+fi
+if test "$HAVE_LIBQTOPENGL" = "1"; then
+ if test -z "$RCC" -o -z "$MOC"; then
+ AC_MSG_WARN([required tools rcc and/or moc not found; Qt not usable])
+ HAVE_LIBQTOPENGL="0"
 fi
 fi

_service:download_files:bino-1.4.4.tar.xz/doc/Makefile.in -> _service:download_files:bino-1.6.0.tar.xz/doc/Makefile.in Changed

_service:download_files:bino-1.4.4.tar.xz/doc/bino.1 -> _service:download_files:bino-1.6.0.tar.xz/doc/bino.1 Changed

_service:download_files:bino-1.4.4.tar.xz/doc/bino.html -> _service:download_files:bino-1.6.0.tar.xz/doc/bino.html Changed

@@ -1,9 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-
 
 <head>
-<title>Bino 1.4.4</title>
+<title>Bino 1.6.0</title>
 
-<meta name="description" content="Bino 1.4.4">
-<meta name="keywords" content="Bino 1.4.4">
+<meta name="description" content="Bino 1.6.0">
+<meta name="keywords" content="Bino 1.6.0">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="Generator" content="makeinfo">
@@ -58,7 +58,7 @@
 </head>
 
 <body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
-<h1 class="settitle" align="center">Bino 1.4.4</h1>
+<h1 class="settitle" align="center">Bino 1.6.0</h1>
 
 
 
@@ -71,10 +71,10 @@
 </div>
 <a name="Bino"></a>
 <h1 class="top">Bino</h1>
-This manual was last updated 22 August 2013 for version
-1.4.4 of Bino.
+This manual was last updated 11 September 2014 for version
+1.6.0 of Bino.
 
-Copyright &copy; 2011, 2012, 2013
+Copyright &copy; 2011, 2012, 2013, 2014
 Martin Lambers (<a href="mailto:marlam@marlam.de">marlam@marlam.de</a>),
 Stefan Eilemann (<a href="mailto:eile@eyescale.ch">eile@eyescale.ch</a>),
 Frédéric Devernay (<a href="mailto:Frederic.Devernay@inrialpes.fr">Frederic.Devernay@inrialpes.fr</a>)

_service:download_files:bino-1.4.4.tar.xz/doc/bino.info -> _service:download_files:bino-1.6.0.tar.xz/doc/bino.info Changed

@@ -1,10 +1,11 @@
 This is bino.info, produced by makeinfo version 5.2 from bino.texi.
 
-This manual was last updated 22 August 2013 for version 1.4.4 of Bino.
+This manual was last updated 11 September 2014 for version 1.6.0 of
+Bino.
 
- Copyright © 2011, 2012, 2013 Martin Lambers (<marlam@marlam.de>),
-Stefan Eilemann (<eile@eyescale.ch>), Frédéric Devernay
-(<Frederic.Devernay@inrialpes.fr>)
+ Copyright © 2011, 2012, 2013, 2014 Martin Lambers
+(<marlam@marlam.de>), Stefan Eilemann (<eile@eyescale.ch>), Frédéric
+Devernay (<Frederic.Devernay@inrialpes.fr>)
 
 Copying and distribution of this file and the accompanying media
 files, with or without modification, are permitted in any medium
@@ -21,11 +22,12 @@
 Bino
 ****
 
-This manual was last updated 22 August 2013 for version 1.4.4 of Bino.
+This manual was last updated 11 September 2014 for version 1.6.0 of
+Bino.
 
- Copyright © 2011, 2012, 2013 Martin Lambers (<marlam@marlam.de>),
-Stefan Eilemann (<eile@eyescale.ch>), Frédéric Devernay
-(<Frederic.Devernay@inrialpes.fr>)
+ Copyright © 2011, 2012, 2013, 2014 Martin Lambers
+(<marlam@marlam.de>), Stefan Eilemann (<eile@eyescale.ch>), Frédéric
+Devernay (<Frederic.Devernay@inrialpes.fr>)
 
 Copying and distribution of this file and the accompanying media
 files, with or without modification, are permitted in any medium
@@ -1225,23 +1227,23 @@
 
 &#x1f;
 Tag Table:
-Node: Top&#x7f;735
-Node: Introduction&#x7f;1524
-Node: Invocation&#x7f;2553
-Node: Input Layouts&#x7f;7033
-Ref: Supported Input Layouts&#x7f;7943
-Ref: File Name Conventions&#x7f;10011
-Node: Output Techniques&#x7f;10923
-Ref: Supported Output Techniques&#x7f;13658
-Ref: Crosstalk Ghostbusting&#x7f;17591
-Ref: Basic Multi Display Support&#x7f;19595
-Ref: Advanced Multi Display Support&#x7f;20737
-Node: Interactive Control&#x7f;32035
-Node: Scripting&#x7f;34053
-Ref: Script Commands&#x7f;36037
-Node: Camera Devices&#x7f;42319
-Node: Audio/Video Synchronization&#x7f;43298
-Node: Performance Tweaking&#x7f;44465
+Node: Top&#x7f;744
+Node: Introduction&#x7f;1542
+Node: Invocation&#x7f;2571
+Node: Input Layouts&#x7f;7051
+Ref: Supported Input Layouts&#x7f;7961
+Ref: File Name Conventions&#x7f;10029
+Node: Output Techniques&#x7f;10941
+Ref: Supported Output Techniques&#x7f;13676
+Ref: Crosstalk Ghostbusting&#x7f;17609
+Ref: Basic Multi Display Support&#x7f;19613
+Ref: Advanced Multi Display Support&#x7f;20755
+Node: Interactive Control&#x7f;32053
+Node: Scripting&#x7f;34071
+Ref: Script Commands&#x7f;36055
+Node: Camera Devices&#x7f;42337
+Node: Audio/Video Synchronization&#x7f;43316
+Node: Performance Tweaking&#x7f;44483
 &#x1f;
 End Tag Table

_service:download_files:bino-1.4.4.tar.xz/doc/bino.texi -> _service:download_files:bino-1.6.0.tar.xz/doc/bino.texi Changed

_service:download_files:bino-1.4.4.tar.xz/doc/stamp-vti -> _service:download_files:bino-1.6.0.tar.xz/doc/stamp-vti Changed

_service:download_files:bino-1.4.4.tar.xz/doc/version.texi -> _service:download_files:bino-1.6.0.tar.xz/doc/version.texi Changed

_service:download_files:bino-1.4.4.tar.xz/po/Makefile.in.in -> _service:download_files:bino-1.6.0.tar.xz/po/Makefile.in.in Changed

@@ -8,13 +8,14 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.18
-GETTEXT_MACRO_VERSION = 0.18
+# Origin: gettext-0.19
+GETTEXT_MACRO_VERSION = 0.19
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
+SED = @SED@
 SHELL = /bin/sh
 @SET_MAKE@
 
@@ -76,6 +77,16 @@
 
 CATALOGS = @CATALOGS@
 
+POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
+POFILESDEPS_yes = $(POFILESDEPS_)
+POFILESDEPS_no =
+POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
+
+DISTFILESDEPS_ = update-po
+DISTFILESDEPS_yes = $(DISTFILESDEPS_)
+DISTFILESDEPS_no =
+DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
+
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
@@ -96,14 +107,14 @@
 	mv t-$@ $@
 
 
-all: check-macro-version all-@USE_NLS@
+all: all-@USE_NLS@
 
 all-yes: stamp-po
 all-no:
 
 # Ensure that the gettext macros and this Makefile.in.in are in sync.
-check-macro-version:
-	@test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+CHECK_MACRO_VERSION = \
+	test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
 	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
 	       exit 1; \
 	     }
@@ -123,6 +134,7 @@
 # $(POFILES) has been designed to not touch files that don't need to be
 # changed.
 stamp-po: $(srcdir)/$(DOMAIN).pot
+	@$(CHECK_MACRO_VERSION)
 	test ! -f $(srcdir)/$(DOMAIN).pot || \
 	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
 	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
@@ -137,11 +149,29 @@
 
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+# The determination of whether the package xyz is a GNU one is based on the
+# heuristic whether some file in the top level directory mentions "GNU xyz".
+# If GNU 'find' is available, we avoid grepping through monster files.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-	if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
-	  package_gnu='GNU '; \
+	package_gnu="$(PACKAGE_GNU)"; \
+	test -n "$$package_gnu" || { \
+	  if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
+		 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
+			       -size -10000000c -exec grep 'GNU @PACKAGE@' \
+			       /dev/null '{}' ';' 2>/dev/null; \
+	       else \
+		 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+	       fi; \
+	     } | grep -v 'libtool:' >/dev/null; then \
+	     package_gnu=yes; \
+	   else \
+	     package_gnu=no; \
+	   fi; \
+	}; \
+	if test "$$package_gnu" = "yes"; then \
+	  package_prefix='GNU '; \
 	else \
-	  package_gnu=''; \
+	  package_prefix=''; \
 	fi; \
 	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
 	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
@@ -161,7 +191,7 @@
 	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
 	      --files-from=$(srcdir)/POTFILES.in \
 	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	      --package-name="$${package_gnu}@PACKAGE@" \
+	      --package-name="$${package_prefix}@PACKAGE@" \
 	      --package-version='@VERSION@' \
 	      --msgid-bugs-address="$$msgid_bugs_address" \
 	    ;; \
@@ -189,9 +219,10 @@
 
 # This target rebuilds a PO file if $(DOMAIN).pot has changed.
 # Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(srcdir)/$(DOMAIN).pot
+$(POFILES): $(POFILESDEPS)
 	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
 	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
 	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
 	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
 	  cd $(srcdir) \
@@ -352,7 +383,7 @@
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
-	$(MAKE) update-po
+	test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
 dist2: stamp-po $(DISTFILES)

_service:download_files:bino-1.4.4.tar.xz/po/Rules-quot -> _service:download_files:bino-1.6.0.tar.xz/po/Rules-quot Changed

@@ -1,3 +1,4 @@
+# This file, Rules-quot, can be copied and used freely without restrictions.
 # Special Makefile rules for English message catalogs with quotation marks.
 
 DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
@@ -14,13 +15,23 @@
 
 .insert-header.po-update-en:
 	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	ll=`echo $$lang | sed -e 's/@.*//'`; \
 	LC_ALL=C; export LC_ALL; \
 	cd $(srcdir); \
-	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
+	   | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
+	   { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	     '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \
+	       $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
+	       ;; \
+	     *) \
+	       $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
+	       ;; \
+	     esac } 2>/dev/null > $$tmpdir/$$lang.new.po \
+	     ; then \
 	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  else \

_service:download_files:bino-1.4.4.tar.xz/po/bg.gmo -> _service:download_files:bino-1.6.0.tar.xz/po/bg.gmo Changed

_service:download_files:bino-1.4.4.tar.xz/po/bg.po -> _service:download_files:bino-1.6.0.tar.xz/po/bg.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: bino 1.4.0\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2013-11-18 19:42+0100\n"
+"POT-Creation-Date: 2014-09-11 19:49+0200\n"
 "PO-Revision-Date: 2012-10-13 00:33+0200\n"
 "Last-Translator: Krasimir S. Stefanov <lokiisyourmaster@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -90,13 +90,18 @@
 msgid "Too many arguments."
 msgstr "Прекалено много аргументи."
 
-#: src/base/str.cpp:268
+#: src/base/str.cpp:269
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Не може да се конвертира низ в %s."
 
-#: src/base/str.cpp:516 src/base/str.cpp:534 src/base/str.cpp:544
-#: src/base/str.cpp:555 src/base/str.cpp:560
+#: src/base/str.cpp:517 src/base/str.cpp:536 src/base/str.cpp:547
+#: src/base/str.cpp:559
+#, fuzzy, c-format
+msgid "Cannot convert %s to %s: %s"
+msgstr "Не може да се конвертира %s в %s."
+
+#: src/base/str.cpp:565
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Не може да се конвертира %s в %s."
@@ -122,9 +127,9 @@
 msgid "OpenAL device '%s' is not available."
 msgstr "OpenAL ustrojstwoto '%s' не е налично."
 
-#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:158
-#: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
-#: src/media_data.cpp:1260
+#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:159
+#: src/media_data.cpp:1207 src/media_data.cpp:1230 src/media_data.cpp:1268
+#: src/media_data.cpp:1273
 msgid "unknown"
 msgstr "непознат"
 
@@ -190,8 +195,8 @@
 msgstr "OpenAL буферите не могат да бъдат премахнати от опашката."
 
 #: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:374 src/media_object.cpp:851 src/media_object.cpp:1322
-#: src/video_output.cpp:419
+#: src/main.cpp:402 src/media_object.cpp:855 src/media_object.cpp:1339
+#: src/video_output.cpp:420
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -201,244 +206,244 @@
 msgid "%s: invalid command '%s'"
 msgstr "%s: невалидна команда '%s'"
 
-#: src/dispatch.cpp:166
+#: src/dispatch.cpp:167
 msgid "Cannot connect to X server."
 msgstr "Няма връзка с X сървъра."
 
-#: src/dispatch.cpp:182
+#: src/dispatch.cpp:183
 msgid "No video to play."
 msgstr "Няма видео за възпроизвеждане."
 
-#: src/dispatch.cpp:437 src/player_equalizer.cpp:85
+#: src/dispatch.cpp:438 src/player_equalizer.cpp:87
 msgid "No video streams found."
 msgstr "Не са открити видео потоци."
 
-#: src/dispatch.cpp:454
+#: src/dispatch.cpp:455
 msgid "Cannot set requested stereo layout: incompatible media."
 msgstr "Не може да се зададе избрания стерео формат: несъвместима медия."
 
-#: src/dispatch.cpp:469
+#: src/dispatch.cpp:470
 #, c-format
 msgid "Video stream %d not found."
 msgstr "Видео потокът %d не бе намерен."
 
-#: src/dispatch.cpp:475
+#: src/dispatch.cpp:476
 #, c-format
 msgid "Audio stream %d not found."
 msgstr "Аудио потокът %d не бе намерен."
 
-#: src/dispatch.cpp:483
+#: src/dispatch.cpp:484
 #, c-format
 msgid "Subtitle stream %d not found."
 msgstr "Потокът със субтитри %d не бе намерен."
 
-#: src/dispatch.cpp:555 src/main.cpp:767
+#: src/dispatch.cpp:559 src/main.cpp:795
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Тази версия на Bino е компилирана без поддръжка на Еквилайзер."
 
-#: src/gui.cpp:107
+#: src/gui.cpp:111
 msgid "Video:"
 msgstr "Видео:"
 
-#: src/gui.cpp:108
+#: src/gui.cpp:112
 msgid "Select the video stream."
 msgstr "Избор на видео поток."
 
-#: src/gui.cpp:114
+#: src/gui.cpp:118
 msgid "Audio:"
 msgstr "Аудио:"
 
-#: src/gui.cpp:115
+#: src/gui.cpp:119
 msgid "Select the audio stream."
 msgstr "Избор на аудио поток."
 
-#: src/gui.cpp:121
+#: src/gui.cpp:125
 msgid "Subtitle:"
 msgstr "Субтитри:"
 
-#: src/gui.cpp:122
+#: src/gui.cpp:126
 msgid "Select the subtitle stream."
 msgstr "Избор на субтитри."
 
-#: src/gui.cpp:133 src/media_input.cpp:276
+#: src/gui.cpp:137 src/media_input.cpp:276
 msgid "Input:"
 msgstr "Вход:"
 
-#: src/gui.cpp:134
+#: src/gui.cpp:138
 msgid "Set the 3D layout of the video stream."
 msgstr "Избор на 3D разположение на видеото."
 
-#: src/gui.cpp:138 src/main.cpp:431
+#: src/gui.cpp:142 src/main.cpp:459
 msgid "2D"
 msgstr "2D"
 
-#: src/gui.cpp:139 src/main.cpp:432
+#: src/gui.cpp:143 src/main.cpp:460
 msgid "Separate streams, left first"
 msgstr "Отделни потоци, първо левия"
 
-#: src/gui.cpp:140 src/main.cpp:433
+#: src/gui.cpp:144 src/main.cpp:461
 msgid "Separate streams, right first"
 msgstr "Отделни потоци, първо десния"
 
-#: src/gui.cpp:141 src/main.cpp:434
+#: src/gui.cpp:145 src/main.cpp:462
 msgid "Alternating, left first"
 msgstr "Редуващи се, първо лява половина"
 
-#: src/gui.cpp:142 src/main.cpp:435
+#: src/gui.cpp:146 src/main.cpp:463
 msgid "Alternating, right first"
 msgstr "Редуващи се, първо дясна половина"
 
-#: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2151 src/gui.cpp:2180
-#: src/main.cpp:436 src/main.cpp:451
+#: src/gui.cpp:147 src/gui.cpp:171 src/gui.cpp:2212 src/gui.cpp:2241
+#: src/main.cpp:464 src/main.cpp:479
 msgid "Top/bottom"
 msgstr "Горе/Долу"
 
-#: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2152 src/gui.cpp:2181
-#: src/main.cpp:437 src/main.cpp:452
+#: src/gui.cpp:148 src/gui.cpp:172 src/gui.cpp:2213 src/gui.cpp:2242
+#: src/main.cpp:465 src/main.cpp:480
 msgid "Top/bottom, half height"
 msgstr "Горе/Долу, половин височина"
 
-#: src/gui.cpp:145 src/main.cpp:438
+#: src/gui.cpp:149 src/main.cpp:466
 msgid "Bottom/top"
 msgstr "Долу/Горе"
 
-#: src/gui.cpp:146 src/main.cpp:439
+#: src/gui.cpp:150 src/main.cpp:467
 msgid "Bottom/top, half height"
 msgstr "Долу/Горе, половин височина"
 
-#: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2153 src/gui.cpp:2182
-#: src/main.cpp:440 src/main.cpp:453
+#: src/gui.cpp:151 src/gui.cpp:173 src/gui.cpp:2214 src/gui.cpp:2243
+#: src/main.cpp:468 src/main.cpp:481
 msgid "Left/right"
 msgstr "Ляво/Дясно"
 
-#: src/gui.cpp:148 src/gui.cpp:170 src/gui.cpp:2154 src/gui.cpp:2183
-#: src/main.cpp:441 src/main.cpp:454

_service:download_files:bino-1.4.4.tar.xz/po/bino.pot -> _service:download_files:bino-1.6.0.tar.xz/po/bino.pot Changed

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: bino 1.4.4\n"
+"Project-Id-Version: bino 1.6.0\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2013-11-18 19:42+0100\n"
+"POT-Creation-Date: 2014-09-11 19:49+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -90,13 +90,18 @@
 msgid "Too many arguments."
 msgstr ""
 
-#: src/base/str.cpp:268
+#: src/base/str.cpp:269
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr ""
 
-#: src/base/str.cpp:516 src/base/str.cpp:534 src/base/str.cpp:544
-#: src/base/str.cpp:555 src/base/str.cpp:560
+#: src/base/str.cpp:517 src/base/str.cpp:536 src/base/str.cpp:547
+#: src/base/str.cpp:559
+#, c-format
+msgid "Cannot convert %s to %s: %s"
+msgstr ""
+
+#: src/base/str.cpp:565
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr ""
@@ -122,9 +127,9 @@
 msgid "OpenAL device '%s' is not available."
 msgstr ""
 
-#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:158
-#: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
-#: src/media_data.cpp:1260
+#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:159
+#: src/media_data.cpp:1207 src/media_data.cpp:1230 src/media_data.cpp:1268
+#: src/media_data.cpp:1273
 msgid "unknown"
 msgstr ""
 
@@ -190,8 +195,8 @@
 msgstr ""
 
 #: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:374 src/media_object.cpp:851 src/media_object.cpp:1322
-#: src/video_output.cpp:419
+#: src/main.cpp:402 src/media_object.cpp:855 src/media_object.cpp:1339
+#: src/video_output.cpp:420
 #, c-format
 msgid "%s: %s"
 msgstr ""
@@ -201,1005 +206,1017 @@
 msgid "%s: invalid command '%s'"
 msgstr ""
 
-#: src/dispatch.cpp:166
+#: src/dispatch.cpp:167
 msgid "Cannot connect to X server."
 msgstr ""
 
-#: src/dispatch.cpp:182
+#: src/dispatch.cpp:183
 msgid "No video to play."
 msgstr ""
 
-#: src/dispatch.cpp:437 src/player_equalizer.cpp:85
+#: src/dispatch.cpp:438 src/player_equalizer.cpp:87
 msgid "No video streams found."
 msgstr ""
 
-#: src/dispatch.cpp:454
+#: src/dispatch.cpp:455
 msgid "Cannot set requested stereo layout: incompatible media."
 msgstr ""
 
-#: src/dispatch.cpp:469
+#: src/dispatch.cpp:470
 #, c-format
 msgid "Video stream %d not found."
 msgstr ""
 
-#: src/dispatch.cpp:475
+#: src/dispatch.cpp:476
 #, c-format
 msgid "Audio stream %d not found."
 msgstr ""
 
-#: src/dispatch.cpp:483
+#: src/dispatch.cpp:484
 #, c-format
 msgid "Subtitle stream %d not found."
 msgstr ""
 
-#: src/dispatch.cpp:555 src/main.cpp:767
+#: src/dispatch.cpp:559 src/main.cpp:795
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr ""
 
-#: src/gui.cpp:107
+#: src/gui.cpp:111
 msgid "Video:"
 msgstr ""
 
-#: src/gui.cpp:108
+#: src/gui.cpp:112
 msgid "Select the video stream."
 msgstr ""
 
-#: src/gui.cpp:114
+#: src/gui.cpp:118
 msgid "Audio:"
 msgstr ""
 
-#: src/gui.cpp:115
+#: src/gui.cpp:119
 msgid "Select the audio stream."
 msgstr ""
 
-#: src/gui.cpp:121
+#: src/gui.cpp:125
 msgid "Subtitle:"
 msgstr ""
 
-#: src/gui.cpp:122
+#: src/gui.cpp:126
 msgid "Select the subtitle stream."
 msgstr ""
 
-#: src/gui.cpp:133 src/media_input.cpp:276
+#: src/gui.cpp:137 src/media_input.cpp:276
 msgid "Input:"
 msgstr ""
 
-#: src/gui.cpp:134
+#: src/gui.cpp:138
 msgid "Set the 3D layout of the video stream."
 msgstr ""
 
-#: src/gui.cpp:138 src/main.cpp:431
+#: src/gui.cpp:142 src/main.cpp:459
 msgid "2D"
 msgstr ""
 
-#: src/gui.cpp:139 src/main.cpp:432
+#: src/gui.cpp:143 src/main.cpp:460
 msgid "Separate streams, left first"
 msgstr ""
 
-#: src/gui.cpp:140 src/main.cpp:433
+#: src/gui.cpp:144 src/main.cpp:461
 msgid "Separate streams, right first"
 msgstr ""
 
-#: src/gui.cpp:141 src/main.cpp:434
+#: src/gui.cpp:145 src/main.cpp:462
 msgid "Alternating, left first"
 msgstr ""
 
-#: src/gui.cpp:142 src/main.cpp:435
+#: src/gui.cpp:146 src/main.cpp:463
 msgid "Alternating, right first"
 msgstr ""
 
-#: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2151 src/gui.cpp:2180
-#: src/main.cpp:436 src/main.cpp:451
+#: src/gui.cpp:147 src/gui.cpp:171 src/gui.cpp:2212 src/gui.cpp:2241
+#: src/main.cpp:464 src/main.cpp:479
 msgid "Top/bottom"
 msgstr ""
 
-#: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2152 src/gui.cpp:2181
-#: src/main.cpp:437 src/main.cpp:452
+#: src/gui.cpp:148 src/gui.cpp:172 src/gui.cpp:2213 src/gui.cpp:2242
+#: src/main.cpp:465 src/main.cpp:480
 msgid "Top/bottom, half height"
 msgstr ""
 
-#: src/gui.cpp:145 src/main.cpp:438
+#: src/gui.cpp:149 src/main.cpp:466
 msgid "Bottom/top"
 msgstr ""
 
-#: src/gui.cpp:146 src/main.cpp:439
+#: src/gui.cpp:150 src/main.cpp:467
 msgid "Bottom/top, half height"
 msgstr ""
 
-#: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2153 src/gui.cpp:2182
-#: src/main.cpp:440 src/main.cpp:453
+#: src/gui.cpp:151 src/gui.cpp:173 src/gui.cpp:2214 src/gui.cpp:2243
+#: src/main.cpp:468 src/main.cpp:481
 msgid "Left/right"
 msgstr ""

_service:download_files:bino-1.4.4.tar.xz/po/de.gmo -> _service:download_files:bino-1.6.0.tar.xz/po/de.gmo Changed

_service:download_files:bino-1.4.4.tar.xz/po/de.po -> _service:download_files:bino-1.6.0.tar.xz/po/de.po Changed

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 The Bino developers
+# Copyright (C) 2014 The Bino developers
 # This file is distributed under the same license as the Bino package.
 # Martin Lambers <marlam@marlam.de>, 2011.
 #
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: bino 1.3.4\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2013-11-18 19:42+0100\n"
+"POT-Creation-Date: 2014-09-11 19:49+0200\n"
 "PO-Revision-Date: 2011-04-10 17:23+0200\n"
 "Last-Translator: Martin Lambers <marlam@marlam.de>\n"
 "Language-Team: none\n"
@@ -88,13 +88,18 @@
 msgid "Too many arguments."
 msgstr "Zu viele Argumente."
 
-#: src/base/str.cpp:268
+#: src/base/str.cpp:269
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Kann Zeichenkette nicht zu %s konvertieren."
 
-#: src/base/str.cpp:516 src/base/str.cpp:534 src/base/str.cpp:544
-#: src/base/str.cpp:555 src/base/str.cpp:560
+#: src/base/str.cpp:517 src/base/str.cpp:536 src/base/str.cpp:547
+#: src/base/str.cpp:559
+#, c-format
+msgid "Cannot convert %s to %s: %s"
+msgstr "Kann %s nicht zu %s konvertieren: %s"
+
+#: src/base/str.cpp:565
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Kann %s nicht zu %s konvertieren."
@@ -120,9 +125,9 @@
 msgid "OpenAL device '%s' is not available."
 msgstr "OpenAL Gerät '%s' ist nicht verfügbar."
 
-#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:158
-#: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
-#: src/media_data.cpp:1260
+#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:159
+#: src/media_data.cpp:1207 src/media_data.cpp:1230 src/media_data.cpp:1268
+#: src/media_data.cpp:1273
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -188,8 +193,8 @@
 msgstr "Kann OpenAL Quellenpuffer nicht aus Warteschlange entfernen."
 
 #: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:374 src/media_object.cpp:851 src/media_object.cpp:1322
-#: src/video_output.cpp:419
+#: src/main.cpp:402 src/media_object.cpp:855 src/media_object.cpp:1339
+#: src/video_output.cpp:420
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -199,247 +204,247 @@
 msgid "%s: invalid command '%s'"
 msgstr "%s: Ungültiges Kommando '%s'"
 
-#: src/dispatch.cpp:166
+#: src/dispatch.cpp:167
 msgid "Cannot connect to X server."
 msgstr "Kann keine Verbindung zum X Server aufbauen."
 
-#: src/dispatch.cpp:182
+#: src/dispatch.cpp:183
 msgid "No video to play."
 msgstr "Kein Video abzuspielen."
 
-#: src/dispatch.cpp:437 src/player_equalizer.cpp:85
+#: src/dispatch.cpp:438 src/player_equalizer.cpp:87
 msgid "No video streams found."
 msgstr "Keine Videokanäle gefunden."
 
-#: src/dispatch.cpp:454
+#: src/dispatch.cpp:455
 msgid "Cannot set requested stereo layout: incompatible media."
 msgstr "Kann Stereolayout nicht setzen: inkompatible Daten."
 
-#: src/dispatch.cpp:469
+#: src/dispatch.cpp:470
 #, c-format
 msgid "Video stream %d not found."
 msgstr "Videokanal %d nicht gefunden."
 
-#: src/dispatch.cpp:475
+#: src/dispatch.cpp:476
 #, c-format
 msgid "Audio stream %d not found."
 msgstr "Audiokanal %d nicht gefunden."
 
-#: src/dispatch.cpp:483
+#: src/dispatch.cpp:484
 #, c-format
 msgid "Subtitle stream %d not found."
 msgstr "Untertitelkanal %d nicht gefunden."
 
-#: src/dispatch.cpp:555 src/main.cpp:767
+#: src/dispatch.cpp:559 src/main.cpp:795
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr ""
 "Diese Version von Bino wurde ohne Unterstützung für Equalizer erstellt."
 
-#: src/gui.cpp:107
+#: src/gui.cpp:111
 msgid "Video:"
 msgstr "Video:"
 
-#: src/gui.cpp:108
+#: src/gui.cpp:112
 msgid "Select the video stream."
 msgstr "Auswahl des Videokanals."
 
-#: src/gui.cpp:114
+#: src/gui.cpp:118
 msgid "Audio:"
 msgstr "Audio:"
 
-#: src/gui.cpp:115
+#: src/gui.cpp:119
 msgid "Select the audio stream."
 msgstr "Auswahl des Videokanals."
 
-#: src/gui.cpp:121
+#: src/gui.cpp:125
 msgid "Subtitle:"
 msgstr "Untertitel:"
 
-#: src/gui.cpp:122
+#: src/gui.cpp:126
 msgid "Select the subtitle stream."
 msgstr "Auswahl des Untertitelkanals."
 
-#: src/gui.cpp:133 src/media_input.cpp:276
+#: src/gui.cpp:137 src/media_input.cpp:276
 msgid "Input:"
 msgstr "Eingabe:"
 
-#: src/gui.cpp:134
+#: src/gui.cpp:138
 msgid "Set the 3D layout of the video stream."
 msgstr "Auswahl des Stereolayouts des Videokanals."
 
-#: src/gui.cpp:138 src/main.cpp:431
+#: src/gui.cpp:142 src/main.cpp:459
 msgid "2D"
 msgstr "2D"
 
-#: src/gui.cpp:139 src/main.cpp:432
+#: src/gui.cpp:143 src/main.cpp:460
 msgid "Separate streams, left first"
 msgstr "Getrennte Kanäle, links zuerst"
 
-#: src/gui.cpp:140 src/main.cpp:433
+#: src/gui.cpp:144 src/main.cpp:461
 msgid "Separate streams, right first"
 msgstr "Getrennte Kanäle, rechts zuerst"
 
-#: src/gui.cpp:141 src/main.cpp:434
+#: src/gui.cpp:145 src/main.cpp:462
 msgid "Alternating, left first"
 msgstr "Abwechselnd, links zuerst."
 
-#: src/gui.cpp:142 src/main.cpp:435
+#: src/gui.cpp:146 src/main.cpp:463
 msgid "Alternating, right first"
 msgstr "Abwechselnd, rechts zuerst."
 
-#: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2151 src/gui.cpp:2180
-#: src/main.cpp:436 src/main.cpp:451
+#: src/gui.cpp:147 src/gui.cpp:171 src/gui.cpp:2212 src/gui.cpp:2241
+#: src/main.cpp:464 src/main.cpp:479
 msgid "Top/bottom"
 msgstr "Oben/unten"
 
-#: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2152 src/gui.cpp:2181
-#: src/main.cpp:437 src/main.cpp:452
+#: src/gui.cpp:148 src/gui.cpp:172 src/gui.cpp:2213 src/gui.cpp:2242
+#: src/main.cpp:465 src/main.cpp:480
 msgid "Top/bottom, half height"
 msgstr "Oben/unten, halbe Höhe"
 
-#: src/gui.cpp:145 src/main.cpp:438
+#: src/gui.cpp:149 src/main.cpp:466
 msgid "Bottom/top"
 msgstr "Unten/oben"
 
-#: src/gui.cpp:146 src/main.cpp:439
+#: src/gui.cpp:150 src/main.cpp:467
 msgid "Bottom/top, half height"
 msgstr "Unten/oben, halbe Höhe"
 
-#: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2153 src/gui.cpp:2182
-#: src/main.cpp:440 src/main.cpp:453

_service:download_files:bino-1.4.4.tar.xz/po/fr.gmo -> _service:download_files:bino-1.6.0.tar.xz/po/fr.gmo Changed

_service:download_files:bino-1.4.4.tar.xz/po/fr.po -> _service:download_files:bino-1.6.0.tar.xz/po/fr.po Changed

@@ -1,6 +1,6 @@
 # French translations for bino package
 # Traductions françaises du paquet bino.
-# Copyright (C) 2012 The Bino developers
+# Copyright (C) 2014 The Bino developers
 # This file is distributed under the same license as the bino package.
 # Frédéric Devernay <frederic.devernay@m4x.org>, 2012.
 #
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2013-11-18 19:42+0100\n"
+"POT-Creation-Date: 2014-09-11 19:49+0200\n"
 "PO-Revision-Date: 2012-06-05 10:45+0200\n"
 "Last-Translator: Frédéric Devernay <>\n"
 "Language-Team: French\n"
@@ -91,13 +91,18 @@
 msgid "Too many arguments."
 msgstr "Trop d'arguments."
 
-#: src/base/str.cpp:268
+#: src/base/str.cpp:269
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Impossible de convertir la chaîne de caractères en %s."
 
-#: src/base/str.cpp:516 src/base/str.cpp:534 src/base/str.cpp:544
-#: src/base/str.cpp:555 src/base/str.cpp:560
+#: src/base/str.cpp:517 src/base/str.cpp:536 src/base/str.cpp:547
+#: src/base/str.cpp:559
+#, fuzzy, c-format
+msgid "Cannot convert %s to %s: %s"
+msgstr "Impossible de convertir %s en %s."
+
+#: src/base/str.cpp:565
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Impossible de convertir %s en %s."
@@ -123,9 +128,9 @@
 msgid "OpenAL device '%s' is not available."
 msgstr "Périphérique OpenAL '%s' non disponible."
 
-#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:158
-#: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
-#: src/media_data.cpp:1260
+#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:159
+#: src/media_data.cpp:1207 src/media_data.cpp:1230 src/media_data.cpp:1268
+#: src/media_data.cpp:1273
 msgid "unknown"
 msgstr "inconnu"
 
@@ -191,8 +196,8 @@
 msgstr "Impossible de vider la queue de tampons de la source OpenAL."
 
 #: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:374 src/media_object.cpp:851 src/media_object.cpp:1322
-#: src/video_output.cpp:419
+#: src/main.cpp:402 src/media_object.cpp:855 src/media_object.cpp:1339
+#: src/video_output.cpp:420
 #, c-format
 msgid "%s: %s"
 msgstr "%s : %s"
@@ -202,246 +207,246 @@
 msgid "%s: invalid command '%s'"
 msgstr "%s: commande invalide '%s'"
 
-#: src/dispatch.cpp:166
+#: src/dispatch.cpp:167
 msgid "Cannot connect to X server."
 msgstr "Impossible de se connecter au serveur X."
 
-#: src/dispatch.cpp:182
+#: src/dispatch.cpp:183
 msgid "No video to play."
 msgstr "Aucune vidéo à jouer."
 
-#: src/dispatch.cpp:437 src/player_equalizer.cpp:85
+#: src/dispatch.cpp:438 src/player_equalizer.cpp:87
 msgid "No video streams found."
 msgstr "Aucun flux vidéo trouvé."
 
-#: src/dispatch.cpp:454
+#: src/dispatch.cpp:455
 msgid "Cannot set requested stereo layout: incompatible media."
 msgstr "Impossible de choisir le mode stéréo sélectionné : média incompatible."
 
-#: src/dispatch.cpp:469
+#: src/dispatch.cpp:470
 #, c-format
 msgid "Video stream %d not found."
 msgstr "Flux vidéo %d non trouvé."
 
-#: src/dispatch.cpp:475
+#: src/dispatch.cpp:476
 #, c-format
 msgid "Audio stream %d not found."
 msgstr "Flux audio %d non trouvé."
 
-#: src/dispatch.cpp:483
+#: src/dispatch.cpp:484
 #, c-format
 msgid "Subtitle stream %d not found."
 msgstr "Flux de sous-titres %d non trouvé."
 
-#: src/dispatch.cpp:555 src/main.cpp:767
+#: src/dispatch.cpp:559 src/main.cpp:795
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Cette version de Bino a été compilée sans le support Equalizer."
 
-#: src/gui.cpp:107
+#: src/gui.cpp:111
 msgid "Video:"
 msgstr "Vidéo :"
 
-#: src/gui.cpp:108
+#: src/gui.cpp:112
 msgid "Select the video stream."
 msgstr "Choisir le flux vidéo."
 
-#: src/gui.cpp:114
+#: src/gui.cpp:118
 msgid "Audio:"
 msgstr "Audio :"
 
-#: src/gui.cpp:115
+#: src/gui.cpp:119
 msgid "Select the audio stream."
 msgstr "Choisir le flux audio."
 
-#: src/gui.cpp:121
+#: src/gui.cpp:125
 msgid "Subtitle:"
 msgstr "Sous-titres :"
 
-#: src/gui.cpp:122
+#: src/gui.cpp:126
 msgid "Select the subtitle stream."
 msgstr "Choisir le flux de sous-titres."
 
-#: src/gui.cpp:133 src/media_input.cpp:276
+#: src/gui.cpp:137 src/media_input.cpp:276
 msgid "Input:"
 msgstr "Entrée :"
 
-#: src/gui.cpp:134
+#: src/gui.cpp:138
 msgid "Set the 3D layout of the video stream."
 msgstr "Choisir la disposition 3D du flux vidéo"
 
-#: src/gui.cpp:138 src/main.cpp:431
+#: src/gui.cpp:142 src/main.cpp:459
 msgid "2D"
 msgstr "2D"
 
-#: src/gui.cpp:139 src/main.cpp:432
+#: src/gui.cpp:143 src/main.cpp:460
 msgid "Separate streams, left first"
 msgstr "Flux séparés, gauche d'abord"
 
-#: src/gui.cpp:140 src/main.cpp:433
+#: src/gui.cpp:144 src/main.cpp:461
 msgid "Separate streams, right first"
 msgstr "Flux séparés, droit d'abord"
 
-#: src/gui.cpp:141 src/main.cpp:434
+#: src/gui.cpp:145 src/main.cpp:462
 msgid "Alternating, left first"
 msgstr "Alterné, gauche d'abord"
 
-#: src/gui.cpp:142 src/main.cpp:435
+#: src/gui.cpp:146 src/main.cpp:463
 msgid "Alternating, right first"
 msgstr "Alterné, droit d'abord"
 
-#: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2151 src/gui.cpp:2180
-#: src/main.cpp:436 src/main.cpp:451
+#: src/gui.cpp:147 src/gui.cpp:171 src/gui.cpp:2212 src/gui.cpp:2241
+#: src/main.cpp:464 src/main.cpp:479
 msgid "Top/bottom"
 msgstr "Haut/bas"
 
-#: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2152 src/gui.cpp:2181
-#: src/main.cpp:437 src/main.cpp:452
+#: src/gui.cpp:148 src/gui.cpp:172 src/gui.cpp:2213 src/gui.cpp:2242
+#: src/main.cpp:465 src/main.cpp:480
 msgid "Top/bottom, half height"
 msgstr "Haut/bas, demi-hauteur"
 
-#: src/gui.cpp:145 src/main.cpp:438
+#: src/gui.cpp:149 src/main.cpp:466
 msgid "Bottom/top"
 msgstr "Bas/haut"
 
-#: src/gui.cpp:146 src/main.cpp:439
+#: src/gui.cpp:150 src/main.cpp:467
 msgid "Bottom/top, half height"
 msgstr "Bas/haut, demi-hauteur"
 
-#: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2153 src/gui.cpp:2182

_service:download_files:bino-1.4.4.tar.xz/po/ru.gmo -> _service:download_files:bino-1.6.0.tar.xz/po/ru.gmo Changed

_service:download_files:bino-1.4.4.tar.xz/po/ru.po -> _service:download_files:bino-1.6.0.tar.xz/po/ru.po Changed

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 The Bino developers
+# Copyright (C) 2014 The Bino developers
 # This file is distributed under the same license as the Bino package.
 # Alexey Osipov <simba@lerlan.ru>, 2011.
 #
@@ -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: 2013-11-18 19:42+0100\n"
+"POT-Creation-Date: 2014-09-11 19:49+0200\n"
 "PO-Revision-Date: 2012-06-18 21:29+0600\n"
 "Last-Translator: Alexey Osipov <simba@lerlan.ru>\n"
 "Language-Team: \n"
@@ -88,13 +88,18 @@
 msgid "Too many arguments."
 msgstr "Слишком много параметров."
 
-#: src/base/str.cpp:268
+#: src/base/str.cpp:269
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Невозможно преобразовать строку в %s."
 
-#: src/base/str.cpp:516 src/base/str.cpp:534 src/base/str.cpp:544
-#: src/base/str.cpp:555 src/base/str.cpp:560
+#: src/base/str.cpp:517 src/base/str.cpp:536 src/base/str.cpp:547
+#: src/base/str.cpp:559
+#, fuzzy, c-format
+msgid "Cannot convert %s to %s: %s"
+msgstr "Невозможно преобразовать %s в %s."
+
+#: src/base/str.cpp:565
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Невозможно преобразовать %s в %s."
@@ -120,9 +125,9 @@
 msgid "OpenAL device '%s' is not available."
 msgstr "Устройство OpenAL '%s' не доступно."
 
-#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:158
-#: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
-#: src/media_data.cpp:1260
+#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:159
+#: src/media_data.cpp:1207 src/media_data.cpp:1230 src/media_data.cpp:1268
+#: src/media_data.cpp:1273
 msgid "unknown"
 msgstr "неизвестно"
 
@@ -188,8 +193,8 @@
 msgstr "Невозможно получить из очереди буферы источника OpenAL."
 
 #: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:374 src/media_object.cpp:851 src/media_object.cpp:1322
-#: src/video_output.cpp:419
+#: src/main.cpp:402 src/media_object.cpp:855 src/media_object.cpp:1339
+#: src/video_output.cpp:420
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -199,247 +204,247 @@
 msgid "%s: invalid command '%s'"
 msgstr "%s: некорректная команда '%s'"
 
-#: src/dispatch.cpp:166
+#: src/dispatch.cpp:167
 msgid "Cannot connect to X server."
 msgstr "Невозможно присоединиться к X серверу."
 
-#: src/dispatch.cpp:182
+#: src/dispatch.cpp:183
 msgid "No video to play."
 msgstr "Нет видео для воспроизведения."
 
-#: src/dispatch.cpp:437 src/player_equalizer.cpp:85
+#: src/dispatch.cpp:438 src/player_equalizer.cpp:87
 msgid "No video streams found."
 msgstr "Видео дорожек не найдено."
 
-#: src/dispatch.cpp:454
+#: src/dispatch.cpp:455
 msgid "Cannot set requested stereo layout: incompatible media."
 msgstr ""
 "Невозможно установить требуемую стерео раскладку: неподходящий носитель."
 
-#: src/dispatch.cpp:469
+#: src/dispatch.cpp:470
 #, c-format
 msgid "Video stream %d not found."
 msgstr "Видео дорожка %d не найдена."
 
-#: src/dispatch.cpp:475
+#: src/dispatch.cpp:476
 #, c-format
 msgid "Audio stream %d not found."
 msgstr "Аудио дорожка %d не найдена."
 
-#: src/dispatch.cpp:483
+#: src/dispatch.cpp:484
 #, c-format
 msgid "Subtitle stream %d not found."
 msgstr "Дорожка субтитров %d не найдена."
 
-#: src/dispatch.cpp:555 src/main.cpp:767
+#: src/dispatch.cpp:559 src/main.cpp:795
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Эта версия Bino была собрана без поддержки Equalizer."
 
-#: src/gui.cpp:107
+#: src/gui.cpp:111
 msgid "Video:"
 msgstr "Видео:"
 
-#: src/gui.cpp:108
+#: src/gui.cpp:112
 msgid "Select the video stream."
 msgstr "Выберите видео дорожку."
 
-#: src/gui.cpp:114
+#: src/gui.cpp:118
 msgid "Audio:"
 msgstr "Аудио:"
 
-#: src/gui.cpp:115
+#: src/gui.cpp:119
 msgid "Select the audio stream."
 msgstr "Выберите аудио дорожку."
 
-#: src/gui.cpp:121
+#: src/gui.cpp:125
 msgid "Subtitle:"
 msgstr "Субтитры:"
 
-#: src/gui.cpp:122
+#: src/gui.cpp:126
 msgid "Select the subtitle stream."
 msgstr "Выберите дорожку субтитров."
 
-#: src/gui.cpp:133 src/media_input.cpp:276
+#: src/gui.cpp:137 src/media_input.cpp:276
 msgid "Input:"
 msgstr "Источник:"
 
-#: src/gui.cpp:134
+#: src/gui.cpp:138
 msgid "Set the 3D layout of the video stream."
 msgstr "Укажите 3D раскладку исходного видеофайла."
 
-#: src/gui.cpp:138 src/main.cpp:431
+#: src/gui.cpp:142 src/main.cpp:459
 msgid "2D"
 msgstr "2D"
 
-#: src/gui.cpp:139 src/main.cpp:432
+#: src/gui.cpp:143 src/main.cpp:460
 msgid "Separate streams, left first"
 msgstr "Отдельные видеофайлы, сначала левый"
 
-#: src/gui.cpp:140 src/main.cpp:433
+#: src/gui.cpp:144 src/main.cpp:461
 msgid "Separate streams, right first"
 msgstr "Отдельные видеофайлы, сначала правый"
 
-#: src/gui.cpp:141 src/main.cpp:434
+#: src/gui.cpp:145 src/main.cpp:462
 msgid "Alternating, left first"
 msgstr "Чередование кадров, сначала левый"
 
-#: src/gui.cpp:142 src/main.cpp:435
+#: src/gui.cpp:146 src/main.cpp:463
 msgid "Alternating, right first"
 msgstr "Чередование кадров, сначала правый"
 
-#: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2151 src/gui.cpp:2180
-#: src/main.cpp:436 src/main.cpp:451
+#: src/gui.cpp:147 src/gui.cpp:171 src/gui.cpp:2212 src/gui.cpp:2241
+#: src/main.cpp:464 src/main.cpp:479
 msgid "Top/bottom"
 msgstr "Сверху/снизу"
 
-#: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2152 src/gui.cpp:2181
-#: src/main.cpp:437 src/main.cpp:452
+#: src/gui.cpp:148 src/gui.cpp:172 src/gui.cpp:2213 src/gui.cpp:2242
+#: src/main.cpp:465 src/main.cpp:480
 msgid "Top/bottom, half height"
 msgstr "Сверху/снизу, в половину высоты"
 
-#: src/gui.cpp:145 src/main.cpp:438
+#: src/gui.cpp:149 src/main.cpp:466
 msgid "Bottom/top"
 msgstr "Снизу/сверху"
 
-#: src/gui.cpp:146 src/main.cpp:439
+#: src/gui.cpp:150 src/main.cpp:467
 msgid "Bottom/top, half height"
 msgstr "Снизу/сверху, в половину высоты"
 
-#: src/gui.cpp:147 src/gui.cpp:169 src/gui.cpp:2153 src/gui.cpp:2182
-#: src/main.cpp:440 src/main.cpp:453

_service:download_files:bino-1.4.4.tar.xz/po/zh_cn.gmo -> _service:download_files:bino-1.6.0.tar.xz/po/zh_cn.gmo Changed

_service:download_files:bino-1.4.4.tar.xz/po/zh_cn.po -> _service:download_files:bino-1.6.0.tar.xz/po/zh_cn.po Changed

@@ -1,21 +1,22 @@
 # Chinese translations for bino package
 # bino 3d 播放器简体中文语言文件
-# Copyright (C) 2013 The Bino developers
+# Copyright (C) 2014 The Bino developers
 # This file is distributed under the same license as the PACKAGE package.
-# Frank Hill <hxf.prc@gmail.com>, 2013.
+# Frank Hill <hxf.prc@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bino 1.4.2\n"
+"Project-Id-Version: bino 1.4.4\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2013-11-18 19:42+0100\n"
-"PO-Revision-Date: 2013-08-27 20:45+0800\n"
-"Last-Translator: Frank Hill\n"
+"POT-Creation-Date: 2014-09-11 19:49+0200\n"
+"PO-Revision-Date: 2014-09-16 17:16+0800\n"
+"Last-Translator: Frank Hill <hxf.prc@gmail.com>\n"
 "Language-Team: Simplified Chinese\n"
 "Language: zh_cn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: src/base/dbg.cpp:49
 #, c-format
@@ -90,13 +91,18 @@
 msgid "Too many arguments."
 msgstr "参数太多。"
 
-#: src/base/str.cpp:268
+#: src/base/str.cpp:269
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "无法转换字符串为 %s。"
 
-#: src/base/str.cpp:516 src/base/str.cpp:534 src/base/str.cpp:544
-#: src/base/str.cpp:555 src/base/str.cpp:560
+#: src/base/str.cpp:517 src/base/str.cpp:536 src/base/str.cpp:547
+#: src/base/str.cpp:559
+#, c-format
+msgid "Cannot convert %s to %s: %s"
+msgstr "无法转换 %s 为 %s：%s"
+
+#: src/base/str.cpp:565
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "无法转换 %s 为 %s。"
@@ -122,9 +128,9 @@
 msgid "OpenAL device '%s' is not available."
 msgstr "OpenAL 设备 ‘%s’ 不可用。"
 
-#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:158
-#: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
-#: src/media_data.cpp:1260
+#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:159
+#: src/media_data.cpp:1207 src/media_data.cpp:1230 src/media_data.cpp:1268
+#: src/media_data.cpp:1273
 msgid "unknown"
 msgstr "未知"
 
@@ -190,8 +196,8 @@
 msgstr "无法乱序 OpenAL 音源缓冲。"
 
 #: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:374 src/media_object.cpp:851 src/media_object.cpp:1322
-#: src/video_output.cpp:419
+#: src/main.cpp:402 src/media_object.cpp:855 src/media_object.cpp:1339
+#: src/video_output.cpp:420
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -201,463 +207,463 @@
 msgid "%s: invalid command '%s'"
 msgstr "%s：无效命令 ‘%s’"
 
-#: src/dispatch.cpp:166
+#: src/dispatch.cpp:167
 msgid "Cannot connect to X server."
 msgstr "无法连接 X 服务器。"
 
-#: src/dispatch.cpp:182
+#: src/dispatch.cpp:183
 msgid "No video to play."
 msgstr "无视频。"
 
-#: src/dispatch.cpp:437 src/player_equalizer.cpp:85
+#: src/dispatch.cpp:438 src/player_equalizer.cpp:87
 msgid "No video streams found."
 msgstr "未找到视频流。"
 
-#: src/dispatch.cpp:454
+#: src/dispatch.cpp:455
 msgid "Cannot set requested stereo layout: incompatible media."
 msgstr "无法设置指定的 S3D 布局：不兼容的媒体文件。"
 
-#: src/dispatch.cpp:469
+#: src/dispatch.cpp:470
 #, c-format
 msgid "Video stream %d not found."
 msgstr "视频流 %d 未找到。"
 
-#: src/dispatch.cpp:475
+#: src/dispatch.cpp:476
 #, c-format
 msgid "Audio stream %d not found."
 msgstr "音轨 %d 未找到。"
 
-#: src/dispatch.cpp:483
+#: src/dispatch.cpp:484
 #, c-format
 msgid "Subtitle stream %d not found."
 msgstr "字幕轨 %d 未找到。"
 
-#: src/dispatch.cpp:555 src/main.cpp:767
+#: src/dispatch.cpp:559 src/main.cpp:795
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "此 Bino 版本编译时未加入 Equalizer 支持。"
 
-#: src/gui.cpp:107
+#: src/gui.cpp:111
 msgid "Video:"
 msgstr "视频："
 
-#: src/gui.cpp:108
+#: src/gui.cpp:112
 msgid "Select the video stream."
 msgstr "选择视频流。"
 
-#: src/gui.cpp:114
+#: src/gui.cpp:118
 msgid "Audio:"
 msgstr "音频："
 
-#: src/gui.cpp:115
+#: src/gui.cpp:119
 msgid "Select the audio stream."
 msgstr "选择音轨"
 
-#: src/gui.cpp:121
+#: src/gui.cpp:125
 msgid "Subtitle:"
 msgstr "字幕："
 
-#: src/gui.cpp:122
+#: src/gui.cpp:126
 msgid "Select the subtitle stream."
 msgstr "选择字幕"
 
-#: src/gui.cpp:133 src/media_input.cpp:276
+#: src/gui.cpp:137 src/media_input.cpp:276
 msgid "Input:"
 msgstr "输入："
 
-#: src/gui.cpp:134
+#: src/gui.cpp:138
 msgid "Set the 3D layout of the video stream."
 msgstr "设置视频的 3D 布局"
 
-#: src/gui.cpp:138 src/main.cpp:431
+#: src/gui.cpp:142 src/main.cpp:459
 msgid "2D"
 msgstr "2D"
 
-#: src/gui.cpp:139 src/main.cpp:432
+#: src/gui.cpp:143 src/main.cpp:460
 msgid "Separate streams, left first"
 msgstr "独立视频流，左画面在前"
 
-#: src/gui.cpp:140 src/main.cpp:433
+#: src/gui.cpp:144 src/main.cpp:461
 msgid "Separate streams, right first"
 msgstr "独立视频流，右画面在前"
 
-#: src/gui.cpp:141 src/main.cpp:434
+#: src/gui.cpp:145 src/main.cpp:462
 msgid "Alternating, left first"
 msgstr "交错，左画面在前"
 
-#: src/gui.cpp:142 src/main.cpp:435
+#: src/gui.cpp:146 src/main.cpp:463
 msgid "Alternating, right first"
 msgstr "交错，右视角在前"
 
-#: src/gui.cpp:143 src/gui.cpp:167 src/gui.cpp:2151 src/gui.cpp:2180
-#: src/main.cpp:436 src/main.cpp:451
+#: src/gui.cpp:147 src/gui.cpp:171 src/gui.cpp:2212 src/gui.cpp:2241
+#: src/main.cpp:464 src/main.cpp:479
 msgid "Top/bottom"
 msgstr "左画面在上/右画面在下"
 
-#: src/gui.cpp:144 src/gui.cpp:168 src/gui.cpp:2152 src/gui.cpp:2181
-#: src/main.cpp:437 src/main.cpp:452
+#: src/gui.cpp:148 src/gui.cpp:172 src/gui.cpp:2213 src/gui.cpp:2242
+#: src/main.cpp:465 src/main.cpp:480
 msgid "Top/bottom, half height"
 msgstr "左画面在上/右画面在下，半高画面"

_service:download_files:bino-1.4.4.tar.xz/src/Makefile.am -> _service:download_files:bino-1.6.0.tar.xz/src/Makefile.am Changed

_service:download_files:bino-1.4.4.tar.xz/src/Makefile.in -> _service:download_files:bino-1.6.0.tar.xz/src/Makefile.in Changed

_service:download_files:bino-1.4.4.tar.xz/src/base/Makefile.in -> _service:download_files:bino-1.6.0.tar.xz/src/base/Makefile.in Changed

_service:download_files:bino-1.4.4.tar.xz/src/base/blob.h -> _service:download_files:bino-1.6.0.tar.xz/src/base/blob.h Changed

_service:download_files:bino-1.4.4.tar.xz/src/base/intcheck.h -> _service:download_files:bino-1.6.0.tar.xz/src/base/intcheck.h Changed

_service:download_files:bino-1.4.4.tar.xz/src/base/s11n.cpp -> _service:download_files:bino-1.6.0.tar.xz/src/base/s11n.cpp Changed

_service:download_files:bino-1.4.4.tar.xz/src/base/str.cpp -> _service:download_files:bino-1.6.0.tar.xz/src/base/str.cpp Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2010, 2011, 2012
+ * Copyright (C) 2009, 2010, 2011, 2012, 2013
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -19,6 +19,7 @@
 #include "config.h"
 
 #include <cstdio>
+#include <cstring>
 #include <cstdlib>
 #include <cctype>
 #include <cmath>
@@ -513,7 +514,8 @@
 iconv_t cd = iconv_open(to_charset.c_str(), from_charset.c_str());
 if (cd == reinterpret_cast<iconv_t>(static_cast<size_t>(-1)))
 {
- throw exc(str::asprintf(_("Cannot convert %s to %s."), from_charset.c_str(), to_charset.c_str()), errno);
+ throw exc(str::asprintf(_("Cannot convert %s to %s: %s"),
+ from_charset.c_str(), to_charset.c_str(), std::strerror(errno)), errno);
 }
 
 size_t inbytesleft = src.length() + 1;
@@ -531,7 +533,8 @@
 if (!orig_outbuf)
 {
 iconv_close(cd);
- throw exc(str::asprintf(_("Cannot convert %s to %s."), from_charset.c_str(), to_charset.c_str()), ENOMEM);
+ throw exc(str::asprintf(_("Cannot convert %s to %s: %s"),
+ from_charset.c_str(), to_charset.c_str(), std::strerror(ENOMEM)), ENOMEM);
 }
 char *outbuf = orig_outbuf;
 
@@ -541,7 +544,8 @@
 if (s == static_cast<size_t>(-1))
 {
 free(orig_outbuf);
- throw exc(str::asprintf(_("Cannot convert %s to %s."), from_charset.c_str(), to_charset.c_str()), saved_errno);
+ throw exc(str::asprintf(_("Cannot convert %s to %s: %s"),
+ from_charset.c_str(), to_charset.c_str(), std::strerror(saved_errno)), saved_errno);
 }
 
 std::string dst;
@@ -552,12 +556,14 @@
 catch (std::exception &e)
 {
 free(orig_outbuf);
- throw exc(str::asprintf(_("Cannot convert %s to %s."), from_charset.c_str(), to_charset.c_str()), ENOMEM);
+ throw exc(str::asprintf(_("Cannot convert %s to %s: %s"),
+ from_charset.c_str(), to_charset.c_str(), std::strerror(ENOMEM)), ENOMEM);
 }
 free(orig_outbuf);
 return dst;
 #else
- throw exc(str::asprintf(_("Cannot convert %s to %s."), from_charset.c_str(), to_charset.c_str()), ENOSYS);
+ throw exc(str::asprintf(_("Cannot convert %s to %s."),
+ from_charset.c_str(), to_charset.c_str(), std::strerror(ENOSYS)), ENOSYS);
 #endif
 }

_service:download_files:bino-1.4.4.tar.xz/src/dispatch.cpp -> _service:download_files:bino-1.6.0.tar.xz/src/dispatch.cpp Changed

@@ -1,9 +1,10 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010, 2011, 2012
+ * Copyright (C) 2010, 2011, 2012, 2013
 * Martin Lambers <marlam@marlam.de>
 * Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
+ * Frédéric Bour <frederic.bour@lakaban.net>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -491,6 +492,9 @@
 if (_input_data.params.crop_aspect_ratio_is_set())
 _parameters.set_crop_aspect_ratio(_input_data.params.crop_aspect_ratio());
 notify_all(notification::crop_aspect_ratio);
+ if (_input_data.params.source_aspect_ratio_is_set())
+ _parameters.set_source_aspect_ratio(_input_data.params.source_aspect_ratio());
+ notify_all(notification::source_aspect_ratio);
 if (_input_data.params.parallax_is_set())
 _parameters.set_parallax(_input_data.params.parallax());
 notify_all(notification::parallax);
@@ -798,6 +802,13 @@
 }
 notify_all(notification::crop_aspect_ratio);
 break;
+ case command::set_source_aspect_ratio:
+ {
+ float x = s11n::load<float>(p);
+ _parameters.set_source_aspect_ratio((x <= 0.0f ? 0.0f : clamp(x, 1.0f, 2.39f)));
+ }
+ notify_all(notification::source_aspect_ratio);
+ break;
 case command::adjust_parallax:
 _parameters.set_parallax(clamp(_parameters.parallax() + s11n::load<float>(p), -1.0f, +1.0f));
 notify_all(notification::parallax);
@@ -1185,6 +1196,9 @@
 } else if (tokens.size() == 2 && tokens[0] == "set-crop-aspect-ratio"
 && parse_aspect_ratio(tokens[1], &p.f)) {
 *c = command(command::set_crop_aspect_ratio, p.f);
+ } else if (tokens.size() == 2 && tokens[0] == "set-source-aspect-ratio"
+ && parse_aspect_ratio(tokens[1], &p.f)) {
+ *c = command(command::set_source_aspect_ratio, p.f);
 } else if (tokens.size() == 2 && tokens[0] == "set-parallax"
 && str::to(tokens[1], &p.f)) {
 *c = command(command::set_parallax, p.f);

_service:download_files:bino-1.4.4.tar.xz/src/dispatch.h -> _service:download_files:bino-1.6.0.tar.xz/src/dispatch.h Changed

@@ -1,10 +1,11 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010, 2011, 2012
+ * Copyright (C) 2010, 2011, 2012, 2013
 * Martin Lambers <marlam@marlam.de>
 * Joe <cuchac@email.cz>
 * Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
+ * Frédéric Bour <frederic.bour@lakaban.net>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -135,6 +136,7 @@
 set_stereo_layout, // video_frame::stereo_layout
 set_stereo_layout_swap, // bool
 set_crop_aspect_ratio, // float
+ set_source_aspect_ratio, // float
 set_parallax, // float (absolute value)
 adjust_parallax, // float (relative adjustment)
 set_ghostbust, // float (absolute value)
@@ -254,6 +256,7 @@
 stereo_layout,
 stereo_layout_swap,
 crop_aspect_ratio,
+ source_aspect_ratio,
 parallax,
 ghostbust,
 subtitle_parallax,

_service:download_files:bino-1.4.4.tar.xz/src/gui.cpp -> _service:download_files:bino-1.6.0.tar.xz/src/gui.cpp Changed

@@ -1,13 +1,14 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010, 2011, 2012, 2013
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
 * Joe <cuchac@email.cz>
 * Daniel Schaal <farbing@web.de>
 * D. Matz <bandregent@yahoo.de>
 * Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
+ * Frédéric Bour <frederic.bour@lakaban.net>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -68,14 +69,17 @@
 #include <QSettings>
 #include <QGroupBox>
 #include <QStackedWidget>
+#include <QMimeData>
 
 #include "gettext.h"
-#define _(string) gettext(string)
+// Qt requires strings from gettext to be in UTF-8 encoding.
+#define _(string) (str::convert(gettext(string), str::localcharset(), "UTF-8").c_str())
 
 #include "gui.h"
 #include "lib_versions.h"
 #include "audio_output.h"
 #include "media_input.h"
+#include "video_output_qt.h"
 
 #include "dbg.h"
 #include "msg.h"
@@ -1175,7 +1179,7 @@
 _flip_right_box->setChecked(dispatch::parameters().fullscreen_flip_right());
 _flop_right_box->setChecked(dispatch::parameters().fullscreen_flop_right());
 _3d_ready_sync_box->setChecked(dispatch::parameters().fullscreen_3d_ready_sync());
-#if defined(Q_WS_X11) || defined(Q_WS_MAC)
+#ifndef Q_OS_WIN
 _inhibit_screensaver_box->setChecked(dispatch::parameters().fullscreen_inhibit_screensaver());
 #else
 _inhibit_screensaver_box->setChecked(false);
@@ -1200,7 +1204,7 @@
 int fss = 0;
 QStringList screens = _multi_edt->text().split(',', QString::SkipEmptyParts);
 for (int i = 0; i < screens.size(); i++) {
- int s = str::to<int>(screens[i].toAscii().data());
+ int s = str::to<int>(screens[i].toLatin1().data());
 if (s >= 1 && s <= 16)
 fss |= (1 << (s - 1));
 }
@@ -1958,6 +1962,23 @@
 _crop_ar_combobox->addItem("1:1");
 connect(_crop_ar_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(crop_ar_changed()));
 
+ QLabel *source_ar_label = new QLabel(_("Force source aspect ratio:"));
+ source_ar_label->setToolTip(_("Force the aspect ratio of video source."));
+ _source_ar_combobox = new QComboBox();
+ _source_ar_combobox->setToolTip(source_ar_label->toolTip());
+ _source_ar_combobox->addItem(_("Do not force"));
+ _source_ar_combobox->addItem("16:10");
+ _source_ar_combobox->addItem("16:9");
+ _source_ar_combobox->addItem("1.85:1");
+ _source_ar_combobox->addItem("2.21:1");
+ _source_ar_combobox->addItem("2.35:1");
+ _source_ar_combobox->addItem("2.39:1");
+ _source_ar_combobox->addItem("5:3");
+ _source_ar_combobox->addItem("4:3");
+ _source_ar_combobox->addItem("5:4");
+ _source_ar_combobox->addItem("1:1");
+ connect(_source_ar_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(source_ar_changed()));
+
 QLabel *p_label = new QLabel(_("Parallax:"));
 p_label->setToolTip(_("Adjust parallax, from -1 to +1. This changes the separation of left and right view, "
 "and thus the perceived distance of the scene."));
@@ -2007,16 +2028,18 @@
 QGridLayout *layout = new QGridLayout;
 layout->addWidget(crop_ar_label, 0, 0);
 layout->addWidget(_crop_ar_combobox, 0, 1, 1, 2);
- layout->addWidget(p_label, 1, 0);
- layout->addWidget(_p_slider, 1, 1);
- layout->addWidget(_p_spinbox, 1, 2);
- layout->addWidget(sp_label, 2, 0);
- layout->addWidget(_sp_slider, 2, 1);
- layout->addWidget(_sp_spinbox, 2, 2);
- layout->addWidget(g_label, 3, 0);
- layout->addWidget(_g_slider, 3, 1);
- layout->addWidget(_g_spinbox, 3, 2);
- layout->addWidget(ok_button, 4, 0, 1, 3);
+ layout->addWidget(source_ar_label, 1, 0);
+ layout->addWidget(_source_ar_combobox, 1, 1, 1, 2);
+ layout->addWidget(p_label, 2, 0);
+ layout->addWidget(_p_slider, 2, 1);
+ layout->addWidget(_p_spinbox, 2, 2);
+ layout->addWidget(sp_label, 3, 0);
+ layout->addWidget(_sp_slider, 3, 1);
+ layout->addWidget(_sp_spinbox, 3, 2);
+ layout->addWidget(g_label, 4, 0);
+ layout->addWidget(_g_slider, 4, 1);
+ layout->addWidget(_g_spinbox, 4, 2);
+ layout->addWidget(ok_button, 5, 0, 1, 3);
 setLayout(layout);
 
 update();
@@ -2072,6 +2095,43 @@
 }
 }
 
+void video_dialog::set_source_ar(float value)
+{
+ _source_ar_combobox->setCurrentIndex(
+ ( std::abs(value - 16.0f / 10.0f) < 0.01f ? 1
+ : std::abs(value - 16.0f / 9.0f) < 0.01f ? 2
+ : std::abs(value - 1.85f) < 0.01f ? 3
+ : std::abs(value - 2.21f) < 0.01f ? 4
+ : std::abs(value - 2.35f) < 0.01f ? 5
+ : std::abs(value - 2.39f) < 0.01f ? 6
+ : std::abs(value - 5.0f / 3.0f) < 0.01f ? 7
+ : std::abs(value - 4.0f / 3.0f) < 0.01f ? 8
+ : std::abs(value - 5.0f / 4.0f) < 0.01f ? 9
+ : std::abs(value - 1.0f) < 0.01f ? 10
+ : 0));
+}
+
+void video_dialog::source_ar_changed()
+{
+ if (!_lock)
+ {
+ int i = _source_ar_combobox->currentIndex();
+ float ar =
+ i == 1 ? 16.0f / 10.0f
+ : i == 2 ? 16.0f / 9.0f
+ : i == 3 ? 1.85f
+ : i == 4 ? 2.21f
+ : i == 5 ? 2.35f
+ : i == 6 ? 2.39f
+ : i == 7 ? 5.0f / 3.0f
+ : i == 8 ? 4.0f / 3.0f
+ : i == 9 ? 5.0f / 4.0f
+ : i == 10 ? 1.0f
+ : 0.0f;
+ send_cmd(command::set_source_aspect_ratio, ar);
+ }
+}
+
 void video_dialog::p_slider_changed(int val)
 {
 if (!_lock)
@@ -2113,6 +2173,7 @@
 switch (note.type)
 {
 case notification::crop_aspect_ratio:
+ case notification::source_aspect_ratio:
 case notification::parallax:
 case notification::subtitle_parallax:
 case notification::ghostbust:
@@ -3016,7 +3077,7 @@
 
 file_menu->addSeparator();
 QAction *file_quit_act = new QAction(_("&Quit"), this);
- file_quit_act->setShortcut(QKeySequence::Quit);
+ file_quit_act->setShortcut(tr("Ctrl+Q")); // QKeySequence::Quit is not reliable
 file_quit_act->setMenuRole(QAction::QuitRole);
 file_quit_act->setIcon(get_icon("application-exit"));
 connect(file_quit_act, SIGNAL(triggered()), this, SLOT(close()));
@@ -3090,7 +3151,7 @@
 restoreState(_settings->value("windowstate").toByteArray());
 _settings->endGroup();
 
- // Work around a Qt/X11 problem: if the GL thread is running and a QComboBox
+ // Work around a Qt/X11 problem with Qt4: if the GL thread is running and a QComboBox
 // shows its popup for the first time, then the application sometimes hangs
 // and sometimes aborts with the message "Unknown request in queue while dequeuing".
 // So we briefly show a QComboBox popup before doing anything else.
@@ -3106,7 +3167,7 @@
 }
 #endif
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 // Since this is a single-window app, don't let the user close the main window on OS X
 setWindowFlags(Qt::Window | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
 #endif
@@ -3364,6 +3425,8 @@
 input_data.params.set_stereo_layout_swap(initial_params.stereo_layout_swap());
 if (initial_params.crop_aspect_ratio_is_set())
 input_data.params.set_crop_aspect_ratio(initial_params.crop_aspect_ratio());
+ if (initial_params.source_aspect_ratio_is_set())
+ input_data.params.set_source_aspect_ratio(initial_params.source_aspect_ratio());
 if (initial_params.parallax_is_set())
 input_data.params.set_parallax(initial_params.parallax());
 if (initial_params.ghostbust_is_set())
@@ -3736,7 +3799,7 @@
 about_text->setOpenExternalLinks(true);
 about_text->setText(str::asprintf(_(
 "%s version %s."
- "Copyright (C) 2013 the Bino developers."
+ "Copyright (C) 2014 the Bino developers."

_service:download_files:bino-1.4.4.tar.xz/src/gui.h -> _service:download_files:bino-1.6.0.tar.xz/src/gui.h Changed

@@ -1,12 +1,13 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010, 2011, 2012
+ * Copyright (C) 2010, 2011, 2012, 2013
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
 * Joe <cuchac@email.cz>
 * Daniel Schaal <farbing@web.de>
 * Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
+ * Frédéric Bour <frederic.bour@lakaban.net>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -32,7 +33,6 @@
 #include <QDialog>
 
 #include "dispatch.h"
-#include "video_output_qt.h"
 
 class QLabel;
 class QComboBox;
@@ -49,6 +49,8 @@
 class QStackedWidget;
 class QTimer;
 
+class video_container_widget;
+
 class in_out_widget : public QWidget, public controller
 {
 Q_OBJECT
@@ -316,6 +318,7 @@
 private:
 bool _lock;
 QComboBox *_crop_ar_combobox;
+ QComboBox *_source_ar_combobox;
 QDoubleSpinBox *_p_spinbox;
 QSlider *_p_slider;
 QDoubleSpinBox *_sp_spinbox;
@@ -324,9 +327,11 @@
 QSlider *_g_slider;
 
 void set_crop_ar(float val);
+ void set_source_ar(float val);
 
 private slots:
 void crop_ar_changed();
+ void source_ar_changed();
 void p_slider_changed(int val);
 void p_spinbox_changed(double val);
 void sp_slider_changed(int val);

_service:download_files:bino-1.4.4.tar.xz/src/lib_versions.cpp -> _service:download_files:bino-1.6.0.tar.xz/src/lib_versions.cpp Changed

_service:download_files:bino-1.4.4.tar.xz/src/main.cpp -> _service:download_files:bino-1.6.0.tar.xz/src/main.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010, 2011, 2012, 2013
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014
 * Martin Lambers <marlam@marlam.de>
 * Stefan Eilemann <eile@eyescale.ch>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
@@ -43,9 +43,6 @@
 #include <QApplication>
 #include <QtGlobal>
 #include <QTextCodec>
-#ifdef Q_WS_X11
-# include <X11/Xlib.h>
-#endif
 
 #include "gettext.h"
 #define _(string) gettext(string)
@@ -138,22 +135,31 @@
 #endif
 }
 
+#if QT_VERSION < 0x050000
 static void qt_msg_handler(QtMsgType type, const char *msg)
+#else
+static void qt_msg_handler(QtMsgType type, const QMessageLogContext&, const QString& msg)
+#endif
 {
+#if QT_VERSION < 0x050000
+ std::string s = msg;
+#else
+ std::string s = qPrintable(msg);
+#endif
 switch (type)
 {
 case QtDebugMsg:
- msg::dbg(str::sanitize(msg));
+ msg::dbg(str::sanitize(s));
 break;
 case QtWarningMsg:
- msg::wrn(str::sanitize(msg));
+ msg::wrn(str::sanitize(s));
 break;
 case QtCriticalMsg:
- msg::err(str::sanitize(msg));
+ msg::err(str::sanitize(s));
 break;
 case QtFatalMsg:
 default:
- msg::err(str::sanitize(msg));
+ msg::err(str::sanitize(s));
 std::exit(1);
 }
 }
@@ -194,18 +200,26 @@
 dbg::init_crashhandler();
 
 /* Initialization: Qt */
+ QCoreApplication::setAttribute(Qt::AA_X11InitThreads);
 #ifdef Q_WS_X11
+ // This only works with Qt4; Qt5 ignores the 'have_display' flag.
 const char *display = getenv("DISPLAY");
 bool have_display = (display && display[0] != '\0');
- if (have_display) {
- XInitThreads();
- }
 #else
 bool have_display = true;
 #endif
+#if QT_VERSION < 0x050000
 qInstallMsgHandler(qt_msg_handler);
+#else
+ qInstallMessageHandler(qt_msg_handler);
+#endif
 QApplication *qt_app = new QApplication(argc, argv, have_display);
- QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale()); // necessary for i18n via gettext
+#if QT_VERSION < 0x050000
+ // Make Qt4 behave like Qt5: always interpret all C strings as UTF-8.
+ QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+#endif
+ // Qt resets locale information in the QApplication constructor. Repair that.
+ setlocale(LC_ALL, "");
 QCoreApplication::setOrganizationName("Bino");
 QCoreApplication::setOrganizationDomain("bino3d.org");
 QCoreApplication::setApplicationName(PACKAGE_NAME);
@@ -342,16 +356,30 @@
 options.push_back(&sdi_output_format);
 #endif // HAVE_LIBXNVCTRL
 // Accept some Equalizer options. These are passed to Equalizer for interpretation.
+ opt::flag eq_help("eq-help", '\0', opt::optional);
+ options.push_back(&eq_help);
+ opt::val<std::string> eq_layout("eq-layout", '\0', opt::optional);
+ options.push_back(&eq_layout);
+ opt::val<std::string> eq_gpufilter("eq-gpufilter", '\0', opt::optional);
+ options.push_back(&eq_gpufilter);
+ opt::val<std::string> eq_modelunit("eq-modelunit", '\0', opt::optional);
+ options.push_back(&eq_modelunit);
+ opt::val<std::string> eq_logfile("eq-logfile", '\0', opt::optional);
+ options.push_back(&eq_logfile);
 opt::val<std::string> eq_server("eq-server", '\0', opt::optional);
 options.push_back(&eq_server);
 opt::val<std::string> eq_config("eq-config", '\0', opt::optional);
 options.push_back(&eq_config);
- opt::val<std::string> eq_listen("eq-listen", '\0', opt::optional);
- options.push_back(&eq_listen);
- opt::val<std::string> eq_logfile("eq-logfile", '\0', opt::optional);
- options.push_back(&eq_logfile);
+ opt::val<std::string> eq_config_flags("eq-config-flags", '\0', opt::optional);
+ options.push_back(&eq_config_flags);
+ opt::val<std::string> eq_config_prefixes("eq-config-prefixes", '\0', opt::optional);
+ options.push_back(&eq_config_prefixes);
 opt::val<std::string> eq_render_client("eq-render-client", '\0', opt::optional);
 options.push_back(&eq_render_client);
+ opt::val<std::string> eq_listen("eq-listen", '\0', opt::optional);
+ options.push_back(&eq_listen);
+ opt::val<std::string> co_listen("co-listen", '\0', opt::optional);
+ options.push_back(&co_listen);
 
 std::vector<std::string> arguments;
 #ifdef __APPLE__
@@ -384,7 +412,7 @@
 if (msg::file() == stderr)
 msg::set_file(stdout);
 msg::req(_("%s version %s"), PACKAGE_NAME, VERSION);
- msg::req(4, _("Copyright (C) 2013 the Bino developers."));
+ msg::req(4, _("Copyright (C) 2014 the Bino developers."));
 msg::req_txt(4, _("This is free software. You may redistribute copies of it "
 "under the terms of the GNU General Public License. "
 "There is NO WARRANTY, to the extent permitted by law."));

_service:download_files:bino-1.4.4.tar.xz/src/media_data.cpp -> _service:download_files:bino-1.6.0.tar.xz/src/media_data.cpp Changed

@@ -1,11 +1,12 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010, 2011, 2012
+ * Copyright (C) 2010, 2011, 2012, 2013
 * Martin Lambers <marlam@marlam.de>
 * Joe <joe@wpj.cz>
 * D. Matz <bandregent@yahoo.de>
 * Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
+ * Frédéric Bour <frederic.bour@lakaban.net>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -120,6 +121,7 @@
 unset_stereo_layout();
 unset_stereo_layout_swap();
 unset_crop_aspect_ratio();
+ unset_source_aspect_ratio();
 unset_parallax();
 unset_ghostbust();
 unset_subtitle_parallax();
@@ -174,6 +176,7 @@
 const parameters::stereo_layout_t parameters::_stereo_layout_default = layout_mono;
 const bool parameters::_stereo_layout_swap_default = false;
 const float parameters::_crop_aspect_ratio_default = 0.0f;
+const float parameters::_source_aspect_ratio_default = 0.0f;
 const float parameters::_parallax_default = 0.0f;
 const float parameters::_ghostbust_default = 0.0f;
 const float parameters::_subtitle_parallax_default = 0.0f;
@@ -564,6 +567,8 @@
 s11n::save(os, _stereo_layout_swap_set);
 s11n::save(os, _crop_aspect_ratio);
 s11n::save(os, _crop_aspect_ratio_set);
+ s11n::save(os, _source_aspect_ratio);
+ s11n::save(os, _source_aspect_ratio_set);
 s11n::save(os, _parallax);
 s11n::save(os, _parallax_set);
 s11n::save(os, _ghostbust);
@@ -667,6 +672,8 @@
 s11n::load(is, _stereo_layout_swap_set);
 s11n::load(is, _crop_aspect_ratio);
 s11n::load(is, _crop_aspect_ratio_set);
+ s11n::load(is, _source_aspect_ratio);
+ s11n::load(is, _source_aspect_ratio_set);
 s11n::load(is, _parallax);
 s11n::load(is, _parallax_set);
 s11n::load(is, _ghostbust);
@@ -868,6 +875,7 @@
 unset_stereo_layout();
 unset_stereo_layout_swap();
 unset_crop_aspect_ratio();
+ unset_source_aspect_ratio();
 unset_parallax();
 unset_ghostbust();
 unset_subtitle_parallax();
@@ -886,6 +894,8 @@
 s11n::save(oss, "stereo_layout", stereo_layout_to_string(stereo_layout(), stereo_layout_swap()));
 if (!crop_aspect_ratio_is_default())
 s11n::save(oss, "crop_aspect_ratio", _crop_aspect_ratio);
+ if (!source_aspect_ratio_is_default())
+ s11n::save(oss, "source_aspect_ratio", _source_aspect_ratio);
 if (!parallax_is_default())
 s11n::save(oss, "parallax", _parallax);
 if (!ghostbust_is_default())
@@ -919,6 +929,9 @@
 } else if (name == "crop_aspect_ratio") {
 s11n::load(value, _crop_aspect_ratio);
 _crop_aspect_ratio_set = true;
+ } else if (name == "source_aspect_ratio") {
+ s11n::load(value, _source_aspect_ratio);
+ _source_aspect_ratio_set = true;
 } else if (name == "parallax") {
 s11n::load(value, _parallax);
 _parallax_set = true;

_service:download_files:bino-1.4.4.tar.xz/src/media_data.h -> _service:download_files:bino-1.6.0.tar.xz/src/media_data.h Changed

_service:download_files:bino-1.4.4.tar.xz/src/media_object.cpp -> _service:download_files:bino-1.6.0.tar.xz/src/media_object.cpp Changed

@@ -1,11 +1,12 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010, 2011, 2012, 2013
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <frederic.devernay@inrialpes.fr>
 * Joe <cuchac@email.cz>
 * D. Matz <bandregent@yahoo.de>
+ * Vittorio Giovara <vittorio.giovara@gmail.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -56,6 +57,9 @@
 
 #include "media_object.h"
 
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 25, 0)
+#define AV_CODEC_ID_TEXT CODEC_ID_TEXT
+#endif
 
 // The read thread.
 // This thread reads packets from the AVFormatContext and stores them in the
@@ -880,7 +884,7 @@
 {
 _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 = (codec_ctx->codec_id == CODEC_ID_TEXT
+ AVCodec *codec = (codec_ctx->codec_id == AV_CODEC_ID_TEXT
 ? NULL : avcodec_find_decoder(codec_ctx->codec_id));
 // 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
@@ -897,11 +901,15 @@
 // Set CODEC_FLAG_EMU_EDGE in the same situations in which ffplay sets it.
 // I don't know what exactly this does, but it is necessary to fix the problem
 // described in this thread: http://lists.nongnu.org/archive/html/bino-list/2012-02/msg00039.html
- if (codec_ctx->lowres || (codec && (codec->capabilities & CODEC_CAP_DR1)))
+ int lowres = 0;
+#ifdef FF_API_LOWRES
+ lowres = codec_ctx->lowres;
+#endif
+ if (lowres || (codec && (codec->capabilities & CODEC_CAP_DR1)))
 codec_ctx->flags |= CODEC_FLAG_EMU_EDGE;
 }
- // Find and open the codec. CODEC_ID_TEXT is a special case: it has no decoder since it is unencoded raw data.
- if (codec_ctx->codec_id != CODEC_ID_TEXT && (!codec || (e = avcodec_open2(codec_ctx, codec, NULL)) < 0))
+ // Find and open the codec. AV_CODEC_ID_TEXT is a special case: it has no decoder since it is unencoded raw data.
+ if (codec_ctx->codec_id != AV_CODEC_ID_TEXT && (!codec || (e = avcodec_open2(codec_ctx, codec, NULL)) < 0))
 {
 msg::wrn(_("%s stream %d: Cannot open %s: %s"), _url.c_str(), i,
 codec_ctx->codec_type == AVMEDIA_TYPE_VIDEO ? _("video codec")
@@ -929,8 +937,13 @@
 _ffmpeg->video_packets.push_back(AVPacket());
 av_init_packet(&(_ffmpeg->video_packets[j]));
 _ffmpeg->video_decode_threads.push_back(video_decode_thread(_url, _ffmpeg, j));
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 28, 1)
 _ffmpeg->video_frames.push_back(avcodec_alloc_frame());
 _ffmpeg->video_buffered_frames.push_back(avcodec_alloc_frame());
+#else
+ _ffmpeg->video_frames.push_back(av_frame_alloc());
+ _ffmpeg->video_buffered_frames.push_back(av_frame_alloc());
+#endif
 enum PixelFormat frame_fmt = (_ffmpeg->video_frame_templates[j].layout == video_frame::bgra32
 ? PIX_FMT_BGRA : _ffmpeg->video_codec_ctxs[j]->pix_fmt);
 int frame_bufsize = (avpicture_get_size(frame_fmt,
@@ -947,7 +960,11 @@
 // Initialize things needed for software pixel format conversion
 int sws_bufsize = avpicture_get_size(PIX_FMT_BGRA,
 _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height);
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 28, 1)
 _ffmpeg->video_sws_frames.push_back(avcodec_alloc_frame());
+#else
+ _ffmpeg->video_sws_frames.push_back(av_frame_alloc());
+#endif
 _ffmpeg->video_sws_buffers.push_back(static_cast<uint8_t *>(av_malloc(sws_bufsize)));
 if (!_ffmpeg->video_sws_frames[j] || !_ffmpeg->video_sws_buffers[j])
 {
@@ -1001,9 +1018,9 @@
 int j = _ffmpeg->subtitle_streams.size() - 1;
 msg::dbg(_url + " stream " + str::from(i) + " is subtitle stream " + str::from(j) + ".");
 _ffmpeg->subtitle_codec_ctxs.push_back(codec_ctx);
- // CODEC_ID_TEXT does not have any decoder; it is just UTF-8 text in the packet data.
+ // AV_CODEC_ID_TEXT does not have any decoder; it is just UTF-8 text in the packet data.
 _ffmpeg->subtitle_codecs.push_back(
- _ffmpeg->subtitle_codec_ctxs[j]->codec_id == CODEC_ID_TEXT ? NULL : codec);
+ _ffmpeg->subtitle_codec_ctxs[j]->codec_id == AV_CODEC_ID_TEXT ? NULL : codec);
 _ffmpeg->subtitle_box_templates.push_back(subtitle_box());
 set_subtitle_box_template(j);
 _ffmpeg->subtitle_decode_threads.push_back(subtitle_decode_thread(_url, _ffmpeg, j));
@@ -1200,7 +1217,7 @@
 {
 assert(index >= 0);
 assert(index < video_streams());
- int n = _ffmpeg->format_ctx->streams[_ffmpeg->video_streams.at(index)]->r_frame_rate.num;
+ int n = _ffmpeg->format_ctx->streams[_ffmpeg->video_streams.at(index)]->avg_frame_rate.num;
 if (n <= 0)
 n = 1;
 return n;
@@ -1210,7 +1227,7 @@
 {
 assert(index >= 0);
 assert(index < video_streams());
- int d = _ffmpeg->format_ctx->streams[_ffmpeg->video_streams.at(index)]->r_frame_rate.den;
+ int d = _ffmpeg->format_ctx->streams[_ffmpeg->video_streams.at(index)]->avg_frame_rate.den;
 if (d <= 0)
 d = 1;
 return d;
@@ -1783,8 +1800,8 @@
 int got_subtitle;
 tmppacket = packet;
 
- // CODEC_ID_TEXT does not have any decoder; it is just UTF-8 text in the packet data.
- if (_ffmpeg->subtitle_codec_ctxs[_subtitle_stream]->codec_id == CODEC_ID_TEXT)
+ // AV_CODEC_ID_TEXT does not have any decoder; it is just UTF-8 text in the packet data.
+ if (_ffmpeg->subtitle_codec_ctxs[_subtitle_stream]->codec_id == AV_CODEC_ID_TEXT)
 {
 int64_t duration = packet.convergence_duration * 1000000
 * _ffmpeg->format_ctx->streams[_ffmpeg->subtitle_streams[_subtitle_stream]]->time_base.num
@@ -1944,9 +1961,9 @@
 }
 for (size_t i = 0; i < _ffmpeg->subtitle_streams.size(); i++)
 {
- if (_ffmpeg->format_ctx->streams[_ffmpeg->subtitle_streams[i]]->codec->codec_id != CODEC_ID_TEXT)
+ if (_ffmpeg->format_ctx->streams[_ffmpeg->subtitle_streams[i]]->codec->codec_id != AV_CODEC_ID_TEXT)
 {
- // CODEC_ID_TEXT has no decoder, so we cannot flush its buffers
+ // AV_CODEC_ID_TEXT has no decoder, so we cannot flush its buffers
 avcodec_flush_buffers(_ffmpeg->format_ctx->streams[_ffmpeg->subtitle_streams[i]]->codec);
 }
 _ffmpeg->subtitle_box_buffers[i].clear();

_service:download_files:bino-1.4.4.tar.xz/src/player_equalizer.cpp -> _service:download_files:bino-1.6.0.tar.xz/src/player_equalizer.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010, 2011, 2012
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014
 * Martin Lambers <marlam@marlam.de>
 * Stefan Eilemann <eile@eyescale.ch>
 *
@@ -22,8 +22,10 @@
 #include "config.h"
 
 #include <sstream>
+#include <algorithm>
 #include <cmath>
 #include <cstdlib>
+#include <unistd.h> // for usleep()
 
 #include <eq/eq.h>
 
@@ -229,51 +231,6 @@
 };
 
 /*
- * Define errors produced by player.
- */
-
-enum Error
-{
- ERROR_MAP_INITDATA_FAILED = eq::ERROR_CUSTOM,
- ERROR_MAP_FRAMEDATA_FAILED,
- ERROR_PLAYER_INIT_FAILED,
- ERROR_OPENGL_2_1_NEEDED
-};
-
-struct ErrorData
-{
- const uint32_t code;
- const std::string text;
-};
-
-static ErrorData errors[] =
-{
- { ERROR_MAP_FRAMEDATA_FAILED, _("Init data mapping failed.") },
- { ERROR_MAP_INITDATA_FAILED, _("Frame data mapping failed.") },
- { ERROR_PLAYER_INIT_FAILED, _("Video player initialization failed.") },
- { ERROR_OPENGL_2_1_NEEDED, _("Need at least OpenGL 2.1.") },
- { 0, "" } // last!
-};
-
-static void initErrors()
-{
- co::base::ErrorRegistry &registry = co::base::Global::getErrorRegistry();
- for (size_t i = 0; errors[i].code != 0; i++)
- {
- registry.setString(errors[i].code, errors[i].text);
- }
-}
-
-static void exitErrors()
-{
- co::base::ErrorRegistry &registry = co::base::Global::getErrorRegistry();
- for (size_t i = 0; errors[i].code != 0; i++)
- {
- registry.eraseString(errors[i].code);
- }
-}
-
-/*
 * eq_init_data
 */
 
@@ -699,7 +656,7 @@
 eq::Vector3f w = u.cross(v);
 w.normalize();
 
- const eq::Vector3f dot = w.dot(eq::Vector3f::FORWARD);
+ const eq::Vector3f dot(w.dot(eq::Vector3f::FORWARD));
 const float val = dot.squared_length();
 if (val < angle) // facing more away then previous segment
 {
@@ -712,12 +669,12 @@
 wall.apply(vp);
 
 const eq::Vector3f topRight = wall.topLeft + wall.bottomRight - wall.bottomLeft;
- float yMin = EQ_MIN(wall.bottomLeft.y(), wall.bottomRight.y());
- float yMax = EQ_MAX(wall.bottomLeft.y(), wall.bottomRight.y());
- yMin = EQ_MIN(yMin, wall.topLeft.y());
- yMax = EQ_MAX(yMax, wall.topLeft.y());
- yMin = EQ_MIN(yMin, topRight.y());
- yMax = EQ_MAX(yMax, topRight.y());
+ float yMin = std::min(wall.bottomLeft.y(), wall.bottomRight.y());
+ float yMax = std::max(wall.bottomLeft.y(), wall.bottomRight.y());
+ yMin = std::min(yMin, wall.topLeft.y());
+ yMax = std::max(yMax, wall.topLeft.y());
+ yMin = std::min(yMin, topRight.y());
+ yMax = std::max(yMax, topRight.y());
 
 const float h = yMax - yMin;
 const eq::Vector3f center = (wall.bottomRight + wall.topLeft) * 0.5f;
@@ -776,13 +733,13 @@
 eq_config *config = static_cast<eq_config *>(getConfig());
 if (!config->mapObject(&init_data, init_id))
 {
- setError(ERROR_MAP_INITDATA_FAILED);
+ msg::err(_("Init data mapping failed."));
 return false;
 }
 // Map our FrameData instance to the master instance
 if (!config->mapObject(&frame_data, init_data.frame_data_id))
 {
- setError(ERROR_MAP_FRAMEDATA_FAILED);
+ msg::err(_("Frame data mapping failed."));
 return false;
 }
 
@@ -795,7 +752,7 @@
 init_data.params.swap_interval());
 if (!_player.init(init_data.input))
 {
- setError(ERROR_PLAYER_INIT_FAILED);
+ msg::err(_("Video player initialization failed."));
 return false;
 }
 }
@@ -911,7 +868,6 @@
 "GL_VERSION_2_1 GL_EXT_framebuffer_object"))
 {
 msg::err(_("This OpenGL implementation does not support OpenGL 2.1 and framebuffer objects."));
- setError(ERROR_OPENGL_2_1_NEEDED);
 return false;
 }
 
@@ -1086,7 +1042,6 @@
 assert(!global_player_equalizer);
 global_player_equalizer = this;
 /* Initialize Equalizer */
- initErrors();
 _node_factory = new eq_node_factory;
 if (!eq::init(*argc, argv, _node_factory))
 {
@@ -1106,7 +1061,6 @@
 {
 eq::releaseConfig(_config);
 eq::exit();
- exitErrors();
 delete _node_factory;
 global_player_equalizer = NULL;
 }

_service:download_files:bino-1.4.4.tar.xz/src/video_output.cpp -> _service:download_files:bino-1.6.0.tar.xz/src/video_output.cpp Changed

@@ -1,11 +1,12 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010, 2011, 2012
+ * Copyright (C) 2010, 2011, 2012, 2013
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <frederic.devernay@inrialpes.fr>
 * Joe <cuchac@email.cz>
 * Binocle <http://binocle.com> (author: Olivier Letz <oletz@binocle.com>)
+ * Frédéric Bour <frederic.bour@lakaban.net>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1088,6 +1089,8 @@
 src_ar /= 2.0f;
 crop_ar /= 2.0f;
 }
+ if (params.source_aspect_ratio_is_set() && params.source_aspect_ratio() > 0.0f)
+ src_ar = params.source_aspect_ratio();
 compute_viewport_and_tex_coords(_viewport[0], _tex_coords[0], src_ar,
 w / 2, h, dst_w, dst_h, dst_ar,
 crop_ar, params.zoom(), need_even_width, need_even_height);
@@ -1105,6 +1108,8 @@
 src_ar *= 2.0f;
 crop_ar *= 2.0f;
 }
+ if (params.source_aspect_ratio_is_set() && params.source_aspect_ratio() > 0.0f)
+ src_ar = params.source_aspect_ratio();
 compute_viewport_and_tex_coords(_viewport[0], _tex_coords[0], src_ar,
 w, h / 2, dst_w, dst_h, dst_ar,
 crop_ar, params.zoom(), need_even_width, need_even_height);
@@ -1124,6 +1129,8 @@
 float dst_h = (h - blank_lines) / 2;
 float dst_ar = dst_w * screen_pixel_aspect_ratio() / dst_h;
 float src_ar = _frame[_active_index].aspect_ratio;
+ if (params.source_aspect_ratio_is_set() && params.source_aspect_ratio() > 0.0f)
+ src_ar = params.source_aspect_ratio();
 compute_viewport_and_tex_coords(_viewport[0], _tex_coords[0], src_ar,
 w, (h - blank_lines) / 2, dst_w, dst_h, dst_ar,
 params.crop_aspect_ratio(), params.zoom(), need_even_width, need_even_height);
@@ -1135,6 +1142,8 @@
 float dst_h = h;
 float dst_ar = dst_w * screen_pixel_aspect_ratio() / dst_h;
 float src_ar = _frame[_active_index].aspect_ratio;
+ if (params.source_aspect_ratio_is_set() && params.source_aspect_ratio() > 0.0f)
+ src_ar = params.source_aspect_ratio();
 compute_viewport_and_tex_coords(_viewport[0], _tex_coords[0], src_ar,
 w, h, dst_w, dst_h, dst_ar,
 params.crop_aspect_ratio(), params.zoom(), need_even_width, need_even_height);
@@ -1183,6 +1192,8 @@
 || _render_last_params.stereo_mode() != _render_params.stereo_mode()
 || _render_last_params.crop_aspect_ratio() < _render_params.crop_aspect_ratio()
 || _render_last_params.crop_aspect_ratio() > _render_params.crop_aspect_ratio()
+ || _render_last_params.source_aspect_ratio() < _render_params.source_aspect_ratio()
+ || _render_last_params.source_aspect_ratio() > _render_params.source_aspect_ratio()
 || _render_last_params.zoom() < _render_params.zoom()
 || _render_last_params.zoom() > _render_params.zoom()
 || full_display_width() != dst_width

_service:download_files:bino-1.4.4.tar.xz/src/video_output_qt.cpp -> _service:download_files:bino-1.6.0.tar.xz/src/video_output_qt.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010, 2011, 2012
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <frederic.devernay@inrialpes.fr>
 * Joe <cuchac@email.cz>
@@ -45,9 +45,11 @@
 #ifdef Q_WS_X11
 # include <QX11Info>
 # include <X11/Xlib.h>
+#endif
+#if HAVE_X11
 # include <GL/glxew.h>
 #endif
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 #include <IOKit/pwr_mgt/IOPMLib.h>
 #include <AvailabilityMacros.h>
 #endif
@@ -78,7 +80,7 @@
 {
 }
 
-#ifdef Q_WS_X11
+#if HAVE_X11
 GLXEWContext* gl_thread::glxewGetContext() const
 {
 return _vo_qt->glxewGetContext();
@@ -137,7 +139,7 @@
 _vo_qt_widget->makeCurrent();
 assert(QGLContext::currentContext() == _vo_qt_widget->context());
 while (_render) {
-#ifdef Q_WS_X11
+#if HAVE_X11
 GLuint counter;
 if (GLXEW_SGI_video_sync && glXGetVideoSyncSGI(&counter) == 0)
 _display_frameno = counter;
@@ -209,20 +211,7 @@
 _vo_qt->sdi_output(_display_frameno);
 #endif // HAVE_LIBXNVCTRL
 _vo_qt->display_current_frame(_display_frameno);
- // Swap buffers. To avoid problems with the NVIDIA 304.x driver
- // series on GNU/Linux, we first release the GL context and re-grab
- // it after the swap. Not sure why that would be necessary, but it
- // fixes a problem where swapBuffers() does not return and the
- // application blocks.
- // However, this breaks video playback on Windows, so only do it on
- // X11 systems.
-#ifdef Q_WS_X11
- _vo_qt_widget->doneCurrent();
-#endif
 _vo_qt_widget->swapBuffers();
-#ifdef Q_WS_X11
- _vo_qt_widget->makeCurrent();
-#endif
 } else if (!dispatch::parameters().benchmark()) {
 // do not busy loop
 usleep(1000);
@@ -244,6 +233,9 @@
 }
 _wait_mutex.unlock();
 _vo_qt_widget->doneCurrent();
+#if QT_VERSION >= 0x050000
+ _vo_qt_widget->context()->moveToThread(QCoreApplication::instance()->thread());
+#endif
 }
 
 int64_t gl_thread::time_to_next_frame_presentation()
@@ -303,6 +295,9 @@
 
 void video_output_qt_widget::start_rendering()
 {
+#if QT_VERSION >= 0x050000
+ context()->moveToThread(&_gl_thread);
+#endif
 _gl_thread.set_render(true);
 _gl_thread.start();
 _timer.start(0);
@@ -486,7 +481,11 @@
 
 void video_output_qt_widget::mouseReleaseEvent(QMouseEvent *event)
 {
+#if QT_VERSION < 0x050000
 _vo->mouse_set_pos(std::max(std::min(static_cast<float>(event->posF().x()) / this->width(), 1.0f), 0.0f));
+#else
+ _vo->mouse_set_pos(std::max(std::min(static_cast<float>(event->localPos().x()) / this->width(), 1.0f), 0.0f));
+#endif
 }
 
 void video_output_qt_widget::mouseDoubleClickEvent(QMouseEvent *)
@@ -626,7 +625,7 @@
 set_opengl_versions();
 glewExperimental = GL_TRUE;
 GLenum err = glewInit();
-#ifdef Q_WS_X11
+#if HAVE_X11
 if (err == GLEW_OK)
 {
 err = glxewInit();
@@ -782,7 +781,7 @@
 process_events();
 }
 
-#ifdef Q_WS_X11
+#if HAVE_X11
 GLXEWContext* video_output_qt::glxewGetContext() const
 {
 return const_cast<GLXEWContext*>(&_glxew_context);
@@ -846,15 +845,9 @@
 
 void video_output_qt::suspend_screensaver()
 {
-#if defined(Q_WS_X11)
- _widget->stop_rendering();
- if (QProcess::execute(QString("xdg-screensaver suspend ")
- + str::from(_container_widget->winId()).c_str()) != 0)
- msg::wrn(_("Cannot suspend screensaver."));
- _widget->start_rendering();
-#elif defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
 /* TODO */
-#elif defined(Q_WS_MAC)
+#elif defined(Q_OS_MAC)
 # if defined (MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
 // API introduced in 10.6
 IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, CFSTR ("Bino"), &_disableDisplaySleepAssertion);
@@ -862,21 +855,27 @@
 // API introduced in OSX 10.5, deprecated in 10.6
 IOPMAssertionCreate(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, &_disableDisplaySleepAssertion);
 # endif
+#elif defined(Q_OS_UNIX)
+ _widget->stop_rendering();
+ if (QProcess::execute(QString("xdg-screensaver suspend ")
+ + str::from(_container_widget->winId()).c_str()) != 0)
+ msg::wrn(_("Cannot suspend screensaver."));
+ _widget->start_rendering();
 #endif
 }
 
 void video_output_qt::resume_screensaver()
 {
-#if defined(Q_WS_X11)
+#if defined(Q_OS_WIN)
+ /* TODO */
+#elif defined(Q_OS_MAC)
+ IOPMAssertionRelease(_disableDisplaySleepAssertion);
+#elif defined(Q_OS_UNIX)
 _widget->stop_rendering();
 if (QProcess::execute(QString("xdg-screensaver resume ")
 + str::from(_container_widget->winId()).c_str()) != 0)
 msg::wrn(_("Cannot resume screensaver."));
 _widget->start_rendering();
-#elif defined(Q_WS_WIN)
- /* TODO */
-#elif defined(Q_WS_MAC)
- IOPMAssertionRelease(_disableDisplaySleepAssertion);
 #endif
 }
 
@@ -944,7 +943,7 @@
 void video_output_qt::enter_fullscreen()
 {
 if (!_fullscreen) {
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 _widget->stop_rendering();
 #endif
 // If the container is a window, we save its geometry here so that
@@ -996,6 +995,8 @@
 * 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. */
+ /* In the hope that this crap is not necessary anymore with Qt5, we continue to test
+ * for Q_WS_X11, which is never defined with Qt5. */
 if (new_window_flags & Qt::X11BypassWindowManagerHint) {
 QApplication::syncX(); // just for safety; not sure if it is necessary
 XSetInputFocus(QX11Info::display(), _container_widget->winId(), RevertToParent, CurrentTime);
@@ -1010,7 +1011,7 @@
 _screensaver_inhibited = true;
 }
 _fullscreen = true;
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 _widget->start_rendering();
 #endif
 }
@@ -1019,7 +1020,7 @@
 void video_output_qt::exit_fullscreen()
 {
 if (_fullscreen) {
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 _widget->stop_rendering();
 #endif
 // Resume the screensaver before disabling fullscreen, so that our window ID
@@ -1043,7 +1044,7 @@
 _container_widget->raise();

_service:download_files:bino-1.4.4.tar.xz/src/video_output_qt.h -> _service:download_files:bino-1.6.0.tar.xz/src/video_output_qt.h Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010, 2011, 2012
+ * Copyright (C) 2010, 2011, 2012, 2013
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -21,6 +21,8 @@
 #ifndef VIDEO_OUTPUT_QT_H
 #define VIDEO_OUTPUT_QT_H
 
+#include "config.h"
+
 #include <GL/glew.h>
 
 #include <QWidget>
@@ -30,7 +32,7 @@
 #include <QThread>
 #include <QMutex>
 
-#ifdef Q_WS_X11
+#if HAVE_X11
 # include <GL/glxew.h>
 #endif
 
@@ -67,7 +69,7 @@
 public:
 gl_thread(video_output_qt* vo_qt, video_output_qt_widget* vo_qt_widget);
 
-#ifdef Q_WS_X11
+#if HAVE_X11
 GLXEWContext* glxewGetContext() const;
 #endif
 
@@ -164,7 +166,7 @@
 class video_output_qt : public video_output
 {
 private:
-#ifdef Q_WS_X11
+#if HAVE_X11
 GLXEWContext _glxew_context;
 #endif
 GLEWContext _glew_context;
@@ -179,7 +181,7 @@
 bool _screensaver_inhibited;
 bool _recreate_context;
 bool _recreate_context_stereo;
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 unsigned int _disableDisplaySleepAssertion;
 #endif
 
@@ -190,7 +192,7 @@
 void resume_screensaver();
 
 protected:
-#ifdef Q_WS_X11
+#if HAVE_X11
 GLXEWContext* glxewGetContext() const;
 #endif
 virtual GLEWContext* glewGetContext() const;