Packman Build Service PMBS

Changes of Revision 29

bino.changes Changed

bino.spec Changed

@@ -18,57 +18,43 @@
 #
 
 
-%bcond_without equalizer
-%if 0%{?suse_version} == 1315 && 0%{?is_opensuse}
-%define Leap_verSP 4210
-%endif
-%if 0%{?Leap_verSP} == 4210 || 0%{?suse_version} > 1320
-%bcond_without qt5
-%endif
+%bcond_with     bino_equalizer
 Name:           bino
-Version:        1.6.1
+Version:        1.6.5
 Release:        0
 Summary:        Video Player with 3D and Multi-Display Video Support
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Players
 Url:            http://bino3d.org
 Source:         http://download-mirror.savannah.gnu.org/releases/bino/bino-%{version}.tar.xz
+Patch0:         0001-Revert-Always-use-GLEWmx-do-not-fall-back-to-GLEW.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
-BuildRequires:  glibc-devel
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libtool
-BuildRequires:  lirc-devel
-BuildRequires:  make
 BuildRequires:  pkgconfig
-BuildRequires:  makeinfo
 BuildRequires:  update-desktop-files
-BuildRequires:  xz
-BuildRequires:  pkgconfig(glewmx) >= 1.6.0
+#
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libavdevice)
+BuildRequires:  pkgconfig(libswscale)
 BuildRequires:  pkgconfig(libass)
-BuildRequires:  pkgconfig(libavcodec) = 56.60.100
-BuildRequires:  pkgconfig(libavdevice) = 56.4.100
-BuildRequires:  pkgconfig(libavformat) = 56.40.101
-BuildRequires:  pkgconfig(libavutil) = 54.31.100
-BuildRequires:  pkgconfig(libswscale) = 3.1.101
 BuildRequires:  pkgconfig(openal)
-BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(glu)
-%if %{with equalizer}
-BuildRequires:  pkgconfig(Equalizer)
-%endif
-%if %{with qt5}
-BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  pkgconfig(Qt5Gui)
-BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(Qt5OpenGL)
+BuildRequires:  pkgconfig(Qt5Core)
+%if %{with bino_equalizer}
+BuildRequires:  pkgconfig(Equalizer)
+BuildRequires:  pkgconfig(glewmx) >= 1.6.0
 %else
-BuildRequires:  pkgconfig(QtCore)
-BuildRequires:  pkgconfig(QtGui)
-BuildRequires:  pkgconfig(QtOpenGL)
+BuildRequires:  pkgconfig(glew) >= 1.6.0
 %endif
-Requires:       %{install_info_prereq}
+BuildRequires:  pkgconfig(glu)
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(lirc)
+#
+Requires(pre):  hicolor-icon-theme
+Requires(pre):  %{install_info_prereq}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -81,40 +67,27 @@
 
 %prep
 %setup -q
-
-# Compile your code with -fPIC (Qt5)
-sed -i '/CXXFLAGS/s/fPIE/fPIC/;/LDFLAGS/s/pie/fpic/' configure
-# fix removal of translations
-pushd po
-mv zh{_cn,_CN}.po
-mv zh{_cn,_CN}.gmo
-sed -i 's/_cn/_CN/' LINGUAS
-popd
+%patch0 -p1
 
 %build
-%if 0%{?suse_version} >= 1230
-# hangle 'multiple definition of'
-export LDFLAGS="%{optflags} -zmuldefs"
-%endif
 # support via liblircclient
-export liblircclient_CFLAGS="-I%{_includedir}"
-export liblircclient_LIBS="-L%{_libdir} -llirc_client"
+export lirc_CFLAGS="-I%{_includedir}"
+export lirc_LIBS="-L%{_libdir} -llirc_client"
 
+autoreconf -fi
 %configure \
     --disable-silent-rules \
-    %if !%{with equalizer}
+    %if %{without bino_equalizer}
     --without-equalizer \
     %endif
-    %if %{with qt5}
     --with-qt-version=5
-    %endif
     
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install
 
-rm -rf "%{buildroot}%{_datadir}/doc"
+rm -rfv "%{buildroot}%{_datadir}/doc"
 
 %suse_update_desktop_file -r "%{name}" AudioVideo Video Player
 %find_lang "%{name}" || echo -n >"%{name}.lang"
@@ -127,7 +100,7 @@
 %postun
 %icon_theme_cache_postun
 %desktop_database_postun
-if [ $1 = 0 ]; then
+if [ "$1" = 0 ]; then
   %info_del %{name}.info
 fi

0001-Revert-Always-use-GLEWmx-do-not-fall-back-to-GLEW.patch Added

@@ -0,0 +1,205 @@
+From 7098cd6afb7ed805de085ed72a5a3ff56e529277 Mon Sep 17 00:00:00 2001
+From: Martin Lambers <marlam@marlam.de>
+Date: Sun, 18 Dec 2016 14:37:52 +0100
+Subject: [PATCH] Revert "Always use GLEWmx, do not fall back to GLEW."
+
+This reverts commit eaf9278782b32a13cea19d1be331cb74a6cddce9.
+---
+ configure.ac | 15 +++++++++++++--
+ src/Makefile.am | 8 ++++++--
+ src/video_output.h | 4 +++-
+ src/video_output_qt.cpp | 13 ++++++++-----
+ src/video_output_qt.h | 20 +++++++++++++-------
+ 5 files changed, 43 insertions(+), 17 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 52181ed..03c6b58 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -296,7 +296,9 @@ fi
+ AC_DEFINE_UNQUOTED([HAVE_LIBEQUALIZER], [$HAVE_LIBEQUALIZER], [Have Equalizer?])
+ AM_CONDITIONAL([HAVE_LIBEQUALIZER], [test "$HAVE_LIBEQUALIZER" = "1"])
+ 
+-dnl glewmx
++dnl glew
++dnl With Equalizer, we need glewmx, since that is what Equalizer uses.
++dnl Without Equalizer, glew (without mx) is ok to use, too.
+ PKG_CHECK_MODULES([libglewmx], [glewmx >= 1.6.0], [HAVE_LIBGLEWMX=1], [HAVE_LIBGLEWMX=0])
+ if test "$HAVE_LIBGLEWMX" != "1"; then
+ AC_MSG_WARN([required library libglewmx >= 1.6.0 not found:])
+@@ -304,6 +306,15 @@ if test "$HAVE_LIBGLEWMX" != "1"; then
+ AC_MSG_WARN([libglewmx is provided by glew; Debian package: libglewmx-dev])
+ fi
+ AM_CONDITIONAL([HAVE_LIBGLEWMX], [test "$HAVE_LIBGLEWMX" = "1"])
++if test "$HAVE_LIBGLEWMX" != "1" -a "$HAVE_LIBEQUALIZER" != "1"; then
++ AC_MSG_NOTICE([trying to use libglew instead of libglewmx])
++ PKG_CHECK_MODULES([libglew], [glew >= 1.6.0], [HAVE_LIBGLEW=1], [HAVE_LIBGLEW=0])
++ if test "$HAVE_LIBGLEW" != "1"; then
++ AC_MSG_WARN([required library libglew >= 1.6.0 not found:])
++ AC_MSG_WARN([$libglew_PKG_ERRORS])
++ AC_MSG_WARN([libglew is provided by glew; Debian package: libglew-dev])
++ fi
++fi
+ 
+ dnl libXNVCtrl
+ AC_ARG_WITH([xnvctrl],
+@@ -390,7 +401,7 @@ if test "$am_cv_func_iconv" != "yes" \
+ -o "$HAVE_LIBASS" != "1" \
+ -o "$HAVE_LIBOPENAL" != "1" \
+ -o "$HAVE_LIBQTOPENGL" != "1" \
+- -o "$HAVE_LIBGLEWMX" != "1" \
++ -o $ "$HAVE_LIBGLEWMX" != "1" -a "$HAVE_LIBGLEW" != "1" $ \
+ -o $ "$equalizer" = "yes" -a "$HAVE_LIBEQUALIZER" != "1" $ \
+ -o $ "$xnvctrl" = "yes" -a "$HAVE_LIBXNVCTRL" != "1" $ \
+ -o $ "$lirc" = "yes" -a "$HAVE_LIRC" != "1" $ ; then
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6fc12bb..65cbae6 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -149,11 +149,15 @@ DEFS += -DHTMLDIR=\"$(htmldir)\" -DLOCALEDIR=\"$(localedir)\"
+ 
+ AM_CPPFLAGS = \
+ 	$(libavformat_CFLAGS) $(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \
+-	$(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglewmx_CFLAGS) $(libqtopengl_CFLAGS)
++	$(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglewmx_CFLAGS) $(libglew_CFLAGS) $(libqtopengl_CFLAGS)
+ 
+ bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) $(LIBICONV) \
+ 	$(libavformat_LIBS) $(libavdevice_LIBS) $(libswscale_LIBS) $(libass_LIBS) \
+-	$(libopenal_LIBS) $(libgl_LIBS) $(libglewmx_LIBS) $(libqtopengl_LIBS)
++	$(libopenal_LIBS) $(libgl_LIBS) $(libglewmx_LIBS) $(libglew_LIBS) $(libqtopengl_LIBS)
++
++if HAVE_LIBGLEWMX
++AM_CPPFLAGS += -DGLEW_MX
++endif
+ 
+ if HAVE_LIBEQUALIZER
+ bino_SOURCES += player_equalizer.h player_equalizer.cpp
+diff --git a/src/video_output.h b/src/video_output.h
+index 8430ddc..2fd72ce 100644
+--- a/src/video_output.h
++++ b/src/video_output.h
+@@ -1,7 +1,7 @@
+ /*
+ * This file is part of bino, a 3D video player.
+ *
+- * Copyright (C) 2010, 2011, 2012, 2015
++ * Copyright (C) 2010, 2011, 2012, 2015, 2016
+ * Martin Lambers <marlam@marlam.de>
+ * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+ * Joe <cuchac@email.cz>
+@@ -128,7 +128,9 @@ private:
+ protected:
+ subtitle_renderer _subtitle_renderer;
+ 
++#ifdef GLEW_MX
+ virtual GLEWContext* glewGetContext() const = 0;
++#endif
+ 
+ // Get the total viewport size.
+ int full_display_width() const;
+diff --git a/src/video_output_qt.cpp b/src/video_output_qt.cpp
+index 0758892..ab82388 100644
+--- a/src/video_output_qt.cpp
++++ b/src/video_output_qt.cpp
+@@ -1,7 +1,7 @@
+ /*
+ * This file is part of bino, a 3D video player.
+ *
+- * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015
++ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016
+ * Martin Lambers <marlam@marlam.de>
+ * Frédéric Devernay <frederic.devernay@inrialpes.fr>
+ * Joe <cuchac@email.cz>
+@@ -80,11 +80,13 @@ gl_thread::gl_thread(video_output_qt* vo_qt, video_output_qt_widget* vo_qt_widge
+ {
+ }
+ 
+-#if HAVE_X11
++#ifdef GLEW_MX
++# if HAVE_X11
+ GLXEWContext* gl_thread::glxewGetContext() const
+ {
+ return _vo_qt->glxewGetContext();
+ }
++# endif
+ #endif
+ 
+ void gl_thread::set_render(bool r)
+@@ -781,17 +783,18 @@ void video_output_qt::create_widget()
+ process_events();
+ }
+ 
+-#if HAVE_X11
++#ifdef GLEW_MX
++# if HAVE_X11
+ GLXEWContext* video_output_qt::glxewGetContext() const
+ {
+ return const_cast<GLXEWContext*>(&_glxew_context);
+ }
+-#endif
+-
++# endif
+ GLEWContext* video_output_qt::glewGetContext() const
+ {
+ return const_cast<GLEWContext*>(&_glew_context);
+ }
++#endif
+ 
+ bool video_output_qt::context_is_stereo() const
+ {
+diff --git a/src/video_output_qt.h b/src/video_output_qt.h
+index 1cc3174..089bac9 100644
+--- a/src/video_output_qt.h
++++ b/src/video_output_qt.h
+@@ -1,7 +1,7 @@
+ /*
+ * This file is part of bino, a 3D video player.
+ *
+- * Copyright (C) 2010, 2011, 2012, 2013, 2015
++ * Copyright (C) 2010, 2011, 2012, 2013, 2015, 2016
+ * Martin Lambers <marlam@marlam.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+@@ -69,8 +69,10 @@ private:
+ public:
+ gl_thread(video_output_qt* vo_qt, video_output_qt_widget* vo_qt_widget);
+ 
+-#if HAVE_X11
++#ifdef GLEW_MX
++# if HAVE_X11
+ GLXEWContext* glxewGetContext() const;
++# endif
+ #endif
+ 
+ void set_render(bool r);
+@@ -166,10 +168,12 @@ protected:
+ class video_output_qt : public video_output
+ {
+ private:
+-#if HAVE_X11
++#ifdef GLEW_MX
++# if HAVE_X11
+ GLXEWContext _glxew_context;
+-#endif
++# endif
+ GLEWContext _glew_context;
++#endif
+ int _screen_width, _screen_height;
+ float _screen_pixel_aspect_ratio;
+ video_container_widget *_container_widget;
+@@ -192,10 +196,12 @@ private:
+ void resume_screensaver();
+ 
+ protected:
+-#if HAVE_X11
+- GLXEWContext* glxewGetContext() const;
+-#endif
++#ifdef GLEW_MX
++# if HAVE_X11
++ virtual GLXEWContext* glxewGetContext() const;
++# endif
+ virtual GLEWContext* glewGetContext() const;
++#endif
+ virtual bool context_is_stereo() const;
+ virtual void recreate_context(bool stereo);
+ virtual void trigger_resize(int w, int h);

bino-1.6.1.tar.xz/src/base/blob.h Deleted

@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2010, 2011, 2012
- * Martin Lambers <marlam@marlam.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file blob.h
- *
- * This class provides an opaque memory block of a given size which can
- * store any kind of data. Such memory blocks are a pain to manage with
- * new/delete or new[]/delete[] or malloc()/free() because of the necessary
- * type casting. This class provides easy access pointers and a destructor.
- */
-
-#ifndef BLOB_H
-#define BLOB_H
-
-#include <cstdlib>
-#include <cstring>
-#include <cerrno>
-
-#include "exc.h"
-#include "intcheck.h"
-
-
-class blob
-{
-private:
-
- size_t _size;
- void* _ptr;
-
- static void* alloc(size_t s)
- {
- void* ptr = std::malloc(s);
- if (s != 0 && !ptr) {
- throw exc(ENOMEM);
- }
- return ptr;
- }
-
- static void* realloc(void* p, size_t s)
- {
- void* ptr = std::realloc(p, s);
- if (s != 0 && !ptr) {
- throw exc(ENOMEM);
- }
- return ptr;
- }
-
-public:
-
- blob() throw () :
- _size(0), _ptr(NULL)
- {
- }
-
- blob(size_t s) :
- _size(s), _ptr(alloc(_size))
- {
- }
-
- blob(size_t s, size_t n) :
- _size(checked_mul(s, n)), _ptr(alloc(_size))
- {
- }
-
- blob(size_t s, size_t n0, size_t n1) :
- _size(checked_mul(checked_mul(s, n0), n1)), _ptr(alloc(_size))
- {
- }
-
- blob(size_t s, size_t n0, size_t n1, size_t n2) :
- _size(checked_mul(checked_mul(s, n0), checked_mul(n1, n2))), _ptr(alloc(_size))
- {
- }
-
- blob(const blob& b) :
- _size(b._size), _ptr(alloc(_size))
- {
- if (_size > 0) {
- std::memcpy(_ptr, b._ptr, _size);
- }
- }
-
- const blob& operator=(const blob& b)
- {
- if (b.size() == 0) {
- std::free(_ptr);
- _size = 0;
- _ptr = NULL;
- } else {
- void *ptr = alloc(b.size());
- std::memcpy(ptr, b.ptr(), b.size());
- std::free(_ptr);
- _ptr = ptr;
- _size = b.size();
- }
- return *this;
- }
-
- ~blob() throw ()
- {
- std::free(_ptr);
- }
-
- void free()
- {
- std::free(_ptr);
- _ptr = NULL;
- _size = 0;
- }
-
- void resize(size_t s)
- {
- _ptr = realloc(_ptr, s);
- _size = s;
- }
-
- void resize(size_t s, size_t n)
- {
- _ptr = realloc(_ptr, checked_mul(s, n));
- _size = s;
- }
-
- void resize(size_t s, size_t n0, size_t n1)
- {
- _ptr = realloc(_ptr, checked_mul(checked_mul(s, n0), n1));
- _size = s;
- }
-
- void resize(size_t s, size_t n0, size_t n1, size_t n2)
- {
- _ptr = realloc(_ptr, checked_mul(checked_mul(s, n0), checked_mul(n1, n2)));
- _size = s;
- }
-
- size_t size() const throw ()
- {
- return _size;
- }
-
- const void* ptr(size_t offset = 0) const throw ()
- {
- return static_cast<const void*>(static_cast<const char*>(_ptr) + offset);
- }
-
- void* ptr(size_t offset = 0) throw ()
- {
- return static_cast<void*>(static_cast<char*>(_ptr) + offset);
- }
-
- template<typename T>
- const T* ptr(size_t offset = 0) const throw ()
- {
- return static_cast<const T*>(ptr(offset * sizeof(T)));
- }
-
- template<typename T>
- T* ptr(size_t offset = 0) throw ()
- {
- return static_cast<T*>(ptr(offset * sizeof(T)));
- }
-};
-
-#endif

bino-1.6.1.tar.xz/src/base/intcheck.h Deleted

@@ -1,224 +0,0 @@
-/*
- * Copyright (C) 2010, 2011, 2012, 2013
- * Martin Lambers <marlam@marlam.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file intcheck.h
- *
- * This file provides functions that operate on integers and check
- * for over- and underflow.
- */
-
-#ifndef INTCHECK_H
-#define INTCHECK_H
-
-#include <cerrno>
-#include <limits>
-
-#include "exc.h"
-
-
-/**
- * \param x Integer value.
- * \return Casted integer value.
- *
- * Cast the integer value \a x to the given type.
- * If over- or underflow would occur, this function throws exc(ERANGE).
- * Example: size_t a = checked_cast<size_t>(b);
- */
-template<typename TO, typename FROM>
-TO checked_cast(FROM x)
-{
- // The goal of this case differentiation is to
- // a) help the compiler to optimize unnecessary checks away
- // b) avoid compiler warnings like 'comparison of signed and unsigned'
- if (std::numeric_limits<FROM>::is_signed && std::numeric_limits<TO>::is_signed)
- {
- if (sizeof(FROM) > sizeof(TO)
- && (x < static_cast<FROM>(std::numeric_limits<TO>::min())
- || x > static_cast<FROM>(std::numeric_limits<TO>::max())))
- {
- throw exc(ERANGE);
- }
- }
- else if (!std::numeric_limits<FROM>::is_signed && !std::numeric_limits<TO>::is_signed)
- {
- if (sizeof(FROM) >= sizeof(TO) && x > static_cast<FROM>(std::numeric_limits<TO>::max()))
- {
- throw exc(ERANGE);
- }
- }
- else if (std::numeric_limits<FROM>::is_signed) // TO is unsigned
- {
- if (x < static_cast<FROM>(std::numeric_limits<TO>::min())
- || (sizeof(FROM) > sizeof(TO) && x > static_cast<FROM>(std::numeric_limits<TO>::max())))
- {
- throw exc(ERANGE);
- }
- }
- else // FROM is unsigned, TO is signed
- {
- if (sizeof(FROM) >= sizeof(TO) && x > static_cast<FROM>(std::numeric_limits<TO>::max()))
- {
- throw exc(ERANGE);
- }
- }
- return x;
-}
-
-/**
- * \param a Integer value.
- * \param b Integer value.
- * \return a + b
- *
- * Return a + b.
- * If over- or underflow would occur, this function throws exc(ERANGE).
- */
-template<typename T>
-T checked_add(T a, T b)
-{
- if (b < static_cast<T>(1))
- {
- if (a < std::numeric_limits<T>::min() - b)
- {
- throw exc(ERANGE);
- }
- }
- else
- {
- if (a > std::numeric_limits<T>::max() - b)
- {
- throw exc(ERANGE);
- }
- }
- return a + b;
-}
-
-/**
- * \param a Integer value.
- * \param b Integer value.
- * \return a - b
- *
- * Return a - b.
- * If over- or underflow would occur, this function throws exc(ERANGE).
- */
-template<typename T>
-T checked_sub(T a, T b)
-{
- if (b < static_cast<T>(1))
- {
- if (a > std::numeric_limits<T>::max() + b)
- {
- throw exc(ERANGE);
- }
- }
- else
- {
- if (a < std::numeric_limits<T>::min() + b)
- {
- throw exc(ERANGE);
- }
- }
- return a - b;
-}
-
-/**
- * \param a Integer value.
- * \param b Integer value.
- * \return a * b
- *
- * Return a * b.
- * If over- or underflow would occur, this function throws exc(ERANGE).
- */
-template<typename T>
-T checked_mul(T a, T b)
-{
- if (std::numeric_limits<T>::is_signed)
- {
- /* Adapted from the comp.lang.c FAQ, see http://c-faq.com/misc/sd26.html */
- if (a == std::numeric_limits<T>::min())
- {
- if (b != static_cast<T>(0) && b != static_cast<T>(1))
- {
- throw exc(ERANGE);
- }
- }
- else if (b == std::numeric_limits<T>::min())
- {
- if (a != static_cast<T>(0) && a != static_cast<T>(1))
- {
- throw exc(ERANGE);
- }
- }
- else
- {
- if (a < static_cast<T>(1))
- {
- a = -a;
- }
- if (b < static_cast<T>(1))
- {
- b = -b;
- }
- }
- }
- if (!(b == static_cast<T>(0) || !(std::numeric_limits<T>::max() / b < a)))
- {
- throw exc(ERANGE);
- }
- return a * b;
-}
-
-/**
- * \param a Integer value.
- * \param b Integer value.
- * \return a / b
- *
- * Return a / b.
- * If over- or underflow would occur, this function throws exc(ERANGE).
- */
-template<typename T>
-T checked_div(T a, T b)
-{
- if (b == 0
- || (std::numeric_limits<T>::is_signed
- && a == std::numeric_limits<T>::min()
- && b == static_cast<T>(-1)))
- {
- throw exc(ERANGE);
- }
- return a / b;
-}
-
-/**
- * \param a Integer value.
- * \return abs(a)
- *
- * Return the absolute value of a.
- * If overflow would occur, this function throws exc(ERANGE).
- */
-template<typename T>
-T checked_abs(T a)
-{
- if (std::numeric_limits<T>::is_signed && a == std::numeric_limits<T>::min())
- {
- throw exc(ERANGE);
- }
- return a < 0 ? -a : a;
-}
-
-#endif

bino-1.6.1.tar.xz/src/base/s11n.cpp Deleted

@@ -1,649 +0,0 @@
-/*
- * Copyright (C) 2008, 2009, 2010, 2011, 2012
- * Martin Lambers <marlam@marlam.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <cstring>
-
-#include "str.h"
-
-#include "s11n.h"
-
-
-static const char* low_char_encodings[] = {
- "\\(NUL)", // 0
- "\\(SOH)", // 1
- "\\(STX)", // 2
- "\\(ETX)", // 3
- "\\(EOT)", // 4
- "\\(ENQ)", // 5
- "\\(ACK)", // 6
- "\\(BEL)", // 7
- "\\(_BS)", // 8
- "\\(_HT)", // 9
- "\\(_LF)", // 10
- "\\(_VT)", // 11
- "\\(_FF)", // 12
- "\\(_CR)", // 13
- "\\(_SO)", // 14
- "\\(_SI)", // 15
- "\\(DLE)", // 16
- "\\(DC1)", // 17
- "\\(DC2)", // 18
- "\\(DC3)", // 19
- "\\(DC4)", // 20
- "\\(NAK)", // 21
- "\\(SYN)", // 22
- "\\(ETB)", // 23
- "\\(CAN)", // 24
- "\\(_EM)", // 25
- "\\(SUB)", // 26
- "\\(ESC)", // 27
- "\\(_FS)", // 28
- "\\(_GS)", // 29
- "\\(_RS)", // 30
- "\\(_US)", // 31
-};
-
-
-void s11n::startgroup(std::ostream& os, const char* name)
-{
- os << ' ' << name << "={";
-}
-
-void s11n::endgroup(std::ostream& os)
-{
- os << " }";
-}
-
-void s11n::load(std::istream& is, std::string& name, std::string& value)
-{
- char c;
- // skip leading spaces
- while (is.good() && (c = is.get()) == ' ');
- // read name
- name.clear();
- while (is.good() && c != '=') {
- name.push_back(c);
- c = is.get();
- }
- c = is.get();
- // read value
- value.clear();
- bool value_is_valid = false;
- int group_depth = 0;
- char enc_char[] = "\\(...)";
- for (;;) {
- bool c_is_valid = false;
- if (c == '\\') {
- c = is.get();
- if (c == '\\' || c == ' ' || c == '{' || c == '}') {
- c_is_valid = true;
- } else {
- enc_char[1] = c;
- enc_char[2] = is.get();
- enc_char[3] = is.get();
- enc_char[4] = is.get();
- enc_char[5] = is.get();
- if (std::memcmp(enc_char, "\\(DEL)", 6) == 0) {
- c = 127;
- c_is_valid = true;
- } else {
- for (int j = 0; j <= 31; j++) {
- if (std::memcmp(enc_char, low_char_encodings[j], 6) == 0) {
- c = j;
- c_is_valid = true;
- break;
- }
- }
- }
- }
- } else {
- if (c == '{') {
- group_depth++;
- } else if (c == '}') {
- group_depth--;
- if (group_depth < 0)
- break;
- }
- c_is_valid = true;
- }
- if (!c_is_valid || !is.good())
- break;
- value.append(1, c);
- if (group_depth == 0 && (is.peek() == ' ' || is.eof())) {
- value_is_valid = true;
- break;
- }
- c = is.get();
- }
- if (!value_is_valid)
- value = "";
- else if (value.length() >= 2 && value[0] == '{' && value[value.length() - 1] == '}')
- value = value.substr(1, value.length() - 2);
-}
-
-void serializable::save(std::ostream& os, const char* name) const
-{
- // Default implementation: use binary save and store binary blob
- std::ostringstream oss;
- this->save(oss);
- s11n::startgroup(os, name);
- s11n::save(os, "size", oss.str().length());
- s11n::save(os, "", oss.str().data(), oss.str().length());
- s11n::endgroup(os);
-}
-
-void serializable::load(const std::string& s)
-{
- // Default implementation: read and restore binary blob
- std::istringstream iss(s);
- std::string name, value;
- s11n::load(iss, name, value);
- size_t size = 0;
- if (name == "size")
- s11n::load(value, size);
- s11n::load(iss, name, value);
- std::string str;
- char* buf = new char[size];
- s11n::load(value, buf, size);
- str.assign(buf, size);
- delete[] buf;
- std::istringstream iss2(str);
- this->load(iss2);
-}
-
-// Return value NULL means the character can be written as is.
-static const char* enc_char(char x)
-{
- return (x >= 0 && x <= 31 ? low_char_encodings[static_cast<int>(x)]
- : x == 127 ? "\\(DEL)"
- : x == '{' ? "\\{"
- : x == '}' ? "\\}"
- : x == ' ' ? "\\ "
- : x == '\\' ? "\\\\"
- : NULL);
-}
-
-// Decode a character. The index i is incremented according to the characters consumed from s.
-static char dec_char(const char* s, size_t& i)
-{
- if (s[i] == '\\') {
- if (s[i + 1] == '\\' || s[i + 1] == ' ' || s[i + 1] == '{' || s[i + 1] == '}') {
- i++;
- return s[i++];
- } else if (s[i + 1] != '\0' && s[i + 2] != '\0' && s[i + 3] != '\0' && s[i + 4] != '\0' && s[i + 5] != '\0') {
- if (std::memcmp(s, "\\(DEL)", 6) == 0) {
- i += 6;
- return 127;
- } else {
- for (int j = 0; j <= 31; j++) {
- if (std::memcmp(s, low_char_encodings[j], 6) == 0) {
- i += 6;
- return j;
- }
- }
- // invalid string!
- return '\0';
- }
- } else {
- // invalid string!
- return '\0';
- }
- } else {
- return s[i++];
- }
-}
-
-/*
- * Save a value to a stream
- */
-
-// Fundamental arithmetic data types
-
-void s11n::save(std::ostream& os, bool x)
-{
- os.write(reinterpret_cast<const char*>(&x), sizeof(x));
-}
-
-void s11n::save(std::ostream& os, const char* name, bool x)
-{
- os << ' ' << name << '=' << (x ? '1' : '0');
-}
-
-void s11n::save(std::ostream& os, char x)
-{
- os.write(reinterpret_cast<const char*>(&x), sizeof(x));
-}
-
-void s11n::save(std::ostream& os, const char* name, char x)
-{
- const char* e = enc_char(x);
- os << ' ' << name << '=';
- if (e)
- os << e;
- else
- os << x;
-}
-
-void s11n::save(std::ostream& os, signed char x)
-{
- os.write(reinterpret_cast<const char*>(&x), sizeof(x));
-}
-
-void s11n::save(std::ostream& os, const char* name, signed char x)
-{
- os << ' ' << name << '=' << static_cast<int>(x);
-}
-
-void s11n::save(std::ostream& os, unsigned char x)
-{
- os.write(reinterpret_cast<const char*>(&x), sizeof(x));
-}
-
-void s11n::save(std::ostream& os, const char* name, unsigned char x)
-{
- os << ' ' << name << '=' << static_cast<int>(x);
-}
-
-void s11n::save(std::ostream& os, short x)
-{
- os.write(reinterpret_cast<const char*>(&x), sizeof(x));
-}
-
-void s11n::save(std::ostream& os, const char* name, short x)
-{
- os << ' ' << name << '=' << x;
-}
-
-void s11n::save(std::ostream& os, unsigned short x)
-{
- os.write(reinterpret_cast<const char*>(&x), sizeof(x));
-}
-
-void s11n::save(std::ostream& os, const char* name, unsigned short x)
-{
- os << ' ' << name << '=' << x;
-}
-
-void s11n::save(std::ostream& os, int x)
-{
- os.write(reinterpret_cast<const char*>(&x), sizeof(x));
-}
-
-void s11n::save(std::ostream& os, const char* name, int x)
-{
- os << ' ' << name << '=' << x;
-}
-
-void s11n::save(std::ostream& os, unsigned int x)
-{
- os.write(reinterpret_cast<const char*>(&x), sizeof(x));
-}
-
-void s11n::save(std::ostream& os, const char* name, unsigned int x)
-{
- os << ' ' << name << '=' << x;
-}
-
-void s11n::save(std::ostream& os, long x)
-{
- os.write(reinterpret_cast<const char*>(&x), sizeof(x));
-}
-
-void s11n::save(std::ostream& os, const char* name, long x)
-{
- os << ' ' << name << '=' << x;
-}
-
-void s11n::save(std::ostream& os, unsigned long x)
-{
- os.write(reinterpret_cast<const char*>(&x), sizeof(x));
-}
-
-void s11n::save(std::ostream& os, const char* name, unsigned long x)
-{
- os << ' ' << name << '=' << x;
-}
-
-void s11n::save(std::ostream& os, long long x)
-{
- os.write(reinterpret_cast<const char*>(&x), sizeof(x));
-}
-
-void s11n::save(std::ostream& os, const char* name, long long x)
-{
- os << ' ' << name << '=' << x;
-}
-
-void s11n::save(std::ostream& os, unsigned long long x)
-{
- os.write(reinterpret_cast<const char*>(&x), sizeof(x));
-}
-
-void s11n::save(std::ostream& os, const char* name, unsigned long long x)
-{
- os << ' ' << name << '=' << x;
-}
-
-void s11n::save(std::ostream& os, float x)
-{
- os.write(reinterpret_cast<const char*>(&x), sizeof(x));
-}
-
-void s11n::save(std::ostream& os, const char* name, float x)
-{
- os << ' ' << name << '=' << str::from(x).c_str();
-}
-
-void s11n::save(std::ostream& os, double x)
-{
- os.write(reinterpret_cast<const char*>(&x), sizeof(x));
-}
-
-void s11n::save(std::ostream& os, const char* name, double x)
-{
- os << ' ' << name << '=' << str::from(x).c_str();
-}
-
-void s11n::save(std::ostream& os, long double x)
-{
- os.write(reinterpret_cast<const char*>(&x), sizeof(x));
-}
-
-void s11n::save(std::ostream& os, const char* name, long double x)
-{
- os << ' ' << name << '=' << str::from(x).c_str();
-}
-
-// Binary blobs
-
-void s11n::save(std::ostream& os, const void* x, const size_t n)
-{
- os.write(reinterpret_cast<const char*>(x), n);
-}
-
-void s11n::save(std::ostream& os, const char* name, const void* x, const size_t n)
-{
- static const char hex[] = "0123456789abcdef";
- startgroup(os, name);
- for (size_t i = 0; i < n; i++) {
- unsigned char val = static_cast<const unsigned char*>(x)[i];
- os << hex[(val >> 4) & 0xf] << hex[val & 0xf];
- if (i < n - 1)
- os << ' ';
- }
- endgroup(os);
-}
-
-// Serializable classes
-
-void s11n::save(std::ostream& os, const serializable& x)
-{
- x.save(os);
-}
-
-void s11n::save(std::ostream& os, const char* name, const serializable& x)
-{
- x.save(os, name);
-}
-
-// Basic STL types
-
-void s11n::save(std::ostream& os, const std::string& x)
-{
- size_t s = x.length();
- os.write(reinterpret_cast<const char*>(&s), sizeof(s));
- os.write(reinterpret_cast<const char*>(x.data()), s);
-}
-
-void s11n::save(std::ostream& os, const char* name, const std::string& x)
-{
- os << ' ' << name << '=';
- for (size_t i = 0; i < x.length(); i++) {
- char c = x[i];
- const char* e = enc_char(c);
- if (e)
- os << e;
- else
- os << c;
- }
-}
-
-
-/*
- * Load a value from a stream
- */
-
-// Fundamental arithmetic data types
-
-void s11n::load(std::istream& is, bool& x)
-{
- is.read(reinterpret_cast<char*>(&x), sizeof(x));
-}
-
-void s11n::load(const std::string& s, bool& x)
-{
- x = str::to<bool>(s);
-}
-
-void s11n::load(std::istream& is, char& x)
-{
- is.read(reinterpret_cast<char*>(&x), sizeof(x));
-}
-
-void s11n::load(const std::string& s, char& x)
-{
- size_t i = 0;
- x = dec_char(s.c_str(), i);
-}
-
-void s11n::load(std::istream& is, signed char& x)
-{
- is.read(reinterpret_cast<char*>(&x), sizeof(x));
-}
-
-void s11n::load(const std::string& s, signed char& x)
-{
- x = str::to<int>(s);
-}
-
-void s11n::load(std::istream& is, unsigned char& x)
-{
- is.read(reinterpret_cast<char*>(&x), sizeof(x));
-}
-
-void s11n::load(const std::string& s, unsigned char& x)
-{
- x = str::to<unsigned int>(s);
-}
-
-void s11n::load(std::istream& is, short& x)
-{
- is.read(reinterpret_cast<char*>(&x), sizeof(x));
-}
-
-void s11n::load(const std::string& s, short& x)
-{
- x = str::to<short>(s);
-}
-
-void s11n::load(std::istream& is, unsigned short& x)
-{
- is.read(reinterpret_cast<char*>(&x), sizeof(x));
-}
-
-void s11n::load(const std::string& s, unsigned short& x)
-{
- x = str::to<unsigned short>(s);
-}
-
-void s11n::load(std::istream& is, int& x)
-{
- is.read(reinterpret_cast<char*>(&x), sizeof(x));
-}
-
-void s11n::load(const std::string& s, int& x)
-{
- x = str::to<int>(s);
-}
-
-void s11n::load(std::istream& is, unsigned int& x)
-{
- is.read(reinterpret_cast<char*>(&x), sizeof(x));
-}
-
-void s11n::load(const std::string& s, unsigned int& x)
-{
- x = str::to<unsigned int>(s);
-}
-
-void s11n::load(std::istream& is, long& x)
-{
- is.read(reinterpret_cast<char*>(&x), sizeof(x));
-}
-
-void s11n::load(const std::string& s, long& x)
-{
- x = str::to<long>(s);
-}
-
-void s11n::load(std::istream& is, unsigned long& x)
-{
- is.read(reinterpret_cast<char*>(&x), sizeof(x));
-}
-
-void s11n::load(const std::string& s, unsigned long& x)
-{
- x = str::to<unsigned long>(s);
-}
-
-void s11n::load(std::istream& is, long long& x)
-{
- is.read(reinterpret_cast<char*>(&x), sizeof(x));
-}
-
-void s11n::load(const std::string& s, long long& x)
-{
- x = str::to<long long>(s);
-}
-
-void s11n::load(std::istream& is, unsigned long long& x)
-{
- is.read(reinterpret_cast<char*>(&x), sizeof(x));
-}
-
-void s11n::load(const std::string& s, unsigned long long& x)
-{
- x = str::to<unsigned long long>(s);
-}
-
-void s11n::load(std::istream& is, float& x)
-{
- is.read(reinterpret_cast<char*>(&x), sizeof(x));
-}
-
-void s11n::load(const std::string& s, float& x)
-{
- x = str::to<float>(s);
-}
-
-void s11n::load(std::istream& is, double& x)
-{
- is.read(reinterpret_cast<char*>(&x), sizeof(x));
-}
-
-void s11n::load(const std::string& s, double& x)
-{
- x = str::to<double>(s);
-}
-
-void s11n::load(std::istream& is, long double& x)
-{
- is.read(reinterpret_cast<char*>(&x), sizeof(x));
-}
-
-void s11n::load(const std::string& s, long double& x)
-{
- x = str::to<long double>(s);
-}
-
-// Binary blobs
-
-void s11n::load(std::istream& is, void* x, const size_t n)
-{
- is.read(reinterpret_cast<char*>(x), n);
-}
-
-void s11n::load(const std::string& s, void* x, const size_t n)
-{
- std::memset(x, 0, n);
- size_t i = 0;
- while (i < n && i + 3 < s.length()) {
- unsigned char val = 0;
- if (s[i] == ' ') {
- i++;
- if (s[i] >= '0' && s[i] <= '9')
- val |= (s[i] - '0') << 4;
- else if (s[i] >= 'a' && s[i] <= 'z')
- val |= (s[i] - 'a' + 10) << 4;
- i++;
- if (s[i] >= '0' && s[i] <= '9')
- val |= (s[i] - '0');
- else if (s[i] >= 'a' && s[i] <= 'z')
- val |= (s[i] - 'a' + 10);
- }
- static_cast<unsigned char*>(x)[i] = val;
- }
-}
-
-// Serializable classes
-
-void s11n::load(std::istream& is, serializable& x)
-{
- x.load(is);
-}
-
-void s11n::load(const std::string& s, serializable& x)
-{
- x.load(s);
-}
-
-// Basic STL types
-
-void s11n::load(std::istream& is, std::string& x)
-{
- size_t s;
- is.read(reinterpret_cast<char*>(&s), sizeof(s));
- char* buf = new char[s];
- is.read(buf, s);
- x.assign(buf, s);
- delete[] buf;
-}
-
-void s11n::load(const std::string& s, std::string& x)
-{
- x.clear();
- if (s.length() == 0)
- return;
- const char *sc = s.c_str();
- size_t i = 0;
- while (i < s.length()) {
- x.append(1, dec_char(sc, i));
- }
-}

bino-1.6.1.tar.xz/src/base/s11n.h Deleted

@@ -1,250 +0,0 @@
-/*
- * Copyright (C) 2008, 2009, 2010, 2011, 2012
- * Martin Lambers <marlam@marlam.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef S11N_H
-#define S11N_H
-
-/*
- * This module provides functions s11n::save() and s11n::load() that serialize
- * types and objects.
- * This works for all basic data types, STL types such as std::string, and
- * classes that implement the s11n interface.
- * Additionally, STL containers of serializable types can also be serialized,
- * e.g. std::vector<std::string>.
- */
-
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
-
-
-class serializable
-{
-public:
- /*
- * Interface for serializable classes
- */
-
- // Save binary. Efficient. Needs compatible architectures and application versions on the writing and reading end.
- virtual void save(std::ostream& os) const = 0;
- virtual void load(std::istream& is) = 0;
-
- // Save in human-readable and editable text format. Can be used for machine- and application version independent
- // saving of data. The default implementation falls back on the above binary functions and stores the binary data in
- // strings.
- virtual void save(std::ostream& os, const char* name) const;
- virtual void load(const std::string& s);
-};
-
-namespace s11n
-{
- // Functions needed to human-readable save/load:
- // - When saving a group of values contained in a serializable class, use startgroup()/endgroup()
- // - When loading back, get the next name/value pair and interpret it
- void startgroup(std::ostream& os, const char* name);
- void endgroup(std::ostream& os);
- void load(std::istream& is, std::string& name, std::string& value);
-
- /*
- * Save a value to a stream
- */
-
- // Fundamental arithmetic data types
-
- void save(std::ostream& os, bool x);
- void save(std::ostream& os, const char* name, bool x);
- void save(std::ostream& os, char x);
- void save(std::ostream& os, const char* name, char x);
- void save(std::ostream& os, signed char x);
- void save(std::ostream& os, const char* name, signed char x);
- void save(std::ostream& os, unsigned char x);
- void save(std::ostream& os, const char* name, unsigned char x);
- void save(std::ostream& os, short x);
- void save(std::ostream& os, const char* name, short x);
- void save(std::ostream& os, unsigned short x);
- void save(std::ostream& os, const char* name, unsigned short x);
- void save(std::ostream& os, int x);
- void save(std::ostream& os, const char* name, int x);
- void save(std::ostream& os, unsigned int x);
- void save(std::ostream& os, const char* name, unsigned int x);
- void save(std::ostream& os, long x);
- void save(std::ostream& os, const char* name, long x);
- void save(std::ostream& os, unsigned long x);
- void save(std::ostream& os, const char* name, unsigned long x);
- void save(std::ostream& os, long long x);
- void save(std::ostream& os, const char* name, long long x);
- void save(std::ostream& os, unsigned long long x);
- void save(std::ostream& os, const char* name, unsigned long long x);
- void save(std::ostream& os, float x);
- void save(std::ostream& os, const char* name, float x);
- void save(std::ostream& os, double x);
- void save(std::ostream& os, const char* name, double x);
- void save(std::ostream& os, long double x);
- void save(std::ostream& os, const char* name, long double x);
-
- // Binary blobs
-
- void save(std::ostream& os, const void* x, const size_t n);
- void save(std::ostream& os, const char* name, const void* x, const size_t n);
-
- // Serializable classes
-
- void save(std::ostream& os, const serializable& x);
- void save(std::ostream& os, const char* name, const serializable& x);
-
- // Basic STL types
-
- void save(std::ostream& os, const std::string& x);
- void save(std::ostream& os, const char* name, const std::string& x);
-
- // STL containters
-
- template<typename T>
- void save(std::ostream& os, const std::vector<T>& x)
- {
- size_t s = x.size();
- save(os, s);
- for (size_t i = 0; i < s; i++) {
- save(os, x[i]);
- }
- }
-
- template<typename T>
- void save(std::ostream& os, const char* name, const std::vector<T>& x)
- {
- size_t s = x.size();
- startgroup(os, name);
- save(os, "size", s);
- for (size_t i = 0; i < s; i++) {
- save(os, "", x[i]);
- }
- endgroup(os);
- }
-
- // TODO: add more STL containers as needed
-
- /*
- * Load a value from a stream
- */
-
- // Fundamental arithmetic data types
-
- void load(std::istream& is, bool& x);
- void load(const std::string& s, bool& x);
- void load(std::istream& is, char& x);
- void load(const std::string& s, char& x);
- void load(std::istream& is, signed char& x);
- void load(const std::string& s, signed char& x);
- void load(std::istream& is, unsigned char& x);
- void load(const std::string& s, unsigned char& x);
- void load(std::istream& is, short& x);
- void load(const std::string& s, short& x);
- void load(std::istream& is, unsigned short& x);
- void load(const std::string& s, unsigned short& x);
- void load(std::istream& is, int& x);
- void load(const std::string& s, int& x);
- void load(std::istream& is, unsigned int& x);
- void load(const std::string& s, unsigned int& x);
- void load(std::istream& is, long& x);
- void load(const std::string& s, long& x);
- void load(std::istream& is, unsigned long& x);
- void load(const std::string& s, unsigned long& x);
- void load(std::istream& is, long long& x);
- void load(const std::string& s, long long& x);
- void load(std::istream& is, unsigned long long& x);
- void load(const std::string& s, unsigned long long& x);
- void load(std::istream& is, float& x);
- void load(const std::string& s, float& x);
- void load(std::istream& is, double& x);
- void load(const std::string& s, double& x);
- void load(std::istream& is, long double& x);
- void load(const std::string& s, long double& x);
-
- // Binary blobs
-
- void load(std::istream& is, void* x, const size_t n);
- void load(const std::string& s, void* x, const size_t n);
-
- // Serializable classes
-
- void load(std::istream& is, serializable& x);
- void load(const std::string& s, serializable& x);
-
- // Basic STL types
-
- void load(std::istream& is, std::string& x);
- void load(const std::string& s, std::string& x);
-
- // STL containers
-
- template<typename T>
- void load(std::istream& is, std::vector<T>& x)
- {
- x.clear();
- size_t s;
- load(is, s);
- for (size_t i = 0; i < s; i++) {
- T v;
- load(is, v);
- x.push_back(v);
- }
- }
-
- template<typename T>
- void load(const std::string& s, std::vector<T>& x)
- {
- std::stringstream ss(s);
- std::string name, value;
- size_t z = 0;
- load(ss, name, value);
- if (name == "size")
- load(value, z);
- size_t i = 0;
- while (ss.good() && i < z) {
- load(ss, name, value);
- T v;
- load(value, v);
- x.push_back(v);
- i++;
- }
- x.resize(z);
- }
-
- // TODO: add more STL containers as needed
-
- // Convenience wrappers: directly return a loaded value
-
- template<typename T>
- T load(std::istream& is)
- {
- T x;
- load(is, x);
- return x;
- }
-
- template<typename T>
- T load(const std::string& s)
- {
- T x;
- load(s, x);
- return x;
- }
-};
-
-#endif

bino-1.6.1.tar.xz/src/base/thread.cpp Deleted

@@ -1,300 +0,0 @@
-/*
- * Copyright (C) 2011, 2012
- * Martin Lambers <marlam@marlam.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <cerrno>
-#include <cstring>
-#include <pthread.h>
-#include <sched.h>
-
-#include "gettext.h"
-#define _(string) gettext(string)
-
-#include "thread.h"
-
-
-const pthread_mutex_t mutex::_mutex_initializer = PTHREAD_MUTEX_INITIALIZER;
-
-mutex::mutex() : _mutex(_mutex_initializer)
-{
- int e = pthread_mutex_init(&_mutex, NULL);
- if (e != 0)
- throw exc(std::string(_("System function failed: "))
- + "pthread_mutex_init(): " + std::strerror(e), e);
-}
-
-mutex::mutex(const mutex&) : _mutex(_mutex_initializer)
-{
- // You cannot have multiple copies of the same mutex.
- // Instead, we create a new one. This allows easier use of mutexes in STL containers.
- int e = pthread_mutex_init(&_mutex, NULL);
- if (e != 0)
- throw exc(std::string(_("System function failed: "))
- + "pthread_mutex_init(): " + std::strerror(e), e);
-}
-
-mutex::~mutex()
-{
- (void)pthread_mutex_destroy(&_mutex);
-}
-
-void mutex::lock()
-{
- int e = pthread_mutex_lock(&_mutex);
- if (e != 0)
- throw exc(std::string(_("System function failed: "))
- + "pthread_mutex_lock(): " + std::strerror(e), e);
-}
-
-bool mutex::trylock()
-{
- return (pthread_mutex_trylock(&_mutex) == 0);
-}
-
-void mutex::unlock()
-{
- int e = pthread_mutex_unlock(&_mutex);
- if (e != 0)
- throw exc(std::string(_("System function failed: "))
- + "pthread_mutex_unlock(): " + std::strerror(e), e);
-}
-
-
-const pthread_cond_t condition::_cond_initializer = PTHREAD_COND_INITIALIZER;
-
-condition::condition() : _cond(_cond_initializer)
-{
- int e = pthread_cond_init(&_cond, NULL);
- if (e != 0)
- throw exc(std::string(_("System function failed: "))
- + "pthread_cond_init(): " + std::strerror(e), e);
-}
-
-condition::condition(const condition&) : _cond(_cond_initializer)
-{
- // You cannot have multiple copies of the same condition.
- // Instead, we create a new one. This allows easier use of conditions in STL containers.
- int e = pthread_cond_init(&_cond, NULL);
- if (e != 0)
- throw exc(std::string(_("System function failed: "))
- + "pthread_cond_init(): " + std::strerror(e), e);
-}
-
-condition::~condition()
-{
- (void)pthread_cond_destroy(&_cond);
-}
-
-void condition::wait(mutex& m)
-{
- int e = pthread_cond_wait(&_cond, &m._mutex);
- if (e != 0)
- throw exc(std::string(_("System function failed: "))
- + "pthread_cond_wait(): " + std::strerror(e), e);
-}
-
-void condition::wake_one()
-{
- int e = pthread_cond_signal(&_cond);
- if (e != 0)
- throw exc(std::string(_("System function failed: "))
- + "pthread_cond_signal(): " + std::strerror(e), e);
-}
-
-void condition::wake_all()
-{
- int e = pthread_cond_broadcast(&_cond);
- if (e != 0)
- throw exc(std::string(_("System function failed: "))
- + "pthread_cond_broadcast(): " + std::strerror(e), e);
-}
-
-
-const int thread::priority_default;
-const int thread::priority_min;
-
-thread::thread() :
- __thread_id(pthread_self()),
- __joinable(false),
- __running(false),
- __wait_mutex(),
- __exception()
-{
-}
-
-thread::thread(const thread&) :
- __thread_id(pthread_self()),
- __joinable(false),
- __running(false),
- __wait_mutex(),
- __exception()
-{
- // The thread state cannot be copied; a new state is created instead.
-}
-
-thread::~thread()
-{
- if (__joinable)
- (void)pthread_detach(__thread_id);
-}
-
-void* thread::__run(void* p)
-{
- thread* t = static_cast<thread*>(p);
- try {
- t->run();
- }
- catch (exc& e) {
- t->__exception = e;
- }
- catch (std::exception& e) {
- t->__exception = e;
- }
- catch (...) {
- // We must assume this means thread cancellation. In this
- // case, we *must* rethrow the exception.
- t->__running = false;
- throw;
- }
- t->__running = false;
- return NULL;
-}
-
-void thread::start(int priority)
-{
- if (atomic::bool_compare_and_swap(&__running, false, true)) {
- wait();
- int e;
- pthread_attr_t priority_thread_attr;
- pthread_attr_t* thread_attr = NULL;
- if (priority != priority_default)
- {
- // Currently this means priority_min
- int policy, min_priority;
- struct sched_param param;
- e = pthread_attr_init(&priority_thread_attr);
- e = e || pthread_attr_getschedpolicy(&priority_thread_attr, &policy);
- if (e == 0) {
- min_priority = sched_get_priority_min(policy);
- if (min_priority == -1)
- e = errno;
- }
- e = e || pthread_attr_getschedparam(&priority_thread_attr, &param);
- if (e == 0) {
- param.sched_priority = min_priority;
- }
- e = e || pthread_attr_setschedparam(&priority_thread_attr, &param);
- if (e != 0) {
- throw exc(std::string(_("System function failed: "))
- + "pthread_attr_*(): " + std::strerror(e), e);
- }
- thread_attr = &priority_thread_attr;
- }
- e = pthread_create(&__thread_id, thread_attr, __run, this);
- if (e != 0) {
- throw exc(std::string(_("System function failed: "))
- + "pthread_create(): " + std::strerror(e), e);
- }
- __joinable = true;
- }
-}
-
-void thread::wait()
-{
- __wait_mutex.lock();
- if (atomic::bool_compare_and_swap(&__joinable, true, false)) {
- int e = pthread_join(__thread_id, NULL);
- if (e != 0) {
- __wait_mutex.unlock();
- throw exc(std::string(_("System function failed: "))
- + "pthread_join(): " + std::strerror(e), e);
- }
- }
- __wait_mutex.unlock();
-}
-
-void thread::finish()
-{
- wait();
- if (!exception().empty())
- throw exception();
-}
-
-void thread::cancel()
-{
- __wait_mutex.lock();
- int e = pthread_cancel(__thread_id);
- if (e != 0) {
- __wait_mutex.unlock();
- throw exc(std::string(_("System function failed: "))
- + "pthread_cancel(): " + std::strerror(e), e);
- }
- __wait_mutex.unlock();
-}
-
-
-thread_group::thread_group(unsigned char size) : __max_size(size)
-{
- __active_threads.reserve(__max_size);
- __finished_threads.reserve(__max_size);
-}
-
-thread_group::~thread_group()
-{
- try {
- for (size_t i = 0; i < __active_threads.size(); i++) {
- __active_threads[i]->cancel();
- }
- }
- catch (...) {
- }
-}
-
-bool thread_group::start(thread* t, int priority)
-{
- if (__active_threads.size() < __max_size) {
- t->start(priority);
- __active_threads.push_back(t);
- return true;
- } else {
- return false;
- }
-}
-
-thread* thread_group::get_next_finished_thread()
-{
- if (__finished_threads.size() == 0) {
- std::vector<thread*>::iterator it = __active_threads.begin();
- while (it != __active_threads.end()) {
- if (!(*it)->is_running()) {
- __finished_threads.push_back(*it);
- it = __active_threads.erase(it);
- } else {
- it++;
- }
- }
- }
- if (__finished_threads.size() > 0) {
- thread* ret = __finished_threads.back();
- __finished_threads.pop_back();
- return ret;
- } else {
- return NULL;
- }
-}

bino-1.6.1.tar.xz/src/base/thread.h Deleted

@@ -1,226 +0,0 @@
-/*
- * Copyright (C) 2011, 2012
- * Martin Lambers <marlam@marlam.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef THREADS_H
-#define THREADS_H
-
-#include <vector>
-#include <pthread.h>
-
-#include "exc.h"
-
-
-/*
- * Atomic operations
- */
-
-namespace atomic
-{
- // TODO
- //
- // Currently this is just an interface to the GCC atomic builtin functions; see
- // http://gcc.gnu.org/onlinedocs/gcc-4.4.1/gcc/Atomic-Builtins.html#Atomic-Builtins
- //
- // This must be extended when (if) other compilers are used some day.
- //
- // The functions obviously only work for basic data types.
- // The comments were copied from the GCC manual referenced above.
-
- /* The following functions perform the operation suggested by the name,
- * and return the value that had previously been in memory. */
- template<typename T> T fetch_and_add(T* ptr, T value) { return __sync_fetch_and_add(ptr, value); }
- template<typename T> T fetch_and_sub(T* ptr, T value) { return __sync_fetch_and_sub(ptr, value); }
- template<typename T> T fetch_and_or(T* ptr, T value) { return __sync_fetch_and_or(ptr, value); }
- template<typename T> T fetch_and_and(T* ptr, T value) { return __sync_fetch_and_and(ptr, value); }
- template<typename T> T fetch_and_xor(T* ptr, T value) { return __sync_fetch_and_xor(ptr, value); }
- template<typename T> T fetch_and_nand(T* ptr, T value) { return __sync_fetch_and_nand(ptr, value); }
-
- /* The following functions perform the operation suggested by the name,
- * and return the new value. */
- template<typename T> T add_and_fetch(T* ptr, T value) { return __sync_add_and_fetch(ptr, value); }
- template<typename T> T sub_and_fetch(T* ptr, T value) { return __sync_sub_and_fetch(ptr, value); }
- template<typename T> T or_and_fetch(T* ptr, T value) { return __sync_or_and_fetch(ptr, value); }
- template<typename T> T and_and_fetch(T* ptr, T value) { return __sync_and_and_fetch(ptr, value); }
- template<typename T> T xor_and_fetch(T* ptr, T value) { return __sync_xor_and_fetch(ptr, value); }
- template<typename T> T nand_and_fetch(T* ptr, T value) { return __sync_nand_and_fetch(ptr, value); }
-
- /* The following functions perform an atomic compare and swap.
- * That is, if the current value of *ptr is oldval, then write newval into *ptr.
- * The "bool" version returns true if the comparison is successful and newval was written.
- * The "val" version returns the contents of *ptr before the operation. */
- template<typename T> bool bool_compare_and_swap(T* ptr, T oldval, T newval) { return __sync_bool_compare_and_swap(ptr, oldval, newval); }
- template<typename T> T val_compare_and_swap(T* ptr, T oldval, T newval) { return __sync_val_compare_and_swap(ptr, oldval, newval); }
-
- /* The following are convenience functions implemented on top of the above
- * basic atomic operations. */
- template<typename T> T fetch_and_inc(T* ptr) { return fetch_and_add(ptr, static_cast<T>(1)); }
- template<typename T> T inc_and_fetch(T* ptr) { return add_and_fetch(ptr, static_cast<T>(1)); }
- template<typename T> T fetch_and_dec(T* ptr) { return fetch_and_sub(ptr, static_cast<T>(1)); }
- template<typename T> T dec_and_fetch(T* ptr) { return sub_and_fetch(ptr, static_cast<T>(1)); }
-}
-
-
-/*
- * Mutex
- */
-
-class mutex
-{
-private:
- static const pthread_mutex_t _mutex_initializer;
- pthread_mutex_t _mutex;
-
-public:
- // Constructor / Destructor
- mutex();
- mutex(const mutex& m);
- ~mutex();
-
- // Lock the mutex.
- void lock();
- // Try to lock the mutex. Return true on success, false otherwise.
- bool trylock();
- // Unlock the mutex
- void unlock();
-
- friend class condition;
-};
-
-
-/*
- * Wait condition
- */
-
-class condition
-{
-private:
- static const pthread_cond_t _cond_initializer;
- pthread_cond_t _cond;
-
-public:
- // Constructor / Destructor
- condition();
- condition(const condition& c);
- ~condition();
-
- // Wait for the condition. The calling thread must have the mutex locked.
- void wait(mutex& m);
- // Wake one thread that waits on the condition.
- void wake_one();
- // Wake all threads that wait on the condition.
- void wake_all();
-};
-
-
-/*
- * Thread
- *
- * Implement the run() function in a subclass.
- */
-
-class thread
-{
-private:
- pthread_t __thread_id;
- bool __joinable;
- bool __running;
- mutex __wait_mutex;
- exc __exception;
-
- static void* __run(void* p);
-
-public:
- // Priorities
- static const int priority_default = 0;
- static const int priority_min = 1;
-
- // Constructor / Destructor
- thread();
- thread(const thread& t);
- virtual ~thread();
-
- // Implement this in a subclass; it will be executed from the thread via start()
- virtual void run() = 0;
-
- // Start a new thread that executes the run() function. If the thread is already
- // running, this function does nothing.
- void start(int priority = thread::priority_default);
-
- // Returns whether this thread is currently running.
- bool is_running()
- {
- return __running;
- }
-
- // Wait for the thread to finish. If the thread is not running, this function
- // returns immediately.
- void wait();
-
- // Wait for the thread to finish, like wait(), and rethrow an exception that the
- // run() function might have thrown during its execution.
- void finish();
-
- // Cancel a thread. This is dangerous and should not be used.
- void cancel();
-
- // Get an exception that the run() function might have thrown.
- const exc& exception() const
- {
- return __exception;
- }
- // Modify the stored exception
- exc& exception()
- {
- return __exception;
- }
-};
-
-
-/*
- * Thread group.
- *
- * This manages a group of threads that has a fixed maximum size. New threads
- * can only be started if there are still free slots in the group. A finished
- * thread makes its slot available for future threads.
- *
- * A thread group must be managed from a single thread. When the thread group
- * object is destroyed, all remaining threads are cancelled.
- */
-
-class thread_group
-{
-private:
- unsigned char __max_size;
- std::vector<thread*> __active_threads;
- std::vector<thread*> __finished_threads;
-
-public:
- thread_group(unsigned char size);
- virtual ~thread_group();
-
- // Start a new thread and return its slot number. If there are no free
- // slots, the thread is not started and false is returned.
- bool start(thread* t, int priority = thread::priority_default);
-
- // Return a finished thread object from the group and free its slot so
- // that future threads can use it. If there is no finished thread, NULL
- // is returned.
- thread* get_next_finished_thread();
-};
-
-#endif

bino-1.6.1.tar.xz/src/base/timer.cpp Deleted

@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2010, 2011, 2012
- * Martin Lambers <marlam@marlam.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <cerrno>
-#ifdef HAVE_CLOCK_GETTIME
-# include <time.h>
-#else
-# include <sys/time.h>
-#endif
-
-#include "gettext.h"
-#define _(string) gettext(string)
-
-#include "exc.h"
-#include "timer.h"
-
-
-int64_t timer::get_microseconds(timer::type t)
-{
-#ifdef HAVE_CLOCK_GETTIME
-
- struct timespec time;
- int r;
- if (t == realtime) {
- r = clock_gettime(CLOCK_REALTIME, &time);
- } else if (t == monotonic) {
- r = clock_gettime(CLOCK_MONOTONIC, &time);
- } else if (t == process_cpu) {
-#if defined(CLOCK_PROCESS_CPUTIME_ID)
- r = clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time);
-#elif defined(CLOCK_PROF)
- r = clock_gettime(CLOCK_PROF, &time);
-#else
- r = -1;
- errno = ENOSYS;
-#endif
- } else /* t == thread_cpu */ {
-#ifdef CLOCK_THREAD_CPUTIME_ID
- r = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &time);
-#else
- r = -1;
- errno = ENOSYS;
-#endif
- }
- if (r != 0)
- throw exc(_("Cannot get time."), errno);
- return static_cast<int64_t>(time.tv_sec) * 1000000 + time.tv_nsec / 1000;
-
-#else
-
- if (t == realtime || t == monotonic) {
- struct timeval tv;
- int r = gettimeofday(&tv, NULL);
- if (r != 0)
- throw exc(_("Cannot get time."), errno);
- return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
- } else if (t == process_cpu) {
- // In W32, clock() starts with zero on program start, so we do not need
- // to subtract a start value.
- // XXX: Is this also true on Mac OS X?
- clock_t c = clock();
- return (c * static_cast<int64_t>(1000000) / CLOCKS_PER_SEC);
- } else {
- throw exc(_("Cannot get time."), ENOSYS);
- }
-
-#endif
-}

bino-1.6.1.tar.xz/src/base/timer.h Deleted

@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2010, 2011, 2012
- * Martin Lambers <marlam@marlam.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file timer.h
- *
- * Timer.
- */
-
-#ifndef TIMER_H
-#define TIMER_H
-
-#include <stdint.h>
-
-
-namespace timer
-{
- enum type {
- realtime,
- monotonic,
- process_cpu,
- thread_cpu
- };
-
- int64_t get_microseconds(type type);
-};
-
-#endif

bino-1.6.1.tar.xz/AUTHORS -> bino-1.6.5.tar.xz/AUTHORS Changed

bino-1.6.1.tar.xz/ChangeLog -> bino-1.6.5.tar.xz/ChangeLog Changed

@@ -1,3 +1,406 @@
+commit 7eae52b4f2b84c988144c71b93c7cb6e9f99278d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-12-16 09:05:08 +0100
+
+ Bump version to 1.6.5.
+
+ AUTHORS | 3 +++
+ NEWS | 3 +++
+ configure.ac | 2 +-
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+
+commit b3613ae54c787ae01286138c0f899cc42dc3540f
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-12-16 09:03:27 +0100
+
+ Fix conversions between numbers and strings to be locale-independent in all cases.
+
+ src/base/str.cpp | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+commit 3dbdf2347faf55f21765468f4b68c02e195ea2d6
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-11-30 20:23:51 +0100
+
+ Bump version to 1.6.4.
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 69ca1a55235adfe73c7aeb32c2ccba577124d0ad
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-11-30 20:23:29 +0100
+
+ Update NEWS, AUTHORS.
+
+ AUTHORS | 10 +++++++++-
+ NEWS | 10 ++++++++++
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+commit 032cd3f600a0035a585be55d64f8919ee6148c35
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-11-30 19:10:41 +0100
+
+ Work around Qt 5.7 problem: disable "OpenGL stereo" support for Qt >= 5.7.
+ 
+ This workaround can hopefully be removed later.
+
+ src/video_output_qt.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit 55bc95cc25c4ec1939e7b31f40ce5c3f43e09fb5
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-11-30 19:02:49 +0100
+
+ Fix usage of setlocale()
+
+ src/base/str.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 546085961bc48cd55f31d054189cd6c522f3f599
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-11-30 18:44:52 +0100
+
+ Fix valgrind warnings about uninitialized value.
+
+ src/controlswidget.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit c2f99d8b62e60d6fb760c327c4e18d7f5f5be633
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-11-30 18:35:04 +0100
+
+ Fix segfault with --version due to missing Qt cleanup.
+
+ src/main.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 6e6b2d13172aa062c5d155abc436250702a46f88
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-11-30 18:34:52 +0100
+
+ Fix building with latest FFmpeg
+
+ src/media_object.cpp | 50 +++++++++++++++++++++++++-------------------------
+ 1 file changed, 25 insertions(+), 25 deletions(-)
+
+commit a3960e4b8291694fc64996748156ce6a9a00f767
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-03-21 09:17:16 +0100
+
+ Remove libquadmath stuff, Bino does not use it.
+
+ configure.ac | 5 -----
+ 1 file changed, 5 deletions(-)
+
+commit d7b9a8f5f7fd8959bfee46a82075334fe1768fe9
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-03-21 09:14:07 +0100
+
+ Fix building with libxnvctrl on current Debian.
+
+ configure.ac | 6 +++---
+ src/Makefile.am | 2 +-
+ src/NvSDIout.cpp | 18 ++++++++++++++----
+ src/NvSDIout.h | 3 +++
+ src/NvSDIutils.cpp | 4 ++--
+ src/gui.cpp | 2 +-
+ src/main.cpp | 8 ++++----
+ src/mainwindow.cpp | 2 +-
+ src/media_data.cpp | 2 +-
+ src/sdioutputdialog.cpp | 3 +--
+ 10 files changed, 31 insertions(+), 19 deletions(-)
+
+commit 95c9cb00c69b6c7bcf73316642e983c404d38eea
+Author: Phobos Kappa <phobosk>
+Date: 2016-03-21 08:45:13 +0100
+
+ Fix building with libxnvctrl.
+
+ src/Makefile.am | 3 ++-
+ src/sdioutputdialog.cpp | 10 ++++++++++
+ src/sdioutputdialog.h | 2 ++
+ 3 files changed, 14 insertions(+), 1 deletion(-)
+
+commit 89c0054c642376db72bf8fc0a981c47e73575db7
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-03-21 09:19:57 +0100
+
+ Bump version to 1.6.3.
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 1aaa6dc242a0d5c3daaf238b597bc7f105aa9938
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-02-11 20:53:17 +0100
+
+ Add forgotten file gui_common.h
+
+ src/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 2ea5315b4b660c2d80e448474c1a901c32e2e11b
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-02-08 08:49:38 +0100
+
+ Fix detection of LIRC for newer LIRC versions, and adjust library version reporting accordingly.
+
+ configure.ac | 37 +++++++++++++++++++++----------------
+ src/Makefile.am | 6 +++---
+ src/lib_versions.cpp | 28 ++++++++++++++--------------
+ src/main.cpp | 6 +++---
+ 4 files changed, 41 insertions(+), 36 deletions(-)
+
+commit 3bc1b366c15e50b7c26eeea1833045b52d8d6c54
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-02-01 19:37:56 +0100
+
+ Bump version to 1.6.2.
+
+ configure.ac | 2 +-
+ src/main.cpp | 4 ++--
+ src/mainwindow.cpp | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 7998f727f4da009b41242794b42eeb3157fdc9be
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-02-01 19:37:48 +0100
+
+ Update NEWS.
+
+ NEWS | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 11de155ce6a74b41aa254af2e26e81d638958387
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-02-01 19:32:51 +0100
+
+ Update Windows package build instructions
+
+ README.Windows | 2 +-
+ pkg/w32/notes.txt | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+commit 47567fb16dc70edd2dfca459c82b9399057954b9
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-02-01 19:31:32 +0100
+
+ Update bg.po, fr.po
+
+ po/bg.po | 2289 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------
+ po/fr.po | 2279 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------
+ 2 files changed, 2120 insertions(+), 2448 deletions(-)
+
+commit 42657f780ae528153071b308416f195b983328a2
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2016-02-01 19:23:18 +0100
+
+ Make Qt5 the default instead of Qt4
+
+ configure.ac | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit 2faff7314a556bc92b139b6d5b94f2d62591ff9a
+Author: Daniel Schaal <daniel@schaal.email>
+Date: 2016-01-30 16:26:09 +0100
+
+ Build with -fPIC to fix compilation error
+ 
+ When Qt5 is build with -reduce-relocations we have to build with -fPIC
+
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 1405a6f5d6607a457ba36265df6454db597cbeb6
+Author: Daniel Schaal <daniel@schaal.email>
+Date: 2016-01-30 16:20:29 +0100
+
+ Rename logf to logfile to avoid naming clash when compiling with gcc6
+
+ src/main.cpp | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+commit ec826e6337fa4e78d907bb3ec30f7c35b041f982
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2015-03-19 06:38:55 +0100
+
+ Update callers of str::replace after base module update.
+ 
+ Fixes bug 44576.
+
+ src/subtitle_renderer.cpp | 4 ++--
+ src/video_output.cpp | 24 ++++++++++++------------
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+commit 3d2a4dab0402cc3e0f77f4d7d83cf3650fc333d1
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2015-01-09 19:42:49 +0100
+
+ Update base modules, to fix some build problems for MXE targets.
+
+ configure.ac | 21 ++--
+ po/POTFILES.in | 6 +-
+ src/Makefile.am | 2 +-
+ src/NvSDIout.cpp | 10 +-
+ src/NvSDIutils.cpp | 6 +-
+ src/audio_output.cpp | 24 ++--
+ src/base/Makefile.am | 13 +-
+ src/base/{blob.h => blb.h} | 43 ++++---
+ src/base/{intcheck.h => chk.h} | 106 ++++++++++------
+ src/base/dbg.cpp | 10 +-
+ src/base/dbg.h | 6 +-
+ src/base/exc.cpp | 10 +-
+ src/base/exc.h | 2 +-
+ src/base/gettext.h | 6 +
+ src/base/msg.cpp | 8 +-
+ src/base/msg.h | 2 +-
+ src/base/opt.cpp | 14 +--
+ src/base/opt.h | 2 +-
+ src/base/{thread.cpp => pth.cpp} | 10 +-
+ src/base/{thread.h => pth.h} | 10 +-
+ src/base/{s11n.cpp => ser.cpp} | 6 +-
+ src/base/{s11n.h => ser.h} | 16 +--
+ src/base/str.cpp | 629 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
+ src/base/str.h | 46 +++++--
+ src/base/{timer.cpp => tmr.cpp} | 22 ++--
+ src/base/{timer.h => tmr.h} | 20 +--
+ src/command_file.cpp | 16 +--
+ src/dispatch.cpp | 18 +--
+ src/dispatch.h | 6 +-
+ src/fullscreendialog.cpp | 6 +-
+ src/gui_common.h | 6 +-
+ src/lib_versions.cpp | 8 +-
+ src/lirc.cpp | 12 +-
+ src/main.cpp | 14 +--
+ src/mainwindow.cpp | 16 +--
+ src/media_data.cpp | 14 +--
+ src/media_data.h | 6 +-
+ src/media_input.cpp | 14 +--
+ src/media_object.cpp | 18 +--
+ src/player.cpp | 30 ++---
+ src/player.h | 6 +-
+ src/player_equalizer.cpp | 12 +-
+ src/subtitle_renderer.cpp | 22 ++--
+ src/subtitle_renderer.h | 4 +-
+ src/video_output.cpp | 18 +--
+ src/video_output.h | 4 +-
+ src/video_output_qt.cpp | 20 +--
+ src/video_output_qt.h | 4 +-
+ 48 files changed, 936 insertions(+), 388 deletions(-)
+
+commit 8cd03de77069ed11b5e0275491819406f860df0c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2015-01-09 19:42:39 +0100
+
+ Update README.Windows
+
+ README.Windows | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit 46e0a27c3e0d738eda8fc4745afcede587222fbe
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2014-12-22 16:18:06 +0100
+
+ Reenable Czech translation in Windows installer
+
+ pkg/w32/bino.nsi | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 75a47f8dbfdbb0b5eba927be7309c1f18439da4a
+Author: cuchac <cuchac@email.cz>
+Date: 2014-12-18 11:25:56 +0100
+
+ Reenable Czech translation
+
+ po/LINGUAS | 2 +-
+ po/cs.po | 2238 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------
+ 2 files changed, 1200 insertions(+), 1040 deletions(-)
+
+commit dc8b9036149b9b7b449ea67647d2c0ab3026af48
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2014-10-13 13:28:17 +0200
+
+ Update AUTHORS, NEWS.
+
+ AUTHORS | 3 +++
+ NEWS | 3 +++
+ 2 files changed, 6 insertions(+)
+
+commit fba3211ea23ca35058cb513b86fec4b4336f3dad
+Author: Daniel Schaal <farbing@web.de>
+Date: 2014-10-03 12:17:38 +0200
+
+ Combine Preferences into single dialog.
+ 
+ Make a single dialog with a QStackedWidget which holds all
+ preference widgets and can be selected via a QListWidget.
+
+ src/Makefile.am | 1 +
+ src/audiodialog.cpp | 10 +------
+ src/audiodialog.h | 6 ++--
+ src/colordialog.cpp | 10 +------
+ src/colordialog.h | 6 ++--
+ src/crosstalkdialog.cpp | 10 +------
+ src/crosstalkdialog.h | 6 ++--
+ src/fullscreendialog.cpp | 10 +------
+ src/fullscreendialog.h | 6 ++--
+ src/mainwindow.cpp | 162 +++++++-----------------------------------------------------------------------------------------------
+ src/mainwindow.h | 34 ++--------------------
+ src/preferences.cpp | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/preferences.h | 54 ++++++++++++++++++++++++++++++++++
+ src/qualitydialog.cpp | 10 +------
+ src/qualitydialog.h | 6 ++--
+ src/sdioutputdialog.cpp | 10 +------
+ src/sdioutputdialog.h | 6 ++--
+ src/subtitledialog.cpp | 9 +-----
+ src/subtitledialog.h | 7 +++--
+ src/videodialog.cpp | 10 +------
+ src/videodialog.h | 6 ++--
+ src/zoomdialog.cpp | 9 +-----
+ src/zoomdialog.h | 6 ++--
+ 23 files changed, 200 insertions(+), 288 deletions(-)
+
+commit 0c775c7136441e754165cd53b07e683d27c4a81f
+Author: Daniel Schaal <farbing@web.de>
+Date: 2014-10-03 11:10:59 +0200
+
+ Split gui.h/gui.cpp into multiple files.
+ 
+ Put the dialog classes into their own files.
+
+ src/Makefile.am | 26 +-
+ src/audiodialog.cpp | 119 ++++
+ src/audiodialog.h | 56 ++
+ src/colordialog.cpp | 189 +++++
+ src/colordialog.h | 69 ++
+ src/controlswidget.cpp | 390 +++++++++++
+ src/controlswidget.h | 93 +++
+ src/crosstalkdialog.cpp | 111 +++
+ src/crosstalkdialog.h | 55 ++
+ src/fullscreendialog.cpp | 219 ++++++
+ src/fullscreendialog.h | 63 ++
+ src/gui.cpp | 3818 -----------------------------------------------------------------------------------------------------
+ src/gui.h | 446 +-----------
+ src/gui_common.h | 10 +
+ src/inoutwidget.cpp | 633 +++++++++++++++++
+ src/inoutwidget.h | 78 +++
+ src/mainwindow.cpp | 1153 +++++++++++++++++++++++++++++++
+ src/mainwindow.h | 144 ++++
+ src/opendevicedialog.cpp | 198 ++++++
+ src/opendevicedialog.h | 70 ++
+ src/qualitydialog.cpp | 92 +++
+ src/qualitydialog.h | 56 ++
+ src/sdioutputdialog.cpp | 509 ++++++++++++++
+ src/sdioutputdialog.h | 60 ++
+ src/subtitledialog.cpp | 324 +++++++++
+ src/subtitledialog.h | 80 +++
+ src/videodialog.cpp | 284 ++++++++
+ src/videodialog.h | 73 ++
+ src/zoomdialog.cpp | 102 +++
+ src/zoomdialog.h | 56 ++
+ 30 files changed, 5313 insertions(+), 4263 deletions(-)
+
 commit 8f72c57cd7e3e4ac7f42c31139e7ea20943f9bfb
 Author: Martin Lambers <marlam@marlam.de>
 Date: 2014-10-13 13:19:20 +0200
@@ -14,7 +417,7 @@
 
 Update ru.po
 
- po/ru.po | 837 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
+ po/ru.po | 837 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------
 1 file changed, 426 insertions(+), 411 deletions(-)
 
 commit 8476381a9817c51f7c535463111db1eb1f6272c3
@@ -59,7 +462,7 @@
 
 Update de.po.
 
- po/de.po | 831 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
+ po/de.po | 831 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------
 1 file changed, 425 insertions(+), 406 deletions(-)
 
 commit 6758337bd133f4a7f5be8d20850d3c3186ee84d1
@@ -68,9 +471,9 @@
 
 Update gettext files to 0.19.x.
 
- build-aux/config.rpath | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------
- po/Makefile.in.in | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
- po/Rules-quot | 15 +++++++++++++--
+ build-aux/config.rpath | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
+ po/Makefile.in.in | 53 ++++++++++++++++++++++++++++++++++++----------
+ po/Rules-quot | 15 +++++++++++--
 3 files changed, 121 insertions(+), 67 deletions(-)
 
 commit 323155686afd7d514e7a8b384f0edd975a22ae06
@@ -138,7 +541,7 @@
 
 Update Simplified Chinese translation.
 
- po/zh_cn.po | 843 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------
+ po/zh_cn.po | 843 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
 1 file changed, 431 insertions(+), 412 deletions(-)
 
 commit 14a170787be2f7c6980828ef480d0401379b0b76
@@ -263,11 +666,11 @@
 Add Simplified Chinese translation.
 
 Conflicts:
- 	AUTHORS
+ AUTHORS
 
 AUTHORS | 4 +-
 po/LINGUAS | 2 +-
- po/zh_cn.po | 1876 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------
+ po/zh_cn.po | 1876 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
 3 files changed, 956 insertions(+), 926 deletions(-)
 
 commit 37cb50eae797c2ad3aacbf82fd35859274b5f2aa
@@ -437,7 +840,7 @@
 
 Remove INSTALL; this is generated by autoconf
 
- INSTALL | 370 ----------------------------------------------------------------------------------------------------------------------------------------------
+ INSTALL | 370 -----------------------------------------------------------------------------------------------------------------------
 1 file changed, 370 deletions(-)
 
 commit 1496d94dd32871e40738bf330cc33622f84a2cf5
@@ -638,7 +1041,7 @@
 
 AUTHORS | 3 +-
 po/LINGUAS | 1 +
- po/bg.po | 1880 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/bg.po | 1880 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 1883 insertions(+), 1 deletion(-)
 
 commit 194b2d4a7c3284ac5f5d2138b7fef30485ab7543
@@ -699,20 +1102,20 @@
 
 .gitignore | 6 +
 Makefile.am | 2 -
- build-aux/config.guess | 1530 ------------------------------------------------------------------------------------------------------------
- build-aux/config.sub | 1773 ------------------------------------------------------------------------------------------------------------------------------
- build-aux/depcomp | 688 -------------------------------------------------
- build-aux/install-sh | 527 --------------------------------------
- build-aux/mdate-sh | 225 ----------------
- build-aux/missing | 331 ------------------------
- m4/gettext.m4 | 383 ----------------------------
- m4/iconv.m4 | 214 ----------------
- m4/lib-ld.m4 | 110 --------
- m4/lib-link.m4 | 774 -------------------------------------------------------
- m4/lib-prefix.m4 | 224 ----------------
- m4/nls.m4 | 32 ---
- m4/po.m4 | 449 --------------------------------
- m4/progtest.m4 | 92 -------
+ build-aux/config.guess | 1530 -----------------------------------------------------------------------------------------
+ build-aux/config.sub | 1773 -------------------------------------------------------------------------------------------------------
+ build-aux/depcomp | 688 ----------------------------------------
+ build-aux/install-sh | 527 -------------------------------
+ build-aux/mdate-sh | 225 -------------
+ build-aux/missing | 331 --------------------
+ m4/gettext.m4 | 383 -----------------------
+ m4/iconv.m4 | 214 -------------
+ m4/lib-ld.m4 | 110 -------
+ m4/lib-link.m4 | 774 ---------------------------------------------
+ m4/lib-prefix.m4 | 224 -------------
+ m4/nls.m4 | 32 --
+ m4/po.m4 | 449 --------------------------
+ m4/progtest.m4 | 92 ------
 16 files changed, 6 insertions(+), 7354 deletions(-)
 
 commit 9d253d51eb041434893f2886c2eba409021f3cfc
@@ -844,7 +1247,7 @@
 
 Update ru.po.
 
- po/ru.po | 438 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------
+ po/ru.po | 438 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------
 1 file changed, 226 insertions(+), 212 deletions(-)
 
 commit 101fdd6b29eafc6a6346fcf6a50511e2cd793c7f
@@ -874,7 +1277,7 @@
 
 Update fr.po.
 
- po/fr.po | 402 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------
+ po/fr.po | 402 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------
 1 file changed, 187 insertions(+), 215 deletions(-)
 
 commit 5c5bdd269b2d514cba2031e34d6c86197f08099d
@@ -906,7 +1309,7 @@
 
 Update de.po.
 
- po/de.po | 404 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------
+ po/de.po | 404 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------
 1 file changed, 188 insertions(+), 216 deletions(-)
 
 commit 9b1b5deeecd9c4573b53893051d3746803635ad2
@@ -961,7 +1364,7 @@
 Update ru.po.
 
 AUTHORS | 1 +
- po/ru.po | 2676 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------
+ po/ru.po | 2676 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
 2 files changed, 1675 insertions(+), 1002 deletions(-)
 
 commit c00de8fc2b2b28e7bee1a74ee902bf81056c4b40
@@ -987,7 +1390,7 @@
 
 Update fr.po.
 
- po/fr.po | 2665 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------
+ po/fr.po | 2665 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------
 1 file changed, 1499 insertions(+), 1166 deletions(-)
 
 commit 6a88eb976bd6c5961650fc19e339a99344e1bf46
@@ -1044,7 +1447,7 @@
 
 Update de.po.
 
- po/de.po | 2424 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------
+ po/de.po | 2424 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------
 1 file changed, 1397 insertions(+), 1027 deletions(-)
 
 commit a5cbe318aa5d6215af85c61edef567ebecfb0306
@@ -1053,8 +1456,8 @@
 
 Tweak translatable strings to reduce translation burden.
 
- src/gui.cpp | 76 ++++++++++++++++++++++-----------------------
- src/main.cpp | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
+ src/gui.cpp | 76 ++++++++++++++++++-------------------
+ src/main.cpp | 234 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------
 2 files changed, 155 insertions(+), 155 deletions(-)
 
 commit cfa298e66a8c00bd5d0171f20f36807a66a54749
@@ -1415,7 +1818,7 @@
 src/dispatch.h | 2 ++
 src/gui.cpp | 5 +++++
 src/gui.h | 1 +
- src/video_output_qt.cpp | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
+ src/video_output_qt.cpp | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
 src/video_output_qt.h | 6 +++++-
 6 files changed, 99 insertions(+), 23 deletions(-)
 
@@ -1569,7 +1972,7 @@
 
 Video output: cleanup.
 
- src/video_output.cpp | 1443 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
+ src/video_output.cpp | 1443 +++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
 src/video_output.h | 21 +-
 2 files changed, 677 insertions(+), 787 deletions(-)
 
@@ -1591,8 +1994,8 @@
 Now that color space conversion is done in prepare_next_frame(), there is no
 need to keep two sets of input textures for the original video data.
 
- src/video_output.cpp | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------
- src/video_output.h | 12 ++++++------
+ src/video_output.cpp | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------
+ src/video_output.h | 12 +++++-----
 2 files changed, 68 insertions(+), 73 deletions(-)
 
 commit 30dc8a1c097c69918490f98bd861d1a4f17310bb
@@ -1616,8 +2019,8 @@
 When performing color conversion in the preparation step, we need two sets
 of textures for the output, just like for the other preparation tasks.
 
- src/video_output.cpp | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------
- src/video_output.h | 15 +++++++-------
+ src/video_output.cpp | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------
+ src/video_output.h | 15 ++++++------
 2 files changed, 78 insertions(+), 78 deletions(-)
 
 commit 4cbf38c6f9612a9951142b16e6ff4f469619378d
@@ -1662,9 +2065,9 @@
 
 The color adjustment code is too expensive and needs to be replaced later.
 
- src/video_output.cpp | 197 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------
- src/video_output_color.fs.glsl | 58 ++++++++---------------------------
- src/video_output_render.fs.glsl | 55 +++++++++++++++++++++++++++++++--
+ src/video_output.cpp | 197 +++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
+ src/video_output_color.fs.glsl | 58 ++++++----------------------
+ src/video_output_render.fs.glsl | 55 ++++++++++++++++++++++++++-
 3 files changed, 163 insertions(+), 147 deletions(-)
 
 commit 990f334493cec2ccfb2859fdd7d728608064c415
@@ -1745,21 +2148,21 @@
 
 NEWS | 3 +-
 doc/bino.1 | 2 +
- doc/bino.texi | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------
+ doc/bino.texi | 213 ++++++++++++++++++++++++++++++++++++++++++---------
 src/Makefile.am | 1 +
- src/base/str.cpp | 31 +++++++++
- src/base/str.h | 4 ++
- src/command_file.cpp | 148 +++++++++++++++++++++++++++++++++++++++++++
- src/command_file.h | 58 +++++++++++++++++
- src/dispatch.cpp | 429 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
- src/dispatch.h | 39 +++++++-----
- src/lirc.cpp | 122 +-----------------------------------
+ src/base/str.cpp | 31 ++++++++
+ src/base/str.h | 4 +
+ src/command_file.cpp | 148 +++++++++++++++++++++++++++++++++++
+ src/command_file.h | 58 ++++++++++++++
+ src/dispatch.cpp | 429 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
+ src/dispatch.h | 39 ++++++----
+ src/lirc.cpp | 122 +----------------------------
 src/lirc.h | 3 -
- src/main.cpp | 58 ++++++-----------
- src/media_data.cpp | 141 +++++++++++++++++++++++++----------------
+ src/main.cpp | 58 +++++---------
+ src/media_data.cpp | 141 +++++++++++++++++++++-------------
 src/media_data.h | 2 +
 src/player.h | 2 +-
- src/player_equalizer.cpp | 58 ++++++++++++-----
+ src/player_equalizer.cpp | 58 ++++++++++----
 17 files changed, 1010 insertions(+), 304 deletions(-)
 
 commit 1f34e3dbd49ae856493abec2fec33f336dca6169
@@ -1771,22 +2174,22 @@
 AUTHORS | 1 +
 NEWS | 1 +
 README.Linux | 7 ++
- configure.ac | 44 ++++++++++-
+ configure.ac | 44 ++++++++-
 src/Makefile.am | 6 ++
- src/NvSDIout.cpp | 309 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/NvSDIout.h | 100 +++++++++++++++++++++++++
- src/NvSDIutils.cpp | 461 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/NvSDIutils.h | 53 +++++++++++++
- src/dispatch.cpp | 15 ++++
+ src/NvSDIout.cpp | 309 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/NvSDIout.h | 100 ++++++++++++++++++++
+ src/NvSDIutils.cpp | 461 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/NvSDIutils.h | 53 +++++++++++
+ src/dispatch.cpp | 15 +++
 src/dispatch.h | 11 +++
- src/gui.cpp | 516 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/gui.h | 37 ++++++++-
+ src/gui.cpp | 516 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/gui.h | 37 +++++++-
 src/main.cpp | 16 ++++
- src/media_data.cpp | 56 ++++++++++++++
+ src/media_data.cpp | 56 +++++++++++
 src/media_data.h | 6 ++
 src/player_equalizer.cpp | 2 +-
- src/video_output.cpp | 67 ++++++++++++++++-
- src/video_output.h | 26 ++++++-
+ src/video_output.cpp | 67 +++++++++++++-
+ src/video_output.h | 26 +++++-
 src/video_output_qt.cpp | 6 ++
 20 files changed, 1728 insertions(+), 12 deletions(-)
 
@@ -1811,10 +2214,10 @@
 - Do not rerender subtitles in display_current_frame(), even
 if that means that some changes do not take effect immediately.
 
- src/gui.cpp | 4 +++-
+ src/gui.cpp | 4 ++-
 src/subtitle_renderer.cpp | 2 +-
- src/video_output.cpp | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------
- src/video_output.h | 7 ++++---
+ src/video_output.cpp | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------
+ src/video_output.h | 7 ++---
 4 files changed, 81 insertions(+), 73 deletions(-)
 
 commit 256d872f9bba29c5bf6b9732b1160acfb3cc69a5
@@ -1867,11 +2270,11 @@
 - Use only a single subtitle box, not two like for video frames.
 - Fix a few problems.
 
- src/media_data.h | 13 +++--
- src/subtitle_renderer.cpp | 17 +++---
- src/subtitle_renderer.h | 10 ++--
- src/video_output.cpp | 352 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------
- src/video_output.h | 21 ++++----
+ src/media_data.h | 13 ++--
+ src/subtitle_renderer.cpp | 17 +++--
+ src/subtitle_renderer.h | 10 +--
+ src/video_output.cpp | 352 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
+ src/video_output.h | 21 +++---
 5 files changed, 266 insertions(+), 147 deletions(-)
 
 commit 87dd17c34d8863274ea93dd27228162160cd71d7
@@ -1884,7 +2287,7 @@
 doc/bino.texi | 2 ++
 src/dispatch.cpp | 4 ++++
 src/dispatch.h | 2 ++
- src/gui.cpp | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------
+ src/gui.cpp | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------
 src/gui.h | 3 +++
 src/main.cpp | 5 +++++
 src/media_data.cpp | 11 +++++++++++
@@ -1979,7 +2382,7 @@
 Add simplified chinese translation (incomplete).
 
 po/LINGUAS | 1 +
- po/zh_cn.po | 1812 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/zh_cn.po | 1812 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1813 insertions(+)
 
 commit 2f3cbf224b1dd203ef5a4cb129f80eb8583839fd
@@ -2054,7 +2457,7 @@
 
 GUI: make About dialog non-modal.
 
- src/gui.cpp | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------
+ src/gui.cpp | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
 1 file changed, 75 insertions(+), 72 deletions(-)
 
 commit 9f40859d3f7078789bc4c22b2b8492014b6ec0e3
@@ -2222,9 +2625,9 @@
 
 Fix and simplify fullscreen mode and settings dialog.
 
- src/gui.cpp | 106 +++++++++++++++++++++++++++++-----------------------------------------------------------------------------
+ src/gui.cpp | 106 ++++++++++++++++++++++++++++---------------------------------------------------------------------------
 src/gui.h | 15 +--------------
- src/video_output_qt.cpp | 104 ++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------
+ src/video_output_qt.cpp | 104 +++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------
 3 files changed, 74 insertions(+), 151 deletions(-)
 
 commit 36bafd06135c347f23287c8ce5ee5e0f42bcda4f
@@ -2363,22 +2766,22 @@
 
 Currently, this mode is only supported on X11.
 
- doc/Makefile.am | 12 ++++-
- doc/bino.1 | 8 ++--
- doc/bino.texi | 9 ++--
+ doc/Makefile.am | 12 +++-
+ doc/bino.1 | 8 ++-
+ doc/bino.texi | 9 ++-
 src/Makefile.am | 5 +-
- src/gui.cpp | 98 ++++++++++++++++++++++-----------------
+ src/gui.cpp | 98 +++++++++++++++++--------------
 src/icons-local/README | 2 +-
- src/icons-local/output-type-alternating.ipe | 266 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-alternating.ipe | 266 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/icons-local/output-type-alternating.png | Bin 0 -> 473 bytes
- src/main.cpp | 6 ++-
+ src/main.cpp | 6 +-
 src/media_data.cpp | 5 ++
 src/media_data.h | 1 +
 src/player_equalizer.cpp | 3 +-
- src/video_output.cpp | 8 ++--
- src/video_output.h | 9 ++--
- src/video_output_qt.cpp | 47 ++++++++++++++++++-
- src/video_output_qt.h | 16 +++++++
+ src/video_output.cpp | 8 ++-
+ src/video_output.h | 9 +--
+ src/video_output_qt.cpp | 47 ++++++++++++++-
+ src/video_output_qt.h | 16 +++++
 16 files changed, 430 insertions(+), 65 deletions(-)
 
 commit eaf9278782b32a13cea19d1be331cb74a6cddce9
@@ -2503,7 +2906,7 @@
 
 Fix parameter initalization on open/play/stop.
 
- src/dispatch.cpp | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------
+ src/dispatch.cpp | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------
 1 file changed, 69 insertions(+), 67 deletions(-)
 
 commit 70a0c32d7d60a0e405659a305821cc348b9dcf6d
@@ -2549,14 +2952,14 @@
 Now using GLEWmx also works on Windows.
 
 po/POTFILES.in | 1 -
- src/Makefile.am | 7 +--
+ src/Makefile.am | 7 +-
 src/player_equalizer.cpp | 1 +
- src/video_output.cpp | 246 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
- src/video_output.h | 17 ++++++
+ src/video_output.cpp | 246 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
+ src/video_output.h | 17 +++++
 src/video_output_qt.cpp | 12 ++--
 src/video_output_qt.h | 3 +
- src/xgl.cpp | 389 -----------------------------------------------------------------------------------------------------------------------------
- src/xgl.h | 145 -----------------------------------------------
+ src/xgl.cpp | 389 ------------------------------------------------------------------------------------------------------
+ src/xgl.h | 145 --------------------------------------
 9 files changed, 246 insertions(+), 575 deletions(-)
 
 commit ea8a27aebf0a8335fcceffc036667612531e045d
@@ -2670,11 +3073,11 @@
 
 Fix handling of file/URL open errors.
 
- src/dispatch.cpp | 30 ++++++++++++++++++++++++-----
+ src/dispatch.cpp | 30 ++++++++++++++++++++----
 src/dispatch.h | 2 +-
- src/gui.cpp | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------
+ src/gui.cpp | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------
 src/gui.h | 4 +++-
- src/main.cpp | 10 +---------
+ src/main.cpp | 10 +-------
 5 files changed, 106 insertions(+), 77 deletions(-)
 
 commit 4d66732614169744434d7acae27fd2525bbc9cd4
@@ -2683,8 +3086,8 @@
 
 GUI: make fullscreen dialog non-blocking.
 
- src/gui.cpp | 399 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------
- src/gui.h | 60 +++++++++++++++++----
+ src/gui.cpp | 399 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------
+ src/gui.h | 60 ++++++++++++++----
 2 files changed, 261 insertions(+), 198 deletions(-)
 
 commit 7cd95313a76fe1155b5512bff43a49b43c559425
@@ -2806,12 +3209,12 @@
 
 This fixes Equalizer mode to work with the new structure.
 
- src/dispatch.cpp | 54 ++++++++++++++++++++---
- src/dispatch.h | 11 ++++-
- src/main.cpp | 17 ++++----
- src/player.h | 22 +++++++---
- src/player_equalizer.cpp | 294 ++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------
- src/player_equalizer.h | 15 ++++---
+ src/dispatch.cpp | 54 ++++++++++++++++---
+ src/dispatch.h | 11 +++-
+ src/main.cpp | 17 +++---
+ src/player.h | 22 +++++---
+ src/player_equalizer.cpp | 294 +++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------
+ src/player_equalizer.h | 15 +++---
 6 files changed, 203 insertions(+), 210 deletions(-)
 
 commit cd4d3204a6f417c5066edd480380231ec47d0a37
@@ -2822,11 +3225,11 @@
 
 This fixes GUI mode to work with the new structure.
 
- src/dispatch.cpp | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------
+ src/dispatch.cpp | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------
 src/dispatch.h | 1 +
- src/gui.cpp | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------
- src/video_output_qt.cpp | 58 ++++++++++++++++++++++++++++-----------------------------
- src/video_output_qt.h | 23 +++++++++++++++++------
+ src/gui.cpp | 88 ++++++++++++++++++++++++++++++++++++++++++-----------------------------
+ src/video_output_qt.cpp | 58 +++++++++++++++++++++++------------------------
+ src/video_output_qt.h | 23 ++++++++++++++-----
 5 files changed, 161 insertions(+), 137 deletions(-)
 
 commit 4bb823917b04b9a4e0a7c7b70c1a256c96214369
@@ -2843,12 +3246,12 @@
 It also simplifies things because updates do not need to be triggered manually
 anymore, e.g. on parameter changes or window movement.
 
- src/dispatch.cpp | 38 ++++++++++++++----------
+ src/dispatch.cpp | 38 +++++++++++---------
 src/main.cpp | 6 ++++
- src/video_output.cpp | 26 +++++++----------
- src/video_output.h | 5 ++--
- src/video_output_qt.cpp | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------
- src/video_output_qt.h | 63 ++++++++++++++++++++++++++++++++++++----
+ src/video_output.cpp | 26 ++++++--------
+ src/video_output.h | 5 ++-
+ src/video_output_qt.cpp | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
+ src/video_output_qt.h | 63 +++++++++++++++++++++++++++++---
 6 files changed, 271 insertions(+), 68 deletions(-)
 
 commit 14baff7c96d41dc4763b629f93cd8436d9e2686c
@@ -2860,25 +3263,22 @@
 This moves the management of media input, audio and video output, and player
 objects to the central dispatch.
 
- src/Makefile.am | 6 +-
- src/audio_output.h | 3 +-
- src/controller.cpp | 584 -----------------------
- src/controller.h | 300 ------------
- src/dispatch.cpp | 739 +++++++++++++++++++++++++++++
- src/dispatch.h | 350 ++++++++++++++
- src/gui.cpp | 3073 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/gui.h | 403 ++++++++++++++++
- src/lirc.h | 2 +-
- src/main.cpp | 144 +++---
- src/player.cpp | 413 ++++------------
- src/player.h | 105 +----
- src/player_qt.cpp | 3246 -----------------------------------------------------------------------------------------------------------------------------
- src/player_qt.h | 434 -----------------
- src/video_output.cpp | 29 +-
- src/video_output.h | 5 +-
- src/video_output_qt.cpp | 61 +--
- src/video_output_qt.h | 28 +-
- 18 files changed, 4782 insertions(+), 5143 deletions(-)
+ src/Makefile.am | 6 +-
+ src/audio_output.h | 3 +-
+ src/controller.cpp | 584 --------------------------------------------------------------------------
+ src/dispatch.cpp | 739 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/{controller.h => dispatch.h} | 96 ++++++++++---
+ src/{player_qt.cpp => gui.cpp} | 413 ++++++++++++++++------------------------------------
+ src/{player_qt.h => gui.h} | 59 ++------
+ src/lirc.h | 2 +-
+ src/main.cpp | 144 ++++++++-----------
+ src/player.cpp | 413 ++++++++++++----------------------------------------
+ src/player.h | 105 ++------------
+ src/video_output.cpp | 29 +---
+ src/video_output.h | 5 +-
+ src/video_output_qt.cpp | 61 ++++----
+ src/video_output_qt.h | 28 ++--
+ 15 files changed, 1163 insertions(+), 1524 deletions(-)
 
 commit 5e05468c6656dce8775816bbc2bf5a9584ce4cf8
 Author: Martin Lambers <marlam@marlam.de>
@@ -2889,24 +3289,24 @@
 This moves all parameter management to a single central dispatch
 that exists independent of the player object.
 
- src/audio_output.cpp | 40 +++--
+ src/audio_output.cpp | 40 ++--
 src/audio_output.h | 12 +-
 src/base/opt.cpp | 4 +
 src/base/opt.h | 13 +-
- src/base/s11n.h | 18 +++
- src/controller.cpp | 500 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
- src/controller.h | 303 ++++++++++++++++++------------------
+ src/base/s11n.h | 18 ++
+ src/controller.cpp | 500 +++++++++++++++++++++++++++++++++++++++++++-----
+ src/controller.h | 303 ++++++++++++++----------------
 src/lirc.cpp | 33 +---
 src/lirc.h | 9 +-
- src/main.cpp | 268 +++++++++++++-------------------
- src/player.cpp | 599 ++++++++++++-----------------------------------------------------------
- src/player.h | 26 +++-
+ src/main.cpp | 268 +++++++++++---------------
+ src/player.cpp | 599 ++++++++++------------------------------------------------
+ src/player.h | 26 ++-
 src/player_equalizer.cpp | 2 +-
- src/player_qt.cpp | 1044 ++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------
- src/player_qt.h | 40 ++---
+ src/player_qt.cpp | 1044 +++++++++++++++++++++++++++++------------------------------------------------------------------------
+ src/player_qt.h | 40 ++--
 src/video_output.cpp | 2 +-
 src/video_output.h | 9 +-
- src/video_output_qt.cpp | 66 ++------
+ src/video_output_qt.cpp | 66 ++-----
 src/video_output_qt.h | 11 +-
 19 files changed, 1230 insertions(+), 1769 deletions(-)
 
@@ -3043,7 +3443,7 @@
 
 Translations: break the "--help" string into smaller segments.
 
- src/main.cpp | 239 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
+ src/main.cpp | 239 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------
 1 file changed, 118 insertions(+), 121 deletions(-)
 
 commit 5d60a1ea7b47f1b3792753b8b1bb3d256d7c6a6d
@@ -3130,9 +3530,9 @@
 
 Make the new parameter load/save scheme compatible to Bino <= 1.2.x.
 
- src/media_data.cpp | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------
- src/media_data.h | 12 +++++------
- src/player_qt.cpp | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/media_data.cpp | 138 ++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------
+ src/media_data.h | 12 ++++-----
+ src/player_qt.cpp | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 227 insertions(+), 78 deletions(-)
 
 commit 8f1bb9250fc88a846f2fe8b598cd0e031f0a8cb7
@@ -3143,18 +3543,18 @@
 
 Also update all callers.
 
- src/main.cpp | 106 ++++---
- src/media_data.cpp | 1899 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------
- src/media_data.h | 289 ++++++++++---------
+ src/main.cpp | 106 +++---
+ src/media_data.cpp | 1899 +++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
+ src/media_data.h | 289 ++++++++--------
 src/media_input.cpp | 26 +-
 src/media_input.h | 6 +-
- src/media_object.cpp | 68 ++---
- src/player.cpp | 121 +++-----
+ src/media_object.cpp | 68 ++--
+ src/player.cpp | 121 ++-----
 src/player.h | 15 -
 src/player_equalizer.cpp | 3 +-
- src/player_qt.cpp | 333 +++++++++++-----------
+ src/player_qt.cpp | 333 +++++++++---------
 src/player_qt.h | 7 +-
- src/video_output.cpp | 176 ++++++------
+ src/video_output.cpp | 176 +++++-----
 12 files changed, 1538 insertions(+), 1511 deletions(-)
 
 commit c7b9194e33508ef48a396fc84cee393d202a62d9
@@ -3164,15 +3564,15 @@
 Restructure the parameter class, and update all callers.
 
 src/audio_output.cpp | 4 +-
- src/controller.h | 18 ++--
- src/main.cpp | 114 ++++++++++++++--------
- src/media_data.cpp | 662 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------
- src/media_data.h | 114 ++++++++++++++--------
- src/player.cpp | 273 +++++++++++++++++++++++++++------------------------
+ src/controller.h | 18 +--
+ src/main.cpp | 114 +++++++++++-------
+ src/media_data.cpp | 662 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------
+ src/media_data.h | 114 +++++++++++-------
+ src/player.cpp | 273 ++++++++++++++++++++++--------------------
 src/player_equalizer.cpp | 4 +-
- src/player_qt.cpp | 462 ++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
+ src/player_qt.cpp | 462 +++++++++++++++++++++++++++++++++++-----------------------------------
 src/subtitle_renderer.cpp | 20 ++--
- src/video_output.cpp | 228 +++++++++++++++++++++----------------------
+ src/video_output.cpp | 228 +++++++++++++++++------------------
 10 files changed, 1043 insertions(+), 856 deletions(-)
 
 commit 5b2e081a04c6eb148891ad08f2553ba5045d0d20
@@ -3258,12 +3658,12 @@
 
 Improve zoom, and put it into its own GUI dialog.
 
- doc/bino.1 | 4 ++--
- doc/bino.texi | 4 ++--
+ doc/bino.1 | 4 +--
+ doc/bino.texi | 4 +--
 src/main.cpp | 2 +-
- src/player.cpp | 4 ++--
- src/player_qt.cpp | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
- src/player_qt.h | 26 +++++++++++++++++----
+ src/player.cpp | 4 +--
+ src/player_qt.cpp | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------
+ src/player_qt.h | 26 ++++++++++++++---
 6 files changed, 139 insertions(+), 71 deletions(-)
 
 commit 27095573fee12acc90bc5b181ba7516f06b83779
@@ -3463,8 +3863,8 @@
 
 GUI: integrate zoom preferences into video preferences.
 
- src/player_qt.cpp | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------
- src/player_qt.h | 36 +++++-------------
+ src/player_qt.cpp | 277 ++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------
+ src/player_qt.h | 36 ++++-----------
 2 files changed, 126 insertions(+), 187 deletions(-)
 
 commit eedaa6443e7c2aff4613a103f0e68e1a50a1176c
@@ -3519,17 +3919,17 @@
 
 AUTHORS | 1 +
 src/Makefile.am | 4 +-
- src/icons-local/input-layout-alternating-left-right.ipe | 260 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/input-layout-alternating-left-right.ipe | 260 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/icons-local/input-layout-alternating-left-right.png | Bin 0 -> 861 bytes
- src/icons-local/input-layout-alternating-right-left.ipe | 260 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/input-layout-alternating-right-left.ipe | 260 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/icons-local/input-layout-alternating-right-left.png | Bin 0 -> 872 bytes
- src/main.cpp | 6 ++-
- src/media_data.cpp | 18 ++++++-
+ src/main.cpp | 6 +-
+ src/media_data.cpp | 18 ++++-
 src/media_data.h | 4 +-
- src/media_input.cpp | 18 ++++---
- src/media_object.cpp | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
- src/media_object.h | 8 +--
- src/player_qt.cpp | 44 ++++++++++------
+ src/media_input.cpp | 18 +++--
+ src/media_object.cpp | 232 ++++++++++++++++++++++++++++++++++++++++-----------------------
+ src/media_object.h | 8 ++-
+ src/player_qt.cpp | 44 +++++++-----
 13 files changed, 742 insertions(+), 113 deletions(-)
 
 commit 4fe593c1918edfacf5914c4b0d2777514ad4ef78
@@ -3571,24 +3971,24 @@
 Update/merge base modules.
 
 configure.ac | 2 +-
- src/base/blob.h | 88 +++++++++++----------
+ src/base/blob.h | 88 +++++++++--------
 src/base/dbg.cpp | 4 +-
- src/base/dbg.h | 16 ++--
- src/base/exc.cpp | 10 +--
+ src/base/dbg.h | 16 +--
+ src/base/exc.cpp | 10 +-
 src/base/exc.h | 4 +-
 src/base/intcheck.h | 4 +-
- src/base/msg.cpp | 10 ++-
- src/base/msg.h | 20 ++++-
+ src/base/msg.cpp | 10 +-
+ src/base/msg.h | 20 +++-
 src/base/opt.cpp | 4 +-
 src/base/opt.h | 4 +-
- src/base/s11n.cpp | 566 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------
- src/base/s11n.h | 179 +++++++++++++++++++++++++++++------------
- src/base/str.cpp | 46 ++++++++++-
+ src/base/s11n.cpp | 566 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
+ src/base/s11n.h | 179 ++++++++++++++++++++++++----------
+ src/base/str.cpp | 46 ++++++++-
 src/base/str.h | 7 +-
- src/base/thread.cpp | 132 ++++++++++++++++++++++---------
- src/base/thread.h | 86 ++++++++++++++------
- src/base/timer.cpp | 42 ++++------
- src/base/timer.h | 9 +--
+ src/base/thread.cpp | 132 ++++++++++++++++++-------
+ src/base/thread.h | 86 ++++++++++++-----
+ src/base/timer.cpp | 42 +++-----
+ src/base/timer.h | 9 +-
 src/media_data.h | 8 +-
 src/player.h | 2 +-
 src/player_qt.cpp | 1 +
@@ -3689,8 +4089,8 @@
 
 Update autotools files.
 
- build-aux/config.guess | 360 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------
- build-aux/config.sub | 181 ++++++++++++++++++++++++++++++++++++++++++++--------------------
+ build-aux/config.guess | 360 ++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------
+ build-aux/config.sub | 181 +++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 296 insertions(+), 245 deletions(-)
 
 commit fc6877bf30561e90fe7e0862432b28b68f1af109
@@ -3858,8 +4258,8 @@
 
 GUI: Fix all preferences dialogs to work when no video is opened.
 
- src/player_qt.cpp | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------
- src/player_qt.h | 11 ++++++----
+ src/player_qt.cpp | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------
+ src/player_qt.h | 11 ++++++---
 2 files changed, 105 insertions(+), 51 deletions(-)
 
 commit 104ce9d380a5cffa93651d8cd99f7fb124e18b11
@@ -3868,20 +4268,20 @@
 
 Add a zoom mode for videos that are wider than the screen.
 
- doc/bino.1 | 7 ++++-
- doc/bino.texi | 10 ++++++-
- src/controller.h | 3 +++
+ doc/bino.1 | 7 +++-
+ doc/bino.texi | 10 +++++-
+ src/controller.h | 3 ++
 src/lirc.cpp | 4 +++
- src/main.cpp | 7 ++++-
- src/media_data.cpp | 9 ++++++-
+ src/main.cpp | 7 +++-
+ src/media_data.cpp | 9 +++++-
 src/media_data.h | 1 +
- src/player.cpp | 14 ++++++++++
- src/player_equalizer.cpp | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------
- src/player_qt.cpp | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
- src/player_qt.h | 21 +++++++++++++++
- src/video_output.cpp | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------
- src/video_output.h | 8 +++---
- src/video_output_qt.cpp | 10 +++++--
+ src/player.cpp | 14 ++++++++
+ src/player_equalizer.cpp | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------
+ src/player_qt.cpp | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ src/player_qt.h | 21 ++++++++++++
+ src/video_output.cpp | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------
+ src/video_output.h | 8 +++--
+ src/video_output_qt.cpp | 10 ++++--
 14 files changed, 381 insertions(+), 146 deletions(-)
 
 commit debdddaecae81da1c3de9e14c45841ec76efb749
@@ -3935,7 +4335,7 @@
 Update cs.po.
 
 po/LINGUAS | 2 +-
- po/cs.po | 790 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
+ po/cs.po | 790 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------
 2 files changed, 522 insertions(+), 270 deletions(-)
 
 commit 62c315157cfff5c0c39701f54dcf3256bda578b8
@@ -4009,22 +4409,17 @@
 
 This uses the freedesktop.org standards.
 
- configure.ac | 8 +
- src/Makefile.am | 31 +++-
- src/bino.desktop | 11 ++
- src/logo/16x16/bino.png | Bin 0 -> 714 bytes
- src/logo/32x32/bino.png | Bin 0 -> 1698 bytes
- src/logo/48x48/bino.png | Bin 0 -> 2554 bytes
- src/logo/64x64/bino.png | Bin 0 -> 3914 bytes
- src/logo/bino_logo_small.svg | 1011 ------------------------------------------------------------------------------------------------------------------
- src/logo/bino_logo_small_16x16.png | Bin 714 -> 0 bytes
- src/logo/bino_logo_small_32x32.png | Bin 1698 -> 0 bytes
- src/logo/bino_logo_small_48x48.png | Bin 2554 -> 0 bytes
- src/logo/bino_logo_small_64x64.png | Bin 3914 -> 0 bytes
- src/logo/scalable/bino.svg | 1011 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/player_qt.cpp | 2 +-
- src/video_output_qt.cpp | 2 +-
- 15 files changed, 1056 insertions(+), 1020 deletions(-)
+ configure.ac | 8 ++++++++
+ src/Makefile.am | 31 ++++++++++++++++++++++++-------
+ src/bino.desktop | 11 +++++++++++
+ src/logo/{bino_logo_small_16x16.png => 16x16/bino.png} | Bin
+ src/logo/{bino_logo_small_32x32.png => 32x32/bino.png} | Bin
+ src/logo/{bino_logo_small_48x48.png => 48x48/bino.png} | Bin
+ src/logo/{bino_logo_small_64x64.png => 64x64/bino.png} | Bin
+ src/logo/{bino_logo_small.svg => scalable/bino.svg} | 0
+ src/player_qt.cpp | 2 +-
+ src/video_output_qt.cpp | 2 +-
+ 10 files changed, 45 insertions(+), 9 deletions(-)
 
 commit f87b79ee7fa4482f38b794ed098cdd4047f8a0ce
 Author: Martin Lambers <marlam@marlam.de>
@@ -4165,7 +4560,7 @@
 
 Manual: some tweaks and improvements.
 
- doc/bino.texi | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------
+ doc/bino.texi | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
 1 file changed, 86 insertions(+), 85 deletions(-)
 
 commit d59ae1dce114e758d617bd5e315b9685c0e4dfad
@@ -4184,7 +4579,7 @@
 Update pl.po.
 
 AUTHORS | 1 +
- po/pl.po | 819 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------
+ po/pl.po | 819 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------
 2 files changed, 538 insertions(+), 282 deletions(-)
 
 commit 68f3f8d35be69b2915eed2877302b6cdda48c9f0
@@ -4222,7 +4617,7 @@
 
 Update fr.po.
 
- po/fr.po | 802 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
+ po/fr.po | 802 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------
 1 file changed, 528 insertions(+), 274 deletions(-)
 
 commit c5d5d82639348e77ef2b776407e80a0d9cf0454a
@@ -4240,7 +4635,7 @@
 
 Update ru.po.
 
- po/ru.po | 812 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------
+ po/ru.po | 812 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------
 1 file changed, 531 insertions(+), 281 deletions(-)
 
 commit 3411dab55e1a0dc2d6867e028877ce23812991a5
@@ -4367,7 +4762,7 @@
 
 Update de.po.
 
- po/de.po | 449 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------
+ po/de.po | 449 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------
 1 file changed, 227 insertions(+), 222 deletions(-)
 
 commit f7e233001b4f84864d2ce55ede83defa7e8b65ab
@@ -4514,8 +4909,8 @@
 
 Manual: add images and explanations, and restructure some sections.
 
- doc/Makefile.am | 34 ++++++-
- doc/bino.texi | 604 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
+ doc/Makefile.am | 34 ++++-
+ doc/bino.texi | 604 +++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
 doc/input-layout-bottom-top-half.png | 1 +
 doc/input-layout-bottom-top.png | 1 +
 doc/input-layout-even-odd-rows.png | 1 +
@@ -4553,67 +4948,67 @@
 
 GUI: add mini-icons to the entries in the input/output comboboxes.
 
- src/Makefile.am | 38 ++++++-
- src/icons-local/README | 21 ++++
- src/icons-local/input-layout-bottom-top-half.ipe | 253 +++++++++++++++++++++++++++++++++++++++++++
+ src/Makefile.am | 38 ++++-
+ src/icons-local/README | 21 +++
+ src/icons-local/input-layout-bottom-top-half.ipe | 253 +++++++++++++++++++++++++++++++++
 src/icons-local/input-layout-bottom-top-half.png | Bin 0 -> 468 bytes
- src/icons-local/input-layout-bottom-top.ipe | 260 ++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/input-layout-bottom-top.ipe | 260 ++++++++++++++++++++++++++++++++++
 src/icons-local/input-layout-bottom-top.png | Bin 0 -> 645 bytes
- src/icons-local/input-layout-even-odd-rows.ipe | 279 +++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/input-layout-even-odd-rows.ipe | 279 ++++++++++++++++++++++++++++++++++++
 src/icons-local/input-layout-even-odd-rows.png | Bin 0 -> 339 bytes
- src/icons-local/input-layout-left-right-half.ipe | 253 +++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/input-layout-left-right-half.ipe | 253 +++++++++++++++++++++++++++++++++
 src/icons-local/input-layout-left-right-half.png | Bin 0 -> 433 bytes
- src/icons-local/input-layout-left-right.ipe | 253 +++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/input-layout-left-right.ipe | 253 +++++++++++++++++++++++++++++++++
 src/icons-local/input-layout-left-right.png | Bin 0 -> 562 bytes
- src/icons-local/input-layout-mono.ipe | 245 ++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/input-layout-mono.ipe | 245 ++++++++++++++++++++++++++++++++
 src/icons-local/input-layout-mono.png | Bin 0 -> 569 bytes
- src/icons-local/input-layout-odd-even-rows.ipe | 279 +++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/input-layout-odd-even-rows.ipe | 279 ++++++++++++++++++++++++++++++++++++
 src/icons-local/input-layout-odd-even-rows.png | Bin 0 -> 335 bytes
- src/icons-local/input-layout-right-left-half.ipe | 253 +++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/input-layout-right-left-half.ipe | 253 +++++++++++++++++++++++++++++++++
 src/icons-local/input-layout-right-left-half.png | Bin 0 -> 444 bytes
- src/icons-local/input-layout-right-left.ipe | 253 +++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/input-layout-right-left.ipe | 253 +++++++++++++++++++++++++++++++++
 src/icons-local/input-layout-right-left.png | Bin 0 -> 551 bytes
- src/icons-local/input-layout-separate-left-right.ipe | 253 +++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/input-layout-separate-left-right.ipe | 253 +++++++++++++++++++++++++++++++++
 src/icons-local/input-layout-separate-left-right.png | Bin 0 -> 597 bytes
- src/icons-local/input-layout-separate-right-left.ipe | 253 +++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/input-layout-separate-right-left.ipe | 253 +++++++++++++++++++++++++++++++++
 src/icons-local/input-layout-separate-right-left.png | Bin 0 -> 595 bytes
- src/icons-local/input-layout-top-bottom-half.ipe | 253 +++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/input-layout-top-bottom-half.ipe | 253 +++++++++++++++++++++++++++++++++
 src/icons-local/input-layout-top-bottom-half.png | Bin 0 -> 471 bytes
- src/icons-local/input-layout-top-bottom.ipe | 260 ++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/input-layout-top-bottom.ipe | 260 ++++++++++++++++++++++++++++++++++
 src/icons-local/input-layout-top-bottom.png | Bin 0 -> 649 bytes
- src/icons-local/output-type-amber-blue.ipe | 272 ++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-amber-blue.ipe | 272 +++++++++++++++++++++++++++++++++++
 src/icons-local/output-type-amber-blue.png | Bin 0 -> 1945 bytes
- src/icons-local/output-type-checkerboard.ipe | 573 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-checkerboard.ipe | 573 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/icons-local/output-type-checkerboard.png | Bin 0 -> 501 bytes
- src/icons-local/output-type-even-odd-columns.ipe | 293 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-even-odd-columns.ipe | 293 ++++++++++++++++++++++++++++++++++++++
 src/icons-local/output-type-even-odd-columns.png | Bin 0 -> 365 bytes
- src/icons-local/output-type-even-odd-rows.ipe | 279 +++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-even-odd-rows.ipe | 279 ++++++++++++++++++++++++++++++++++++
 src/icons-local/output-type-even-odd-rows.png | Bin 0 -> 339 bytes
- src/icons-local/output-type-green-magenta.ipe | 272 ++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-green-magenta.ipe | 272 +++++++++++++++++++++++++++++++++++
 src/icons-local/output-type-green-magenta.png | Bin 0 -> 1954 bytes
- src/icons-local/output-type-hdmi-frame-pack.ipe | 245 ++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-hdmi-frame-pack.ipe | 245 ++++++++++++++++++++++++++++++++
 src/icons-local/output-type-hdmi-frame-pack.png | Bin 0 -> 1211 bytes
- src/icons-local/output-type-left-right-half.ipe | 253 +++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-left-right-half.ipe | 253 +++++++++++++++++++++++++++++++++
 src/icons-local/output-type-left-right-half.png | Bin 0 -> 433 bytes
- src/icons-local/output-type-left-right.ipe | 253 +++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-left-right.ipe | 253 +++++++++++++++++++++++++++++++++
 src/icons-local/output-type-left-right.png | Bin 0 -> 562 bytes
- src/icons-local/output-type-mono-left.ipe | 245 ++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-mono-left.ipe | 245 ++++++++++++++++++++++++++++++++
 src/icons-local/output-type-mono-left.png | Bin 0 -> 324 bytes
- src/icons-local/output-type-mono-right.ipe | 245 ++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-mono-right.ipe | 245 ++++++++++++++++++++++++++++++++
 src/icons-local/output-type-mono-right.png | Bin 0 -> 372 bytes
- src/icons-local/output-type-red-blue.ipe | 272 ++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-red-blue.ipe | 272 +++++++++++++++++++++++++++++++++++
 src/icons-local/output-type-red-blue.png | Bin 0 -> 1898 bytes
- src/icons-local/output-type-red-cyan.ipe | 272 ++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-red-cyan.ipe | 272 +++++++++++++++++++++++++++++++++++
 src/icons-local/output-type-red-cyan.png | Bin 0 -> 1943 bytes
- src/icons-local/output-type-red-green.ipe | 272 ++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-red-green.ipe | 272 +++++++++++++++++++++++++++++++++++
 src/icons-local/output-type-red-green.png | Bin 0 -> 1891 bytes
- src/icons-local/output-type-stereo.ipe | 245 ++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-stereo.ipe | 245 ++++++++++++++++++++++++++++++++
 src/icons-local/output-type-stereo.png | Bin 0 -> 885 bytes
- src/icons-local/output-type-top-bottom-half.ipe | 253 +++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-top-bottom-half.ipe | 253 +++++++++++++++++++++++++++++++++
 src/icons-local/output-type-top-bottom-half.png | Bin 0 -> 471 bytes
- src/icons-local/output-type-top-bottom.ipe | 260 ++++++++++++++++++++++++++++++++++++++++++++
+ src/icons-local/output-type-top-bottom.ipe | 260 ++++++++++++++++++++++++++++++++++
 src/icons-local/output-type-top-bottom.png | Bin 0 -> 649 bytes
- src/player_qt.cpp | 76 ++++++-------
+ src/player_qt.cpp | 76 +++++-----
 61 files changed, 7946 insertions(+), 40 deletions(-)
 
 commit a5643dbc8a231393bbed004fb3ef3611873caf4b
@@ -4684,8 +5079,8 @@
 
 Subtitle renderer: minor cleanup.
 
- src/subtitle_renderer.cpp | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------
- src/subtitle_renderer.h | 4 ++--
+ src/subtitle_renderer.cpp | 149 +++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------
+ src/subtitle_renderer.h | 4 +--
 2 files changed, 63 insertions(+), 90 deletions(-)
 
 commit a7bbf4e3c0ee9b660270e564c4e5d7be5cc7d5c1
@@ -4800,7 +5195,7 @@
 
 Update de.po.
 
- po/de.po | 698 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------
+ po/de.po | 698 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
 1 file changed, 440 insertions(+), 258 deletions(-)
 
 commit 762c7a9296fca91387f14d57638fe1a4327b7ab3
@@ -4981,20 +5376,20 @@
 Add flexible fullscreen modes with support for multiple screens.
 
 NEWS | 2 +-
- doc/bino.1 | 15 ++++++--
- doc/bino.texi | 29 +++++++++-----
- src/controller.h | 12 +++++-
- src/main.cpp | 50 ++++++++++++++++++++----
- src/media_data.cpp | 38 ++++++++++++++++---
+ doc/bino.1 | 15 ++++--
+ doc/bino.texi | 29 ++++++++----
+ src/controller.h | 12 ++++-
+ src/main.cpp | 50 +++++++++++++++++---
+ src/media_data.cpp | 38 +++++++++++++--
 src/media_data.h | 6 ++-
- src/player.cpp | 47 +++++++++++++++++++----
+ src/player.cpp | 47 +++++++++++++++---
 src/player_equalizer.cpp | 1 +
- src/player_qt.cpp | 246 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------
- src/video_output.cpp | 99 ++++++++++++++++++++++++++++++++++--------------
+ src/player_qt.cpp | 246 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
+ src/video_output.cpp | 99 +++++++++++++++++++++++++++-----------
 src/video_output.h | 1 +
- src/video_output_qt.cpp | 78 ++++++++++++++++++++++++++++++++------
- src/video_output_qt.h | 5 ++-
- src/video_output_render.fs.glsl | 32 ++++++++--------
+ src/video_output_qt.cpp | 78 +++++++++++++++++++++++++-----
+ src/video_output_qt.h | 5 +-
+ src/video_output_render.fs.glsl | 32 ++++++-------
 15 files changed, 539 insertions(+), 122 deletions(-)
 
 commit 96ab59272883a1c94227dec88b9198e676ea73c8
@@ -5108,16 +5503,16 @@
 
 Add LIRC support.
 
- configure.ac | 31 +++++++++++++++++-
- doc/bino.1 | 2 ++
- doc/bino.texi | 62 ++++++++++++++++++++++++++++++++++++
- src/Makefile.am | 6 ++++
- src/controller.h | 6 ++++
- src/lib_versions.cpp | 25 +++++++++++++++
- src/lirc.cpp | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/lirc.h | 56 +++++++++++++++++++++++++++++++++
- src/main.cpp | 28 +++++++++++++++++
- src/player.cpp | 2 ++
+ configure.ac | 31 ++++++++++++++-
+ doc/bino.1 | 2 +
+ doc/bino.texi | 62 ++++++++++++++++++++++++++++++
+ src/Makefile.am | 6 +++
+ src/controller.h | 6 +++
+ src/lib_versions.cpp | 25 ++++++++++++
+ src/lirc.cpp | 221 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/lirc.h | 56 +++++++++++++++++++++++++++
+ src/main.cpp | 28 ++++++++++++++
+ src/player.cpp | 2 +
 10 files changed, 438 insertions(+), 1 deletion(-)
 
 commit 3f5bd9ed540af47298a69c9f1d473dedc5cda234
@@ -5134,10 +5529,10 @@
 
 src/audio_output.cpp | 4 +---
 src/audio_output.h | 2 +-
- src/controller.cpp | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
- src/controller.h | 40 ++++++++++++++++++++++++++++++----------
- src/player.cpp | 103 ++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------
- src/player.h | 9 ---------
+ src/controller.cpp | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
+ src/controller.h | 40 ++++++++++++++++++++++++++---------
+ src/player.cpp | 103 ++++++++++++++++++++++++++++++++++++-----------------------------------------------------
+ src/player.h | 9 --------
 src/player_equalizer.cpp | 4 ++--
 src/player_qt.cpp | 4 ++--
 src/video_output.cpp | 4 +---
@@ -5319,11 +5714,11 @@
 
 doc/bino.1 | 2 ++
 doc/bino.texi | 2 ++
- src/main.cpp | 23 ++++++++++++++--
+ src/main.cpp | 23 +++++++++++--
 src/media_data.h | 3 +-
- src/media_object.cpp | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------
- src/player_qt.cpp | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------------
- src/player_qt.h | 10 +++++--
+ src/media_object.cpp | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
+ src/player_qt.cpp | 101 +++++++++++++++++++++++++++++++++++++++++--------------
+ src/player_qt.h | 10 ++++--
 7 files changed, 215 insertions(+), 119 deletions(-)
 
 commit 9c9ffca87aa43ba98b46052fcabd188f67d65b2d
@@ -5332,19 +5727,19 @@
 
 Device support: allow to request specific frame size and frame rate.
 
- doc/bino.1 | 4 ++++
- doc/bino.texi | 4 ++++
- src/main.cpp | 16 +++++++++++++-
- src/media_data.cpp | 30 ++++++++++++++++++++++++++
- src/media_data.h | 30 ++++++++++++++++++++++++++
- src/media_input.cpp | 8 +++----
+ doc/bino.1 | 4 +++
+ doc/bino.texi | 4 +++
+ src/main.cpp | 16 +++++++++++-
+ src/media_data.cpp | 30 ++++++++++++++++++++++
+ src/media_data.h | 30 ++++++++++++++++++++++
+ src/media_input.cpp | 8 +++---
 src/media_input.h | 2 +-
- src/media_object.cpp | 28 +++++++++++++++++++++----
+ src/media_object.cpp | 28 +++++++++++++++++---
 src/media_object.h | 2 +-
- src/player.cpp | 8 +++----
+ src/player.cpp | 8 +++---
 src/player.h | 2 +-
- src/player_qt.cpp | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------
- src/player_qt.h | 24 ++++++++++++++++++++-
+ src/player_qt.cpp | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
+ src/player_qt.h | 24 +++++++++++++++++-
 13 files changed, 258 insertions(+), 48 deletions(-)
 
 commit e83b858eaad24e611fe2918b1d5ce1e2005f3a8c
@@ -5471,7 +5866,7 @@
 
 Also clear all members on closing, not just the FFmpeg stuff.
 
- src/media_object.cpp | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------
+ src/media_object.cpp | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------
 1 file changed, 89 insertions(+), 83 deletions(-)
 
 commit aac1aa089008a843559f38e6f657d58e72994119
@@ -5529,11 +5924,11 @@
 
 Update *.po.
 
- po/cs.po | 323 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------
- po/de.po | 317 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
- po/fr.po | 257 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
- po/pl.po | 257 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
- po/ru.po | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------
+ po/cs.po | 323 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------
+ po/de.po | 317 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------
+ po/fr.po | 257 +++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
+ po/pl.po | 257 +++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
+ po/ru.po | 265 ++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
 5 files changed, 707 insertions(+), 712 deletions(-)
 
 commit 6e61ee7d4f23bd2397eea252ea1c9f0f980812ad
@@ -5629,27 +6024,27 @@
 Based on a suggestion by Joe in
 <http://lists.nongnu.org/archive/html/bino-list/2011-04/msg00082.html>.
 
- src/Makefile.am | 45 ++++++++----
- src/icons/COPYING | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/icons/README | 18 ++---
+ src/Makefile.am | 45 ++++++---
+ src/icons/COPYING | 215 +++++++++++++++++++++++++++++++++++++++++++
+ src/icons/README | 18 +---
 src/icons/application-exit.png | Bin 0 -> 3017 bytes
 src/icons/applications-internet.png | Bin 0 -> 5158 bytes
- src/icons/b.ipe | 402 ------------------------------------------------------------------------------------------------------
+ src/icons/b.ipe | 402 --------------------------------------------------------------------------------
 src/icons/b.png | Bin 579 -> 0 bytes
- src/icons/bb.ipe | 408 -------------------------------------------------------------------------------------------------------
+ src/icons/bb.ipe | 408 ---------------------------------------------------------------------------------
 src/icons/bb.png | Bin 826 -> 0 bytes
- src/icons/bbb.ipe | 414 ---------------------------------------------------------------------------------------------------------
+ src/icons/bbb.ipe | 414 ----------------------------------------------------------------------------------
 src/icons/bbb.png | Bin 1066 -> 0 bytes
- src/icons/center.ipe | 420 -----------------------------------------------------------------------------------------------------------
+ src/icons/center.ipe | 420 ------------------------------------------------------------------------------------
 src/icons/center.png | Bin 1335 -> 0 bytes
 src/icons/document-open.png | Bin 0 -> 1616 bytes
- src/icons/f.ipe | 402 ------------------------------------------------------------------------------------------------------
+ src/icons/f.ipe | 402 --------------------------------------------------------------------------------
 src/icons/f.png | Bin 583 -> 0 bytes
- src/icons/ff.ipe | 408 -------------------------------------------------------------------------------------------------------
+ src/icons/ff.ipe | 408 ---------------------------------------------------------------------------------
 src/icons/ff.png | Bin 814 -> 0 bytes
- src/icons/fff.ipe | 414 ---------------------------------------------------------------------------------------------------------
+ src/icons/fff.ipe | 414 ----------------------------------------------------------------------------------
 src/icons/fff.png | Bin 1024 -> 0 bytes
- src/icons/fullscreen.ipe | 419 ----------------------------------------------------------------------------------------------------------
+ src/icons/fullscreen.ipe | 419 -----------------------------------------------------------------------------------
 src/icons/fullscreen.png | Bin 1109 -> 0 bytes
 src/icons/help-about.png | Bin 0 -> 2261 bytes
 src/icons/help-contents.png | Bin 0 -> 2795 bytes
@@ -5658,17 +6053,17 @@
 src/icons/media-playback-stop.png | Bin 0 -> 1891 bytes
 src/icons/media-seek-backward.png | Bin 0 -> 1964 bytes
 src/icons/media-seek-forward.png | Bin 0 -> 1962 bytes
- src/icons/pause.ipe | 410 --------------------------------------------------------------------------------------------------------
+ src/icons/pause.ipe | 410 ----------------------------------------------------------------------------------
 src/icons/pause.png | Bin 571 -> 0 bytes
- src/icons/play.ipe | 402 ------------------------------------------------------------------------------------------------------
+ src/icons/play.ipe | 402 --------------------------------------------------------------------------------
 src/icons/play.png | Bin 709 -> 0 bytes
 src/icons/preferences-desktop-keyboard.png | Bin 0 -> 1414 bytes
- src/icons/stop.ipe | 403 ------------------------------------------------------------------------------------------------------
+ src/icons/stop.ipe | 403 --------------------------------------------------------------------------------
 src/icons/stop.png | Bin 417 -> 0 bytes
 src/icons/view-fullscreen.png | Bin 0 -> 883 bytes
 src/icons/view-restore.png | Bin 0 -> 899 bytes
- src/player_qt.cpp | 42 ++++++++---
- src/qt_resources.qrc | 19 -----
+ src/player_qt.cpp | 42 ++++++---
+ src/qt_resources.qrc | 19 ----
 40 files changed, 281 insertions(+), 4560 deletions(-)
 
 commit 9ee9475f919ab09fdec7f444664eb0d12c9e3220
@@ -5716,7 +6111,7 @@
 
 pkg/w32/bino.nsi | 17 +-
 po/LINGUAS | 1 +
- po/fr.po | 1323 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/fr.po | 1323 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 1334 insertions(+), 7 deletions(-)
 
 commit a8a90d5355e3751a98b053ad2906e1cf72ce437f
@@ -5808,7 +6203,7 @@
 AUTHORS | 1 +
 pkg/w32/bino.nsi | 6 +
 po/LINGUAS | 3 +-
- po/pl.po | 1310 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/pl.po | 1310 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 1319 insertions(+), 1 deletion(-)
 
 commit 9843961076f65c8b947df4f34ccfd265e48d989a
@@ -5826,7 +6221,7 @@
 
 Update ru.po.
 
- po/ru.po | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------
+ po/ru.po | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------
 1 file changed, 85 insertions(+), 96 deletions(-)
 
 commit 949dde274f45f0bd17d56366edaf80d22e1f8691
@@ -5922,7 +6317,7 @@
 
 pkg/w32/bino.nsi | 6 +
 po/LINGUAS | 1 +
- po/ru.po | 1317 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/ru.po | 1317 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 1324 insertions(+)
 
 commit 66993854b13c0039d98ce3e7b3e2ec8856236c98
@@ -5969,7 +6364,7 @@
 Add czech translation.
 
 po/LINGUAS | 1 +
- po/cs.po | 1302 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/cs.po | 1302 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1303 insertions(+)
 
 commit 6a861d3642b7a38c07ec9fa09d8e582d1c6064c7
@@ -6070,7 +6465,7 @@
 
 Update de.po.
 
- po/de.po | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------
+ po/de.po | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------
 1 file changed, 140 insertions(+), 121 deletions(-)
 
 commit 882cd1fd34a48acdb905614ccd720fd3507e087b
@@ -6095,8 +6490,8 @@
 
 base/msg: add message functions with indentation level.
 
- src/base/msg.cpp | 334 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
- src/base/msg.h | 30 ++++++++++++
+ src/base/msg.cpp | 334 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
+ src/base/msg.h | 30 ++++++++++
 2 files changed, 337 insertions(+), 27 deletions(-)
 
 commit cd26e53a5dcfd0d2b239a56a3baf306d609df424
@@ -6151,47 +6546,47 @@
 ABOUT-NLS | 2 +
 Makefile.am | 4 +-
 configure.ac | 8 +-
- m4/gettext.m4 | 383 +++++++++++++++++++++++++++++++++++++
- m4/iconv.m4 | 214 +++++++++++++++++++++
- m4/lib-ld.m4 | 110 +++++++++++
- m4/lib-link.m4 | 774 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- m4/lib-prefix.m4 | 224 ++++++++++++++++++++++
- m4/nls.m4 | 32 ++++
- m4/po.m4 | 449 ++++++++++++++++++++++++++++++++++++++++++++
- m4/progtest.m4 | 92 +++++++++
+ m4/gettext.m4 | 383 ++++++++++++++++++++++++++++++
+ m4/iconv.m4 | 214 +++++++++++++++++
+ m4/lib-ld.m4 | 110 +++++++++
+ m4/lib-link.m4 | 774 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ m4/lib-prefix.m4 | 224 ++++++++++++++++++
+ m4/nls.m4 | 32 +++
+ m4/po.m4 | 449 ++++++++++++++++++++++++++++++++++++
+ m4/progtest.m4 | 92 ++++++++
 po/LINGUAS | 2 +
- po/Makefile.in.in | 444 +++++++++++++++++++++++++++++++++++++++++++
+ po/Makefile.in.in | 444 +++++++++++++++++++++++++++++++++++
 po/Makevars | 41 ++++
- po/POTFILES.in | 24 +++
- po/Rules-quot | 47 +++++
+ po/POTFILES.in | 24 ++
+ po/Rules-quot | 47 ++++
 po/boldquot.sed | 10 +
- po/de.po | 1267 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- po/en@boldquot.header | 25 +++
- po/en@quot.header | 22 +++
- po/insert-header.sin | 23 +++
+ po/de.po | 1267 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/en@boldquot.header | 25 ++
+ po/en@quot.header | 22 ++
+ po/insert-header.sin | 23 ++
 po/quot.sed | 6 +
 po/remove-potcdate.sin | 19 ++
 src/Makefile.am | 7 +-
- src/audio_output.cpp | 35 ++--
+ src/audio_output.cpp | 35 +--
 src/base/dbg.cpp | 9 +-
 src/base/exc.cpp | 9 +-
- src/base/gettext.h | 280 +++++++++++++++++++++++++++
- src/base/opt.cpp | 25 +--
+ src/base/gettext.h | 280 ++++++++++++++++++++++
+ src/base/opt.cpp | 25 +-
 src/base/str.cpp | 15 +-
 src/base/thread.cpp | 17 +-
 src/base/timer.cpp | 19 +-
 src/lib_versions.cpp | 11 +-
- src/main.cpp | 195 ++++++++++---------
+ src/main.cpp | 195 ++++++++--------
 src/media_data.cpp | 11 +-
- src/media_input.cpp | 21 ++-
- src/media_object.cpp | 69 ++++---
- src/player.cpp | 23 ++-
+ src/media_input.cpp | 21 +-
+ src/media_object.cpp | 69 +++---
+ src/player.cpp | 23 +-
 src/player_equalizer.cpp | 31 +--
- src/player_qt.cpp | 343 +++++++++++++++++-----------------
+ src/player_qt.cpp | 343 +++++++++++++--------------
 src/subtitle_renderer.cpp | 11 +-
 src/video_output.cpp | 7 +-
- src/video_output_qt.cpp | 21 ++-
- src/xgl.cpp | 38 ++--
+ src/video_output_qt.cpp | 21 +-
+ src/xgl.cpp | 38 ++-
 45 files changed, 4996 insertions(+), 425 deletions(-)
 
 commit aab135dd4ff16e7e6598275f47491f8c52647f6c
@@ -6338,10 +6733,10 @@
 src/controller.h | 2 ++
 src/media_data.cpp | 7 +++++++
 src/media_data.h | 1 +
- src/player.cpp | 8 ++++++++
- src/player_qt.cpp | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
+ src/player.cpp | 8 +++++++
+ src/player_qt.cpp | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 src/player_qt.h | 5 +++++
- src/subtitle_renderer.cpp | 17 +++++++++++++++--
+ src/subtitle_renderer.cpp | 17 +++++++++++++--
 src/video_output.cpp | 1 +
 8 files changed, 147 insertions(+), 10 deletions(-)
 
@@ -6393,16 +6788,16 @@
 
 Make subtitle appearance configurable.
 
- src/controller.h | 41 +++++++++++++---
- src/media_data.cpp | 37 +++++++++++++-
+ src/controller.h | 41 +++++++++++--
+ src/media_data.cpp | 37 +++++++++++-
 src/media_data.h | 5 ++
- src/player.cpp | 65 +++++++++++++++++++++----
+ src/player.cpp | 65 ++++++++++++++++----
 src/player.h | 1 +
- src/player_qt.cpp | 326 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
- src/player_qt.h | 38 +++++++++++++++
- src/subtitle_renderer.cpp | 52 +++++++++++++++++---
- src/subtitle_renderer.h | 12 ++++-
- src/video_output.cpp | 22 +++++----
+ src/player_qt.cpp | 326 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ src/player_qt.h | 38 ++++++++++++
+ src/subtitle_renderer.cpp | 52 +++++++++++++---
+ src/subtitle_renderer.h | 12 +++-
+ src/video_output.cpp | 22 ++++---
 src/video_output.h | 3 +-
 11 files changed, 564 insertions(+), 38 deletions(-)
 
@@ -6484,9 +6879,9 @@
 This is because some virtual functions can really only be implemented on
 channel level (e.g. screen_pixel_aspect_ratio, video_display_width, ...).
 
- src/player_equalizer.cpp | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
+ src/player_equalizer.cpp | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------
 src/video_output.cpp | 4 ++--
- src/video_output.h | 12 ++++++------
+ src/video_output.h | 12 +++++------
 3 files changed, 73 insertions(+), 55 deletions(-)
 
 commit 94d8cb8d6a7125eeb0e2e24b925cb65bc1c311e5
@@ -6537,9 +6932,9 @@
 the current subtitle to the texture, which should be much faster in the common
 case because subtitles fill only a small part of the screen.
 
- src/subtitle_renderer.cpp | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
- src/subtitle_renderer.h | 45 ++++++++++++++++++++++----
- src/video_output.cpp | 64 ++++++++++++++++++++++++-------------
+ src/subtitle_renderer.cpp | 218 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
+ src/subtitle_renderer.h | 45 +++++++++++++++++----
+ src/video_output.cpp | 64 +++++++++++++++++++-----------
 src/video_output.h | 1 +
 4 files changed, 242 insertions(+), 86 deletions(-)
 
@@ -6566,11 +6961,11 @@
 These are mainly found on DVD video.
 
 src/media_data.cpp | 9 ++++++++-
- src/media_data.h | 26 +++++++++++++++++++-------
- src/media_object.cpp | 20 ++++++++++++++------
- src/subtitle_renderer.cpp | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
+ src/media_data.h | 26 +++++++++++++++++-------
+ src/media_object.cpp | 20 ++++++++++++------
+ src/subtitle_renderer.cpp | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
 src/subtitle_renderer.h | 7 ++++++-
- src/video_output.cpp | 19 ++++++++++++++-----
+ src/video_output.cpp | 19 ++++++++++++-----
 src/video_output.h | 2 +-
 7 files changed, 142 insertions(+), 53 deletions(-)
 
@@ -6601,12 +6996,12 @@
 resulted in wrong color and alpha values.
 
 src/Makefile.am | 2 --
- src/subtitle_renderer.cpp | 44 ++++++++++++++++-----------------
- src/subtitle_renderer.h | 10 ++++----
- src/video_output.cpp | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------
- src/video_output.h | 14 ++++++++++-
- src/video_output_render.fs.glsl | 36 +++++++++++++++++++++------
- src/video_output_subtitle.fs.glsl | 49 -------------------------------------
+ src/subtitle_renderer.cpp | 44 +++++++++++++--------------
+ src/subtitle_renderer.h | 10 +++---
+ src/video_output.cpp | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------
+ src/video_output.h | 14 ++++++++-
+ src/video_output_render.fs.glsl | 36 +++++++++++++++++-----
+ src/video_output_subtitle.fs.glsl | 49 ------------------------------
 7 files changed, 166 insertions(+), 144 deletions(-)
 
 commit 06cc1e308aaffad984f854ccf30a2a4d660eb930
@@ -6774,10 +7169,10 @@
 doc/bino.1 | 6 +-
 doc/bino.texi | 5 +-
 src/main.cpp | 8 ++-
- src/media_input.cpp | 139 +++++++++++++++++++++++++++++++++++++++++++-
- src/media_input.h | 38 +++++++++++-
- src/media_object.cpp | 413 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
- src/media_object.h | 34 ++++++++---
+ src/media_input.cpp | 139 +++++++++++++++++++++++++++++++++++-
+ src/media_input.h | 38 +++++++++-
+ src/media_object.cpp | 413 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
+ src/media_object.h | 34 ++++++---
 8 files changed, 594 insertions(+), 50 deletions(-)
 
 commit bed1064c5e6a691018763c941f2d94e4ddfa391b
@@ -6796,11 +7191,11 @@
 
 Add subtitle renderer based on LibASS.
 
- configure.ac | 9 ++++++
- src/Makefile.am | 5 ++--
- src/lib_versions.cpp | 24 +++++++++++++++
- src/subtitle_renderer.cpp | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/subtitle_renderer.h | 55 ++++++++++++++++++++++++++++++++++
+ configure.ac | 9 +++++
+ src/Makefile.am | 5 ++-
+ src/lib_versions.cpp | 24 ++++++++++++
+ src/subtitle_renderer.cpp | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/subtitle_renderer.h | 55 ++++++++++++++++++++++++++++
 5 files changed, 292 insertions(+), 2 deletions(-)
 
 commit ae512c212521e2caf8feb77a74a354870cc71205
@@ -6857,9 +7252,9 @@
 hdmi_frame_pack now use viewports that split aspect ratio borders equally
 between the two views.
 
- src/player_equalizer.cpp | 6 ++++-
- src/video_output.cpp | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------
- src/video_output.h | 6 ++---
+ src/player_equalizer.cpp | 6 +++-
+ src/video_output.cpp | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------
+ src/video_output.h | 6 ++--
 3 files changed, 106 insertions(+), 70 deletions(-)
 
 commit 6958295b09f35c6d2151984ed19c17e75cb21cb4
@@ -7273,8 +7668,8 @@
 src/logo/README | 17 ++
 src/logo/bino_logo.ico | Bin 0 -> 32038 bytes
 src/logo/bino_logo.png | Bin 0 -> 23017 bytes
- src/logo/bino_logo.svg | 1081 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/logo/bino_logo_small.svg | 1011 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/logo/bino_logo.svg | 1081 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/logo/bino_logo_small.svg | 1011 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/logo/bino_logo_small_16x16.png | Bin 0 -> 714 bytes
 src/logo/bino_logo_small_32x32.png | Bin 0 -> 1698 bytes
 src/logo/bino_logo_small_48x48.png | Bin 0 -> 2554 bytes
@@ -7367,8 +7762,8 @@
 
 Minor improvement of the base thread module.
 
- src/base/thread.cpp | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------
- src/base/thread.h | 17 ++++++++-------
+ src/base/thread.cpp | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
+ src/base/thread.h | 17 +++++++------
 2 files changed, 91 insertions(+), 74 deletions(-)
 
 commit c95361737f0cdecff39e35192b89cd29cfac81ba
@@ -7419,16 +7814,16 @@
 (via data()), we start the decoder thread to decode new data asynchronously.
 
 configure.ac | 1 +
- src/audio_output.cpp | 24 ++++--
- src/audio_output.h | 26 ++++---
+ src/audio_output.cpp | 24 +++--
+ src/audio_output.h | 26 +++---
 src/base/Makefile.am | 3 +-
- src/base/thread.cpp | 151 +++++++++++++++++++++++++++++++++++++
- src/base/thread.h | 152 +++++++++++++++++++++++++++++++++++++
- src/media_input.cpp | 110 ++++++++++++++++++++-------
+ src/base/thread.cpp | 151 ++++++++++++++++++++++++++++++
+ src/base/thread.h | 152 +++++++++++++++++++++++++++++++
+ src/media_input.cpp | 110 ++++++++++++++++------
 src/media_input.h | 3 +
- src/media_object.cpp | 531 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------
+ src/media_object.cpp | 531 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
 src/media_object.h | 11 +--
- src/player.cpp | 95 +++++++++++++++--------
+ src/player.cpp | 95 ++++++++++++-------
 src/player.h | 8 +-
 12 files changed, 854 insertions(+), 261 deletions(-)
 
@@ -7739,8 +8134,8 @@
 
 Player: clean up and add comments.
 
- src/player.cpp | 17 +++++++++-------
- src/player.h | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------
+ src/player.cpp | 17 ++++++++------
+ src/player.h | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
 2 files changed, 94 insertions(+), 68 deletions(-)
 
 commit 8e07b3c8450b14a1f45acbf1a732a0e604433a4c
@@ -7786,15 +8181,15 @@
 green-magenta-half-color
 green-magenta-full-color
 
- doc/bino.1 | 25 ++++++++++++++-------
- doc/bino.texi | 24 +++++++++++++-------
- src/main.cpp | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
- src/media_data.cpp | 67 ++++++++++++++++++++++++++++++++++++++++++-------------
- src/media_data.h | 13 +++++++----
+ doc/bino.1 | 25 +++++++++++------
+ doc/bino.texi | 24 ++++++++++------
+ src/main.cpp | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------
+ src/media_data.cpp | 67 +++++++++++++++++++++++++++++++++-----------
+ src/media_data.h | 13 ++++++---
 src/player.cpp | 2 +-
- src/player_qt.cpp | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
- src/video_output.cpp | 39 ++++++++++++++++++++++----------
- src/video_output_render.fs.glsl | 39 ++++++++++++++++++++++----------
+ src/player_qt.cpp | 91 ++++++++++++++++++++++++++++++++++++++++-------------------
+ src/video_output.cpp | 39 ++++++++++++++++++--------
+ src/video_output_render.fs.glsl | 39 ++++++++++++++++++--------
 9 files changed, 287 insertions(+), 158 deletions(-)
 
 commit 90e4ba79a239073a4b04cc68c55e7c64a0035267
@@ -7841,11 +8236,11 @@
 
 Equalizer: fix compilation errors caused by the rewrite, and cleanup.
 
- src/media_data.cpp | 32 +++++++++
- src/media_data.h | 8 ++-
- src/player.cpp | 90 ++++++++++++++++++++-----
- src/player.h | 19 ++++--
- src/player_equalizer.cpp | 451 +++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------
+ src/media_data.cpp | 32 ++++++++
+ src/media_data.h | 8 +-
+ src/player.cpp | 90 ++++++++++++++++-----
+ src/player.h | 19 ++++-
+ src/player_equalizer.cpp | 451 +++++++++++++++++++++++++++++++++++-------------------------------------------------------------------
 5 files changed, 279 insertions(+), 321 deletions(-)
 
 commit 050be237112189a6298dee8745343be1197e7876
@@ -7863,12 +8258,12 @@
 
 End all messages with '.' consistently.
 
- src/audio_output.cpp | 32 ++++++++++++++++----------------
- src/main.cpp | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------
- src/media_object.cpp | 38 +++++++++++++++++++-------------------
- src/player.cpp | 14 +++++++-------
+ src/audio_output.cpp | 32 ++++++++++++++--------------
+ src/main.cpp | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------
+ src/media_object.cpp | 38 ++++++++++++++++-----------------
+ src/player.cpp | 14 ++++++------
 src/video_output_qt.cpp | 6 +++---
- src/xgl.cpp | 12 ++++++------
+ src/xgl.cpp | 12 +++++------
 6 files changed, 111 insertions(+), 111 deletions(-)
 
 commit 72afdff2b4c477161015c46656c1025c1c91df6b
@@ -7895,8 +8290,8 @@
 
 Improve library version listing.
 
- src/lib_versions.cpp | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------
- src/player_qt.cpp | 8 ++++----
+ src/lib_versions.cpp | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------
+ src/player_qt.cpp | 8 +++----
 2 files changed, 80 insertions(+), 49 deletions(-)
 
 commit d81ad58e1a49d6afe94fcec0a814003be056ecc9
@@ -7917,15 +8312,15 @@
 
 Add support for switching video and audio streams during playback.
 
- src/controller.h | 26 ++++++++++++++++++++
- src/main.cpp | 4 ++++
- src/media_input.cpp | 23 ++++++++++++++++--
- src/media_input.h | 12 ++++++++++
- src/player.cpp | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
- src/player.h | 3 +++
- src/player_qt.cpp | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------
- src/player_qt.h | 8 +++++--
- src/video_output_qt.cpp | 6 +++++
+ src/controller.h | 26 ++++++++++++++++
+ src/main.cpp | 4 +++
+ src/media_input.cpp | 23 +++++++++++++--
+ src/media_input.h | 12 ++++++++
+ src/player.cpp | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
+ src/player.h | 3 ++
+ src/player_qt.cpp | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
+ src/player_qt.h | 8 +++--
+ src/video_output_qt.cpp | 6 ++++
 9 files changed, 294 insertions(+), 48 deletions(-)
 
 commit 14c2c122140de0211f0bdb1ffc5ed8fabd348ba8
@@ -7954,9 +8349,9 @@
 
 Add forgotten GUI icons.
 
- src/icons/center.ipe | 420 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons/center.ipe | 420 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/icons/center.png | Bin 0 -> 1335 bytes
- src/icons/fullscreen.ipe | 419 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons/fullscreen.ipe | 419 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/icons/fullscreen.png | Bin 0 -> 1109 bytes
 4 files changed, 839 insertions(+)
 
@@ -7979,10 +8374,10 @@
 
 src/Makefile.am | 2 +
 src/controller.h | 6 +
- src/player.cpp | 103 ++++++++++++++--
+ src/player.cpp | 103 +++++++++++--
 src/player.h | 1 +
- src/player_qt.cpp | 867 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------
- src/player_qt.h | 117 +++++++++++++++---
+ src/player_qt.cpp | 867 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
+ src/player_qt.h | 117 ++++++++++++---
 src/qt_resources.qrc | 2 +
 7 files changed, 820 insertions(+), 278 deletions(-)
 
@@ -8059,7 +8454,7 @@
 generic parameters to commands and notifications.
 
 src/base/Makefile.am | 5 +----
- src/controller.h | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------
+ src/controller.h | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------
 2 files changed, 75 insertions(+), 58 deletions(-)
 
 commit 7b43e08d99756f0276866e6ac1737d21bb4d7094
@@ -8094,10 +8489,10 @@
 Also, improve parameters handling and storing of settings.
 
 src/main.cpp | 6 ++--
- src/media_data.cpp | 37 +++++++++++++------------
- src/player_qt.cpp | 188 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------
+ src/media_data.cpp | 37 +++++++++++----------
+ src/player_qt.cpp | 188 +++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------
 src/player_qt.h | 3 +-
- src/video_output_qt.cpp | 20 ++++++++++----
+ src/video_output_qt.cpp | 20 +++++++----
 5 files changed, 128 insertions(+), 126 deletions(-)
 
 commit 0b9e5cbdcd6ba9a908f176b53f971fbfbc8f6b1e
@@ -8160,10 +8555,10 @@
 Cleanup the player class.
 
 src/main.cpp | 2 +-
- src/player.cpp | 192 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
- src/player.h | 33 +++++++++--------------
- src/player_qt.cpp | 54 +++++++++++--------------------------
- src/player_qt.h | 9 ++++---
+ src/player.cpp | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------
+ src/player.h | 33 +++++++------------
+ src/player_qt.cpp | 54 ++++++++++---------------------
+ src/player_qt.h | 9 ++++--
 5 files changed, 126 insertions(+), 164 deletions(-)
 
 commit b93f3bbd871ffa4adc10aee682805fdd420531e7
@@ -8200,21 +8595,21 @@
 Rewrite media file and input handling.
 
 src/Makefile.am | 5 +-
- src/decoder.cpp | 157 -------------------
- src/decoder.h | 201 ------------------------
- src/decoder_ffmpeg.cpp | 917 ----------------------------------------------------------------------------------------------------------
- src/decoder_ffmpeg.h | 86 ----------
- src/input.cpp | 518 ------------------------------------------------------------
- src/input.h | 196 -----------------------
- src/media_data.cpp | 59 ++++++-
+ src/decoder.cpp | 157 ---------------
+ src/decoder.h | 201 -------------------
+ src/decoder_ffmpeg.cpp | 917 --------------------------------------------------------------------------------------
+ src/decoder_ffmpeg.h | 86 ---------
+ src/input.cpp | 518 -------------------------------------------------
+ src/input.h | 196 -------------------
+ src/media_data.cpp | 59 +++++-
 src/media_data.h | 26 ++-
- src/media_input.cpp | 458 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/media_input.h | 146 +++++++++++++++++
- src/media_object.cpp | 1081 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/media_object.h | 118 ++++++++++++++
- src/player.cpp | 293 +++++++++-------------------------
+ src/media_input.cpp | 458 +++++++++++++++++++++++++++++++++++++++++++
+ src/media_input.h | 146 ++++++++++++++
+ src/media_object.cpp | 1081 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/media_object.h | 118 ++++++++++++
+ src/player.cpp | 293 +++++++---------------------
 src/player.h | 14 +-
- src/player_qt.cpp | 38 ++---
+ src/player_qt.cpp | 38 ++--
 src/player_qt.h | 1 -
 src/video_output.cpp | 4 +-
 src/video_output.h | 1 -
@@ -8227,30 +8622,27 @@
 
 Rewrite video data handling.
 
- src/Makefile.am | 13 +-
- src/controller.h | 4 +-
- src/input.cpp | 109 +------------
- src/input.h | 7 +-
- src/main.cpp | 85 ++++++-----
- src/media_data.cpp | 441 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/media_data.h | 128 ++++++++++++++++
- src/player.cpp | 252 ++++++++++++++++++++----------
- src/player.h | 34 +++--
- src/player_qt.cpp | 229 ++++++++++++++--------------
- src/player_qt.h | 17 +--
- src/video_output.cpp | 925 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
- src/video_output.h | 200 +++++++++++++-----------
- src/video_output_color.fs.glsl | 131 ++++++++++++++++
- src/video_output_opengl.cpp | 787 ----------------------------------------------------------------------------------------------
- src/video_output_opengl.h | 168 --------------------
- src/video_output_opengl_color.fs.glsl | 131 ----------------
- src/video_output_opengl_qt.cpp | 571 --------------------------------------------------------------------
- src/video_output_opengl_qt.h | 134 ----------------
- src/video_output_opengl_render.fs.glsl | 199 ------------------------
- src/video_output_qt.cpp | 494 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/video_output_qt.h | 141 +++++++++++++++++
- src/video_output_render.fs.glsl | 199 ++++++++++++++++++++++++
- 23 files changed, 2856 insertions(+), 2543 deletions(-)
+ src/Makefile.am | 13 +-
+ src/controller.h | 4 +-
+ src/input.cpp | 109 +------
+ src/input.h | 7 +-
+ src/main.cpp | 85 ++---
+ src/media_data.cpp | 441 ++++++++++++++++++++++++++
+ src/media_data.h | 128 ++++++++
+ src/player.cpp | 252 ++++++++++-----
+ src/player.h | 34 +-
+ src/player_qt.cpp | 229 +++++++-------
+ src/player_qt.h | 17 +-
+ src/video_output.cpp | 925 +++++++++++++++++++++++++++++++++++++++++++++++++------
+ src/video_output.h | 200 +++++++-----
+ src/{video_output_opengl_color.fs.glsl => video_output_color.fs.glsl} | 0
+ src/video_output_opengl.cpp | 787 ----------------------------------------------
+ src/video_output_opengl.h | 168 ----------
+ src/video_output_opengl_qt.cpp | 571 ----------------------------------
+ src/video_output_qt.cpp | 494 +++++++++++++++++++++++++++++
+ src/{video_output_opengl_qt.h => video_output_qt.h} | 79 ++---
+ src/{video_output_opengl_render.fs.glsl => video_output_render.fs.glsl} | 0
+ 20 files changed, 2428 insertions(+), 2115 deletions(-)
 
 commit 70c0443cdb2649ef58914f52c15fdd89c7045300
 Author: Martin Lambers <marlam@marlam.de>
@@ -8267,8 +8659,8 @@
 
 Improve library version handling.
 
- src/audio_output.cpp | 2 ++
- src/lib_versions.cpp | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------
+ src/audio_output.cpp | 2 +
+ src/lib_versions.cpp | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------
 src/lib_versions.h | 5 +++
 3 files changed, 122 insertions(+), 110 deletions(-)
 
@@ -8278,8 +8670,8 @@
 
 Improve library version handling.
 
- src/lib_versions.cpp | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
- src/lib_versions.h | 5 ++++-
+ src/lib_versions.cpp | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
+ src/lib_versions.h | 5 +++-
 2 files changed, 99 insertions(+), 53 deletions(-)
 
 commit eb397aef85f0dca6c8bce5420570373a5e048ddd
@@ -8297,16 +8689,16 @@
 
 Rewrite library version handling.
 
- src/audio_output.cpp | 47 ++------------------------------------
- src/audio_output.h | 5 +----
- src/decoder_ffmpeg.cpp | 15 -------------
+ src/audio_output.cpp | 47 ++-----------------------------
+ src/audio_output.h | 5 +---
+ src/decoder_ffmpeg.cpp | 15 ----------
 src/decoder_ffmpeg.h | 2 --
- src/lib_versions.cpp | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
- src/lib_versions.h | 6 +++--
- src/player_equalizer.cpp | 11 ---------
+ src/lib_versions.cpp | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
+ src/lib_versions.h | 6 ++--
+ src/player_equalizer.cpp | 11 --------
 src/player_equalizer.h | 2 --
- src/qt_app.cpp | 7 ------
- src/qt_app.h | 5 -----
+ src/qt_app.cpp | 7 -----
+ src/qt_app.h | 5 ----
 10 files changed, 149 insertions(+), 106 deletions(-)
 
 commit 4db0e04fd3528b0669ce3b7e885f269ef6970209
@@ -8316,14 +8708,14 @@
 Rewrite audio data handling.
 
 src/Makefile.am | 2 +-
- src/audio_output.cpp | 428 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
- src/audio_output.h | 71 ++++++++++++++------
- src/audio_output_openal.cpp | 433 --------------------------------------------------------------------------------------------------------------------------
- src/audio_output_openal.h | 77 ----------------------
+ src/audio_output.cpp | 428 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ src/audio_output.h | 71 ++++++++++++-----
+ src/audio_output_openal.cpp | 433 ---------------------------------------------------------------------------------------------------
+ src/audio_output_openal.h | 77 ------------------
 src/lib_versions.cpp | 6 +-
- src/media_data.cpp | 78 ++++++++++++++++++++++
- src/media_data.h | 60 +++++++++++++++++
- src/player.cpp | 32 +++++++--
+ src/media_data.cpp | 78 ++++++++++++++++++
+ src/media_data.h | 60 ++++++++++++++
+ src/player.cpp | 32 ++++++--
 9 files changed, 644 insertions(+), 543 deletions(-)
 
 commit 3e58ac4ec23ada5a75806e1508bafa7a49a45d80
@@ -8430,21 +8822,19 @@
 
 Improve the base/dbg module.
 
- configure.ac | 6 ++++++
- src/audio_output_openal.cpp | 2 +-
- src/base/Makefile.am | 2 +-
- src/base/dbg.cpp | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/base/dbg.h | 52 +++++++++++++++++++++++++++++++++++++++++++++
- src/base/debug.cpp | 143 --------------------------------------------------------------------------------------------------------------------------
- src/base/debug.h | 50 -------------------------------------------
- src/base/str.cpp | 2 +-
- src/decoder_ffmpeg.cpp | 2 +-
- src/input.cpp | 2 +-
- src/main.cpp | 2 +-
- src/player_equalizer.cpp | 2 +-
- src/video_output_opengl.cpp | 2 +-
- src/xgl.cpp | 2 +-
- 14 files changed, 210 insertions(+), 202 deletions(-)
+ configure.ac | 6 ++++++
+ src/audio_output_openal.cpp | 2 +-
+ src/base/Makefile.am | 2 +-
+ src/base/{debug.cpp => dbg.cpp} | 6 +++---
+ src/base/{debug.h => dbg.h} | 32 +++++++++++++++++---------------
+ src/base/str.cpp | 2 +-
+ src/decoder_ffmpeg.cpp | 2 +-
+ src/input.cpp | 2 +-
+ src/main.cpp | 2 +-
+ src/player_equalizer.cpp | 2 +-
+ src/video_output_opengl.cpp | 2 +-
+ src/xgl.cpp | 2 +-
+ 12 files changed, 35 insertions(+), 27 deletions(-)
 
 commit 468758e8ad28fc9a59091b3cf893390177a4a500
 Author: Martin Lambers <marlam@marlam.de>
@@ -8583,9 +8973,9 @@
 
 Manual: some tweaks.
 
- build-aux/texinfo.tex | 9291 -------------------------------------------------------------------------------------------------------------------------------
+ build-aux/texinfo.tex | 9291 --------------------------------------------------------------------------------------------------------
 configure.ac | 2 +-
- doc/bino.texi | 149 ++-
+ doc/bino.texi | 149 +-
 3 files changed, 78 insertions(+), 9364 deletions(-)
 
 commit 136b278510bb3fef220df82c7f20b91971b868d6
@@ -8811,11 +9201,11 @@
 
 GUI: Add support for crosstalk ghostbusting.
 
- src/controller.h | 7 +++++--
- src/player.cpp | 10 ++++++++++
- src/player_qt.cpp | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
- src/player_qt.h | 7 +++++++
- src/video_output_opengl_qt.cpp | 4 ++++
+ src/controller.h | 7 ++++--
+ src/player.cpp | 10 ++++++++
+ src/player_qt.cpp | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
+ src/player_qt.h | 7 ++++++
+ src/video_output_opengl_qt.cpp | 4 +++
 5 files changed, 148 insertions(+), 11 deletions(-)
 
 commit bd2d5de0ef0e36a1da257c82ef88a8e2dbb52003
@@ -8879,10 +9269,10 @@
 
 .gitignore | 3 +
 build-aux/mdate-sh | 205 +++
- build-aux/texinfo.tex | 9291 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ build-aux/texinfo.tex | 9291 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/Makefile.am | 20 +-
 doc/bino.1 | 88 +-
- doc/bino.texi | 644 +++++++++
+ doc/bino.texi | 644 +++++++
 doc/crosstalk-ghostbusting.txt | 43 -
 doc/crosstalk-pattern-l.png | Bin 19148 -> 0 bytes
 doc/crosstalk-pattern-r.png | Bin 19159 -> 0 bytes
@@ -8925,17 +9315,17 @@
 
 Add initial support for crosstalk ghostbusting.
 
- doc/Makefile.am | 6 +++++-
- doc/bino.1 | 6 ++++++
- doc/crosstalk-ghostbusting.txt | 43 +++++++++++++++++++++++++++++++++++++++++++
+ doc/Makefile.am | 6 ++++-
+ doc/bino.1 | 6 +++++
+ doc/crosstalk-ghostbusting.txt | 43 +++++++++++++++++++++++++++++++++++
 doc/crosstalk-pattern-l.png | Bin 0 -> 19148 bytes
 doc/crosstalk-pattern-r.png | Bin 0 -> 19159 bytes
 doc/gamma-pattern.png | Bin 0 -> 14653 bytes
- src/main.cpp | 16 ++++++++++++++++
+ src/main.cpp | 16 +++++++++++++
 src/video_output.cpp | 1 +
- src/video_output.h | 5 +++++
- src/video_output_opengl.cpp | 54 +++++++++++++++++++++++++-----------------------------
- src/video_output_opengl_render.fs.glsl | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
+ src/video_output.h | 5 ++++
+ src/video_output_opengl.cpp | 54 ++++++++++++++++++++-----------------------
+ src/video_output_opengl_render.fs.glsl | 110 +++++++++++++++++++++++++++++++++++++++++++---------------------------------------------
 11 files changed, 155 insertions(+), 86 deletions(-)
 
 commit 2a417da0c1db55b5ab668fc820bb51834f306af3
@@ -8947,11 +9337,11 @@
 After successfully building bino, you can now use 'make package-macosx' to
 build an application bundle.
 
- Makefile.am | 15 ++++++
+ Makefile.am | 15 +++++
 README.MacOSX | 2 +
 configure.ac | 1 +
 pkg/macosx/Bino.icns | Bin 0 -> 29307 bytes
- pkg/macosx/Info.plist.in | 356 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ pkg/macosx/Info.plist.in | 356 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pkg/macosx/README | 8 +++
 6 files changed, 382 insertions(+)
 
@@ -8995,12 +9385,12 @@
 Windows on a GNU/Linux system by typing 'make package-w32'.
 This is now documented in README.Windows.
 
- Makefile.am | 16 ++++++++++++++++
- README.Windows | 22 ++++++++++++++++++---
- configure.ac | 17 +++++++++++++++++
- pkg/w32/bino.nsi | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- pkg/w32/notes.txt | 18 ++++++++++++++++++
- src/Makefile.am | 6 ++++++
+ Makefile.am | 16 +++++++++++++
+ README.Windows | 22 +++++++++++++++---
+ configure.ac | 17 ++++++++++++++
+ pkg/w32/bino.nsi | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ pkg/w32/notes.txt | 18 ++++++++++++++
+ src/Makefile.am | 6 +++++
 src/icons/appicon.ico | Bin 0 -> 1078 bytes
 7 files changed, 210 insertions(+), 3 deletions(-)
 
@@ -9163,18 +9553,18 @@
 
 Use a more flexible description of the video frame format.
 
- src/decoder.cpp | 91 +++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
- src/decoder.h | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
- src/decoder_ffmpeg.cpp | 94 +++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------
+ src/decoder.cpp | 91 +++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
+ src/decoder.h | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
+ src/decoder_ffmpeg.cpp | 94 +++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
 src/decoder_ffmpeg.h | 2 +-
- src/input.cpp | 34 ++++++++++++++--------------------
+ src/input.cpp | 34 ++++++++++++++-------------------
 src/input.h | 6 +++---
 src/player.cpp | 4 ++--
 src/player_equalizer.cpp | 16 ++++++++--------
 src/video_output.h | 2 +-
- src/video_output_opengl.cpp | 70 +++++++++++++++++++++++++++++++++++-----------------------------------
+ src/video_output_opengl.cpp | 70 +++++++++++++++++++++++++++++++++----------------------------------
 src/video_output_opengl.h | 6 +++---
- src/video_output_opengl_color.fs.glsl | 40 ++++++++++++++++++++--------------------
+ src/video_output_opengl_color.fs.glsl | 40 +++++++++++++++++++-------------------
 src/video_output_opengl_qt.cpp | 2 +-
 src/video_output_opengl_qt.h | 2 +-
 14 files changed, 240 insertions(+), 213 deletions(-)
@@ -9198,15 +9588,15 @@
 handling of the ITU-709 YUV variant (used by HD video) and of the JPEG YUV
 variant (which uses the full 0-255 range, in contrast to ITU-601).
 
- src/decoder.cpp | 52 +++++++++++++++++++++++-----
- src/decoder.h | 26 +++++++++++---
- src/decoder_ffmpeg.cpp | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
+ src/decoder.cpp | 52 ++++++++++++++++++----
+ src/decoder.h | 26 ++++++++---
+ src/decoder_ffmpeg.cpp | 150 +++++++++++++++++++++++++++++++++++++++++++++------------------
 src/decoder_ffmpeg.h | 3 +-
- src/input.cpp | 43 ++++++++++++++++++-----
- src/player_equalizer.cpp | 4 +--
- src/video_output_opengl.cpp | 211 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------
- src/video_output_opengl.h | 8 +++--
- src/video_output_opengl_color.fs.glsl | 31 +++++++++++------
+ src/input.cpp | 43 ++++++++++++++----
+ src/player_equalizer.cpp | 4 +-
+ src/video_output_opengl.cpp | 211 +++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------
+ src/video_output_opengl.h | 8 ++--
+ src/video_output_opengl_color.fs.glsl | 31 ++++++++-----
 9 files changed, 365 insertions(+), 163 deletions(-)
 
 commit eec7661847ad7920c85f7adfa309548184f95cd8
@@ -9510,16 +9900,16 @@
 The new version only copies the required data, not more. Also, it avoids
 reading beyond buffer boundaries for the even-odd-row input mode.
 
- src/decoder.cpp | 13 +++++++++++
+ src/decoder.cpp | 13 +++++++++
 src/decoder.h | 1 +
- src/input.cpp | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------
- src/input.h | 13 +++++++----
- src/player.cpp | 16 ++++++++++----
- src/player.h | 4 +---
+ src/input.cpp | 147 +++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------
+ src/input.h | 13 ++++++---
+ src/player.cpp | 16 ++++++++---
+ src/player.h | 4 +--
 src/player_equalizer.cpp | 2 +-
 src/player_qt.cpp | 2 +-
- src/video_output.h | 12 ++++++----
- src/video_output_opengl.cpp | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------
+ src/video_output.h | 12 ++++++---
+ src/video_output_opengl.cpp | 138 +++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
 src/video_output_opengl.h | 6 ++---
 11 files changed, 195 insertions(+), 159 deletions(-)
 
@@ -9827,7 +10217,7 @@
 
 Improve man page.
 
- doc/bino.1 | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------
+ doc/bino.1 | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
 1 file changed, 84 insertions(+), 55 deletions(-)
 
 commit 89122297e6cfd3d458306b3c92739bac8acd8964
@@ -9849,8 +10239,8 @@
 then for the file name, and only as a last resort for the resolution.
 
 src/decoder.h | 3 ++-
- src/decoder_ffmpeg.h | 5 +++++
- src/input.cpp | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
+ src/decoder_ffmpeg.h | 5 ++++
+ src/input.cpp | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------
 3 files changed, 121 insertions(+), 34 deletions(-)
 
 commit fe7181288edfca857e318b49e0d5a55bce15b118
@@ -9965,11 +10355,11 @@
 
 src/Makefile.am | 6 +-
 src/player_equalizer.cpp | 2 -
- src/video_output_opengl.cpp | 479 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
- src/video_output_opengl.fs.glsl | 236 -------------------------------------------------------
- src/video_output_opengl.h | 44 +++++++----
- src/video_output_opengl_color.fs.glsl | 92 ++++++++++++++++++++++
- src/video_output_opengl_render.fs.glsl | 180 ++++++++++++++++++++++++++++++++++++++++++
+ src/video_output_opengl.cpp | 479 ++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
+ src/video_output_opengl.fs.glsl | 236 -------------------------------------------
+ src/video_output_opengl.h | 44 +++++---
+ src/video_output_opengl_color.fs.glsl | 92 +++++++++++++++++
+ src/video_output_opengl_render.fs.glsl | 180 +++++++++++++++++++++++++++++++++
 7 files changed, 577 insertions(+), 462 deletions(-)
 
 commit c7aa104ddd38931c08e4a413e98d1f4c6f64aace
@@ -9990,10 +10380,10 @@
 Remove all workarounds for OpenGL implementations that do not meet these
 minimum requirements.
 
- src/player_equalizer.cpp | 23 +++----
- src/video_output_opengl.cpp | 451 ++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------
- src/video_output_opengl.h | 23 ++++---
- src/video_output_opengl_qt.cpp | 12 ++--
+ src/player_equalizer.cpp | 23 +++--
+ src/video_output_opengl.cpp | 451 ++++++++++++++++++++++++++----------------------------------------------------------------------
+ src/video_output_opengl.h | 23 +++--
+ src/video_output_opengl_qt.cpp | 12 +--
 4 files changed, 152 insertions(+), 357 deletions(-)
 
 commit cb4b4dc3fe2ef6f15847ecfd26ca2891ed68d5a7
@@ -10093,10 +10483,10 @@
 
 Fix and cleanup the masking output modes.
 
- src/player_qt.cpp | 39 ++++++++++++++++++++-------------------
+ src/player_qt.cpp | 39 +++++++++++++++++++------------------
 src/player_qt.h | 3 ++-
- src/video_output_opengl_qt.cpp | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
- src/video_output_opengl_qt.h | 42 ++++++++++++++++++++++++++++++++++--------
+ src/video_output_opengl_qt.cpp | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------
+ src/video_output_opengl_qt.h | 42 ++++++++++++++++++++++++++++++++--------
 4 files changed, 119 insertions(+), 66 deletions(-)
 
 commit 0c3c8a13147a565717aac57e73c9f3ed56246a69
@@ -10291,10 +10681,10 @@
 
 This simplifies things, avoids several ugly hacks, and fixes fullscreen mode on Windows.
 
- src/player_qt.cpp | 30 +++++++++++++-----------------
+ src/player_qt.cpp | 30 ++++++++++++----------------
 src/player_qt.h | 4 +---
- src/video_output_opengl_qt.cpp | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
- src/video_output_opengl_qt.h | 11 +++++++----
+ src/video_output_opengl_qt.cpp | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------
+ src/video_output_opengl_qt.h | 11 ++++++----
 4 files changed, 79 insertions(+), 71 deletions(-)
 
 commit 5acc2af7f3fb1734ad4a4f35b2c084a8a0102ca8
@@ -10428,8 +10818,8 @@
 
 doc/Makefile.am | 2 +-
 doc/multi-display-rotated.jpg | Bin 0 -> 24928 bytes
- doc/multi-display.txt | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/player_equalizer.cpp | 8 ++++++++
+ doc/multi-display.txt | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/player_equalizer.cpp | 8 +++++++
 4 files changed, 122 insertions(+), 1 deletion(-)
 
 commit 6e40db3e5dbd0c5749220941258ae8b1fb2280c5
@@ -10462,8 +10852,8 @@
 
 document equalizer-3d mode
 
- doc/multi-display.txt | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/player_equalizer.cpp | 8 ++++++++
+ doc/multi-display.txt | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/player_equalizer.cpp | 8 +++++++
 2 files changed, 125 insertions(+)
 
 commit d1c3e84f6fcf4e876de07fd79e8d466997848614
@@ -10496,10 +10886,10 @@
 The new ouput mode 'equalizer-3d' allows to configure non-planar projections.
 
 doc/bino.1 | 4 ++-
- doc/multi-display.txt | 8 ++++++
- src/main.cpp | 19 +++++++++++---
- src/player_equalizer.cpp | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------
- src/player_equalizer.h | 24 +++++++++++++++++-
+ doc/multi-display.txt | 8 +++++
+ src/main.cpp | 19 +++++++++---
+ src/player_equalizer.cpp | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
+ src/player_equalizer.h | 24 +++++++++++++-
 5 files changed, 190 insertions(+), 39 deletions(-)
 
 commit 4c6ad07681db44c4bfb415953baaba43458be64a
@@ -10587,7 +10977,7 @@
 Merge branch 'master' of git://git.savannah.nongnu.org/bino
 
 Conflicts:
- 	src/video_output_opengl_qt.cpp
+ src/video_output_opengl_qt.cpp
 
 commit a5319c19718b35c6e61b06b84b84c8060c10ee4d
 Author: Stefan Eilemann <eilemann@gmail.com>
@@ -10875,8 +11265,8 @@
 
 configure.ac | 2 +-
 doc/Makefile.am | 1 +
- doc/bino.1 | 27 ++++++++++++++++++++-
- doc/multi-display.txt | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ doc/bino.1 | 27 ++++++++++++++++-
+ doc/multi-display.txt | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 198 insertions(+), 2 deletions(-)
 
 commit c201c0b871e09c2fabbbe37f465d2f05e0996b0f
@@ -10937,11 +11327,11 @@
 
 GUI: use names instead of enum values to store input and output modes.
 
- src/input.cpp | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/input.cpp | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/input.h | 2 ++
- src/main.cpp | 104 ++++++++++++++++++------------------------------------------------------------------------------------
- src/player_qt.cpp | 23 +++++++++++++----------
- src/video_output.cpp | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/main.cpp | 104 +++++++++++++++---------------------------------------------------------------------
+ src/player_qt.cpp | 23 ++++++++++---------
+ src/video_output.cpp | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/video_output.h | 5 ++++-
 6 files changed, 250 insertions(+), 97 deletions(-)
 
@@ -10962,8 +11352,8 @@
 
 Remember the last video directory and the last 2D and 3D output modes.
 
- src/player_qt.cpp | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
- src/player_qt.h | 26 ++++++++++++++++++--------
+ src/player_qt.cpp | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
+ src/player_qt.h | 26 ++++++++++++++++-------
 2 files changed, 109 insertions(+), 41 deletions(-)
 
 commit 0ba0570e5947258eec5762bec0375ac5f0093615
@@ -10981,8 +11371,8 @@
 
 Equalizer: various cleanups.
 
- src/player_equalizer.cpp | 245 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------
- src/player_equalizer.h | 2 --
+ src/player_equalizer.cpp | 245 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------
+ src/player_equalizer.h | 2 -
 2 files changed, 126 insertions(+), 121 deletions(-)
 
 commit 2b21e9a7cd1aedc380f85af756f6fff9e9113861
@@ -11026,21 +11416,21 @@
 
 For even-odd-rows: [0 1 0]
 [0 2 0]
- 		 [0 1 0]
+ [0 1 0]
 
 For even-odd-columns: [0 0 0]
 [1 2 1]
- 		 [0 0 0]
+ [0 0 0]
 
 For checkerboard: [0 1 0]
 [1 4 1]
- 		 [0 1 0]
+ [0 1 0]
 
 As a side effect, the masking modes now work again with the free ATI drivers on
 Linux.
 
- src/video_output_opengl.cpp | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
- src/video_output_opengl.fs.glsl | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
+ src/video_output_opengl.cpp | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------
+ src/video_output_opengl.fs.glsl | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------
 src/video_output_opengl.h | 1 +
 3 files changed, 221 insertions(+), 64 deletions(-)
 
@@ -11132,9 +11522,9 @@
 
 Equalizer: handle keyboard events.
 
- src/player.cpp | 40 +++++++++++++++++++++-------------------
+ src/player.cpp | 40 +++++++++++++++++++-----------------
 src/player.h | 5 +++--
- src/player_equalizer.cpp | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
+ src/player_equalizer.cpp | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 src/player_qt.cpp | 3 ++-
 4 files changed, 135 insertions(+), 26 deletions(-)
 
@@ -11297,11 +11687,11 @@
 
 The idea came from http://stereogl.sourceforge.net/ via Frédéric Devernay.
 
- src/player_equalizer.cpp | 2 ++
- src/video_output_opengl.cpp | 191 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
+ src/player_equalizer.cpp | 2 +
+ src/video_output_opengl.cpp | 191 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------
 src/video_output_opengl.h | 3 ++
- src/video_output_opengl_qt.cpp | 35 +++++++++++++++-------
- src/video_output_opengl_qt.h | 5 ++++
+ src/video_output_opengl_qt.cpp | 35 ++++++++++++------
+ src/video_output_opengl_qt.h | 5 +++
 5 files changed, 169 insertions(+), 67 deletions(-)
 
 commit b600453f99013deb98a907302a02eaeac6c4d773
@@ -11712,44 +12102,43 @@
 
 doc/bino.1 | 11 +-
 src/Makefile.am | 16 ++-
- src/appicon.png | Bin 3657 -> 0 bytes
- src/controller.cpp | 14 +++
- src/controller.h | 14 ++-
- src/gui.cpp | 210 ---------------------------------
- src/gui.h | 88 --------------
- src/icons/README | 14 +++
- src/icons/appicon.png | Bin 0 -> 3657 bytes
- src/icons/b.ipe | 402 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/controller.cpp | 14 ++
+ src/controller.h | 14 +-
+ src/gui.cpp | 210 ---------------------------
+ src/gui.h | 88 ------------
+ src/icons/README | 14 ++
+ src/{ => icons}/appicon.png | Bin
+ src/icons/b.ipe | 402 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/icons/b.png | Bin 0 -> 579 bytes
- src/icons/bb.ipe | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons/bb.ipe | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/icons/bb.png | Bin 0 -> 826 bytes
- src/icons/bbb.ipe | 414 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons/bbb.ipe | 414 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/icons/bbb.png | Bin 0 -> 1066 bytes
- src/icons/f.ipe | 402 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons/f.ipe | 402 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/icons/f.png | Bin 0 -> 583 bytes
- src/icons/ff.ipe | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons/ff.ipe | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/icons/ff.png | Bin 0 -> 814 bytes
- src/icons/fff.ipe | 414 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons/fff.ipe | 414 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/icons/fff.png | Bin 0 -> 1024 bytes
- src/icons/pause.ipe | 410 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons/pause.ipe | 410 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/icons/pause.png | Bin 0 -> 571 bytes
- src/icons/play.ipe | 402 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons/play.ipe | 402 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/icons/play.png | Bin 0 -> 709 bytes
- src/icons/stop.ipe | 403 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/icons/stop.ipe | 403 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/icons/stop.png | Bin 0 -> 417 bytes
 src/main.cpp | 17 +--
- src/player.cpp | 77 ++++++++----
+ src/player.cpp | 77 +++++++---
 src/player.h | 24 +++-
 src/player_equalizer.cpp | 4 +-
- src/player_qt.cpp | 760 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/player_qt.h | 173 +++++++++++++++++++++++++++
+ src/player_qt.cpp | 760 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/player_qt.h | 173 ++++++++++++++++++++++
 src/qt_resources.qrc | 11 +-
 src/video_output.h | 3 +
- src/video_output_opengl.cpp | 82 ++++++-------
- src/video_output_opengl.h | 23 +++-
- src/video_output_opengl_qt.cpp | 97 +++++++++++++---
- src/video_output_opengl_qt.h | 20 +++-
- 39 files changed, 4913 insertions(+), 408 deletions(-)
+ src/video_output_opengl.cpp | 82 ++++++-----
+ src/video_output_opengl.h | 23 ++-
+ src/video_output_opengl_qt.cpp | 97 ++++++++++---
+ src/video_output_opengl_qt.h | 20 ++-
+ 38 files changed, 4913 insertions(+), 408 deletions(-)
 
 commit 7741c5a76e78060a6f7d84a7876166a264e6be54
 Author: Martin Lambers <marlam@marlam.de>
@@ -11759,13 +12148,13 @@
 
 src/Makefile.am | 5 +++
 src/appicon.png | Bin 0 -> 3657 bytes
- src/gui.cpp | 210 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/gui.h | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++
- src/main.cpp | 11 +++++--
- src/qt_app.cpp | 9 ++++++
+ src/gui.cpp | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/gui.h | 88 ++++++++++++++++++++++++++++++++++++++++
+ src/main.cpp | 11 ++++-
+ src/qt_app.cpp | 9 +++++
 src/qt_app.h | 1 +
 src/qt_resources.qrc | 5 +++
- src/video_output_opengl_qt.cpp | 6 ++--
+ src/video_output_opengl_qt.cpp | 6 ++-
 src/video_output_opengl_qt.h | 1 +
 10 files changed, 332 insertions(+), 4 deletions(-)
 
@@ -11800,12 +12189,12 @@
 With the free ATI r600 driver, it currently leads to a factor 2 slowdown
 instead, but this is something that will probably be fixed some day.
 
- src/decoder_ffmpeg.cpp | 10 +++---
+ src/decoder_ffmpeg.cpp | 10 ++---
 src/input.cpp | 2 +-
- src/player_equalizer.cpp | 8 +++--
+ src/player_equalizer.cpp | 8 ++--
 src/video_frame_format.h | 2 +-
- src/video_output_opengl.cpp | 229 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------
- src/video_output_opengl.fs.glsl | 10 +++---
+ src/video_output_opengl.cpp | 229 ++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------
+ src/video_output_opengl.fs.glsl | 10 ++---
 src/video_output_opengl.h | 3 +-
 src/video_output_opengl_qt.cpp | 1 +
 8 files changed, 122 insertions(+), 143 deletions(-)
@@ -11825,8 +12214,8 @@
 
 Remove the unused freeglut implementation of video_output_opengl.
 
- src/video_output_opengl_freeglut.cpp | 345 -----------------------------------------------------------------------------------------------------------------
- src/video_output_opengl_freeglut.h | 62 ---------------------
+ src/video_output_opengl_freeglut.cpp | 345 ------------------------------------------------------------------------------------------
+ src/video_output_opengl_freeglut.h | 62 ----------------
 2 files changed, 407 deletions(-)
 
 commit ef6c6ead7e8cd293567d61ba8deec8829f561c83
@@ -11835,14 +12224,14 @@
 
 Replace freeglut with Qt's QGLWidget.
 
- configure.ac | 41 ++++++++-------
- src/Makefile.am | 23 +++++++--
+ configure.ac | 41 ++++++------
+ src/Makefile.am | 23 +++++--
 src/player.cpp | 4 +-
- src/video_output_opengl.cpp | 54 +++++++++++++++++--
- src/video_output_opengl.h | 8 +--
- src/video_output_opengl_freeglut.cpp | 63 ++--------------------
- src/video_output_opengl_qt.cpp | 322 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/video_output_opengl_qt.h | 83 +++++++++++++++++++++++++++++
+ src/video_output_opengl.cpp | 54 +++++++++++++--
+ src/video_output_opengl.h | 8 ++-
+ src/video_output_opengl_freeglut.cpp | 63 ++----------------
+ src/video_output_opengl_qt.cpp | 322 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/video_output_opengl_qt.h | 83 +++++++++++++++++++++++
 8 files changed, 507 insertions(+), 91 deletions(-)
 
 commit dcab76201f0ad37adaddbec1b12ebe168d15d821
@@ -11864,23 +12253,23 @@
 
 This does not currently work and is disabled by default.
 
- configure.ac | 36 ++++--
- src/Makefile.am | 7 ++
+ configure.ac | 36 +++--
+ src/Makefile.am | 7 +
 src/base/Makefile.am | 4 +
- src/base/s11n.cpp | 235 +++++++++++++++++++++++++++++++++++++
- src/base/s11n.h | 152 ++++++++++++++++++++++++
+ src/base/s11n.cpp | 235 ++++++++++++++++++++++++++++++
+ src/base/s11n.h | 152 +++++++++++++++++++
 src/input.h | 5 +
- src/main.cpp | 397 +++++++++++++++++++++++++--------------------------------------
- src/player.cpp | 571 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
- src/player.h | 77 +++++++++++--
- src/player_equalizer.cpp | 715 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/player_equalizer.h | 23 ++++
+ src/main.cpp | 397 ++++++++++++++++++++------------------------------
+ src/player.cpp | 571 +++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
+ src/player.h | 77 ++++++++--
+ src/player_equalizer.cpp | 715 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/player_equalizer.h | 23 +++
 src/video_output.cpp | 11 ++
- src/video_output.h | 28 +++--
- src/video_output_opengl.cpp | 423 +++++++++----------------------------------------------------------
- src/video_output_opengl.h | 58 ++++++----
- src/video_output_opengl_freeglut.cpp | 398 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/video_output_opengl_freeglut.h | 62 ++++++++++
+ src/video_output.h | 28 ++--
+ src/video_output_opengl.cpp | 423 +++++++----------------------------------------------
+ src/video_output_opengl.h | 58 +++++---
+ src/video_output_opengl_freeglut.cpp | 398 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/video_output_opengl_freeglut.h | 62 ++++++++
 src/xgl.h | 2 +-
 18 files changed, 2363 insertions(+), 841 deletions(-)
 
@@ -12028,8 +12417,8 @@
 
 Support OpenGL implementations that do not support non-power-of-two textures.
 
- src/video_output_opengl.cpp | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------
- src/video_output_opengl.h | 4 ++++
+ src/video_output_opengl.cpp | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
+ src/video_output_opengl.h | 4 +++
 2 files changed, 120 insertions(+), 34 deletions(-)
 
 commit f9bcd2131e5fcd43de68d45d5bdfc66b6fbfb2b5
@@ -12115,18 +12504,18 @@
 fall back to software conversion to rgb24.
 
 src/Makefile.am | 1 +
- src/decoder.h | 23 ++++---
- src/decoder_ffmpeg.cpp | 54 +++++++++++-----
+ src/decoder.h | 23 +++---
+ src/decoder_ffmpeg.cpp | 54 +++++++++----
 src/decoder_ffmpeg.h | 6 +-
- src/input.cpp | 183 ++++++++++++++++++++++++++++++-----------------------
- src/input.h | 14 +++--
+ src/input.cpp | 183 ++++++++++++++++++++++++-------------------
+ src/input.h | 14 +++-
 src/main.cpp | 1 +
- src/player.cpp | 43 +++++--------
- src/video_frame_format.h | 29 +++++++++
+ src/player.cpp | 43 ++++------
+ src/video_frame_format.h | 29 +++++++
 src/video_output.h | 9 ++-
- src/video_output_opengl.cpp | 407 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
- src/video_output_opengl.fs.glsl | 278 ++++++++++++++++++++++++++++++++++++--------------------------------------------
- src/video_output_opengl.h | 16 ++++-
+ src/video_output_opengl.cpp | 407 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
+ src/video_output_opengl.fs.glsl | 278 +++++++++++++++++++++++++++++------------------------------------
+ src/video_output_opengl.h | 16 +++-
 13 files changed, 618 insertions(+), 446 deletions(-)
 
 commit 41cee5622973cb8ba3b28a449f93d281ea22cd9d
@@ -12155,57 +12544,57 @@
 
 .gitignore | 7 +
 AUTHORS | 1 +
- COPYING | 674 +++++++++++++++++++++++++++++++++++++++++++++++
+ COPYING | 674 ++++++++++++++++++++++++++++++++++++++
 ChangeLog | 3 +
- INSTALL | 365 ++++++++++++++++++++++++++
+ INSTALL | 365 +++++++++++++++++++++
 Makefile.am | 19 ++
 NEWS | 0
 README | 0
- build-aux/config.guess | 1533 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- build-aux/config.rpath | 672 +++++++++++++++++++++++++++++++++++++++++++++++
- build-aux/config.sub | 1693 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- build-aux/depcomp | 630 ++++++++++++++++++++++++++++++++++++++++++++
- build-aux/install-sh | 520 ++++++++++++++++++++++++++++++++++++
- build-aux/missing | 376 ++++++++++++++++++++++++++
- configure.ac | 100 +++++++
+ build-aux/config.guess | 1533 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ build-aux/config.rpath | 672 +++++++++++++++++++++++++++++++++++++
+ build-aux/config.sub | 1693 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ build-aux/depcomp | 630 +++++++++++++++++++++++++++++++++++
+ build-aux/install-sh | 520 +++++++++++++++++++++++++++++
+ build-aux/missing | 376 +++++++++++++++++++++
+ configure.ac | 100 ++++++
 doc/Makefile.am | 2 +
- doc/bino.1 | 91 +++++++
- src/Makefile.am | 54 ++++
- src/audio_output.cpp | 31 +++
- src/audio_output.h | 67 +++++
- src/audio_output_openal.cpp | 311 ++++++++++++++++++++++
- src/audio_output_openal.h | 71 +++++
- src/base/Makefile.am | 16 ++
- src/base/blob.h | 167 ++++++++++++
- src/base/debug.cpp | 137 ++++++++++
- src/base/debug.h | 50 ++++
- src/base/exc.cpp | 124 +++++++++
- src/base/exc.h | 77 ++++++
- src/base/intcheck.h | 208 +++++++++++++++
- src/base/msg.cpp | 472 +++++++++++++++++++++++++++++++++
- src/base/msg.h | 99 +++++++
- src/base/opt.cpp | 259 ++++++++++++++++++
- src/base/opt.h | 655 +++++++++++++++++++++++++++++++++++++++++++++
- src/base/str.cpp | 411 +++++++++++++++++++++++++++++
- src/base/str.h | 102 +++++++
- src/base/timer.cpp | 52 ++++
- src/base/timer.h | 53 ++++
- src/controller.cpp | 52 ++++
- src/controller.h | 120 +++++++++
+ doc/bino.1 | 91 +++++
+ src/Makefile.am | 54 +++
+ src/audio_output.cpp | 31 ++
+ src/audio_output.h | 67 ++++
+ src/audio_output_openal.cpp | 311 ++++++++++++++++++
+ src/audio_output_openal.h | 71 ++++
+ src/base/Makefile.am | 16 +
+ src/base/blob.h | 167 ++++++++++
+ src/base/debug.cpp | 137 ++++++++
+ src/base/debug.h | 50 +++
+ src/base/exc.cpp | 124 +++++++
+ src/base/exc.h | 77 +++++
+ src/base/intcheck.h | 208 ++++++++++++
+ src/base/msg.cpp | 472 ++++++++++++++++++++++++++
+ src/base/msg.h | 99 ++++++
+ src/base/opt.cpp | 259 +++++++++++++++
+ src/base/opt.h | 655 ++++++++++++++++++++++++++++++++++++
+ src/base/str.cpp | 411 +++++++++++++++++++++++
+ src/base/str.h | 102 ++++++
+ src/base/timer.cpp | 52 +++
+ src/base/timer.h | 53 +++
+ src/controller.cpp | 52 +++
+ src/controller.h | 120 +++++++
 src/decoder.cpp | 57 ++++
- src/decoder.h | 120 +++++++++
- src/decoder_ffmpeg.cpp | 744 +++++++++++++++++++++++++++++++++++++++++++++++++++
- src/decoder_ffmpeg.h | 73 ++++++
- src/input.cpp | 391 +++++++++++++++++++++++++++
- src/input.h | 140 ++++++++++
- src/main.cpp | 421 +++++++++++++++++++++++++++++
- src/player.cpp | 355 +++++++++++++++++++++++++
- src/player.h | 73 ++++++
- src/video_output.cpp | 31 +++
- src/video_output.h | 89 +++++++
- src/video_output_opengl.cpp | 753 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/video_output_opengl.fs.glsl | 192 ++++++++++++++
- src/video_output_opengl.h | 84 ++++++
- src/xgl.cpp | 412 +++++++++++++++++++++++++++++
- src/xgl.h | 161 ++++++++++++
+ src/decoder.h | 120 +++++++
+ src/decoder_ffmpeg.cpp | 744 +++++++++++++++++++++++++++++++++++++++++
+ src/decoder_ffmpeg.h | 73 +++++
+ src/input.cpp | 391 ++++++++++++++++++++++
+ src/input.h | 140 ++++++++
+ src/main.cpp | 421 ++++++++++++++++++++++++
+ src/player.cpp | 355 ++++++++++++++++++++
+ src/player.h | 73 +++++
+ src/video_output.cpp | 31 ++
+ src/video_output.h | 89 +++++
+ src/video_output_opengl.cpp | 753 ++++++++++++++++++++++++++++++++++++++++++
+ src/video_output_opengl.fs.glsl | 192 +++++++++++
+ src/video_output_opengl.h | 84 +++++
+ src/xgl.cpp | 412 +++++++++++++++++++++++
+ src/xgl.h | 161 +++++++++
 55 files changed, 14370 insertions(+)

bino-1.6.1.tar.xz/Makefile.in -> bino-1.6.5.tar.xz/Makefile.in Changed

bino-1.6.1.tar.xz/NEWS -> bino-1.6.5.tar.xz/NEWS Changed

bino-1.6.1.tar.xz/README.Windows -> bino-1.6.5.tar.xz/README.Windows Changed

bino-1.6.1.tar.xz/aclocal.m4 -> bino-1.6.5.tar.xz/aclocal.m4 Changed

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,19 +20,19 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# gettext.m4 serial 66 (gettext-0.18.2)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+# gettext.m4 serial 68 (gettext-0.19.8)
+dnl Copyright (C) 1995-2014, 2016 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.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:
@@ -183,13 +183,18 @@
 [AC_LANG_PROGRAM(
 [[
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 ]],
 [[
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 ]])],
 [eval "$gt_func_gnugettext_libc=yes"],
 [eval "$gt_func_gnugettext_libc=no"])])
@@ -215,17 +220,22 @@
 [AC_LANG_PROGRAM(
 [[
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 ]],
 [[
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 ]])],
 [eval "$gt_func_gnugettext_libintl=yes"],
 [eval "$gt_func_gnugettext_libintl=no"])
@@ -236,17 +246,22 @@
 [AC_LANG_PROGRAM(
 [[
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 ]],
 [[
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 ]])],
 [LIBINTL="$LIBINTL $LIBICONV"
 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
@@ -422,8 +437,12 @@
 dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
 AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
 
-# iconv.m4 serial 18 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
+
+dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
+
+# iconv.m4 serial 19 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2007-2014, 2016 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.
@@ -496,27 +515,33 @@
 if test $am_cv_lib_iconv = yes; then
 LIBS="$LIBS $LIBICONV"
 fi
- AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ am_cv_func_iconv_works=no
+ for ac_iconv_const in '' 'const'; do
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
 #include <iconv.h>
 #include <string.h>
-int main ()
-{
- int result = 0;
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+ ]],
+ [[int result = 0;
 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
 returns. */
 {
 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
 if (cd_utf8_to_88591 != (iconv_t)(-1))
 {
- static const char input[] = "\342\202\254"; /* EURO SIGN */
+ static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
 char buf[10];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_utf8_to_88591,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if (res == 0)
 result |= 1;
@@ -529,14 +554,14 @@
 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
 if (cd_ascii_to_88591 != (iconv_t)(-1))
 {
- static const char input[] = "\263";
+ static ICONV_CONST char input[] = "\263";
 char buf[10];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_ascii_to_88591,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if (res == 0)
 result |= 2;
@@ -548,14 +573,14 @@
 iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
 if (cd_88591_to_utf8 != (iconv_t)(-1))
 {
- static const char input[] = "\304";
+ static ICONV_CONST char input[] = "\304";
 static char buf[2] = { (char)0xDE, (char)0xAD };
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = 1;
 char *outptr = buf;
 size_t outbytesleft = 1;
 size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
 result |= 4;
@@ -568,14 +593,14 @@
 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
 if (cd_88591_to_utf8 != (iconv_t)(-1))
 {
- static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+ static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
 char buf[50];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if ((int)res > 0)
 result |= 8;
@@ -595,17 +620,14 @@
 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
 result |= 16;
 return result;
-}]])],
- [am_cv_func_iconv_works=yes],
- [am_cv_func_iconv_works=no],
- [
-changequote(,)dnl
- case "$host_os" in
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
- *) am_cv_func_iconv_works="guessing yes" ;;
- esac
-changequote([,])dnl
- ])
+]])],
+ [am_cv_func_iconv_works=yes], ,
+ [case "$host_os" in
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac])
+ test "$am_cv_func_iconv_works" = no || break
+ done
 LIBS="$am_save_LIBS"
 ])
 case "$am_cv_func_iconv_works" in
@@ -692,18 +714,18 @@
 ])
 
 # intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014, 2016 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.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Checks for special options needed on Mac OS X.
@@ -749,7 +771,7 @@
 ])
 
 # lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2009-2016 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 +891,7 @@
 ])
 
 # lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2016 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 +1669,7 @@
 ])
 
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2016 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,19 +1894,19 @@
 ])
 
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl 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.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:
@@ -1904,32 +1926,63 @@
 AC_SUBST([USE_NLS])
 ])
 
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+ [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -1951,18 +2004,19 @@
 		PKG_CONFIG=""
 	fi
 fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG
 
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
@@ -1972,8 +2026,10 @@
 $3])dnl
 fi])
 
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
 m4_define([_PKG_CONFIG],
 [if test -n "$$1"; then
 pkg_cv_[]$1="$$1"
@@ -1985,10 +2041,11 @@
 else
 pkg_failed=untried
 fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
 
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -1996,19 +2053,17 @@
 else
 _pkg_short_errors_supported=no
 fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
 
 
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 AC_DEFUN([PKG_CHECK_MODULES],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@@ -2062,16 +2117,40 @@
 AC_MSG_RESULT([yes])
 	$3
 fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
 
 
-# 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.
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
 AC_DEFUN([PKG_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -2082,16 +2161,18 @@
 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])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.
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
 AC_DEFUN([PKG_NOARCH_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -2102,13 +2183,15 @@
 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])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.
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl 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
@@ -2117,21 +2200,21 @@
 AS_VAR_COPY([$1], [pkg_cv_][$1])
 
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
+])dnl PKG_CHECK_VAR
 
-# po.m4 serial 22 (gettext-0.19)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+# po.m4 serial 24 (gettext-0.19)
+dnl Copyright (C) 1995-2014, 2016 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.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:
@@ -2574,18 +2657,18 @@
 ])
 
 # progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2005, 2008-2016 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.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:
@@ -2665,7 +2748,7 @@
 AC_SUBST([$1])dnl
 ])
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2677,10 +2760,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
 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.1], [],
+m4_if([$1], [1.15], [],
 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -2696,14 +2779,14 @@
 # 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.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2748,15 +2831,14 @@
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2787,7 +2869,7 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2978,7 +3060,7 @@
 
 # Generate code to set up dependency tracking. -*- Autoconf -*-
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3054,7 +3136,7 @@
 
 # Do all the work for Automake. -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3144,8 +3226,8 @@
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -3219,6 +3301,9 @@
 AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
 fi
 fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 ])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
@@ -3248,7 +3333,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3259,7 +3344,7 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
 case $am_aux_dir in
 *\ * | *\	*)
 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3269,7 +3354,7 @@
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3290,7 +3375,7 @@
 
 # Check to see how 'make' treats includes.	 -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3340,7 +3425,7 @@
 
 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3379,7 +3464,7 @@
 
 # Helper functions for option handling. -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3408,7 +3493,7 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3455,7 +3540,7 @@
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3474,7 +3559,7 @@
 
 # Check to make sure that the build environment is sane. -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3555,7 +3640,7 @@
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3615,7 +3700,7 @@
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3643,7 +3728,7 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3662,7 +3747,7 @@
 
 # Check how to create a tarball. -*- Autoconf -*-
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

bino-1.6.1.tar.xz/build-aux/compile -> bino-1.6.5.tar.xz/build-aux/compile Changed

bino-1.6.1.tar.xz/build-aux/config.guess -> bino-1.6.5.tar.xz/build-aux/config.guess Changed

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2014-03-23'
+timestamp='2016-10-02'
 
 # 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
@@ -24,12 +24,12 @@
 # program. This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2016 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."
@@ -168,19 +168,29 @@
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name. We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	 /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	 /sbin/$sysctl 2>/dev/null || \
+	 /usr/sbin/$sysctl 2>/dev/null || \
+	 echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	 armeb) machine=armeb-unknown ;;
 	 arm*) machine=arm-unknown ;;
 	 sh3el) machine=shl-unknown ;;
 	 sh3eb) machine=sh-unknown ;;
 	 sh5el) machine=sh5le-unknown ;;
+	 earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e$armv[0-9]$.*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*$eb$$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
 	 *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
+	 earm*)
+		os=netbsdelf
+		;;
 	 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -197,6 +207,13 @@
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	 earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@@ -207,13 +224,13 @@
 		release='-gnu'
 		;;
 	 *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "${machine}-${os}${release}${abi}"
 	exit ;;
 *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -223,6 +240,10 @@
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+ *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
 *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -235,6 +256,9 @@
 *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
+ *:Sortix:*:*)
+	echo ${UNAME_MACHINE}-unknown-sortix
+	exit ;;
 alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -251,42 +275,42 @@
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha $.*$ processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	 "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	 "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	 "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	 "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	 "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	 "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	 "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	 "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	 "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	 "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	 "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	 "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	 "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	 "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	 "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -359,16 +383,16 @@
 	exit ;;
 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 	 if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	 then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	 fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -393,7 +417,7 @@
 	exit ;;
 sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	 sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -579,8 +603,9 @@
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			 awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -617,13 +642,13 @@
 		 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		 case "${sc_cpu_version}" in
-		 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		 532) # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			 32) HP_ARCH="hppa2.0n" ;;
-			 64) HP_ARCH="hppa2.0w" ;;
-			 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
+			 32) HP_ARCH=hppa2.0n ;;
+			 64) HP_ARCH=hppa2.0w ;;
+			 '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
 			esac ;;
 		 esac
 		fi
@@ -662,11 +687,11 @@
 		 exit (0);
 		}
 EOF
-		 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		 (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		 test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if [ ${HP_ARCH} = hppa2.0w ]
 	then
 	 eval $set_cc_for_build
 
@@ -679,12 +704,12 @@
 	 # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	 # => hppa64-hp-hpux11.23
 
-	 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	 if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	 then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	 else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	 fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -789,14 +814,14 @@
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
 5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -878,7 +903,7 @@
 	exit ;;
 *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
 i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -901,7 +926,7 @@
 	 EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 arc:Linux:*:* | arceb:Linux:*:*)
@@ -932,6 +957,9 @@
 crisv32:Linux:*:*)
 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
+ e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
 frv:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -944,6 +972,9 @@
 ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+ k1om:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
 m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -969,6 +1000,9 @@
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+ mips64el:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
 openrisc*:Linux:*:*)
 	echo or1k-unknown-linux-${LIBC}
 	exit ;;
@@ -1001,6 +1035,9 @@
 ppcle:Linux:*:*)
 	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
+ riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
 s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
@@ -1020,7 +1057,7 @@
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
 x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
 xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1099,7 +1136,7 @@
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
@@ -1248,6 +1285,9 @@
 SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
+ SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
 Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1261,9 +1301,9 @@
 	 UNAME_PROCESSOR=powerpc
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; 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) | \
+		 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		 grep IS_64BIT_ARCH >/dev/null
 		then
 		 case $UNAME_PROCESSOR in
@@ -1285,7 +1325,7 @@
 	exit ;;
 *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1316,7 +1356,7 @@
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	 UNAME_MACHINE=i386
 	else
 	 UNAME_MACHINE="$cputype"
@@ -1358,7 +1398,7 @@
 	echo i386-pc-xenix
 	exit ;;
 i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
 	exit ;;
 i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1369,23 +1409,25 @@
 x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
+ amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
+	exit ;;
 esac
 
 cat >&2 <<EOF
 $0: unable to guess system type
 
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite
+config.guess and config.sub with the latest versions from:
 
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
 
 config.guess timestamp = $timestamp

bino-1.6.1.tar.xz/build-aux/config.sub -> bino-1.6.5.tar.xz/build-aux/config.sub Changed

bino-1.6.1.tar.xz/build-aux/depcomp -> bino-1.6.5.tar.xz/build-aux/depcomp Changed

bino-1.6.1.tar.xz/build-aux/install-sh -> bino-1.6.5.tar.xz/build-aux/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2014-09-12.12; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,19 +41,15 @@
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
+tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"
 
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
 
-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,17 +64,6 @@
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=
 
 # Desired mode of installed file.
@@ -97,7 +82,7 @@
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -137,46 +122,57 @@
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
     -o) chowncmd="$chownprog $2"
-	shift;;
+        shift;;
 
     -s) stripcmd=$stripprog;;
 
-    -t) dst_arg=$2
-	# Protect names problematic for 'test' and other utilities.
-	case $dst_arg in
-	  -* | [=!]) dst_arg=./$dst_arg;;
-	esac
-	shift;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
 
-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)	shift
-	break;;
+    --) shift
+        break;;
 
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -208,6 +204,15 @@
 fi
 
 if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
   trap "ret=130; $do_exit" 2
@@ -223,16 +228,16 @@
 
     *[0-7])
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw='% 200'
+        u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw=,u+rw
+        u_plus_rw=,u+rw
       fi
       cp_umask=$mode$u_plus_rw;;
   esac
@@ -269,41 +274,15 @@
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
       fi
       dstdir=$dst
       dst=$dstdir/`basename "$src"`
       dstdir_status=0
     else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X$//$[^/]' \| \
-	     X"$dst" : 'X$//$$' \| \
-	     X"$dst" : 'X$/$' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/\/$[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/\/$$/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/$.*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
+      dstdir=`dirname "$dst"`
       test -d "$dstdir"
       dstdir_status=$?
     fi
@@ -314,74 +293,81 @@
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            # $RANDOM is not portable (e.g. dash);  use it when possible to
+            # lower collision chance
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
+            # create the $tmpdir first (and fail if unsuccessful) to make sure
+            # that nobody tries to guess the $tmpdir name.
+            if (umask $mkdir_umask &&
+                $mkdirprog $mkdir_mode "$tmpdir" &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   test_tmpdir="$tmpdir/a"
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
     esac
 
     if
       $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )
     then :
     else
@@ -391,53 +377,51 @@
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix='/';;
-	[-=!]*) prefix='./';;
-	*)  prefix='';;
+        /*) prefix='/';;
+        [-=!]*) prefix='./';;
+        *)  prefix='';;
       esac
 
-      eval "$initialize_posix_glob"
-
       oIFS=$IFS
       IFS=/
-      $posix_glob set -f
+      set -f
       set fnord $dstdir
       shift
-      $posix_glob set +f
+      set +f
       IFS=$oIFS
 
       prefixes=
 
       for d
       do
-	test X"$d" = X && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
       fi
     fi
   fi
@@ -472,15 +456,12 @@
 
     # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
        set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
+       set +f &&
        test "$old" = "$new" &&
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     then
@@ -493,24 +474,24 @@
       # to itself, or perhaps because mv is so ancient that it does not
       # support -f.
       {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
       }
     fi || exit 1

bino-1.6.1.tar.xz/build-aux/mdate-sh -> bino-1.6.5.tar.xz/build-aux/mdate-sh Changed

bino-1.6.1.tar.xz/build-aux/missing -> bino-1.6.5.tar.xz/build-aux/missing Changed

bino-1.6.1.tar.xz/config.h.in -> bino-1.6.5.tar.xz/config.h.in Changed

@@ -44,23 +44,23 @@
 /* Have Equalizer? */
 #undef HAVE_LIBEQUALIZER
 
-/* Have liblircclient? */
-#undef HAVE_LIBLIRCCLIENT
-
 /* Have NVIDIA libXNVCtrl for Quadro SDI output? */
 #undef HAVE_LIBXNVCTRL
 
+/* Have lirc? */
+#undef HAVE_LIRC
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
 /* Define to 1 if you have the `nl_langinfo' function. */
 #undef HAVE_NL_LANGINFO
 
-/* Define to 1 if you have the <NVCtrlLib.h> header file. */
-#undef HAVE_NVCTRLLIB_H
+/* Define to 1 if you have the <NVCtrl/NVCtrlLib.h> header file. */
+#undef HAVE_NVCTRL_NVCTRLLIB_H
 
-/* Define to 1 if you have the <NVCtrl.h> header file. */
-#undef HAVE_NVCTRL_H
+/* Define to 1 if you have the <NVCtrl/NVCtrl.h> header file. */
+#undef HAVE_NVCTRL_NVCTRL_H
 
 /* Define to 1 if you have the `sigaction' function. */
 #undef HAVE_SIGACTION
@@ -104,8 +104,8 @@
 /* libass version */
 #undef LIBASS_PKGCONFIG_VERSION
 
-/* liblircclient version */
-#undef LIBLIRCCLIENT_PKGCONFIG_VERSION
+/* lirc version */
+#undef LIRC_PKGCONFIG_VERSION
 
 /* Define to 1 to disable assertions and other debugging checks. */
 #undef NDEBUG

bino-1.6.1.tar.xz/configure -> bino-1.6.5.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.6.1.
+# Generated by GNU Autoconf 2.69 for Bino 1.6.5.
 #
 # Report bugs to <bino-list@nongnu.org>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='Bino'
 PACKAGE_TARNAME='bino'
-PACKAGE_VERSION='1.6.1'
-PACKAGE_STRING='Bino 1.6.1'
+PACKAGE_VERSION='1.6.5'
+PACKAGE_STRING='Bino 1.6.5'
 PACKAGE_BUGREPORT='bino-list@nongnu.org'
 PACKAGE_URL='http://bino3d.org/'
 
@@ -629,10 +629,10 @@
 LIBOBJS
 UPDATE_DESKTOP_DATABASE
 GTK_UPDATE_ICON_CACHE
-HAVE_LIBLIRCCLIENT_FALSE
-HAVE_LIBLIRCCLIENT_TRUE
-liblircclient_LIBS
-liblircclient_CFLAGS
+HAVE_LIRC_FALSE
+HAVE_LIRC_TRUE
+lirc_LIBS
+lirc_CFLAGS
 libgl_LIBS
 libgl_CFLAGS
 HAVE_LIBXNVCTRL_FALSE
@@ -781,6 +781,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -815,7 +816,7 @@
 with_qt_version
 with_equalizer
 with_xnvctrl
-with_liblircclient
+with_lirc
 '
 ac_precious_vars='build_alias
 host_alias
@@ -857,8 +858,8 @@
 libglewmx_LIBS
 libgl_CFLAGS
 libgl_LIBS
-liblircclient_CFLAGS
-liblircclient_LIBS
+lirc_CFLAGS
+lirc_LIBS
 GTK_UPDATE_ICON_CACHE
 UPDATE_DESKTOP_DATABASE'
 
@@ -899,6 +900,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1151,6 +1153,15 @@
 | -silent | --silent | --silen | --sile | --sil)
 silent=yes ;;
 
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
 ac_prev=sbindir ;;
 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1288,7 +1299,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
 eval ac_val=\$$ac_var
 # Remove trailing slashes.
@@ -1401,7 +1412,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.6.1 to adapt to many kinds of systems.
+\`configure' configures Bino 1.6.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1441,6 +1452,7 @@
 --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
 --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
 --libdir=DIR object code libraries [EPREFIX/lib]
 --includedir=DIR C header files [PREFIX/include]
 --oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1472,7 +1484,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of Bino 1.6.1:";;
+ short | recursive ) echo "Configuration of Bino 1.6.5:";;
 esac
 cat <<\_ACEOF
 
@@ -1499,14 +1511,14 @@
 --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
+ --with-qt-version Choose Qt version. Currently 4 or 5; 5 is the
 default.
 --without-equalizer Disable multi-display support via Equalizer (enabled
 by default)
 --with-xnvctrl Enable NVIDIA Quadro SDI output (disabled by
 default)
- --without-liblircclient Disable remote control support via liblircclient
- (enabled by default)
+ --without-lirc Disable remote control support via lirc (enabled by
+ default)
 
 Some influential environment variables:
 CC C compiler command
@@ -1566,10 +1578,8 @@
 libgl_CFLAGS
 C compiler flags for libgl, overriding pkg-config
 libgl_LIBS linker flags for libgl, overriding pkg-config
- liblircclient_CFLAGS
- C compiler flags for liblircclient, overriding pkg-config
- liblircclient_LIBS
- linker flags for liblircclient, overriding pkg-config
+ lirc_CFLAGS C compiler flags for lirc, overriding pkg-config
+ lirc_LIBS linker flags for lirc, overriding pkg-config
 GTK_UPDATE_ICON_CACHE
 gtk-update-icon-cache command
 UPDATE_DESKTOP_DATABASE
@@ -1642,7 +1652,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-Bino configure 1.6.1
+Bino configure 1.6.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2409,7 +2419,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Bino $as_me 1.6.1, which was
+It was created by Bino $as_me 1.6.5, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
 $ $0 $@
@@ -2901,8 +2911,8 @@
 test "$program_prefix$program_suffix$program_transform_name" = \
 NONENONEs,x,x, &&
 program_prefix=${target_alias}-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4411,7 +4421,7 @@
 
 fi
 
-am__api_version='1.14'
+am__api_version='1.15'
 
 # Find a good install program. We prefer a C program (faster),
 # so one script is as good as another. But avoid the broken or
@@ -4600,7 +4610,7 @@
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
 case $am_aux_dir in
 *\ * | *\	*)
 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -4957,7 +4967,7 @@
 
 # Define the identity of the package.
 PACKAGE='bino'
- VERSION='1.6.1'
+ VERSION='1.6.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4991,8 +5001,8 @@
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility. Yes, it's still used
 # in the wild :-( We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
@@ -6341,6 +6351,110 @@
 #define HAVE_DECL_OPTRESET $ac_have_decl
 _ACEOF
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC atomic builtins" >&5
+$as_echo_n "checking for GCC atomic builtins... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+int b, x = 0; b = __sync_bool_compare_and_swap(&x, 0, 1);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ HAVE_GCC_ATOMIC_BUILTINS=1
+else
+ HAVE_GCC_ATOMIC_BUILTINS=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if test "$HAVE_GCC_ATOMIC_BUILTINS" = "1"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ as_fn_error $? "GCC atomic builtins not found. Please use a newer compiler." "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
+$as_echo_n "checking for library containing pthread_create... " >&6; }
+if ${ac_cv_search_pthread_create+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_create ();
+int
+main ()
+{
+return pthread_create ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' pthread; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_pthread_create=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_pthread_create+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search_pthread_create+:} false; then :
+
+else
+ ac_cv_search_pthread_create=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5
+$as_echo "$ac_cv_search_pthread_create" >&6; }
+ac_res=$ac_cv_search_pthread_create
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+CPPFLAGS_bak="$CPPFLAGS"
+LDFLAGS_bak="$LDFLAGS"
+CPPFLAGS="-pthread $CPPFLAGS"
+LDFLAGS="-pthread $LDFLAGS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ CPPFLAGS="$CPPFLAGS_bak"; LDFLAGS="$LDFLAGS_bak"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test "X$prefix" = "XNONE"; then
 acl_final_prefix="$ac_default_prefix"
@@ -7140,36 +7254,42 @@
 if test $am_cv_lib_iconv = yes; then
 LIBS="$LIBS $LIBICONV"
 fi
- if test "$cross_compiling" = yes; then :
-
- case "$host_os" in
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
- *) am_cv_func_iconv_works="guessing yes" ;;
- esac
-
+ am_cv_func_iconv_works=no
+ for ac_iconv_const in '' 'const'; do
+ if test "$cross_compiling" = yes; then :
+ case "$host_os" in
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 #include <iconv.h>
 #include <string.h>
-int main ()
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+
+int
+main ()
 {
- int result = 0;
+int result = 0;
 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
 returns. */
 {
 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
 if (cd_utf8_to_88591 != (iconv_t)(-1))
 {
- static const char input[] = "\342\202\254"; /* EURO SIGN */
+ static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
 char buf[10];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_utf8_to_88591,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if (res == 0)
 result |= 1;
@@ -7182,14 +7302,14 @@
 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
 if (cd_ascii_to_88591 != (iconv_t)(-1))
 {
- static const char input[] = "\263";
+ static ICONV_CONST char input[] = "\263";
 char buf[10];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_ascii_to_88591,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if (res == 0)
 result |= 2;
@@ -7201,14 +7321,14 @@
 iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
 if (cd_88591_to_utf8 != (iconv_t)(-1))
 {
- static const char input[] = "\304";
+ static ICONV_CONST char input[] = "\304";
 static char buf[2] = { (char)0xDE, (char)0xAD };
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = 1;
 char *outptr = buf;
 size_t outbytesleft = 1;
 size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
 result |= 4;
@@ -7221,14 +7341,14 @@
 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
 if (cd_88591_to_utf8 != (iconv_t)(-1))
 {
- static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+ static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
 char buf[50];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if ((int)res > 0)
 result |= 8;
@@ -7248,17 +7368,20 @@
 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
 result |= 16;
 return result;
+
+ ;
+ return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
 am_cv_func_iconv_works=yes
-else
- am_cv_func_iconv_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+ test "$am_cv_func_iconv_works" = no || break
+ done
 LIBS="$am_save_LIBS"
 
 fi
@@ -7353,110 +7476,6 @@
 fi
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC atomic builtins" >&5
-$as_echo_n "checking for GCC atomic builtins... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-int b, x = 0; b = __sync_bool_compare_and_swap(&x, 0, 1);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- HAVE_GCC_ATOMIC_BUILTINS=1
-else
- HAVE_GCC_ATOMIC_BUILTINS=0
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-if test "$HAVE_GCC_ATOMIC_BUILTINS" = "1"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "GCC atomic builtins not found. Please use a newer compiler." "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
-$as_echo_n "checking for library containing pthread_create... " >&6; }
-if ${ac_cv_search_pthread_create+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_create ();
-int
-main ()
-{
-return pthread_create ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' pthread; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_pthread_create=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_pthread_create+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_pthread_create+:} false; then :
-
-else
- ac_cv_search_pthread_create=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5
-$as_echo "$ac_cv_search_pthread_create" >&6; }
-ac_res=$ac_cv_search_pthread_create
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-CPPFLAGS_bak="$CPPFLAGS"
-LDFLAGS_bak="$LDFLAGS"
-CPPFLAGS="-pthread $CPPFLAGS"
-LDFLAGS="-pthread $LDFLAGS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- CPPFLAGS="$CPPFLAGS_bak"; LDFLAGS="$LDFLAGS_bak"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
 $as_echo_n "checking for library containing clock_gettime... " >&6; }
 if ${ac_cv_search_clock_gettime+:} false; then :
@@ -8051,16 +8070,21 @@
 /* end confdefs.h. */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
 ;
 return 0;
@@ -8180,36 +8204,42 @@
 if test $am_cv_lib_iconv = yes; then
 LIBS="$LIBS $LIBICONV"
 fi
- if test "$cross_compiling" = yes; then :
-
- case "$host_os" in
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
- *) am_cv_func_iconv_works="guessing yes" ;;
- esac
-
+ am_cv_func_iconv_works=no
+ for ac_iconv_const in '' 'const'; do
+ if test "$cross_compiling" = yes; then :
+ case "$host_os" in
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 #include <iconv.h>
 #include <string.h>
-int main ()
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+
+int
+main ()
 {
- int result = 0;
+int result = 0;
 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
 returns. */
 {
 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
 if (cd_utf8_to_88591 != (iconv_t)(-1))
 {
- static const char input[] = "\342\202\254"; /* EURO SIGN */
+ static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
 char buf[10];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_utf8_to_88591,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if (res == 0)
 result |= 1;
@@ -8222,14 +8252,14 @@
 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
 if (cd_ascii_to_88591 != (iconv_t)(-1))
 {
- static const char input[] = "\263";
+ static ICONV_CONST char input[] = "\263";
 char buf[10];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_ascii_to_88591,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if (res == 0)
 result |= 2;
@@ -8241,14 +8271,14 @@
 iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
 if (cd_88591_to_utf8 != (iconv_t)(-1))
 {
- static const char input[] = "\304";
+ static ICONV_CONST char input[] = "\304";
 static char buf[2] = { (char)0xDE, (char)0xAD };
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = 1;
 char *outptr = buf;
 size_t outbytesleft = 1;
 size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
 result |= 4;
@@ -8261,14 +8291,14 @@
 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
 if (cd_88591_to_utf8 != (iconv_t)(-1))
 {
- static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+ static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
 char buf[50];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if ((int)res > 0)
 result |= 8;
@@ -8288,17 +8318,20 @@
 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
 result |= 16;
 return result;
+
+ ;
+ return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
 am_cv_func_iconv_works=yes
-else
- am_cv_func_iconv_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+ test "$am_cv_func_iconv_works" = no || break
+ done
 LIBS="$am_save_LIBS"
 
 fi
@@ -8804,20 +8837,25 @@
 /* end confdefs.h. */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
 ;
 return 0;
@@ -8836,20 +8874,25 @@
 /* end confdefs.h. */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
 ;
 return 0;
@@ -9685,13 +9728,13 @@
 if test "${with_qt_version+set}" = set; then :
 withval=$with_qt_version; qt_version="$withval"
 else
- qt_version="4"
+ qt_version="5"
 fi
 
 if test "$qt_version" != "4" -a "$qt_version" != "5"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unknown Qt version requested, falling back to Qt 4." >&5
-$as_echo "$as_me: WARNING: unknown Qt version requested, falling back to Qt 4." >&2;}
- qt_version="4"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unknown Qt version requested, falling back to Qt 5." >&5
+$as_echo "$as_me: WARNING: unknown Qt version requested, falling back to Qt 5." >&2;}
+ qt_version="5"
 fi
 
 
@@ -10373,12 +10416,12 @@
 fi
 
 fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt needs -fPIE and -pie" >&5
-$as_echo_n "checking whether Qt needs -fPIE and -pie... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt needs -fPIC and -pie" >&5
+$as_echo_n "checking whether Qt needs -fPIC and -pie... " >&6; }
 if test -n "`$PKG_CONFIG --variable=qt_config Qt5Core | $GREP reduce_relocations`"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
- CXXFLAGS="$CXXFLAGS -fPIE"
+ CXXFLAGS="$CXXFLAGS -fPIC"
 LDFLAGS="$LDFLAGS -pie"
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -10614,7 +10657,7 @@
 CPPFLAGS_BAK="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $libX11_CFLAGS $xnvctrl_CFLAGS"
 
- for ac_header in NVCtrl.h NVCtrlLib.h
+ for ac_header in NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h
 do :
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <GL/glx.h>
@@ -10640,7 +10683,7 @@
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXNVCtrl $libX11_LIBS -lXext $LIBS"
+LIBS="-lXNVCtrl -lX11 -lXext $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
@@ -10682,8 +10725,8 @@
 if test "$HAVE_LIBXNVCTRL" != "1"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: optional library libXNVCtrl not found" >&5
 $as_echo "$as_me: WARNING: optional library libXNVCtrl not found" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libXNVCtrl is provided by NVIDIA; Ubuntu package: nvidia-settings" >&5
-$as_echo "$as_me: WARNING: libXNVCtrl is provided by NVIDIA; Ubuntu package: nvidia-settings" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libXNVCtrl is provided by NVIDIA; Debian package: libxnvctrl-dev" >&5
+$as_echo "$as_me: WARNING: libXNVCtrl is provided by NVIDIA; Debian package: libxnvctrl-dev" >&2;}
 xnvctrl="no"
 fi
 else
@@ -10775,11 +10818,11 @@
 	HAVE_LIBGL=1
 fi
 
-LIBLIRCCLIENT_PKGCONFIG_VERSION="\"\""
+LIRC_PKGCONFIG_VERSION="\"\""
 
-# Check whether --with-liblircclient was given.
-if test "${with_liblircclient+set}" = set; then :
- withval=$with_liblircclient; if test "$withval" = "yes"; then lirc="yes"; else lirc="no"; fi
+# Check whether --with-lirc was given.
+if test "${with_lirc+set}" = set; then :
+ withval=$with_lirc; if test "$withval" = "yes"; then lirc="yes"; else lirc="no"; fi
 else
 lirc="yes"
 fi
@@ -10787,11 +10830,83 @@
 if test "$lirc" = "yes"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for liblircclient" >&5
-$as_echo_n "checking for liblircclient... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lirc" >&5
+$as_echo_n "checking for lirc... " >&6; }
+
+if test -n "$lirc_CFLAGS"; then
+ pkg_cv_lirc_CFLAGS="$lirc_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lirc >= 0.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "lirc >= 0.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_lirc_CFLAGS=`$PKG_CONFIG --cflags "lirc >= 0.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$lirc_LIBS"; then
+ pkg_cv_lirc_LIBS="$lirc_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lirc >= 0.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "lirc >= 0.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_lirc_LIBS=`$PKG_CONFIG --libs "lirc >= 0.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+	 lirc_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lirc >= 0.0" 2>&1`
+ else
+	 lirc_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lirc >= 0.0" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$lirc_PKG_ERRORS" >&5
+
+	HAVE_LIRC=0
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_LIRC=0
+else
+	lirc_CFLAGS=$pkg_cv_lirc_CFLAGS
+	lirc_LIBS=$pkg_cv_lirc_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_LIRC=1
+fi
+ if test "$HAVE_LIRC" != "1"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lirc" >&5
+$as_echo_n "checking for lirc... " >&6; }
 
-if test -n "$liblircclient_CFLAGS"; then
- pkg_cv_liblircclient_CFLAGS="$liblircclient_CFLAGS"
+if test -n "$lirc_CFLAGS"; then
+ pkg_cv_lirc_CFLAGS="$lirc_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblircclient0 >= 0.0\""; } >&5
@@ -10799,7 +10914,7 @@
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_liblircclient_CFLAGS=`$PKG_CONFIG --cflags "liblircclient0 >= 0.0" 2>/dev/null`
+ pkg_cv_lirc_CFLAGS=`$PKG_CONFIG --cflags "liblircclient0 >= 0.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10807,8 +10922,8 @@
 else
 pkg_failed=untried
 fi
-if test -n "$liblircclient_LIBS"; then
- pkg_cv_liblircclient_LIBS="$liblircclient_LIBS"
+if test -n "$lirc_LIBS"; then
+ pkg_cv_lirc_LIBS="$lirc_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblircclient0 >= 0.0\""; } >&5
@@ -10816,7 +10931,7 @@
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_liblircclient_LIBS=`$PKG_CONFIG --libs "liblircclient0 >= 0.0" 2>/dev/null`
+ pkg_cv_lirc_LIBS=`$PKG_CONFIG --libs "liblircclient0 >= 0.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10837,55 +10952,58 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 liblircclient_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liblircclient0 >= 0.0" 2>&1`
+	 lirc_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liblircclient0 >= 0.0" 2>&1`
 else
-	 liblircclient_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liblircclient0 >= 0.0" 2>&1`
+	 lirc_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liblircclient0 >= 0.0" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$liblircclient_PKG_ERRORS" >&5
+	echo "$lirc_PKG_ERRORS" >&5
 
-	HAVE_LIBLIRCCLIENT=0
+	HAVE_LIRC=0
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	HAVE_LIBLIRCCLIENT=0
+	HAVE_LIRC=0
 else
-	liblircclient_CFLAGS=$pkg_cv_liblircclient_CFLAGS
-	liblircclient_LIBS=$pkg_cv_liblircclient_LIBS
+	lirc_CFLAGS=$pkg_cv_lirc_CFLAGS
+	lirc_LIBS=$pkg_cv_lirc_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVE_LIBLIRCCLIENT=1
+	HAVE_LIRC=1
 fi
- if test "$HAVE_LIBLIRCCLIENT" != "1"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: optional library liblircclient not found:" >&5
-$as_echo "$as_me: WARNING: optional library liblircclient not found:" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $liblircclient_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $liblircclient_PKG_ERRORS" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: liblircclient is provided by LIRC; Debian package: liblircclient-dev" >&5
-$as_echo "$as_me: WARNING: liblircclient is provided by LIRC; Debian package: liblircclient-dev" >&2;}
-	lirc="no"
+ if test "$HAVE_LIRC" != "1"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: optional library lirc not found:" >&5
+$as_echo "$as_me: WARNING: optional library lirc not found:" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $lirc_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $lirc_PKG_ERRORS" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: lirc is provided by LIRC; Debian package: liblircclient-dev" >&5
+$as_echo "$as_me: WARNING: lirc is provided by LIRC; Debian package: liblircclient-dev" >&2;}
+ lirc="no"
+ else
+ LIRC_PKGCONFIG_VERSION="\"`$PKG_CONFIG --modversion liblircclient0`\""
+ fi
 else
- LIBLIRCCLIENT_PKGCONFIG_VERSION="\"`$PKG_CONFIG --modversion liblircclient0`\""
+ LIRC_PKGCONFIG_VERSION="\"`$PKG_CONFIG --modversion lirc`\""
 fi
 else
- HAVE_LIBLIRCCLIENT=0
+ HAVE_LIRC=0
 fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBLIRCCLIENT $HAVE_LIBLIRCCLIENT
+#define HAVE_LIRC $HAVE_LIRC
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define LIBLIRCCLIENT_PKGCONFIG_VERSION $LIBLIRCCLIENT_PKGCONFIG_VERSION
+#define LIRC_PKGCONFIG_VERSION $LIRC_PKGCONFIG_VERSION
 _ACEOF
 
- if test "$HAVE_LIBLIRCCLIENT" = "1"; then
- HAVE_LIBLIRCCLIENT_TRUE=
- HAVE_LIBLIRCCLIENT_FALSE='#'
+ if test "$HAVE_LIRC" = "1"; then
+ HAVE_LIRC_TRUE=
+ HAVE_LIRC_FALSE='#'
 else
- HAVE_LIBLIRCCLIENT_TRUE='#'
- HAVE_LIBLIRCCLIENT_FALSE=
+ HAVE_LIRC_TRUE='#'
+ HAVE_LIRC_FALSE=
 fi
 
 
@@ -10988,7 +11106,7 @@
 -o "$HAVE_LIBGLEWMX" != "1" \
 -o $ "$equalizer" = "yes" -a "$HAVE_LIBEQUALIZER" != "1" $ \
 -o $ "$xnvctrl" = "yes" -a "$HAVE_LIBXNVCTRL" != "1" $ \
- -o $ "$lirc" = "yes" -a "$HAVE_LIBLIRCCLIENT" != "1" $ ; then
+ -o $ "$lirc" = "yes" -a "$HAVE_LIRC" != "1" $ ; then
 as_fn_error $? "One or more libraries were not found. See messages above." "$LINENO" 5
 fi
 
@@ -11152,8 +11270,8 @@
 as_fn_error $? "conditional \"HAVE_LIBXNVCTRL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_LIBLIRCCLIENT_TRUE}" && test -z "${HAVE_LIBLIRCCLIENT_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_LIBLIRCCLIENT\" was never defined.
+if test -z "${HAVE_LIRC_TRUE}" && test -z "${HAVE_LIRC_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_LIRC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -11553,7 +11671,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Bino $as_me 1.6.1, which was
+This file was extended by Bino $as_me 1.6.5, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
@@ -11620,7 +11738,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Bino config.status 1.6.1
+Bino config.status 1.6.5
 configured by $0, generated by GNU Autoconf 2.69,
 with options \\"\$ac_cs_config\\"
 
@@ -12610,4 +12728,4 @@
 echo "NLS: $USE_NLS"
 echo "Equalizer: $equalizer"
 echo "NVIDIA Quadro SDI output: $xnvctrl"
-echo "liblircclient: $lirc"
+echo "lirc: $lirc"

bino-1.6.1.tar.xz/configure.ac -> bino-1.6.5.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, 2014
+dnl Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016
 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.6.1], [bino-list@nongnu.org], [bino], [http://bino3d.org/])
+AC_INIT([Bino], [1.6.5], [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])
@@ -91,7 +91,7 @@
 AC_LANG_PUSH([C])
 dnl - dbg
 AC_CHECK_FUNCS([backtrace sigaction])
-dnl - endianness
+dnl - end
 dnl AC_C_BIGENDIAN
 dnl - fio
 dnl case "${target}" in *-*-mingw*) LIBS="$LIBS -lshlwapi" ;; esac
@@ -99,12 +99,7 @@
 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
+dnl - pth
 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);]])],
@@ -121,7 +116,12 @@
 CPPFLAGS="-pthread $CPPFLAGS"
 LDFLAGS="-pthread $LDFLAGS"
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [], [CPPFLAGS="$CPPFLAGS_bak"; LDFLAGS="$LDFLAGS_bak"])
-dnl - timer
+dnl - str
+AM_ICONV([])
+AC_CHECK_FUNCS([nl_langinfo vasprintf wcswidth])
+dnl - sys
+dnl AC_CHECK_FUNCS([nanosleep sysconf sched_yield])
+dnl - tmr
 AC_SEARCH_LIBS([clock_gettime], [rt])
 AC_CHECK_FUNCS([clock_gettime])
 AC_LANG_POP([C])
@@ -192,11 +192,11 @@
 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"])
+ [AS_HELP_STRING([--with-qt-version], [Choose Qt version. Currently 4 or 5; 5 is the default.])],
+ [qt_version="$withval"], [qt_version="5"])
 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"
+ AC_MSG_WARN([unknown Qt version requested, falling back to Qt 5.])
+ qt_version="5"
 fi
 AC_ARG_VAR([RCC], [rcc command])
 AC_ARG_VAR([MOC], [moc command])
@@ -250,12 +250,12 @@
 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 Qt5 on Linux requires -fPIC / -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])
+ AC_MSG_CHECKING([whether Qt needs -fPIC and -pie])
 if test -n "`$PKG_CONFIG --variable=qt_config Qt5Core | $GREP reduce_relocations`"; then
 AC_MSG_RESULT([yes])
- CXXFLAGS="$CXXFLAGS -fPIE"
+ CXXFLAGS="$CXXFLAGS -fPIC"
 LDFLAGS="$LDFLAGS -pie"
 else
 AC_MSG_RESULT([no])
@@ -313,7 +313,7 @@
 CPPFLAGS_BAK="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $libX11_CFLAGS $xnvctrl_CFLAGS"
 AC_SUBST([xnvctrl_CFLAGS])
- AC_CHECK_HEADERS([NVCtrl.h NVCtrlLib.h],
+ AC_CHECK_HEADERS([NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h],
 [HAVE_LIBXNVCTRL=1],
 [HAVE_LIBXNVCTRL=0],
 [#include <GL/glx.h>])
@@ -325,13 +325,13 @@
 [XNVCTRLQueryAttribute],
 [HAVE_LIBXNVCTRL=1],
 [HAVE_LIBXNVCTRL=0],
- [$libX11_LIBS -lXext])
+ [-lX11 -lXext])
 LDFLAGS="$LDFLAGS_BAK"
 fi
 CPPFLAGS="$CPPFLAGS_BAK"
 if test "$HAVE_LIBXNVCTRL" != "1"; then
 AC_MSG_WARN([optional library libXNVCtrl not found])
- AC_MSG_WARN([libXNVCtrl is provided by NVIDIA; Ubuntu package: nvidia-settings])
+ AC_MSG_WARN([libXNVCtrl is provided by NVIDIA; Debian package: libxnvctrl-dev])
 xnvctrl="no"
 fi
 else
@@ -348,26 +348,31 @@
 PKG_CHECK_MODULES([libgl], [gl >= 0.0], [HAVE_LIBGL=1], [HAVE_LIBGL=0])
 
 dnl LIRC
-LIBLIRCCLIENT_PKGCONFIG_VERSION="\"\""
-AC_ARG_WITH([liblircclient],
- [AS_HELP_STRING([--without-liblircclient], [Disable remote control support via liblircclient (enabled by default)])],
+LIRC_PKGCONFIG_VERSION="\"\""
+AC_ARG_WITH([lirc],
+ [AS_HELP_STRING([--without-lirc], [Disable remote control support via lirc (enabled by default)])],
 [if test "$withval" = "yes"; then lirc="yes"; else lirc="no"; fi], [lirc="yes"])
 if test "$lirc" = "yes"; then
- PKG_CHECK_MODULES([liblircclient], [liblircclient0 >= 0.0], [HAVE_LIBLIRCCLIENT=1], [HAVE_LIBLIRCCLIENT=0])
- if test "$HAVE_LIBLIRCCLIENT" != "1"; then
- AC_MSG_WARN([optional library liblircclient not found:])
- AC_MSG_WARN([$liblircclient_PKG_ERRORS])
- AC_MSG_WARN([liblircclient is provided by LIRC; Debian package: liblircclient-dev])
-	lirc="no"
+ PKG_CHECK_MODULES([lirc], [lirc >= 0.0], [HAVE_LIRC=1], [HAVE_LIRC=0])
+ if test "$HAVE_LIRC" != "1"; then
+ PKG_CHECK_MODULES([lirc], [liblircclient0 >= 0.0], [HAVE_LIRC=1], [HAVE_LIRC=0])
+ if test "$HAVE_LIRC" != "1"; then
+ AC_MSG_WARN([optional library lirc not found:])
+ AC_MSG_WARN([$lirc_PKG_ERRORS])
+ AC_MSG_WARN([lirc is provided by LIRC; Debian package: liblircclient-dev])
+ lirc="no"
+ else
+ LIRC_PKGCONFIG_VERSION="\"`$PKG_CONFIG --modversion liblircclient0`\""
+ fi
 else
- LIBLIRCCLIENT_PKGCONFIG_VERSION="\"`$PKG_CONFIG --modversion liblircclient0`\""
+ LIRC_PKGCONFIG_VERSION="\"`$PKG_CONFIG --modversion lirc`\""
 fi
 else
- HAVE_LIBLIRCCLIENT=0
+ HAVE_LIRC=0
 fi
-AC_DEFINE_UNQUOTED([HAVE_LIBLIRCCLIENT], [$HAVE_LIBLIRCCLIENT], [Have liblircclient?])
-AC_DEFINE_UNQUOTED([LIBLIRCCLIENT_PKGCONFIG_VERSION], [$LIBLIRCCLIENT_PKGCONFIG_VERSION], [liblircclient version])
-AM_CONDITIONAL([HAVE_LIBLIRCCLIENT], [test "$HAVE_LIBLIRCCLIENT" = "1"])
+AC_DEFINE_UNQUOTED([HAVE_LIRC], [$HAVE_LIRC], [Have lirc?])
+AC_DEFINE_UNQUOTED([LIRC_PKGCONFIG_VERSION], [$LIRC_PKGCONFIG_VERSION], [lirc version])
+AM_CONDITIONAL([HAVE_LIRC], [test "$HAVE_LIRC" = "1"])
 
 dnl Icon and Menu tools. It is ok if these are missing.
 GTK_UPDATE_ICON_CACHE=""
@@ -388,7 +393,7 @@
 -o "$HAVE_LIBGLEWMX" != "1" \
 -o $ "$equalizer" = "yes" -a "$HAVE_LIBEQUALIZER" != "1" $ \
 -o $ "$xnvctrl" = "yes" -a "$HAVE_LIBXNVCTRL" != "1" $ \
- -o $ "$lirc" = "yes" -a "$HAVE_LIBLIRCCLIENT" != "1" $ ; then
+ -o $ "$lirc" = "yes" -a "$HAVE_LIRC" != "1" $ ; then
 AC_MSG_ERROR([One or more libraries were not found. See messages above.])
 fi
 
@@ -407,4 +412,4 @@
 echo "NLS: $USE_NLS"
 echo "Equalizer: $equalizer"
 echo "NVIDIA Quadro SDI output: $xnvctrl"
-echo "liblircclient: $lirc"
+echo "lirc: $lirc"

bino-1.6.1.tar.xz/doc/Makefile.in -> bino-1.6.5.tar.xz/doc/Makefile.in Changed

bino-1.6.1.tar.xz/doc/bino.html -> bino-1.6.5.tar.xz/doc/bino.html Changed

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 
-
+
 <head>
-<title>Bino 1.6.0</title>
+<title>Bino 1.6.5</title>
 
-<meta name="description" content="Bino 1.6.0">
-<meta name="keywords" content="Bino 1.6.0">
+<meta name="description" content="Bino 1.6.5">
+<meta name="keywords" content="Bino 1.6.5">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="Generator" content="makeinfo">
@@ -28,16 +28,16 @@
 <style type="text/css">
 
 </style>
@@ -57,8 +56,8 @@
 
 </head>
 
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
-<h1 class="settitle" align="center">Bino 1.6.0</h1>
+<body lang="en">
+<h1 class="settitle" align="center">Bino 1.6.5</h1>
 
 
 
@@ -72,7 +71,7 @@
 <a name="Bino"></a>
 <h1 class="top">Bino</h1>
 This manual was last updated 11 September 2014 for version
-1.6.0 of Bino.
+1.6.5 of Bino.
 
 Copyright &copy; 2011, 2012, 2013, 2014
 Martin Lambers (<a href="mailto:marlam@marlam.de">marlam@marlam.de</a>),

bino-1.6.1.tar.xz/doc/bino.info -> bino-1.6.5.tar.xz/doc/bino.info Changed

@@ -1,6 +1,6 @@
-This is bino.info, produced by makeinfo version 5.2 from bino.texi.
+This is bino.info, produced by makeinfo version 6.3 from bino.texi.
 
-This manual was last updated 11 September 2014 for version 1.6.1 of
+This manual was last updated 11 September 2014 for version 1.6.5 of
 Bino.
 
 Copyright © 2011, 2012, 2013, 2014 Martin Lambers
@@ -22,7 +22,7 @@
 Bino
 ****
 
-This manual was last updated 11 September 2014 for version 1.6.1 of
+This manual was last updated 11 September 2014 for version 1.6.5 of
 Bino.
 
 Copyright © 2011, 2012, 2013, 2014 Martin Lambers
@@ -78,7 +78,7 @@
 
 This section describes the command line interface of Bino.
 
- Synopsis: ‘bino [OPTION…] [FILE…]’
+ Synopsis: ‘bino [OPTION...] [FILE...]’
 
 Bino combines all input files into one media source which is then
 played. This means you can have video, audio, and subtitle streams in
@@ -150,8 +150,8 @@
 ‘-f’
 ‘--fullscreen’
 Fullscreen.
-‘--fullscreen-screens=[S0[,S1[,…]]]’
- Use the listed screens S0, …, SN in fullscreen mode. Screen
+‘--fullscreen-screens=[S0[,S1[,...]]]’
+ Use the listed screens S0, ..., SN in fullscreen mode. Screen
 numbers start with 1. If the list is empty, the primary screen
 will be used (this is the default).
 ‘--fullscreen-flip-left’
@@ -1005,7 +1005,7 @@
 number of seconds, before processing more commands from this file,
 script, or FIFO.
 (This command is not available for LIRC remote controls.)
-‘open [OPTION…] FILE…’
+‘open [OPTION...] FILE...’
 Open the given files.
 You can use percent-encoding to encode special characters. See
 <http://en.wikipedia.org/wiki/Percent_encoding>. Use this if the

bino-1.6.1.tar.xz/doc/stamp-vti -> bino-1.6.5.tar.xz/doc/stamp-vti Changed

bino-1.6.1.tar.xz/doc/version.texi -> bino-1.6.5.tar.xz/doc/version.texi Changed

bino-1.6.1.tar.xz/pkg/w32/bino.nsi -> bino-1.6.5.tar.xz/pkg/w32/bino.nsi Changed

bino-1.6.1.tar.xz/pkg/w32/notes.txt -> bino-1.6.5.tar.xz/pkg/w32/notes.txt Changed

bino-1.6.1.tar.xz/po/LINGUAS -> bino-1.6.5.tar.xz/po/LINGUAS Changed

bino-1.6.1.tar.xz/po/POTFILES.in -> bino-1.6.5.tar.xz/po/POTFILES.in Changed

bino-1.6.1.tar.xz/po/bg.gmo -> bino-1.6.5.tar.xz/po/bg.gmo Changed

bino-1.6.1.tar.xz/po/bg.po -> bino-1.6.5.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: 2014-10-13 13:20+0200\n"
+"POT-Creation-Date: 2016-12-16 09:10+0100\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,31 +90,31 @@
 msgid "Too many arguments."
 msgstr "Прекалено много аргументи."
 
-#: src/base/str.cpp:269
+#: src/base/str.cpp:459
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Не може да се конвертира низ в %s."
 
-#: src/base/str.cpp:517 src/base/str.cpp:536 src/base/str.cpp:547
-#: src/base/str.cpp:559
-#, fuzzy, c-format
+#: src/base/str.cpp:993 src/base/str.cpp:1012 src/base/str.cpp:1023
+#: src/base/str.cpp:1035
+#, c-format
 msgid "Cannot convert %s to %s: %s"
-msgstr "Не може да се конвертира %s в %s."
+msgstr "Не може да се конвертира %s в %s: %s"
 
-#: src/base/str.cpp:565
+#: src/base/str.cpp:1041
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Не може да се конвертира %s в %s."
 
-#: src/base/thread.cpp:38 src/base/thread.cpp:48 src/base/thread.cpp:61
-#: src/base/thread.cpp:74 src/base/thread.cpp:85 src/base/thread.cpp:95
-#: src/base/thread.cpp:108 src/base/thread.cpp:116 src/base/thread.cpp:124
-#: src/base/thread.cpp:204 src/base/thread.cpp:211 src/base/thread.cpp:225
-#: src/base/thread.cpp:245
+#: src/base/pth.cpp:38 src/base/pth.cpp:48 src/base/pth.cpp:61
+#: src/base/pth.cpp:74 src/base/pth.cpp:85 src/base/pth.cpp:95
+#: src/base/pth.cpp:108 src/base/pth.cpp:116 src/base/pth.cpp:124
+#: src/base/pth.cpp:204 src/base/pth.cpp:211 src/base/pth.cpp:225
+#: src/base/pth.cpp:245
 msgid "System function failed: "
 msgstr "Системната функция не можа да бъде изпълнена:"
 
-#: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
+#: src/base/tmr.cpp:63 src/base/tmr.cpp:72 src/base/tmr.cpp:81
 msgid "Cannot get time."
 msgstr "Времето не може да бъде установено."
 
@@ -237,1195 +237,318 @@
 msgid "Subtitle stream %d not found."
 msgstr "Потокът със субтитри %d не бе намерен."
 
-#: src/dispatch.cpp:559 src/main.cpp:795
+#: src/dispatch.cpp:559 src/main.cpp:796
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Тази версия на Bino е компилирана без поддръжка на Еквилайзер."
 
-#: src/gui.cpp:111
-msgid "Video:"
-msgstr "Видео:"
+#: src/lib_versions.cpp:183 src/lib_versions.cpp:195
+msgid "not used"
+msgstr "не се използва"
+
+#: src/lirc.cpp:61
+msgid "Cannot initialize LIRC."
+msgstr "Не може да се инициализира LIRC."
+
+#: src/lirc.cpp:67
+msgid "Cannot set LIRC socket properties."
+msgstr "Не могат да бъдат зададени свойствата на LIRC сокета."
 
-#: src/gui.cpp:112
-msgid "Select the video stream."
-msgstr "Избор на видео поток."
+#: src/lirc.cpp:74
+msgid "Cannot read LIRC default configuration."
+msgstr "Не може да бъде прочетена стандартната конфигурация на LIRC."
 
-#: src/gui.cpp:118
-msgid "Audio:"
-msgstr "Аудио:"
+#: src/lirc.cpp:89
+#, c-format
+msgid "Cannot read LIRC configuration file %s."
+msgstr "Не може да бъде прочетен конфигурационният файл на LIRC %s."
 
-#: src/gui.cpp:119
-msgid "Select the audio stream."
-msgstr "Избор на аудио поток."
+#: src/lirc.cpp:117
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr "Не може да се получи LIRC събитие; изключване на LIRC поддръжката."
 
-#: src/gui.cpp:125
-msgid "Subtitle:"
-msgstr "Субтитри:"
+#: src/lirc.cpp:131
+#, c-format
+msgid "Received invalid command '%s' from LIRC."
+msgstr "Получена е невалидна команда '%s' от LIRC."
 
-#: src/gui.cpp:126
-msgid "Select the subtitle stream."
-msgstr "Избор на субтитри."
+#: src/lirc.cpp:141
+msgid "Cannot get command for LIRC code."
+msgstr "Не можа да се вземе командата за LIRC кода."
 
-#: src/gui.cpp:137 src/media_input.cpp:276
-msgid "Input:"
-msgstr "Вход:"
+#: src/main.cpp:414
+#, c-format
+msgid "%s version %s"
+msgstr "%s версия %s"
+
+#: src/main.cpp:415
+#, fuzzy
+msgid "Copyright (C) 2016 the Bino developers."
+msgstr "Всички права запазени (C) 2014 от разработчиците на Bino."
+
+#: src/main.cpp:416
+msgid ""
+"This is free software. You may redistribute copies of it under the terms of "
+"the GNU General Public License. There is NO WARRANTY, to the extent "
+"permitted by law."
+msgstr ""
+"Тази програма е свободен софтуер. Може да разпространявате нейни копия "
+"според условията на GNU General Public License. Програмата идва без НИКАКВА "
+"ГАРАНЦИЯ, доколкото това е позволено от закона."
+
+#: src/main.cpp:419
+msgid "Platform:"
+msgstr "Платформа:"
+
+#: src/main.cpp:421
+msgid "Libraries used:"
+msgstr "Използвани библиотеки:"
+
+#. TRANSLATORS: This is the --help text. Please keep the line length limited.
+#. * The --help output should look good with a line width of 80 characters.
+#: src/main.cpp:434
+msgid "Usage:"
+msgstr "Използване:"
+
+#: src/main.cpp:436
+msgid "Options:"
+msgstr "Опции:"
+
+#: src/main.cpp:437
+msgid "Print help"
+msgstr "Отпечатване на помощта"
+
+#: src/main.cpp:438
+msgid "Print version"
+msgstr "Отпечатване на версията"
+
+#: src/main.cpp:439
+msgid "Do not use the GUI, just show a plain window"
+msgstr "Без използване на графичен интерфейс, само просто прозорец"
+
+#: src/main.cpp:440
+msgid "Append all log messages to the given file"
+msgstr "Прибавяне на всички съобщения на дневника към избрания файл"
+
+#: src/main.cpp:441
+msgid "Set log level (debug/info/warning/error/quiet)"
+msgstr ""
+"Ниво на докладване на съобщения в дневника (debug/info/warning/error/quiet)"
+
+#: src/main.cpp:442
+msgid "Print a list of known audio devices and exit"
+msgstr "Отпечатване на списък с известни аудио устройства и затваряне"
+
+#: src/main.cpp:443
+msgid "Use audio device number N (N=0 is the default)"
+msgstr "Използване на аудио устройство номер N (N=0 е по подразбиране)"
+
+#: src/main.cpp:444
+msgid "Delay audio by D milliseconds (default 0)"
+msgstr "Забавяне на звука с D милисекунди (по подразбиране 0)"
+
+#: src/main.cpp:445
+msgid "Set audio volume (0 to 1, default 1)"
+msgstr "Задаване на нивото на звука (0 до 1, по подразбиране 1)"
+
+#: src/main.cpp:446
+msgid "Mute audio"
+msgstr "Заглушаване на звука"
+
+#: src/main.cpp:447
+msgid "Type of input device: default, firewire, x11"
+msgstr "Тип на устройството: default, firewire, x11"
+
+#: src/main.cpp:448
+msgid "Request frame size WxH from input device"
+msgstr "Изискване на размер на кадъра WxH от входното устройство"
+
+#: src/main.cpp:449
+msgid "Request frame rate N/D from input device"
+msgstr "Изискване на кадтова честота N/D от входното устройство"
+
+#: src/main.cpp:450
+msgid "Request device format 'default' or 'mjpeg'"
+msgstr "Изискване на формат 'default' или 'mjpeg'"
+
+#: src/main.cpp:451
+msgid "Read commands from a file"
+msgstr "Прочитане на командите от файл"
+
+#: src/main.cpp:452
+msgid "Use the given LIRC configuration file"
+msgstr "Използване на избрания LIRC конфигурационен файл"
+
+#: src/main.cpp:453
+msgid "This option can be used more than once"
+msgstr "Тази опция може да бъде използвана повече от веднъж"
+
+#: src/main.cpp:454
+msgid "Output quality (0=fastest to 4=best/default)"
+msgstr "Изходно качество (0=най-бързо, 4=най-добро/по подразбиране)"
+
+#: src/main.cpp:455
+msgid "Select video stream (1-n, depending on input)"
+msgstr "Избор на видео поток (1-n, зависи от входа)"
+
+#: src/main.cpp:456
+msgid "Select audio stream (1-n, depending on input)"
+msgstr "Избор на аудио поток (1-n, зависи от входа)"
+
+#: src/main.cpp:457
+msgid "Select subtitle stream (0-n, dep. on input)"
+msgstr "Избор на поток на субтитрите (1-n, зависи от входа)"
 
-#: src/gui.cpp:138
-msgid "Set the 3D layout of the video stream."
-msgstr "Избор на 3D разположение на видеото."
+#: src/main.cpp:458
+msgid "Select input type (default autodetect):"
+msgstr "Избор на типа на входа (по подразбиране се засича автоматично)"
 
-#: src/gui.cpp:142 src/main.cpp:459
+#: src/main.cpp:459
 msgid "2D"
 msgstr "2D"
 
-#: src/gui.cpp:143 src/main.cpp:460
+#: src/main.cpp:460
 msgid "Separate streams, left first"
 msgstr "Отделни потоци, първо левия"
 
-#: src/gui.cpp:144 src/main.cpp:461
+#: src/main.cpp:461
 msgid "Separate streams, right first"
 msgstr "Отделни потоци, първо десния"
 
-#: src/gui.cpp:145 src/main.cpp:462
+#: src/main.cpp:462
 msgid "Alternating, left first"
 msgstr "Редуващи се, първо лява половина"
 
-#: src/gui.cpp:146 src/main.cpp:463
+#: src/main.cpp:463
 msgid "Alternating, right first"
 msgstr "Редуващи се, първо дясна половина"
 
-#: 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: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:149 src/main.cpp:466
+#: src/main.cpp:466
 msgid "Bottom/top"
 msgstr "Долу/Горе"
 
-#: src/gui.cpp:150 src/main.cpp:467
+#: src/main.cpp:467
 msgid "Bottom/top, half height"
 msgstr "Долу/Горе, половин височина"
 
-#: 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:152 src/gui.cpp:174 src/gui.cpp:2215 src/gui.cpp:2244
 #: src/main.cpp:469 src/main.cpp:482
 msgid "Left/right, half width"
 msgstr "Ляво/Дясно, половин ширина"
 
-#: src/gui.cpp:153 src/main.cpp:470
+#: src/main.cpp:470
 msgid "Right/left"
 msgstr "Дясно/Ляво"
 
-#: src/gui.cpp:154 src/main.cpp:471
+#: src/main.cpp:471
 msgid "Right/left, half width"
 msgstr "Дясно/Ляво, половин ширина"
 
-#: src/gui.cpp:155 src/gui.cpp:175 src/gui.cpp:2216 src/gui.cpp:2245
 #: src/main.cpp:472 src/main.cpp:483
 msgid "Even/odd rows"
 msgstr "Четни/Нечетни редове"
 
-#: src/gui.cpp:156 src/main.cpp:473
+#: src/main.cpp:473
 msgid "Odd/even rows"
 msgstr "Нечетни/Четни редове"
 
-#: src/gui.cpp:162
-msgid "Output:"
-msgstr "Изход:"
+#: src/main.cpp:474
+msgid "Select output type:"
+msgstr "Избор на типа на изхода:"
+
+#: src/main.cpp:475
+msgid "OpenGL stereo"
+msgstr "OpenGL стерео"
 
-#: src/gui.cpp:163
-msgid "Set the 3D output type for your display."
-msgstr "Избор на 3D типа на дисплея."
+#: src/main.cpp:476
+msgid "Left/right alternating"
+msgstr "Редуващи се, Лява/Дясна"
 
-#: src/gui.cpp:167 src/gui.cpp:2210 src/gui.cpp:2239 src/main.cpp:477
+#: src/main.cpp:477
 msgid "Left view"
 msgstr "Лява половина"
 
-#: src/gui.cpp:168 src/gui.cpp:2211 src/gui.cpp:2240 src/main.cpp:478
+#: src/main.cpp:478
 msgid "Right view"
 msgstr "Дясна половина"
 
-#: src/gui.cpp:169 src/main.cpp:475
-msgid "OpenGL stereo"
-msgstr "OpenGL стерео"
-
-#: src/gui.cpp:170 src/main.cpp:476
-msgid "Left/right alternating"
-msgstr "Редуващи се, Лява/Дясна"
-
-#: src/gui.cpp:176 src/gui.cpp:2217 src/gui.cpp:2246 src/main.cpp:484
+#: src/main.cpp:484
 msgid "Even/odd columns"
 msgstr "Четни/Нечетни колони"
 
-#: src/gui.cpp:177 src/gui.cpp:2218 src/gui.cpp:2247 src/main.cpp:485
+#: src/main.cpp:485
 msgid "Checkerboard pattern"
 msgstr "Шахматно"
 
-#: src/gui.cpp:178 src/main.cpp:486
+#: src/main.cpp:486
 msgid "HDMI frame packing mode"
 msgstr "HDMI пакетиране на кадри"
 
-#: src/gui.cpp:179 src/gui.cpp:2219 src/gui.cpp:2248 src/main.cpp:487
+#: src/main.cpp:487
 msgid "Red/cyan glasses, monochrome"
 msgstr "Червени/Циан очила, монохром"
 
-#: src/gui.cpp:180 src/gui.cpp:2220 src/gui.cpp:2249 src/main.cpp:488
+#: src/main.cpp:488
 msgid "Red/cyan glasses, half color"
 msgstr "Червени/Циан очила, половин цветност"
 
-#: src/gui.cpp:181 src/gui.cpp:2221 src/gui.cpp:2250 src/main.cpp:489
+#: src/main.cpp:489
 msgid "Red/cyan glasses, full color"
 msgstr "Червени/Циан очила, пълни цветове"
 
-#: src/gui.cpp:182 src/gui.cpp:2222 src/gui.cpp:2251 src/main.cpp:490
+#: src/main.cpp:490
 msgid "Red/cyan glasses, Dubois"
 msgstr "Червени/Циан очила, Дюбоа"
 
-#: src/gui.cpp:183 src/gui.cpp:2223 src/gui.cpp:2252 src/main.cpp:491
+#: src/main.cpp:491
 msgid "Green/magenta glasses, monochrome"
 msgstr "Зелено/Пурпурни очила, монохром"
 
-#: src/gui.cpp:184 src/gui.cpp:2224 src/gui.cpp:2253 src/main.cpp:492
+#: src/main.cpp:492
 msgid "Green/magenta glasses, half color"
 msgstr "Зелено/Пурпурни очила, половин цветност"
 
-#: src/gui.cpp:185 src/gui.cpp:2225 src/gui.cpp:2254 src/main.cpp:493
+#: src/main.cpp:493
 msgid "Green/magenta glasses, full color"
 msgstr "Зелено/Пурпурни очила, пълни цветове"
 
-#: src/gui.cpp:186 src/gui.cpp:2226 src/gui.cpp:2255 src/main.cpp:494
+#: src/main.cpp:494
 msgid "Green/magenta glasses, Dubois"
 msgstr "Зелено/Пурпурни очила, Дюбоа"
 
-#: src/gui.cpp:187 src/gui.cpp:2227 src/gui.cpp:2256 src/main.cpp:495
+#: src/main.cpp:495
 msgid "Amber/blue glasses, monochrome"
 msgstr "Кехлибар/Сини очила, монохром"
 
-#: src/gui.cpp:188 src/gui.cpp:2228 src/gui.cpp:2257 src/main.cpp:496
+#: src/main.cpp:496
 msgid "Amber/blue glasses, half color"
 msgstr "Кехлибар/Сини очила, половин цветност"
 
-#: src/gui.cpp:189 src/gui.cpp:2229 src/gui.cpp:2258 src/main.cpp:497
+#: src/main.cpp:497
 msgid "Amber/blue glasses, full color"
 msgstr "Кехлибар/Сини очила, пълни цветове"
 
-#: src/gui.cpp:190 src/gui.cpp:2230 src/gui.cpp:2259 src/main.cpp:498
+#: src/main.cpp:498
 msgid "Amber/blue glasses, Dubois"
 msgstr "Кехлибар/Сини очила, Дюбоа"
 
-#: src/gui.cpp:191 src/gui.cpp:2231 src/gui.cpp:2260 src/main.cpp:499
+#: src/main.cpp:499
 msgid "Red/green glasses, monochrome"
-msgstr "Червени/Зелени очила, монохромно"
-
-#: src/gui.cpp:192 src/gui.cpp:2232 src/gui.cpp:2261 src/main.cpp:500
-msgid "Red/blue glasses, monochrome"
-msgstr "Червени/Сини очила, монохромно"
-
-#: src/gui.cpp:196
-msgid "Swap left/right"
-msgstr "Размяна на ляво/дясно"
-
-#: src/gui.cpp:197
-msgid ""
-"Swap the left and right view. Use this if the 3D effect seems wrong."
-msgstr "Размяна на левия и десния изглед."
-
-#: src/gui.cpp:475 src/gui.cpp:1736
-msgid "Off"
-msgstr "Изключено"
-
-#: src/gui.cpp:706
-msgid ""
-"This slider shows the progress during video playback, and can be used to "
-"seek in the video."
-msgstr ""
-"Този плъзгач показва докъде е стигнало възпроизвеждането, и може да се "
-"използва за превъртане."
-
-#: src/gui.cpp:713
-msgid "Elapsed / total time."
-msgstr "Изминало / Общо време."
-
-#: src/gui.cpp:720
-msgid "Toggle audio mute."
-msgstr "Заглушаване на звука."
-
-#: src/gui.cpp:725
-msgid "Adjust audio volume."
-msgstr "Задаване нивото на звука."
-
-#: src/gui.cpp:737
-msgid "Play."
-msgstr "Изпълняване."
-
-#: src/gui.cpp:741
-msgid "Pause."
-msgstr "Пауза."
-
-#: src/gui.cpp:745
-msgid "Stop."
-msgstr "Стоп."
-
-#: src/gui.cpp:750
-msgid "Toggle loop mode."
-msgstr "(Де)Активиране на повторение."
-
-#: src/gui.cpp:757
-msgid ""
-"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
-"f key."
-msgstr ""
-"Превключване на пълноекранен режим. Можете да го напуснете чрез натискане "
-"на клавиш f."
-
-#: src/gui.cpp:763
-msgid "Center the video area on your screen."
-msgstr "Центриране на видеото в екрана."
-
-#: src/gui.cpp:770
-msgid "Seek backward 10 minutes."
-msgstr "Назад 10 минути."
-
-#: src/gui.cpp:775
-msgid "Seek backward 1 minute."
-msgstr "Назад 1 минута."
-
-#: src/gui.cpp:781
-msgid "Seek backward 10 seconds."
-msgstr "Назад 10 секунди."
-
-#: src/gui.cpp:787
-msgid "Seek forward 10 seconds."
-msgstr "Напред 10 секунди."
-
-#: src/gui.cpp:792
-msgid "Seek forward 1 minute."
-msgstr "Напред 1 минута."
-
-#: src/gui.cpp:798
-msgid "Seek forward 10 minutes."
-msgstr "Напред 10 минути."
-
-#: src/gui.cpp:1059
-msgid "Fullscreen/Multiscreen Settings"
-msgstr "Настройки на пълен екран/много екрани"
-
-#: src/gui.cpp:1061
-msgid "Configure fullscreen mode:"
-msgstr "Конфигуриране на пълноекранния режим:"
-
-#: src/gui.cpp:1062
-msgid "Select the screens to use in fullscreen mode."
-msgstr "Избор на екрани, които ще се използват в пълноекранен режим."
-
-#: src/gui.cpp:1064
-msgid "Single screen:"
-msgstr "Единичен екран:"
-
-#: src/gui.cpp:1065
-msgid "Use a single screen for fullscreen mode."
-msgstr "Използване на един екран за пълноекранния режим."
-
-#: src/gui.cpp:1068
-msgid "Primary screen"
-msgstr "Основен екран"
-
-#: src/gui.cpp:1071 src/gui.cpp:1082 src/gui.cpp:1083
-#, c-format
-msgid "Screen %d"
-msgstr "Екран %d"
-
-#: src/gui.cpp:1074
-msgid "Dual screen:"
-msgstr "Два екрана:"
-
-#: src/gui.cpp:1075
-msgid "Use two screens for fullscreen mode."
-msgstr "Използване на два екрана за пълноекранния режим."
-
-#: src/gui.cpp:1087
-msgid "Multi screen:"
-msgstr "Много екрани:"
-
-#: src/gui.cpp:1088
-msgid "Use multiple screens for fullscreen mode."
-msgstr "Използване на множество екрани за пълноекранния режим."
-
-#: src/gui.cpp:1090
-msgid "Comma-separated list of screens to use for fullscreen mode."
-msgstr ""
-"Отделени със запетайка екрани, които да се използват в пълноекранния "
-"режим."
-
-#: src/gui.cpp:1093
-msgid "When in fullscreen mode,"
-msgstr "Когато е пълноекранен режим,"
-
-#: src/gui.cpp:1094
-msgid "Set special left/right view handling for fullscreen mode."
-msgstr "Настройка на специален ляв/десен изглед при пълноекранен режим."
-
-#: src/gui.cpp:1096
-msgid "flip left view vertically."
-msgstr "обръщане на левия изглед вертикално."
-
-#: src/gui.cpp:1098
-msgid "flop left view horizontally."
-msgstr "обръщане на левия изглед хоризонтално."
-
-#: src/gui.cpp:1100
-msgid "flip right view vertically."
-msgstr "обръщане на десния изглед вертикално."
-
-#: src/gui.cpp:1102
-msgid "flop right view horizontally."
-msgstr "обръщане на десния изглед хоризонтално."
-
-#: src/gui.cpp:1105
-msgid "use DLP(R) 3-D Ready Sync"
-msgstr "използване на DLP(R) 3-D Ready синхронизация"
-
-#: src/gui.cpp:1106
-msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
-msgstr ""
-"използване на DLP&reg; 3-D Ready синхронизация за поддържаните изходни "
-"режими."
-
-#: src/gui.cpp:1108
-msgid "inhibit the screensaver"
-msgstr "подтискане на предпазителя на екрана"
-
-#: src/gui.cpp:1109
-msgid "Inhibit the screensaver during fullscreen playback."
-msgstr ""
-"Подтиска задействането на екранния предпазител по време на пълноекранно "
-"възпроизвеждане."
-
-#: src/gui.cpp:1111 src/gui.cpp:1277 src/gui.cpp:1412 src/gui.cpp:1473
-#: src/gui.cpp:1538 src/gui.cpp:1616 src/gui.cpp:1740 src/gui.cpp:2025
-#: src/gui.cpp:2264 src/gui.cpp:2750 src/gui.cpp:3477 src/gui.cpp:3524
-#: src/gui.cpp:3841
-msgid "OK"
-msgstr "Добре"
-
-#: src/gui.cpp:1230
-msgid "Display Color Adjustments"
-msgstr "Настройки на цветовете"
-
-#: src/gui.cpp:1232
-msgid "Contrast:"
-msgstr "Контраст:"
-
-#: src/gui.cpp:1243
-msgid "Brightness:"
-msgstr "Яркост:"
-
-#: src/gui.cpp:1254
-msgid "Hue:"
-msgstr "Оттенък:"
-
-#: src/gui.cpp:1265
-msgid "Saturation:"
-msgstr "Наситеност:"
-
-#: src/gui.cpp:1383
-msgid "Display Crosstalk Calibration"
-msgstr "Калибриране на Crosstalk"
-
-#. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/gui.cpp:1386
-msgid ""
-"Please read the manual to find out how to measure the crosstalk "
-"levels of your display."
-msgstr ""
-"Моля прочетете ръководството за да разберете как да откриете нивата на "
-"crosstalk за вашия дисплей."
-
-#: src/gui.cpp:1390
-msgid "Red:"
-msgstr "Червено:"
-
-#: src/gui.cpp:1397
-msgid "Green:"
-msgstr "Зелено:"
-
-#: src/gui.cpp:1404
-msgid "Blue:"
-msgstr "Синьо:"
-
-#: src/gui.cpp:1460
-msgid "Rendering Quality Adjustments"
-msgstr "Настройки на качеството на рендериране"
-
-#: src/gui.cpp:1462
-msgid "Rendering Quality:"
-msgstr "Качество на рендериране:"
-
-#: src/gui.cpp:1516
-msgid "Zoom for wide videos"
-msgstr "Увеличаване при широко видео"
-
-#: src/gui.cpp:1519
-msgid ""
-"Set zoom level for videos that are wider than the screen: 0: Show "
-"full video width. 1: Use full screen height."
-msgstr ""
-"Задава нивото на увеличаване когато видеото е по-широко от екрана:"
-" 0: показване на пълната ширина на видеото. 1: използване на "
-"пълноекранната височина."
-
-#: src/gui.cpp:1523
-msgid "Zoom:"
-msgstr "Увеличаване:"
-
-#: src/gui.cpp:1524
-msgid "Set the zoom level for videos that are wider than the screen."
-msgstr ""
-"Задава нивото на увеличаване когато видеото е по-широко от екрана."
-
-#: src/gui.cpp:1582
-msgid "Audio Settings"
-msgstr "Звукови настройки"
-
-#: src/gui.cpp:1584
-msgid "Audio device:"
-msgstr "Звуково устройство:"
-
-#: src/gui.cpp:1585
-msgid ""
-"Select the audio device. This will take effect for the next started "
-"video."
-msgstr ""
-"Избор на звуково устройство. Ще влезе в ефект при следващото "
-"стартиране на видеото."
-
-#: src/gui.cpp:1589 src/gui.cpp:2680
-msgid "Default"
-msgstr "По подразбиране"
-
-#: src/gui.cpp:1606
-msgid "Audio delay (ms):"
-msgstr "Закъснение на звука (мсек)"
-
-#: src/gui.cpp:1607
-msgid ""
-"Set an audio delay, in milliseconds. This is useful if audio and video "
-"are not in sync."
-msgstr ""
-"Настройва закъснението на звука. Използва се когато звука и видеото не "
-"са синхронизирани."
-
-#: src/gui.cpp:1664
-msgid "Subtitle Settings"
-msgstr "Настройки на субтитрите"
-
-#: src/gui.cpp:1667
-msgid ""
-"These settings apply only to soft subtitles, not to bitmaps. Some "
-"changes require a restart of the video to take effect."
-msgstr ""
-"Тези настройки се отнасят само за текстови субтитри. Някои от "
-"настройките изискват рестартиране на видеото за да влязат в сила."
-
-#: src/gui.cpp:1670
-msgid "Encoding:"
-msgstr "Кодировка:"
-
-#: src/gui.cpp:1671
-msgid "Set the subtitle character set encoding."
-msgstr "Кодировка на субтитрите."
-
-#: src/gui.cpp:1686
-msgid "Override font:"
-msgstr "Шрифт:"
-
-#: src/gui.cpp:1687
-msgid "Override the subtitle font family."
-msgstr "Шрифт на субтитрите."
-
-#: src/gui.cpp:1696
-msgid "Override font size:"
-msgstr "Размер на шрифта:"
-
-#: src/gui.cpp:1697
-msgid "Override the subtitle font size."
-msgstr "Размер на шрифта на субтитрите."
-
-#: src/gui.cpp:1707
-msgid "Override scale factor:"
-msgstr "Коефициент на уголемяване:"
-
-#: src/gui.cpp:1708
-msgid "Override the subtitle scale factor."
-msgstr "Коефициент на уголемяване на субтитрите."
-
-#: src/gui.cpp:1719
-msgid "Override color:"
-msgstr "Цвят на шрифта:"
-
-#: src/gui.cpp:1720
-msgid "Override the subtitle color."
-msgstr "Цвят на субтитрите."
-
-#: src/gui.cpp:1729
-msgid "Override shadow:"
-msgstr "Сянка на шрифта:"
-
-#: src/gui.cpp:1730
-msgid "Override the subtitle shadow."
-msgstr "Сянка на субтитрите."
-
-#: src/gui.cpp:1735
-msgid "On"
-msgstr "Включване"
-
-#: src/gui.cpp:1946
-msgid "Video Settings"
-msgstr "Видео настройки"
-
-#: src/gui.cpp:1948
-msgid "Crop to aspect ratio:"
-msgstr "Изрязване до съотношение:"
-
-#: src/gui.cpp:1949
-msgid ""
-"Set the real aspect ratio of the video, so that borders can be cropped.</"
-"p>"
-msgstr ""
-"Задаване на реалното съотношение на видеото, така че рамките да могат да "
-"бъдат изрязани."
-
-#: src/gui.cpp:1952
-msgid "Do not crop"
-msgstr "Без изрязване"
-
-#: src/gui.cpp:1965
-#, fuzzy
-msgid "Force source aspect ratio:"
-msgstr "Изрязване до съотношение:"
-
-#: src/gui.cpp:1966
-#, fuzzy
-msgid "Force the aspect ratio of video source."
-msgstr ""
-"Задаване на реалното съотношение на видеото, така че рамките да могат да "
-"бъдат изрязани."
-
-#: src/gui.cpp:1969
-#, fuzzy
-msgid "Do not force"
-msgstr "Без изрязване"
-
-#: src/gui.cpp:1982
-msgid "Parallax:"
-msgstr "Паралакс:"
-
-#: src/gui.cpp:1983
-msgid ""
-"Adjust parallax, from -1 to +1. This changes the separation of left and "
-"right view, and thus the perceived distance of the scene."
-msgstr ""
-"Настройка на паралакса, от -1 до +1. Тази настройка определя "
-"раздалечаването между левия и десния изглед, т.е. дълбочината на сцената."
-
-#: src/gui.cpp:1996
-msgid "Subtitle parallax:"
-msgstr "Паралакс на субтитрите:"
-
-#: src/gui.cpp:1997
-msgid ""
-"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
-"distance of the subtitles."
-msgstr ""
-"Настройка на паралакса на субтитрите, от -1 до +1. Тази настройка "
-"определя дълбочината на субтитрите."
-
-#: src/gui.cpp:2010
-msgid "Ghostbusting:"
-msgstr "Подтискане на смесването:"
-
-#: src/gui.cpp:2011
-msgid ""
-"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
-"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
-"does not work with anaglyph glasses."
-msgstr ""
-"Задава нивото на подтискане на смесването между левия и десния изглед, от "
-"0 до 1. Трябва да настроите първо нивата на подтискане на дисплея. Тази "
-"опция не работи с анаглифни очила."
-
-#: src/gui.cpp:2195
-msgid "SDI Output Settings"
-msgstr "Настройки на SDI изход"
-
-#: src/gui.cpp:2197
-msgid "SDI Output Format:"
-msgstr "SDI изходен формат:"
-
-#: src/gui.cpp:2198
-msgid "Select output format used for SDI output."
-msgstr "Избор на формат за SDI изхода."
-
-#: src/gui.cpp:2206
-msgid "Left stereo mode:"
-msgstr "Ляв стерео режим:"
-
-#: src/gui.cpp:2207
-msgid "Select stereo mode used for left SDI output."
-msgstr "Избор на стерео режим за левия SDI изход."
-
-#: src/gui.cpp:2235
-msgid "Right stereo mode:"
-msgstr "Десен стерео режим:"
-
-#: src/gui.cpp:2236
-msgid "Select stereo mode used for right SDI output."
-msgstr "Избор на стерео режим за десния SDI изход."
-
-#: src/gui.cpp:2676
-msgid "Open device(s)"
-msgstr "Отваряне на устройство"
-
-#: src/gui.cpp:2679
-msgid "Choose a device type."
-msgstr "Избор на типа на устройството."
-
-#: src/gui.cpp:2681 src/media_object.cpp:831
-msgid "Firewire"
-msgstr "Firewire"
-
-#: src/gui.cpp:2682 src/media_object.cpp:832
-msgid "X11"
-msgstr "X11"
-
-#: src/gui.cpp:2685 src/gui.cpp:2688
-msgid "Choose a device."
-msgstr "Избор на устройство."
-
-#: src/gui.cpp:2691
-msgid "Set the X11 device string. Refer to the manual for details."
-msgstr ""
-"Задаване на X11 низ на устройството. Вижте ръководството за повече "
-"информация."
-
-#: src/gui.cpp:2715
-msgid "First device:"
-msgstr "Първо устройство:"
-
-#: src/gui.cpp:2716
-msgid "Second device:"
-msgstr "Второ устройство:"
-
-#: src/gui.cpp:2720
-msgid "Request frame size"
-msgstr "Изискване на размер на кадъра"
-
-#: src/gui.cpp:2721
-msgid ""
-"Request a specific frame size from the device, e.g. 640x480. The device "
-"must support this frame size. Some devices require a frame size to be "
-"selected."
-msgstr ""
-"Изискване на специфичен размер на кадъра от устройството, например "
-"640x480. Устройството трябва да поддържа този размер. Някои устройства "
-"изискват размера на кадъра да бъде зададен."
-
-#: src/gui.cpp:2732
-msgid "Request frame rate"
-msgstr "Изискване на кадрова честота"
-
-#: src/gui.cpp:2733
-msgid ""
-"Request a specific frame rate from the device, e.g. 25/1. The device must "
-"support this frame rate. Some devices require a frame rate to be selected.</"
-"p>"
-msgstr ""
-"Изискване на специфична кадрова честота от устройството, например 25/1. "
-"Устройството трябва да поддържа тази честота. Някои устройства изискват "
-"честотата да бъде зададена."
-
-#: src/gui.cpp:2744
-msgid "Request MJPEG format"
-msgstr "Изискване на MJPEG формат"
-
-#: src/gui.cpp:2745
-msgid ""
-"Request MJPEG data from the input device. The device may ignore this "
-"request."
-msgstr ""
-"Изискване на MJPEG данни от устройството. Някои устройства може да "
-"игнорират тази заявка."
-
-#: src/gui.cpp:2748 src/gui.cpp:3523
-msgid "Cancel"
-msgstr "Отказ"
-
-#: src/gui.cpp:3046
-msgid "&File"
-msgstr "Файл"
-
-#: src/gui.cpp:3047
-msgid "&Open file(s)..."
-msgstr "Отваряне на файл(ове)"
-
-#: src/gui.cpp:3052
-msgid "Open &URL(s)..."
-msgstr "Отваряне на адрес(и)"
-
-#: src/gui.cpp:3056
-msgid "Open &device(s)..."
-msgstr "Отваряне на устройство"
-
-#: src/gui.cpp:3071
-msgid "&Clear recent files"
-msgstr "Изчистване на историята"
-
-#: src/gui.cpp:3079
-msgid "&Quit"
-msgstr "Изход"
-
-#: src/gui.cpp:3085
-msgid "&Preferences"
-msgstr "Предпочитания"
-
-#: src/gui.cpp:3088
-msgid "&Fullscreen Settings..."
-msgstr "Настройки за пълен екран"
-
-#: src/gui.cpp:3091
-msgid "Display &Color Adjustments..."
-msgstr "Настройки на цветовете"
-
-#: src/gui.cpp:3094
-msgid "Display Cross&talk Calibration..."
-msgstr "Калибриране на Crosstalk"
-
-#: src/gui.cpp:3098
-msgid "Quality Adjustments..."
-msgstr "Настройки на качеството"
-
-#: src/gui.cpp:3102
-msgid "&Zoom for wide videos..."
-msgstr "Увеличаване при широко видео..."
-
-#: src/gui.cpp:3106
-msgid "&Audio Settings..."
-msgstr "Настройки на звука"
-
-#: src/gui.cpp:3110
-msgid "&Subtitle Settings..."
-msgstr "Настройки на субтитрите"
-
-#: src/gui.cpp:3114
-msgid "Current &Video Settings..."
-msgstr "Настройки на текущото видео"
-
-#: src/gui.cpp:3119
-msgid "SDI &Output Settings..."
-msgstr "Настройки на SDI изход..."
-
-#: src/gui.cpp:3123
-msgid "&Help"
-msgstr "Помощ"
-
-#: src/gui.cpp:3124
-msgid "&Manual..."
-msgstr "Ръководство"
-
-#: src/gui.cpp:3129
-msgid "&Website..."
-msgstr "Интернет страница"
-
-#: src/gui.cpp:3133
-msgid "&Keyboard Shortcuts"
-msgstr "Бързи клавиши"
-
-#: src/gui.cpp:3137
-msgid "&About"
-msgstr "Относно"
-
-#: src/gui.cpp:3470
-msgid "Tip"
-msgstr "Съвет"
-
-#: src/gui.cpp:3473
-msgid ""
-"You can select and open multiple files at once.This is useful for "
-"example if you have extra subtitle files, or if left and right view are "
-"stored in separate files."
-msgstr ""
-"Може да избирате и да отваряте множество файлове.Това е полезно "
-"например когато имате субтитри в отделен файл, или левия и десния канал "
-"са в отделни файлове"
-
-#: src/gui.cpp:3476
-msgid "Do not show this message again."
-msgstr "Да не се показва повече."
-
-#: src/gui.cpp:3493
-msgid "Open files"
-msgstr "Отваряне на файлове"
-
-#: src/gui.cpp:3517
-msgid "Open URL(s)"
-msgstr "Отваряне на адрес(и)"
-
-#: src/gui.cpp:3518
-msgid "URL(s):"
-msgstr "Адрес(и)"
-
-#: src/gui.cpp:3519
-msgid "Enter one or more space separated URLs."
-msgstr "Въведете един или повече адреси, разделени с интервал."
-
-#: src/gui.cpp:3732 src/gui.cpp:3740 src/video_output_qt.cpp:291
-#: src/video_output_qt.cpp:534 src/video_output_qt.cpp:731
-#: src/video_output_qt.cpp:743 src/video_output_qt.cpp:764
-msgid "Error"
-msgstr "Грешка"
-
-#: src/gui.cpp:3732
-msgid "Cannot open manual."
-msgstr "Ръководството не може да бъде отворено."
-
-#: src/gui.cpp:3740
-msgid "Cannot open website."
-msgstr "Интернет страницата не може да бъде отворена."
-
-#: src/gui.cpp:3748
-msgid "Keyboard Shortcuts"
-msgstr "Бързи клавиши"
-
-#: src/gui.cpp:3751
-msgid "Keyboard control:"
-msgstr "Контролиране с клавиатура:"
-
-#: src/gui.cpp:3753 src/main.cpp:534
-msgid "ESC"
-msgstr "ESC"
-
-#: src/gui.cpp:3753
-msgid "Stop"
-msgstr "Спиране"
-
-#: src/gui.cpp:3754 src/main.cpp:536
-msgid "SPACE"
-msgstr "SPACE"
-
-#: src/gui.cpp:3754 src/main.cpp:536
-msgid "Pause / unpause"
-msgstr "Пауза / Пускане"
-
-#: src/gui.cpp:3755 src/main.cpp:537
-msgid "Toggle fullscreen"
-msgstr "Превключване на пълен екран"
-
-#: src/gui.cpp:3756 src/main.cpp:538
-msgid "Center window"
-msgstr "Центриране на прозореца"
-
-#: src/gui.cpp:3757 src/main.cpp:539
-msgid "Swap left/right eye"
-msgstr "Размяна ляво/дясно"
-
-#: src/gui.cpp:3758 src/main.cpp:540
-msgid "Cycle through available video streams"
-msgstr "Превключване между наличните видео потоци"
-
-#: src/gui.cpp:3759 src/main.cpp:541
-msgid "Cycle through available audio streams"
-msgstr "Превключване между наличните аудио потоци"
-
-#: src/gui.cpp:3760 src/main.cpp:542
-msgid "Cycle through available subtitle streams"
-msgstr "Превключване между наличните субтитри"
-
-#: src/gui.cpp:3761 src/main.cpp:543
-msgid "Adjust contrast"
-msgstr "Настройка на контраста"
-
-#: src/gui.cpp:3762 src/main.cpp:544
-msgid "Adjust brightness"
-msgstr "Настройка на яркостта"
-
-#: src/gui.cpp:3763 src/main.cpp:545
-msgid "Adjust hue"
-msgstr "Настройка на оттенъка"
-
-#: src/gui.cpp:3764 src/main.cpp:546
-msgid "Adjust saturation"
-msgstr "Настройка на наситеността"
-
-#: src/gui.cpp:3765 src/main.cpp:547
-msgid "Adjust parallax"
-msgstr "Настройка на паралакса"
-
-#: src/gui.cpp:3766 src/main.cpp:548
-msgid "Adjust ghostbusting"
-msgstr "Настройка на подтискането на смесване между изгледите"
-
-#: src/gui.cpp:3767 src/main.cpp:549
-msgid "Adjust zoom for wide videos"
-msgstr "Настройка на увеличението за широко видео"
-
-#: src/gui.cpp:3768 src/main.cpp:550
-msgid "Adjust audio volume"
-msgstr "Настройка на нивото на звука"
-
-#: src/gui.cpp:3769 src/main.cpp:551
-msgid "Toggle audio mute"
-msgstr "Заглушаване на звука"
-
-#: src/gui.cpp:3770 src/main.cpp:552
-msgid "Step a single video frame forward"
-msgstr "Преминаване един кадър напред"
-
-#: src/gui.cpp:3771 src/main.cpp:553
-msgid "left, right"
-msgstr "ляво, дясно"
-
-#: src/gui.cpp:3771 src/main.cpp:553
-msgid "Seek 10 seconds backward / forward"
-msgstr "Преминаване 10 секунди назад / напред"
-
-#: src/gui.cpp:3772 src/main.cpp:554
-msgid "down, up"
-msgstr "надолу, нагоре"
-
-#: src/gui.cpp:3772 src/main.cpp:554
-msgid "Seek 1 minute backward / forward"
-msgstr "Преминаване 1 минута назад / напред"
-
-#: src/gui.cpp:3773 src/main.cpp:555
-msgid "page down, page up"
-msgstr "страница надолу, страница нагоре"
-
-#: src/gui.cpp:3773 src/main.cpp:555
-msgid "Seek 10 minutes backward / forward"
-msgstr "Преминаване 10 минути назад / напред"
-
-#: src/gui.cpp:3774 src/main.cpp:557
-msgid "Media keys"
-msgstr "Мултимедийни клавиши"
-
-#: src/gui.cpp:3774 src/main.cpp:557
-msgid "Media keys should work as expected"
-msgstr "Мултимедийните клавиши трябва да работят нормално"
-
-#: src/gui.cpp:3790
-#, c-format
-msgid "About %s"
-msgstr "Относно %s"
-
-#: src/gui.cpp:3796
-#, c-format
-msgid "The %s 3D video player"
-msgstr "%s 3D видео плеър"
-
-#: src/gui.cpp:3801
-#, c-format
-msgid ""
-"%s version %s.Copyright (C) 2014 the Bino developers.This "
-"is free software. You may redistribute copies of it under the terms of the "
-"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
-"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
-"\"%s\">%s</a> for more information on this software."
-msgstr ""
-"%s версия %s.Всички права запазени (C) 2014 от разработчиците на "
-"Bino.Тази програма е свободен софтуер. Може да разпространявате нейни "
-"копия според условията на <a href=\"http://www.gnu.org/licenses/gpl.html"
-"\">GNU General Public License</a>. Програмата идва без НИКАКВА ГАРАНЦИЯ, "
-"доколкото това е позволено от закона.Вижте <a href=\"%s\">%s</a> за "
-"повече информация."
-
-#: src/gui.cpp:3813 src/main.cpp:419
-msgid "Platform:"
-msgstr "Платформа:"
-
-#: src/gui.cpp:3814 src/main.cpp:421
-msgid "Libraries used:"
-msgstr "Използвани библиотеки:"
-
-#: src/gui.cpp:3836
-msgid "About"
-msgstr "Относно"
-
-#: src/gui.cpp:3837
-msgid "Libraries"
-msgstr "Библиотеки"
-
-#: src/gui.cpp:3838
-msgid "Team"
-msgstr "Екип"
-
-#: src/gui.cpp:3839
-msgid "License"
-msgstr "Лиценз"
-
-#: src/lib_versions.cpp:183 src/lib_versions.cpp:195
-msgid "not used"
-msgstr "не се използва"
-
-#: src/lirc.cpp:61
-msgid "Cannot initialize LIRC."
-msgstr "Не може да се инициализира LIRC."
-
-#: src/lirc.cpp:67
-msgid "Cannot set LIRC socket properties."
-msgstr "Не могат да бъдат зададени свойствата на LIRC сокета."
-
-#: src/lirc.cpp:74
-msgid "Cannot read LIRC default configuration."
-msgstr "Не може да бъде прочетена стандартната конфигурация на LIRC."
-
-#: src/lirc.cpp:89
-#, c-format
-msgid "Cannot read LIRC configuration file %s."
-msgstr "Не може да бъде прочетен конфигурационният файл на LIRC %s."
-
-#: src/lirc.cpp:117
-msgid "Cannot get LIRC event; disabling LIRC support."
-msgstr "Не може да се получи LIRC събитие; изключване на LIRC поддръжката."
-
-#: src/lirc.cpp:131
-#, c-format
-msgid "Received invalid command '%s' from LIRC."
-msgstr "Получена е невалидна команда '%s' от LIRC."
-
-#: src/lirc.cpp:141
-msgid "Cannot get command for LIRC code."
-msgstr "Не можа да се вземе командата за LIRC кода."
-
-#: src/main.cpp:414
-#, c-format
-msgid "%s version %s"
-msgstr "%s версия %s"
-
-#: src/main.cpp:415
-msgid "Copyright (C) 2014 the Bino developers."
-msgstr "Всички права запазени (C) 2014 от разработчиците на Bino."
-
-#: src/main.cpp:416
-msgid ""
-"This is free software. You may redistribute copies of it under the terms of "
-"the GNU General Public License. There is NO WARRANTY, to the extent "
-"permitted by law."
-msgstr ""
-"Тази програма е свободен софтуер. Може да разпространявате нейни копия "
-"според условията на GNU General Public License. Програмата идва без НИКАКВА "
-"ГАРАНЦИЯ, доколкото това е позволено от закона."
-
-#. TRANSLATORS: This is the --help text. Please keep the line length limited.
-#. * The --help output should look good with a line width of 80 characters.
-#: src/main.cpp:434
-msgid "Usage:"
-msgstr "Използване:"
-
-#: src/main.cpp:436
-msgid "Options:"
-msgstr "Опции:"
-
-#: src/main.cpp:437
-msgid "Print help"
-msgstr "Отпечатване на помощта"
-
-#: src/main.cpp:438
-msgid "Print version"
-msgstr "Отпечатване на версията"
-
-#: src/main.cpp:439
-msgid "Do not use the GUI, just show a plain window"
-msgstr "Без използване на графичен интерфейс, само просто прозорец"
-
-#: src/main.cpp:440
-msgid "Append all log messages to the given file"
-msgstr "Прибавяне на всички съобщения на дневника към избрания файл"
-
-#: src/main.cpp:441
-msgid "Set log level (debug/info/warning/error/quiet)"
-msgstr ""
-"Ниво на докладване на съобщения в дневника (debug/info/warning/error/quiet)"
-
-#: src/main.cpp:442
-msgid "Print a list of known audio devices and exit"
-msgstr "Отпечатване на списък с известни аудио устройства и затваряне"
-
-#: src/main.cpp:443
-msgid "Use audio device number N (N=0 is the default)"
-msgstr "Използване на аудио устройство номер N (N=0 е по подразбиране)"
-
-#: src/main.cpp:444
-msgid "Delay audio by D milliseconds (default 0)"
-msgstr "Забавяне на звука с D милисекунди (по подразбиране 0)"
-
-#: src/main.cpp:445
-msgid "Set audio volume (0 to 1, default 1)"
-msgstr "Задаване на нивото на звука (0 до 1, по подразбиране 1)"
-
-#: src/main.cpp:446
-msgid "Mute audio"
-msgstr "Заглушаване на звука"
-
-#: src/main.cpp:447
-msgid "Type of input device: default, firewire, x11"
-msgstr "Тип на устройството: default, firewire, x11"
-
-#: src/main.cpp:448
-msgid "Request frame size WxH from input device"
-msgstr "Изискване на размер на кадъра WxH от входното устройство"
-
-#: src/main.cpp:449
-msgid "Request frame rate N/D from input device"
-msgstr "Изискване на кадтова честота N/D от входното устройство"
-
-#: src/main.cpp:450
-msgid "Request device format 'default' or 'mjpeg'"
-msgstr "Изискване на формат 'default' или 'mjpeg'"
-
-#: src/main.cpp:451
-msgid "Read commands from a file"
-msgstr "Прочитане на командите от файл"
-
-#: src/main.cpp:452
-msgid "Use the given LIRC configuration file"
-msgstr "Използване на избрания LIRC конфигурационен файл"
-
-#: src/main.cpp:453
-msgid "This option can be used more than once"
-msgstr "Тази опция може да бъде използвана повече от веднъж"
-
-#: src/main.cpp:454
-msgid "Output quality (0=fastest to 4=best/default)"
-msgstr "Изходно качество (0=най-бързо, 4=най-добро/по подразбиране)"
-
-#: src/main.cpp:455
-msgid "Select video stream (1-n, depending on input)"
-msgstr "Избор на видео поток (1-n, зависи от входа)"
-
-#: src/main.cpp:456
-msgid "Select audio stream (1-n, depending on input)"
-msgstr "Избор на аудио поток (1-n, зависи от входа)"
-
-#: src/main.cpp:457
-msgid "Select subtitle stream (0-n, dep. on input)"
-msgstr "Избор на поток на субтитрите (1-n, зависи от входа)"
-
-#: src/main.cpp:458
-msgid "Select input type (default autodetect):"
-msgstr "Избор на типа на входа (по подразбиране се засича автоматично)"
-
-#: src/main.cpp:474
-msgid "Select output type:"
-msgstr "Избор на типа на изхода:"
+msgstr "Червени/Зелени очила, монохромно"
+
+#: src/main.cpp:500
+msgid "Red/blue glasses, monochrome"
+msgstr "Червени/Сини очила, монохромно"
 
 #: src/main.cpp:501
 msgid "Multi-display via Equalizer (2D setup)"
@@ -1556,6 +679,10 @@
 msgstr "Интерактивен контрол:"
 
 #: src/main.cpp:534
+msgid "ESC"
+msgstr "ESC"
+
+#: src/main.cpp:534
 msgid "Leave fullscreen mode, or quit"
 msgstr "Напускане на пълноекранния режим или изход"
 
@@ -1563,6 +690,102 @@
 msgid "Quit"
 msgstr "Изход"
 
+#: src/main.cpp:536
+msgid "SPACE"
+msgstr "SPACE"
+
+#: src/main.cpp:536
+msgid "Pause / unpause"
+msgstr "Пауза / Пускане"
+
+#: src/main.cpp:537
+msgid "Toggle fullscreen"
+msgstr "Превключване на пълен екран"
+
+#: src/main.cpp:538
+msgid "Center window"
+msgstr "Центриране на прозореца"
+
+#: src/main.cpp:539
+msgid "Swap left/right eye"
+msgstr "Размяна ляво/дясно"
+
+#: src/main.cpp:540
+msgid "Cycle through available video streams"
+msgstr "Превключване между наличните видео потоци"
+
+#: src/main.cpp:541
+msgid "Cycle through available audio streams"
+msgstr "Превключване между наличните аудио потоци"
+
+#: src/main.cpp:542
+msgid "Cycle through available subtitle streams"
+msgstr "Превключване между наличните субтитри"
+
+#: src/main.cpp:543
+msgid "Adjust contrast"
+msgstr "Настройка на контраста"
+
+#: src/main.cpp:544
+msgid "Adjust brightness"
+msgstr "Настройка на яркостта"
+
+#: src/main.cpp:545
+msgid "Adjust hue"
+msgstr "Настройка на оттенъка"
+
+#: src/main.cpp:546
+msgid "Adjust saturation"
+msgstr "Настройка на наситеността"
+
+#: src/main.cpp:547
+msgid "Adjust parallax"
+msgstr "Настройка на паралакса"
+
+#: src/main.cpp:548
+msgid "Adjust ghostbusting"
+msgstr "Настройка на подтискането на смесване между изгледите"
+
+#: src/main.cpp:549
+msgid "Adjust zoom for wide videos"
+msgstr "Настройка на увеличението за широко видео"
+
+#: src/main.cpp:550
+msgid "Adjust audio volume"
+msgstr "Настройка на нивото на звука"
+
+#: src/main.cpp:551
+msgid "Toggle audio mute"
+msgstr "Заглушаване на звука"
+
+#: src/main.cpp:552
+msgid "Step a single video frame forward"
+msgstr "Преминаване един кадър напред"
+
+#: src/main.cpp:553
+msgid "left, right"
+msgstr "ляво, дясно"
+
+#: src/main.cpp:553
+msgid "Seek 10 seconds backward / forward"
+msgstr "Преминаване 10 секунди назад / напред"
+
+#: src/main.cpp:554
+msgid "down, up"
+msgstr "надолу, нагоре"
+
+#: src/main.cpp:554
+msgid "Seek 1 minute backward / forward"
+msgstr "Преминаване 1 минута назад / напред"
+
+#: src/main.cpp:555
+msgid "page down, page up"
+msgstr "страница надолу, страница нагоре"
+
+#: src/main.cpp:555
+msgid "Seek 10 minutes backward / forward"
+msgstr "Преминаване 10 минути назад / напред"
+
 #: src/main.cpp:556
 msgid "Mouse click"
 msgstr "Щракане с мишката"
@@ -1571,20 +794,28 @@
 msgid "Seek according to horizontal click position"
 msgstr "Превъртане според хоризонталната позиция на щракването"
 
-#: src/main.cpp:626
+#: src/main.cpp:557
+msgid "Media keys"
+msgstr "Мултимедийни клавиши"
+
+#: src/main.cpp:557
+msgid "Media keys should work as expected"
+msgstr "Мултимедийните клавиши трябва да работят нормално"
+
+#: src/main.cpp:627
 msgid "No audio devices known."
 msgstr "Няма познати аудио устройства."
 
-#: src/main.cpp:641
+#: src/main.cpp:642
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Режим на тестване: синхронизацията на звук и време е изключена."
 
-#: src/main.cpp:655
+#: src/main.cpp:656
 #, c-format
 msgid "Unknown mode %s."
 msgstr "Непознат режим %s."
 
-#: src/main.cpp:787
+#: src/main.cpp:788
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Тази версия на Bino е компилирана без поддръжка на LIRC."
 
@@ -1600,6 +831,10 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d канал(а)., %g kHz, %d бита"
 
+#: src/media_input.cpp:276
+msgid "Input:"
+msgstr "Вход:"
+
 #: src/media_input.cpp:281
 #, c-format
 msgid "Video %s: %s"
@@ -1658,6 +893,14 @@
 msgid "No support available for %s device."
 msgstr "Няма поддръжка за устройство %s."
 
+#: src/media_object.cpp:831
+msgid "Firewire"
+msgstr "Firewire"
+
+#: src/media_object.cpp:832
+msgid "X11"
+msgstr "X11"
+
 #: src/media_object.cpp:833
 msgid "default"
 msgstr "по подразбиране"
@@ -1864,6 +1107,12 @@
 msgid "Cannot create a PBO buffer."
 msgstr "Не може да се създаде PBO буфер."
 
+#: src/video_output_qt.cpp:291 src/video_output_qt.cpp:534
+#: src/video_output_qt.cpp:731 src/video_output_qt.cpp:743
+#: src/video_output_qt.cpp:764
+msgid "Error"
+msgstr "Грешка"
+
 #: src/video_output_qt.cpp:636
 #, c-format
 msgid "Cannot initialize GLEW: %s"
@@ -1897,5 +1146,573 @@
 msgid "Cannot resume screensaver."
 msgstr "Предпазителя на екрана не може да бъде активиран"
 
+#~ msgid "Video:"
+#~ msgstr "Видео:"
+
+#~ msgid "Select the video stream."
+#~ msgstr "Избор на видео поток."
+
+#~ msgid "Audio:"
+#~ msgstr "Аудио:"
+
+#~ msgid "Select the audio stream."
+#~ msgstr "Избор на аудио поток."
+
+#~ msgid "Subtitle:"
+#~ msgstr "Субтитри:"
+
+#~ msgid "Select the subtitle stream."
+#~ msgstr "Избор на субтитри."
+
+#~ msgid "Set the 3D layout of the video stream."
+#~ msgstr "Избор на 3D разположение на видеото."
+
+#~ msgid "Output:"
+#~ msgstr "Изход:"
+
+#~ msgid "Set the 3D output type for your display."
+#~ msgstr "Избор на 3D типа на дисплея."
+
+#~ msgid "Swap left/right"
+#~ msgstr "Размяна на ляво/дясно"
+
+#~ msgid ""
+#~ "Swap the left and right view. Use this if the 3D effect seems wrong.</"
+#~ "p>"
+#~ msgstr "Размяна на левия и десния изглед."
+
+#~ msgid "Off"
+#~ msgstr "Изключено"
+
+#~ msgid ""
+#~ "This slider shows the progress during video playback, and can be used "
+#~ "to seek in the video."
+#~ msgstr ""
+#~ "Този плъзгач показва докъде е стигнало възпроизвеждането, и може да се "
+#~ "използва за превъртане."
+
+#~ msgid "Elapsed / total time."
+#~ msgstr "Изминало / Общо време."
+
+#~ msgid "Toggle audio mute."
+#~ msgstr "Заглушаване на звука."
+
+#~ msgid "Adjust audio volume."
+#~ msgstr "Задаване нивото на звука."
+
+#~ msgid "Play."
+#~ msgstr "Изпълняване."
+
+#~ msgid "Pause."
+#~ msgstr "Пауза."
+
+#~ msgid "Stop."
+#~ msgstr "Стоп."
+
+#~ msgid "Toggle loop mode."
+#~ msgstr "(Де)Активиране на повторение."
+
+#~ msgid ""
+#~ "Switch to fullscreen mode. You can leave fullscreen mode by pressing "
+#~ "the f key."
+#~ msgstr ""
+#~ "Превключване на пълноекранен режим. Можете да го напуснете чрез "
+#~ "натискане на клавиш f."
+
+#~ msgid "Center the video area on your screen."
+#~ msgstr "Центриране на видеото в екрана."
+
+#~ msgid "Seek backward 10 minutes."
+#~ msgstr "Назад 10 минути."
+
+#~ msgid "Seek backward 1 minute."
+#~ msgstr "Назад 1 минута."
+
+#~ msgid "Seek backward 10 seconds."
+#~ msgstr "Назад 10 секунди."
+
+#~ msgid "Seek forward 10 seconds."
+#~ msgstr "Напред 10 секунди."
+
+#~ msgid "Seek forward 1 minute."
+#~ msgstr "Напред 1 минута."
+
+#~ msgid "Seek forward 10 minutes."
+#~ msgstr "Напред 10 минути."
+
+#~ msgid "Fullscreen/Multiscreen Settings"
+#~ msgstr "Настройки на пълен екран/много екрани"
+
+#~ msgid "Configure fullscreen mode:"
+#~ msgstr "Конфигуриране на пълноекранния режим:"
+
+#~ msgid "Select the screens to use in fullscreen mode."
+#~ msgstr "Избор на екрани, които ще се използват в пълноекранен режим."
+
+#~ msgid "Single screen:"
+#~ msgstr "Единичен екран:"
+
+#~ msgid "Use a single screen for fullscreen mode."
+#~ msgstr "Използване на един екран за пълноекранния режим."
+
+#~ msgid "Primary screen"
+#~ msgstr "Основен екран"
+
+#~ msgid "Screen %d"
+#~ msgstr "Екран %d"
+
+#~ msgid "Dual screen:"
+#~ msgstr "Два екрана:"
+
+#~ msgid "Use two screens for fullscreen mode."
+#~ msgstr "Използване на два екрана за пълноекранния режим."
+
+#~ msgid "Multi screen:"
+#~ msgstr "Много екрани:"
+
+#~ msgid "Use multiple screens for fullscreen mode."
+#~ msgstr "Използване на множество екрани за пълноекранния режим."
+
+#~ msgid "Comma-separated list of screens to use for fullscreen mode."
+#~ msgstr ""
+#~ "Отделени със запетайка екрани, които да се използват в пълноекранния "
+#~ "режим."
+
+#~ msgid "When in fullscreen mode,"
+#~ msgstr "Когато е пълноекранен режим,"
+
+#~ msgid "Set special left/right view handling for fullscreen mode."
+#~ msgstr ""
+#~ "Настройка на специален ляв/десен изглед при пълноекранен режим."
+
+#~ msgid "flip left view vertically."
+#~ msgstr "обръщане на левия изглед вертикално."
+
+#~ msgid "flop left view horizontally."
+#~ msgstr "обръщане на левия изглед хоризонтално."
+
+#~ msgid "flip right view vertically."
+#~ msgstr "обръщане на десния изглед вертикално."
+
+#~ msgid "flop right view horizontally."
+#~ msgstr "обръщане на десния изглед хоризонтално."
+
+#~ msgid "use DLP(R) 3-D Ready Sync"
+#~ msgstr "използване на DLP(R) 3-D Ready синхронизация"
+
+#~ msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
+#~ msgstr ""
+#~ "използване на DLP&reg; 3-D Ready синхронизация за поддържаните изходни "
+#~ "режими."
+
+#~ msgid "inhibit the screensaver"
+#~ msgstr "подтискане на предпазителя на екрана"
+
+#~ msgid "Inhibit the screensaver during fullscreen playback."
+#~ msgstr ""
+#~ "Подтиска задействането на екранния предпазител по време на "
+#~ "пълноекранно възпроизвеждане."
+
+#~ msgid "OK"
+#~ msgstr "Добре"
+
+#~ msgid "Display Color Adjustments"
+#~ msgstr "Настройки на цветовете"
+
+#~ msgid "Contrast:"
+#~ msgstr "Контраст:"
+
+#~ msgid "Brightness:"
+#~ msgstr "Яркост:"
+
+#~ msgid "Hue:"
+#~ msgstr "Оттенък:"
+
+#~ msgid "Saturation:"
+#~ msgstr "Наситеност:"
+
+#~ msgid "Display Crosstalk Calibration"
+#~ msgstr "Калибриране на Crosstalk"
+
+#~ msgid ""
+#~ "Please read the manual to find out how to measure the crosstalk "
+#~ "levels of your display."
+#~ msgstr ""
+#~ "Моля прочетете ръководството за да разберете как да откриете нивата "
+#~ "на crosstalk за вашия дисплей."
+
+#~ msgid "Red:"
+#~ msgstr "Червено:"
+
+#~ msgid "Green:"
+#~ msgstr "Зелено:"
+
+#~ msgid "Blue:"
+#~ msgstr "Синьо:"
+
+#~ msgid "Rendering Quality Adjustments"
+#~ msgstr "Настройки на качеството на рендериране"
+
+#~ msgid "Rendering Quality:"
+#~ msgstr "Качество на рендериране:"
+
+#~ msgid "Zoom for wide videos"
+#~ msgstr "Увеличаване при широко видео"
+
+#~ msgid ""
+#~ "Set zoom level for videos that are wider than the screen: 0: "
+#~ "Show full video width. 1: Use full screen height."
+#~ msgstr ""
+#~ "Задава нивото на увеличаване когато видеото е по-широко от екрана:"
+#~ " 0: показване на пълната ширина на видеото. 1: използване на "
+#~ "пълноекранната височина."
+
+#~ msgid "Zoom:"
+#~ msgstr "Увеличаване:"
+
+#~ msgid "Set the zoom level for videos that are wider than the screen."
+#~ msgstr ""
+#~ "Задава нивото на увеличаване когато видеото е по-широко от екрана."
+
+#~ msgid "Audio Settings"
+#~ msgstr "Звукови настройки"
+
+#~ msgid "Audio device:"
+#~ msgstr "Звуково устройство:"
+
+#~ msgid ""
+#~ "Select the audio device. This will take effect for the next started "
+#~ "video."
+#~ msgstr ""
+#~ "Избор на звуково устройство. Ще влезе в ефект при следващото "
+#~ "стартиране на видеото."
+
+#~ msgid "Default"
+#~ msgstr "По подразбиране"
+
+#~ msgid "Audio delay (ms):"
+#~ msgstr "Закъснение на звука (мсек)"
+
+#~ msgid ""
+#~ "Set an audio delay, in milliseconds. This is useful if audio and "
+#~ "video are not in sync."
+#~ msgstr ""
+#~ "Настройва закъснението на звука. Използва се когато звука и видеото "
+#~ "не са синхронизирани."
+
+#~ msgid "Subtitle Settings"
+#~ msgstr "Настройки на субтитрите"
+
+#~ msgid ""
+#~ "These settings apply only to soft subtitles, not to bitmaps. Some "
+#~ "changes require a restart of the video to take effect."
+#~ msgstr ""
+#~ "Тези настройки се отнасят само за текстови субтитри. Някои от "
+#~ "настройките изискват рестартиране на видеото за да влязат в сила."
+
+#~ msgid "Encoding:"
+#~ msgstr "Кодировка:"
+
+#~ msgid "Set the subtitle character set encoding."
+#~ msgstr "Кодировка на субтитрите."
+
+#~ msgid "Override font:"
+#~ msgstr "Шрифт:"
+
+#~ msgid "Override the subtitle font family."
+#~ msgstr "Шрифт на субтитрите."
+
+#~ msgid "Override font size:"
+#~ msgstr "Размер на шрифта:"
+
+#~ msgid "Override the subtitle font size."
+#~ msgstr "Размер на шрифта на субтитрите."
+
+#~ msgid "Override scale factor:"
+#~ msgstr "Коефициент на уголемяване:"
+
+#~ msgid "Override the subtitle scale factor."
+#~ msgstr "Коефициент на уголемяване на субтитрите."
+
+#~ msgid "Override color:"
+#~ msgstr "Цвят на шрифта:"
+
+#~ msgid "Override the subtitle color."
+#~ msgstr "Цвят на субтитрите."
+
+#~ msgid "Override shadow:"
+#~ msgstr "Сянка на шрифта:"
+
+#~ msgid "Override the subtitle shadow."
+#~ msgstr "Сянка на субтитрите."
+
+#~ msgid "On"
+#~ msgstr "Включване"
+
+#~ msgid "Video Settings"
+#~ msgstr "Видео настройки"
+
+#~ msgid "Crop to aspect ratio:"
+#~ msgstr "Изрязване до съотношение:"
+
+#~ msgid ""
+#~ "Set the real aspect ratio of the video, so that borders can be cropped."
+#~ ""
+#~ msgstr ""
+#~ "Задаване на реалното съотношение на видеото, така че рамките да могат "
+#~ "да бъдат изрязани."
+
+#~ msgid "Do not crop"
+#~ msgstr "Без изрязване"
+
+#~ msgid "Parallax:"
+#~ msgstr "Паралакс:"
+
+#~ msgid ""
+#~ "Adjust parallax, from -1 to +1. This changes the separation of left "
+#~ "and right view, and thus the perceived distance of the scene."
+#~ msgstr ""
+#~ "Настройка на паралакса, от -1 до +1. Тази настройка определя "
+#~ "раздалечаването между левия и десния изглед, т.е. дълбочината на сцената."
+#~ ""
+
+#~ msgid "Subtitle parallax:"
+#~ msgstr "Паралакс на субтитрите:"
+
+#~ msgid ""
+#~ "Adjust subtitle parallax, from -1 to +1. This changes the perceived "
+#~ "distance of the subtitles."
+#~ msgstr ""
+#~ "Настройка на паралакса на субтитрите, от -1 до +1. Тази настройка "
+#~ "определя дълбочината на субтитрите."
+
+#~ msgid "Ghostbusting:"
+#~ msgstr "Подтискане на смесването:"
+
+#~ msgid ""
+#~ "Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+#~ "the crosstalk levels of your display first. Note that crosstalk "
+#~ "ghostbusting does not work with anaglyph glasses."
+#~ msgstr ""
+#~ "Задава нивото на подтискане на смесването между левия и десния изглед, "
+#~ "от 0 до 1. Трябва да настроите първо нивата на подтискане на дисплея. "
+#~ "Тази опция не работи с анаглифни очила."
+
+#~ msgid "SDI Output Settings"
+#~ msgstr "Настройки на SDI изход"
+
+#~ msgid "SDI Output Format:"
+#~ msgstr "SDI изходен формат:"
+
+#~ msgid "Select output format used for SDI output."
+#~ msgstr "Избор на формат за SDI изхода."
+
+#~ msgid "Left stereo mode:"
+#~ msgstr "Ляв стерео режим:"
+
+#~ msgid "Select stereo mode used for left SDI output."
+#~ msgstr "Избор на стерео режим за левия SDI изход."
+
+#~ msgid "Right stereo mode:"
+#~ msgstr "Десен стерео режим:"
+
+#~ msgid "Select stereo mode used for right SDI output."
+#~ msgstr "Избор на стерео режим за десния SDI изход."
+
+#~ msgid "Open device(s)"
+#~ msgstr "Отваряне на устройство"
+
+#~ msgid "Choose a device type."
+#~ msgstr "Избор на типа на устройството."
+
+#~ msgid "Choose a device."
+#~ msgstr "Избор на устройство."
+
+#~ msgid "Set the X11 device string. Refer to the manual for details."
+#~ msgstr ""
+#~ "Задаване на X11 низ на устройството. Вижте ръководството за повече "
+#~ "информация."
+
+#~ msgid "First device:"
+#~ msgstr "Първо устройство:"
+
+#~ msgid "Second device:"
+#~ msgstr "Второ устройство:"
+
+#~ msgid "Request frame size"
+#~ msgstr "Изискване на размер на кадъра"
+
+#~ msgid ""
+#~ "Request a specific frame size from the device, e.g. 640x480. The "
+#~ "device must support this frame size. Some devices require a frame size to "
+#~ "be selected."
+#~ msgstr ""
+#~ "Изискване на специфичен размер на кадъра от устройството, например "
+#~ "640x480. Устройството трябва да поддържа този размер. Някои устройства "
+#~ "изискват размера на кадъра да бъде зададен."
+
+#~ msgid "Request frame rate"
+#~ msgstr "Изискване на кадрова честота"
+
+#~ msgid ""
+#~ "Request a specific frame rate from the device, e.g. 25/1. The device "
+#~ "must support this frame rate. Some devices require a frame rate to be "
+#~ "selected."
+#~ msgstr ""
+#~ "Изискване на специфична кадрова честота от устройството, например "
+#~ "25/1. Устройството трябва да поддържа тази честота. Някои устройства "
+#~ "изискват честотата да бъде зададена."
+
+#~ msgid "Request MJPEG format"
+#~ msgstr "Изискване на MJPEG формат"
+
+#~ msgid ""
+#~ "Request MJPEG data from the input device. The device may ignore this "
+#~ "request."
+#~ msgstr ""
+#~ "Изискване на MJPEG данни от устройството. Някои устройства може да "
+#~ "игнорират тази заявка."
+
+#~ msgid "Cancel"
+#~ msgstr "Отказ"
+
+#~ msgid "&File"
+#~ msgstr "Файл"
+
+#~ msgid "&Open file(s)..."
+#~ msgstr "Отваряне на файл(ове)"
+
+#~ msgid "Open &URL(s)..."
+#~ msgstr "Отваряне на адрес(и)"
+
+#~ msgid "Open &device(s)..."
+#~ msgstr "Отваряне на устройство"
+
+#~ msgid "&Clear recent files"
+#~ msgstr "Изчистване на историята"
+
+#~ msgid "&Quit"
+#~ msgstr "Изход"
+
+#~ msgid "&Preferences"
+#~ msgstr "Предпочитания"
+
+#~ msgid "&Fullscreen Settings..."
+#~ msgstr "Настройки за пълен екран"
+
+#~ msgid "Display &Color Adjustments..."
+#~ msgstr "Настройки на цветовете"
+
+#~ msgid "Display Cross&talk Calibration..."
+#~ msgstr "Калибриране на Crosstalk"
+
+#~ msgid "Quality Adjustments..."
+#~ msgstr "Настройки на качеството"
+
+#~ msgid "&Zoom for wide videos..."
+#~ msgstr "Увеличаване при широко видео..."
+
+#~ msgid "&Audio Settings..."
+#~ msgstr "Настройки на звука"
+
+#~ msgid "&Subtitle Settings..."
+#~ msgstr "Настройки на субтитрите"
+
+#~ msgid "Current &Video Settings..."
+#~ msgstr "Настройки на текущото видео"
+
+#~ msgid "SDI &Output Settings..."
+#~ msgstr "Настройки на SDI изход..."
+
+#~ msgid "&Help"
+#~ msgstr "Помощ"
+
+#~ msgid "&Manual..."
+#~ msgstr "Ръководство"
+
+#~ msgid "&Website..."
+#~ msgstr "Интернет страница"
+
+#~ msgid "&Keyboard Shortcuts"
+#~ msgstr "Бързи клавиши"
+
+#~ msgid "&About"
+#~ msgstr "Относно"
+
+#~ msgid "Tip"
+#~ msgstr "Съвет"
+
+#~ msgid ""
+#~ "You can select and open multiple files at once.This is useful "
+#~ "for example if you have extra subtitle files, or if left and right "
+#~ "view are stored in separate files."
+#~ msgstr ""
+#~ "Може да избирате и да отваряте множество файлове.Това е полезно "
+#~ "например когато имате субтитри в отделен файл, или левия и десния "
+#~ "канал са в отделни файлове"
+
+#~ msgid "Do not show this message again."
+#~ msgstr "Да не се показва повече."
+
+#~ msgid "Open files"
+#~ msgstr "Отваряне на файлове"
+
+#~ msgid "Open URL(s)"
+#~ msgstr "Отваряне на адрес(и)"
+
+#~ msgid "URL(s):"
+#~ msgstr "Адрес(и)"
+
+#~ msgid "Enter one or more space separated URLs."
+#~ msgstr "Въведете един или повече адреси, разделени с интервал."
+
+#~ msgid "Cannot open manual."
+#~ msgstr "Ръководството не може да бъде отворено."
+
+#~ msgid "Cannot open website."
+#~ msgstr "Интернет страницата не може да бъде отворена."
+
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Бързи клавиши"
+
+#~ msgid "Keyboard control:"
+#~ msgstr "Контролиране с клавиатура:"
+
+#~ msgid "Stop"
+#~ msgstr "Спиране"
+
+#~ msgid "About %s"
+#~ msgstr "Относно %s"
+
+#~ msgid "The %s 3D video player"
+#~ msgstr "%s 3D видео плеър"
+
+#~ msgid ""
+#~ "%s version %s.Copyright (C) 2014 the Bino developers.</"
+#~ "p>This is free software. You may redistribute copies of it under the "
+#~ "terms of the <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General "
+#~ "Public License</a>. There is NO WARRANTY, to the extent permitted by law."
+#~ "See <a href=\"%s\">%s</a> for more information on this software.</"
+#~ "p>"
+#~ msgstr ""
+#~ "%s версия %s.Всички права запазени (C) 2014 от разработчиците "
+#~ "на Bino.Тази програма е свободен софтуер. Може да разпространявате "
+#~ "нейни копия според условията на <a href=\"http://www.gnu.org/licenses/gpl."
+#~ "html\">GNU General Public License</a>. Програмата идва без НИКАКВА "
+#~ "ГАРАНЦИЯ, доколкото това е позволено от закона.Вижте <a href=\"%s"
+#~ "\">%s</a> за повече информация."
+
+#~ msgid "About"
+#~ msgstr "Относно"
+
+#~ msgid "Libraries"
+#~ msgstr "Библиотеки"
+
+#~ msgid "Team"
+#~ msgstr "Екип"
+
+#~ msgid "License"
+#~ msgstr "Лиценз"
+
 #~ msgid "Need at least OpenGL 2.1."
 #~ msgstr "Изисква се поне OpenGL 2.1"

bino-1.6.1.tar.xz/po/bino.pot -> bino-1.6.5.tar.xz/po/bino.pot Changed

@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The Bino developers
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the bino package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: bino 1.6.1\n"
+"Project-Id-Version: bino 1.6.5\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2014-10-13 13:20+0200\n"
+"POT-Creation-Date: 2016-12-16 09:10+0100\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,31 +90,31 @@
 msgid "Too many arguments."
 msgstr ""
 
-#: src/base/str.cpp:269
+#: src/base/str.cpp:459
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr ""
 
-#: src/base/str.cpp:517 src/base/str.cpp:536 src/base/str.cpp:547
-#: src/base/str.cpp:559
+#: src/base/str.cpp:993 src/base/str.cpp:1012 src/base/str.cpp:1023
+#: src/base/str.cpp:1035
 #, c-format
 msgid "Cannot convert %s to %s: %s"
 msgstr ""
 
-#: src/base/str.cpp:565
+#: src/base/str.cpp:1041
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr ""
 
-#: src/base/thread.cpp:38 src/base/thread.cpp:48 src/base/thread.cpp:61
-#: src/base/thread.cpp:74 src/base/thread.cpp:85 src/base/thread.cpp:95
-#: src/base/thread.cpp:108 src/base/thread.cpp:116 src/base/thread.cpp:124
-#: src/base/thread.cpp:204 src/base/thread.cpp:211 src/base/thread.cpp:225
-#: src/base/thread.cpp:245
+#: src/base/pth.cpp:38 src/base/pth.cpp:48 src/base/pth.cpp:61
+#: src/base/pth.cpp:74 src/base/pth.cpp:85 src/base/pth.cpp:95
+#: src/base/pth.cpp:108 src/base/pth.cpp:116 src/base/pth.cpp:124
+#: src/base/pth.cpp:204 src/base/pth.cpp:211 src/base/pth.cpp:225
+#: src/base/pth.cpp:245
 msgid "System function failed: "
 msgstr ""
 
-#: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
+#: src/base/tmr.cpp:63 src/base/tmr.cpp:72 src/base/tmr.cpp:81
 msgid "Cannot get time."
 msgstr ""
 
@@ -237,985 +237,10 @@
 msgid "Subtitle stream %d not found."
 msgstr ""
 
-#: src/dispatch.cpp:559 src/main.cpp:795
+#: src/dispatch.cpp:559 src/main.cpp:796
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr ""
 
-#: src/gui.cpp:111
-msgid "Video:"
-msgstr ""
-
-#: src/gui.cpp:112
-msgid "Select the video stream."
-msgstr ""
-
-#: src/gui.cpp:118
-msgid "Audio:"
-msgstr ""
-
-#: src/gui.cpp:119
-msgid "Select the audio stream."
-msgstr ""
-
-#: src/gui.cpp:125
-msgid "Subtitle:"
-msgstr ""
-
-#: src/gui.cpp:126
-msgid "Select the subtitle stream."
-msgstr ""
-
-#: src/gui.cpp:137 src/media_input.cpp:276
-msgid "Input:"
-msgstr ""
-
-#: src/gui.cpp:138
-msgid "Set the 3D layout of the video stream."
-msgstr ""
-
-#: src/gui.cpp:142 src/main.cpp:459
-msgid "2D"
-msgstr ""
-
-#: src/gui.cpp:143 src/main.cpp:460
-msgid "Separate streams, left first"
-msgstr ""
-
-#: src/gui.cpp:144 src/main.cpp:461
-msgid "Separate streams, right first"
-msgstr ""
-
-#: src/gui.cpp:145 src/main.cpp:462
-msgid "Alternating, left first"
-msgstr ""
-
-#: src/gui.cpp:146 src/main.cpp:463
-msgid "Alternating, right first"
-msgstr ""
-
-#: 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: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:149 src/main.cpp:466
-msgid "Bottom/top"
-msgstr ""
-
-#: src/gui.cpp:150 src/main.cpp:467
-msgid "Bottom/top, half height"
-msgstr ""
-
-#: 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:152 src/gui.cpp:174 src/gui.cpp:2215 src/gui.cpp:2244
-#: src/main.cpp:469 src/main.cpp:482
-msgid "Left/right, half width"
-msgstr ""
-
-#: src/gui.cpp:153 src/main.cpp:470
-msgid "Right/left"
-msgstr ""
-
-#: src/gui.cpp:154 src/main.cpp:471
-msgid "Right/left, half width"
-msgstr ""
-
-#: src/gui.cpp:155 src/gui.cpp:175 src/gui.cpp:2216 src/gui.cpp:2245
-#: src/main.cpp:472 src/main.cpp:483
-msgid "Even/odd rows"
-msgstr ""
-
-#: src/gui.cpp:156 src/main.cpp:473
-msgid "Odd/even rows"
-msgstr ""
-
-#: src/gui.cpp:162
-msgid "Output:"
-msgstr ""
-
-#: src/gui.cpp:163
-msgid "Set the 3D output type for your display."
-msgstr ""
-
-#: src/gui.cpp:167 src/gui.cpp:2210 src/gui.cpp:2239 src/main.cpp:477
-msgid "Left view"
-msgstr ""
-
-#: src/gui.cpp:168 src/gui.cpp:2211 src/gui.cpp:2240 src/main.cpp:478
-msgid "Right view"
-msgstr ""
-
-#: src/gui.cpp:169 src/main.cpp:475
-msgid "OpenGL stereo"
-msgstr ""
-
-#: src/gui.cpp:170 src/main.cpp:476
-msgid "Left/right alternating"
-msgstr ""
-
-#: src/gui.cpp:176 src/gui.cpp:2217 src/gui.cpp:2246 src/main.cpp:484
-msgid "Even/odd columns"
-msgstr ""
-
-#: src/gui.cpp:177 src/gui.cpp:2218 src/gui.cpp:2247 src/main.cpp:485
-msgid "Checkerboard pattern"
-msgstr ""
-
-#: src/gui.cpp:178 src/main.cpp:486
-msgid "HDMI frame packing mode"
-msgstr ""
-
-#: src/gui.cpp:179 src/gui.cpp:2219 src/gui.cpp:2248 src/main.cpp:487
-msgid "Red/cyan glasses, monochrome"
-msgstr ""
-
-#: src/gui.cpp:180 src/gui.cpp:2220 src/gui.cpp:2249 src/main.cpp:488
-msgid "Red/cyan glasses, half color"
-msgstr ""
-
-#: src/gui.cpp:181 src/gui.cpp:2221 src/gui.cpp:2250 src/main.cpp:489
-msgid "Red/cyan glasses, full color"
-msgstr ""
-
-#: src/gui.cpp:182 src/gui.cpp:2222 src/gui.cpp:2251 src/main.cpp:490
-msgid "Red/cyan glasses, Dubois"
-msgstr ""
-
-#: src/gui.cpp:183 src/gui.cpp:2223 src/gui.cpp:2252 src/main.cpp:491
-msgid "Green/magenta glasses, monochrome"
-msgstr ""
-
-#: src/gui.cpp:184 src/gui.cpp:2224 src/gui.cpp:2253 src/main.cpp:492
-msgid "Green/magenta glasses, half color"
-msgstr ""
-
-#: src/gui.cpp:185 src/gui.cpp:2225 src/gui.cpp:2254 src/main.cpp:493
-msgid "Green/magenta glasses, full color"
-msgstr ""
-
-#: src/gui.cpp:186 src/gui.cpp:2226 src/gui.cpp:2255 src/main.cpp:494
-msgid "Green/magenta glasses, Dubois"
-msgstr ""
-
-#: src/gui.cpp:187 src/gui.cpp:2227 src/gui.cpp:2256 src/main.cpp:495
-msgid "Amber/blue glasses, monochrome"
-msgstr ""
-
-#: src/gui.cpp:188 src/gui.cpp:2228 src/gui.cpp:2257 src/main.cpp:496
-msgid "Amber/blue glasses, half color"
-msgstr ""
-
-#: src/gui.cpp:189 src/gui.cpp:2229 src/gui.cpp:2258 src/main.cpp:497
-msgid "Amber/blue glasses, full color"
-msgstr ""
-
-#: src/gui.cpp:190 src/gui.cpp:2230 src/gui.cpp:2259 src/main.cpp:498
-msgid "Amber/blue glasses, Dubois"
-msgstr ""
-
-#: src/gui.cpp:191 src/gui.cpp:2231 src/gui.cpp:2260 src/main.cpp:499
-msgid "Red/green glasses, monochrome"
-msgstr ""
-
-#: src/gui.cpp:192 src/gui.cpp:2232 src/gui.cpp:2261 src/main.cpp:500
-msgid "Red/blue glasses, monochrome"
-msgstr ""
-
-#: src/gui.cpp:196
-msgid "Swap left/right"
-msgstr ""
-
-#: src/gui.cpp:197
-msgid ""
-"Swap the left and right view. Use this if the 3D effect seems wrong."
-msgstr ""
-
-#: src/gui.cpp:475 src/gui.cpp:1736
-msgid "Off"
-msgstr ""
-
-#: src/gui.cpp:706
-msgid ""
-"This slider shows the progress during video playback, and can be used to "
-"seek in the video."
-msgstr ""
-
-#: src/gui.cpp:713
-msgid "Elapsed / total time."
-msgstr ""
-
-#: src/gui.cpp:720
-msgid "Toggle audio mute."
-msgstr ""
-
-#: src/gui.cpp:725
-msgid "Adjust audio volume."
-msgstr ""
-
-#: src/gui.cpp:737
-msgid "Play."
-msgstr ""
-
-#: src/gui.cpp:741
-msgid "Pause."
-msgstr ""
-
-#: src/gui.cpp:745
-msgid "Stop."
-msgstr ""
-
-#: src/gui.cpp:750
-msgid "Toggle loop mode."
-msgstr ""
-
-#: src/gui.cpp:757
-msgid ""
-"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
-"f key."
-msgstr ""
-
-#: src/gui.cpp:763
-msgid "Center the video area on your screen."
-msgstr ""
-
-#: src/gui.cpp:770
-msgid "Seek backward 10 minutes."
-msgstr ""
-
-#: src/gui.cpp:775
-msgid "Seek backward 1 minute."
-msgstr ""
-
-#: src/gui.cpp:781
-msgid "Seek backward 10 seconds."
-msgstr ""
-
-#: src/gui.cpp:787
-msgid "Seek forward 10 seconds."
-msgstr ""
-
-#: src/gui.cpp:792
-msgid "Seek forward 1 minute."
-msgstr ""
-
-#: src/gui.cpp:798
-msgid "Seek forward 10 minutes."
-msgstr ""
-
-#: src/gui.cpp:1059
-msgid "Fullscreen/Multiscreen Settings"
-msgstr ""
-
-#: src/gui.cpp:1061
-msgid "Configure fullscreen mode:"
-msgstr ""
-
-#: src/gui.cpp:1062
-msgid "Select the screens to use in fullscreen mode."
-msgstr ""
-
-#: src/gui.cpp:1064
-msgid "Single screen:"
-msgstr ""
-
-#: src/gui.cpp:1065
-msgid "Use a single screen for fullscreen mode."
-msgstr ""
-
-#: src/gui.cpp:1068
-msgid "Primary screen"
-msgstr ""
-
-#: src/gui.cpp:1071 src/gui.cpp:1082 src/gui.cpp:1083
-#, c-format
-msgid "Screen %d"
-msgstr ""
-
-#: src/gui.cpp:1074
-msgid "Dual screen:"
-msgstr ""
-
-#: src/gui.cpp:1075
-msgid "Use two screens for fullscreen mode."
-msgstr ""
-
-#: src/gui.cpp:1087
-msgid "Multi screen:"
-msgstr ""
-
-#: src/gui.cpp:1088
-msgid "Use multiple screens for fullscreen mode."
-msgstr ""
-
-#: src/gui.cpp:1090
-msgid "Comma-separated list of screens to use for fullscreen mode."
-msgstr ""
-
-#: src/gui.cpp:1093
-msgid "When in fullscreen mode,"
-msgstr ""
-
-#: src/gui.cpp:1094
-msgid "Set special left/right view handling for fullscreen mode."
-msgstr ""
-
-#: src/gui.cpp:1096
-msgid "flip left view vertically."
-msgstr ""
-
-#: src/gui.cpp:1098
-msgid "flop left view horizontally."
-msgstr ""
-
-#: src/gui.cpp:1100
-msgid "flip right view vertically."
-msgstr ""
-
-#: src/gui.cpp:1102
-msgid "flop right view horizontally."
-msgstr ""
-
-#: src/gui.cpp:1105
-msgid "use DLP(R) 3-D Ready Sync"
-msgstr ""
-
-#: src/gui.cpp:1106
-msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
-msgstr ""
-
-#: src/gui.cpp:1108
-msgid "inhibit the screensaver"
-msgstr ""
-
-#: src/gui.cpp:1109
-msgid "Inhibit the screensaver during fullscreen playback."
-msgstr ""
-
-#: src/gui.cpp:1111 src/gui.cpp:1277 src/gui.cpp:1412 src/gui.cpp:1473
-#: src/gui.cpp:1538 src/gui.cpp:1616 src/gui.cpp:1740 src/gui.cpp:2025
-#: src/gui.cpp:2264 src/gui.cpp:2750 src/gui.cpp:3477 src/gui.cpp:3524
-#: src/gui.cpp:3841
-msgid "OK"
-msgstr ""
-
-#: src/gui.cpp:1230
-msgid "Display Color Adjustments"
-msgstr ""
-
-#: src/gui.cpp:1232
-msgid "Contrast:"
-msgstr ""
-
-#: src/gui.cpp:1243
-msgid "Brightness:"
-msgstr ""
-
-#: src/gui.cpp:1254
-msgid "Hue:"
-msgstr ""
-
-#: src/gui.cpp:1265
-msgid "Saturation:"
-msgstr ""
-
-#: src/gui.cpp:1383
-msgid "Display Crosstalk Calibration"
-msgstr ""
-
-#. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/gui.cpp:1386
-msgid ""
-"Please read the manual to find out how to measure the crosstalk "
-"levels of your display."
-msgstr ""
-
-#: src/gui.cpp:1390
-msgid "Red:"
-msgstr ""
-
-#: src/gui.cpp:1397
-msgid "Green:"
-msgstr ""
-
-#: src/gui.cpp:1404
-msgid "Blue:"
-msgstr ""
-
-#: src/gui.cpp:1460
-msgid "Rendering Quality Adjustments"
-msgstr ""
-
-#: src/gui.cpp:1462
-msgid "Rendering Quality:"
-msgstr ""
-
-#: src/gui.cpp:1516
-msgid "Zoom for wide videos"
-msgstr ""
-
-#: src/gui.cpp:1519
-msgid ""
-"Set zoom level for videos that are wider than the screen: 0: Show "
-"full video width. 1: Use full screen height."
-msgstr ""
-
-#: src/gui.cpp:1523
-msgid "Zoom:"
-msgstr ""
-
-#: src/gui.cpp:1524
-msgid "Set the zoom level for videos that are wider than the screen."
-msgstr ""
-
-#: src/gui.cpp:1582
-msgid "Audio Settings"
-msgstr ""
-
-#: src/gui.cpp:1584
-msgid "Audio device:"
-msgstr ""
-
-#: src/gui.cpp:1585
-msgid ""
-"Select the audio device. This will take effect for the next started "
-"video."
-msgstr ""
-
-#: src/gui.cpp:1589 src/gui.cpp:2680
-msgid "Default"
-msgstr ""
-
-#: src/gui.cpp:1606
-msgid "Audio delay (ms):"
-msgstr ""
-
-#: src/gui.cpp:1607
-msgid ""
-"Set an audio delay, in milliseconds. This is useful if audio and video "
-"are not in sync."
-msgstr ""
-
-#: src/gui.cpp:1664
-msgid "Subtitle Settings"
-msgstr ""
-
-#: src/gui.cpp:1667
-msgid ""
-"These settings apply only to soft subtitles, not to bitmaps. Some "
-"changes require a restart of the video to take effect."
-msgstr ""
-
-#: src/gui.cpp:1670
-msgid "Encoding:"
-msgstr ""
-
-#: src/gui.cpp:1671
-msgid "Set the subtitle character set encoding."
-msgstr ""
-
-#: src/gui.cpp:1686
-msgid "Override font:"
-msgstr ""
-
-#: src/gui.cpp:1687
-msgid "Override the subtitle font family."
-msgstr ""
-
-#: src/gui.cpp:1696
-msgid "Override font size:"
-msgstr ""
-
-#: src/gui.cpp:1697
-msgid "Override the subtitle font size."
-msgstr ""
-
-#: src/gui.cpp:1707
-msgid "Override scale factor:"
-msgstr ""
-
-#: src/gui.cpp:1708
-msgid "Override the subtitle scale factor."
-msgstr ""
-
-#: src/gui.cpp:1719
-msgid "Override color:"
-msgstr ""
-
-#: src/gui.cpp:1720
-msgid "Override the subtitle color."
-msgstr ""
-
-#: src/gui.cpp:1729
-msgid "Override shadow:"
-msgstr ""
-
-#: src/gui.cpp:1730
-msgid "Override the subtitle shadow."
-msgstr ""
-
-#: src/gui.cpp:1735
-msgid "On"
-msgstr ""
-
-#: src/gui.cpp:1946
-msgid "Video Settings"
-msgstr ""
-
-#: src/gui.cpp:1948
-msgid "Crop to aspect ratio:"
-msgstr ""
-
-#: src/gui.cpp:1949
-msgid ""
-"Set the real aspect ratio of the video, so that borders can be cropped.</"
-"p>"
-msgstr ""
-
-#: src/gui.cpp:1952
-msgid "Do not crop"
-msgstr ""
-
-#: src/gui.cpp:1965
-msgid "Force source aspect ratio:"
-msgstr ""
-
-#: src/gui.cpp:1966
-msgid "Force the aspect ratio of video source."
-msgstr ""
-
-#: src/gui.cpp:1969
-msgid "Do not force"
-msgstr ""
-
-#: src/gui.cpp:1982
-msgid "Parallax:"
-msgstr ""
-
-#: src/gui.cpp:1983
-msgid ""
-"Adjust parallax, from -1 to +1. This changes the separation of left and "
-"right view, and thus the perceived distance of the scene."
-msgstr ""
-
-#: src/gui.cpp:1996
-msgid "Subtitle parallax:"
-msgstr ""
-
-#: src/gui.cpp:1997
-msgid ""
-"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
-"distance of the subtitles."
-msgstr ""
-
-#: src/gui.cpp:2010
-msgid "Ghostbusting:"
-msgstr ""
-
-#: src/gui.cpp:2011
-msgid ""
-"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
-"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
-"does not work with anaglyph glasses."
-msgstr ""
-
-#: src/gui.cpp:2195
-msgid "SDI Output Settings"
-msgstr ""
-
-#: src/gui.cpp:2197
-msgid "SDI Output Format:"
-msgstr ""
-
-#: src/gui.cpp:2198
-msgid "Select output format used for SDI output."
-msgstr ""
-
-#: src/gui.cpp:2206
-msgid "Left stereo mode:"
-msgstr ""
-
-#: src/gui.cpp:2207
-msgid "Select stereo mode used for left SDI output."
-msgstr ""
-
-#: src/gui.cpp:2235
-msgid "Right stereo mode:"
-msgstr ""
-
-#: src/gui.cpp:2236
-msgid "Select stereo mode used for right SDI output."
-msgstr ""
-
-#: src/gui.cpp:2676
-msgid "Open device(s)"
-msgstr ""
-
-#: src/gui.cpp:2679
-msgid "Choose a device type."
-msgstr ""
-
-#: src/gui.cpp:2681 src/media_object.cpp:831
-msgid "Firewire"
-msgstr ""
-
-#: src/gui.cpp:2682 src/media_object.cpp:832
-msgid "X11"
-msgstr ""
-
-#: src/gui.cpp:2685 src/gui.cpp:2688
-msgid "Choose a device."
-msgstr ""
-
-#: src/gui.cpp:2691
-msgid "Set the X11 device string. Refer to the manual for details."
-msgstr ""
-
-#: src/gui.cpp:2715
-msgid "First device:"
-msgstr ""
-
-#: src/gui.cpp:2716
-msgid "Second device:"
-msgstr ""
-
-#: src/gui.cpp:2720
-msgid "Request frame size"
-msgstr ""
-
-#: src/gui.cpp:2721
-msgid ""
-"Request a specific frame size from the device, e.g. 640x480. The device "
-"must support this frame size. Some devices require a frame size to be "
-"selected."
-msgstr ""
-
-#: src/gui.cpp:2732
-msgid "Request frame rate"
-msgstr ""
-
-#: src/gui.cpp:2733
-msgid ""
-"Request a specific frame rate from the device, e.g. 25/1. The device must "
-"support this frame rate. Some devices require a frame rate to be selected.</"
-"p>"
-msgstr ""
-
-#: src/gui.cpp:2744
-msgid "Request MJPEG format"
-msgstr ""
-
-#: src/gui.cpp:2745
-msgid ""
-"Request MJPEG data from the input device. The device may ignore this "
-"request."
-msgstr ""
-
-#: src/gui.cpp:2748 src/gui.cpp:3523
-msgid "Cancel"
-msgstr ""
-
-#: src/gui.cpp:3046
-msgid "&File"
-msgstr ""
-
-#: src/gui.cpp:3047
-msgid "&Open file(s)..."
-msgstr ""
-
-#: src/gui.cpp:3052
-msgid "Open &URL(s)..."
-msgstr ""
-
-#: src/gui.cpp:3056
-msgid "Open &device(s)..."
-msgstr ""
-
-#: src/gui.cpp:3071
-msgid "&Clear recent files"
-msgstr ""
-
-#: src/gui.cpp:3079
-msgid "&Quit"
-msgstr ""
-
-#: src/gui.cpp:3085
-msgid "&Preferences"
-msgstr ""
-
-#: src/gui.cpp:3088
-msgid "&Fullscreen Settings..."
-msgstr ""
-
-#: src/gui.cpp:3091
-msgid "Display &Color Adjustments..."
-msgstr ""
-
-#: src/gui.cpp:3094
-msgid "Display Cross&talk Calibration..."
-msgstr ""
-
-#: src/gui.cpp:3098
-msgid "Quality Adjustments..."
-msgstr ""
-
-#: src/gui.cpp:3102
-msgid "&Zoom for wide videos..."
-msgstr ""
-
-#: src/gui.cpp:3106
-msgid "&Audio Settings..."
-msgstr ""
-
-#: src/gui.cpp:3110
-msgid "&Subtitle Settings..."
-msgstr ""
-
-#: src/gui.cpp:3114
-msgid "Current &Video Settings..."
-msgstr ""
-
-#: src/gui.cpp:3119
-msgid "SDI &Output Settings..."
-msgstr ""
-
-#: src/gui.cpp:3123
-msgid "&Help"
-msgstr ""
-
-#: src/gui.cpp:3124
-msgid "&Manual..."
-msgstr ""
-
-#: src/gui.cpp:3129
-msgid "&Website..."
-msgstr ""
-
-#: src/gui.cpp:3133
-msgid "&Keyboard Shortcuts"
-msgstr ""
-
-#: src/gui.cpp:3137
-msgid "&About"
-msgstr ""
-
-#: src/gui.cpp:3470
-msgid "Tip"
-msgstr ""
-
-#: src/gui.cpp:3473
-msgid ""
-"You can select and open multiple files at once.This is useful for "
-"example if you have extra subtitle files, or if left and right view are "
-"stored in separate files."
-msgstr ""
-
-#: src/gui.cpp:3476
-msgid "Do not show this message again."
-msgstr ""
-
-#: src/gui.cpp:3493
-msgid "Open files"
-msgstr ""
-
-#: src/gui.cpp:3517
-msgid "Open URL(s)"
-msgstr ""
-
-#: src/gui.cpp:3518
-msgid "URL(s):"
-msgstr ""
-
-#: src/gui.cpp:3519
-msgid "Enter one or more space separated URLs."
-msgstr ""
-
-#: src/gui.cpp:3732 src/gui.cpp:3740 src/video_output_qt.cpp:291
-#: src/video_output_qt.cpp:534 src/video_output_qt.cpp:731
-#: src/video_output_qt.cpp:743 src/video_output_qt.cpp:764
-msgid "Error"
-msgstr ""
-
-#: src/gui.cpp:3732
-msgid "Cannot open manual."
-msgstr ""
-
-#: src/gui.cpp:3740
-msgid "Cannot open website."
-msgstr ""
-
-#: src/gui.cpp:3748
-msgid "Keyboard Shortcuts"
-msgstr ""
-
-#: src/gui.cpp:3751
-msgid "Keyboard control:"
-msgstr ""
-
-#: src/gui.cpp:3753 src/main.cpp:534
-msgid "ESC"
-msgstr ""
-
-#: src/gui.cpp:3753
-msgid "Stop"
-msgstr ""
-
-#: src/gui.cpp:3754 src/main.cpp:536
-msgid "SPACE"
-msgstr ""
-
-#: src/gui.cpp:3754 src/main.cpp:536
-msgid "Pause / unpause"
-msgstr ""
-
-#: src/gui.cpp:3755 src/main.cpp:537
-msgid "Toggle fullscreen"
-msgstr ""
-
-#: src/gui.cpp:3756 src/main.cpp:538
-msgid "Center window"
-msgstr ""
-
-#: src/gui.cpp:3757 src/main.cpp:539
-msgid "Swap left/right eye"
-msgstr ""
-
-#: src/gui.cpp:3758 src/main.cpp:540
-msgid "Cycle through available video streams"
-msgstr ""
-
-#: src/gui.cpp:3759 src/main.cpp:541
-msgid "Cycle through available audio streams"
-msgstr ""
-
-#: src/gui.cpp:3760 src/main.cpp:542
-msgid "Cycle through available subtitle streams"
-msgstr ""
-
-#: src/gui.cpp:3761 src/main.cpp:543
-msgid "Adjust contrast"
-msgstr ""
-
-#: src/gui.cpp:3762 src/main.cpp:544
-msgid "Adjust brightness"
-msgstr ""
-
-#: src/gui.cpp:3763 src/main.cpp:545
-msgid "Adjust hue"
-msgstr ""
-
-#: src/gui.cpp:3764 src/main.cpp:546
-msgid "Adjust saturation"
-msgstr ""
-
-#: src/gui.cpp:3765 src/main.cpp:547
-msgid "Adjust parallax"
-msgstr ""
-
-#: src/gui.cpp:3766 src/main.cpp:548
-msgid "Adjust ghostbusting"
-msgstr ""
-
-#: src/gui.cpp:3767 src/main.cpp:549
-msgid "Adjust zoom for wide videos"
-msgstr ""
-
-#: src/gui.cpp:3768 src/main.cpp:550
-msgid "Adjust audio volume"
-msgstr ""
-
-#: src/gui.cpp:3769 src/main.cpp:551
-msgid "Toggle audio mute"
-msgstr ""
-
-#: src/gui.cpp:3770 src/main.cpp:552
-msgid "Step a single video frame forward"
-msgstr ""
-
-#: src/gui.cpp:3771 src/main.cpp:553
-msgid "left, right"
-msgstr ""
-
-#: src/gui.cpp:3771 src/main.cpp:553
-msgid "Seek 10 seconds backward / forward"
-msgstr ""
-
-#: src/gui.cpp:3772 src/main.cpp:554
-msgid "down, up"
-msgstr ""
-
-#: src/gui.cpp:3772 src/main.cpp:554
-msgid "Seek 1 minute backward / forward"
-msgstr ""
-
-#: src/gui.cpp:3773 src/main.cpp:555
-msgid "page down, page up"
-msgstr ""
-
-#: src/gui.cpp:3773 src/main.cpp:555
-msgid "Seek 10 minutes backward / forward"
-msgstr ""
-
-#: src/gui.cpp:3774 src/main.cpp:557
-msgid "Media keys"
-msgstr ""
-
-#: src/gui.cpp:3774 src/main.cpp:557
-msgid "Media keys should work as expected"
-msgstr ""
-
-#: src/gui.cpp:3790
-#, c-format
-msgid "About %s"
-msgstr ""
-
-#: src/gui.cpp:3796
-#, c-format
-msgid "The %s 3D video player"
-msgstr ""
-
-#: src/gui.cpp:3801
-#, c-format
-msgid ""
-"%s version %s.Copyright (C) 2014 the Bino developers.This "
-"is free software. You may redistribute copies of it under the terms of the "
-"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
-"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
-"\"%s\">%s</a> for more information on this software."
-msgstr ""
-
-#: src/gui.cpp:3813 src/main.cpp:419
-msgid "Platform:"
-msgstr ""
-
-#: src/gui.cpp:3814 src/main.cpp:421
-msgid "Libraries used:"
-msgstr ""
-
-#: src/gui.cpp:3836
-msgid "About"
-msgstr ""
-
-#: src/gui.cpp:3837
-msgid "Libraries"
-msgstr ""
-
-#: src/gui.cpp:3838
-msgid "Team"
-msgstr ""
-
-#: src/gui.cpp:3839
-msgid "License"
-msgstr ""
-
 #: src/lib_versions.cpp:183 src/lib_versions.cpp:195
 msgid "not used"
 msgstr ""
@@ -1256,7 +281,7 @@
 msgstr ""
 
 #: src/main.cpp:415
-msgid "Copyright (C) 2014 the Bino developers."
+msgid "Copyright (C) 2016 the Bino developers."
 msgstr ""
 
 #: src/main.cpp:416
@@ -1266,6 +291,14 @@
 "permitted by law."
 msgstr ""
 
+#: src/main.cpp:419
+msgid "Platform:"
+msgstr ""
+
+#: src/main.cpp:421
+msgid "Libraries used:"
+msgstr ""
+
 #. TRANSLATORS: This is the --help text. Please keep the line length limited.
 #. * The --help output should look good with a line width of 80 characters.
 #: src/main.cpp:434
@@ -1364,10 +397,154 @@
 msgid "Select input type (default autodetect):"
 msgstr ""
 
+#: src/main.cpp:459
+msgid "2D"
+msgstr ""
+
+#: src/main.cpp:460
+msgid "Separate streams, left first"
+msgstr ""
+
+#: src/main.cpp:461
+msgid "Separate streams, right first"
+msgstr ""
+
+#: src/main.cpp:462
+msgid "Alternating, left first"
+msgstr ""
+
+#: src/main.cpp:463
+msgid "Alternating, right first"
+msgstr ""
+
+#: src/main.cpp:464 src/main.cpp:479
+msgid "Top/bottom"
+msgstr ""
+
+#: src/main.cpp:465 src/main.cpp:480
+msgid "Top/bottom, half height"
+msgstr ""
+
+#: src/main.cpp:466
+msgid "Bottom/top"
+msgstr ""
+
+#: src/main.cpp:467
+msgid "Bottom/top, half height"
+msgstr ""
+
+#: src/main.cpp:468 src/main.cpp:481
+msgid "Left/right"
+msgstr ""
+
+#: src/main.cpp:469 src/main.cpp:482
+msgid "Left/right, half width"
+msgstr ""
+
+#: src/main.cpp:470
+msgid "Right/left"
+msgstr ""
+
+#: src/main.cpp:471
+msgid "Right/left, half width"
+msgstr ""
+
+#: src/main.cpp:472 src/main.cpp:483
+msgid "Even/odd rows"
+msgstr ""
+
+#: src/main.cpp:473
+msgid "Odd/even rows"
+msgstr ""
+
 #: src/main.cpp:474
 msgid "Select output type:"
 msgstr ""
 
+#: src/main.cpp:475
+msgid "OpenGL stereo"
+msgstr ""
+
+#: src/main.cpp:476
+msgid "Left/right alternating"
+msgstr ""
+
+#: src/main.cpp:477
+msgid "Left view"
+msgstr ""
+
+#: src/main.cpp:478
+msgid "Right view"
+msgstr ""
+
+#: src/main.cpp:484
+msgid "Even/odd columns"
+msgstr ""
+
+#: src/main.cpp:485
+msgid "Checkerboard pattern"
+msgstr ""
+
+#: src/main.cpp:486
+msgid "HDMI frame packing mode"
+msgstr ""
+
+#: src/main.cpp:487
+msgid "Red/cyan glasses, monochrome"
+msgstr ""
+
+#: src/main.cpp:488
+msgid "Red/cyan glasses, half color"
+msgstr ""
+
+#: src/main.cpp:489
+msgid "Red/cyan glasses, full color"
+msgstr ""
+
+#: src/main.cpp:490
+msgid "Red/cyan glasses, Dubois"
+msgstr ""
+
+#: src/main.cpp:491
+msgid "Green/magenta glasses, monochrome"
+msgstr ""
+
+#: src/main.cpp:492
+msgid "Green/magenta glasses, half color"
+msgstr ""
+
+#: src/main.cpp:493
+msgid "Green/magenta glasses, full color"
+msgstr ""
+
+#: src/main.cpp:494
+msgid "Green/magenta glasses, Dubois"
+msgstr ""
+
+#: src/main.cpp:495
+msgid "Amber/blue glasses, monochrome"
+msgstr ""
+
+#: src/main.cpp:496
+msgid "Amber/blue glasses, half color"
+msgstr ""
+
+#: src/main.cpp:497
+msgid "Amber/blue glasses, full color"
+msgstr ""
+
+#: src/main.cpp:498
+msgid "Amber/blue glasses, Dubois"
+msgstr ""
+
+#: src/main.cpp:499
+msgid "Red/green glasses, monochrome"
+msgstr ""
+
+#: src/main.cpp:500
+msgid "Red/blue glasses, monochrome"
+msgstr ""
+
 #: src/main.cpp:501
 msgid "Multi-display via Equalizer (2D setup)"
 msgstr ""
@@ -1497,6 +674,10 @@
 msgstr ""
 
 #: src/main.cpp:534
+msgid "ESC"
+msgstr ""
+
+#: src/main.cpp:534
 msgid "Leave fullscreen mode, or quit"
 msgstr ""
 
@@ -1504,6 +685,102 @@
 msgid "Quit"
 msgstr ""
 
+#: src/main.cpp:536
+msgid "SPACE"
+msgstr ""
+
+#: src/main.cpp:536
+msgid "Pause / unpause"
+msgstr ""
+
+#: src/main.cpp:537
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: src/main.cpp:538
+msgid "Center window"
+msgstr ""
+
+#: src/main.cpp:539
+msgid "Swap left/right eye"
+msgstr ""
+
+#: src/main.cpp:540
+msgid "Cycle through available video streams"
+msgstr ""
+
+#: src/main.cpp:541
+msgid "Cycle through available audio streams"
+msgstr ""
+
+#: src/main.cpp:542
+msgid "Cycle through available subtitle streams"
+msgstr ""
+
+#: src/main.cpp:543
+msgid "Adjust contrast"
+msgstr ""
+
+#: src/main.cpp:544
+msgid "Adjust brightness"
+msgstr ""
+
+#: src/main.cpp:545
+msgid "Adjust hue"
+msgstr ""
+
+#: src/main.cpp:546
+msgid "Adjust saturation"
+msgstr ""
+
+#: src/main.cpp:547
+msgid "Adjust parallax"
+msgstr ""
+
+#: src/main.cpp:548
+msgid "Adjust ghostbusting"
+msgstr ""
+
+#: src/main.cpp:549
+msgid "Adjust zoom for wide videos"
+msgstr ""
+
+#: src/main.cpp:550
+msgid "Adjust audio volume"
+msgstr ""
+
+#: src/main.cpp:551
+msgid "Toggle audio mute"
+msgstr ""
+
+#: src/main.cpp:552
+msgid "Step a single video frame forward"
+msgstr ""
+
+#: src/main.cpp:553
+msgid "left, right"
+msgstr ""
+
+#: src/main.cpp:553
+msgid "Seek 10 seconds backward / forward"
+msgstr ""
+
+#: src/main.cpp:554
+msgid "down, up"
+msgstr ""
+
+#: src/main.cpp:554
+msgid "Seek 1 minute backward / forward"
+msgstr ""
+
+#: src/main.cpp:555
+msgid "page down, page up"
+msgstr ""
+
+#: src/main.cpp:555
+msgid "Seek 10 minutes backward / forward"
+msgstr ""
+
 #: src/main.cpp:556
 msgid "Mouse click"
 msgstr ""
@@ -1512,20 +789,28 @@
 msgid "Seek according to horizontal click position"
 msgstr ""
 
-#: src/main.cpp:626
+#: src/main.cpp:557
+msgid "Media keys"
+msgstr ""
+
+#: src/main.cpp:557
+msgid "Media keys should work as expected"
+msgstr ""
+
+#: src/main.cpp:627
 msgid "No audio devices known."
 msgstr ""
 
-#: src/main.cpp:641
+#: src/main.cpp:642
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr ""
 
-#: src/main.cpp:655
+#: src/main.cpp:656
 #, c-format
 msgid "Unknown mode %s."
 msgstr ""
 
-#: src/main.cpp:787
+#: src/main.cpp:788
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr ""
 
@@ -1541,6 +826,10 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr ""
 
+#: src/media_input.cpp:276
+msgid "Input:"
+msgstr ""
+
 #: src/media_input.cpp:281
 #, c-format
 msgid "Video %s: %s"
@@ -1598,6 +887,14 @@
 msgid "No support available for %s device."
 msgstr ""
 
+#: src/media_object.cpp:831
+msgid "Firewire"
+msgstr ""
+
+#: src/media_object.cpp:832
+msgid "X11"
+msgstr ""
+
 #: src/media_object.cpp:833
 msgid "default"
 msgstr ""
@@ -1803,6 +1100,12 @@
 msgid "Cannot create a PBO buffer."
 msgstr ""
 
+#: src/video_output_qt.cpp:291 src/video_output_qt.cpp:534
+#: src/video_output_qt.cpp:731 src/video_output_qt.cpp:743
+#: src/video_output_qt.cpp:764
+msgid "Error"
+msgstr ""
+
 #: src/video_output_qt.cpp:636
 #, c-format
 msgid "Cannot initialize GLEW: %s"

bino-1.6.5.tar.xz/po/cs.gmo Added

bino-1.6.5.tar.xz/po/cs.po Added

@@ -0,0 +1,1716 @@
+# Copyright (C) 2014 The Bino developers
+# This file is distributed under the same license as the Bino package.
+# Joe <cuchac@email.cz>, 2011-2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bino 0.9.2\n"
+"Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
+"POT-Creation-Date: 2016-12-16 09:10+0100\n"
+"PO-Revision-Date: 2011-04-10 17:23+0200\n"
+"Last-Translator: Joe <cuchac@email.cz>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
+"X-Language: cs_CZ\n"
+"X-Source-Language: C\n"
+
+#: src/base/dbg.cpp:49
+#, c-format
+msgid "Caught signal %d (%s). Aborting."
+msgstr "Obdržn signál %d (%s). Ukončuji se."
+
+#: src/base/dbg.cpp:56
+msgid "Unexpected exception."
+msgstr "Neočekávaná výjimka."
+
+#. TRANSLATORS: %s will be a mail address.
+#: src/base/dbg.cpp:221
+#, c-format
+msgid "Report bugs to <%s>."
+msgstr "Chyby hlaste na <%s>."
+
+#: src/base/exc.cpp:52 src/base/exc.cpp:70 src/base/exc.cpp:104
+#, c-format
+msgid "Exception: %s"
+msgstr "Výjimka: %s"
+
+#: src/base/opt.cpp:168
+#, c-format
+msgid "Invalid option %s."
+msgstr "Neplatná operace %s."
+
+#: src/base/opt.cpp:172
+#, c-format
+msgid "Option --%s does not take an argument."
+msgstr "Volba --%s nepřijímá žádný argument."
+
+#: src/base/opt.cpp:177
+#, c-format
+msgid "Invalid option -%c."
+msgstr "Neplatná volba -%c."
+
+#: src/base/opt.cpp:186
+#, c-format
+msgid "Option --%s requires an argument."
+msgstr "Volba --%s vyžaduje argument."
+
+#: src/base/opt.cpp:191
+#, c-format
+msgid "Option -%c requires an argument."
+msgstr "Volba -%c vyžaduje argument."
+
+#: src/base/opt.cpp:212
+#, c-format
+msgid "Invalid argument for -%c."
+msgstr "Neplatný argument pro -%c."
+
+#: src/base/opt.cpp:216
+#, c-format
+msgid "Invalid argument for --%s."
+msgstr "Neplatný argument pro --%s."
+
+#: src/base/opt.cpp:239
+#, c-format
+msgid "Option --%s (-%c) is mandatory."
+msgstr "Volba --%s (-%c) je povinná."
+
+#: src/base/opt.cpp:243
+#, c-format
+msgid "Option --%s is mandatory."
+msgstr "Volba --%s je povinná."
+
+#: src/base/opt.cpp:257
+msgid "Too few arguments."
+msgstr "Příliš málo parametrů."
+
+#: src/base/opt.cpp:262
+msgid "Too many arguments."
+msgstr "Příliš mnoho parametrů."
+
+#: src/base/str.cpp:459
+#, c-format
+msgid "Cannot convert string to %s."
+msgstr "Nelze převést text do %s."
+
+#: src/base/str.cpp:993 src/base/str.cpp:1012 src/base/str.cpp:1023
+#: src/base/str.cpp:1035
+#, c-format
+msgid "Cannot convert %s to %s: %s"
+msgstr "Nelze převést %s to %s: %s"
+
+#: src/base/str.cpp:1041
+#, c-format
+msgid "Cannot convert %s to %s."
+msgstr "Nelze převést %s to %s."
+
+#: src/base/pth.cpp:38 src/base/pth.cpp:48 src/base/pth.cpp:61
+#: src/base/pth.cpp:74 src/base/pth.cpp:85 src/base/pth.cpp:95
+#: src/base/pth.cpp:108 src/base/pth.cpp:116 src/base/pth.cpp:124
+#: src/base/pth.cpp:204 src/base/pth.cpp:211 src/base/pth.cpp:225
+#: src/base/pth.cpp:245
+msgid "System function failed: "
+msgstr "Systémová funkce selhala: "
+
+#: src/base/tmr.cpp:63 src/base/tmr.cpp:72 src/base/tmr.cpp:81
+msgid "Cannot get time."
+msgstr "Nelze získat aktuální čas."
+
+#: src/audio_output.cpp:93
+msgid "No OpenAL device available."
+msgstr "Není k dispozici žádné OpenAL zařízení."
+
+#: src/audio_output.cpp:98 src/audio_output.cpp:104
+#, c-format
+msgid "OpenAL device '%s' is not available."
+msgstr "OpenAL zařízení '%s' není k dispozici."
+
+#: 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 "neznámá"
+
+#: src/audio_output.cpp:111
+msgid "No OpenAL context available."
+msgstr "Není k dispozici žádný OpenAL kontext."
+
+#: src/audio_output.cpp:122
+msgid "Cannot create OpenAL buffers."
+msgstr "Nelze vytvořit OpenAL buffer."
+
+#: src/audio_output.cpp:131
+msgid "Cannot create OpenAL source."
+msgstr "Nelze vytvořit OpenAL zdroj."
+
+#: src/audio_output.cpp:144
+msgid "Cannot set OpenAL source parameters."
+msgstr "Nelze nastavit parametry OpenAL."
+
+#: src/audio_output.cpp:198
+msgid "Cannot check OpenAL source state."
+msgstr "Nelze ověřit stav OpenAL zdroje."
+
+#: src/audio_output.cpp:205
+msgid "Cannot restart OpenAL source playback."
+msgstr "Nelze znovu spustit přehrávání OpeanAL zdroje."
+
+#: src/audio_output.cpp:358
+#, c-format
+msgid "No OpenAL format available for audio data format %s."
+msgstr "Neexistuje vhodný OpenAL format pro daný audio formát %s."
+
+#: src/audio_output.cpp:374
+msgid "Cannot set OpenAL audio volume."
+msgstr "Nelze nastavit hlasitost OpenAL zvuku."
+
+#: src/audio_output.cpp:400
+msgid "Cannot buffer initial OpenAL data."
+msgstr "Nelze načíst počáteční data OpenAL."
+
+#: src/audio_output.cpp:414
+msgid "Cannot buffer OpenAL data."
+msgstr "Nelze načíst OpenAL data."
+
+#: src/audio_output.cpp:439
+msgid "Cannot start OpenAL source playback."
+msgstr "Nelze začít přehrávat OpeanAL zdroj."
+
+#: src/audio_output.cpp:453
+msgid "Cannot pause OpenAL source playback."
+msgstr "Nelze přerušit přehrávání OpeanAL zdroje."
+
+#: src/audio_output.cpp:462
+msgid "Cannot unpause OpenAL source playback."
+msgstr "Nelze pokračovat v přehrávání OpeanAL zdroje."
+
+#: src/audio_output.cpp:471
+msgid "Cannot stop OpenAL source playback."
+msgstr "Nelze zastavit přehrávání OpeanAL zdroje."
+
+#: src/audio_output.cpp:482
+msgid "Cannot unqueue OpenAL source buffers."
+msgstr "Nelze odpojit buffery OpeanAL zdroje."
+
+#: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
+#: 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"
+
+#: src/command_file.cpp:174
+#, c-format
+msgid "%s: invalid command '%s'"
+msgstr "%s: neplatný příkaz '%s'"
+
+#: src/dispatch.cpp:167
+msgid "Cannot connect to X server."
+msgstr "Nelze se připojit k X serveru."
+
+#: src/dispatch.cpp:183
+msgid "No video to play."
+msgstr "Nenalezeno žádné video."
+
+#: src/dispatch.cpp:438 src/player_equalizer.cpp:87
+msgid "No video streams found."
+msgstr "Nebyly nalezeny žádné video stopy."
+
+#: src/dispatch.cpp:455
+msgid "Cannot set requested stereo layout: incompatible media."
+msgstr "Nemohu nastavit požadovaný stereo formát: nekompatibilní vstup."
+
+#: src/dispatch.cpp:470
+#, c-format
+msgid "Video stream %d not found."
+msgstr "Video stopa %d nebyla nalezena."
+
+#: src/dispatch.cpp:476
+#, c-format
+msgid "Audio stream %d not found."
+msgstr "Zvuková stopa %d nebyla nalezena."
+
+#: src/dispatch.cpp:484
+#, c-format
+msgid "Subtitle stream %d not found."
+msgstr "Stopa titulků %d nebyla nalezena."
+
+#: src/dispatch.cpp:559 src/main.cpp:796
+msgid "This version of Bino was compiled without support for Equalizer."
+msgstr "Tato verze Bina byla zkompilována bez podpory knihovny Equalizer."
+
+#: src/lib_versions.cpp:183 src/lib_versions.cpp:195
+msgid "not used"
+msgstr "nevyužívá se"
+
+#: src/lirc.cpp:61
+msgid "Cannot initialize LIRC."
+msgstr "Nemohu inicializovat LIRC."
+
+#: src/lirc.cpp:67
+msgid "Cannot set LIRC socket properties."
+msgstr "Nelze nastavit parametry LIRC socketu."
+
+#: src/lirc.cpp:74
+msgid "Cannot read LIRC default configuration."
+msgstr "Nelze získat výchozí nastavení LIRC."
+
+#: src/lirc.cpp:89
+#, c-format
+msgid "Cannot read LIRC configuration file %s."
+msgstr "Nelze přečíst LIRC konfigurační soubor %s."
+
+#: src/lirc.cpp:117
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr "Nelze získat událost z LIRC; vypínám podporu LIRC."
+
+#: src/lirc.cpp:131
+#, c-format
+msgid "Received invalid command '%s' from LIRC."
+msgstr "Obdržen neplatný příkaz '%s' z LIRC."
+
+#: src/lirc.cpp:141
+msgid "Cannot get command for LIRC code."
+msgstr "Nelze získat příkaz pro daný LIRC kód."
+
+#: src/main.cpp:414
+#, c-format
+msgid "%s version %s"
+msgstr "%s verze %s"
+
+#: src/main.cpp:415
+#, fuzzy
+msgid "Copyright (C) 2016 the Bino developers."
+msgstr "Copyright (C) 2014 Bino vývojáři."
+
+#: src/main.cpp:416
+msgid ""
+"This is free software. You may redistribute copies of it under the terms of "
+"the GNU General Public License. There is NO WARRANTY, to the extent "
+"permitted by law."
+msgstr ""
+"Tento program je svobodný software. Můžete jej šířit a modifikovat podle "
+"ustanovení GNU General Public License.Tento program je rozšiřován v naději, "
+"že bude užitečný, avšak BEZ JAKÉKOLI ZÁRUKY; neposkytují se ani odvozené "
+"záruky PRODEJNOSTI anebo VHODNOSTI PRO URČITÝ ÚČEL."
+
+#: src/main.cpp:419
+msgid "Platform:"
+msgstr "Platforma:"
+
+#: src/main.cpp:421
+msgid "Libraries used:"
+msgstr "Použité knihovny:"
+
+#. TRANSLATORS: This is the --help text. Please keep the line length limited.
+#. * The --help output should look good with a line width of 80 characters.
+#: src/main.cpp:434
+msgid "Usage:"
+msgstr "Použití:"
+
+#: src/main.cpp:436
+msgid "Options:"
+msgstr "Volby:"
+
+#: src/main.cpp:437
+msgid "Print help"
+msgstr "Zobrazit návod"
+
+#: src/main.cpp:438
+msgid "Print version"
+msgstr "Zobrazit verzi"
+
+#: src/main.cpp:439
+msgid "Do not use the GUI, just show a plain window"
+msgstr "Nezobrazovat ovládací panely. Zobrazit pouze okno s videem"
+
+#: src/main.cpp:440
+msgid "Append all log messages to the given file"
+msgstr "Všechny zpávy logu zapsat do souboru"
+
+#: src/main.cpp:441
+msgid "Set log level (debug/info/warning/error/quiet)"
+msgstr "Nastavit detail logování (debug/info/warning/error/quiet)"
+
+#: src/main.cpp:442
+msgid "Print a list of known audio devices and exit"
+msgstr "Vypsat seznam všech zvukových zařízení a skončit"
+
+#: src/main.cpp:443
+msgid "Use audio device number N (N=0 is the default)"
+msgstr "Použít zvukové zařízení číslo N (N=0 je výchozí)"
+
+#: src/main.cpp:444
+msgid "Delay audio by D milliseconds (default 0)"
+msgstr "Zpoždění zvuku o D milisekund (výchozí 0)"
+
+#: src/main.cpp:445
+msgid "Set audio volume (0 to 1, default 1)"
+msgstr "Nastavit hlasitost zvuku (0 až 1, výchozí 1)"
+
+#: src/main.cpp:446
+msgid "Mute audio"
+msgstr "Ztišit zvuk"
+
+#: src/main.cpp:447
+msgid "Type of input device: default, firewire, x11"
+msgstr "Typ vstupního zařízení: výchozí, firewire, x11"
+
+#: src/main.cpp:448
+msgid "Request frame size WxH from input device"
+msgstr "Vynutit velikost obrazu ze vstupního zařízení"
+
+#: src/main.cpp:449
+msgid "Request frame rate N/D from input device"
+msgstr "Vynutit snímkovou frekvenci ze vstupního zařízení"
+
+#: src/main.cpp:450
+msgid "Request device format 'default' or 'mjpeg'"
+msgstr "Vynutit formát zařízení 'výchozí' nebo 'mjpeg'"
+
+#: src/main.cpp:451
+msgid "Read commands from a file"
+msgstr "Číst příkazy ze souboru"
+
+#: src/main.cpp:452
+msgid "Use the given LIRC configuration file"
+msgstr "Použít daný LIRC konfigurační soubor"
+
+#: src/main.cpp:453
+msgid "This option can be used more than once"
+msgstr "Tuto volbu je možné použít vícekrát"
+
+#: src/main.cpp:454
+msgid "Output quality (0=fastest to 4=best/default)"
+msgstr "Kvalita výstupu (0=nejrychlejší, 4=nejkvalitnější/výchozí)"
+
+#: src/main.cpp:455
+msgid "Select video stream (1-n, depending on input)"
+msgstr "Vyber stopu videa (1-n v závislosti na vstupu)"
+
+#: src/main.cpp:456
+msgid "Select audio stream (1-n, depending on input)"
+msgstr "Vyber stopu zvuku (1-n v závislosti na vstupu)"
+
+#: src/main.cpp:457
+msgid "Select subtitle stream (0-n, dep. on input)"
+msgstr "Vyber stopu titulků (0-n v závislosti na vstupu)"
+
+#: src/main.cpp:458
+msgid "Select input type (default autodetect):"
+msgstr "Vyber typ vstupu (výchozí je automatická detekce):"
+
+#: src/main.cpp:459
+msgid "2D"
+msgstr "2D"
+
+#: src/main.cpp:460
+msgid "Separate streams, left first"
+msgstr "Oddělené stopy, levá první"
+
+#: src/main.cpp:461
+msgid "Separate streams, right first"
+msgstr "Oddělené stopy, pravá první"
+
+#: src/main.cpp:462
+msgid "Alternating, left first"
+msgstr "Střídající se snímky, levý první"
+
+#: src/main.cpp:463
+msgid "Alternating, right first"
+msgstr "Střídající se snímky, pravý první"
+
+#: src/main.cpp:464 src/main.cpp:479
+msgid "Top/bottom"
+msgstr "Nahoře/Dole"
+
+#: src/main.cpp:465 src/main.cpp:480
+msgid "Top/bottom, half height"
+msgstr "Nahoře/Dole, poloviční výška"
+
+#: src/main.cpp:466
+msgid "Bottom/top"
+msgstr "Dole/Nahoře"
+
+#: src/main.cpp:467
+msgid "Bottom/top, half height"
+msgstr "Dole/Nahoře, poloviční výška"
+
+#: src/main.cpp:468 src/main.cpp:481
+msgid "Left/right"
+msgstr "Levá/Pravá"
+
+#: src/main.cpp:469 src/main.cpp:482
+msgid "Left/right, half width"
+msgstr "Levá/Pravá, poloviční šířka"
+
+#: src/main.cpp:470
+msgid "Right/left"
+msgstr "Pravá/Levá"
+
+#: src/main.cpp:471
+msgid "Right/left, half width"
+msgstr "Pravá/Levá, poloviční šířka"
+
+#: src/main.cpp:472 src/main.cpp:483
+msgid "Even/odd rows"
+msgstr "Sudé/Liché řádky"
+
+#: src/main.cpp:473
+msgid "Odd/even rows"
+msgstr "Liché/Sudé řádky"
+
+#: src/main.cpp:474
+msgid "Select output type:"
+msgstr "Vyber typ výstupu:"
+
+#: src/main.cpp:475
+msgid "OpenGL stereo"
+msgstr "OpenGL stereo"
+
+#: src/main.cpp:476
+msgid "Left/right alternating"
+msgstr "Levá/Pravá, střídající se"
+
+#: src/main.cpp:477
+msgid "Left view"
+msgstr "Levý obraz"
+
+#: src/main.cpp:478
+msgid "Right view"
+msgstr "Pravý obraz"
+
+#: src/main.cpp:484
+msgid "Even/odd columns"
+msgstr "Sudé/Liché sloupce"
+
+#: src/main.cpp:485
+msgid "Checkerboard pattern"
+msgstr "Šachovnice"
+
+#: src/main.cpp:486
+msgid "HDMI frame packing mode"
+msgstr "HDMI režim"
+
+#: src/main.cpp:487
+msgid "Red/cyan glasses, monochrome"
+msgstr "Červené/azurové brýle, stupně šedi"
+
+#: src/main.cpp:488
+msgid "Red/cyan glasses, half color"
+msgstr "Červené/azurové brýle, polotóny"
+
+#: src/main.cpp:489
+msgid "Red/cyan glasses, full color"
+msgstr "Červené/azurové brýle, plné tóny"
+
+#: src/main.cpp:490
+msgid "Red/cyan glasses, Dubois"
+msgstr "Červené/azurové brýle, kvalitní Dubois metoda"
+
+#: src/main.cpp:491
+msgid "Green/magenta glasses, monochrome"
+msgstr "Zelené/purpurové brýle, stupně šedi"
+
+#: src/main.cpp:492
+msgid "Green/magenta glasses, half color"
+msgstr "Zelené/purpurové brýle, polotóny"
+
+#: src/main.cpp:493
+msgid "Green/magenta glasses, full color"
+msgstr "Zelené/purpurové brýle, plné tóny"
+
+#: src/main.cpp:494
+msgid "Green/magenta glasses, Dubois"
+msgstr "Zelené/purpurové brýle, kvalitní Dubois metoda"
+
+#: src/main.cpp:495
+msgid "Amber/blue glasses, monochrome"
+msgstr "Jantarové/modré brýle, stupně šedi"
+
+#: src/main.cpp:496
+msgid "Amber/blue glasses, half color"
+msgstr "Jantarové/modré brýle, polotóny"
+
+#: src/main.cpp:497
+msgid "Amber/blue glasses, full color"
+msgstr "Jantarové/modré brýle, plné tóny"
+
+#: src/main.cpp:498
+msgid "Amber/blue glasses, Dubois"
+msgstr "Jantarové/modré brýle, kvalitní Dubois metoda"
+
+#: src/main.cpp:499
+msgid "Red/green glasses, monochrome"
+msgstr "Červené/zelené brýle, stupně šedi"
+
+#: src/main.cpp:500
+msgid "Red/blue glasses, monochrome"
+msgstr "Červené/modré brýle, stupně šedi"
+
+#: src/main.cpp:501
+msgid "Multi-display via Equalizer (2D setup)"
+msgstr "Režim více obrazovek přes Equalizer (2D)"
+
+#: src/main.cpp:502
+msgid "Multi-display via Equalizer (3D setup)"
+msgstr "Režim více obrazovek přes Equalizer (3D)"
+
+#: src/main.cpp:503
+msgid "Swap left/right view"
+msgstr "Prohoď levý/pravý obraz"
+
+#: src/main.cpp:504
+msgid "Fullscreen"
+msgstr "Celá obrazovka"
+
+#: src/main.cpp:505
+msgid "Use the listed screens in fullscreen mode"
+msgstr "Použij uvedené obrazovky pro celoobrazový režim"
+
+#: src/main.cpp:506
+msgid "Screen numbers start with 1"
+msgstr "Obrazovky se číslují od jedničky"
+
+#: src/main.cpp:507
+msgid "An empty list defaults to the primary screen"
+msgstr "Prázdný seznam použije výchozí obrazovku"
+
+#: src/main.cpp:508
+msgid "Flip left view vertically when fullscreen"
+msgstr "V celoobrazovém režimu překlop levý obraz vertikálně"
+
+#: src/main.cpp:509
+msgid "Flop left view horizontally when fullscreen"
+msgstr "V celoobrazovém režimu překlop levý obraz horizontálně"
+
+#: src/main.cpp:510
+msgid "Flip right view vertically when fullscreen"
+msgstr "V celoobrazovém režimu překlop pravý obraz vertikálně"
+
+#: src/main.cpp:511
+msgid "Flop right view horizontally when fullscreen"
+msgstr "V celoobrazovém režimu překlop pravý obraz horizontálně"
+
+#: src/main.cpp:512
+msgid "Use DLP 3-D Ready Sync when fullscreen"
+msgstr "Použij DLP 3-D Ready Sync v celoobrazovém režimu"
+
+#: src/main.cpp:513
+msgid "Set zoom for wide videos (0=off to 1=full)"
+msgstr "Nastav přiblížení pro široká videa (0=vypnuto, 1=celé)"
+
+#: src/main.cpp:514
+msgid "Crop video to given aspect ratio (0:0=off)"
+msgstr "Ořízni video na daný poměr stran (0:0=vypnuto)"
+
+#: src/main.cpp:515
+msgid "Center window on screen"
+msgstr "Vycentruj okno na obrazovce"
+
+#: src/main.cpp:516
+msgid "Set subtitle encoding"
+msgstr "Nastav kódovou stránku titulků"
+
+#: src/main.cpp:517
+msgid "Set subtitle font name"
+msgstr "Nastav písmo pro titulků"
+
+#: src/main.cpp:518
+msgid "Set subtitle font size"
+msgstr "Nastav velikost titulků"
+
+#: src/main.cpp:519
+msgid "Set subtitle scale factor"
+msgstr "Nastav zvětšní titulků"
+
+#: src/main.cpp:520
+msgid "Set subtitle color, in [AA]RRGGBB format"
+msgstr "Nastav barvu titulků ve formátu [AA]RRGGBB"
+
+#: src/main.cpp:521
+msgid "Set subtitle shadow, -1=default, 0=off, 1=on"
+msgstr "Nastav stín titulků (-1=výchozí, 0=vypnuto, 1=zapnuto)"
+
+#: src/main.cpp:522
+msgid "Subtitle parallax adjustment (-1 to +1)"
+msgstr "Nastavení paralaxu titulků (-1 až +1)"
+
+#: src/main.cpp:523
+msgid "Parallax adjustment (-1 to +1)"
+msgstr "Nastavení paralaxu (-1 až +1)"
+
+#: src/main.cpp:524
+msgid "Crosstalk leak level (0 to 1)"
+msgstr "Crosstalk leak (0 až 1)"
+
+#: src/main.cpp:525
+msgid "Comma-separated values for R,G,B"
+msgstr "Čárkami oddělené hodnoty pro R,G,B"
+
+#: src/main.cpp:526
+msgid "Amount of ghostbusting to apply (0 to 1)"
+msgstr "Míra ghostbustingu (0 až 1)"
+
+#: src/main.cpp:527
+msgid "Benchmark mode (no audio, show fps)"
+msgstr "Měření výkonu (vypnutý zvuk, zobrazené počty snímků za vteřinu)"
+
+#: src/main.cpp:528
+msgid "Frame rate divisor for display refresh rate"
+msgstr "Dělitel obnovovací frekvence monitoru"
+
+#: src/main.cpp:529
+msgid "Default is 0 for benchmark mode, 1 otherwise"
+msgstr "Výchozi: 0 pro měření výkonu, jinak 1 "
+
+#: src/main.cpp:530
+msgid "Loop the input media"
+msgstr "Opakování vstupních souborů"
+
+#: src/main.cpp:531
+msgid "Set SDI output format"
+msgstr "Nastav výstupní SDI formát"
+
+#: src/main.cpp:533
+msgid "Interactive control:"
+msgstr "Ovládací tlačítka:"
+
+#: src/main.cpp:534
+msgid "ESC"
+msgstr "ESC"
+
+#: src/main.cpp:534
+msgid "Leave fullscreen mode, or quit"
+msgstr "Ukončit celoobrazový režim nebo skončit"
+
+#: src/main.cpp:535
+msgid "Quit"
+msgstr "Skončit"
+
+#: src/main.cpp:536
+msgid "SPACE"
+msgstr "Mezerník"
+
+#: src/main.cpp:536
+msgid "Pause / unpause"
+msgstr "Pauza"
+
+#: src/main.cpp:537
+msgid "Toggle fullscreen"
+msgstr "Přepnout celoobrazový režim"
+
+#: src/main.cpp:538
+msgid "Center window"
+msgstr "Vycentrovat okno"
+
+#: src/main.cpp:539
+msgid "Swap left/right eye"
+msgstr "Prohoď levé/pravé oko"
+
+#: src/main.cpp:540
+msgid "Cycle through available video streams"
+msgstr "Přepni na další dostupnou stopu videa"
+
+#: src/main.cpp:541
+msgid "Cycle through available audio streams"
+msgstr "Přepni na další dostupnou zvukovou stopu"
+
+#: src/main.cpp:542
+msgid "Cycle through available subtitle streams"
+msgstr "Přepni na další dostupnou stopu titulků"
+
+#: src/main.cpp:543
+msgid "Adjust contrast"
+msgstr "Uprav kontrast"
+
+#: src/main.cpp:544
+msgid "Adjust brightness"
+msgstr "Uprav jas"
+
+#: src/main.cpp:545
+msgid "Adjust hue"
+msgstr "Uprav odstín"
+
+#: src/main.cpp:546
+msgid "Adjust saturation"
+msgstr "Uprav sytost"
+
+#: src/main.cpp:547
+msgid "Adjust parallax"
+msgstr "Uprav parallax"
+
+#: src/main.cpp:548
+msgid "Adjust ghostbusting"
+msgstr "Uprav ghostbusting"
+
+#: src/main.cpp:549
+msgid "Adjust zoom for wide videos"
+msgstr "Uprav zvětšní pro široká videa"
+
+#: src/main.cpp:550
+msgid "Adjust audio volume"
+msgstr "Uprav hlasitost zvuku"
+
+#: src/main.cpp:551
+msgid "Toggle audio mute"
+msgstr "Přepni ztišení zvuku"
+
+#: src/main.cpp:552
+msgid "Step a single video frame forward"
+msgstr "Přejdi na další snímek videa"
+
+#: src/main.cpp:553
+msgid "left, right"
+msgstr "levá, pravá"
+
+#: src/main.cpp:553
+msgid "Seek 10 seconds backward / forward"
+msgstr "Přeskoč 10 vteřin zpět / vpřed"
+
+#: src/main.cpp:554
+msgid "down, up"
+msgstr "nahoru, dolů"
+
+#: src/main.cpp:554
+msgid "Seek 1 minute backward / forward"
+msgstr "Přeskoč 1 minutu zpět / vpřed"
+
+#: src/main.cpp:555
+msgid "page down, page up"
+msgstr "page down, page up"
+
+#: src/main.cpp:555
+msgid "Seek 10 minutes backward / forward"
+msgstr "Přeskoč 10 minut zpět / vpřed"
+
+#: src/main.cpp:556
+msgid "Mouse click"
+msgstr "Kliknutí myší"
+
+#: src/main.cpp:556
+msgid "Seek according to horizontal click position"
+msgstr "Vyhledat podle horizontální pozice kliknutí"
+
+#: src/main.cpp:557
+msgid "Media keys"
+msgstr "Multimediální klávesy"
+
+#: src/main.cpp:557
+msgid "Media keys should work as expected"
+msgstr "Multimediální klávesy by měly fungovat dle očekávání"
+
+#: src/main.cpp:627
+msgid "No audio devices known."
+msgstr "Není známé žádné zvukové zařízení."
+
+#: src/main.cpp:642
+msgid "Benchmark mode: audio and time synchronization disabled."
+msgstr "Měření výkonu, synchronizace zvuku a času je vypnuta."
+
+#: src/main.cpp:656
+#, c-format
+msgid "Unknown mode %s."
+msgstr "Neznámý režim: %s."
+
+#: src/main.cpp:788
+msgid "This version of Bino was compiled without support for LIRC."
+msgstr "Tato verze Bina byla zkompilována bez podpory knihovny LIRC."
+
+#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
+#: src/media_data.cpp:1075
+#, c-format
+msgid "%dx%d, %.3g:1"
+msgstr "%dx%d, %.3g:1"
+
+#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
+#: src/media_data.cpp:1206
+#, c-format
+msgid "%s, %d ch., %g kHz, %d bit"
+msgstr "%s, %d ch., %g kHz, %d bit"
+
+#: src/media_input.cpp:276
+msgid "Input:"
+msgstr "Vstup:"
+
+#: src/media_input.cpp:281
+#, c-format
+msgid "Video %s: %s"
+msgstr "Video %s: %s"
+
+#: src/media_input.cpp:286
+msgid "No video."
+msgstr "Žádná video stopa."
+
+#: src/media_input.cpp:292
+#, c-format
+msgid "Audio %s: %s"
+msgstr "Zvuk %s: %s"
+
+#: src/media_input.cpp:297
+msgid "No audio."
+msgstr "Žádná zvuková stopa."
+
+#: src/media_input.cpp:303
+#, c-format
+msgid "Subtitle %s: %s"
+msgstr "Titulky %s: %s"
+
+#: src/media_input.cpp:308
+msgid "No subtitle."
+msgstr "Žádné titulky."
+
+#: src/media_input.cpp:310
+#, c-format
+msgid "Duration: %g seconds"
+msgstr "Délka: %g sekund"
+
+#: src/media_input.cpp:313
+#, c-format
+msgid "Stereo layout: %s"
+msgstr "Stereo režim: %s"
+
+#: src/media_object.cpp:687
+#, c-format
+msgid "%s video stream %d: Unsupported stereo layout %s."
+msgstr "%s video stopa %d: Nepodporovaný stereo režim %s."
+
+#: src/media_object.cpp:725
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with %d channels."
+msgstr "%s zvuková stopa %d: Nemohu přehrát zvukovou stopu s %d kanály."
+
+#: src/media_object.cpp:759
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with sample format %s."
+msgstr "%s zvuková stopa %d: Nemohu přehrát zvukovou stopu ve formátu %s."
+
+#: src/media_object.cpp:830
+#, c-format
+msgid "No support available for %s device."
+msgstr "Zařízení %s není podporováno."
+
+#: src/media_object.cpp:831
+msgid "Firewire"
+msgstr "Firewire"
+
+#: src/media_object.cpp:832
+msgid "X11"
+msgstr "X11"
+
+#: src/media_object.cpp:833
+msgid "default"
+msgstr "výchozí"
+
+#: src/media_object.cpp:866
+#, c-format
+msgid "%s: Cannot read stream info: %s"
+msgstr "%s: Nemohu přečíst informace o stopě: %s"
+
+#: src/media_object.cpp:914
+#, c-format
+msgid "%s stream %d: Cannot open %s: %s"
+msgstr "%s stopa %d: Nemohu otevřít %s: %s"
+
+#: src/media_object.cpp:915
+msgid "video codec"
+msgstr "video kodek"
+
+#: src/media_object.cpp:916
+msgid "audio codec"
+msgstr "zvukový kodek"
+
+#: src/media_object.cpp:917
+msgid "subtitle codec"
+msgstr "kodek titulků"
+
+#: src/media_object.cpp:918
+msgid "data"
+msgstr "data"
+
+#: src/media_object.cpp:919
+msgid "codec not supported"
+msgstr "kodek není podporován"
+
+#: src/media_object.cpp:929
+#, c-format
+msgid "%s video stream %d: Invalid frame size."
+msgstr "%s video stopa %d: Špatná velikost obrazu."
+
+#: src/media_object.cpp:982
+#, c-format
+msgid "%s video stream %d: Cannot initialize conversion context."
+msgstr "%s video stopa %d: Nemohu vytvořit conversion context."
+
+#: src/media_object.cpp:1045
+#, c-format
+msgid "Video stream %d: %s / %s, %g seconds"
+msgstr "Video stopa %d: %s / %s, %g sekund"
+
+#: src/media_object.cpp:1049
+#, c-format
+msgid "Using up to %d threads for decoding."
+msgstr "Využívám až %d vláken pro dekódování."
+
+#: src/media_object.cpp:1054
+#, c-format
+msgid "Audio stream %d: %s / %s, %g seconds"
+msgstr "Zvuková stopa %d: %s / %s, %g sekund"
+
+#: src/media_object.cpp:1061
+#, c-format
+msgid "Subtitle stream %d: %s / %s, %g seconds"
+msgstr "Titulky %d: %s / %s, %g sekund"
+
+#: src/media_object.cpp:1068
+msgid "No usable streams."
+msgstr "Žádná použitelná stopa."
+
+#: src/media_object.cpp:1355 src/media_object.cpp:1385
+#: src/media_object.cpp:1415
+#, c-format
+msgid "%s: Cannot duplicate packet."
+msgstr "%s: Nemohu duplikovat paket."
+
+#: src/media_object.cpp:1508
+#, c-format
+msgid "%s video stream %d: Dropping %dx%d frame"
+msgstr "%s video stopa %d: Zahazuji %dx%d snímek."
+
+#: src/media_object.cpp:1996
+#, c-format
+msgid "%s: Seeking failed."
+msgstr "%s: Vyhledávání selhalo."
+
+#: src/player.cpp:437
+#, c-format
+msgid "Video: delay %g seconds/%g frames; dropping next frame."
+msgstr "Video: zpoždění %g sekund/%g snímků; zahazuji následující snímek."
+
+#: src/player.cpp:453
+#, c-format
+msgid "FPS: %.2f"
+msgstr "FPS: %.2f"
+
+#: src/player_equalizer.cpp:119
+msgid "Reading input frame failed."
+msgstr "Selhalo čtení snímku."
+
+#: src/player_equalizer.cpp:168 src/video_output_qt.cpp:685
+#: src/video_output_qt.cpp:692
+msgid "Waiting for subtitle renderer initialization..."
+msgstr "Čekám na inicializaci vykreslování titulků..."
+
+#: src/player_equalizer.cpp:382
+msgid "No canvas in Equalizer configuration."
+msgstr "V konfiguraci Equalizeru není nastaveno plátno."
+
+#: src/player_equalizer.cpp:389
+#, c-format
+msgid "Equalizer canvas: %gx%g, aspect ratio %g:1"
+msgstr "Equalizer plátno: %gx%g, poměr stran %g:1"
+
+#: src/player_equalizer.cpp:736
+msgid "Init data mapping failed."
+msgstr "Počáteční mapování dat selhalo."
+
+#: src/player_equalizer.cpp:742
+msgid "Frame data mapping failed."
+msgstr "Mapování dat snímku selhalo."
+
+#: src/player_equalizer.cpp:755
+msgid "Video player initialization failed."
+msgstr "Nepodařilo se inicializovat přehrávač videa."
+
+#: src/player_equalizer.cpp:870
+msgid ""
+"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
+"objects."
+msgstr "OpenGL nepodporuje verzi 2.1 a framebuffer objekty."
+
+#: src/player_equalizer.cpp:1048
+msgid "Equalizer initialization failed."
+msgstr "Chyba inicializace Equalizeru."
+
+#: src/player_equalizer.cpp:1056
+msgid "Cannot get equalizer configuration."
+msgstr "Nelze získat nastavení Equalizeru."
+
+#: src/player_equalizer.cpp:1072
+msgid "Equalizer configuration initialization failed."
+msgstr "Nelze získat nastavení Equalizeru."
+
+#: src/subtitle_renderer.cpp:223
+msgid "Cannot initialize LibASS."
+msgstr "Nemohu inicializovat LibASS."
+
+#: src/subtitle_renderer.cpp:232
+msgid "Cannot initialize LibASS renderer."
+msgstr "Nemohu inicializovat vykreslování LibASS."
+
+#: src/subtitle_renderer.cpp:404
+msgid "Cannot initialize LibASS track."
+msgstr "Nemohu inicializovat LibASS stopu."
+
+#: src/subtitle_renderer.cpp:415
+#, c-format
+msgid "Subtitle character set conversion failed: %s"
+msgstr "Konverze kódování titulků selhala: %s"
+
+#: src/video_output.cpp:351
+#, c-format
+msgid "OpenGL error 0x%04X."
+msgstr "OpenGL chyba 0x%04X."
+
+#: src/video_output.cpp:363
+#, c-format
+msgid "OpenGL Framebuffer status error 0x%04X."
+msgstr "OpenGL Framebuffer chyba 0x%04X."
+
+#: src/video_output.cpp:411
+#, c-format
+msgid "OpenGL %s '%s': compiler warning:"
+msgstr "OpenGL %s '%s': varování při kompilaci:"
+
+#: src/video_output.cpp:412 src/video_output.cpp:417
+msgid "vertex shader"
+msgstr "vertex shader"
+
+#: src/video_output.cpp:412 src/video_output.cpp:417
+msgid "fragment shader"
+msgstr "fragment shader"
+
+#: src/video_output.cpp:416
+#, c-format
+msgid "OpenGL %s '%s': compilation failed."
+msgstr "OpenGL %s '%s': selhala kompilace."
+
+#: src/video_output.cpp:419 src/video_output.cpp:496
+msgid "unknown error"
+msgstr "neznámá chyba"
+
+#: src/video_output.cpp:492
+#, c-format
+msgid "OpenGL program '%s': linker warning:"
+msgstr "OpenGL program '%s': varování linkeru:"
+
+#: src/video_output.cpp:495
+#, c-format
+msgid "OpenGL program '%s': linking failed."
+msgstr "OpenGL program '%s': selhalo linkování."
+
+#: src/video_output.cpp:1556 src/video_output.cpp:1700
+msgid "Cannot create a PBO buffer."
+msgstr "Nemohu vytvořit PBO buffer."
+
+#: src/video_output_qt.cpp:291 src/video_output_qt.cpp:534
+#: src/video_output_qt.cpp:731 src/video_output_qt.cpp:743
+#: src/video_output_qt.cpp:764
+msgid "Error"
+msgstr "Chyba"
+
+#: src/video_output_qt.cpp:636
+#, c-format
+msgid "Cannot initialize GLEW: %s"
+msgstr "Nemohu inicializovat GLEW: %s"
+
+#: src/video_output_qt.cpp:656
+msgid "This OpenGL implementation does not support required features."
+msgstr "OpenGL nepodporuje potřebné funkce."
+
+#: src/video_output_qt.cpp:683
+msgid "Please wait"
+msgstr "Prosím čekejte"
+
+#: src/video_output_qt.cpp:743
+msgid "Cannot get valid OpenGL context."
+msgstr "Nemohu získat platný OpenGL context."
+
+#: src/video_output_qt.cpp:754
+msgid "The display does not support OpenGL stereo mode."
+msgstr "Stereo OpenGL režim není podporován."
+
+#: src/video_output_qt.cpp:759
+msgid "Cannot set OpenGL context format."
+msgstr "Nemohu nastavit OpenGL formát."
+
+#: src/video_output_qt.cpp:862
+msgid "Cannot suspend screensaver."
+msgstr "Nelze zakázat spořič obrazovky."
+
+#: src/video_output_qt.cpp:877
+msgid "Cannot resume screensaver."
+msgstr "Nelze povolit spořič obrazovky."
+
+#~ msgid "Video:"
+#~ msgstr "Video:"
+
+#~ msgid "Select the video stream."
+#~ msgstr "Vyber video stopu."
+
+#~ msgid "Audio:"
+#~ msgstr "Zvuk:"
+
+#~ msgid "Select the audio stream."
+#~ msgstr "Vyber zvukovou stopu."
+
+#~ msgid "Subtitle:"
+#~ msgstr "Titulky:"
+
+#~ msgid "Select the subtitle stream."
+#~ msgstr "Vyber stopu titulků."
+
+#~ msgid "Set the 3D layout of the video stream."
+#~ msgstr "Nastav 3D formát videa."
+
+#~ msgid "Output:"
+#~ msgstr "Výstup:"
+
+#~ msgid "Set the 3D output type for your display."
+#~ msgstr "Nastav 3D formát výstupu vašeho monitoru."
+
+#~ msgid "Swap left/right"
+#~ msgstr "Prohoď levou/pravou"
+
+#~ msgid ""
+#~ "Swap the left and right view. Use this if the 3D effect seems wrong.</"
+#~ "p>"
+#~ msgstr ""
+#~ "Prohoď levou a pravou. Použijte, pokud je 3D efekt špatný (obrácený)</"
+#~ "p>"
+
+#~ msgid "Off"
+#~ msgstr "Žádné"
+
+#~ msgid ""
+#~ "This slider shows the progress during video playback, and can be used "
+#~ "to seek in the video."
+#~ msgstr ""
+#~ "Tento posuvník zobrazuje pozici přehrávaného videa, můžete ho použít "
+#~ "pro vyhledávání ve videu."
+
+#~ msgid "Elapsed / total time."
+#~ msgstr "Uplynulý / celkový čas."
+
+#~ msgid "Toggle audio mute."
+#~ msgstr "Přepnout ztišení zvuku."
+
+#~ msgid "Adjust audio volume."
+#~ msgstr "Upravit hlasitost zvuku."
+
+#~ msgid "Play."
+#~ msgstr "Spustit."
+
+#~ msgid "Pause."
+#~ msgstr "Pozastav."
+
+#~ msgid "Stop."
+#~ msgstr "Zastav."
+
+#~ msgid "Toggle loop mode."
+#~ msgstr "Přepnout přehrávání ve smyčce."
+
+#~ msgid ""
+#~ "Switch to fullscreen mode. You can leave fullscreen mode by pressing "
+#~ "the f key."
+#~ msgstr ""
+#~ "Přepni do režimu celé obrazovky. Tento režim můžete ukončit stiskem "
+#~ "tlačítka f"
+
+#~ msgid "Center the video area on your screen."
+#~ msgstr "Vycentruj video na středu obrazovky."
+
+#~ msgid "Seek backward 10 minutes."
+#~ msgstr "Přeskoč 10 minut zpět."
+
+#~ msgid "Seek backward 1 minute."
+#~ msgstr "Přeskoč 1 minutu zpět."
+
+#~ msgid "Seek backward 10 seconds."
+#~ msgstr "Přeskoč 10 vteřin zpět."
+
+#~ msgid "Seek forward 10 seconds."
+#~ msgstr "Přeskoč 10 vteřin dopředu."
+
+#~ msgid "Seek forward 1 minute."
+#~ msgstr "Přeskoč 1 minutu dopředu."
+
+#~ msgid "Seek forward 10 minutes."
+#~ msgstr "Přeskoč 10 minut dopředu."
+
+#~ msgid "Fullscreen/Multiscreen Settings"
+#~ msgstr "Nastavení Celoobrazového/Víceobrazového režimu"
+
+#~ msgid "Configure fullscreen mode:"
+#~ msgstr "Nastavení celoobrazového režimu:"
+
+#~ msgid "Select the screens to use in fullscreen mode."
+#~ msgstr "Vyber obrazovky, které budou použity v celoobrazovém režimu."
+
+#~ msgid "Single screen:"
+#~ msgstr "Jedna obrazovka:"
+
+#~ msgid "Use a single screen for fullscreen mode."
+#~ msgstr "Použij jednu obrazovku pro celoobrazový režim."
+
+#~ msgid "Primary screen"
+#~ msgstr "Primární obrazovka"
+
+#~ msgid "Screen %d"
+#~ msgstr "Obrazovka %d"
+
+#~ msgid "Dual screen:"
+#~ msgstr "Dvě obrazovky:"
+
+#~ msgid "Use two screens for fullscreen mode."
+#~ msgstr "Použij dvě obrazovky pro celoobrazový režim."
+
+#~ msgid "Multi screen:"
+#~ msgstr "Více obrazovek:"
+
+#~ msgid "Use multiple screens for fullscreen mode."
+#~ msgstr "Použij více obrazovek pro celoobrazový režim."
+
+#~ msgid "Comma-separated list of screens to use for fullscreen mode."
+#~ msgstr ""
+#~ "Seznam obrazovek pro použití v celoobrazovém režimu, oddělený čárkou.</"
+#~ "p>"
+
+#~ msgid "When in fullscreen mode,"
+#~ msgstr "V celoobrazovém režimu,"
+
+#~ msgid "Set special left/right view handling for fullscreen mode."
+#~ msgstr ""
+#~ "Nastav zvláštní chování pravého/levého obrazu při celoobrazovém režimu."
+#~ ""
+
+#~ msgid "flip left view vertically."
+#~ msgstr "překlop levý obraz vertikálně."
+
+#~ msgid "flop left view horizontally."
+#~ msgstr "překlop levý obraz horizontálně."
+
+#~ msgid "flip right view vertically."
+#~ msgstr "překlop pravý obraz vertikálně."
+
+#~ msgid "flop right view horizontally."
+#~ msgstr "překlop pravý obraz horizontálně."
+
+#~ msgid "use DLP(R) 3-D Ready Sync"
+#~ msgstr "použít DLP(R) 3-D Ready Sync"
+
+#~ msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
+#~ msgstr ""
+#~ "Použít DLP&reg; 3-D Ready Sync pro podporované výstupní formáty."
+
+#~ msgid "inhibit the screensaver"
+#~ msgstr "zakázat spořič obrazovky"
+
+#~ msgid "Inhibit the screensaver during fullscreen playback."
+#~ msgstr "Zakázat spořič obrazovky v celoobrazovém režimu."
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Display Color Adjustments"
+#~ msgstr "Zobraz nastavení barev"
+
+#~ msgid "Contrast:"
+#~ msgstr "Kontrast:"
+
+#~ msgid "Brightness:"
+#~ msgstr "Jas:"
+
+#~ msgid "Hue:"
+#~ msgstr "Odstín:"
+
+#~ msgid "Saturation:"
+#~ msgstr "Sytost:"
+
+#~ msgid "Display Crosstalk Calibration"
+#~ msgstr "Zobraz Crosstalk kalibraci"
+
+#~ msgid ""
+#~ "Please read the manual to find out how to measure the crosstalk "
+#~ "levels of your display."
+#~ msgstr ""
+#~ "Přečtěte si prosím v manuálu jak změřit nastavení crosstalku pro "
+#~ "váš monitor."
+
+#~ msgid "Red:"
+#~ msgstr "Červená:"
+
+#~ msgid "Green:"
+#~ msgstr "Zelená:"
+
+#~ msgid "Blue:"
+#~ msgstr "Modrá:"
+
+#~ msgid "Rendering Quality Adjustments"
+#~ msgstr "Nastavení kvality výstupu"
+
+#~ msgid "Rendering Quality:"
+#~ msgstr "Kvalita vykreslování:"
+
+#~ msgid "Zoom for wide videos"
+#~ msgstr "Zvětšit široká videa"
+
+#~ msgid ""
+#~ "Set zoom level for videos that are wider than the screen: 0: "
+#~ "Show full video width. 1: Use full screen height."
+#~ msgstr ""
+#~ "Nastav zvětšení pro videa širší než je velikost obrazovky. 0: "
+#~ "Zobrazit plnou šířku videa. 1: Použít výšku obrazovky"
+
+#~ msgid "Zoom:"
+#~ msgstr "Zvětšení:"
+
+#~ msgid "Set the zoom level for videos that are wider than the screen."
+#~ msgstr "Nastav zvětšení pro videa širší než je velikost obrazovky."
+
+#~ msgid "Audio Settings"
+#~ msgstr "Nastavení zvuku"
+
+#~ msgid "Audio device:"
+#~ msgstr "Zvukové zařízení:"
+
+#~ msgid ""
+#~ "Select the audio device. This will take effect for the next started "
+#~ "video."
+#~ msgstr "Vyberte zvukové zařízení. Projeví se až u dalšího videa."
+
+#~ msgid "Default"
+#~ msgstr "Výchozí"
+
+#~ msgid "Audio delay (ms):"
+#~ msgstr "Zpoždění zvuku (ms):"
+
+#~ msgid ""
+#~ "Set an audio delay, in milliseconds. This is useful if audio and "
+#~ "video are not in sync."
+#~ msgstr ""
+#~ "Nastav zpoždění zvuku v milisekundách. Použijte pokud se rozchází "
+#~ "zvuk a video."
+
+#~ msgid "Subtitle Settings"
+#~ msgstr "Nastavení titulků"
+
+#~ msgid ""
+#~ "These settings apply only to soft subtitles, not to bitmaps. Some "
+#~ "changes require a restart of the video to take effect."
+#~ msgstr ""
+#~ "Tato nastavení se aplikují na titulky v textové podobě, ne na "
+#~ "obrázkové. Některé změny se projeví až po restartu videa."
+
+#~ msgid "Encoding:"
+#~ msgstr "Kódování:"
+
+#~ msgid "Set the subtitle character set encoding."
+#~ msgstr "Nastaví znakovou stránku titulků."
+
+#~ msgid "Override font:"
+#~ msgstr "Vynutit font:"
+
+#~ msgid "Override the subtitle font family."
+#~ msgstr "Vynutí font titulků."
+
+#~ msgid "Override font size:"
+#~ msgstr "Vynutit velikost fontu:"
+
+#~ msgid "Override the subtitle font size."
+#~ msgstr "Vynutí velikost titulků."
+
+#~ msgid "Override scale factor:"
+#~ msgstr "Vynutit zvětšení:"
+
+#~ msgid "Override the subtitle scale factor."
+#~ msgstr "Vynutí zvětšní titulků."
+
+#~ msgid "Override color:"
+#~ msgstr "Vynutit barvu:"
+
+#~ msgid "Override the subtitle color."
+#~ msgstr "Vynutí barvu titulků."
+
+#~ msgid "Override shadow:"
+#~ msgstr "Vynutit stín:"
+
+#~ msgid "Override the subtitle shadow."
+#~ msgstr "Vynutí stín titulků."
+
+#~ msgid "On"
+#~ msgstr "Zaputo"
+
+#~ msgid "Video Settings"
+#~ msgstr "Nastavení videa"
+
+#~ msgid "Crop to aspect ratio:"
+#~ msgstr "Oříznout na poměr stran:"
+
+#~ msgid ""
+#~ "Set the real aspect ratio of the video, so that borders can be cropped."
+#~ ""
+#~ msgstr ""
+#~ "Nastav skutečný poměr stran videa, aby bylo možné ořiznout tokraje."
+
+#~ msgid "Do not crop"
+#~ msgstr "Neořezávat"
+
+#~ msgid "Force source aspect ratio:"
+#~ msgstr "Vynutit poměr stran zdroje:"
+
+#~ msgid "Force the aspect ratio of video source."
+#~ msgstr "Vynutit poměr stran zdroje videa."
+
+#~ msgid "Do not force"
+#~ msgstr "Nevynucovat"
+
+#~ msgid "Parallax:"
+#~ msgstr "Parallax:"
+
+#~ msgid ""
+#~ "Adjust parallax, from -1 to +1. This changes the separation of left "
+#~ "and right view, and thus the perceived distance of the scene."
+#~ msgstr ""
+#~ "Upraví parallax, od -1 do +1. Změní vzdálenost levého a pravého obrazu "
+#~ "a tím nastaví hloubku vnímání 3D scény."
+
+#~ msgid "Subtitle parallax:"
+#~ msgstr "Parallax titulků:"
+
+#~ msgid ""
+#~ "Adjust subtitle parallax, from -1 to +1. This changes the perceived "
+#~ "distance of the subtitles."
+#~ msgstr ""
+#~ "Upraví parallax titulků, od -1 do +1. Změní vnímanou vzdálenost "
+#~ "titulků."
+
+#~ msgid "Ghostbusting:"
+#~ msgstr "Ghostbusting:"
+
+#~ msgid ""
+#~ "Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+#~ "the crosstalk levels of your display first. Note that crosstalk "
+#~ "ghostbusting does not work with anaglyph glasses."
+#~ msgstr ""
+#~ "Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+#~ "the crosstalk levels of your display first. Note that crosstalk "
+#~ "ghostbusting does not work with anaglyph glasses."
+
+#~ msgid "SDI Output Settings"
+#~ msgstr "Nastavení SDI výstupu"
+
+#~ msgid "SDI Output Format:"
+#~ msgstr "Formát SDI výstupu:"
+
+#~ msgid "Select output format used for SDI output."
+#~ msgstr "Nastav formát výstupu pro SDI."
+
+#~ msgid "Left stereo mode:"
+#~ msgstr "Levé stereo zobrazení:"
+
+#~ msgid "Select stereo mode used for left SDI output."
+#~ msgstr "Vyber typ stereo zobrazení pro levý SDI výstup."
+
+#~ msgid "Right stereo mode:"
+#~ msgstr "Pravé stereo zobrazení:"
+
+#~ msgid "Select stereo mode used for right SDI output."
+#~ msgstr "Vyber typ stereo zobrazení pro pravý SDI výstup."
+
+#~ msgid "Open device(s)"
+#~ msgstr "Otevři zařízení"
+
+#~ msgid "Choose a device type."
+#~ msgstr "Vyberte typ zařízení."
+
+#~ msgid "Choose a device."
+#~ msgstr "Vyberte zařízení."
+
+#~ msgid "Set the X11 device string. Refer to the manual for details."
+#~ msgstr "Zadejte X11 device string. Podrobnosti najdete v manuálu."
+
+#~ msgid "First device:"
+#~ msgstr "První zařízení:"
+
+#~ msgid "Second device:"
+#~ msgstr "Druhé zařízení"
+
+#~ msgid "Request frame size"
+#~ msgstr "Vynutit velikost obrazu"
+
+#~ msgid ""
+#~ "Request a specific frame size from the device, e.g. 640x480. The "
+#~ "device must support this frame size. Some devices require a frame size to "
+#~ "be selected."
+#~ msgstr ""
+#~ "Požaduj danou velikost obrazu, například 640x480. Zařízení musí danou "
+#~ "velikost podporovat. Některá zařízení vyžadují, aby byla velikost "
+#~ "nastavena."
+
+#~ msgid "Request frame rate"
+#~ msgstr "Vynutit snímkovou frekvenci"
+
+#~ msgid ""
+#~ "Request a specific frame rate from the device, e.g. 25/1. The device "
+#~ "must support this frame rate. Some devices require a frame rate to be "
+#~ "selected."
+#~ msgstr ""
+#~ "Požaduj danou snímkovou frekvenci, například 25/1. Zařízení musí danou "
+#~ "frekvenci podporovat. Některá zařízení vyžadují, aby byla frekvence "
+#~ "nastavena."
+
+#~ msgid "Request MJPEG format"
+#~ msgstr "Vynutit MJPEG formát"
+
+#~ msgid ""
+#~ "Request MJPEG data from the input device. The device may ignore this "
+#~ "request."
+#~ msgstr ""
+#~ "Vynutit data ze vstupního zařízení ve formátu MJPEG. Zařízení však "
+#~ "může požadavek ignorovat."
+
+#~ msgid "Cancel"
+#~ msgstr "Zrušit"
+
+#~ msgid "&File"
+#~ msgstr "&Soubor"
+
+#~ msgid "&Open file(s)..."
+#~ msgstr "&Otevři soubory..."
+
+#~ msgid "Open &URL(s)..."
+#~ msgstr "Otevři &URL..."
+
+#~ msgid "Open &device(s)..."
+#~ msgstr "Otevři &zařízení..."
+
+#~ msgid "&Clear recent files"
+#~ msgstr "&Vyčistit poslední soubory"
+
+#~ msgid "&Quit"
+#~ msgstr "&Ukončit..."
+
+#~ msgid "&Preferences"
+#~ msgstr "&Nastavení"
+
+#~ msgid "&Fullscreen Settings..."
+#~ msgstr "Nastavení &celoobrazového režimu..."
+
+#~ msgid "Display &Color Adjustments..."
+#~ msgstr "Nastavení &barev..."
+
+#~ msgid "Display Cross&talk Calibration..."
+#~ msgstr "Nastavení &Crosstalku..."
+
+#~ msgid "Quality Adjustments..."
+#~ msgstr "Nastavení &kvality..."
+
+#~ msgid "&Zoom for wide videos..."
+#~ msgstr "&Zvětšení pro řiroká videa..."
+
+#~ msgid "&Audio Settings..."
+#~ msgstr "Nastavení &zvuku..."
+
+#~ msgid "&Subtitle Settings..."
+#~ msgstr "Nastavení &titulků..."
+
+#~ msgid "Current &Video Settings..."
+#~ msgstr "Aktuální nastavení videa..."
+
+#~ msgid "SDI &Output Settings..."
+#~ msgstr "Nastavení &SDI výstupu..."
+
+#~ msgid "&Help"
+#~ msgstr "&Nápověda"
+
+#~ msgid "&Manual..."
+#~ msgstr "&Manuál..."
+
+#~ msgid "&Website..."
+#~ msgstr "&Webová stránka..."
+
+#~ msgid "&Keyboard Shortcuts"
+#~ msgstr "&Klávesové zkratky"
+
+#~ msgid "&About"
+#~ msgstr "&O Binu"
+
+#~ msgid "Tip"
+#~ msgstr "Tip"
+
+#~ msgid ""
+#~ "You can select and open multiple files at once.This is useful "
+#~ "for example if you have extra subtitle files, or if left and right "
+#~ "view are stored in separate files."
+#~ msgstr ""
+#~ "Můžete označit o otevřít několik souborů naráz.To se hodí když "
+#~ "jsou titulky uloženy v samostatném souboru, nebo když je video pro "
+#~ "pravý a levý obraz uloženo v samostatných souborech."
+
+#~ msgid "Do not show this message again."
+#~ msgstr "Tuto zprávu příště nezobrazovat."
+
+#~ msgid "Open files"
+#~ msgstr "Otevři soubory"
+
+#~ msgid "Open URL(s)"
+#~ msgstr "Otevři URL"
+
+#~ msgid "URL(s):"
+#~ msgstr "URL:"
+
+#~ msgid "Enter one or more space separated URLs."
+#~ msgstr "Vložte jeden nebo více odkazů. Oddělte je mezerou."
+
+#~ msgid "Cannot open manual."
+#~ msgstr "Nemohu otevřít manál."
+
+#~ msgid "Cannot open website."
+#~ msgstr "Nemohu otevřít webovou stránku."
+
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Klávesové zkratky"
+
+#~ msgid "Keyboard control:"
+#~ msgstr "Ovládání klávesnicí::"
+
+#~ msgid "Stop"
+#~ msgstr "Zastav"
+
+#~ msgid "About %s"
+#~ msgstr "O pragramu %s"
+
+#~ msgid "The %s 3D video player"
+#~ msgstr "%s 3D video přehrávač"
+
+#~ msgid ""
+#~ "%s version %s.Copyright (C) 2014 the Bino developers.</"
+#~ "p>This is free software. You may redistribute copies of it under the "
+#~ "terms of the <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General "
+#~ "Public License</a>. There is NO WARRANTY, to the extent permitted by law."
+#~ "See <a href=\"%s\">%s</a> for more information on this software.</"
+#~ "p>"
+#~ msgstr ""
+#~ "%s verze %s.Copyright (C) 2014 Bino vývojáři.Tento "
+#~ "program je svobodný software. Můžete jej šířit a modifikovat podle "
+#~ "ustanovení <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General "
+#~ "Public License</a>.Tento program je rozšiřován v naději, že bude "
+#~ "užitečný, avšak BEZ JAKÉKOLI ZÁRUKY; neposkytují se ani odvozené záruky "
+#~ "PRODEJNOSTI anebo VHODNOSTI PRO URČITÝ ÚČEL.Navštivte <a href=\"%s"
+#~ "\">%s</a> pro více informací o tomto software."
+
+#~ msgid "About"
+#~ msgstr "O programu"
+
+#~ msgid "Libraries"
+#~ msgstr "Knihovny"
+
+#~ msgid "Team"
+#~ msgstr "Tým"
+
+#~ msgid "License"
+#~ msgstr "Licence"

bino-1.6.1.tar.xz/po/de.gmo -> bino-1.6.5.tar.xz/po/de.gmo Changed

bino-1.6.1.tar.xz/po/de.po -> bino-1.6.5.tar.xz/po/de.po Changed

@@ -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: 2014-10-13 13:20+0200\n"
+"POT-Creation-Date: 2016-12-16 09:10+0100\n"
 "PO-Revision-Date: 2011-04-10 17:23+0200\n"
 "Last-Translator: Martin Lambers <marlam@marlam.de>\n"
 "Language-Team: none\n"
@@ -88,31 +88,31 @@
 msgid "Too many arguments."
 msgstr "Zu viele Argumente."
 
-#: src/base/str.cpp:269
+#: src/base/str.cpp:459
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Kann Zeichenkette nicht zu %s konvertieren."
 
-#: src/base/str.cpp:517 src/base/str.cpp:536 src/base/str.cpp:547
-#: src/base/str.cpp:559
+#: src/base/str.cpp:993 src/base/str.cpp:1012 src/base/str.cpp:1023
+#: src/base/str.cpp:1035
 #, c-format
 msgid "Cannot convert %s to %s: %s"
 msgstr "Kann %s nicht zu %s konvertieren: %s"
 
-#: src/base/str.cpp:565
+#: src/base/str.cpp:1041
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Kann %s nicht zu %s konvertieren."
 
-#: src/base/thread.cpp:38 src/base/thread.cpp:48 src/base/thread.cpp:61
-#: src/base/thread.cpp:74 src/base/thread.cpp:85 src/base/thread.cpp:95
-#: src/base/thread.cpp:108 src/base/thread.cpp:116 src/base/thread.cpp:124
-#: src/base/thread.cpp:204 src/base/thread.cpp:211 src/base/thread.cpp:225
-#: src/base/thread.cpp:245
+#: src/base/pth.cpp:38 src/base/pth.cpp:48 src/base/pth.cpp:61
+#: src/base/pth.cpp:74 src/base/pth.cpp:85 src/base/pth.cpp:95
+#: src/base/pth.cpp:108 src/base/pth.cpp:116 src/base/pth.cpp:124
+#: src/base/pth.cpp:204 src/base/pth.cpp:211 src/base/pth.cpp:225
+#: src/base/pth.cpp:245
 msgid "System function failed: "
 msgstr "Systemfunktion fehlgeschlagen: "
 
-#: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
+#: src/base/tmr.cpp:63 src/base/tmr.cpp:72 src/base/tmr.cpp:81
 msgid "Cannot get time."
 msgstr "Kann Zeit nicht abfragen."
 
@@ -235,1034 +235,11 @@
 msgid "Subtitle stream %d not found."
 msgstr "Untertitelkanal %d nicht gefunden."
 
-#: src/dispatch.cpp:559 src/main.cpp:795
+#: src/dispatch.cpp:559 src/main.cpp:796
 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:111
-msgid "Video:"
-msgstr "Video:"
-
-#: src/gui.cpp:112
-msgid "Select the video stream."
-msgstr "Auswahl des Videokanals."
-
-#: src/gui.cpp:118
-msgid "Audio:"
-msgstr "Audio:"
-
-#: src/gui.cpp:119
-msgid "Select the audio stream."
-msgstr "Auswahl des Videokanals."
-
-#: src/gui.cpp:125
-msgid "Subtitle:"
-msgstr "Untertitel:"
-
-#: src/gui.cpp:126
-msgid "Select the subtitle stream."
-msgstr "Auswahl des Untertitelkanals."
-
-#: src/gui.cpp:137 src/media_input.cpp:276
-msgid "Input:"
-msgstr "Eingabe:"
-
-#: src/gui.cpp:138
-msgid "Set the 3D layout of the video stream."
-msgstr "Auswahl des Stereolayouts des Videokanals."
-
-#: src/gui.cpp:142 src/main.cpp:459
-msgid "2D"
-msgstr "2D"
-
-#: src/gui.cpp:143 src/main.cpp:460
-msgid "Separate streams, left first"
-msgstr "Getrennte Kanäle, links zuerst"
-
-#: src/gui.cpp:144 src/main.cpp:461
-msgid "Separate streams, right first"
-msgstr "Getrennte Kanäle, rechts zuerst"
-
-#: src/gui.cpp:145 src/main.cpp:462
-msgid "Alternating, left first"
-msgstr "Abwechselnd, links zuerst."
-
-#: src/gui.cpp:146 src/main.cpp:463
-msgid "Alternating, right first"
-msgstr "Abwechselnd, rechts zuerst."
-
-#: 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: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:149 src/main.cpp:466
-msgid "Bottom/top"
-msgstr "Unten/oben"
-
-#: src/gui.cpp:150 src/main.cpp:467
-msgid "Bottom/top, half height"
-msgstr "Unten/oben, halbe Höhe"
-
-#: 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 "Links/rechts"
-
-#: src/gui.cpp:152 src/gui.cpp:174 src/gui.cpp:2215 src/gui.cpp:2244
-#: src/main.cpp:469 src/main.cpp:482
-msgid "Left/right, half width"
-msgstr "Links/rechts, halbe Breite"
-
-#: src/gui.cpp:153 src/main.cpp:470
-msgid "Right/left"
-msgstr "Rechts/links"
-
-#: src/gui.cpp:154 src/main.cpp:471
-msgid "Right/left, half width"
-msgstr "Rechts/links, halbe Breite"
-
-#: src/gui.cpp:155 src/gui.cpp:175 src/gui.cpp:2216 src/gui.cpp:2245
-#: src/main.cpp:472 src/main.cpp:483
-msgid "Even/odd rows"
-msgstr "Gerade/ungerade Zeilen"
-
-#: src/gui.cpp:156 src/main.cpp:473
-msgid "Odd/even rows"
-msgstr "Ungerade/gerade Zeilen"
-
-#: src/gui.cpp:162
-msgid "Output:"
-msgstr "Ausgabe:"
-
-#: src/gui.cpp:163
-msgid "Set the 3D output type for your display."
-msgstr "Auswahl des 3D Ausgabetyps für das Ausgabegerät."
-
-#: src/gui.cpp:167 src/gui.cpp:2210 src/gui.cpp:2239 src/main.cpp:477
-msgid "Left view"
-msgstr "Linke Sicht"
-
-#: src/gui.cpp:168 src/gui.cpp:2211 src/gui.cpp:2240 src/main.cpp:478
-msgid "Right view"
-msgstr "Rechte Sicht"
-
-#: src/gui.cpp:169 src/main.cpp:475
-msgid "OpenGL stereo"
-msgstr "OpenGL Stereo"
-
-#: src/gui.cpp:170 src/main.cpp:476
-msgid "Left/right alternating"
-msgstr "Links/rechts abwechselnd"
-
-#: src/gui.cpp:176 src/gui.cpp:2217 src/gui.cpp:2246 src/main.cpp:484
-msgid "Even/odd columns"
-msgstr "Gerade/ungerade Spalten"
-
-#: src/gui.cpp:177 src/gui.cpp:2218 src/gui.cpp:2247 src/main.cpp:485
-msgid "Checkerboard pattern"
-msgstr "Schachbrettmuster"
-
-#: src/gui.cpp:178 src/main.cpp:486
-msgid "HDMI frame packing mode"
-msgstr "HDMI Framepacking Modus"
-
-#: src/gui.cpp:179 src/gui.cpp:2219 src/gui.cpp:2248 src/main.cpp:487
-msgid "Red/cyan glasses, monochrome"
-msgstr "Rot/cyan Brillen, monochrom"
-
-#: src/gui.cpp:180 src/gui.cpp:2220 src/gui.cpp:2249 src/main.cpp:488
-msgid "Red/cyan glasses, half color"
-msgstr "Rot/cyan Brillen, halbfarbig"
-
-#: src/gui.cpp:181 src/gui.cpp:2221 src/gui.cpp:2250 src/main.cpp:489
-msgid "Red/cyan glasses, full color"
-msgstr "Rot/cyan Brillen, vollfarbig"
-
-#: src/gui.cpp:182 src/gui.cpp:2222 src/gui.cpp:2251 src/main.cpp:490
-msgid "Red/cyan glasses, Dubois"
-msgstr "Rot/cyan Brillen, Dubois"
-
-#: src/gui.cpp:183 src/gui.cpp:2223 src/gui.cpp:2252 src/main.cpp:491
-msgid "Green/magenta glasses, monochrome"
-msgstr "Grün/magenta Brillen, monochrom"
-
-#: src/gui.cpp:184 src/gui.cpp:2224 src/gui.cpp:2253 src/main.cpp:492
-msgid "Green/magenta glasses, half color"
-msgstr "Grün/magenta Brillen, halbfarbig"
-
-#: src/gui.cpp:185 src/gui.cpp:2225 src/gui.cpp:2254 src/main.cpp:493
-msgid "Green/magenta glasses, full color"
-msgstr "Grün/magenta Brillen, vollfarbig"
-
-#: src/gui.cpp:186 src/gui.cpp:2226 src/gui.cpp:2255 src/main.cpp:494
-msgid "Green/magenta glasses, Dubois"
-msgstr "Grün/magenta Brillen, Dubois"
-
-#: src/gui.cpp:187 src/gui.cpp:2227 src/gui.cpp:2256 src/main.cpp:495
-msgid "Amber/blue glasses, monochrome"
-msgstr "Orange/blau Brillen, monochrom"
-
-#: src/gui.cpp:188 src/gui.cpp:2228 src/gui.cpp:2257 src/main.cpp:496
-msgid "Amber/blue glasses, half color"
-msgstr "Orange/blau Brillen, halbfarbig"
-
-#: src/gui.cpp:189 src/gui.cpp:2229 src/gui.cpp:2258 src/main.cpp:497
-msgid "Amber/blue glasses, full color"
-msgstr "Orange/blau Brillen, vollfarbig"
-
-#: src/gui.cpp:190 src/gui.cpp:2230 src/gui.cpp:2259 src/main.cpp:498
-msgid "Amber/blue glasses, Dubois"
-msgstr "Orange/blau Brillen, Dubois"
-
-#: src/gui.cpp:191 src/gui.cpp:2231 src/gui.cpp:2260 src/main.cpp:499
-msgid "Red/green glasses, monochrome"
-msgstr "Rot/grün Brillen, monochrome"
-
-#: src/gui.cpp:192 src/gui.cpp:2232 src/gui.cpp:2261 src/main.cpp:500
-msgid "Red/blue glasses, monochrome"
-msgstr "Rot/blau Brillen, monochrom"
-
-#: src/gui.cpp:196
-msgid "Swap left/right"
-msgstr "Tausche links/rechts"
-
-#: src/gui.cpp:197
-msgid ""
-"Swap the left and right view. Use this if the 3D effect seems wrong."
-msgstr ""
-"Vertauschung von linker und rechter Sicht (falls der 3D Effekt falsch "
-"wirkt)."
-
-#: src/gui.cpp:475 src/gui.cpp:1736
-msgid "Off"
-msgstr "Aus"
-
-#: src/gui.cpp:706
-msgid ""
-"This slider shows the progress during video playback, and can be used to "
-"seek in the video."
-msgstr ""
-"Dieser Gleiter zeigt der Fortschritt beim Abspielen an, und kann zum Vor- "
-"und Zurückspulen benutzt werden."
-
-#: src/gui.cpp:713
-msgid "Elapsed / total time."
-msgstr "Zeit / Gesamtdauer."
-
-#: src/gui.cpp:720
-msgid "Toggle audio mute."
-msgstr "Schalte Stummschaltung um."
-
-#: src/gui.cpp:725
-msgid "Adjust audio volume."
-msgstr "Stelle Lautstärke ein."
-
-#: src/gui.cpp:737
-msgid "Play."
-msgstr "Abspielen."
-
-#: src/gui.cpp:741
-msgid "Pause."
-msgstr "Pause."
-
-#: src/gui.cpp:745
-msgid "Stop."
-msgstr "Stopp."
-
-#: src/gui.cpp:750
-msgid "Toggle loop mode."
-msgstr "Schalte Wiederholmodus um."
-
-#: src/gui.cpp:757
-msgid ""
-"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
-"f key."
-msgstr ""
-"Zum Vollbildmodus schalten. Der Vollbildmodus kann mit der Taste f "
-"verlassen werden."
-
-#: src/gui.cpp:763
-msgid "Center the video area on your screen."
-msgstr "Zentrierung des Videos in der Mitte des Bildschirms."
-
-#: src/gui.cpp:770
-msgid "Seek backward 10 minutes."
-msgstr "10 Minuten zurückspulen."
-
-#: src/gui.cpp:775
-msgid "Seek backward 1 minute."
-msgstr "1 Minute zurückspulen."
-
-#: src/gui.cpp:781
-msgid "Seek backward 10 seconds."
-msgstr "10 Sekunden zurückspulen."
-
-#: src/gui.cpp:787
-msgid "Seek forward 10 seconds."
-msgstr "10 Sekunden vorspulen."
-
-#: src/gui.cpp:792
-msgid "Seek forward 1 minute."
-msgstr "1 Minute vorspulen."
-
-#: src/gui.cpp:798
-msgid "Seek forward 10 minutes."
-msgstr "10 Minuten vorspulen."
-
-#: src/gui.cpp:1059
-msgid "Fullscreen/Multiscreen Settings"
-msgstr "Vollbild-/Multibildeinstellungen"
-
-#: src/gui.cpp:1061
-msgid "Configure fullscreen mode:"
-msgstr "Konfiguriere Vollbildmodus:"
-
-#: src/gui.cpp:1062
-msgid "Select the screens to use in fullscreen mode."
-msgstr "Auswahl der Bildschirme für den Vollbildmodus."
-
-#: src/gui.cpp:1064
-msgid "Single screen:"
-msgstr "Einzelner Bildschirm:"
-
-#: src/gui.cpp:1065
-msgid "Use a single screen for fullscreen mode."
-msgstr "Benutze einen einzelnen Bildschirm im Vollbildmodus."
-
-#: src/gui.cpp:1068
-msgid "Primary screen"
-msgstr "Hauptbildschirm"
-
-#: src/gui.cpp:1071 src/gui.cpp:1082 src/gui.cpp:1083
-#, c-format
-msgid "Screen %d"
-msgstr "Bildschirm %d"
-
-#: src/gui.cpp:1074
-msgid "Dual screen:"
-msgstr "Doppelbildschirm:"
-
-#: src/gui.cpp:1075
-msgid "Use two screens for fullscreen mode."
-msgstr "Benutze zwei Bildschirme im Vollbildmodus."
-
-#: src/gui.cpp:1087
-msgid "Multi screen:"
-msgstr "Multibildschirm:"
-
-#: src/gui.cpp:1088
-msgid "Use multiple screens for fullscreen mode."
-msgstr "Benutze mehrere Bildschirme im Vollbildmodus."
-
-#: src/gui.cpp:1090
-msgid "Comma-separated list of screens to use for fullscreen mode."
-msgstr ""
-"Liste von Bildschirmen für den Vollbildmodus, durch Kommata getrennt."
-
-#: src/gui.cpp:1093
-msgid "When in fullscreen mode,"
-msgstr "Im Vollbildmodus:"
-
-#: src/gui.cpp:1094
-msgid "Set special left/right view handling for fullscreen mode."
-msgstr ""
-"Wähle spezielle Einstellungen für linke und rechte Ansicht im "
-"Vollbildmodus."
-
-#: src/gui.cpp:1096
-msgid "flip left view vertically."
-msgstr "Spiegele linke Ansicht vertikal."
-
-#: src/gui.cpp:1098
-msgid "flop left view horizontally."
-msgstr "Spiegele linke Ansicht horizontal."
-
-#: src/gui.cpp:1100
-msgid "flip right view vertically."
-msgstr "Spiegele rechte Ansicht vertikal."
-
-#: src/gui.cpp:1102
-msgid "flop right view horizontally."
-msgstr "Spiegele rechte Ansicht horizontal."
-
-#: src/gui.cpp:1105
-msgid "use DLP(R) 3-D Ready Sync"
-msgstr "aktiviere DLP(R) 3-D Ready Sync"
-
-#: src/gui.cpp:1106
-msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
-msgstr "Aktiviere DLP&reg; 3-D Ready Sync für unterstützte Ausgabemodi."
-
-#: src/gui.cpp:1108
-msgid "inhibit the screensaver"
-msgstr "deaktiviere den Bildschirmschoner"
-
-#: src/gui.cpp:1109
-msgid "Inhibit the screensaver during fullscreen playback."
-msgstr "Deaktiviere den Bildschirmschoner im Vollbildmodus."
-
-#: src/gui.cpp:1111 src/gui.cpp:1277 src/gui.cpp:1412 src/gui.cpp:1473
-#: src/gui.cpp:1538 src/gui.cpp:1616 src/gui.cpp:1740 src/gui.cpp:2025
-#: src/gui.cpp:2264 src/gui.cpp:2750 src/gui.cpp:3477 src/gui.cpp:3524
-#: src/gui.cpp:3841
-msgid "OK"
-msgstr "OK"
-
-#: src/gui.cpp:1230
-msgid "Display Color Adjustments"
-msgstr "Bildschirmfarbenjustierung"
-
-#: src/gui.cpp:1232
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#: src/gui.cpp:1243
-msgid "Brightness:"
-msgstr "Helligkeit:"
-
-#: src/gui.cpp:1254
-msgid "Hue:"
-msgstr "Farbton:"
-
-#: src/gui.cpp:1265
-msgid "Saturation:"
-msgstr "Farbsättigung:"
-
-#: src/gui.cpp:1383
-msgid "Display Crosstalk Calibration"
-msgstr "Bildschirm-Crosstalk Kalibrierung"
-
-#. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/gui.cpp:1386
-msgid ""
-"Please read the manual to find out how to measure the crosstalk "
-"levels of your display."
-msgstr ""
-"Bitte lese das Handbuch um herauszufinden wie Crosstalk-Level für "
-"Deinen Bildschirm gemessen werden."
-
-#: src/gui.cpp:1390
-msgid "Red:"
-msgstr "Rot:"
-
-#: src/gui.cpp:1397
-msgid "Green:"
-msgstr "Grün:"
-
-#: src/gui.cpp:1404
-msgid "Blue:"
-msgstr "Blau:"
-
-#: src/gui.cpp:1460
-msgid "Rendering Quality Adjustments"
-msgstr "Justierung der Ausgabequalität"
-
-#: src/gui.cpp:1462
-msgid "Rendering Quality:"
-msgstr "Ausgabequalität:"
-
-#: src/gui.cpp:1516
-msgid "Zoom for wide videos"
-msgstr "Zoom für überbreite Videos"
-
-#: src/gui.cpp:1519
-msgid ""
-"Set zoom level for videos that are wider than the screen: 0: Show "
-"full video width. 1: Use full screen height."
-msgstr ""
-"Setze den Zoom für Videos, die breiter als der Bildschirm sind: 0: "
-"Zeige volle Videobreite. 1: Nutze volle Bildschirmhöhe."
-
-#: src/gui.cpp:1523
-msgid "Zoom:"
-msgstr "Zoom:"
-
-#: src/gui.cpp:1524
-msgid "Set the zoom level for videos that are wider than the screen."
-msgstr "Setze den Zoom für Videos, die breiter als der Bildschirm sind."
-
-#: src/gui.cpp:1582
-msgid "Audio Settings"
-msgstr "Audio Einstellungen"
-
-#: src/gui.cpp:1584
-msgid "Audio device:"
-msgstr "Audiogerät:"
-
-#: src/gui.cpp:1585
-msgid ""
-"Select the audio device. This will take effect for the next started "
-"video."
-msgstr ""
-"Wähle das Audiogerät. Die Auswahl wird für das nächste gestartete "
-"Video aktiv."
-
-#: src/gui.cpp:1589 src/gui.cpp:2680
-msgid "Default"
-msgstr "Standard"
-
-#: src/gui.cpp:1606
-msgid "Audio delay (ms):"
-msgstr "Audioverzögerung (ms):"
-
-#: src/gui.cpp:1607
-msgid ""
-"Set an audio delay, in milliseconds. This is useful if audio and video "
-"are not in sync."
-msgstr ""
-"Setze eine Audioverzögerung in Millisekunden. Dies ist nüztlich wenn "
-"Audio und Video nicht synchron laufen."
-
-#: src/gui.cpp:1664
-msgid "Subtitle Settings"
-msgstr "Untertitel Einstellungen"
-
-#: src/gui.cpp:1667
-msgid ""
-"These settings apply only to soft subtitles, not to bitmaps. Some "
-"changes require a restart of the video to take effect."
-msgstr ""
-"Diese Einstellungen gelten für Text-Untertitel, nicht für Bild-Untertitel."
-" Einige Einstellungen benötigen einen Neustart des Videos, um aktiv zu "
-"werden."
-
-#: src/gui.cpp:1670
-msgid "Encoding:"
-msgstr "Zeichensatz:"
-
-#: src/gui.cpp:1671
-msgid "Set the subtitle character set encoding."
-msgstr "Auswahl des Untertitelzeichensatzes."
-
-#: src/gui.cpp:1686
-msgid "Override font:"
-msgstr "Setze Schriftart:"
-
-#: src/gui.cpp:1687
-msgid "Override the subtitle font family."
-msgstr "Auswahl der Schriftart des Untertitels."
-
-#: src/gui.cpp:1696
-msgid "Override font size:"
-msgstr "Setze Schriftgröße:"
-
-#: src/gui.cpp:1697
-msgid "Override the subtitle font size."
-msgstr "Auswahl der Schriftgröße des Untertitels."
-
-#: src/gui.cpp:1707
-msgid "Override scale factor:"
-msgstr "Setze Skalierungsfaktor:"
-
-#: src/gui.cpp:1708
-msgid "Override the subtitle scale factor."
-msgstr "Auswahl des Skalierungsfaktors des Untertitels."
-
-#: src/gui.cpp:1719
-msgid "Override color:"
-msgstr "Setze Farbe:"
-
-#: src/gui.cpp:1720
-msgid "Override the subtitle color."
-msgstr "Auswahl der Farbe des Untertitels."
-
-#: src/gui.cpp:1729
-msgid "Override shadow:"
-msgstr "Setze Schatten:"
-
-#: src/gui.cpp:1730
-msgid "Override the subtitle shadow."
-msgstr "Auswahl des Schattens für Untertitel."
-
-#: src/gui.cpp:1735
-msgid "On"
-msgstr "An"
-
-#: src/gui.cpp:1946
-msgid "Video Settings"
-msgstr "Video Einstellungen"
-
-#: src/gui.cpp:1948
-msgid "Crop to aspect ratio:"
-msgstr "Stutze auf Seitenverhältnis:"
-
-#: src/gui.cpp:1949
-msgid ""
-"Set the real aspect ratio of the video, so that borders can be cropped.</"
-"p>"
-msgstr ""
-"Setze das wahre Seitenverhältnis des Videos, so dass Ränder gestutzt "
-"werden können."
-
-#: src/gui.cpp:1952
-msgid "Do not crop"
-msgstr "Kein Stutzen"
-
-#
-#: src/gui.cpp:1965
-msgid "Force source aspect ratio:"
-msgstr "Erzwinge Seitenverhältnis:"
-
-#
-#: src/gui.cpp:1966
-msgid "Force the aspect ratio of video source."
-msgstr "Erzwinge das Seitenverhältnis des Videos"
-
-#
-#: src/gui.cpp:1969
-msgid "Do not force"
-msgstr "Nicht erzwingen"
-
-#: src/gui.cpp:1982
-msgid "Parallax:"
-msgstr "Parallaxe:"
-
-#: src/gui.cpp:1983
-msgid ""
-"Adjust parallax, from -1 to +1. This changes the separation of left and "
-"right view, and thus the perceived distance of the scene."
-msgstr ""
-"Justierung der Parallaxe, von -1 bis +1. Dies ändert die Separierung von "
-"linker und rechter Sicht und damit den wahrgenommenen Abstand der Szene."
-
-#: src/gui.cpp:1996
-msgid "Subtitle parallax:"
-msgstr "Untertitelparallaxe:"
-
-#: src/gui.cpp:1997
-msgid ""
-"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
-"distance of the subtitles."
-msgstr ""
-"Justierung der Untertitelparallaxe, von -1 bis +1. Dies ändert den "
-"wahrgenommenen Abstand der Untertitel."
-
-#: src/gui.cpp:2010
-msgid "Ghostbusting:"
-msgstr "Crosstalk-Verringerungsfaktor:"
-
-#: src/gui.cpp:2011
-msgid ""
-"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
-"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
-"does not work with anaglyph glasses."
-msgstr ""
-"Auswahl des Faktors der Verringerung von Crosstalk, von 0 bis 1. Zuerst "
-"müssen die Crosstalk-Level des Bildschirms gesetzt werden. Crosstalk-"
-"Verringerung funktioniert nicht mit Anaglyphenbrillen."
-
-#: src/gui.cpp:2195
-msgid "SDI Output Settings"
-msgstr "SDI Ausgabe Einstellungen"
-
-#: src/gui.cpp:2197
-msgid "SDI Output Format:"
-msgstr "SDI Ausgabeformat:"
-
-#: src/gui.cpp:2198
-msgid "Select output format used for SDI output."
-msgstr "Auswahl des Ausgabeformats für SDI Ausgabe."
-
-#: src/gui.cpp:2206
-msgid "Left stereo mode:"
-msgstr "Linker Stereomodus:"
-
-#: src/gui.cpp:2207
-msgid "Select stereo mode used for left SDI output."
-msgstr "Auswahl der Ausgabemodus für die linken SDI Ausgabe."
-
-#: src/gui.cpp:2235
-msgid "Right stereo mode:"
-msgstr "Rechter Stereomodus:"
-
-#: src/gui.cpp:2236
-msgid "Select stereo mode used for right SDI output."
-msgstr "Auswahl der Ausgabemodus für die rechte SDI Ausgabe."
-
-#: src/gui.cpp:2676
-msgid "Open device(s)"
-msgstr "Öffne Gerät(e)"
-
-#: src/gui.cpp:2679
-msgid "Choose a device type."
-msgstr "Auswahl des Kameratyps."
-
-#: src/gui.cpp:2681 src/media_object.cpp:831
-msgid "Firewire"
-msgstr "Firewire"
-
-#: src/gui.cpp:2682 src/media_object.cpp:832
-msgid "X11"
-msgstr "X11"
-
-#: src/gui.cpp:2685 src/gui.cpp:2688
-msgid "Choose a device."
-msgstr "Auswahl der Kamera."
-
-#: src/gui.cpp:2691
-msgid "Set the X11 device string. Refer to the manual for details."
-msgstr "Setze das X11 Gerät. Siehe Benutzerhandbuch."
-
-#: src/gui.cpp:2715
-msgid "First device:"
-msgstr "Erstes Gerät:"
-
-#: src/gui.cpp:2716
-msgid "Second device:"
-msgstr "Zweites Gerät:"
-
-#: src/gui.cpp:2720
-msgid "Request frame size"
-msgstr "Fordere Bildgröße an"
-
-#: src/gui.cpp:2721
-msgid ""
-"Request a specific frame size from the device, e.g. 640x480. The device "
-"must support this frame size. Some devices require a frame size to be "
-"selected."
-msgstr ""
-"Fordere eine bestimmete Bildauflösung von der Kamera an, z.B. 640x480. "
-"Die Kamera muss diese Auflösung unterstützen. Einige Kameras verlangen, dass "
-"eine Auflösung ausgewählt wird."
-
-#: src/gui.cpp:2732
-msgid "Request frame rate"
-msgstr "Fordere Bildrate an"
-
-#: src/gui.cpp:2733
-msgid ""
-"Request a specific frame rate from the device, e.g. 25/1. The device must "
-"support this frame rate. Some devices require a frame rate to be selected.</"
-"p>"
-msgstr ""
-"Fordere eine bestimmte Bildrate von der Kamera an, z.B. 25/1. Die Kamera "
-"muss diese Bildrate unterstützen. Einige Kameras verlangen, dass eine "
-"Bildrate ausgewählt wird."
-
-#: src/gui.cpp:2744
-msgid "Request MJPEG format"
-msgstr "Fordere MJPEG Format an"
-
-#: src/gui.cpp:2745
-msgid ""
-"Request MJPEG data from the input device. The device may ignore this "
-"request."
-msgstr ""
-"Fordere MJPEG Daten from Gerät an. Das Gerät kann diese Anforderung "
-"ignorieren."
-
-#: src/gui.cpp:2748 src/gui.cpp:3523
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: src/gui.cpp:3046
-msgid "&File"
-msgstr "&Datei"
-
-#: src/gui.cpp:3047
-msgid "&Open file(s)..."
-msgstr "Öffne Datei(en)..."
-
-#: src/gui.cpp:3052
-msgid "Open &URL(s)..."
-msgstr "Öffne &URL(s)..."
-
-#: src/gui.cpp:3056
-msgid "Open &device(s)..."
-msgstr "Öffne &Gerät(e)..."
-
-#: src/gui.cpp:3071
-msgid "&Clear recent files"
-msgstr "Lösche Liste zuletzt geöffneter Dateien"
-
-#: src/gui.cpp:3079
-msgid "&Quit"
-msgstr "&Beenden"
-
-#: src/gui.cpp:3085
-msgid "&Preferences"
-msgstr "&Einstellungen"
-
-#: src/gui.cpp:3088
-msgid "&Fullscreen Settings..."
-msgstr "&Vollbildeinstellungen..."
-
-#: src/gui.cpp:3091
-msgid "Display &Color Adjustments..."
-msgstr "Bildschirm&farben..."
-
-#: src/gui.cpp:3094
-msgid "Display Cross&talk Calibration..."
-msgstr "Bildschirm-Crosstalk..."
-
-#: src/gui.cpp:3098
-msgid "Quality Adjustments..."
-msgstr "Qualitätseinstellungen..."
-
-#: src/gui.cpp:3102
-msgid "&Zoom for wide videos..."
-msgstr "&Zoom für überbreite Videos..."
-
-#: src/gui.cpp:3106
-msgid "&Audio Settings..."
-msgstr "&Audio Einstellungen..."
-
-#: src/gui.cpp:3110
-msgid "&Subtitle Settings..."
-msgstr "&Untertitel Einstellungen..."
-
-#: src/gui.cpp:3114
-msgid "Current &Video Settings..."
-msgstr "Einstellungen für das aktuelle Video..."
-
-#: src/gui.cpp:3119
-msgid "SDI &Output Settings..."
-msgstr "SDI Ausgabe Einstellungen..."
-
-#: src/gui.cpp:3123
-msgid "&Help"
-msgstr "&Hilfe"
-
-#: src/gui.cpp:3124
-msgid "&Manual..."
-msgstr "&Handbuch..."
-
-#: src/gui.cpp:3129
-msgid "&Website..."
-msgstr "&Webseite..."
-
-#: src/gui.cpp:3133
-msgid "&Keyboard Shortcuts"
-msgstr "&Tastaturkürzel"
-
-#: src/gui.cpp:3137
-msgid "&About"
-msgstr "&Über"
-
-#: src/gui.cpp:3470
-msgid "Tip"
-msgstr "Tipp"
-
-#: src/gui.cpp:3473
-msgid ""
-"You can select and open multiple files at once.This is useful for "
-"example if you have extra subtitle files, or if left and right view are "
-"stored in separate files."
-msgstr ""
-"Du kannst mehrere Dateien gleichzeitig auswählen und öffnen.Dies "
-"ist nützlich wenn Du z.B. Untertitel in Extradateien hast, oder wenn "
-"linke und rechte Ansicht in separaten Dateien gespeichert sind."
-
-#: src/gui.cpp:3476
-msgid "Do not show this message again."
-msgstr "Zeige diese Nachricht nicht noch einmal."
-
-#: src/gui.cpp:3493
-msgid "Open files"
-msgstr "Dateien öffnen"
-
-#: src/gui.cpp:3517
-msgid "Open URL(s)"
-msgstr "Öffne URL(s)"
-
-#: src/gui.cpp:3518
-msgid "URL(s):"
-msgstr "URL(s):"
-
-#: src/gui.cpp:3519
-msgid "Enter one or more space separated URLs."
-msgstr "Gebe eine oder mehrere durch Leerzeichen getrennte URLs ein."
-
-#: src/gui.cpp:3732 src/gui.cpp:3740 src/video_output_qt.cpp:291
-#: src/video_output_qt.cpp:534 src/video_output_qt.cpp:731
-#: src/video_output_qt.cpp:743 src/video_output_qt.cpp:764
-msgid "Error"
-msgstr "Fehler"
-
-#: src/gui.cpp:3732
-msgid "Cannot open manual."
-msgstr "Kann Handbuch nicht öffnen."
-
-#: src/gui.cpp:3740
-msgid "Cannot open website."
-msgstr "Kann Webseite nicht öffnen."
-
-#: src/gui.cpp:3748
-msgid "Keyboard Shortcuts"
-msgstr "Tastaturkürzel"
-
-#: src/gui.cpp:3751
-msgid "Keyboard control:"
-msgstr "Tastaturkürzel:"
-
-#: src/gui.cpp:3753 src/main.cpp:534
-msgid "ESC"
-msgstr "ESC"
-
-#: src/gui.cpp:3753
-msgid "Stop"
-msgstr "Stopp"
-
-#: src/gui.cpp:3754 src/main.cpp:536
-msgid "SPACE"
-msgstr "Leertaste"
-
-#: src/gui.cpp:3754 src/main.cpp:536
-msgid "Pause / unpause"
-msgstr "Pause / weiter"
-
-#: src/gui.cpp:3755 src/main.cpp:537
-msgid "Toggle fullscreen"
-msgstr "Schalte Vollbildmodus um"
-
-#: src/gui.cpp:3756 src/main.cpp:538
-msgid "Center window"
-msgstr "Zentriere Fenster"
-
-#: src/gui.cpp:3757 src/main.cpp:539
-msgid "Swap left/right eye"
-msgstr "Tausche links/rechts"
-
-#: src/gui.cpp:3758 src/main.cpp:540
-msgid "Cycle through available video streams"
-msgstr "Schalte durch verfügbare Videokanäle"
-
-#: src/gui.cpp:3759 src/main.cpp:541
-msgid "Cycle through available audio streams"
-msgstr "Schalte durch verfügbare Audiokanäle"
-
-#: src/gui.cpp:3760 src/main.cpp:542
-msgid "Cycle through available subtitle streams"
-msgstr "Schalte durch verfügbare Untertitelkanäle"
-
-#: src/gui.cpp:3761 src/main.cpp:543
-msgid "Adjust contrast"
-msgstr "Justiere Kontrast"
-
-#: src/gui.cpp:3762 src/main.cpp:544
-msgid "Adjust brightness"
-msgstr "Justiere Helligkeit"
-
-#: src/gui.cpp:3763 src/main.cpp:545
-msgid "Adjust hue"
-msgstr "Justiere Farbton"
-
-#: src/gui.cpp:3764 src/main.cpp:546
-msgid "Adjust saturation"
-msgstr "Justiere Farbsättigung"
-
-#: src/gui.cpp:3765 src/main.cpp:547
-msgid "Adjust parallax"
-msgstr "Justiere Parallaxe"
-
-#: src/gui.cpp:3766 src/main.cpp:548
-msgid "Adjust ghostbusting"
-msgstr "Justiere Crosstalk-Verringerungsfaktor"
-
-#: src/gui.cpp:3767 src/main.cpp:549
-msgid "Adjust zoom for wide videos"
-msgstr "Justiere Zoom für überbreite Videos"
-
-#: src/gui.cpp:3768 src/main.cpp:550
-msgid "Adjust audio volume"
-msgstr "Justiere Lautstärke"
-
-#: src/gui.cpp:3769 src/main.cpp:551
-msgid "Toggle audio mute"
-msgstr "Schalte Stummschaltung um"
-
-#: src/gui.cpp:3770 src/main.cpp:552
-msgid "Step a single video frame forward"
-msgstr "Schalte ein Videobild weiter"
-
-#: src/gui.cpp:3771 src/main.cpp:553
-msgid "left, right"
-msgstr "links, rechts"
-
-#: src/gui.cpp:3771 src/main.cpp:553
-msgid "Seek 10 seconds backward / forward"
-msgstr "Springe 10 Sekunden zurück / vor"
-
-#: src/gui.cpp:3772 src/main.cpp:554
-msgid "down, up"
-msgstr "runter, rauf"
-
-#: src/gui.cpp:3772 src/main.cpp:554
-msgid "Seek 1 minute backward / forward"
-msgstr "Springe 1 Minute zurück / vor"
-
-#: src/gui.cpp:3773 src/main.cpp:555
-msgid "page down, page up"
-msgstr "Seite runter, Seite rauf"
-
-#: src/gui.cpp:3773 src/main.cpp:555
-msgid "Seek 10 minutes backward / forward"
-msgstr "Springe 10 Minuten zurück / vor"
-
-#: src/gui.cpp:3774 src/main.cpp:557
-msgid "Media keys"
-msgstr "Medientasten"
-
-#: src/gui.cpp:3774 src/main.cpp:557
-msgid "Media keys should work as expected"
-msgstr "Medientasten sollten wie erwartet funktionieren"
-
-#: src/gui.cpp:3790
-#, c-format
-msgid "About %s"
-msgstr "Über %s"
-
-#: src/gui.cpp:3796
-#, c-format
-msgid "The %s 3D video player"
-msgstr "%s - 3D Videospieler"
-
-#: src/gui.cpp:3801
-#, c-format
-msgid ""
-"%s version %s.Copyright (C) 2014 the Bino developers.This "
-"is free software. You may redistribute copies of it under the terms of the "
-"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
-"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
-"\"%s\">%s</a> for more information on this software."
-msgstr ""
-"%s Version %s.Copyright (C) 2014 Die Bino Entwickler.Dies "
-"ist freie Software. Du kannst Kopien davon verteilen unter den Bedingungen "
-"der <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public "
-"License</a>. Es gibt keine Garantie.Siehe <a href=\"%s\">%s</a> für "
-"mehr Informationen über diese Software."
-
-#: src/gui.cpp:3813 src/main.cpp:419
-msgid "Platform:"
-msgstr "Plattform:"
-
-#: src/gui.cpp:3814 src/main.cpp:421
-msgid "Libraries used:"
-msgstr "Benutzte Bibliotheken:"
-
-#: src/gui.cpp:3836
-msgid "About"
-msgstr "Über"
-
-#: src/gui.cpp:3837
-msgid "Libraries"
-msgstr "Bibliotheken"
-
-#: src/gui.cpp:3838
-msgid "Team"
-msgstr "Team"
-
-#: src/gui.cpp:3839
-msgid "License"
-msgstr "Lizenz"
-
 #: src/lib_versions.cpp:183 src/lib_versions.cpp:195
 msgid "not used"
 msgstr "nicht benutzt"
@@ -1304,7 +281,8 @@
 msgstr "%s Version %s"
 
 #: src/main.cpp:415
-msgid "Copyright (C) 2014 the Bino developers."
+#, fuzzy
+msgid "Copyright (C) 2016 the Bino developers."
 msgstr "Copyright (C) 2014 Die Bino Entwickler."
 
 #: src/main.cpp:416
@@ -1316,6 +294,14 @@
 "Dies ist freie Software. Du kannst Kopien davon verteilen unter den "
 "Bedingungen der GNU General Public License. Es gibt keine Garantie."
 
+#: src/main.cpp:419
+msgid "Platform:"
+msgstr "Plattform:"
+
+#: src/main.cpp:421
+msgid "Libraries used:"
+msgstr "Benutzte Bibliotheken:"
+
 #. TRANSLATORS: This is the --help text. Please keep the line length limited.
 #. * The --help output should look good with a line width of 80 characters.
 #: src/main.cpp:434
@@ -1414,10 +400,154 @@
 msgid "Select input type (default autodetect):"
 msgstr "Setze Eingabetyp (Standard: automatisch):"
 
+#: src/main.cpp:459
+msgid "2D"
+msgstr "2D"
+
+#: src/main.cpp:460
+msgid "Separate streams, left first"
+msgstr "Getrennte Kanäle, links zuerst"
+
+#: src/main.cpp:461
+msgid "Separate streams, right first"
+msgstr "Getrennte Kanäle, rechts zuerst"
+
+#: src/main.cpp:462
+msgid "Alternating, left first"
+msgstr "Abwechselnd, links zuerst."
+
+#: src/main.cpp:463
+msgid "Alternating, right first"
+msgstr "Abwechselnd, rechts zuerst."
+
+#: src/main.cpp:464 src/main.cpp:479
+msgid "Top/bottom"
+msgstr "Oben/unten"
+
+#: src/main.cpp:465 src/main.cpp:480
+msgid "Top/bottom, half height"
+msgstr "Oben/unten, halbe Höhe"
+
+#: src/main.cpp:466
+msgid "Bottom/top"
+msgstr "Unten/oben"
+
+#: src/main.cpp:467
+msgid "Bottom/top, half height"
+msgstr "Unten/oben, halbe Höhe"
+
+#: src/main.cpp:468 src/main.cpp:481
+msgid "Left/right"
+msgstr "Links/rechts"
+
+#: src/main.cpp:469 src/main.cpp:482
+msgid "Left/right, half width"
+msgstr "Links/rechts, halbe Breite"
+
+#: src/main.cpp:470
+msgid "Right/left"
+msgstr "Rechts/links"
+
+#: src/main.cpp:471
+msgid "Right/left, half width"
+msgstr "Rechts/links, halbe Breite"
+
+#: src/main.cpp:472 src/main.cpp:483
+msgid "Even/odd rows"
+msgstr "Gerade/ungerade Zeilen"
+
+#: src/main.cpp:473
+msgid "Odd/even rows"
+msgstr "Ungerade/gerade Zeilen"
+
 #: src/main.cpp:474
 msgid "Select output type:"
 msgstr "Setze Ausgabemodus:"
 
+#: src/main.cpp:475
+msgid "OpenGL stereo"
+msgstr "OpenGL Stereo"
+
+#: src/main.cpp:476
+msgid "Left/right alternating"
+msgstr "Links/rechts abwechselnd"
+
+#: src/main.cpp:477
+msgid "Left view"
+msgstr "Linke Sicht"
+
+#: src/main.cpp:478
+msgid "Right view"
+msgstr "Rechte Sicht"
+
+#: src/main.cpp:484
+msgid "Even/odd columns"
+msgstr "Gerade/ungerade Spalten"
+
+#: src/main.cpp:485
+msgid "Checkerboard pattern"
+msgstr "Schachbrettmuster"
+
+#: src/main.cpp:486
+msgid "HDMI frame packing mode"
+msgstr "HDMI Framepacking Modus"
+
+#: src/main.cpp:487
+msgid "Red/cyan glasses, monochrome"
+msgstr "Rot/cyan Brillen, monochrom"
+
+#: src/main.cpp:488
+msgid "Red/cyan glasses, half color"
+msgstr "Rot/cyan Brillen, halbfarbig"
+
+#: src/main.cpp:489
+msgid "Red/cyan glasses, full color"
+msgstr "Rot/cyan Brillen, vollfarbig"
+
+#: src/main.cpp:490
+msgid "Red/cyan glasses, Dubois"
+msgstr "Rot/cyan Brillen, Dubois"
+
+#: src/main.cpp:491
+msgid "Green/magenta glasses, monochrome"
+msgstr "Grün/magenta Brillen, monochrom"
+
+#: src/main.cpp:492
+msgid "Green/magenta glasses, half color"
+msgstr "Grün/magenta Brillen, halbfarbig"
+
+#: src/main.cpp:493
+msgid "Green/magenta glasses, full color"
+msgstr "Grün/magenta Brillen, vollfarbig"
+
+#: src/main.cpp:494
+msgid "Green/magenta glasses, Dubois"
+msgstr "Grün/magenta Brillen, Dubois"
+
+#: src/main.cpp:495
+msgid "Amber/blue glasses, monochrome"
+msgstr "Orange/blau Brillen, monochrom"
+
+#: src/main.cpp:496
+msgid "Amber/blue glasses, half color"
+msgstr "Orange/blau Brillen, halbfarbig"
+
+#: src/main.cpp:497
+msgid "Amber/blue glasses, full color"
+msgstr "Orange/blau Brillen, vollfarbig"
+
+#: src/main.cpp:498
+msgid "Amber/blue glasses, Dubois"
+msgstr "Orange/blau Brillen, Dubois"
+
+#: src/main.cpp:499
+msgid "Red/green glasses, monochrome"
+msgstr "Rot/grün Brillen, monochrome"
+
+#: src/main.cpp:500
+msgid "Red/blue glasses, monochrome"
+msgstr "Rot/blau Brillen, monochrom"
+
 #: src/main.cpp:501
 msgid "Multi-display via Equalizer (2D setup)"
 msgstr "Multidisplay via Equalizer (2D)"
@@ -1547,6 +677,10 @@
 msgstr "Interaktive Bedienung:"
 
 #: src/main.cpp:534
+msgid "ESC"
+msgstr "ESC"
+
+#: src/main.cpp:534
 msgid "Leave fullscreen mode, or quit"
 msgstr "Verlasse Vollbildmodus, oder beende"
 
@@ -1554,6 +688,102 @@
 msgid "Quit"
 msgstr "Beenden"
 
+#: src/main.cpp:536
+msgid "SPACE"
+msgstr "Leertaste"
+
+#: src/main.cpp:536
+msgid "Pause / unpause"
+msgstr "Pause / weiter"
+
+#: src/main.cpp:537
+msgid "Toggle fullscreen"
+msgstr "Schalte Vollbildmodus um"
+
+#: src/main.cpp:538
+msgid "Center window"
+msgstr "Zentriere Fenster"
+
+#: src/main.cpp:539
+msgid "Swap left/right eye"
+msgstr "Tausche links/rechts"
+
+#: src/main.cpp:540
+msgid "Cycle through available video streams"
+msgstr "Schalte durch verfügbare Videokanäle"
+
+#: src/main.cpp:541
+msgid "Cycle through available audio streams"
+msgstr "Schalte durch verfügbare Audiokanäle"
+
+#: src/main.cpp:542
+msgid "Cycle through available subtitle streams"
+msgstr "Schalte durch verfügbare Untertitelkanäle"
+
+#: src/main.cpp:543
+msgid "Adjust contrast"
+msgstr "Justiere Kontrast"
+
+#: src/main.cpp:544
+msgid "Adjust brightness"
+msgstr "Justiere Helligkeit"
+
+#: src/main.cpp:545
+msgid "Adjust hue"
+msgstr "Justiere Farbton"
+
+#: src/main.cpp:546
+msgid "Adjust saturation"
+msgstr "Justiere Farbsättigung"
+
+#: src/main.cpp:547
+msgid "Adjust parallax"
+msgstr "Justiere Parallaxe"
+
+#: src/main.cpp:548
+msgid "Adjust ghostbusting"
+msgstr "Justiere Crosstalk-Verringerungsfaktor"
+
+#: src/main.cpp:549
+msgid "Adjust zoom for wide videos"
+msgstr "Justiere Zoom für überbreite Videos"
+
+#: src/main.cpp:550
+msgid "Adjust audio volume"
+msgstr "Justiere Lautstärke"
+
+#: src/main.cpp:551
+msgid "Toggle audio mute"
+msgstr "Schalte Stummschaltung um"
+
+#: src/main.cpp:552
+msgid "Step a single video frame forward"
+msgstr "Schalte ein Videobild weiter"
+
+#: src/main.cpp:553
+msgid "left, right"
+msgstr "links, rechts"
+
+#: src/main.cpp:553
+msgid "Seek 10 seconds backward / forward"
+msgstr "Springe 10 Sekunden zurück / vor"
+
+#: src/main.cpp:554
+msgid "down, up"
+msgstr "runter, rauf"
+
+#: src/main.cpp:554
+msgid "Seek 1 minute backward / forward"
+msgstr "Springe 1 Minute zurück / vor"
+
+#: src/main.cpp:555
+msgid "page down, page up"
+msgstr "Seite runter, Seite rauf"
+
+#: src/main.cpp:555
+msgid "Seek 10 minutes backward / forward"
+msgstr "Springe 10 Minuten zurück / vor"
+
 #: src/main.cpp:556
 msgid "Mouse click"
 msgstr "Mausklick"
@@ -1562,20 +792,28 @@
 msgid "Seek according to horizontal click position"
 msgstr "Springe zur Klick-Position"
 
-#: src/main.cpp:626
+#: src/main.cpp:557
+msgid "Media keys"
+msgstr "Medientasten"
+
+#: src/main.cpp:557
+msgid "Media keys should work as expected"
+msgstr "Medientasten sollten wie erwartet funktionieren"
+
+#: src/main.cpp:627
 msgid "No audio devices known."
 msgstr "Keine Audiogeräte gefunden."
 
-#: src/main.cpp:641
+#: src/main.cpp:642
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Benchmark Modus: Audio und Videosynchronisation deaktiviert."
 
-#: src/main.cpp:655
+#: src/main.cpp:656
 #, c-format
 msgid "Unknown mode %s."
 msgstr "Unbekannter Modus %s."
 
-#: src/main.cpp:787
+#: src/main.cpp:788
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Diese Version von Bino wurde ohne Unterstützung für LIRC erstellt."
 
@@ -1591,6 +829,10 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d Kan., %g kHz, %d bit"
 
+#: src/media_input.cpp:276
+msgid "Input:"
+msgstr "Eingabe:"
+
 #: src/media_input.cpp:281
 #, c-format
 msgid "Video %s: %s"
@@ -1648,6 +890,14 @@
 msgid "No support available for %s device."
 msgstr "Unterstüztung für %s Geräte nicht verfügbar."
 
+#: src/media_object.cpp:831
+msgid "Firewire"
+msgstr "Firewire"
+
+#: src/media_object.cpp:832
+msgid "X11"
+msgstr "X11"
+
 #: src/media_object.cpp:833
 msgid "default"
 msgstr "Standard"
@@ -1855,6 +1105,12 @@
 msgid "Cannot create a PBO buffer."
 msgstr "Kann keinen PBO Puffer erzeugen."
 
+#: src/video_output_qt.cpp:291 src/video_output_qt.cpp:534
+#: src/video_output_qt.cpp:731 src/video_output_qt.cpp:743
+#: src/video_output_qt.cpp:764
+msgid "Error"
+msgstr "Fehler"
+
 #: src/video_output_qt.cpp:636
 #, c-format
 msgid "Cannot initialize GLEW: %s"
@@ -1889,5 +1145,583 @@
 msgid "Cannot resume screensaver."
 msgstr "Kann Bildschirmschoner nicht reaktivieren."
 
+#~ msgid "Video:"
+#~ msgstr "Video:"
+
+#~ msgid "Select the video stream."
+#~ msgstr "Auswahl des Videokanals."
+
+#~ msgid "Audio:"
+#~ msgstr "Audio:"
+
+#~ msgid "Select the audio stream."
+#~ msgstr "Auswahl des Videokanals."
+
+#~ msgid "Subtitle:"
+#~ msgstr "Untertitel:"
+
+#~ msgid "Select the subtitle stream."
+#~ msgstr "Auswahl des Untertitelkanals."
+
+#~ msgid "Set the 3D layout of the video stream."
+#~ msgstr "Auswahl des Stereolayouts des Videokanals."
+
+#~ msgid "Output:"
+#~ msgstr "Ausgabe:"
+
+#~ msgid "Set the 3D output type for your display."
+#~ msgstr "Auswahl des 3D Ausgabetyps für das Ausgabegerät."
+
+#~ msgid "Swap left/right"
+#~ msgstr "Tausche links/rechts"
+
+#~ msgid ""
+#~ "Swap the left and right view. Use this if the 3D effect seems wrong.</"
+#~ "p>"
+#~ msgstr ""
+#~ "Vertauschung von linker und rechter Sicht (falls der 3D Effekt falsch "
+#~ "wirkt)."
+
+#~ msgid "Off"
+#~ msgstr "Aus"
+
+#~ msgid ""
+#~ "This slider shows the progress during video playback, and can be used "
+#~ "to seek in the video."
+#~ msgstr ""
+#~ "Dieser Gleiter zeigt der Fortschritt beim Abspielen an, und kann zum "
+#~ "Vor- und Zurückspulen benutzt werden."
+
+#~ msgid "Elapsed / total time."
+#~ msgstr "Zeit / Gesamtdauer."
+
+#~ msgid "Toggle audio mute."
+#~ msgstr "Schalte Stummschaltung um."
+
+#~ msgid "Adjust audio volume."
+#~ msgstr "Stelle Lautstärke ein."
+
+#~ msgid "Play."
+#~ msgstr "Abspielen."
+
+#~ msgid "Pause."
+#~ msgstr "Pause."
+
+#~ msgid "Stop."
+#~ msgstr "Stopp."
+
+#~ msgid "Toggle loop mode."
+#~ msgstr "Schalte Wiederholmodus um."
+
+#~ msgid ""
+#~ "Switch to fullscreen mode. You can leave fullscreen mode by pressing "
+#~ "the f key."
+#~ msgstr ""
+#~ "Zum Vollbildmodus schalten. Der Vollbildmodus kann mit der Taste f "
+#~ "verlassen werden."
+
+#~ msgid "Center the video area on your screen."
+#~ msgstr "Zentrierung des Videos in der Mitte des Bildschirms."
+
+#~ msgid "Seek backward 10 minutes."
+#~ msgstr "10 Minuten zurückspulen."
+
+#~ msgid "Seek backward 1 minute."
+#~ msgstr "1 Minute zurückspulen."
+
+#~ msgid "Seek backward 10 seconds."
+#~ msgstr "10 Sekunden zurückspulen."
+
+#~ msgid "Seek forward 10 seconds."
+#~ msgstr "10 Sekunden vorspulen."
+
+#~ msgid "Seek forward 1 minute."
+#~ msgstr "1 Minute vorspulen."
+
+#~ msgid "Seek forward 10 minutes."
+#~ msgstr "10 Minuten vorspulen."
+
+#~ msgid "Fullscreen/Multiscreen Settings"
+#~ msgstr "Vollbild-/Multibildeinstellungen"
+
+#~ msgid "Configure fullscreen mode:"
+#~ msgstr "Konfiguriere Vollbildmodus:"
+
+#~ msgid "Select the screens to use in fullscreen mode."
+#~ msgstr "Auswahl der Bildschirme für den Vollbildmodus."
+
+#~ msgid "Single screen:"
+#~ msgstr "Einzelner Bildschirm:"
+
+#~ msgid "Use a single screen for fullscreen mode."
+#~ msgstr "Benutze einen einzelnen Bildschirm im Vollbildmodus."
+
+#~ msgid "Primary screen"
+#~ msgstr "Hauptbildschirm"
+
+#~ msgid "Screen %d"
+#~ msgstr "Bildschirm %d"
+
+#~ msgid "Dual screen:"
+#~ msgstr "Doppelbildschirm:"
+
+#~ msgid "Use two screens for fullscreen mode."
+#~ msgstr "Benutze zwei Bildschirme im Vollbildmodus."
+
+#~ msgid "Multi screen:"
+#~ msgstr "Multibildschirm:"
+
+#~ msgid "Use multiple screens for fullscreen mode."
+#~ msgstr "Benutze mehrere Bildschirme im Vollbildmodus."
+
+#~ msgid "Comma-separated list of screens to use for fullscreen mode."
+#~ msgstr ""
+#~ "Liste von Bildschirmen für den Vollbildmodus, durch Kommata getrennt.</"
+#~ "p>"
+
+#~ msgid "When in fullscreen mode,"
+#~ msgstr "Im Vollbildmodus:"
+
+#~ msgid "Set special left/right view handling for fullscreen mode."
+#~ msgstr ""
+#~ "Wähle spezielle Einstellungen für linke und rechte Ansicht im "
+#~ "Vollbildmodus."
+
+#~ msgid "flip left view vertically."
+#~ msgstr "Spiegele linke Ansicht vertikal."
+
+#~ msgid "flop left view horizontally."
+#~ msgstr "Spiegele linke Ansicht horizontal."
+
+#~ msgid "flip right view vertically."
+#~ msgstr "Spiegele rechte Ansicht vertikal."
+
+#~ msgid "flop right view horizontally."
+#~ msgstr "Spiegele rechte Ansicht horizontal."
+
+#~ msgid "use DLP(R) 3-D Ready Sync"
+#~ msgstr "aktiviere DLP(R) 3-D Ready Sync"
+
+#~ msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
+#~ msgstr ""
+#~ "Aktiviere DLP&reg; 3-D Ready Sync für unterstützte Ausgabemodi."
+
+#~ msgid "inhibit the screensaver"
+#~ msgstr "deaktiviere den Bildschirmschoner"
+
+#~ msgid "Inhibit the screensaver during fullscreen playback."
+#~ msgstr "Deaktiviere den Bildschirmschoner im Vollbildmodus."
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Display Color Adjustments"
+#~ msgstr "Bildschirmfarbenjustierung"
+
+#~ msgid "Contrast:"
+#~ msgstr "Kontrast:"
+
+#~ msgid "Brightness:"
+#~ msgstr "Helligkeit:"
+
+#~ msgid "Hue:"
+#~ msgstr "Farbton:"
+
+#~ msgid "Saturation:"
+#~ msgstr "Farbsättigung:"
+
+#~ msgid "Display Crosstalk Calibration"
+#~ msgstr "Bildschirm-Crosstalk Kalibrierung"
+
+#~ msgid ""
+#~ "Please read the manual to find out how to measure the crosstalk "
+#~ "levels of your display."
+#~ msgstr ""
+#~ "Bitte lese das Handbuch um herauszufinden wie Crosstalk-Level für "
+#~ "Deinen Bildschirm gemessen werden."
+
+#~ msgid "Red:"
+#~ msgstr "Rot:"
+
+#~ msgid "Green:"
+#~ msgstr "Grün:"
+
+#~ msgid "Blue:"
+#~ msgstr "Blau:"
+
+#~ msgid "Rendering Quality Adjustments"
+#~ msgstr "Justierung der Ausgabequalität"
+
+#~ msgid "Rendering Quality:"
+#~ msgstr "Ausgabequalität:"
+
+#~ msgid "Zoom for wide videos"
+#~ msgstr "Zoom für überbreite Videos"
+
+#~ msgid ""
+#~ "Set zoom level for videos that are wider than the screen: 0: "
+#~ "Show full video width. 1: Use full screen height."
+#~ msgstr ""
+#~ "Setze den Zoom für Videos, die breiter als der Bildschirm sind:"
+#~ " 0: Zeige volle Videobreite. 1: Nutze volle Bildschirmhöhe."
+
+#~ msgid "Zoom:"
+#~ msgstr "Zoom:"
+
+#~ msgid "Set the zoom level for videos that are wider than the screen."
+#~ msgstr ""
+#~ "Setze den Zoom für Videos, die breiter als der Bildschirm sind."
+
+#~ msgid "Audio Settings"
+#~ msgstr "Audio Einstellungen"
+
+#~ msgid "Audio device:"
+#~ msgstr "Audiogerät:"
+
+#~ msgid ""
+#~ "Select the audio device. This will take effect for the next started "
+#~ "video."
+#~ msgstr ""
+#~ "Wähle das Audiogerät. Die Auswahl wird für das nächste gestartete "
+#~ "Video aktiv."
+
+#~ msgid "Default"
+#~ msgstr "Standard"
+
+#~ msgid "Audio delay (ms):"
+#~ msgstr "Audioverzögerung (ms):"
+
+#~ msgid ""
+#~ "Set an audio delay, in milliseconds. This is useful if audio and "
+#~ "video are not in sync."
+#~ msgstr ""
+#~ "Setze eine Audioverzögerung in Millisekunden. Dies ist nüztlich "
+#~ "wenn Audio und Video nicht synchron laufen."
+
+#~ msgid "Subtitle Settings"
+#~ msgstr "Untertitel Einstellungen"
+
+#~ msgid ""
+#~ "These settings apply only to soft subtitles, not to bitmaps. Some "
+#~ "changes require a restart of the video to take effect."
+#~ msgstr ""
+#~ "Diese Einstellungen gelten für Text-Untertitel, nicht für Bild-"
+#~ "Untertitel. Einige Einstellungen benötigen einen Neustart des Videos, "
+#~ "um aktiv zu werden."
+
+#~ msgid "Encoding:"
+#~ msgstr "Zeichensatz:"
+
+#~ msgid "Set the subtitle character set encoding."
+#~ msgstr "Auswahl des Untertitelzeichensatzes."
+
+#~ msgid "Override font:"
+#~ msgstr "Setze Schriftart:"
+
+#~ msgid "Override the subtitle font family."
+#~ msgstr "Auswahl der Schriftart des Untertitels."
+
+#~ msgid "Override font size:"
+#~ msgstr "Setze Schriftgröße:"
+
+#~ msgid "Override the subtitle font size."
+#~ msgstr "Auswahl der Schriftgröße des Untertitels."
+
+#~ msgid "Override scale factor:"
+#~ msgstr "Setze Skalierungsfaktor:"
+
+#~ msgid "Override the subtitle scale factor."
+#~ msgstr "Auswahl des Skalierungsfaktors des Untertitels."
+
+#~ msgid "Override color:"
+#~ msgstr "Setze Farbe:"
+
+#~ msgid "Override the subtitle color."
+#~ msgstr "Auswahl der Farbe des Untertitels."
+
+#~ msgid "Override shadow:"
+#~ msgstr "Setze Schatten:"
+
+#~ msgid "Override the subtitle shadow."
+#~ msgstr "Auswahl des Schattens für Untertitel."
+
+#~ msgid "On"
+#~ msgstr "An"
+
+#~ msgid "Video Settings"
+#~ msgstr "Video Einstellungen"
+
+#~ msgid "Crop to aspect ratio:"
+#~ msgstr "Stutze auf Seitenverhältnis:"
+
+#~ msgid ""
+#~ "Set the real aspect ratio of the video, so that borders can be cropped."
+#~ ""
+#~ msgstr ""
+#~ "Setze das wahre Seitenverhältnis des Videos, so dass Ränder gestutzt "
+#~ "werden können."
+
+#~ msgid "Do not crop"
+#~ msgstr "Kein Stutzen"
+
+#
+#~ msgid "Force source aspect ratio:"
+#~ msgstr "Erzwinge Seitenverhältnis:"
+
+#
+#~ msgid "Force the aspect ratio of video source."
+#~ msgstr "Erzwinge das Seitenverhältnis des Videos"
+
+#
+#~ msgid "Do not force"
+#~ msgstr "Nicht erzwingen"
+
+#~ msgid "Parallax:"
+#~ msgstr "Parallaxe:"
+
+#~ msgid ""
+#~ "Adjust parallax, from -1 to +1. This changes the separation of left "
+#~ "and right view, and thus the perceived distance of the scene."
+#~ msgstr ""
+#~ "Justierung der Parallaxe, von -1 bis +1. Dies ändert die Separierung "
+#~ "von linker und rechter Sicht und damit den wahrgenommenen Abstand der "
+#~ "Szene."
+
+#~ msgid "Subtitle parallax:"
+#~ msgstr "Untertitelparallaxe:"
+
+#~ msgid ""
+#~ "Adjust subtitle parallax, from -1 to +1. This changes the perceived "
+#~ "distance of the subtitles."
+#~ msgstr ""
+#~ "Justierung der Untertitelparallaxe, von -1 bis +1. Dies ändert den "
+#~ "wahrgenommenen Abstand der Untertitel."
+
+#~ msgid "Ghostbusting:"
+#~ msgstr "Crosstalk-Verringerungsfaktor:"
+
+#~ msgid ""
+#~ "Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+#~ "the crosstalk levels of your display first. Note that crosstalk "
+#~ "ghostbusting does not work with anaglyph glasses."
+#~ msgstr ""
+#~ "Auswahl des Faktors der Verringerung von Crosstalk, von 0 bis 1. "
+#~ "Zuerst müssen die Crosstalk-Level des Bildschirms gesetzt werden. "
+#~ "Crosstalk-Verringerung funktioniert nicht mit Anaglyphenbrillen."
+
+#~ msgid "SDI Output Settings"
+#~ msgstr "SDI Ausgabe Einstellungen"
+
+#~ msgid "SDI Output Format:"
+#~ msgstr "SDI Ausgabeformat:"
+
+#~ msgid "Select output format used for SDI output."
+#~ msgstr "Auswahl des Ausgabeformats für SDI Ausgabe."
+
+#~ msgid "Left stereo mode:"
+#~ msgstr "Linker Stereomodus:"
+
+#~ msgid "Select stereo mode used for left SDI output."
+#~ msgstr "Auswahl der Ausgabemodus für die linken SDI Ausgabe."
+
+#~ msgid "Right stereo mode:"
+#~ msgstr "Rechter Stereomodus:"
+
+#~ msgid "Select stereo mode used for right SDI output."
+#~ msgstr "Auswahl der Ausgabemodus für die rechte SDI Ausgabe."
+
+#~ msgid "Open device(s)"
+#~ msgstr "Öffne Gerät(e)"
+
+#~ msgid "Choose a device type."
+#~ msgstr "Auswahl des Kameratyps."
+
+#~ msgid "Choose a device."
+#~ msgstr "Auswahl der Kamera."
+
+#~ msgid "Set the X11 device string. Refer to the manual for details."
+#~ msgstr "Setze das X11 Gerät. Siehe Benutzerhandbuch."
+
+#~ msgid "First device:"
+#~ msgstr "Erstes Gerät:"
+
+#~ msgid "Second device:"
+#~ msgstr "Zweites Gerät:"
+
+#~ msgid "Request frame size"
+#~ msgstr "Fordere Bildgröße an"
+
+#~ msgid ""
+#~ "Request a specific frame size from the device, e.g. 640x480. The "
+#~ "device must support this frame size. Some devices require a frame size to "
+#~ "be selected."
+#~ msgstr ""
+#~ "Fordere eine bestimmete Bildauflösung von der Kamera an, z.B. 640x480. "
+#~ "Die Kamera muss diese Auflösung unterstützen. Einige Kameras verlangen, "
+#~ "dass eine Auflösung ausgewählt wird."
+
+#~ msgid "Request frame rate"
+#~ msgstr "Fordere Bildrate an"
+
+#~ msgid ""
+#~ "Request a specific frame rate from the device, e.g. 25/1. The device "
+#~ "must support this frame rate. Some devices require a frame rate to be "
+#~ "selected."
+#~ msgstr ""
+#~ "Fordere eine bestimmte Bildrate von der Kamera an, z.B. 25/1. Die "
+#~ "Kamera muss diese Bildrate unterstützen. Einige Kameras verlangen, dass "
+#~ "eine Bildrate ausgewählt wird."
+
+#~ msgid "Request MJPEG format"
+#~ msgstr "Fordere MJPEG Format an"
+
+#~ msgid ""
+#~ "Request MJPEG data from the input device. The device may ignore this "
+#~ "request."
+#~ msgstr ""
+#~ "Fordere MJPEG Daten from Gerät an. Das Gerät kann diese Anforderung "
+#~ "ignorieren."
+
+#~ msgid "Cancel"
+#~ msgstr "Abbrechen"
+
+#~ msgid "&File"
+#~ msgstr "&Datei"
+
+#~ msgid "&Open file(s)..."
+#~ msgstr "Öffne Datei(en)..."
+
+#~ msgid "Open &URL(s)..."
+#~ msgstr "Öffne &URL(s)..."
+
+#~ msgid "Open &device(s)..."
+#~ msgstr "Öffne &Gerät(e)..."
+
+#~ msgid "&Clear recent files"
+#~ msgstr "Lösche Liste zuletzt geöffneter Dateien"
+
+#~ msgid "&Quit"
+#~ msgstr "&Beenden"
+
+#~ msgid "&Preferences"
+#~ msgstr "&Einstellungen"
+
+#~ msgid "&Fullscreen Settings..."
+#~ msgstr "&Vollbildeinstellungen..."
+
+#~ msgid "Display &Color Adjustments..."
+#~ msgstr "Bildschirm&farben..."
+
+#~ msgid "Display Cross&talk Calibration..."
+#~ msgstr "Bildschirm-Crosstalk..."
+
+#~ msgid "Quality Adjustments..."
+#~ msgstr "Qualitätseinstellungen..."
+
+#~ msgid "&Zoom for wide videos..."
+#~ msgstr "&Zoom für überbreite Videos..."
+
+#~ msgid "&Audio Settings..."
+#~ msgstr "&Audio Einstellungen..."
+
+#~ msgid "&Subtitle Settings..."
+#~ msgstr "&Untertitel Einstellungen..."
+
+#~ msgid "Current &Video Settings..."
+#~ msgstr "Einstellungen für das aktuelle Video..."
+
+#~ msgid "SDI &Output Settings..."
+#~ msgstr "SDI Ausgabe Einstellungen..."
+
+#~ msgid "&Help"
+#~ msgstr "&Hilfe"
+
+#~ msgid "&Manual..."
+#~ msgstr "&Handbuch..."
+
+#~ msgid "&Website..."
+#~ msgstr "&Webseite..."
+
+#~ msgid "&Keyboard Shortcuts"
+#~ msgstr "&Tastaturkürzel"
+
+#~ msgid "&About"
+#~ msgstr "&Über"
+
+#~ msgid "Tip"
+#~ msgstr "Tipp"
+
+#~ msgid ""
+#~ "You can select and open multiple files at once.This is useful "
+#~ "for example if you have extra subtitle files, or if left and right "
+#~ "view are stored in separate files."
+#~ msgstr ""
+#~ "Du kannst mehrere Dateien gleichzeitig auswählen und öffnen.</"
+#~ "p>Dies ist nützlich wenn Du z.B. Untertitel in Extradateien hast,"
+#~ " oder wenn linke und rechte Ansicht in separaten Dateien gespeichert "
+#~ "sind."
+
+#~ msgid "Do not show this message again."
+#~ msgstr "Zeige diese Nachricht nicht noch einmal."
+
+#~ msgid "Open files"
+#~ msgstr "Dateien öffnen"
+
+#~ msgid "Open URL(s)"
+#~ msgstr "Öffne URL(s)"
+
+#~ msgid "URL(s):"
+#~ msgstr "URL(s):"
+
+#~ msgid "Enter one or more space separated URLs."
+#~ msgstr "Gebe eine oder mehrere durch Leerzeichen getrennte URLs ein."
+
+#~ msgid "Cannot open manual."
+#~ msgstr "Kann Handbuch nicht öffnen."
+
+#~ msgid "Cannot open website."
+#~ msgstr "Kann Webseite nicht öffnen."
+
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Tastaturkürzel"
+
+#~ msgid "Keyboard control:"
+#~ msgstr "Tastaturkürzel:"
+
+#~ msgid "Stop"
+#~ msgstr "Stopp"
+
+#~ msgid "About %s"
+#~ msgstr "Über %s"
+
+#~ msgid "The %s 3D video player"
+#~ msgstr "%s - 3D Videospieler"
+
+#~ msgid ""
+#~ "%s version %s.Copyright (C) 2014 the Bino developers.</"
+#~ "p>This is free software. You may redistribute copies of it under the "
+#~ "terms of the <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General "
+#~ "Public License</a>. There is NO WARRANTY, to the extent permitted by law."
+#~ "See <a href=\"%s\">%s</a> for more information on this software.</"
+#~ "p>"
+#~ msgstr ""
+#~ "%s Version %s.Copyright (C) 2014 Die Bino Entwickler.</"
+#~ "p>Dies ist freie Software. Du kannst Kopien davon verteilen unter den "
+#~ "Bedingungen der <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU "
+#~ "General Public License</a>. Es gibt keine Garantie.Siehe <a href="
+#~ "\"%s\">%s</a> für mehr Informationen über diese Software."
+
+#~ msgid "About"
+#~ msgstr "Über"
+
+#~ msgid "Libraries"
+#~ msgstr "Bibliotheken"
+
+#~ msgid "Team"
+#~ msgstr "Team"
+
+#~ msgid "License"
+#~ msgstr "Lizenz"
+
 #~ msgid "Need at least OpenGL 2.1."
 #~ msgstr "Benötige mindestens OpenGL 2.1."

bino-1.6.1.tar.xz/po/fr.gmo -> bino-1.6.5.tar.xz/po/fr.gmo Changed

bino-1.6.1.tar.xz/po/fr.po -> bino-1.6.5.tar.xz/po/fr.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2014-10-13 13:20+0200\n"
+"POT-Creation-Date: 2016-12-16 09:10+0100\n"
 "PO-Revision-Date: 2012-06-05 10:45+0200\n"
 "Last-Translator: Frédéric Devernay <>\n"
 "Language-Team: French\n"
@@ -91,31 +91,31 @@
 msgid "Too many arguments."
 msgstr "Trop d'arguments."
 
-#: src/base/str.cpp:269
+#: src/base/str.cpp:459
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Impossible de convertir la chaîne de caractères en %s."
 
-#: src/base/str.cpp:517 src/base/str.cpp:536 src/base/str.cpp:547
-#: src/base/str.cpp:559
-#, fuzzy, c-format
+#: src/base/str.cpp:993 src/base/str.cpp:1012 src/base/str.cpp:1023
+#: src/base/str.cpp:1035
+#, c-format
 msgid "Cannot convert %s to %s: %s"
-msgstr "Impossible de convertir %s en %s."
+msgstr "Impossible de convertir %s en %s: %s"
 
-#: src/base/str.cpp:565
+#: src/base/str.cpp:1041
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Impossible de convertir %s en %s."
 
-#: src/base/thread.cpp:38 src/base/thread.cpp:48 src/base/thread.cpp:61
-#: src/base/thread.cpp:74 src/base/thread.cpp:85 src/base/thread.cpp:95
-#: src/base/thread.cpp:108 src/base/thread.cpp:116 src/base/thread.cpp:124
-#: src/base/thread.cpp:204 src/base/thread.cpp:211 src/base/thread.cpp:225
-#: src/base/thread.cpp:245
+#: src/base/pth.cpp:38 src/base/pth.cpp:48 src/base/pth.cpp:61
+#: src/base/pth.cpp:74 src/base/pth.cpp:85 src/base/pth.cpp:95
+#: src/base/pth.cpp:108 src/base/pth.cpp:116 src/base/pth.cpp:124
+#: src/base/pth.cpp:204 src/base/pth.cpp:211 src/base/pth.cpp:225
+#: src/base/pth.cpp:245
 msgid "System function failed: "
 msgstr "Échec d'une fonction système : "
 
-#: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
+#: src/base/tmr.cpp:63 src/base/tmr.cpp:72 src/base/tmr.cpp:81
 msgid "Cannot get time."
 msgstr "Impossible d'obtenir l'heure."
 
@@ -238,1193 +238,317 @@
 msgid "Subtitle stream %d not found."
 msgstr "Flux de sous-titres %d non trouvé."
 
-#: src/dispatch.cpp:559 src/main.cpp:795
+#: src/dispatch.cpp:559 src/main.cpp:796
 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:111
-msgid "Video:"
-msgstr "Vidéo :"
+#: src/lib_versions.cpp:183 src/lib_versions.cpp:195
+msgid "not used"
+msgstr "inutilisé"
+
+#: src/lirc.cpp:61
+msgid "Cannot initialize LIRC."
+msgstr "Impossible d'initialiser LIRC."
+
+#: src/lirc.cpp:67
+msgid "Cannot set LIRC socket properties."
+msgstr "Impossible de régler les paramètres de socket LIRC."
 
-#: src/gui.cpp:112
-msgid "Select the video stream."
-msgstr "Choisir le flux vidéo."
+#: src/lirc.cpp:74
+msgid "Cannot read LIRC default configuration."
+msgstr "Impossible de lire la configuration par défaut de LIRC."
 
-#: src/gui.cpp:118
-msgid "Audio:"
-msgstr "Audio :"
+#: src/lirc.cpp:89
+#, c-format
+msgid "Cannot read LIRC configuration file %s."
+msgstr "Impossible de lire le fichier de configuration LIRC %s."
 
-#: src/gui.cpp:119
-msgid "Select the audio stream."
-msgstr "Choisir le flux audio."
+#: src/lirc.cpp:117
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr "Impossible de lire l'événement LIRC ; désactivation du support LIRC."
 
-#: src/gui.cpp:125
-msgid "Subtitle:"
-msgstr "Sous-titres :"
+#: src/lirc.cpp:131
+#, c-format
+msgid "Received invalid command '%s' from LIRC."
+msgstr "Commande LIRC '%s' invalide."
 
-#: src/gui.cpp:126
-msgid "Select the subtitle stream."
-msgstr "Choisir le flux de sous-titres."
+#: src/lirc.cpp:141
+msgid "Cannot get command for LIRC code."
+msgstr "Commande non disponible pour le code LIRC."
 
-#: src/gui.cpp:137 src/media_input.cpp:276
-msgid "Input:"
-msgstr "Entrée :"
+#: src/main.cpp:414
+#, c-format
+msgid "%s version %s"
+msgstr "%s version %s"
+
+#: src/main.cpp:415
+#, fuzzy
+msgid "Copyright (C) 2016 the Bino developers."
+msgstr "Copyright (C) 2014 les développeurs Bino."
+
+#: src/main.cpp:416
+msgid ""
+"This is free software. You may redistribute copies of it under the terms of "
+"the GNU General Public License. There is NO WARRANTY, to the extent "
+"permitted by law."
+msgstr ""
+"Ceci est un logiciel libre. Vous pouvez en distribuer des copies sous les "
+"termes de la GNU General Public License. Il n'y a AUCUNE GARANTIE, dans les "
+"limites autorisées par la loi."
+
+#: src/main.cpp:419
+msgid "Platform:"
+msgstr "Plateforme :"
+
+#: src/main.cpp:421
+msgid "Libraries used:"
+msgstr "Bibliothèques utilisées :"
+
+#. TRANSLATORS: This is the --help text. Please keep the line length limited.
+#. * The --help output should look good with a line width of 80 characters.
+#: src/main.cpp:434
+msgid "Usage:"
+msgstr "Utilisation :"
+
+#: src/main.cpp:436
+msgid "Options:"
+msgstr "Options :"
+
+#: src/main.cpp:437
+msgid "Print help"
+msgstr "Afficher l'aide"
+
+#: src/main.cpp:438
+msgid "Print version"
+msgstr "Afficher la version"
+
+#: src/main.cpp:439
+msgid "Do not use the GUI, just show a plain window"
+msgstr "Ne pas utiliser l'IHM, afficher une fenêtre simple"
+
+#: src/main.cpp:440
+msgid "Append all log messages to the given file"
+msgstr "Ajouter le journal au fichier précisé"
+
+#: src/main.cpp:441
+msgid "Set log level (debug/info/warning/error/quiet)"
+msgstr "Niveau de détail du journal (debug/info/warning/error/quiet)"
+
+#: src/main.cpp:442
+msgid "Print a list of known audio devices and exit"
+msgstr "Affiche une liste des périphériques audio et quitte"
+
+#: src/main.cpp:443
+msgid "Use audio device number N (N=0 is the default)"
+msgstr "Utiliser le périphérique audio N (N=0 par défaut)"
+
+#: src/main.cpp:444
+msgid "Delay audio by D milliseconds (default 0)"
+msgstr "Retarder l'audio de D millisecondes (0 par défaut)"
+
+#: src/main.cpp:445
+msgid "Set audio volume (0 to 1, default 1)"
+msgstr "Volume audio (de 0 à 1, 1 par défaut)"
+
+#: src/main.cpp:446
+msgid "Mute audio"
+msgstr "Mode silencieux"
+
+#: src/main.cpp:447
+msgid "Type of input device: default, firewire, x11"
+msgstr "Type de périphérique d'entrée: default, firewire, x11"
+
+#: src/main.cpp:448
+msgid "Request frame size WxH from input device"
+msgstr "Demande la résolution WxH au périphérique d'entrée"
+
+#: src/main.cpp:449
+msgid "Request frame rate N/D from input device"
+msgstr "Demande le taux de rafraichissement N/D au périphérique d'entrée"
+
+#: src/main.cpp:450
+msgid "Request device format 'default' or 'mjpeg'"
+msgstr "Format demandé au périphérique: 'default' ou 'mjpeg'"
+
+#: src/main.cpp:451
+msgid "Read commands from a file"
+msgstr "Lire les commandes depuis un fichier"
+
+#: src/main.cpp:452
+msgid "Use the given LIRC configuration file"
+msgstr "Utilise le fichier de configuration LIRC donné"
+
+#: src/main.cpp:453
+msgid "This option can be used more than once"
+msgstr "Cette option peut être utilisée plusieurs fois"
+
+#: src/main.cpp:454
+msgid "Output quality (0=fastest to 4=best/default)"
+msgstr "Qualité de rendu, de 0=rapide à 4=meilleure (4 par défaut)"
+
+#: src/main.cpp:455
+msgid "Select video stream (1-n, depending on input)"
+msgstr "Sélectionner le flux vidéo (1-n, selon l'entrée)"
+
+#: src/main.cpp:456
+msgid "Select audio stream (1-n, depending on input)"
+msgstr "Sélectionner le flux audio (1-n, selon l'entrée)"
+
+#: src/main.cpp:457
+msgid "Select subtitle stream (0-n, dep. on input)"
+msgstr "Sélectionner le flux de sous-titres (0-n, selon l'entrée)"
 
-#: src/gui.cpp:138
-msgid "Set the 3D layout of the video stream."
-msgstr "Choisir la disposition 3D du flux vidéo"
+#: src/main.cpp:458
+msgid "Select input type (default autodetect):"
+msgstr "Sélectionner le type d'entrée (auto-détection par défaut) :"
 
-#: src/gui.cpp:142 src/main.cpp:459
+#: src/main.cpp:459
 msgid "2D"
 msgstr "2D"
 
-#: src/gui.cpp:143 src/main.cpp:460
+#: src/main.cpp:460
 msgid "Separate streams, left first"
 msgstr "Flux séparés, gauche d'abord"
 
-#: src/gui.cpp:144 src/main.cpp:461
+#: src/main.cpp:461
 msgid "Separate streams, right first"
 msgstr "Flux séparés, droit d'abord"
 
-#: src/gui.cpp:145 src/main.cpp:462
+#: src/main.cpp:462
 msgid "Alternating, left first"
 msgstr "Alterné, gauche d'abord"
 
-#: src/gui.cpp:146 src/main.cpp:463
+#: src/main.cpp:463
 msgid "Alternating, right first"
 msgstr "Alterné, droit d'abord"
 
-#: 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: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:149 src/main.cpp:466
+#: src/main.cpp:466
 msgid "Bottom/top"
 msgstr "Bas/haut"
 
-#: src/gui.cpp:150 src/main.cpp:467
+#: src/main.cpp:467
 msgid "Bottom/top, half height"
 msgstr "Bas/haut, demi-hauteur"
 
-#: 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 "gauche/droite"
 
-#: src/gui.cpp:152 src/gui.cpp:174 src/gui.cpp:2215 src/gui.cpp:2244
 #: src/main.cpp:469 src/main.cpp:482
 msgid "Left/right, half width"
 msgstr "Gauche/droite, demi-largeur"
 
-#: src/gui.cpp:153 src/main.cpp:470
+#: src/main.cpp:470
 msgid "Right/left"
 msgstr "Droite/gauche"
 
-#: src/gui.cpp:154 src/main.cpp:471
+#: src/main.cpp:471
 msgid "Right/left, half width"
 msgstr "Droite/gauche, demi-largeur"
 
-#: src/gui.cpp:155 src/gui.cpp:175 src/gui.cpp:2216 src/gui.cpp:2245
 #: src/main.cpp:472 src/main.cpp:483
 msgid "Even/odd rows"
 msgstr "Lignes paires/impaires"
 
-#: src/gui.cpp:156 src/main.cpp:473
+#: src/main.cpp:473
 msgid "Odd/even rows"
 msgstr "Lignes impaires/paires"
 
-#: src/gui.cpp:162
-msgid "Output:"
-msgstr "Sortie :"
+#: src/main.cpp:474
+msgid "Select output type:"
+msgstr "Sélectionner le type de sortie :"
+
+#: src/main.cpp:475
+msgid "OpenGL stereo"
+msgstr "Stéréo OpenGL"
 
-#: src/gui.cpp:163
-msgid "Set the 3D output type for your display."
-msgstr "Choisir le type de sortie 3D pour votre affichage."
+#: src/main.cpp:476
+msgid "Left/right alternating"
+msgstr "Alterné gauche/droite"
 
-#: src/gui.cpp:167 src/gui.cpp:2210 src/gui.cpp:2239 src/main.cpp:477
+#: src/main.cpp:477
 msgid "Left view"
 msgstr "Vue gauche"
 
-#: src/gui.cpp:168 src/gui.cpp:2211 src/gui.cpp:2240 src/main.cpp:478
+#: src/main.cpp:478
 msgid "Right view"
 msgstr "Vue droite"
 
-#: src/gui.cpp:169 src/main.cpp:475
-msgid "OpenGL stereo"
-msgstr "Stéréo OpenGL"
-
-#: src/gui.cpp:170 src/main.cpp:476
-msgid "Left/right alternating"
-msgstr "Alterné gauche/droite"
-
-#: src/gui.cpp:176 src/gui.cpp:2217 src/gui.cpp:2246 src/main.cpp:484
+#: src/main.cpp:484
 msgid "Even/odd columns"
 msgstr "Colonnes paires/impaires"
 
-#: src/gui.cpp:177 src/gui.cpp:2218 src/gui.cpp:2247 src/main.cpp:485
+#: src/main.cpp:485
 msgid "Checkerboard pattern"
 msgstr "Damier"
 
-#: src/gui.cpp:178 src/main.cpp:486
+#: src/main.cpp:486
 msgid "HDMI frame packing mode"
 msgstr "Mode HDMI frame packing"
 
-#: src/gui.cpp:179 src/gui.cpp:2219 src/gui.cpp:2248 src/main.cpp:487
+#: src/main.cpp:487
 msgid "Red/cyan glasses, monochrome"
 msgstr "Lunettes rouge/cyan, monochrome"
 
-#: src/gui.cpp:180 src/gui.cpp:2220 src/gui.cpp:2249 src/main.cpp:488
+#: src/main.cpp:488
 msgid "Red/cyan glasses, half color"
 msgstr "Lunettes rouge/cyan, demi-couleur"
 
-#: src/gui.cpp:181 src/gui.cpp:2221 src/gui.cpp:2250 src/main.cpp:489
+#: src/main.cpp:489
 msgid "Red/cyan glasses, full color"
 msgstr "Lunettes rouge/cyan, pleine couleur"
 
-#: src/gui.cpp:182 src/gui.cpp:2222 src/gui.cpp:2251 src/main.cpp:490
+#: src/main.cpp:490
 msgid "Red/cyan glasses, Dubois"
 msgstr "Lunettes rouge/cyan, Dubois"
 
-#: src/gui.cpp:183 src/gui.cpp:2223 src/gui.cpp:2252 src/main.cpp:491
+#: src/main.cpp:491
 msgid "Green/magenta glasses, monochrome"
 msgstr "Lunettes vert/magenta, monochrome"
 
-#: src/gui.cpp:184 src/gui.cpp:2224 src/gui.cpp:2253 src/main.cpp:492
+#: src/main.cpp:492
 msgid "Green/magenta glasses, half color"
 msgstr "Lunettes vert/magenta, demi-couleur"
 
-#: src/gui.cpp:185 src/gui.cpp:2225 src/gui.cpp:2254 src/main.cpp:493
+#: src/main.cpp:493
 msgid "Green/magenta glasses, full color"
 msgstr "Lunettes vert/magenta, pleine couleur"
 
-#: src/gui.cpp:186 src/gui.cpp:2226 src/gui.cpp:2255 src/main.cpp:494
+#: src/main.cpp:494
 msgid "Green/magenta glasses, Dubois"
 msgstr "Lunettes vert/magenta, Dubois"
 
-#: src/gui.cpp:187 src/gui.cpp:2227 src/gui.cpp:2256 src/main.cpp:495
+#: src/main.cpp:495
 msgid "Amber/blue glasses, monochrome"
 msgstr "Lunettes Ambre/bleu, monochrome"
 
-#: src/gui.cpp:188 src/gui.cpp:2228 src/gui.cpp:2257 src/main.cpp:496
+#: src/main.cpp:496
 msgid "Amber/blue glasses, half color"
 msgstr "Lunettes Ambre/bleu, demi-couleur"
 
-#: src/gui.cpp:189 src/gui.cpp:2229 src/gui.cpp:2258 src/main.cpp:497
+#: src/main.cpp:497
 msgid "Amber/blue glasses, full color"
 msgstr "Lunettes Ambre/bleu, pleine couleur"
 
-#: src/gui.cpp:190 src/gui.cpp:2230 src/gui.cpp:2259 src/main.cpp:498
+#: src/main.cpp:498
 msgid "Amber/blue glasses, Dubois"
 msgstr "Lunettes Ambre/bleu, Dubois"
 
-#: src/gui.cpp:191 src/gui.cpp:2231 src/gui.cpp:2260 src/main.cpp:499
+#: src/main.cpp:499
 msgid "Red/green glasses, monochrome"
-msgstr "Lunettes rouge/vert, monochrome"
-
-#: src/gui.cpp:192 src/gui.cpp:2232 src/gui.cpp:2261 src/main.cpp:500
-msgid "Red/blue glasses, monochrome"
-msgstr "Lunettes rouge/bleu, monochrome"
-
-#: src/gui.cpp:196
-msgid "Swap left/right"
-msgstr "Echanger gauche/droite"
-
-#: src/gui.cpp:197
-msgid ""
-"Swap the left and right view. Use this if the 3D effect seems wrong."
-msgstr ""
-"Echanger les vues droite et gauche. À utiliser si l'effet 3D parait "
-"étrange."
-
-#: src/gui.cpp:475 src/gui.cpp:1736
-msgid "Off"
-msgstr "Non"
-
-#: src/gui.cpp:706
-msgid ""
-"This slider shows the progress during video playback, and can be used to "
-"seek in the video."
-msgstr ""
-"Ce curseur montre la progression de la lecture vidéo, et peut être "
-"utiliser pour naviguer dans la vidéo"
-
-#: src/gui.cpp:713
-msgid "Elapsed / total time."
-msgstr "Temps écoulé/total."
-
-#: src/gui.cpp:720
-msgid "Toggle audio mute."
-msgstr "Basculer le mode silencieux."
-
-#: src/gui.cpp:725
-msgid "Adjust audio volume."
-msgstr "Ajuster le volume audio."
-
-#: src/gui.cpp:737
-msgid "Play."
-msgstr "Lecture."
-
-#: src/gui.cpp:741
-msgid "Pause."
-msgstr "Pause."
-
-#: src/gui.cpp:745
-msgid "Stop."
-msgstr "Stop."
-
-#: src/gui.cpp:750
-msgid "Toggle loop mode."
-msgstr "Basculer le mode lecture en boucle."
-
-#: src/gui.cpp:757
-msgid ""
-"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
-"f key."
-msgstr ""
-"Passer en mode plein écran. Vous pouvez quitter le mode plein écran avec "
-"la touche f ou ESC."
-
-#: src/gui.cpp:763
-msgid "Center the video area on your screen."
-msgstr "Centrer la vidéo sur l'écran."
-
-#: src/gui.cpp:770
-msgid "Seek backward 10 minutes."
-msgstr "Aller 10 minutes en arrière."
-
-#: src/gui.cpp:775
-msgid "Seek backward 1 minute."
-msgstr "Aller 1 minute en arrière."
-
-#: src/gui.cpp:781
-msgid "Seek backward 10 seconds."
-msgstr "Aller 10 secondes en arrière."
-
-#: src/gui.cpp:787
-msgid "Seek forward 10 seconds."
-msgstr "Aller 10 secondes en avant."
-
-#: src/gui.cpp:792
-msgid "Seek forward 1 minute."
-msgstr "Aller 1 minute en avant."
-
-#: src/gui.cpp:798
-msgid "Seek forward 10 minutes."
-msgstr "Aller 10 minutes en avant."
-
-#: src/gui.cpp:1059
-msgid "Fullscreen/Multiscreen Settings"
-msgstr "Réglages plein écran/multi-écrans"
-
-#: src/gui.cpp:1061
-msgid "Configure fullscreen mode:"
-msgstr "Configuration du mode plein écran :"
-
-#: src/gui.cpp:1062
-msgid "Select the screens to use in fullscreen mode."
-msgstr "Choisir les écrans à utiliser pour le mode plein écran."
-
-#: src/gui.cpp:1064
-msgid "Single screen:"
-msgstr "Écran unique :"
-
-#: src/gui.cpp:1065
-msgid "Use a single screen for fullscreen mode."
-msgstr "Utiliser un seul écran pour le mode plein écran."
-
-#: src/gui.cpp:1068
-msgid "Primary screen"
-msgstr "Écran primaire"
-
-#: src/gui.cpp:1071 src/gui.cpp:1082 src/gui.cpp:1083
-#, c-format
-msgid "Screen %d"
-msgstr "Écran %d"
-
-#: src/gui.cpp:1074
-msgid "Dual screen:"
-msgstr "Double écran :"
-
-#: src/gui.cpp:1075
-msgid "Use two screens for fullscreen mode."
-msgstr "Utiliser deux écrans pour le mode plein écran."
-
-#: src/gui.cpp:1087
-msgid "Multi screen:"
-msgstr "Plein écran :"
-
-#: src/gui.cpp:1088
-msgid "Use multiple screens for fullscreen mode."
-msgstr "Utiliser plusieurs écrans pour le mode plein écran"
-
-#: src/gui.cpp:1090
-msgid "Comma-separated list of screens to use for fullscreen mode."
-msgstr ""
-"Liste d'écrans à utiliser pour le mode plein écran, séparés par des "
-"virgules."
-
-#: src/gui.cpp:1093
-msgid "When in fullscreen mode,"
-msgstr "En mode plein écran,"
-
-#: src/gui.cpp:1094
-msgid "Set special left/right view handling for fullscreen mode."
-msgstr ""
-"Réglages spéciaux pour les vues droite et gauche en plein écran."
-
-#: src/gui.cpp:1096
-msgid "flip left view vertically."
-msgstr "flip vertical de la vue gauche"
-
-#: src/gui.cpp:1098
-msgid "flop left view horizontally."
-msgstr "flip horizontal de la vue gauche"
-
-#: src/gui.cpp:1100
-msgid "flip right view vertically."
-msgstr "flip vertical de la vue droite"
-
-#: src/gui.cpp:1102
-msgid "flop right view horizontally."
-msgstr "flop horizontal de la vue droite"
-
-#: src/gui.cpp:1105
-msgid "use DLP(R) 3-D Ready Sync"
-msgstr "utiliser synchronisation DLP® 3-D Ready"
-
-#: src/gui.cpp:1106
-msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
-msgstr ""
-"Utiliser la synchronisation DLP&reg; 3-D Ready pour les modes qui le "
-"supportent."
-
-#: src/gui.cpp:1108
-msgid "inhibit the screensaver"
-msgstr "Désactiver l'économiseur d'écran"
-
-#: src/gui.cpp:1109
-msgid "Inhibit the screensaver during fullscreen playback."
-msgstr "Désactiver l'économiseur d'écran en lecture plein écran."
-
-#: src/gui.cpp:1111 src/gui.cpp:1277 src/gui.cpp:1412 src/gui.cpp:1473
-#: src/gui.cpp:1538 src/gui.cpp:1616 src/gui.cpp:1740 src/gui.cpp:2025
-#: src/gui.cpp:2264 src/gui.cpp:2750 src/gui.cpp:3477 src/gui.cpp:3524
-#: src/gui.cpp:3841
-msgid "OK"
-msgstr "OK"
-
-#: src/gui.cpp:1230
-msgid "Display Color Adjustments"
-msgstr "Réglages des couleurs d'affichage"
-
-#: src/gui.cpp:1232
-msgid "Contrast:"
-msgstr "Contraste :"
-
-#: src/gui.cpp:1243
-msgid "Brightness:"
-msgstr "Luminosité :"
-
-#: src/gui.cpp:1254
-msgid "Hue:"
-msgstr "Teinte :"
-
-#: src/gui.cpp:1265
-msgid "Saturation:"
-msgstr "Saturation :"
-
-#: src/gui.cpp:1383
-msgid "Display Crosstalk Calibration"
-msgstr "Calibrage du crosstalk d'affichage"
-
-#. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/gui.cpp:1386
-msgid ""
-"Please read the manual to find out how to measure the crosstalk "
-"levels of your display."
-msgstr ""
-"Le manuel explique comment mesurer le niveau de crosstalk de votre "
-"affichage."
-
-#: src/gui.cpp:1390
-msgid "Red:"
-msgstr "Rouge :"
-
-#: src/gui.cpp:1397
-msgid "Green:"
-msgstr "Vert :"
-
-#: src/gui.cpp:1404
-msgid "Blue:"
-msgstr "Bleu :"
-
-#: src/gui.cpp:1460
-msgid "Rendering Quality Adjustments"
-msgstr "Réglages de la qualité de rendu"
-
-#: src/gui.cpp:1462
-msgid "Rendering Quality:"
-msgstr "Qualité de rendu :"
-
-#: src/gui.cpp:1516
-msgid "Zoom for wide videos"
-msgstr "Zoom pour les vidéos larges"
-
-#: src/gui.cpp:1519
-msgid ""
-"Set zoom level for videos that are wider than the screen: 0: Show "
-"full video width. 1: Use full screen height."
-msgstr ""
-"Réglage du zoom pour les vidéos qui sont plus larges que l'écran :"
-" 0 : Pleine largeur. 1 : Pleine hauteur."
-
-#: src/gui.cpp:1523
-msgid "Zoom:"
-msgstr "Zoom :"
-
-#: src/gui.cpp:1524
-msgid "Set the zoom level for videos that are wider than the screen."
-msgstr "Niveau de zoom pour les vidéos plus larges que l'écran."
-
-#: src/gui.cpp:1582
-msgid "Audio Settings"
-msgstr "Réglages audio"
-
-#: src/gui.cpp:1584
-msgid "Audio device:"
-msgstr "Périphérique audio :"
-
-#: src/gui.cpp:1585
-msgid ""
-"Select the audio device. This will take effect for the next started "
-"video."
-msgstr ""
-"Choix du périphérique audio. Ceci prendra effet à la prochaine lecture "
-"vidéo."
-
-#: src/gui.cpp:1589 src/gui.cpp:2680
-msgid "Default"
-msgstr "Par défaut"
-
-#: src/gui.cpp:1606
-msgid "Audio delay (ms):"
-msgstr "Retard audio (ms) :"
-
-#: src/gui.cpp:1607
-msgid ""
-"Set an audio delay, in milliseconds. This is useful if audio and video "
-"are not in sync."
-msgstr ""
-"Retard de la piste audio, en millisecondes. Ceci est utile si audio et "
-"vidéo sont désynchronisés."
-
-#: src/gui.cpp:1664
-msgid "Subtitle Settings"
-msgstr "Réglages des sous-titres"
-
-#: src/gui.cpp:1667
-msgid ""
-"These settings apply only to soft subtitles, not to bitmaps. Some "
-"changes require a restart of the video to take effect."
-msgstr ""
-"Ces réglages s'appliquent aux sous-titres textuels, pas aux bitmaps."
-" Certains changements nécessitent de redémarrer la vidéo pour prendre "
-"effet."
-
-#: src/gui.cpp:1670
-msgid "Encoding:"
-msgstr "Encodage :"
-
-#: src/gui.cpp:1671
-msgid "Set the subtitle character set encoding."
-msgstr "Choisir l'encodage du jeux de caractères des sous-titres."
-
-#: src/gui.cpp:1686
-msgid "Override font:"
-msgstr "Police de caractères :"
-
-#: src/gui.cpp:1687
-msgid "Override the subtitle font family."
-msgstr "Force la police de caractères utilisée pour les sous-titres."
-
-#: src/gui.cpp:1696
-msgid "Override font size:"
-msgstr "Taille de police :"
-
-#: src/gui.cpp:1697
-msgid "Override the subtitle font size."
-msgstr "Force la taille de la police des sous-titres."
-
-#: src/gui.cpp:1707
-msgid "Override scale factor:"
-msgstr "Facteur d'échelle :"
-
-#: src/gui.cpp:1708
-msgid "Override the subtitle scale factor."
-msgstr "Force le facteur d'échelle des sous-titres."
-
-#: src/gui.cpp:1719
-msgid "Override color:"
-msgstr "Couleur :"
-
-#: src/gui.cpp:1720
-msgid "Override the subtitle color."
-msgstr "Force la couleur des sous-titres."
-
-#: src/gui.cpp:1729
-msgid "Override shadow:"
-msgstr "Force l'ombre :"
-
-#: src/gui.cpp:1730
-msgid "Override the subtitle shadow."
-msgstr "Force l'ombre des sous-titres."
-
-#: src/gui.cpp:1735
-msgid "On"
-msgstr "Oui"
-
-#: src/gui.cpp:1946
-msgid "Video Settings"
-msgstr "Réglages vidéo"
-
-#: src/gui.cpp:1948
-msgid "Crop to aspect ratio:"
-msgstr "Retailler au facteur d'aspect :"
-
-#: src/gui.cpp:1949
-msgid ""
-"Set the real aspect ratio of the video, so that borders can be cropped.</"
-"p>"
-msgstr ""
-"Choix du véritable facteur d'aspect de la vidéo, pour retailler les bords "
-"noirs."
-
-#: src/gui.cpp:1952
-msgid "Do not crop"
-msgstr "Ne pas retailler"
-
-#: src/gui.cpp:1965
-#, fuzzy
-msgid "Force source aspect ratio:"
-msgstr "Retailler au facteur d'aspect :"
-
-#: src/gui.cpp:1966
-#, fuzzy
-msgid "Force the aspect ratio of video source."
-msgstr ""
-"Choix du véritable facteur d'aspect de la vidéo, pour retailler les bords "
-"noirs."
-
-#: src/gui.cpp:1969
-#, fuzzy
-msgid "Do not force"
-msgstr "Ne pas retailler"
-
-#: src/gui.cpp:1982
-msgid "Parallax:"
-msgstr "Parallaxe :"
-
-#: src/gui.cpp:1983
-msgid ""
-"Adjust parallax, from -1 to +1. This changes the separation of left and "
-"right view, and thus the perceived distance of the scene."
-msgstr ""
-"Ajuster la parallaxe, de -1 à 1. Ceci change la séparation des vues "
-"gauche et droite, et donc la distance perçue de la scène."
-
-#: src/gui.cpp:1996
-msgid "Subtitle parallax:"
-msgstr "Parallaxe des sous-titres :"
-
-#: src/gui.cpp:1997
-msgid ""
-"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
-"distance of the subtitles."
-msgstr ""
-"Ajuster la parallaxe des sous-titres, de -1 à 1. Ceci change la distance "
-"perçue des sous-titres."
-
-#: src/gui.cpp:2010
-msgid "Ghostbusting:"
-msgstr "Ghostbusting :"
-
-#: src/gui.cpp:2011
-msgid ""
-"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
-"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
-"does not work with anaglyph glasses."
-msgstr ""
-"Choisir le niveau de ghostbusting (élimination du crosstalk), de 0 à 1. "
-"Vous devez régler le niveau de crosstalk de votre affichage d'abord. Le "
-"ghostbusting ne fonctionne pas avec les lunettes anaglyphes."
-
-#: src/gui.cpp:2195
-msgid "SDI Output Settings"
-msgstr "Réglages de la sortie SDI"
-
-#: src/gui.cpp:2197
-msgid "SDI Output Format:"
-msgstr "Format de sortie SDI :"
-
-#: src/gui.cpp:2198
-msgid "Select output format used for SDI output."
-msgstr "Choisir le format de sortie SDI."
-
-#: src/gui.cpp:2206
-msgid "Left stereo mode:"
-msgstr "Mode stéréo gauche :"
-
-#: src/gui.cpp:2207
-msgid "Select stereo mode used for left SDI output."
-msgstr "Choisir le mode stéréo pour la sortie SDI gauche."
-
-#: src/gui.cpp:2235
-msgid "Right stereo mode:"
-msgstr "Mode stéréo droit :"
-
-#: src/gui.cpp:2236
-msgid "Select stereo mode used for right SDI output."
-msgstr "Choisir le mode stéréo utilisé pour la sortie SDI droite."
-
-#: src/gui.cpp:2676
-msgid "Open device(s)"
-msgstr "Ouvrir le(s) périphérique(s)"
-
-#: src/gui.cpp:2679
-msgid "Choose a device type."
-msgstr "Sélectionner un type de périphérique."
-
-#: src/gui.cpp:2681 src/media_object.cpp:831
-msgid "Firewire"
-msgstr "Firewire"
-
-#: src/gui.cpp:2682 src/media_object.cpp:832
-msgid "X11"
-msgstr "X11"
-
-#: src/gui.cpp:2685 src/gui.cpp:2688
-msgid "Choose a device."
-msgstr "Sélectionner un périphérique"
-
-#: src/gui.cpp:2691
-msgid "Set the X11 device string. Refer to the manual for details."
-msgstr ""
-"Identifiant du périphérique X11. Voir le manuel pour les détails."
-
-#: src/gui.cpp:2715
-msgid "First device:"
-msgstr "Premier périphérique :"
-
-#: src/gui.cpp:2716
-msgid "Second device:"
-msgstr "Second périphérique :"
-
-#: src/gui.cpp:2720
-msgid "Request frame size"
-msgstr "Résolution demandée"
-
-#: src/gui.cpp:2721
-msgid ""
-"Request a specific frame size from the device, e.g. 640x480. The device "
-"must support this frame size. Some devices require a frame size to be "
-"selected."
-msgstr ""
-"Demande une résolution spécifique au périphérique, par ex. 640x480. Le "
-"périphérique doit supporter cette résolution. Certains périphériques exigent "
-"de sélectionner une résolution."
-
-#: src/gui.cpp:2732
-msgid "Request frame rate"
-msgstr "Taux de rafraichissement demandé"
-
-#: src/gui.cpp:2733
-msgid ""
-"Request a specific frame rate from the device, e.g. 25/1. The device must "
-"support this frame rate. Some devices require a frame rate to be selected.</"
-"p>"
-msgstr ""
-"Demander un taux de rafraichissement au périphérique, par ex. 25/1. Le "
-"périphérique doit supporter ce taux de rafraichissement. Certains "
-"périphériques exigent de sélectionner un taux de rafraichissement."
-
-#: src/gui.cpp:2744
-msgid "Request MJPEG format"
-msgstr "Demander le format MJPEG"
-
-#: src/gui.cpp:2745
-msgid ""
-"Request MJPEG data from the input device. The device may ignore this "
-"request."
-msgstr ""
-"Demander des données MJPEG au périphérique. Le périphérique peut ignorer "
-"cette requête."
-
-#: src/gui.cpp:2748 src/gui.cpp:3523
-msgid "Cancel"
-msgstr "Annuler"
-
-#: src/gui.cpp:3046
-msgid "&File"
-msgstr "&Fichier"
-
-#: src/gui.cpp:3047
-msgid "&Open file(s)..."
-msgstr "&Ouvrir le(s) fichier(s)..."
-
-#: src/gui.cpp:3052
-msgid "Open &URL(s)..."
-msgstr "Ouvrir le(s) &URL(s)..."
-
-#: src/gui.cpp:3056
-msgid "Open &device(s)..."
-msgstr "Ouvrir le(s) périphérique(s)..."
-
-#: src/gui.cpp:3071
-msgid "&Clear recent files"
-msgstr "Effacer les éléments récents"
-
-#: src/gui.cpp:3079
-msgid "&Quit"
-msgstr "&Quitter"
-
-#: src/gui.cpp:3085
-msgid "&Preferences"
-msgstr "&Préférences"
-
-#: src/gui.cpp:3088
-msgid "&Fullscreen Settings..."
-msgstr "Réglages du mode &plein écran..."
-
-#: src/gui.cpp:3091
-msgid "Display &Color Adjustments..."
-msgstr "Réglage des &couleurs de l'affichage..."
-
-#: src/gui.cpp:3094
-msgid "Display Cross&talk Calibration..."
-msgstr "Calibrage du cross&talk de l'affichage..."
-
-#: src/gui.cpp:3098
-msgid "Quality Adjustments..."
-msgstr "Réglage de qualité de rendu..."
-
-#: src/gui.cpp:3102
-msgid "&Zoom for wide videos..."
-msgstr "&Zoom pour les vidéos larges..."
-
-#: src/gui.cpp:3106
-msgid "&Audio Settings..."
-msgstr "Réglages &audio..."
-
-#: src/gui.cpp:3110
-msgid "&Subtitle Settings..."
-msgstr "Réglage des &sous-titres..."
-
-#: src/gui.cpp:3114
-msgid "Current &Video Settings..."
-msgstr "Réglages &vidéo..."
-
-#: src/gui.cpp:3119
-msgid "SDI &Output Settings..."
-msgstr "Réglages de sortie SDI..."
-
-#: src/gui.cpp:3123
-msgid "&Help"
-msgstr "Aide"
-
-#: src/gui.cpp:3124
-msgid "&Manual..."
-msgstr "&Manuel..."
-
-#: src/gui.cpp:3129
-msgid "&Website..."
-msgstr "Site &web..."
-
-#: src/gui.cpp:3133
-msgid "&Keyboard Shortcuts"
-msgstr "Raccourcis clavier"
-
-#: src/gui.cpp:3137
-msgid "&About"
-msgstr "&À propos"
-
-#: src/gui.cpp:3470
-msgid "Tip"
-msgstr "Astuce"
-
-#: src/gui.cpp:3473
-msgid ""
-"You can select and open multiple files at once.This is useful for "
-"example if you have extra subtitle files, or if left and right view are "
-"stored in separate files."
-msgstr ""
-"Vous pouvez sélectionner plusieurs fichiers en même temps.C'est "
-"utile par exemple si vous avez des fichiers de sous-titres externes, ou "
-"si les vues droite et gauche sont dans des fichiers séparés."
-
-#: src/gui.cpp:3476
-msgid "Do not show this message again."
-msgstr "Ne plus montrer ce message"
-
-#: src/gui.cpp:3493
-msgid "Open files"
-msgstr "Ouvrir des fichiers"
-
-#: src/gui.cpp:3517
-msgid "Open URL(s)"
-msgstr "Ouvrir URL(s)"
-
-#: src/gui.cpp:3518
-msgid "URL(s):"
-msgstr "URL(s) :"
-
-#: src/gui.cpp:3519
-msgid "Enter one or more space separated URLs."
-msgstr "Entrez un ou plusieurs URLs séparés par des espaces."
-
-#: src/gui.cpp:3732 src/gui.cpp:3740 src/video_output_qt.cpp:291
-#: src/video_output_qt.cpp:534 src/video_output_qt.cpp:731
-#: src/video_output_qt.cpp:743 src/video_output_qt.cpp:764
-msgid "Error"
-msgstr "Erreur"
-
-#: src/gui.cpp:3732
-msgid "Cannot open manual."
-msgstr "Impossible d'ouvrir le manuel."
-
-#: src/gui.cpp:3740
-msgid "Cannot open website."
-msgstr "Impossible d'ouvrir le site web."
-
-#: src/gui.cpp:3748
-msgid "Keyboard Shortcuts"
-msgstr "Raccourcis clavier"
-
-#: src/gui.cpp:3751
-msgid "Keyboard control:"
-msgstr "Raccourcis clavier:"
-
-#: src/gui.cpp:3753 src/main.cpp:534
-msgid "ESC"
-msgstr "Échap"
-
-#: src/gui.cpp:3753
-msgid "Stop"
-msgstr "Stop"
-
-#: src/gui.cpp:3754 src/main.cpp:536
-msgid "SPACE"
-msgstr "Espace"
-
-#: src/gui.cpp:3754 src/main.cpp:536
-msgid "Pause / unpause"
-msgstr "Pause / lecture"
-
-#: src/gui.cpp:3755 src/main.cpp:537
-msgid "Toggle fullscreen"
-msgstr "Basculer en plein écran"
-
-#: src/gui.cpp:3756 src/main.cpp:538
-msgid "Center window"
-msgstr "Centrer la fenêtre"
-
-#: src/gui.cpp:3757 src/main.cpp:539
-msgid "Swap left/right eye"
-msgstr "Échanger gauche/droite"
-
-#: src/gui.cpp:3758 src/main.cpp:540
-msgid "Cycle through available video streams"
-msgstr "Changer de flux vidéo"
-
-#: src/gui.cpp:3759 src/main.cpp:541
-msgid "Cycle through available audio streams"
-msgstr "Changer de flux audio"
-
-#: src/gui.cpp:3760 src/main.cpp:542
-msgid "Cycle through available subtitle streams"
-msgstr "Changer de flux de sous-titres"
-
-#: src/gui.cpp:3761 src/main.cpp:543
-msgid "Adjust contrast"
-msgstr "Régler le contraste"
-
-#: src/gui.cpp:3762 src/main.cpp:544
-msgid "Adjust brightness"
-msgstr "Régler la luminosité"
-
-#: src/gui.cpp:3763 src/main.cpp:545
-msgid "Adjust hue"
-msgstr "Régler la teinte"
-
-#: src/gui.cpp:3764 src/main.cpp:546
-msgid "Adjust saturation"
-msgstr "Régler la saturation"
-
-#: src/gui.cpp:3765 src/main.cpp:547
-msgid "Adjust parallax"
-msgstr "Régler la parallaxe"
-
-#: src/gui.cpp:3766 src/main.cpp:548
-msgid "Adjust ghostbusting"
-msgstr "Régler le ghostbusting"
-
-#: src/gui.cpp:3767 src/main.cpp:549
-msgid "Adjust zoom for wide videos"
-msgstr "Régler le zoom pour les vidéos larges"
-
-#: src/gui.cpp:3768 src/main.cpp:550
-msgid "Adjust audio volume"
-msgstr "Régler le volume audio"
-
-#: src/gui.cpp:3769 src/main.cpp:551
-msgid "Toggle audio mute"
-msgstr "Basculer mode silencieux"
-
-#: src/gui.cpp:3770 src/main.cpp:552
-msgid "Step a single video frame forward"
-msgstr "Avancer d'une image"
-
-#: src/gui.cpp:3771 src/main.cpp:553
-msgid "left, right"
-msgstr "gauche, droite"
-
-#: src/gui.cpp:3771 src/main.cpp:553
-msgid "Seek 10 seconds backward / forward"
-msgstr "Avancer / reculer de 10 secondes"
-
-#: src/gui.cpp:3772 src/main.cpp:554
-msgid "down, up"
-msgstr "bas, haut"
-
-#: src/gui.cpp:3772 src/main.cpp:554
-msgid "Seek 1 minute backward / forward"
-msgstr "Avancer / reculer d'une minute"
-
-#: src/gui.cpp:3773 src/main.cpp:555
-msgid "page down, page up"
-msgstr "page prec., page suiv."
-
-#: src/gui.cpp:3773 src/main.cpp:555
-msgid "Seek 10 minutes backward / forward"
-msgstr "Avancer / reculer de 10 minutes"
-
-#: src/gui.cpp:3774 src/main.cpp:557
-msgid "Media keys"
-msgstr "Touches multimédia"
-
-#: src/gui.cpp:3774 src/main.cpp:557
-msgid "Media keys should work as expected"
-msgstr "Les touches multimédia devraient fonctionner comme on s'y attend"
-
-#: src/gui.cpp:3790
-#, c-format
-msgid "About %s"
-msgstr "À propos de %s"
-
-#: src/gui.cpp:3796
-#, c-format
-msgid "The %s 3D video player"
-msgstr "Le lecteur vidéo 3D %s"
-
-#: src/gui.cpp:3801
-#, c-format
-msgid ""
-"%s version %s.Copyright (C) 2014 the Bino developers.This "
-"is free software. You may redistribute copies of it under the terms of the "
-"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
-"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
-"\"%s\">%s</a> for more information on this software."
-msgstr ""
-"%s version %s.Copyright (C) 2014 les développeurs Bino.Ceci "
-"est un logiciel libre. Vous pouvez en distribuer des copies sous les termes "
-"de la <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public "
-"License</a>. Il n'y a AUCUNE GARANTIE, dans les limites autorisées par la "
-"loi.Voir <a href=\"%s\">%s</a> pour plus d'informations sur ce "
-"logiciel."
-
-#: src/gui.cpp:3813 src/main.cpp:419
-msgid "Platform:"
-msgstr "Plateforme :"
-
-#: src/gui.cpp:3814 src/main.cpp:421
-msgid "Libraries used:"
-msgstr "Bibliothèques utilisées :"
-
-#: src/gui.cpp:3836
-msgid "About"
-msgstr "À propos"
-
-#: src/gui.cpp:3837
-msgid "Libraries"
-msgstr "Bibliothèques"
-
-#: src/gui.cpp:3838
-msgid "Team"
-msgstr "Équipe"
-
-#: src/gui.cpp:3839
-msgid "License"
-msgstr "Licence"
-
-#: src/lib_versions.cpp:183 src/lib_versions.cpp:195
-msgid "not used"
-msgstr "inutilisé"
-
-#: src/lirc.cpp:61
-msgid "Cannot initialize LIRC."
-msgstr "Impossible d'initialiser LIRC."
-
-#: src/lirc.cpp:67
-msgid "Cannot set LIRC socket properties."
-msgstr "Impossible de régler les paramètres de socket LIRC."
-
-#: src/lirc.cpp:74
-msgid "Cannot read LIRC default configuration."
-msgstr "Impossible de lire la configuration par défaut de LIRC."
-
-#: src/lirc.cpp:89
-#, c-format
-msgid "Cannot read LIRC configuration file %s."
-msgstr "Impossible de lire le fichier de configuration LIRC %s."
-
-#: src/lirc.cpp:117
-msgid "Cannot get LIRC event; disabling LIRC support."
-msgstr "Impossible de lire l'événement LIRC ; désactivation du support LIRC."
-
-#: src/lirc.cpp:131
-#, c-format
-msgid "Received invalid command '%s' from LIRC."
-msgstr "Commande LIRC '%s' invalide."
-
-#: src/lirc.cpp:141
-msgid "Cannot get command for LIRC code."
-msgstr "Commande non disponible pour le code LIRC."
-
-#: src/main.cpp:414
-#, c-format
-msgid "%s version %s"
-msgstr "%s version %s"
-
-#: src/main.cpp:415
-msgid "Copyright (C) 2014 the Bino developers."
-msgstr "Copyright (C) 2014 les développeurs Bino."
-
-#: src/main.cpp:416
-msgid ""
-"This is free software. You may redistribute copies of it under the terms of "
-"the GNU General Public License. There is NO WARRANTY, to the extent "
-"permitted by law."
-msgstr ""
-"Ceci est un logiciel libre. Vous pouvez en distribuer des copies sous les "
-"termes de la GNU General Public License. Il n'y a AUCUNE GARANTIE, dans les "
-"limites autorisées par la loi."
-
-#. TRANSLATORS: This is the --help text. Please keep the line length limited.
-#. * The --help output should look good with a line width of 80 characters.
-#: src/main.cpp:434
-msgid "Usage:"
-msgstr "Utilisation :"
-
-#: src/main.cpp:436
-msgid "Options:"
-msgstr "Options :"
-
-#: src/main.cpp:437
-msgid "Print help"
-msgstr "Afficher l'aide"
-
-#: src/main.cpp:438
-msgid "Print version"
-msgstr "Afficher la version"
-
-#: src/main.cpp:439
-msgid "Do not use the GUI, just show a plain window"
-msgstr "Ne pas utiliser l'IHM, afficher une fenêtre simple"
-
-#: src/main.cpp:440
-msgid "Append all log messages to the given file"
-msgstr "Ajouter le journal au fichier précisé"
-
-#: src/main.cpp:441
-msgid "Set log level (debug/info/warning/error/quiet)"
-msgstr "Niveau de détail du journal (debug/info/warning/error/quiet)"
-
-#: src/main.cpp:442
-msgid "Print a list of known audio devices and exit"
-msgstr "Affiche une liste des périphériques audio et quitte"
-
-#: src/main.cpp:443
-msgid "Use audio device number N (N=0 is the default)"
-msgstr "Utiliser le périphérique audio N (N=0 par défaut)"
-
-#: src/main.cpp:444
-msgid "Delay audio by D milliseconds (default 0)"
-msgstr "Retarder l'audio de D millisecondes (0 par défaut)"
-
-#: src/main.cpp:445
-msgid "Set audio volume (0 to 1, default 1)"
-msgstr "Volume audio (de 0 à 1, 1 par défaut)"
-
-#: src/main.cpp:446
-msgid "Mute audio"
-msgstr "Mode silencieux"
-
-#: src/main.cpp:447
-msgid "Type of input device: default, firewire, x11"
-msgstr "Type de périphérique d'entrée: default, firewire, x11"
-
-#: src/main.cpp:448
-msgid "Request frame size WxH from input device"
-msgstr "Demande la résolution WxH au périphérique d'entrée"
-
-#: src/main.cpp:449
-msgid "Request frame rate N/D from input device"
-msgstr "Demande le taux de rafraichissement N/D au périphérique d'entrée"
-
-#: src/main.cpp:450
-msgid "Request device format 'default' or 'mjpeg'"
-msgstr "Format demandé au périphérique: 'default' ou 'mjpeg'"
-
-#: src/main.cpp:451
-msgid "Read commands from a file"
-msgstr "Lire les commandes depuis un fichier"
-
-#: src/main.cpp:452
-msgid "Use the given LIRC configuration file"
-msgstr "Utilise le fichier de configuration LIRC donné"
-
-#: src/main.cpp:453
-msgid "This option can be used more than once"
-msgstr "Cette option peut être utilisée plusieurs fois"
-
-#: src/main.cpp:454
-msgid "Output quality (0=fastest to 4=best/default)"
-msgstr "Qualité de rendu, de 0=rapide à 4=meilleure (4 par défaut)"
-
-#: src/main.cpp:455
-msgid "Select video stream (1-n, depending on input)"
-msgstr "Sélectionner le flux vidéo (1-n, selon l'entrée)"
-
-#: src/main.cpp:456
-msgid "Select audio stream (1-n, depending on input)"
-msgstr "Sélectionner le flux audio (1-n, selon l'entrée)"
-
-#: src/main.cpp:457
-msgid "Select subtitle stream (0-n, dep. on input)"
-msgstr "Sélectionner le flux de sous-titres (0-n, selon l'entrée)"
-
-#: src/main.cpp:458
-msgid "Select input type (default autodetect):"
-msgstr "Sélectionner le type d'entrée (auto-détection par défaut) :"
-
-#: src/main.cpp:474
-msgid "Select output type:"
-msgstr "Sélectionner le type de sortie :"
+msgstr "Lunettes rouge/vert, monochrome"
+
+#: src/main.cpp:500
+msgid "Red/blue glasses, monochrome"
+msgstr "Lunettes rouge/bleu, monochrome"
 
 #: src/main.cpp:501
 msgid "Multi-display via Equalizer (2D setup)"
@@ -1555,6 +679,10 @@
 msgstr "Contrôle interactif :"
 
 #: src/main.cpp:534
+msgid "ESC"
+msgstr "Échap"
+
+#: src/main.cpp:534
 msgid "Leave fullscreen mode, or quit"
 msgstr "Sortir du mode plein écran ou quitter"
 
@@ -1562,6 +690,102 @@
 msgid "Quit"
 msgstr "Quitter"
 
+#: src/main.cpp:536
+msgid "SPACE"
+msgstr "Espace"
+
+#: src/main.cpp:536
+msgid "Pause / unpause"
+msgstr "Pause / lecture"
+
+#: src/main.cpp:537
+msgid "Toggle fullscreen"
+msgstr "Basculer en plein écran"
+
+#: src/main.cpp:538
+msgid "Center window"
+msgstr "Centrer la fenêtre"
+
+#: src/main.cpp:539
+msgid "Swap left/right eye"
+msgstr "Échanger gauche/droite"
+
+#: src/main.cpp:540
+msgid "Cycle through available video streams"
+msgstr "Changer de flux vidéo"
+
+#: src/main.cpp:541
+msgid "Cycle through available audio streams"
+msgstr "Changer de flux audio"
+
+#: src/main.cpp:542
+msgid "Cycle through available subtitle streams"
+msgstr "Changer de flux de sous-titres"
+
+#: src/main.cpp:543
+msgid "Adjust contrast"
+msgstr "Régler le contraste"
+
+#: src/main.cpp:544
+msgid "Adjust brightness"
+msgstr "Régler la luminosité"
+
+#: src/main.cpp:545
+msgid "Adjust hue"
+msgstr "Régler la teinte"
+
+#: src/main.cpp:546
+msgid "Adjust saturation"
+msgstr "Régler la saturation"
+
+#: src/main.cpp:547
+msgid "Adjust parallax"
+msgstr "Régler la parallaxe"
+
+#: src/main.cpp:548
+msgid "Adjust ghostbusting"
+msgstr "Régler le ghostbusting"
+
+#: src/main.cpp:549
+msgid "Adjust zoom for wide videos"
+msgstr "Régler le zoom pour les vidéos larges"
+
+#: src/main.cpp:550
+msgid "Adjust audio volume"
+msgstr "Régler le volume audio"
+
+#: src/main.cpp:551
+msgid "Toggle audio mute"
+msgstr "Basculer mode silencieux"
+
+#: src/main.cpp:552
+msgid "Step a single video frame forward"
+msgstr "Avancer d'une image"
+
+#: src/main.cpp:553
+msgid "left, right"
+msgstr "gauche, droite"
+
+#: src/main.cpp:553
+msgid "Seek 10 seconds backward / forward"
+msgstr "Avancer / reculer de 10 secondes"
+
+#: src/main.cpp:554
+msgid "down, up"
+msgstr "bas, haut"
+
+#: src/main.cpp:554
+msgid "Seek 1 minute backward / forward"
+msgstr "Avancer / reculer d'une minute"
+
+#: src/main.cpp:555
+msgid "page down, page up"
+msgstr "page prec., page suiv."
+
+#: src/main.cpp:555
+msgid "Seek 10 minutes backward / forward"
+msgstr "Avancer / reculer de 10 minutes"
+
 #: src/main.cpp:556
 msgid "Mouse click"
 msgstr "Clic souris"
@@ -1570,20 +794,28 @@
 msgid "Seek according to horizontal click position"
 msgstr "Aller à la position définie par l'abscisse du clic"
 
-#: src/main.cpp:626
+#: src/main.cpp:557
+msgid "Media keys"
+msgstr "Touches multimédia"
+
+#: src/main.cpp:557
+msgid "Media keys should work as expected"
+msgstr "Les touches multimédia devraient fonctionner comme on s'y attend"
+
+#: src/main.cpp:627
 msgid "No audio devices known."
 msgstr "Pas de périphérique audio connu."
 
-#: src/main.cpp:641
+#: src/main.cpp:642
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Mode banc d'essai: audio et synchronisation temporelle désactivés."
 
-#: src/main.cpp:655
+#: src/main.cpp:656
 #, c-format
 msgid "Unknown mode %s."
 msgstr "Mode %s inconnu."
 
-#: src/main.cpp:787
+#: src/main.cpp:788
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Cette version de Bino a été compilée sans le support LIRC."
 
@@ -1599,6 +831,10 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d ch., %g kHz, %d bit"
 
+#: src/media_input.cpp:276
+msgid "Input:"
+msgstr "Entrée :"
+
 #: src/media_input.cpp:281
 #, c-format
 msgid "Video %s: %s"
@@ -1657,6 +893,14 @@
 msgid "No support available for %s device."
 msgstr "Périphérique %s non supporté."
 
+#: src/media_object.cpp:831
+msgid "Firewire"
+msgstr "Firewire"
+
+#: src/media_object.cpp:832
+msgid "X11"
+msgstr "X11"
+
 #: src/media_object.cpp:833
 msgid "default"
 msgstr "par défaut"
@@ -1864,6 +1108,12 @@
 msgid "Cannot create a PBO buffer."
 msgstr "Impossuble de créer un buffer PBO."
 
+#: src/video_output_qt.cpp:291 src/video_output_qt.cpp:534
+#: src/video_output_qt.cpp:731 src/video_output_qt.cpp:743
+#: src/video_output_qt.cpp:764
+msgid "Error"
+msgstr "Erreur"
+
 #: src/video_output_qt.cpp:636
 #, c-format
 msgid "Cannot initialize GLEW: %s"
@@ -1898,5 +1148,570 @@
 msgid "Cannot resume screensaver."
 msgstr "Impossible de rétablir l'économiseur d'écran."
 
+#~ msgid "Video:"
+#~ msgstr "Vidéo :"
+
+#~ msgid "Select the video stream."
+#~ msgstr "Choisir le flux vidéo."
+
+#~ msgid "Audio:"
+#~ msgstr "Audio :"
+
+#~ msgid "Select the audio stream."
+#~ msgstr "Choisir le flux audio."
+
+#~ msgid "Subtitle:"
+#~ msgstr "Sous-titres :"
+
+#~ msgid "Select the subtitle stream."
+#~ msgstr "Choisir le flux de sous-titres."
+
+#~ msgid "Set the 3D layout of the video stream."
+#~ msgstr "Choisir la disposition 3D du flux vidéo"
+
+#~ msgid "Output:"
+#~ msgstr "Sortie :"
+
+#~ msgid "Set the 3D output type for your display."
+#~ msgstr "Choisir le type de sortie 3D pour votre affichage."
+
+#~ msgid "Swap left/right"
+#~ msgstr "Echanger gauche/droite"
+
+#~ msgid ""
+#~ "Swap the left and right view. Use this if the 3D effect seems wrong.</"
+#~ "p>"
+#~ msgstr ""
+#~ "Echanger les vues droite et gauche. À utiliser si l'effet 3D parait "
+#~ "étrange."
+
+#~ msgid "Off"
+#~ msgstr "Non"
+
+#~ msgid ""
+#~ "This slider shows the progress during video playback, and can be used "
+#~ "to seek in the video."
+#~ msgstr ""
+#~ "Ce curseur montre la progression de la lecture vidéo, et peut être "
+#~ "utiliser pour naviguer dans la vidéo"
+
+#~ msgid "Elapsed / total time."
+#~ msgstr "Temps écoulé/total."
+
+#~ msgid "Toggle audio mute."
+#~ msgstr "Basculer le mode silencieux."
+
+#~ msgid "Adjust audio volume."
+#~ msgstr "Ajuster le volume audio."
+
+#~ msgid "Play."
+#~ msgstr "Lecture."
+
+#~ msgid "Pause."
+#~ msgstr "Pause."
+
+#~ msgid "Stop."
+#~ msgstr "Stop."
+
+#~ msgid "Toggle loop mode."
+#~ msgstr "Basculer le mode lecture en boucle."
+
+#~ msgid ""
+#~ "Switch to fullscreen mode. You can leave fullscreen mode by pressing "
+#~ "the f key."
+#~ msgstr ""
+#~ "Passer en mode plein écran. Vous pouvez quitter le mode plein écran "
+#~ "avec la touche f ou ESC."
+
+#~ msgid "Center the video area on your screen."
+#~ msgstr "Centrer la vidéo sur l'écran."
+
+#~ msgid "Seek backward 10 minutes."
+#~ msgstr "Aller 10 minutes en arrière."
+
+#~ msgid "Seek backward 1 minute."
+#~ msgstr "Aller 1 minute en arrière."
+
+#~ msgid "Seek backward 10 seconds."
+#~ msgstr "Aller 10 secondes en arrière."
+
+#~ msgid "Seek forward 10 seconds."
+#~ msgstr "Aller 10 secondes en avant."
+
+#~ msgid "Seek forward 1 minute."
+#~ msgstr "Aller 1 minute en avant."
+
+#~ msgid "Seek forward 10 minutes."
+#~ msgstr "Aller 10 minutes en avant."
+
+#~ msgid "Fullscreen/Multiscreen Settings"
+#~ msgstr "Réglages plein écran/multi-écrans"
+
+#~ msgid "Configure fullscreen mode:"
+#~ msgstr "Configuration du mode plein écran :"
+
+#~ msgid "Select the screens to use in fullscreen mode."
+#~ msgstr "Choisir les écrans à utiliser pour le mode plein écran."
+
+#~ msgid "Single screen:"
+#~ msgstr "Écran unique :"
+
+#~ msgid "Use a single screen for fullscreen mode."
+#~ msgstr "Utiliser un seul écran pour le mode plein écran."
+
+#~ msgid "Primary screen"
+#~ msgstr "Écran primaire"
+
+#~ msgid "Screen %d"
+#~ msgstr "Écran %d"
+
+#~ msgid "Dual screen:"
+#~ msgstr "Double écran :"
+
+#~ msgid "Use two screens for fullscreen mode."
+#~ msgstr "Utiliser deux écrans pour le mode plein écran."
+
+#~ msgid "Multi screen:"
+#~ msgstr "Plein écran :"
+
+#~ msgid "Use multiple screens for fullscreen mode."
+#~ msgstr "Utiliser plusieurs écrans pour le mode plein écran"
+
+#~ msgid "Comma-separated list of screens to use for fullscreen mode."
+#~ msgstr ""
+#~ "Liste d'écrans à utiliser pour le mode plein écran, séparés par des "
+#~ "virgules."
+
+#~ msgid "When in fullscreen mode,"
+#~ msgstr "En mode plein écran,"
+
+#~ msgid "Set special left/right view handling for fullscreen mode."
+#~ msgstr ""
+#~ "Réglages spéciaux pour les vues droite et gauche en plein écran."
+
+#~ msgid "flip left view vertically."
+#~ msgstr "flip vertical de la vue gauche"
+
+#~ msgid "flop left view horizontally."
+#~ msgstr "flip horizontal de la vue gauche"
+
+#~ msgid "flip right view vertically."
+#~ msgstr "flip vertical de la vue droite"
+
+#~ msgid "flop right view horizontally."
+#~ msgstr "flop horizontal de la vue droite"
+
+#~ msgid "use DLP(R) 3-D Ready Sync"
+#~ msgstr "utiliser synchronisation DLP® 3-D Ready"
+
+#~ msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
+#~ msgstr ""
+#~ "Utiliser la synchronisation DLP&reg; 3-D Ready pour les modes qui le "
+#~ "supportent."
+
+#~ msgid "inhibit the screensaver"
+#~ msgstr "Désactiver l'économiseur d'écran"
+
+#~ msgid "Inhibit the screensaver during fullscreen playback."
+#~ msgstr "Désactiver l'économiseur d'écran en lecture plein écran."
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Display Color Adjustments"
+#~ msgstr "Réglages des couleurs d'affichage"
+
+#~ msgid "Contrast:"
+#~ msgstr "Contraste :"
+
+#~ msgid "Brightness:"
+#~ msgstr "Luminosité :"
+
+#~ msgid "Hue:"
+#~ msgstr "Teinte :"
+
+#~ msgid "Saturation:"
+#~ msgstr "Saturation :"
+
+#~ msgid "Display Crosstalk Calibration"
+#~ msgstr "Calibrage du crosstalk d'affichage"
+
+#~ msgid ""
+#~ "Please read the manual to find out how to measure the crosstalk "
+#~ "levels of your display."
+#~ msgstr ""
+#~ "Le manuel explique comment mesurer le niveau de crosstalk de "
+#~ "votre affichage."
+
+#~ msgid "Red:"
+#~ msgstr "Rouge :"
+
+#~ msgid "Green:"
+#~ msgstr "Vert :"
+
+#~ msgid "Blue:"
+#~ msgstr "Bleu :"
+
+#~ msgid "Rendering Quality Adjustments"
+#~ msgstr "Réglages de la qualité de rendu"
+
+#~ msgid "Rendering Quality:"
+#~ msgstr "Qualité de rendu :"
+
+#~ msgid "Zoom for wide videos"
+#~ msgstr "Zoom pour les vidéos larges"
+
+#~ msgid ""
+#~ "Set zoom level for videos that are wider than the screen: 0: "
+#~ "Show full video width. 1: Use full screen height."
+#~ msgstr ""
+#~ "Réglage du zoom pour les vidéos qui sont plus larges que l'écran :"
+#~ " 0 : Pleine largeur. 1 : Pleine hauteur."
+
+#~ msgid "Zoom:"
+#~ msgstr "Zoom :"
+
+#~ msgid "Set the zoom level for videos that are wider than the screen."
+#~ msgstr "Niveau de zoom pour les vidéos plus larges que l'écran."
+
+#~ msgid "Audio Settings"
+#~ msgstr "Réglages audio"
+
+#~ msgid "Audio device:"
+#~ msgstr "Périphérique audio :"
+
+#~ msgid ""
+#~ "Select the audio device. This will take effect for the next started "
+#~ "video."
+#~ msgstr ""
+#~ "Choix du périphérique audio. Ceci prendra effet à la prochaine "
+#~ "lecture vidéo."
+
+#~ msgid "Default"
+#~ msgstr "Par défaut"
+
+#~ msgid "Audio delay (ms):"
+#~ msgstr "Retard audio (ms) :"
+
+#~ msgid ""
+#~ "Set an audio delay, in milliseconds. This is useful if audio and "
+#~ "video are not in sync."
+#~ msgstr ""
+#~ "Retard de la piste audio, en millisecondes. Ceci est utile si audio "
+#~ "et vidéo sont désynchronisés."
+
+#~ msgid "Subtitle Settings"
+#~ msgstr "Réglages des sous-titres"
+
+#~ msgid ""
+#~ "These settings apply only to soft subtitles, not to bitmaps. Some "
+#~ "changes require a restart of the video to take effect."
+#~ msgstr ""
+#~ "Ces réglages s'appliquent aux sous-titres textuels, pas aux bitmaps."
+#~ " Certains changements nécessitent de redémarrer la vidéo pour prendre "
+#~ "effet."
+
+#~ msgid "Encoding:"
+#~ msgstr "Encodage :"
+
+#~ msgid "Set the subtitle character set encoding."
+#~ msgstr "Choisir l'encodage du jeux de caractères des sous-titres."
+
+#~ msgid "Override font:"
+#~ msgstr "Police de caractères :"
+
+#~ msgid "Override the subtitle font family."
+#~ msgstr "Force la police de caractères utilisée pour les sous-titres."
+
+#~ msgid "Override font size:"
+#~ msgstr "Taille de police :"
+
+#~ msgid "Override the subtitle font size."
+#~ msgstr "Force la taille de la police des sous-titres."
+
+#~ msgid "Override scale factor:"
+#~ msgstr "Facteur d'échelle :"
+
+#~ msgid "Override the subtitle scale factor."
+#~ msgstr "Force le facteur d'échelle des sous-titres."
+
+#~ msgid "Override color:"
+#~ msgstr "Couleur :"
+
+#~ msgid "Override the subtitle color."
+#~ msgstr "Force la couleur des sous-titres."
+
+#~ msgid "Override shadow:"
+#~ msgstr "Force l'ombre :"
+
+#~ msgid "Override the subtitle shadow."
+#~ msgstr "Force l'ombre des sous-titres."
+
+#~ msgid "On"
+#~ msgstr "Oui"
+
+#~ msgid "Video Settings"
+#~ msgstr "Réglages vidéo"
+
+#~ msgid "Crop to aspect ratio:"
+#~ msgstr "Retailler au facteur d'aspect :"
+
+#~ msgid ""
+#~ "Set the real aspect ratio of the video, so that borders can be cropped."
+#~ ""
+#~ msgstr ""
+#~ "Choix du véritable facteur d'aspect de la vidéo, pour retailler les "
+#~ "bords noirs."
+
+#~ msgid "Do not crop"
+#~ msgstr "Ne pas retailler"
+
+#~ msgid "Parallax:"
+#~ msgstr "Parallaxe :"
+
+#~ msgid ""
+#~ "Adjust parallax, from -1 to +1. This changes the separation of left "
+#~ "and right view, and thus the perceived distance of the scene."
+#~ msgstr ""
+#~ "Ajuster la parallaxe, de -1 à 1. Ceci change la séparation des vues "
+#~ "gauche et droite, et donc la distance perçue de la scène."
+
+#~ msgid "Subtitle parallax:"
+#~ msgstr "Parallaxe des sous-titres :"
+
+#~ msgid ""
+#~ "Adjust subtitle parallax, from -1 to +1. This changes the perceived "
+#~ "distance of the subtitles."
+#~ msgstr ""
+#~ "Ajuster la parallaxe des sous-titres, de -1 à 1. Ceci change la "
+#~ "distance perçue des sous-titres."
+
+#~ msgid "Ghostbusting:"
+#~ msgstr "Ghostbusting :"
+
+#~ msgid ""
+#~ "Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+#~ "the crosstalk levels of your display first. Note that crosstalk "
+#~ "ghostbusting does not work with anaglyph glasses."
+#~ msgstr ""
+#~ "Choisir le niveau de ghostbusting (élimination du crosstalk), de 0 à "
+#~ "1. Vous devez régler le niveau de crosstalk de votre affichage d'abord. "
+#~ "Le ghostbusting ne fonctionne pas avec les lunettes anaglyphes."
+
+#~ msgid "SDI Output Settings"
+#~ msgstr "Réglages de la sortie SDI"
+
+#~ msgid "SDI Output Format:"
+#~ msgstr "Format de sortie SDI :"
+
+#~ msgid "Select output format used for SDI output."
+#~ msgstr "Choisir le format de sortie SDI."
+
+#~ msgid "Left stereo mode:"
+#~ msgstr "Mode stéréo gauche :"
+
+#~ msgid "Select stereo mode used for left SDI output."
+#~ msgstr "Choisir le mode stéréo pour la sortie SDI gauche."
+
+#~ msgid "Right stereo mode:"
+#~ msgstr "Mode stéréo droit :"
+
+#~ msgid "Select stereo mode used for right SDI output."
+#~ msgstr "Choisir le mode stéréo utilisé pour la sortie SDI droite."
+
+#~ msgid "Open device(s)"
+#~ msgstr "Ouvrir le(s) périphérique(s)"
+
+#~ msgid "Choose a device type."
+#~ msgstr "Sélectionner un type de périphérique."
+
+#~ msgid "Choose a device."
+#~ msgstr "Sélectionner un périphérique"
+
+#~ msgid "Set the X11 device string. Refer to the manual for details."
+#~ msgstr ""
+#~ "Identifiant du périphérique X11. Voir le manuel pour les détails."
+
+#~ msgid "First device:"
+#~ msgstr "Premier périphérique :"
+
+#~ msgid "Second device:"
+#~ msgstr "Second périphérique :"
+
+#~ msgid "Request frame size"
+#~ msgstr "Résolution demandée"
+
+#~ msgid ""
+#~ "Request a specific frame size from the device, e.g. 640x480. The "
+#~ "device must support this frame size. Some devices require a frame size to "
+#~ "be selected."
+#~ msgstr ""
+#~ "Demande une résolution spécifique au périphérique, par ex. 640x480. Le "
+#~ "périphérique doit supporter cette résolution. Certains périphériques "
+#~ "exigent de sélectionner une résolution."
+
+#~ msgid "Request frame rate"
+#~ msgstr "Taux de rafraichissement demandé"
+
+#~ msgid ""
+#~ "Request a specific frame rate from the device, e.g. 25/1. The device "
+#~ "must support this frame rate. Some devices require a frame rate to be "
+#~ "selected."
+#~ msgstr ""
+#~ "Demander un taux de rafraichissement au périphérique, par ex. 25/1. Le "
+#~ "périphérique doit supporter ce taux de rafraichissement. Certains "
+#~ "périphériques exigent de sélectionner un taux de rafraichissement."
+
+#~ msgid "Request MJPEG format"
+#~ msgstr "Demander le format MJPEG"
+
+#~ msgid ""
+#~ "Request MJPEG data from the input device. The device may ignore this "
+#~ "request."
+#~ msgstr ""
+#~ "Demander des données MJPEG au périphérique. Le périphérique peut "
+#~ "ignorer cette requête."
+
+#~ msgid "Cancel"
+#~ msgstr "Annuler"
+
+#~ msgid "&File"
+#~ msgstr "&Fichier"
+
+#~ msgid "&Open file(s)..."
+#~ msgstr "&Ouvrir le(s) fichier(s)..."
+
+#~ msgid "Open &URL(s)..."
+#~ msgstr "Ouvrir le(s) &URL(s)..."
+
+#~ msgid "Open &device(s)..."
+#~ msgstr "Ouvrir le(s) périphérique(s)..."
+
+#~ msgid "&Clear recent files"
+#~ msgstr "Effacer les éléments récents"
+
+#~ msgid "&Quit"
+#~ msgstr "&Quitter"
+
+#~ msgid "&Preferences"
+#~ msgstr "&Préférences"
+
+#~ msgid "&Fullscreen Settings..."
+#~ msgstr "Réglages du mode &plein écran..."
+
+#~ msgid "Display &Color Adjustments..."
+#~ msgstr "Réglage des &couleurs de l'affichage..."
+
+#~ msgid "Display Cross&talk Calibration..."
+#~ msgstr "Calibrage du cross&talk de l'affichage..."
+
+#~ msgid "Quality Adjustments..."
+#~ msgstr "Réglage de qualité de rendu..."
+
+#~ msgid "&Zoom for wide videos..."
+#~ msgstr "&Zoom pour les vidéos larges..."
+
+#~ msgid "&Audio Settings..."
+#~ msgstr "Réglages &audio..."
+
+#~ msgid "&Subtitle Settings..."
+#~ msgstr "Réglage des &sous-titres..."
+
+#~ msgid "Current &Video Settings..."
+#~ msgstr "Réglages &vidéo..."
+
+#~ msgid "SDI &Output Settings..."
+#~ msgstr "Réglages de sortie SDI..."
+
+#~ msgid "&Help"
+#~ msgstr "Aide"
+
+#~ msgid "&Manual..."
+#~ msgstr "&Manuel..."
+
+#~ msgid "&Website..."
+#~ msgstr "Site &web..."
+
+#~ msgid "&Keyboard Shortcuts"
+#~ msgstr "Raccourcis clavier"
+
+#~ msgid "&About"
+#~ msgstr "&À propos"
+
+#~ msgid "Tip"
+#~ msgstr "Astuce"
+
+#~ msgid ""
+#~ "You can select and open multiple files at once.This is useful "
+#~ "for example if you have extra subtitle files, or if left and right "
+#~ "view are stored in separate files."
+#~ msgstr ""
+#~ "Vous pouvez sélectionner plusieurs fichiers en même temps.C'est "
+#~ "utile par exemple si vous avez des fichiers de sous-titres externes, "
+#~ "ou si les vues droite et gauche sont dans des fichiers séparés."
+
+#~ msgid "Do not show this message again."
+#~ msgstr "Ne plus montrer ce message"
+
+#~ msgid "Open files"
+#~ msgstr "Ouvrir des fichiers"
+
+#~ msgid "Open URL(s)"
+#~ msgstr "Ouvrir URL(s)"
+
+#~ msgid "URL(s):"
+#~ msgstr "URL(s) :"
+
+#~ msgid "Enter one or more space separated URLs."
+#~ msgstr "Entrez un ou plusieurs URLs séparés par des espaces."
+
+#~ msgid "Cannot open manual."
+#~ msgstr "Impossible d'ouvrir le manuel."
+
+#~ msgid "Cannot open website."
+#~ msgstr "Impossible d'ouvrir le site web."
+
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Raccourcis clavier"
+
+#~ msgid "Keyboard control:"
+#~ msgstr "Raccourcis clavier:"
+
+#~ msgid "Stop"
+#~ msgstr "Stop"
+
+#~ msgid "About %s"
+#~ msgstr "À propos de %s"
+
+#~ msgid "The %s 3D video player"
+#~ msgstr "Le lecteur vidéo 3D %s"
+
+#~ msgid ""
+#~ "%s version %s.Copyright (C) 2014 the Bino developers.</"
+#~ "p>This is free software. You may redistribute copies of it under the "
+#~ "terms of the <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General "
+#~ "Public License</a>. There is NO WARRANTY, to the extent permitted by law."
+#~ "See <a href=\"%s\">%s</a> for more information on this software.</"
+#~ "p>"
+#~ msgstr ""
+#~ "%s version %s.Copyright (C) 2014 les développeurs Bino.</"
+#~ "p>Ceci est un logiciel libre. Vous pouvez en distribuer des copies "
+#~ "sous les termes de la <a href=\"http://www.gnu.org/licenses/gpl.html"
+#~ "\">GNU General Public License</a>. Il n'y a AUCUNE GARANTIE, dans les "
+#~ "limites autorisées par la loi.Voir <a href=\"%s\">%s</a> pour plus "
+#~ "d'informations sur ce logiciel."
+
+#~ msgid "About"
+#~ msgstr "À propos"
+
+#~ msgid "Libraries"
+#~ msgstr "Bibliothèques"
+
+#~ msgid "Team"
+#~ msgstr "Équipe"
+
+#~ msgid "License"
+#~ msgstr "Licence"
+
 #~ msgid "Need at least OpenGL 2.1."
 #~ msgstr "OpenGL 2.1 minimum requis."

bino-1.6.1.tar.xz/po/ru.gmo -> bino-1.6.5.tar.xz/po/ru.gmo Changed

bino-1.6.1.tar.xz/po/ru.po -> bino-1.6.5.tar.xz/po/ru.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2014-10-13 13:20+0200\n"
+"POT-Creation-Date: 2016-12-16 09:10+0100\n"
 "PO-Revision-Date: 2014-09-22 00:59+0600\n"
 "Last-Translator: Alexey Osipov <public@alexey.osipov.name>\n"
 "Language-Team: \n"
@@ -88,31 +88,31 @@
 msgid "Too many arguments."
 msgstr "Слишком много параметров."
 
-#: src/base/str.cpp:269
+#: src/base/str.cpp:459
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Невозможно преобразовать строку в %s."
 
-#: src/base/str.cpp:517 src/base/str.cpp:536 src/base/str.cpp:547
-#: src/base/str.cpp:559
+#: src/base/str.cpp:993 src/base/str.cpp:1012 src/base/str.cpp:1023
+#: src/base/str.cpp:1035
 #, c-format
 msgid "Cannot convert %s to %s: %s"
 msgstr "Невозможно преобразовать %s в %s: %s"
 
-#: src/base/str.cpp:565
+#: src/base/str.cpp:1041
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Невозможно преобразовать %s в %s."
 
-#: src/base/thread.cpp:38 src/base/thread.cpp:48 src/base/thread.cpp:61
-#: src/base/thread.cpp:74 src/base/thread.cpp:85 src/base/thread.cpp:95
-#: src/base/thread.cpp:108 src/base/thread.cpp:116 src/base/thread.cpp:124
-#: src/base/thread.cpp:204 src/base/thread.cpp:211 src/base/thread.cpp:225
-#: src/base/thread.cpp:245
+#: src/base/pth.cpp:38 src/base/pth.cpp:48 src/base/pth.cpp:61
+#: src/base/pth.cpp:74 src/base/pth.cpp:85 src/base/pth.cpp:95
+#: src/base/pth.cpp:108 src/base/pth.cpp:116 src/base/pth.cpp:124
+#: src/base/pth.cpp:204 src/base/pth.cpp:211 src/base/pth.cpp:225
+#: src/base/pth.cpp:245
 msgid "System function failed: "
 msgstr "Отказ системной функции:"
 
-#: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
+#: src/base/tmr.cpp:63 src/base/tmr.cpp:72 src/base/tmr.cpp:81
 msgid "Cannot get time."
 msgstr "Невозможно получить время."
 
@@ -236,1039 +236,10 @@
 msgid "Subtitle stream %d not found."
 msgstr "Дорожка субтитров %d не найдена."
 
-#: src/dispatch.cpp:559 src/main.cpp:795
+#: src/dispatch.cpp:559 src/main.cpp:796
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Эта версия Bino была собрана без поддержки Equalizer."
 
-#: src/gui.cpp:111
-msgid "Video:"
-msgstr "Видео:"
-
-#: src/gui.cpp:112
-msgid "Select the video stream."
-msgstr "Выберите видео дорожку."
-
-#: src/gui.cpp:118
-msgid "Audio:"
-msgstr "Аудио:"
-
-#: src/gui.cpp:119
-msgid "Select the audio stream."
-msgstr "Выберите аудио дорожку."
-
-#: src/gui.cpp:125
-msgid "Subtitle:"
-msgstr "Субтитры:"
-
-#: src/gui.cpp:126
-msgid "Select the subtitle stream."
-msgstr "Выберите дорожку субтитров."
-
-#: src/gui.cpp:137 src/media_input.cpp:276
-msgid "Input:"
-msgstr "Источник:"
-
-#: src/gui.cpp:138
-msgid "Set the 3D layout of the video stream."
-msgstr "Укажите 3D раскладку исходного видеофайла."
-
-#: src/gui.cpp:142 src/main.cpp:459
-msgid "2D"
-msgstr "2D"
-
-#: src/gui.cpp:143 src/main.cpp:460
-msgid "Separate streams, left first"
-msgstr "Отдельные видеофайлы, сначала левый"
-
-#: src/gui.cpp:144 src/main.cpp:461
-msgid "Separate streams, right first"
-msgstr "Отдельные видеофайлы, сначала правый"
-
-#: src/gui.cpp:145 src/main.cpp:462
-msgid "Alternating, left first"
-msgstr "Чередование кадров, сначала левый"
-
-#: src/gui.cpp:146 src/main.cpp:463
-msgid "Alternating, right first"
-msgstr "Чередование кадров, сначала правый"
-
-#: 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: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:149 src/main.cpp:466
-msgid "Bottom/top"
-msgstr "Снизу/сверху"
-
-#: src/gui.cpp:150 src/main.cpp:467
-msgid "Bottom/top, half height"
-msgstr "Снизу/сверху, в половину высоты"
-
-#: 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:152 src/gui.cpp:174 src/gui.cpp:2215 src/gui.cpp:2244
-#: src/main.cpp:469 src/main.cpp:482
-msgid "Left/right, half width"
-msgstr "Слева/справа, в половину ширины"
-
-#: src/gui.cpp:153 src/main.cpp:470
-msgid "Right/left"
-msgstr "Справа/слева"
-
-#: src/gui.cpp:154 src/main.cpp:471
-msgid "Right/left, half width"
-msgstr "Справа/слева, в половину ширины"
-
-#: src/gui.cpp:155 src/gui.cpp:175 src/gui.cpp:2216 src/gui.cpp:2245
-#: src/main.cpp:472 src/main.cpp:483
-msgid "Even/odd rows"
-msgstr "Четные/нечетные ряды"
-
-#: src/gui.cpp:156 src/main.cpp:473
-msgid "Odd/even rows"
-msgstr "Нечетные/четные ряды"
-
-#: src/gui.cpp:162
-msgid "Output:"
-msgstr "Режим:"
-
-#: src/gui.cpp:163
-msgid "Set the 3D output type for your display."
-msgstr "Укажите 3D режим для вашего дисплея."
-
-#: src/gui.cpp:167 src/gui.cpp:2210 src/gui.cpp:2239 src/main.cpp:477
-msgid "Left view"
-msgstr "Левый видеоряд"
-
-#: src/gui.cpp:168 src/gui.cpp:2211 src/gui.cpp:2240 src/main.cpp:478
-msgid "Right view"
-msgstr "Правый видеоряд"
-
-#: src/gui.cpp:169 src/main.cpp:475
-msgid "OpenGL stereo"
-msgstr "Стерео OpenGL"
-
-#: src/gui.cpp:170 src/main.cpp:476
-msgid "Left/right alternating"
-msgstr "Чередование кадров (левый/правый)"
-
-#: src/gui.cpp:176 src/gui.cpp:2217 src/gui.cpp:2246 src/main.cpp:484
-msgid "Even/odd columns"
-msgstr "Четные/нечетные столбцы"
-
-#: src/gui.cpp:177 src/gui.cpp:2218 src/gui.cpp:2247 src/main.cpp:485
-msgid "Checkerboard pattern"
-msgstr "В шахматном порядке"
-
-#: src/gui.cpp:178 src/main.cpp:486
-msgid "HDMI frame packing mode"
-msgstr "Режим упаковки кадров HDMI"
-
-#: src/gui.cpp:179 src/gui.cpp:2219 src/gui.cpp:2248 src/main.cpp:487
-msgid "Red/cyan glasses, monochrome"
-msgstr "Красно-голубые очки, черно-белый режим"
-
-#: src/gui.cpp:180 src/gui.cpp:2220 src/gui.cpp:2249 src/main.cpp:488
-msgid "Red/cyan glasses, half color"
-msgstr "Красно-голубые очки, половина цветности"
-
-#: src/gui.cpp:181 src/gui.cpp:2221 src/gui.cpp:2250 src/main.cpp:489
-msgid "Red/cyan glasses, full color"
-msgstr "Красно-голубые очки, полноцветный режим"
-
-#: src/gui.cpp:182 src/gui.cpp:2222 src/gui.cpp:2251 src/main.cpp:490
-msgid "Red/cyan glasses, Dubois"
-msgstr "Красно-голубые очки, метод Дюбуа"
-
-#: src/gui.cpp:183 src/gui.cpp:2223 src/gui.cpp:2252 src/main.cpp:491
-msgid "Green/magenta glasses, monochrome"
-msgstr "Зелёно-пурпурные очки, черно-белый режим"
-
-#: src/gui.cpp:184 src/gui.cpp:2224 src/gui.cpp:2253 src/main.cpp:492
-msgid "Green/magenta glasses, half color"
-msgstr "Зелёно-пурпурные очки, половина цветности"
-
-#: src/gui.cpp:185 src/gui.cpp:2225 src/gui.cpp:2254 src/main.cpp:493
-msgid "Green/magenta glasses, full color"
-msgstr "Зелёно-пурпурные очки, полноцветный режим"
-
-#: src/gui.cpp:186 src/gui.cpp:2226 src/gui.cpp:2255 src/main.cpp:494
-msgid "Green/magenta glasses, Dubois"
-msgstr "Зелёно-пурпурные очки, метод Дюбуа"
-
-#: src/gui.cpp:187 src/gui.cpp:2227 src/gui.cpp:2256 src/main.cpp:495
-msgid "Amber/blue glasses, monochrome"
-msgstr "Янтарно-синие очки, черно-белый режим"
-
-#: src/gui.cpp:188 src/gui.cpp:2228 src/gui.cpp:2257 src/main.cpp:496
-msgid "Amber/blue glasses, half color"
-msgstr "Янтарно-синие очки, половина цветности"
-
-#: src/gui.cpp:189 src/gui.cpp:2229 src/gui.cpp:2258 src/main.cpp:497
-msgid "Amber/blue glasses, full color"
-msgstr "Янтарно-синие очки, полноцветный режим"
-
-#: src/gui.cpp:190 src/gui.cpp:2230 src/gui.cpp:2259 src/main.cpp:498
-msgid "Amber/blue glasses, Dubois"
-msgstr "Янтарно-синие очки, метод Дюбуа"
-
-#: src/gui.cpp:191 src/gui.cpp:2231 src/gui.cpp:2260 src/main.cpp:499
-msgid "Red/green glasses, monochrome"
-msgstr "Красно-зелёные очки, черно-белый режим"
-
-#: src/gui.cpp:192 src/gui.cpp:2232 src/gui.cpp:2261 src/main.cpp:500
-msgid "Red/blue glasses, monochrome"
-msgstr "Красно-синие очки, черно-белый режим"
-
-#: src/gui.cpp:196
-msgid "Swap left/right"
-msgstr "Наоборот"
-
-#: src/gui.cpp:197
-msgid ""
-"Swap the left and right view. Use this if the 3D effect seems wrong."
-msgstr ""
-"Поменять местами левый и правый видеоряды. Включите, если 3D эффект "
-"кажется неправильным."
-
-#: src/gui.cpp:475 src/gui.cpp:1736
-msgid "Off"
-msgstr "Выключено"
-
-#: src/gui.cpp:706
-msgid ""
-"This slider shows the progress during video playback, and can be used to "
-"seek in the video."
-msgstr ""
-"Этот ползунок показывает позицию воспроизведения и может быть использован "
-"для перемотки."
-
-#: src/gui.cpp:713
-msgid "Elapsed / total time."
-msgstr "Прошло / всего времени."
-
-#: src/gui.cpp:720
-msgid "Toggle audio mute."
-msgstr "Включить/выключить звук."
-
-#: src/gui.cpp:725
-msgid "Adjust audio volume."
-msgstr "Громкость."
-
-#: src/gui.cpp:737
-msgid "Play."
-msgstr "Воспроизведение."
-
-#: src/gui.cpp:741
-msgid "Pause."
-msgstr "Пауза."
-
-#: src/gui.cpp:745
-msgid "Stop."
-msgstr "Стоп."
-
-#: src/gui.cpp:750
-msgid "Toggle loop mode."
-msgstr "Включить/выключить режим повтора."
-
-#: src/gui.cpp:757
-msgid ""
-"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
-"f key."
-msgstr ""
-"Перейти в полноэкранный режим. Вы можете покинуть полноэкранный режим "
-"путем нажатия клавиши f."
-
-#: src/gui.cpp:763
-msgid "Center the video area on your screen."
-msgstr "Расположить видео по центру экрана."
-
-#: src/gui.cpp:770
-msgid "Seek backward 10 minutes."
-msgstr "Перемотать на 10 минут назад."
-
-#: src/gui.cpp:775
-msgid "Seek backward 1 minute."
-msgstr "Перемотать на 1 минуту назад."
-
-#: src/gui.cpp:781
-msgid "Seek backward 10 seconds."
-msgstr "Перемотать на 10 секунд назад."
-
-#: src/gui.cpp:787
-msgid "Seek forward 10 seconds."
-msgstr "Перемотать на 10 секунд вперед."
-
-#: src/gui.cpp:792
-msgid "Seek forward 1 minute."
-msgstr "Перемотать на 1 минуту вперед."
-
-#: src/gui.cpp:798
-msgid "Seek forward 10 minutes."
-msgstr "Перемотать на 10 минут вперед."
-
-#: src/gui.cpp:1059
-msgid "Fullscreen/Multiscreen Settings"
-msgstr "Полноэкранный и многоэкранный режим"
-
-#: src/gui.cpp:1061
-msgid "Configure fullscreen mode:"
-msgstr "Настройки полноэкранного режима:"
-
-#: src/gui.cpp:1062
-msgid "Select the screens to use in fullscreen mode."
-msgstr "Выберите экраны для полноэкранного режима."
-
-#: src/gui.cpp:1064
-msgid "Single screen:"
-msgstr "Один экран:"
-
-#: src/gui.cpp:1065
-msgid "Use a single screen for fullscreen mode."
-msgstr "Использовать один экран для полноэкранного режима."
-
-#: src/gui.cpp:1068
-msgid "Primary screen"
-msgstr "Главный экран"
-
-#: src/gui.cpp:1071 src/gui.cpp:1082 src/gui.cpp:1083
-#, c-format
-msgid "Screen %d"
-msgstr "Экран %d"
-
-#: src/gui.cpp:1074
-msgid "Dual screen:"
-msgstr "Два экрана:"
-
-#: src/gui.cpp:1075
-msgid "Use two screens for fullscreen mode."
-msgstr "Использовать два экрана для полноэкранного режима."
-
-#: src/gui.cpp:1087
-msgid "Multi screen:"
-msgstr "Много экранов:"
-
-#: src/gui.cpp:1088
-msgid "Use multiple screens for fullscreen mode."
-msgstr "Использовать много экранов для полноэкранного режима"
-
-#: src/gui.cpp:1090
-msgid "Comma-separated list of screens to use for fullscreen mode."
-msgstr "Список экранов для полноэкранного режима, разделенных запятыми."
-
-#: src/gui.cpp:1093
-msgid "When in fullscreen mode,"
-msgstr "Когда в полноэкранном режиме,"
-
-#: src/gui.cpp:1094
-msgid "Set special left/right view handling for fullscreen mode."
-msgstr ""
-"Включить специальную обработку левого и правого видеорядов в "
-"полноэкранном режиме."
-
-#: src/gui.cpp:1096
-msgid "flip left view vertically."
-msgstr "отразить левый видеоряд вертикально."
-
-#: src/gui.cpp:1098
-msgid "flop left view horizontally."
-msgstr "отразить левый видеоряд горизонтально."
-
-#: src/gui.cpp:1100
-msgid "flip right view vertically."
-msgstr "отразить правый видеоряд вертикально."
-
-#: src/gui.cpp:1102
-msgid "flop right view horizontally."
-msgstr "отразить правый видеоряд горизонтально."
-
-#: src/gui.cpp:1105
-msgid "use DLP(R) 3-D Ready Sync"
-msgstr "посылать сигнал DLP(R) 3-D Ready "
-
-#: src/gui.cpp:1106
-msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
-msgstr ""
-"Посылать сигнал синхронизации DLP&reg; 3-D Ready в подходящих "
-"видеорежимах."
-
-#: src/gui.cpp:1108
-msgid "inhibit the screensaver"
-msgstr "отключить хранитель экрана"
-
-#: src/gui.cpp:1109
-msgid "Inhibit the screensaver during fullscreen playback."
-msgstr "Отключить хранитель экрана во время полноэкранного просмотра."
-
-#: src/gui.cpp:1111 src/gui.cpp:1277 src/gui.cpp:1412 src/gui.cpp:1473
-#: src/gui.cpp:1538 src/gui.cpp:1616 src/gui.cpp:1740 src/gui.cpp:2025
-#: src/gui.cpp:2264 src/gui.cpp:2750 src/gui.cpp:3477 src/gui.cpp:3524
-#: src/gui.cpp:3841
-msgid "OK"
-msgstr "OK"
-
-#: src/gui.cpp:1230
-msgid "Display Color Adjustments"
-msgstr "Настройки цветности"
-
-#: src/gui.cpp:1232
-msgid "Contrast:"
-msgstr "Контрастность:"
-
-#: src/gui.cpp:1243
-msgid "Brightness:"
-msgstr "Яркость:"
-
-#: src/gui.cpp:1254
-msgid "Hue:"
-msgstr "Оттенок:"
-
-#: src/gui.cpp:1265
-msgid "Saturation:"
-msgstr "Насыщенность:"
-
-#: src/gui.cpp:1383
-msgid "Display Crosstalk Calibration"
-msgstr "Уровни перекрестных помех"
-
-#. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/gui.cpp:1386
-msgid ""
-"Please read the manual to find out how to measure the crosstalk "
-"levels of your display."
-msgstr ""
-"Пожалуйста прочтите инструкцию, чтобы узнать, как измерить "
-"уровень перекрестных помех."
-
-#: src/gui.cpp:1390
-msgid "Red:"
-msgstr "Красный:"
-
-#: src/gui.cpp:1397
-msgid "Green:"
-msgstr "Зеленый:"
-
-#: src/gui.cpp:1404
-msgid "Blue:"
-msgstr "Синий:"
-
-#: src/gui.cpp:1460
-msgid "Rendering Quality Adjustments"
-msgstr "Настройка качества изображения"
-
-#: src/gui.cpp:1462
-msgid "Rendering Quality:"
-msgstr "Качество изображения:"
-
-#: src/gui.cpp:1516
-msgid "Zoom for wide videos"
-msgstr "Масштаб для широкоэкранного видео"
-
-#: src/gui.cpp:1519
-msgid ""
-"Set zoom level for videos that are wider than the screen: 0: Show "
-"full video width. 1: Use full screen height."
-msgstr ""
-"Масштаб для видеозаписей, ширина которых превышает ширину экрана:"
-" 0: Показывать видео в полную ширину. 1: Использовать всю высоту "
-"экрана."
-
-#: src/gui.cpp:1523
-msgid "Zoom:"
-msgstr "Масштаб:"
-
-#: src/gui.cpp:1524
-msgid "Set the zoom level for videos that are wider than the screen."
-msgstr "Масштаб для видеозаписей, которые шире экрана."
-
-#: src/gui.cpp:1582
-msgid "Audio Settings"
-msgstr "Настройки звука"
-
-#: src/gui.cpp:1584
-msgid "Audio device:"
-msgstr "Устройство:"
-
-#: src/gui.cpp:1585
-msgid ""
-"Select the audio device. This will take effect for the next started "
-"video."
-msgstr ""
-"Выберите аудио устройство. Изменения вступят в силу при следующем "
-"воспроизведении."
-
-#: src/gui.cpp:1589 src/gui.cpp:2680
-msgid "Default"
-msgstr "По умолчанию"
-
-#: src/gui.cpp:1606
-msgid "Audio delay (ms):"
-msgstr "Задержка (мс):"
-
-#: src/gui.cpp:1607
-msgid ""
-"Set an audio delay, in milliseconds. This is useful if audio and video "
-"are not in sync."
-msgstr ""
-"Позволяет установить задержку воспроизведения аудио дорожки, в "
-"миллисекундах. Полезно, если аудио и видео дорожки не синхронизированы.</"
-"p>"
-
-#: src/gui.cpp:1664
-msgid "Subtitle Settings"
-msgstr "Настройки субтитров"
-
-#: src/gui.cpp:1667
-msgid ""
-"These settings apply only to soft subtitles, not to bitmaps. Some "
-"changes require a restart of the video to take effect."
-msgstr ""
-"Данные настройки применяются только для текстовых субтитров. Некоторые "
-"изменения вступят в силу только после перезапуска видео."
-
-#: src/gui.cpp:1670
-msgid "Encoding:"
-msgstr "Кодировка:"
-
-#: src/gui.cpp:1671
-msgid "Set the subtitle character set encoding."
-msgstr "Выберите кодировку символов в субтитрах."
-
-#: src/gui.cpp:1686
-msgid "Override font:"
-msgstr "Переопределить шрифт:"
-
-#: src/gui.cpp:1687
-msgid "Override the subtitle font family."
-msgstr "Переопределение шрифта субтитров, указанного в файле субтитров."
-
-#: src/gui.cpp:1696
-msgid "Override font size:"
-msgstr "Переопределить размер шрифта:"
-
-#: src/gui.cpp:1697
-msgid "Override the subtitle font size."
-msgstr ""
-"Переопределение размера шрифта субтитров, указанного в файле субтитров.</"
-"p>"
-
-#: src/gui.cpp:1707
-msgid "Override scale factor:"
-msgstr "Переопределить коэффициент масштаба:"
-
-#: src/gui.cpp:1708
-msgid "Override the subtitle scale factor."
-msgstr ""
-"Переопределение коэффициента масштаба субтитров, указанного в файле "
-"субтитров."
-
-#: src/gui.cpp:1719
-msgid "Override color:"
-msgstr "Переопределить цвет:"
-
-#: src/gui.cpp:1720
-msgid "Override the subtitle color."
-msgstr "Переопределение цвета субтитров, указанного в файле субтитров."
-
-#: src/gui.cpp:1729
-msgid "Override shadow:"
-msgstr "Переопределить тень:"
-
-#: src/gui.cpp:1730
-msgid "Override the subtitle shadow."
-msgstr "Переопределение наличия тени под субтитрами."
-
-#: src/gui.cpp:1735
-msgid "On"
-msgstr "Включено"
-
-#: src/gui.cpp:1946
-msgid "Video Settings"
-msgstr "Видео настройки"
-
-#: src/gui.cpp:1948
-msgid "Crop to aspect ratio:"
-msgstr "Обрезать под соотношение сторон:"
-
-#: src/gui.cpp:1949
-msgid ""
-"Set the real aspect ratio of the video, so that borders can be cropped.</"
-"p>"
-msgstr "Обрезать видео до указанных пропорций."
-
-#: src/gui.cpp:1952
-msgid "Do not crop"
-msgstr "Не обрезать"
-
-#: src/gui.cpp:1965
-msgid "Force source aspect ratio:"
-msgstr "Изменить соотношение сторон:"
-
-#: src/gui.cpp:1966
-msgid "Force the aspect ratio of video source."
-msgstr "Растянуть или сжать видео до указанных пропорций."
-
-#: src/gui.cpp:1969
-msgid "Do not force"
-msgstr "Не изменять"
-
-#: src/gui.cpp:1982
-msgid "Parallax:"
-msgstr "Параллакс:"
-
-#: src/gui.cpp:1983
-msgid ""
-"Adjust parallax, from -1 to +1. This changes the separation of left and "
-"right view, and thus the perceived distance of the scene."
-msgstr ""
-"Корректировка параллакса, от -1 до +1. Позволяет изменить разделение "
-"между левым и правым видеорядами и, таким образом, ощущаемую удаленность "
-"сцены."
-
-#: src/gui.cpp:1996
-msgid "Subtitle parallax:"
-msgstr "Параллакс субтитров:"
-
-#: src/gui.cpp:1997
-msgid ""
-"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
-"distance of the subtitles."
-msgstr ""
-"Корректировка параллакса субтитров, от -1 до +1. Позволяет изменить "
-"ощущаемую удаленность субтитров."
-
-#: src/gui.cpp:2010
-msgid "Ghostbusting:"
-msgstr "Подавление перекрестных помех:"
-
-#: src/gui.cpp:2011
-msgid ""
-"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
-"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
-"does not work with anaglyph glasses."
-msgstr ""
-"Укажите величину подавления перекрестных помех, от 0 до 1. Предварительно "
-"вам необходимо установить уровни перекрестных помех для вашего дисплея. "
-"Имейте ввиду, что подавление перекрестных помех не работает с анаглифными "
-"очками."
-
-#: src/gui.cpp:2195
-msgid "SDI Output Settings"
-msgstr "Настройки SDI"
-
-#: src/gui.cpp:2197
-msgid "SDI Output Format:"
-msgstr "Выходной формат SDI:"
-
-#: src/gui.cpp:2198
-msgid "Select output format used for SDI output."
-msgstr "Выберите выходной формат для SDI."
-
-#: src/gui.cpp:2206
-msgid "Left stereo mode:"
-msgstr "Левый стерео режим:"
-
-#: src/gui.cpp:2207
-msgid "Select stereo mode used for left SDI output."
-msgstr "Выберите стерео режим для левого выхода SDI."
-
-#: src/gui.cpp:2235
-msgid "Right stereo mode:"
-msgstr "Правый стерео режим:"
-
-#: src/gui.cpp:2236
-msgid "Select stereo mode used for right SDI output."
-msgstr "Выберите стерео режим для правого выхода SDI."
-
-#: src/gui.cpp:2676
-msgid "Open device(s)"
-msgstr "Открыть устройство(а)"
-
-#: src/gui.cpp:2679
-msgid "Choose a device type."
-msgstr "Выберите тип устройства."
-
-#: src/gui.cpp:2681 src/media_object.cpp:831
-msgid "Firewire"
-msgstr "Firewire"
-
-#: src/gui.cpp:2682 src/media_object.cpp:832
-msgid "X11"
-msgstr "X11"
-
-#: src/gui.cpp:2685 src/gui.cpp:2688
-msgid "Choose a device."
-msgstr "Выберите устройство."
-
-#: src/gui.cpp:2691
-msgid "Set the X11 device string. Refer to the manual for details."
-msgstr ""
-"Введите строку устройства X11. За подробностями обратитесь к документации."
-""
-
-#: src/gui.cpp:2715
-msgid "First device:"
-msgstr "Первое устройство:"
-
-#: src/gui.cpp:2716
-msgid "Second device:"
-msgstr "Второе устройство:"
-
-#: src/gui.cpp:2720
-msgid "Request frame size"
-msgstr "Размер кадра"
-
-#: src/gui.cpp:2721
-msgid ""
-"Request a specific frame size from the device, e.g. 640x480. The device "
-"must support this frame size. Some devices require a frame size to be "
-"selected."
-msgstr ""
-"Потребовать от устройства указанный размер кадра, например 640x480. "
-"Устройство должно поддерживать этот размер кадра. Некоторые устройства "
-"требуют явного указания размера кадра."
-
-#: src/gui.cpp:2732
-msgid "Request frame rate"
-msgstr "Частота кадров"
-
-#: src/gui.cpp:2733
-msgid ""
-"Request a specific frame rate from the device, e.g. 25/1. The device must "
-"support this frame rate. Some devices require a frame rate to be selected.</"
-"p>"
-msgstr ""
-"Потребовать от устройства указанной частоты кадров, например 25/1. "
-"Устройство должно поддерживать эту частоту кадров. Некоторые устройства "
-"требуют явного указания частоты кадров."
-
-#: src/gui.cpp:2744
-msgid "Request MJPEG format"
-msgstr "Потребовать формат MJPEG"
-
-#: src/gui.cpp:2745
-msgid ""
-"Request MJPEG data from the input device. The device may ignore this "
-"request."
-msgstr ""
-"Потребовать от устройства данные в формате MJPEG. Устройство может "
-"проигнорировать данное требование."
-
-#: src/gui.cpp:2748 src/gui.cpp:3523
-msgid "Cancel"
-msgstr "Отмена"
-
-#: src/gui.cpp:3046
-msgid "&File"
-msgstr "&Файл"
-
-#: src/gui.cpp:3047
-msgid "&Open file(s)..."
-msgstr "&Открыть файл(ы)..."
-
-#: src/gui.cpp:3052
-msgid "Open &URL(s)..."
-msgstr "Открыть &URL(ы)..."
-
-#: src/gui.cpp:3056
-msgid "Open &device(s)..."
-msgstr "Открыть &устройство(а)..."
-
-#: src/gui.cpp:3071
-msgid "&Clear recent files"
-msgstr "Очистить список &недавних файлов"
-
-#: src/gui.cpp:3079
-msgid "&Quit"
-msgstr "&Выход"
-
-#: src/gui.cpp:3085
-msgid "&Preferences"
-msgstr "&Настройки"
-
-#: src/gui.cpp:3088
-msgid "&Fullscreen Settings..."
-msgstr "Настройки &полноэкранного режима..."
-
-#: src/gui.cpp:3091
-msgid "Display &Color Adjustments..."
-msgstr "Настройки &цветности..."
-
-#: src/gui.cpp:3094
-msgid "Display Cross&talk Calibration..."
-msgstr "&Уровни перекрестных помех..."
-
-#: src/gui.cpp:3098
-msgid "Quality Adjustments..."
-msgstr "Настройки &качества..."
-
-#: src/gui.cpp:3102
-msgid "&Zoom for wide videos..."
-msgstr "&Масштаб для широкоэкранных видео..."
-
-#: src/gui.cpp:3106
-msgid "&Audio Settings..."
-msgstr "Настройки &звука..."
-
-#: src/gui.cpp:3110
-msgid "&Subtitle Settings..."
-msgstr "Настройки &субтитров..."
-
-#: src/gui.cpp:3114
-msgid "Current &Video Settings..."
-msgstr "Настройки проигрываемого &видео..."
-
-#: src/gui.cpp:3119
-msgid "SDI &Output Settings..."
-msgstr "Настройки выхода &SDI..."
-
-#: src/gui.cpp:3123
-msgid "&Help"
-msgstr "&Помощь"
-
-#: src/gui.cpp:3124
-msgid "&Manual..."
-msgstr "Сп&равка..."
-
-#: src/gui.cpp:3129
-msgid "&Website..."
-msgstr "Ве&б-сайт..."
-
-#: src/gui.cpp:3133
-msgid "&Keyboard Shortcuts"
-msgstr "&Горячие клавиши"
-
-#: src/gui.cpp:3137
-msgid "&About"
-msgstr "О програ&мме"
-
-#: src/gui.cpp:3470
-msgid "Tip"
-msgstr "Совет"
-
-#: src/gui.cpp:3473
-msgid ""
-"You can select and open multiple files at once.This is useful for "
-"example if you have extra subtitle files, or if left and right view are "
-"stored in separate files."
-msgstr ""
-"Вы можете открыть сразу несколько файлов.Это полезно, когда у вас "
-"есть отдельный файл с субтитрами, или если левый и правый видеоряды "
-"записаны в разных файлах."
-
-#: src/gui.cpp:3476
-msgid "Do not show this message again."
-msgstr "Больше не показывать это сообщение."
-
-#: src/gui.cpp:3493
-msgid "Open files"
-msgstr "Открыть файлы"
-
-#: src/gui.cpp:3517
-msgid "Open URL(s)"
-msgstr "Открыть адрес(а)"
-
-#: src/gui.cpp:3518
-msgid "URL(s):"
-msgstr "Адрес(а):"
-
-#: src/gui.cpp:3519
-msgid "Enter one or more space separated URLs."
-msgstr "Введите один или более адресов (URL), разделенных пробелами."
-
-#: src/gui.cpp:3732 src/gui.cpp:3740 src/video_output_qt.cpp:291
-#: src/video_output_qt.cpp:534 src/video_output_qt.cpp:731
-#: src/video_output_qt.cpp:743 src/video_output_qt.cpp:764
-msgid "Error"
-msgstr "Ошибка"
-
-#: src/gui.cpp:3732
-msgid "Cannot open manual."
-msgstr "Невозможно открыть справку."
-
-#: src/gui.cpp:3740
-msgid "Cannot open website."
-msgstr "Невозможно открыть веб-сайт."
-
-#: src/gui.cpp:3748
-msgid "Keyboard Shortcuts"
-msgstr "Горячие клавиши"
-
-#: src/gui.cpp:3751
-msgid "Keyboard control:"
-msgstr "Управление с клавиатуры:"
-
-#: src/gui.cpp:3753 src/main.cpp:534
-msgid "ESC"
-msgstr "ESC"
-
-#: src/gui.cpp:3753
-msgid "Stop"
-msgstr "Стоп"
-
-#: src/gui.cpp:3754 src/main.cpp:536
-msgid "SPACE"
-msgstr "ПРОБЕЛ"
-
-#: src/gui.cpp:3754 src/main.cpp:536
-msgid "Pause / unpause"
-msgstr "Пауза / Воспроизведение"
-
-#: src/gui.cpp:3755 src/main.cpp:537
-msgid "Toggle fullscreen"
-msgstr "Полноэкранный режим"
-
-#: src/gui.cpp:3756 src/main.cpp:538
-msgid "Center window"
-msgstr "Расположить окно по центру"
-
-#: src/gui.cpp:3757 src/main.cpp:539
-msgid "Swap left/right eye"
-msgstr "Поменять местами левый и правый видеоряды"
-
-#: src/gui.cpp:3758 src/main.cpp:540
-msgid "Cycle through available video streams"
-msgstr "Переключить видео дорожку"
-
-#: src/gui.cpp:3759 src/main.cpp:541
-msgid "Cycle through available audio streams"
-msgstr "Переключить аудио дорожку"
-
-#: src/gui.cpp:3760 src/main.cpp:542
-msgid "Cycle through available subtitle streams"
-msgstr "Переключить дорожку субтитров"
-
-#: src/gui.cpp:3761 src/main.cpp:543
-msgid "Adjust contrast"
-msgstr "Регулировка контрастности"
-
-#: src/gui.cpp:3762 src/main.cpp:544
-msgid "Adjust brightness"
-msgstr "Регулировка яркости"
-
-#: src/gui.cpp:3763 src/main.cpp:545
-msgid "Adjust hue"
-msgstr "Регулировка оттенка"
-
-#: src/gui.cpp:3764 src/main.cpp:546
-msgid "Adjust saturation"
-msgstr "Регулировка насыщенности"
-
-#: src/gui.cpp:3765 src/main.cpp:547
-msgid "Adjust parallax"
-msgstr "Регулировка параллакса"
-
-#: src/gui.cpp:3766 src/main.cpp:548
-msgid "Adjust ghostbusting"
-msgstr "Подавление перекрестных помех"
-
-#: src/gui.cpp:3767 src/main.cpp:549
-msgid "Adjust zoom for wide videos"
-msgstr "Регулировка масштаба для широкоэкранных видео"
-
-#: src/gui.cpp:3768 src/main.cpp:550
-msgid "Adjust audio volume"
-msgstr "Регулировка громкости"
-
-#: src/gui.cpp:3769 src/main.cpp:551
-msgid "Toggle audio mute"
-msgstr "Включить/выключить звук"
-
-#: src/gui.cpp:3770 src/main.cpp:552
-msgid "Step a single video frame forward"
-msgstr "Перемотка на один кадр вперед"
-
-#: src/gui.cpp:3771 src/main.cpp:553
-msgid "left, right"
-msgstr "влево, вправо"
-
-#: src/gui.cpp:3771 src/main.cpp:553
-msgid "Seek 10 seconds backward / forward"
-msgstr "Перемотка на 10 секунд назад / вперед"
-
-#: src/gui.cpp:3772 src/main.cpp:554
-msgid "down, up"
-msgstr "вниз, вверх"
-
-#: src/gui.cpp:3772 src/main.cpp:554
-msgid "Seek 1 minute backward / forward"
-msgstr "Перемотка на 1 минуту назад / вперед"
-
-#: src/gui.cpp:3773 src/main.cpp:555
-msgid "page down, page up"
-msgstr "page down, page up"
-
-#: src/gui.cpp:3773 src/main.cpp:555
-msgid "Seek 10 minutes backward / forward"
-msgstr "Перемотка на 10 минут назад / вперед"
-
-#: src/gui.cpp:3774 src/main.cpp:557
-msgid "Media keys"
-msgstr "Мультимедийные клавиши"
-
-#: src/gui.cpp:3774 src/main.cpp:557
-msgid "Media keys should work as expected"
-msgstr "Должны работать как задумано."
-
-#: src/gui.cpp:3790
-#, c-format
-msgid "About %s"
-msgstr "О %s"
-
-#: src/gui.cpp:3796
-#, c-format
-msgid "The %s 3D video player"
-msgstr "3D видео плеер %s"
-
-#: src/gui.cpp:3801
-#, c-format
-msgid ""
-"%s version %s.Copyright (C) 2014 the Bino developers.This "
-"is free software. You may redistribute copies of it under the terms of the "
-"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
-"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
-"\"%s\">%s</a> for more information on this software."
-msgstr ""
-"%s версия %s.Copyright (C) 2014 разработчики Bino.Это "
-"свободное программное обеспечение. Вы можете распространять его копии "
-"согласно требованиям <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU "
-"General Public License</a>. Программное обеспечение поставляется БЕЗ КАКИХ-"
-"ЛИБО ГАРАНТИЙ, за исключением предусмотренных законом.Для получения "
-"подробной информации об этом ПО посетите <a href=\"%s\">%s</a>."
-
-#: src/gui.cpp:3813 src/main.cpp:419
-msgid "Platform:"
-msgstr "Платформа:"
-
-#: src/gui.cpp:3814 src/main.cpp:421
-msgid "Libraries used:"
-msgstr "Используемые библиотеки:"
-
-#: src/gui.cpp:3836
-msgid "About"
-msgstr "О программе"
-
-#: src/gui.cpp:3837
-msgid "Libraries"
-msgstr "Библиотеки"
-
-#: src/gui.cpp:3838
-msgid "Team"
-msgstr "Команда"
-
-#: src/gui.cpp:3839
-msgid "License"
-msgstr "Лицензия"
-
 #: src/lib_versions.cpp:183 src/lib_versions.cpp:195
 msgid "not used"
 msgstr "не используется"
@@ -1309,7 +280,8 @@
 msgstr "%s версия %s"
 
 #: src/main.cpp:415
-msgid "Copyright (C) 2014 the Bino developers."
+#, fuzzy
+msgid "Copyright (C) 2016 the Bino developers."
 msgstr "Copyright (C) 2014 Разработчики Bino."
 
 #: src/main.cpp:416
@@ -1322,6 +294,14 @@
 "требованиям лицензии GNU General Public License. Программное обеспечение "
 "поставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, за исключением предусмотренных законом."
 
+#: src/main.cpp:419
+msgid "Platform:"
+msgstr "Платформа:"
+
+#: src/main.cpp:421
+msgid "Libraries used:"
+msgstr "Используемые библиотеки:"
+
 #. TRANSLATORS: This is the --help text. Please keep the line length limited.
 #. * The --help output should look good with a line width of 80 characters.
 #: src/main.cpp:434
@@ -1420,10 +400,154 @@
 msgid "Select input type (default autodetect):"
 msgstr "Входной режим (по умолчанию - автоопределение):"
 
+#: src/main.cpp:459
+msgid "2D"
+msgstr "2D"
+
+#: src/main.cpp:460
+msgid "Separate streams, left first"
+msgstr "Отдельные видеофайлы, сначала левый"
+
+#: src/main.cpp:461
+msgid "Separate streams, right first"
+msgstr "Отдельные видеофайлы, сначала правый"
+
+#: src/main.cpp:462
+msgid "Alternating, left first"
+msgstr "Чередование кадров, сначала левый"
+
+#: src/main.cpp:463
+msgid "Alternating, right first"
+msgstr "Чередование кадров, сначала правый"
+
+#: src/main.cpp:464 src/main.cpp:479
+msgid "Top/bottom"
+msgstr "Сверху/снизу"
+
+#: src/main.cpp:465 src/main.cpp:480
+msgid "Top/bottom, half height"
+msgstr "Сверху/снизу, в половину высоты"
+
+#: src/main.cpp:466
+msgid "Bottom/top"
+msgstr "Снизу/сверху"
+
+#: src/main.cpp:467
+msgid "Bottom/top, half height"
+msgstr "Снизу/сверху, в половину высоты"
+
+#: src/main.cpp:468 src/main.cpp:481
+msgid "Left/right"
+msgstr "Слева/справа"
+
+#: src/main.cpp:469 src/main.cpp:482
+msgid "Left/right, half width"
+msgstr "Слева/справа, в половину ширины"
+
+#: src/main.cpp:470
+msgid "Right/left"
+msgstr "Справа/слева"
+
+#: src/main.cpp:471
+msgid "Right/left, half width"
+msgstr "Справа/слева, в половину ширины"
+
+#: src/main.cpp:472 src/main.cpp:483
+msgid "Even/odd rows"
+msgstr "Четные/нечетные ряды"
+
+#: src/main.cpp:473
+msgid "Odd/even rows"
+msgstr "Нечетные/четные ряды"
+
 #: src/main.cpp:474
 msgid "Select output type:"
 msgstr "Выходной режим:"
 
+#: src/main.cpp:475
+msgid "OpenGL stereo"
+msgstr "Стерео OpenGL"
+
+#: src/main.cpp:476
+msgid "Left/right alternating"
+msgstr "Чередование кадров (левый/правый)"
+
+#: src/main.cpp:477
+msgid "Left view"
+msgstr "Левый видеоряд"
+
+#: src/main.cpp:478
+msgid "Right view"
+msgstr "Правый видеоряд"
+
+#: src/main.cpp:484
+msgid "Even/odd columns"
+msgstr "Четные/нечетные столбцы"
+
+#: src/main.cpp:485
+msgid "Checkerboard pattern"
+msgstr "В шахматном порядке"
+
+#: src/main.cpp:486
+msgid "HDMI frame packing mode"
+msgstr "Режим упаковки кадров HDMI"
+
+#: src/main.cpp:487
+msgid "Red/cyan glasses, monochrome"
+msgstr "Красно-голубые очки, черно-белый режим"
+
+#: src/main.cpp:488
+msgid "Red/cyan glasses, half color"
+msgstr "Красно-голубые очки, половина цветности"
+
+#: src/main.cpp:489
+msgid "Red/cyan glasses, full color"
+msgstr "Красно-голубые очки, полноцветный режим"
+
+#: src/main.cpp:490
+msgid "Red/cyan glasses, Dubois"
+msgstr "Красно-голубые очки, метод Дюбуа"
+
+#: src/main.cpp:491
+msgid "Green/magenta glasses, monochrome"
+msgstr "Зелёно-пурпурные очки, черно-белый режим"
+
+#: src/main.cpp:492
+msgid "Green/magenta glasses, half color"
+msgstr "Зелёно-пурпурные очки, половина цветности"
+
+#: src/main.cpp:493
+msgid "Green/magenta glasses, full color"
+msgstr "Зелёно-пурпурные очки, полноцветный режим"
+
+#: src/main.cpp:494
+msgid "Green/magenta glasses, Dubois"
+msgstr "Зелёно-пурпурные очки, метод Дюбуа"
+
+#: src/main.cpp:495
+msgid "Amber/blue glasses, monochrome"
+msgstr "Янтарно-синие очки, черно-белый режим"
+
+#: src/main.cpp:496
+msgid "Amber/blue glasses, half color"
+msgstr "Янтарно-синие очки, половина цветности"
+
+#: src/main.cpp:497
+msgid "Amber/blue glasses, full color"
+msgstr "Янтарно-синие очки, полноцветный режим"
+
+#: src/main.cpp:498
+msgid "Amber/blue glasses, Dubois"
+msgstr "Янтарно-синие очки, метод Дюбуа"
+
+#: src/main.cpp:499
+msgid "Red/green glasses, monochrome"
+msgstr "Красно-зелёные очки, черно-белый режим"
+
+#: src/main.cpp:500
+msgid "Red/blue glasses, monochrome"
+msgstr "Красно-синие очки, черно-белый режим"
+
 #: src/main.cpp:501
 msgid "Multi-display via Equalizer (2D setup)"
 msgstr "Многоэкранный через Equalizer (2D)"
@@ -1532,33 +656,133 @@
 msgid "Benchmark mode (no audio, show fps)"
 msgstr "Измерение производительности (FPS, без звука)"
 
-#: src/main.cpp:528
-msgid "Frame rate divisor for display refresh rate"
-msgstr "Делитель частоты кадров для частоты экрана"
+#: src/main.cpp:528
+msgid "Frame rate divisor for display refresh rate"
+msgstr "Делитель частоты кадров для частоты экрана"
+
+#: src/main.cpp:529
+msgid "Default is 0 for benchmark mode, 1 otherwise"
+msgstr "По умолчанию для измерения FPS - 0, иначе - 1"
+
+#: src/main.cpp:530
+msgid "Loop the input media"
+msgstr "Режим повтора"
+
+#: src/main.cpp:531
+msgid "Set SDI output format"
+msgstr "Выходной формат SDI"
+
+#: src/main.cpp:533
+msgid "Interactive control:"
+msgstr "Интерактивное управление:"
+
+#: src/main.cpp:534
+msgid "ESC"
+msgstr "ESC"
+
+#: src/main.cpp:534
+msgid "Leave fullscreen mode, or quit"
+msgstr "Покинуть полноэкранный режим или выйти"
+
+#: src/main.cpp:535
+msgid "Quit"
+msgstr "Выход"
+
+#: src/main.cpp:536
+msgid "SPACE"
+msgstr "ПРОБЕЛ"
+
+#: src/main.cpp:536
+msgid "Pause / unpause"
+msgstr "Пауза / Воспроизведение"
+
+#: src/main.cpp:537
+msgid "Toggle fullscreen"
+msgstr "Полноэкранный режим"
+
+#: src/main.cpp:538
+msgid "Center window"
+msgstr "Расположить окно по центру"
+
+#: src/main.cpp:539
+msgid "Swap left/right eye"
+msgstr "Поменять местами левый и правый видеоряды"
+
+#: src/main.cpp:540
+msgid "Cycle through available video streams"
+msgstr "Переключить видео дорожку"
+
+#: src/main.cpp:541
+msgid "Cycle through available audio streams"
+msgstr "Переключить аудио дорожку"
+
+#: src/main.cpp:542
+msgid "Cycle through available subtitle streams"
+msgstr "Переключить дорожку субтитров"
+
+#: src/main.cpp:543
+msgid "Adjust contrast"
+msgstr "Регулировка контрастности"
+
+#: src/main.cpp:544
+msgid "Adjust brightness"
+msgstr "Регулировка яркости"
+
+#: src/main.cpp:545
+msgid "Adjust hue"
+msgstr "Регулировка оттенка"
+
+#: src/main.cpp:546
+msgid "Adjust saturation"
+msgstr "Регулировка насыщенности"
+
+#: src/main.cpp:547
+msgid "Adjust parallax"
+msgstr "Регулировка параллакса"
+
+#: src/main.cpp:548
+msgid "Adjust ghostbusting"
+msgstr "Подавление перекрестных помех"
+
+#: src/main.cpp:549
+msgid "Adjust zoom for wide videos"
+msgstr "Регулировка масштаба для широкоэкранных видео"
+
+#: src/main.cpp:550
+msgid "Adjust audio volume"
+msgstr "Регулировка громкости"
+
+#: src/main.cpp:551
+msgid "Toggle audio mute"
+msgstr "Включить/выключить звук"
+
+#: src/main.cpp:552
+msgid "Step a single video frame forward"
+msgstr "Перемотка на один кадр вперед"
 
-#: src/main.cpp:529
-msgid "Default is 0 for benchmark mode, 1 otherwise"
-msgstr "По умолчанию для измерения FPS - 0, иначе - 1"
+#: src/main.cpp:553
+msgid "left, right"
+msgstr "влево, вправо"
 
-#: src/main.cpp:530
-msgid "Loop the input media"
-msgstr "Режим повтора"
+#: src/main.cpp:553
+msgid "Seek 10 seconds backward / forward"
+msgstr "Перемотка на 10 секунд назад / вперед"
 
-#: src/main.cpp:531
-msgid "Set SDI output format"
-msgstr "Выходной формат SDI"
+#: src/main.cpp:554
+msgid "down, up"
+msgstr "вниз, вверх"
 
-#: src/main.cpp:533
-msgid "Interactive control:"
-msgstr "Интерактивное управление:"
+#: src/main.cpp:554
+msgid "Seek 1 minute backward / forward"
+msgstr "Перемотка на 1 минуту назад / вперед"
 
-#: src/main.cpp:534
-msgid "Leave fullscreen mode, or quit"
-msgstr "Покинуть полноэкранный режим или выйти"
+#: src/main.cpp:555
+msgid "page down, page up"
+msgstr "page down, page up"
 
-#: src/main.cpp:535
-msgid "Quit"
-msgstr "Выход"
+#: src/main.cpp:555
+msgid "Seek 10 minutes backward / forward"
+msgstr "Перемотка на 10 минут назад / вперед"
 
 #: src/main.cpp:556
 msgid "Mouse click"
@@ -1568,22 +792,30 @@
 msgid "Seek according to horizontal click position"
 msgstr "Перемотка по горизонтальному положению курсора"
 
-#: src/main.cpp:626
+#: src/main.cpp:557
+msgid "Media keys"
+msgstr "Мультимедийные клавиши"
+
+#: src/main.cpp:557
+msgid "Media keys should work as expected"
+msgstr "Должны работать как задумано."
+
+#: src/main.cpp:627
 msgid "No audio devices known."
 msgstr "Нет звуковых устройств."
 
-#: src/main.cpp:641
+#: src/main.cpp:642
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr ""
 "Режим оценки производительности: воспроизведение аудио отключено, "
 "воспроизведение видео с максимально-возможной скоростью."
 
-#: src/main.cpp:655
+#: src/main.cpp:656
 #, c-format
 msgid "Unknown mode %s."
 msgstr "Неизвестный режим %s."
 
-#: src/main.cpp:787
+#: src/main.cpp:788
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Эта версия Bino была собрана без поддержки LIRC."
 
@@ -1599,6 +831,10 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d к., %g кГц, %d бит"
 
+#: src/media_input.cpp:276
+msgid "Input:"
+msgstr "Источник:"
+
 #: src/media_input.cpp:281
 #, c-format
 msgid "Video %s: %s"
@@ -1656,6 +892,14 @@
 msgid "No support available for %s device."
 msgstr "Устройство %s не поддерживается."
 
+#: src/media_object.cpp:831
+msgid "Firewire"
+msgstr "Firewire"
+
+#: src/media_object.cpp:832
+msgid "X11"
+msgstr "X11"
+
 #: src/media_object.cpp:833
 msgid "default"
 msgstr "default"
@@ -1862,6 +1106,12 @@
 msgid "Cannot create a PBO buffer."
 msgstr "Невозможно создать буфер PBO."
 
+#: src/video_output_qt.cpp:291 src/video_output_qt.cpp:534
+#: src/video_output_qt.cpp:731 src/video_output_qt.cpp:743
+#: src/video_output_qt.cpp:764
+msgid "Error"
+msgstr "Ошибка"
+
 #: src/video_output_qt.cpp:636
 #, c-format
 msgid "Cannot initialize GLEW: %s"
@@ -1895,6 +1145,590 @@
 msgid "Cannot resume screensaver."
 msgstr "Невозможно включить хранитель экрана."
 
+#~ msgid "Video:"
+#~ msgstr "Видео:"
+
+#~ msgid "Select the video stream."
+#~ msgstr "Выберите видео дорожку."
+
+#~ msgid "Audio:"
+#~ msgstr "Аудио:"
+
+#~ msgid "Select the audio stream."
+#~ msgstr "Выберите аудио дорожку."
+
+#~ msgid "Subtitle:"
+#~ msgstr "Субтитры:"
+
+#~ msgid "Select the subtitle stream."
+#~ msgstr "Выберите дорожку субтитров."
+
+#~ msgid "Set the 3D layout of the video stream."
+#~ msgstr "Укажите 3D раскладку исходного видеофайла."
+
+#~ msgid "Output:"
+#~ msgstr "Режим:"
+
+#~ msgid "Set the 3D output type for your display."
+#~ msgstr "Укажите 3D режим для вашего дисплея."
+
+#~ msgid "Swap left/right"
+#~ msgstr "Наоборот"
+
+#~ msgid ""
+#~ "Swap the left and right view. Use this if the 3D effect seems wrong.</"
+#~ "p>"
+#~ msgstr ""
+#~ "Поменять местами левый и правый видеоряды. Включите, если 3D эффект "
+#~ "кажется неправильным."
+
+#~ msgid "Off"
+#~ msgstr "Выключено"
+
+#~ msgid ""
+#~ "This slider shows the progress during video playback, and can be used "
+#~ "to seek in the video."
+#~ msgstr ""
+#~ "Этот ползунок показывает позицию воспроизведения и может быть "
+#~ "использован для перемотки."
+
+#~ msgid "Elapsed / total time."
+#~ msgstr "Прошло / всего времени."
+
+#~ msgid "Toggle audio mute."
+#~ msgstr "Включить/выключить звук."
+
+#~ msgid "Adjust audio volume."
+#~ msgstr "Громкость."
+
+#~ msgid "Play."
+#~ msgstr "Воспроизведение."
+
+#~ msgid "Pause."
+#~ msgstr "Пауза."
+
+#~ msgid "Stop."
+#~ msgstr "Стоп."
+
+#~ msgid "Toggle loop mode."
+#~ msgstr "Включить/выключить режим повтора."
+
+#~ msgid ""
+#~ "Switch to fullscreen mode. You can leave fullscreen mode by pressing "
+#~ "the f key."
+#~ msgstr ""
+#~ "Перейти в полноэкранный режим. Вы можете покинуть полноэкранный режим "
+#~ "путем нажатия клавиши f."
+
+#~ msgid "Center the video area on your screen."
+#~ msgstr "Расположить видео по центру экрана."
+
+#~ msgid "Seek backward 10 minutes."
+#~ msgstr "Перемотать на 10 минут назад."
+
+#~ msgid "Seek backward 1 minute."
+#~ msgstr "Перемотать на 1 минуту назад."
+
+#~ msgid "Seek backward 10 seconds."
+#~ msgstr "Перемотать на 10 секунд назад."
+
+#~ msgid "Seek forward 10 seconds."
+#~ msgstr "Перемотать на 10 секунд вперед."
+
+#~ msgid "Seek forward 1 minute."
+#~ msgstr "Перемотать на 1 минуту вперед."
+
+#~ msgid "Seek forward 10 minutes."
+#~ msgstr "Перемотать на 10 минут вперед."
+
+#~ msgid "Fullscreen/Multiscreen Settings"
+#~ msgstr "Полноэкранный и многоэкранный режим"
+
+#~ msgid "Configure fullscreen mode:"
+#~ msgstr "Настройки полноэкранного режима:"
+
+#~ msgid "Select the screens to use in fullscreen mode."
+#~ msgstr "Выберите экраны для полноэкранного режима."
+
+#~ msgid "Single screen:"
+#~ msgstr "Один экран:"
+
+#~ msgid "Use a single screen for fullscreen mode."
+#~ msgstr "Использовать один экран для полноэкранного режима."
+
+#~ msgid "Primary screen"
+#~ msgstr "Главный экран"
+
+#~ msgid "Screen %d"
+#~ msgstr "Экран %d"
+
+#~ msgid "Dual screen:"
+#~ msgstr "Два экрана:"
+
+#~ msgid "Use two screens for fullscreen mode."
+#~ msgstr "Использовать два экрана для полноэкранного режима."
+
+#~ msgid "Multi screen:"
+#~ msgstr "Много экранов:"
+
+#~ msgid "Use multiple screens for fullscreen mode."
+#~ msgstr "Использовать много экранов для полноэкранного режима"
+
+#~ msgid "Comma-separated list of screens to use for fullscreen mode."
+#~ msgstr ""
+#~ "Список экранов для полноэкранного режима, разделенных запятыми."
+
+#~ msgid "When in fullscreen mode,"
+#~ msgstr "Когда в полноэкранном режиме,"
+
+#~ msgid "Set special left/right view handling for fullscreen mode."
+#~ msgstr ""
+#~ "Включить специальную обработку левого и правого видеорядов в "
+#~ "полноэкранном режиме."
+
+#~ msgid "flip left view vertically."
+#~ msgstr "отразить левый видеоряд вертикально."
+
+#~ msgid "flop left view horizontally."
+#~ msgstr "отразить левый видеоряд горизонтально."
+
+#~ msgid "flip right view vertically."
+#~ msgstr "отразить правый видеоряд вертикально."
+
+#~ msgid "flop right view horizontally."
+#~ msgstr "отразить правый видеоряд горизонтально."
+
+#~ msgid "use DLP(R) 3-D Ready Sync"
+#~ msgstr "посылать сигнал DLP(R) 3-D Ready "
+
+#~ msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
+#~ msgstr ""
+#~ "Посылать сигнал синхронизации DLP&reg; 3-D Ready в подходящих "
+#~ "видеорежимах."
+
+#~ msgid "inhibit the screensaver"
+#~ msgstr "отключить хранитель экрана"
+
+#~ msgid "Inhibit the screensaver during fullscreen playback."
+#~ msgstr ""
+#~ "Отключить хранитель экрана во время полноэкранного просмотра."
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Display Color Adjustments"
+#~ msgstr "Настройки цветности"
+
+#~ msgid "Contrast:"
+#~ msgstr "Контрастность:"
+
+#~ msgid "Brightness:"
+#~ msgstr "Яркость:"
+
+#~ msgid "Hue:"
+#~ msgstr "Оттенок:"
+
+#~ msgid "Saturation:"
+#~ msgstr "Насыщенность:"
+
+#~ msgid "Display Crosstalk Calibration"
+#~ msgstr "Уровни перекрестных помех"
+
+#~ msgid ""
+#~ "Please read the manual to find out how to measure the crosstalk "
+#~ "levels of your display."
+#~ msgstr ""
+#~ "Пожалуйста прочтите инструкцию, чтобы узнать, как измерить "
+#~ "уровень перекрестных помех."
+
+#~ msgid "Red:"
+#~ msgstr "Красный:"
+
+#~ msgid "Green:"
+#~ msgstr "Зеленый:"
+
+#~ msgid "Blue:"
+#~ msgstr "Синий:"
+
+#~ msgid "Rendering Quality Adjustments"
+#~ msgstr "Настройка качества изображения"
+
+#~ msgid "Rendering Quality:"
+#~ msgstr "Качество изображения:"
+
+#~ msgid "Zoom for wide videos"
+#~ msgstr "Масштаб для широкоэкранного видео"
+
+#~ msgid ""
+#~ "Set zoom level for videos that are wider than the screen: 0: "
+#~ "Show full video width. 1: Use full screen height."
+#~ msgstr ""
+#~ "Масштаб для видеозаписей, ширина которых превышает ширину экрана:"
+#~ " 0: Показывать видео в полную ширину. 1: Использовать всю высоту "
+#~ "экрана."
+
+#~ msgid "Zoom:"
+#~ msgstr "Масштаб:"
+
+#~ msgid "Set the zoom level for videos that are wider than the screen."
+#~ msgstr "Масштаб для видеозаписей, которые шире экрана."
+
+#~ msgid "Audio Settings"
+#~ msgstr "Настройки звука"
+
+#~ msgid "Audio device:"
+#~ msgstr "Устройство:"
+
+#~ msgid ""
+#~ "Select the audio device. This will take effect for the next started "
+#~ "video."
+#~ msgstr ""
+#~ "Выберите аудио устройство. Изменения вступят в силу при следующем "
+#~ "воспроизведении."
+
+#~ msgid "Default"
+#~ msgstr "По умолчанию"
+
+#~ msgid "Audio delay (ms):"
+#~ msgstr "Задержка (мс):"
+
+#~ msgid ""
+#~ "Set an audio delay, in milliseconds. This is useful if audio and "
+#~ "video are not in sync."
+#~ msgstr ""
+#~ "Позволяет установить задержку воспроизведения аудио дорожки, в "
+#~ "миллисекундах. Полезно, если аудио и видео дорожки не синхронизированы."
+#~ ""
+
+#~ msgid "Subtitle Settings"
+#~ msgstr "Настройки субтитров"
+
+#~ msgid ""
+#~ "These settings apply only to soft subtitles, not to bitmaps. Some "
+#~ "changes require a restart of the video to take effect."
+#~ msgstr ""
+#~ "Данные настройки применяются только для текстовых субтитров."
+#~ " Некоторые изменения вступят в силу только после перезапуска видео."
+
+#~ msgid "Encoding:"
+#~ msgstr "Кодировка:"
+
+#~ msgid "Set the subtitle character set encoding."
+#~ msgstr "Выберите кодировку символов в субтитрах."
+
+#~ msgid "Override font:"
+#~ msgstr "Переопределить шрифт:"
+
+#~ msgid "Override the subtitle font family."
+#~ msgstr ""
+#~ "Переопределение шрифта субтитров, указанного в файле субтитров."
+
+#~ msgid "Override font size:"
+#~ msgstr "Переопределить размер шрифта:"
+
+#~ msgid "Override the subtitle font size."
+#~ msgstr ""
+#~ "Переопределение размера шрифта субтитров, указанного в файле субтитров."
+#~ ""
+
+#~ msgid "Override scale factor:"
+#~ msgstr "Переопределить коэффициент масштаба:"
+
+#~ msgid "Override the subtitle scale factor."
+#~ msgstr ""
+#~ "Переопределение коэффициента масштаба субтитров, указанного в файле "
+#~ "субтитров."
+
+#~ msgid "Override color:"
+#~ msgstr "Переопределить цвет:"
+
+#~ msgid "Override the subtitle color."
+#~ msgstr ""
+#~ "Переопределение цвета субтитров, указанного в файле субтитров."
+
+#~ msgid "Override shadow:"
+#~ msgstr "Переопределить тень:"
+
+#~ msgid "Override the subtitle shadow."
+#~ msgstr "Переопределение наличия тени под субтитрами."
+
+#~ msgid "On"
+#~ msgstr "Включено"
+
+#~ msgid "Video Settings"
+#~ msgstr "Видео настройки"
+
+#~ msgid "Crop to aspect ratio:"
+#~ msgstr "Обрезать под соотношение сторон:"
+
+#~ msgid ""
+#~ "Set the real aspect ratio of the video, so that borders can be cropped."
+#~ ""
+#~ msgstr "Обрезать видео до указанных пропорций."
+
+#~ msgid "Do not crop"
+#~ msgstr "Не обрезать"
+
+#~ msgid "Force source aspect ratio:"
+#~ msgstr "Изменить соотношение сторон:"
+
+#~ msgid "Force the aspect ratio of video source."
+#~ msgstr "Растянуть или сжать видео до указанных пропорций."
+
+#~ msgid "Do not force"
+#~ msgstr "Не изменять"
+
+#~ msgid "Parallax:"
+#~ msgstr "Параллакс:"
+
+#~ msgid ""
+#~ "Adjust parallax, from -1 to +1. This changes the separation of left "
+#~ "and right view, and thus the perceived distance of the scene."
+#~ msgstr ""
+#~ "Корректировка параллакса, от -1 до +1. Позволяет изменить разделение "
+#~ "между левым и правым видеорядами и, таким образом, ощущаемую удаленность "
+#~ "сцены."
+
+#~ msgid "Subtitle parallax:"
+#~ msgstr "Параллакс субтитров:"
+
+#~ msgid ""
+#~ "Adjust subtitle parallax, from -1 to +1. This changes the perceived "
+#~ "distance of the subtitles."
+#~ msgstr ""
+#~ "Корректировка параллакса субтитров, от -1 до +1. Позволяет изменить "
+#~ "ощущаемую удаленность субтитров."
+
+#~ msgid "Ghostbusting:"
+#~ msgstr "Подавление перекрестных помех:"
+
+#~ msgid ""
+#~ "Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+#~ "the crosstalk levels of your display first. Note that crosstalk "
+#~ "ghostbusting does not work with anaglyph glasses."
+#~ msgstr ""
+#~ "Укажите величину подавления перекрестных помех, от 0 до 1. "
+#~ "Предварительно вам необходимо установить уровни перекрестных помех для "
+#~ "вашего дисплея. Имейте ввиду, что подавление перекрестных помех не "
+#~ "работает с анаглифными очками."
+
+#~ msgid "SDI Output Settings"
+#~ msgstr "Настройки SDI"
+
+#~ msgid "SDI Output Format:"
+#~ msgstr "Выходной формат SDI:"
+
+#~ msgid "Select output format used for SDI output."
+#~ msgstr "Выберите выходной формат для SDI."
+
+#~ msgid "Left stereo mode:"
+#~ msgstr "Левый стерео режим:"
+
+#~ msgid "Select stereo mode used for left SDI output."
+#~ msgstr "Выберите стерео режим для левого выхода SDI."
+
+#~ msgid "Right stereo mode:"
+#~ msgstr "Правый стерео режим:"
+
+#~ msgid "Select stereo mode used for right SDI output."
+#~ msgstr "Выберите стерео режим для правого выхода SDI."
+
+#~ msgid "Open device(s)"
+#~ msgstr "Открыть устройство(а)"
+
+#~ msgid "Choose a device type."
+#~ msgstr "Выберите тип устройства."
+
+#~ msgid "Choose a device."
+#~ msgstr "Выберите устройство."
+
+#~ msgid "Set the X11 device string. Refer to the manual for details."
+#~ msgstr ""
+#~ "Введите строку устройства X11. За подробностями обратитесь к "
+#~ "документации."
+
+#~ msgid "First device:"
+#~ msgstr "Первое устройство:"
+
+#~ msgid "Second device:"
+#~ msgstr "Второе устройство:"
+
+#~ msgid "Request frame size"
+#~ msgstr "Размер кадра"
+
+#~ msgid ""
+#~ "Request a specific frame size from the device, e.g. 640x480. The "
+#~ "device must support this frame size. Some devices require a frame size to "
+#~ "be selected."
+#~ msgstr ""
+#~ "Потребовать от устройства указанный размер кадра, например 640x480. "
+#~ "Устройство должно поддерживать этот размер кадра. Некоторые устройства "
+#~ "требуют явного указания размера кадра."
+
+#~ msgid "Request frame rate"
+#~ msgstr "Частота кадров"
+
+#~ msgid ""
+#~ "Request a specific frame rate from the device, e.g. 25/1. The device "
+#~ "must support this frame rate. Some devices require a frame rate to be "
+#~ "selected."
+#~ msgstr ""
+#~ "Потребовать от устройства указанной частоты кадров, например 25/1. "
+#~ "Устройство должно поддерживать эту частоту кадров. Некоторые устройства "
+#~ "требуют явного указания частоты кадров."
+
+#~ msgid "Request MJPEG format"
+#~ msgstr "Потребовать формат MJPEG"
+
+#~ msgid ""
+#~ "Request MJPEG data from the input device. The device may ignore this "
+#~ "request."
+#~ msgstr ""
+#~ "Потребовать от устройства данные в формате MJPEG. Устройство может "
+#~ "проигнорировать данное требование."
+
+#~ msgid "Cancel"
+#~ msgstr "Отмена"
+
+#~ msgid "&File"
+#~ msgstr "&Файл"
+
+#~ msgid "&Open file(s)..."
+#~ msgstr "&Открыть файл(ы)..."
+
+#~ msgid "Open &URL(s)..."
+#~ msgstr "Открыть &URL(ы)..."
+
+#~ msgid "Open &device(s)..."
+#~ msgstr "Открыть &устройство(а)..."
+
+#~ msgid "&Clear recent files"
+#~ msgstr "Очистить список &недавних файлов"
+
+#~ msgid "&Quit"
+#~ msgstr "&Выход"
+
+#~ msgid "&Preferences"
+#~ msgstr "&Настройки"
+
+#~ msgid "&Fullscreen Settings..."
+#~ msgstr "Настройки &полноэкранного режима..."
+
+#~ msgid "Display &Color Adjustments..."
+#~ msgstr "Настройки &цветности..."
+
+#~ msgid "Display Cross&talk Calibration..."
+#~ msgstr "&Уровни перекрестных помех..."
+
+#~ msgid "Quality Adjustments..."
+#~ msgstr "Настройки &качества..."
+
+#~ msgid "&Zoom for wide videos..."
+#~ msgstr "&Масштаб для широкоэкранных видео..."
+
+#~ msgid "&Audio Settings..."
+#~ msgstr "Настройки &звука..."
+
+#~ msgid "&Subtitle Settings..."
+#~ msgstr "Настройки &субтитров..."
+
+#~ msgid "Current &Video Settings..."
+#~ msgstr "Настройки проигрываемого &видео..."
+
+#~ msgid "SDI &Output Settings..."
+#~ msgstr "Настройки выхода &SDI..."
+
+#~ msgid "&Help"
+#~ msgstr "&Помощь"
+
+#~ msgid "&Manual..."
+#~ msgstr "Сп&равка..."
+
+#~ msgid "&Website..."
+#~ msgstr "Ве&б-сайт..."
+
+#~ msgid "&Keyboard Shortcuts"
+#~ msgstr "&Горячие клавиши"
+
+#~ msgid "&About"
+#~ msgstr "О програ&мме"
+
+#~ msgid "Tip"
+#~ msgstr "Совет"
+
+#~ msgid ""
+#~ "You can select and open multiple files at once.This is useful "
+#~ "for example if you have extra subtitle files, or if left and right "
+#~ "view are stored in separate files."
+#~ msgstr ""
+#~ "Вы можете открыть сразу несколько файлов.Это полезно, когда у "
+#~ "вас есть отдельный файл с субтитрами, или если левый и правый "
+#~ "видеоряды записаны в разных файлах."
+
+#~ msgid "Do not show this message again."
+#~ msgstr "Больше не показывать это сообщение."
+
+#~ msgid "Open files"
+#~ msgstr "Открыть файлы"
+
+#~ msgid "Open URL(s)"
+#~ msgstr "Открыть адрес(а)"
+
+#~ msgid "URL(s):"
+#~ msgstr "Адрес(а):"
+
+#~ msgid "Enter one or more space separated URLs."
+#~ msgstr "Введите один или более адресов (URL), разделенных пробелами."
+
+#~ msgid "Cannot open manual."
+#~ msgstr "Невозможно открыть справку."
+
+#~ msgid "Cannot open website."
+#~ msgstr "Невозможно открыть веб-сайт."
+
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Горячие клавиши"
+
+#~ msgid "Keyboard control:"
+#~ msgstr "Управление с клавиатуры:"
+
+#~ msgid "Stop"
+#~ msgstr "Стоп"
+
+#~ msgid "About %s"
+#~ msgstr "О %s"
+
+#~ msgid "The %s 3D video player"
+#~ msgstr "3D видео плеер %s"
+
+#~ msgid ""
+#~ "%s version %s.Copyright (C) 2014 the Bino developers.</"
+#~ "p>This is free software. You may redistribute copies of it under the "
+#~ "terms of the <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General "
+#~ "Public License</a>. There is NO WARRANTY, to the extent permitted by law."
+#~ "See <a href=\"%s\">%s</a> for more information on this software.</"
+#~ "p>"
+#~ msgstr ""
+#~ "%s версия %s.Copyright (C) 2014 разработчики Bino.Это "
+#~ "свободное программное обеспечение. Вы можете распространять его копии "
+#~ "согласно требованиям <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU "
+#~ "General Public License</a>. Программное обеспечение поставляется БЕЗ "
+#~ "КАКИХ-ЛИБО ГАРАНТИЙ, за исключением предусмотренных законом.Для "
+#~ "получения подробной информации об этом ПО посетите <a href=\"%s\">%s</a>."
+#~ ""
+
+#~ msgid "About"
+#~ msgstr "О программе"
+
+#~ msgid "Libraries"
+#~ msgstr "Библиотеки"
+
+#~ msgid "Team"
+#~ msgstr "Команда"
+
+#~ msgid "License"
+#~ msgstr "Лицензия"
+
 #~ msgid "Need at least OpenGL 2.1."
 #~ msgstr "Необходим как минимум OpenGL 2.1."

bino-1.6.1.tar.xz/po/zh_cn.gmo -> bino-1.6.5.tar.xz/po/zh_cn.gmo Changed

bino-1.6.1.tar.xz/po/zh_cn.po -> bino-1.6.5.tar.xz/po/zh_cn.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: bino 1.4.4\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2014-10-13 13:20+0200\n"
+"POT-Creation-Date: 2016-12-16 09:10+0100\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"
@@ -91,31 +91,31 @@
 msgid "Too many arguments."
 msgstr "参数太多。"
 
-#: src/base/str.cpp:269
+#: src/base/str.cpp:459
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "无法转换字符串为 %s。"
 
-#: src/base/str.cpp:517 src/base/str.cpp:536 src/base/str.cpp:547
-#: src/base/str.cpp:559
+#: src/base/str.cpp:993 src/base/str.cpp:1012 src/base/str.cpp:1023
+#: src/base/str.cpp:1035
 #, c-format
 msgid "Cannot convert %s to %s: %s"
 msgstr "无法转换 %s 为 %s：%s"
 
-#: src/base/str.cpp:565
+#: src/base/str.cpp:1041
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "无法转换 %s 为 %s。"
 
-#: src/base/thread.cpp:38 src/base/thread.cpp:48 src/base/thread.cpp:61
-#: src/base/thread.cpp:74 src/base/thread.cpp:85 src/base/thread.cpp:95
-#: src/base/thread.cpp:108 src/base/thread.cpp:116 src/base/thread.cpp:124
-#: src/base/thread.cpp:204 src/base/thread.cpp:211 src/base/thread.cpp:225
-#: src/base/thread.cpp:245
+#: src/base/pth.cpp:38 src/base/pth.cpp:48 src/base/pth.cpp:61
+#: src/base/pth.cpp:74 src/base/pth.cpp:85 src/base/pth.cpp:95
+#: src/base/pth.cpp:108 src/base/pth.cpp:116 src/base/pth.cpp:124
+#: src/base/pth.cpp:204 src/base/pth.cpp:211 src/base/pth.cpp:225
+#: src/base/pth.cpp:245
 msgid "System function failed: "
 msgstr "系统函数失败："
 
-#: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
+#: src/base/tmr.cpp:63 src/base/tmr.cpp:72 src/base/tmr.cpp:81
 msgid "Cannot get time."
 msgstr "无法获取时间。"
 
@@ -238,999 +238,10 @@
 msgid "Subtitle stream %d not found."
 msgstr "字幕轨 %d 未找到。"
 
-#: src/dispatch.cpp:559 src/main.cpp:795
+#: src/dispatch.cpp:559 src/main.cpp:796
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "此 Bino 版本编译时未加入 Equalizer 支持。"
 
-#: src/gui.cpp:111
-msgid "Video:"
-msgstr "视频："
-
-#: src/gui.cpp:112
-msgid "Select the video stream."
-msgstr "选择视频流。"
-
-#: src/gui.cpp:118
-msgid "Audio:"
-msgstr "音频："
-
-#: src/gui.cpp:119
-msgid "Select the audio stream."
-msgstr "选择音轨"
-
-#: src/gui.cpp:125
-msgid "Subtitle:"
-msgstr "字幕："
-
-#: src/gui.cpp:126
-msgid "Select the subtitle stream."
-msgstr "选择字幕"
-
-#: src/gui.cpp:137 src/media_input.cpp:276
-msgid "Input:"
-msgstr "输入："
-
-#: src/gui.cpp:138
-msgid "Set the 3D layout of the video stream."
-msgstr "设置视频的 3D 布局"
-
-#: src/gui.cpp:142 src/main.cpp:459
-msgid "2D"
-msgstr "2D"
-
-#: src/gui.cpp:143 src/main.cpp:460
-msgid "Separate streams, left first"
-msgstr "独立视频流，左画面在前"
-
-#: src/gui.cpp:144 src/main.cpp:461
-msgid "Separate streams, right first"
-msgstr "独立视频流，右画面在前"
-
-#: src/gui.cpp:145 src/main.cpp:462
-msgid "Alternating, left first"
-msgstr "交错，左画面在前"
-
-#: src/gui.cpp:146 src/main.cpp:463
-msgid "Alternating, right first"
-msgstr "交错，右视角在前"
-
-#: 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: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:149 src/main.cpp:466
-msgid "Bottom/top"
-msgstr "左画面在下/右画面在上"
-
-#: src/gui.cpp:150 src/main.cpp:467
-msgid "Bottom/top, half height"
-msgstr "左画面在下/右画面在上，半高画面"
-
-#: 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:152 src/gui.cpp:174 src/gui.cpp:2215 src/gui.cpp:2244
-#: src/main.cpp:469 src/main.cpp:482
-msgid "Left/right, half width"
-msgstr "左画面在左/右画面在右，半宽画面"
-
-#: src/gui.cpp:153 src/main.cpp:470
-msgid "Right/left"
-msgstr "水平跨越（左画面在右/右画面在左）"
-
-#: src/gui.cpp:154 src/main.cpp:471
-msgid "Right/left, half width"
-msgstr "右画面在左/左画面在右，半宽画面"
-
-#: src/gui.cpp:155 src/gui.cpp:175 src/gui.cpp:2216 src/gui.cpp:2245
-#: src/main.cpp:472 src/main.cpp:483
-msgid "Even/odd rows"
-msgstr "隔行扫描，偶场为左画面"
-
-#: src/gui.cpp:156 src/main.cpp:473
-msgid "Odd/even rows"
-msgstr "隔行扫描，奇场为左画面"
-
-#: src/gui.cpp:162
-msgid "Output:"
-msgstr "输出："
-
-#: src/gui.cpp:163
-msgid "Set the 3D output type for your display."
-msgstr "设置 3D 输出显示类型"
-
-#: src/gui.cpp:167 src/gui.cpp:2210 src/gui.cpp:2239 src/main.cpp:477
-msgid "Left view"
-msgstr "仅左画面"
-
-#: src/gui.cpp:168 src/gui.cpp:2211 src/gui.cpp:2240 src/main.cpp:478
-msgid "Right view"
-msgstr "仅右画面"
-
-#: src/gui.cpp:169 src/main.cpp:475
-msgid "OpenGL stereo"
-msgstr "OpenGL 立体"
-
-#: src/gui.cpp:170 src/main.cpp:476
-msgid "Left/right alternating"
-msgstr "左右交错"
-
-#: src/gui.cpp:176 src/gui.cpp:2217 src/gui.cpp:2246 src/main.cpp:484
-msgid "Even/odd columns"
-msgstr "偶/奇列"
-
-#: src/gui.cpp:177 src/gui.cpp:2218 src/gui.cpp:2247 src/main.cpp:485
-msgid "Checkerboard pattern"
-msgstr "棋盘格模式"
-
-#: src/gui.cpp:178 src/main.cpp:486
-msgid "HDMI frame packing mode"
-msgstr "HDMI 帧封包模式"
-
-#: src/gui.cpp:179 src/gui.cpp:2219 src/gui.cpp:2248 src/main.cpp:487
-msgid "Red/cyan glasses, monochrome"
-msgstr "红蓝（cyan）眼镜，黑白"
-
-#: src/gui.cpp:180 src/gui.cpp:2220 src/gui.cpp:2249 src/main.cpp:488
-msgid "Red/cyan glasses, half color"
-msgstr "红蓝眼镜，半彩色"
-
-#: src/gui.cpp:181 src/gui.cpp:2221 src/gui.cpp:2250 src/main.cpp:489
-msgid "Red/cyan glasses, full color"
-msgstr "红蓝眼镜，全彩色"
-
-#: src/gui.cpp:182 src/gui.cpp:2222 src/gui.cpp:2251 src/main.cpp:490
-msgid "Red/cyan glasses, Dubois"
-msgstr "红蓝眼镜，Dubois"
-
-#: src/gui.cpp:183 src/gui.cpp:2223 src/gui.cpp:2252 src/main.cpp:491
-msgid "Green/magenta glasses, monochrome"
-msgstr "绿色/洋红眼镜，黑白"
-
-#: src/gui.cpp:184 src/gui.cpp:2224 src/gui.cpp:2253 src/main.cpp:492
-msgid "Green/magenta glasses, half color"
-msgstr "绿色/洋红眼镜，半彩色"
-
-#: src/gui.cpp:185 src/gui.cpp:2225 src/gui.cpp:2254 src/main.cpp:493
-msgid "Green/magenta glasses, full color"
-msgstr "绿色/洋红眼镜，全彩色"
-
-#: src/gui.cpp:186 src/gui.cpp:2226 src/gui.cpp:2255 src/main.cpp:494
-msgid "Green/magenta glasses, Dubois"
-msgstr "绿色/洋红眼镜，Dubois"
-
-#: src/gui.cpp:187 src/gui.cpp:2227 src/gui.cpp:2256 src/main.cpp:495
-msgid "Amber/blue glasses, monochrome"
-msgstr "黄蓝眼镜，黑白"
-
-#: src/gui.cpp:188 src/gui.cpp:2228 src/gui.cpp:2257 src/main.cpp:496
-msgid "Amber/blue glasses, half color"
-msgstr "黄蓝眼镜，半彩色"
-
-#: src/gui.cpp:189 src/gui.cpp:2229 src/gui.cpp:2258 src/main.cpp:497
-msgid "Amber/blue glasses, full color"
-msgstr "黄蓝眼镜，全彩色"
-
-#: src/gui.cpp:190 src/gui.cpp:2230 src/gui.cpp:2259 src/main.cpp:498
-msgid "Amber/blue glasses, Dubois"
-msgstr "黄蓝眼镜，Dubois"
-
-#: src/gui.cpp:191 src/gui.cpp:2231 src/gui.cpp:2260 src/main.cpp:499
-msgid "Red/green glasses, monochrome"
-msgstr "红绿眼镜，黑白"
-
-#: src/gui.cpp:192 src/gui.cpp:2232 src/gui.cpp:2261 src/main.cpp:500
-msgid "Red/blue glasses, monochrome"
-msgstr "红蓝眼镜"
-
-#: src/gui.cpp:196
-msgid "Swap left/right"
-msgstr "交换左右眼"
-
-#: src/gui.cpp:197
-msgid ""
-"Swap the left and right view. Use this if the 3D effect seems wrong."
-msgstr "交换左右眼视角画面，如果 3D 效果是错的话。"
-
-#: src/gui.cpp:475 src/gui.cpp:1736
-msgid "Off"
-msgstr "关闭"
-
-#: src/gui.cpp:706
-msgid ""
-"This slider shows the progress during video playback, and can be used to "
-"seek in the video."
-msgstr "此滑条显示视频播放进度，并可以用来快速定位到某个时间点。"
-
-#: src/gui.cpp:713
-msgid "Elapsed / total time."
-msgstr "已播放/总时长"
-
-#: src/gui.cpp:720
-msgid "Toggle audio mute."
-msgstr "静音开关"
-
-#: src/gui.cpp:725
-msgid "Adjust audio volume."
-msgstr "调节音量"
-
-#: src/gui.cpp:737
-msgid "Play."
-msgstr "播放"
-
-#: src/gui.cpp:741
-msgid "Pause."
-msgstr "暂停"
-
-#: src/gui.cpp:745
-msgid "Stop."
-msgstr "停止"
-
-#: src/gui.cpp:750
-msgid "Toggle loop mode."
-msgstr "切换循环播放"
-
-#: src/gui.cpp:757
-msgid ""
-"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
-"f key."
-msgstr "按“f”键切换全屏模式"
-
-#: src/gui.cpp:763
-msgid "Center the video area on your screen."
-msgstr "视频画面居中"
-
-#: src/gui.cpp:770
-msgid "Seek backward 10 minutes."
-msgstr "后退 10 分钟"
-
-#: src/gui.cpp:775
-msgid "Seek backward 1 minute."
-msgstr "后退 1 分钟"
-
-#: src/gui.cpp:781
-msgid "Seek backward 10 seconds."
-msgstr "后退 10 秒"
-
-#: src/gui.cpp:787
-msgid "Seek forward 10 seconds."
-msgstr "快进 10 秒"
-
-#: src/gui.cpp:792
-msgid "Seek forward 1 minute."
-msgstr "快进 1 分钟"
-
-#: src/gui.cpp:798
-msgid "Seek forward 10 minutes."
-msgstr "快进 10 分钟"
-
-#: src/gui.cpp:1059
-msgid "Fullscreen/Multiscreen Settings"
-msgstr "全屏/多画面设置"
-
-#: src/gui.cpp:1061
-msgid "Configure fullscreen mode:"
-msgstr "配置全屏幕模式"
-
-#: src/gui.cpp:1062
-msgid "Select the screens to use in fullscreen mode."
-msgstr "选择全屏模式要使用的屏幕"
-
-#: src/gui.cpp:1064
-msgid "Single screen:"
-msgstr "单个屏幕："
-
-#: src/gui.cpp:1065
-msgid "Use a single screen for fullscreen mode."
-msgstr "全屏时只使用一个屏幕"
-
-#: src/gui.cpp:1068
-msgid "Primary screen"
-msgstr "主屏幕"
-
-#: src/gui.cpp:1071 src/gui.cpp:1082 src/gui.cpp:1083
-#, c-format
-msgid "Screen %d"
-msgstr "屏幕 %d"
-
-#: src/gui.cpp:1074
-msgid "Dual screen:"
-msgstr "双屏幕："
-
-#: src/gui.cpp:1075
-msgid "Use two screens for fullscreen mode."
-msgstr "全屏时使用双屏幕"
-
-#: src/gui.cpp:1087
-msgid "Multi screen:"
-msgstr "多屏幕："
-
-#: src/gui.cpp:1088
-msgid "Use multiple screens for fullscreen mode."
-msgstr "全屏时使用多个屏幕"
-
-#: src/gui.cpp:1090
-msgid "Comma-separated list of screens to use for fullscreen mode."
-msgstr "全屏时使用的屏幕，用英文逗号分隔。"
-
-#: src/gui.cpp:1093
-msgid "When in fullscreen mode,"
-msgstr "全屏模式时，"
-
-#: src/gui.cpp:1094
-msgid "Set special left/right view handling for fullscreen mode."
-msgstr "全屏时设置特殊的左右画面处理方式。"
-
-#: src/gui.cpp:1096
-msgid "flip left view vertically."
-msgstr "左画面垂直翻转。"
-
-#: src/gui.cpp:1098
-msgid "flop left view horizontally."
-msgstr "左画面水平翻转。"
-
-#: src/gui.cpp:1100
-msgid "flip right view vertically."
-msgstr "右画面垂直翻转。"
-
-#: src/gui.cpp:1102
-msgid "flop right view horizontally."
-msgstr "右画面水平翻转。"
-
-#: src/gui.cpp:1105
-msgid "use DLP(R) 3-D Ready Sync"
-msgstr "使用 DLP(R) 3-D Ready Sync"
-
-#: src/gui.cpp:1106
-msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
-msgstr "为支持的输出模式使用 DLP&reg; 3-D Ready Sync。"
-
-#: src/gui.cpp:1108
-msgid "inhibit the screensaver"
-msgstr "禁用屏幕保护"
-
-#: src/gui.cpp:1109
-msgid "Inhibit the screensaver during fullscreen playback."
-msgstr "全屏播放时禁用屏幕保护"
-
-#: src/gui.cpp:1111 src/gui.cpp:1277 src/gui.cpp:1412 src/gui.cpp:1473
-#: src/gui.cpp:1538 src/gui.cpp:1616 src/gui.cpp:1740 src/gui.cpp:2025
-#: src/gui.cpp:2264 src/gui.cpp:2750 src/gui.cpp:3477 src/gui.cpp:3524
-#: src/gui.cpp:3841
-msgid "OK"
-msgstr "确认"
-
-#: src/gui.cpp:1230
-msgid "Display Color Adjustments"
-msgstr "颜色调整"
-
-#: src/gui.cpp:1232
-msgid "Contrast:"
-msgstr "对比度："
-
-#: src/gui.cpp:1243
-msgid "Brightness:"
-msgstr "亮度："
-
-#: src/gui.cpp:1254
-msgid "Hue:"
-msgstr "色调："
-
-#: src/gui.cpp:1265
-msgid "Saturation:"
-msgstr "饱和度："
-
-#: src/gui.cpp:1383
-msgid "Display Crosstalk Calibration"
-msgstr "窜扰调整"
-
-#. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/gui.cpp:1386
-msgid ""
-"Please read the manual to find out how to measure the crosstalk "
-"levels of your display."
-msgstr "请阅读用户手册以了解 如何调整您显示器的画面窜扰。"
-
-#: src/gui.cpp:1390
-msgid "Red:"
-msgstr "红色："
-
-#: src/gui.cpp:1397
-msgid "Green:"
-msgstr "绿色："
-
-#: src/gui.cpp:1404
-msgid "Blue:"
-msgstr "蓝色："
-
-#: src/gui.cpp:1460
-msgid "Rendering Quality Adjustments"
-msgstr "渲染质量调整"
-
-#: src/gui.cpp:1462
-msgid "Rendering Quality:"
-msgstr "渲染质量："
-
-#: src/gui.cpp:1516
-msgid "Zoom for wide videos"
-msgstr "宽屏视频缩放"
-
-#: src/gui.cpp:1519
-msgid ""
-"Set zoom level for videos that are wider than the screen: 0: Show "
-"full video width. 1: Use full screen height."
-msgstr ""
-"设置比屏幕宽的视频缩放比例： 0：显示画面完整宽度； 1：使用屏幕完全高"
-"度。<／p>"
-
-#: src/gui.cpp:1523
-msgid "Zoom:"
-msgstr "缩放："
-
-#: src/gui.cpp:1524
-msgid "Set the zoom level for videos that are wider than the screen."
-msgstr "设置比屏幕宽的视频缩放比例。"
-
-#: src/gui.cpp:1582
-msgid "Audio Settings"
-msgstr "音频设置"
-
-#: src/gui.cpp:1584
-msgid "Audio device:"
-msgstr "音频设备："
-
-#: src/gui.cpp:1585
-msgid ""
-"Select the audio device. This will take effect for the next started "
-"video."
-msgstr "选择声音设备。 播放下一个视频时其作用。"
-
-#: src/gui.cpp:1589 src/gui.cpp:2680
-msgid "Default"
-msgstr "默认"
-
-#: src/gui.cpp:1606
-msgid "Audio delay (ms):"
-msgstr "声音延迟（ms）："
-
-#: src/gui.cpp:1607
-msgid ""
-"Set an audio delay, in milliseconds. This is useful if audio and video "
-"are not in sync."
-msgstr "设置声音延迟，单位为毫秒。 音视频不同步时使用。"
-
-#: src/gui.cpp:1664
-msgid "Subtitle Settings"
-msgstr "字幕设置"
-
-#: src/gui.cpp:1667
-msgid ""
-"These settings apply only to soft subtitles, not to bitmaps. Some "
-"changes require a restart of the video to take effect."
-msgstr "此设置只对软字幕有作用， 有些改动需要重新播放视频。"
-
-#: src/gui.cpp:1670
-msgid "Encoding:"
-msgstr "编码："
-
-#: src/gui.cpp:1671
-msgid "Set the subtitle character set encoding."
-msgstr "设置字幕编码"
-
-#: src/gui.cpp:1686
-msgid "Override font:"
-msgstr "设置字体："
-
-#: src/gui.cpp:1687
-msgid "Override the subtitle font family."
-msgstr "强制使用某个字体族"
-
-#: src/gui.cpp:1696
-msgid "Override font size:"
-msgstr "设置字体大小："
-
-#: src/gui.cpp:1697
-msgid "Override the subtitle font size."
-msgstr "强制指定字幕字体大小"
-
-#: src/gui.cpp:1707
-msgid "Override scale factor:"
-msgstr "设置缩放比例"
-
-#: src/gui.cpp:1708
-msgid "Override the subtitle scale factor."
-msgstr "强制指定字幕的缩放比例"
-
-#: src/gui.cpp:1719
-msgid "Override color:"
-msgstr "设置颜色"
-
-#: src/gui.cpp:1720
-msgid "Override the subtitle color."
-msgstr "强制字幕使用某一颜色"
-
-#: src/gui.cpp:1729
-msgid "Override shadow:"
-msgstr "设置字幕阴影"
-
-#: src/gui.cpp:1730
-msgid "Override the subtitle shadow."
-msgstr "强制打开或关闭字幕阴影"
-
-#: src/gui.cpp:1735
-msgid "On"
-msgstr "确认"
-
-#: src/gui.cpp:1946
-msgid "Video Settings"
-msgstr "视频设置"
-
-#: src/gui.cpp:1948
-msgid "Crop to aspect ratio:"
-msgstr "剪裁到指定宽高比："
-
-#: src/gui.cpp:1949
-msgid ""
-"Set the real aspect ratio of the video, so that borders can be cropped.</"
-"p>"
-msgstr "设置视频的实际宽高比，以便裁掉黑边。"
-
-#: src/gui.cpp:1952
-msgid "Do not crop"
-msgstr "不剪裁"
-
-#: src/gui.cpp:1965
-msgid "Force source aspect ratio:"
-msgstr "强制视频源宽高比："
-
-#: src/gui.cpp:1966
-msgid "Force the aspect ratio of video source."
-msgstr "强制指定来源视频的宽高比。"
-
-#: src/gui.cpp:1969
-msgid "Do not force"
-msgstr "不指定宽高比"
-
-#: src/gui.cpp:1982
-msgid "Parallax:"
-msgstr "视差："
-
-#: src/gui.cpp:1983
-msgid ""
-"Adjust parallax, from -1 to +1. This changes the separation of left and "
-"right view, and thus the perceived distance of the scene."
-msgstr "调整视差，范围从 -1 到 1。 使感知到的深度发生变化。"
-
-#: src/gui.cpp:1996
-msgid "Subtitle parallax:"
-msgstr "字幕视差："
-
-#: src/gui.cpp:1997
-msgid ""
-"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
-"distance of the subtitles."
-msgstr "调整字幕视差，范围从 -1 到 1。 使感知到的字幕深度发生变化。"
-
-#: src/gui.cpp:2010
-msgid "Ghostbusting:"
-msgstr "消除重影："
-
-#: src/gui.cpp:2011
-msgid ""
-"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
-"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
-"does not work with anaglyph glasses."
-msgstr ""
-"设置窜扰消除重影级别，从 0 到 1。 请先调整显示器的窜扰级别， 此调整"
-"对色分眼睛无效。"
-
-#: src/gui.cpp:2195
-msgid "SDI Output Settings"
-msgstr "SDI 输出设置"
-
-#: src/gui.cpp:2197
-msgid "SDI Output Format:"
-msgstr "SDI 输出格式："
-
-#: src/gui.cpp:2198
-msgid "Select output format used for SDI output."
-msgstr "选择用于 SDI 输出的输出格式"
-
-#: src/gui.cpp:2206
-msgid "Left stereo mode:"
-msgstr "左视角立体模式："
-
-#: src/gui.cpp:2207
-msgid "Select stereo mode used for left SDI output."
-msgstr "选择用于左视角 SDI 输出的立体模式"
-
-#: src/gui.cpp:2235
-msgid "Right stereo mode:"
-msgstr "右视角立体模式："
-
-#: src/gui.cpp:2236
-msgid "Select stereo mode used for right SDI output."
-msgstr "选择用于右视角 SDI 输出的立体模式"
-
-#: src/gui.cpp:2676
-msgid "Open device(s)"
-msgstr "打开设备："
-
-#: src/gui.cpp:2679
-msgid "Choose a device type."
-msgstr "选择一个设备类型"
-
-#: src/gui.cpp:2681 src/media_object.cpp:831
-msgid "Firewire"
-msgstr "火线"
-
-#: src/gui.cpp:2682 src/media_object.cpp:832
-msgid "X11"
-msgstr "X11"
-
-#: src/gui.cpp:2685 src/gui.cpp:2688
-msgid "Choose a device."
-msgstr "选择一个设备"
-
-#: src/gui.cpp:2691
-msgid "Set the X11 device string. Refer to the manual for details."
-msgstr "设置 X11 设备字符串，详情请参阅手册。"
-
-#: src/gui.cpp:2715
-msgid "First device:"
-msgstr "第一个设备："
-
-#: src/gui.cpp:2716
-msgid "Second device:"
-msgstr "第二个设备："
-
-#: src/gui.cpp:2720
-msgid "Request frame size"
-msgstr "请求帧大小"
-
-#: src/gui.cpp:2721
-msgid ""
-"Request a specific frame size from the device, e.g. 640x480. The device "
-"must support this frame size. Some devices require a frame size to be "
-"selected."
-msgstr ""
-"从设备请求一个特定尺寸的画面，比如 640x480。 设备必须支持该帧尺寸，一些"
-"设备要求选择帧尺寸。"
-
-#: src/gui.cpp:2732
-msgid "Request frame rate"
-msgstr "请求帧率"
-
-#: src/gui.cpp:2733
-msgid ""
-"Request a specific frame rate from the device, e.g. 25/1. The device must "
-"support this frame rate. Some devices require a frame rate to be selected.</"
-"p>"
-msgstr ""
-"从设备请求一个特定帧率，比如 25/1。 设备必须支持该帧率，一些设备要求选"
-"择帧率。"
-
-#: src/gui.cpp:2744
-msgid "Request MJPEG format"
-msgstr "请求 MJPEG 格式"
-
-#: src/gui.cpp:2745
-msgid ""
-"Request MJPEG data from the input device. The device may ignore this "
-"request."
-msgstr "从输入设备请求 MJPEG 数据，该设备可能忽略此请求。"
-
-#: src/gui.cpp:2748 src/gui.cpp:3523
-msgid "Cancel"
-msgstr "取消"
-
-#: src/gui.cpp:3046
-msgid "&File"
-msgstr "文件(&F)"
-
-#: src/gui.cpp:3047
-msgid "&Open file(s)..."
-msgstr "打开文件(&O)..."
-
-#: src/gui.cpp:3052
-msgid "Open &URL(s)..."
-msgstr "打开网址(&U)..."
-
-#: src/gui.cpp:3056
-msgid "Open &device(s)..."
-msgstr "打开设备(&D)..."
-
-#: src/gui.cpp:3071
-msgid "&Clear recent files"
-msgstr "清除最近打开文件(&C)"
-
-#: src/gui.cpp:3079
-msgid "&Quit"
-msgstr "退出(&Q)"
-
-#: src/gui.cpp:3085
-msgid "&Preferences"
-msgstr "首选项(&P)"
-
-#: src/gui.cpp:3088
-msgid "&Fullscreen Settings..."
-msgstr "全屏幕设定(&F)…"
-
-#: src/gui.cpp:3091
-msgid "Display &Color Adjustments..."
-msgstr "显示和颜色调整(&C)…"
-
-#: src/gui.cpp:3094
-msgid "Display Cross&talk Calibration..."
-msgstr "显示器窜扰调整(&T)…"
-
-#: src/gui.cpp:3098
-msgid "Quality Adjustments..."
-msgstr "质量调整…"
-
-#: src/gui.cpp:3102
-msgid "&Zoom for wide videos..."
-msgstr "宽屏视频缩放(&Z)"
-
-#: src/gui.cpp:3106
-msgid "&Audio Settings..."
-msgstr "声音设定(&A)…"
-
-#: src/gui.cpp:3110
-msgid "&Subtitle Settings..."
-msgstr "字幕设定(&S)…"
-
-#: src/gui.cpp:3114
-msgid "Current &Video Settings..."
-msgstr "当前视频设定(&V)…"
-
-#: src/gui.cpp:3119
-msgid "SDI &Output Settings..."
-msgstr "SDI 输出设置(&O)…"
-
-#: src/gui.cpp:3123
-msgid "&Help"
-msgstr "帮助(&H)"
-
-#: src/gui.cpp:3124
-msgid "&Manual..."
-msgstr "手册(&M)..."
-
-#: src/gui.cpp:3129
-msgid "&Website..."
-msgstr "网站(&W)..."
-
-#: src/gui.cpp:3133
-msgid "&Keyboard Shortcuts"
-msgstr "快捷键(&K)"
-
-#: src/gui.cpp:3137
-msgid "&About"
-msgstr "关于(&A)"
-
-#: src/gui.cpp:3470
-msgid "Tip"
-msgstr "技巧"
-
-#: src/gui.cpp:3473
-msgid ""
-"You can select and open multiple files at once.This is useful for "
-"example if you have extra subtitle files, or if left and right view are "
-"stored in separate files."
-msgstr ""
-"你可以选择打开多个文件。这在有多个字幕文件，或左右眼在不同文件的情"
-"况时很方便。"
-
-#: src/gui.cpp:3476
-msgid "Do not show this message again."
-msgstr "不再显示此消息。"
-
-#: src/gui.cpp:3493
-msgid "Open files"
-msgstr "打开文件"
-
-#: src/gui.cpp:3517
-msgid "Open URL(s)"
-msgstr "打开网址"
-
-#: src/gui.cpp:3518
-msgid "URL(s):"
-msgstr "网址："
-
-#: src/gui.cpp:3519
-msgid "Enter one or more space separated URLs."
-msgstr "输入一个网址或空格分开的多个网址。"
-
-#: src/gui.cpp:3732 src/gui.cpp:3740 src/video_output_qt.cpp:291
-#: src/video_output_qt.cpp:534 src/video_output_qt.cpp:731
-#: src/video_output_qt.cpp:743 src/video_output_qt.cpp:764
-msgid "Error"
-msgstr "错误"
-
-#: src/gui.cpp:3732
-msgid "Cannot open manual."
-msgstr "无法打开用户手册"
-
-#: src/gui.cpp:3740
-msgid "Cannot open website."
-msgstr "无法打开网站"
-
-#: src/gui.cpp:3748
-msgid "Keyboard Shortcuts"
-msgstr "快捷键"
-
-#: src/gui.cpp:3751
-msgid "Keyboard control:"
-msgstr "按键："
-
-#: src/gui.cpp:3753 src/main.cpp:534
-msgid "ESC"
-msgstr "ESC"
-
-#: src/gui.cpp:3753
-msgid "Stop"
-msgstr "停止"
-
-#: src/gui.cpp:3754 src/main.cpp:536
-msgid "SPACE"
-msgstr "空格"
-
-#: src/gui.cpp:3754 src/main.cpp:536
-msgid "Pause / unpause"
-msgstr "暂停/继续"
-
-#: src/gui.cpp:3755 src/main.cpp:537
-msgid "Toggle fullscreen"
-msgstr "切换全屏"
-
-#: src/gui.cpp:3756 src/main.cpp:538
-msgid "Center window"
-msgstr "窗口居中"
-
-#: src/gui.cpp:3757 src/main.cpp:539
-msgid "Swap left/right eye"
-msgstr "交换左右眼"
-
-#: src/gui.cpp:3758 src/main.cpp:540
-msgid "Cycle through available video streams"
-msgstr "循环切换多个视频流"
-
-#: src/gui.cpp:3759 src/main.cpp:541
-msgid "Cycle through available audio streams"
-msgstr "循环切换多个音轨"
-
-#: src/gui.cpp:3760 src/main.cpp:542
-msgid "Cycle through available subtitle streams"
-msgstr "循环切换字幕"
-
-#: src/gui.cpp:3761 src/main.cpp:543
-msgid "Adjust contrast"
-msgstr "调整对比度"
-
-#: src/gui.cpp:3762 src/main.cpp:544
-msgid "Adjust brightness"
-msgstr "调整亮度"
-
-#: src/gui.cpp:3763 src/main.cpp:545
-msgid "Adjust hue"
-msgstr "调整色调"
-
-#: src/gui.cpp:3764 src/main.cpp:546
-msgid "Adjust saturation"
-msgstr "调整饱和度"
-
-#: src/gui.cpp:3765 src/main.cpp:547
-msgid "Adjust parallax"
-msgstr "调整视差"
-
-#: src/gui.cpp:3766 src/main.cpp:548
-msgid "Adjust ghostbusting"
-msgstr "消重影调整"
-
-#: src/gui.cpp:3767 src/main.cpp:549
-msgid "Adjust zoom for wide videos"
-msgstr "调整宽屏视频的缩放"
-
-#: src/gui.cpp:3768 src/main.cpp:550
-msgid "Adjust audio volume"
-msgstr "调整音量"
-
-#: src/gui.cpp:3769 src/main.cpp:551
-msgid "Toggle audio mute"
-msgstr "切换静音"
-
-#: src/gui.cpp:3770 src/main.cpp:552
-msgid "Step a single video frame forward"
-msgstr "向前一帧"
-
-#: src/gui.cpp:3771 src/main.cpp:553
-msgid "left, right"
-msgstr "左，右"
-
-#: src/gui.cpp:3771 src/main.cpp:553
-msgid "Seek 10 seconds backward / forward"
-msgstr "快退/快进10秒"
-
-#: src/gui.cpp:3772 src/main.cpp:554
-msgid "down, up"
-msgstr "向下箭头，向上箭头"
-
-#: src/gui.cpp:3772 src/main.cpp:554
-msgid "Seek 1 minute backward / forward"
-msgstr "快退/快进1分钟"
-
-#: src/gui.cpp:3773 src/main.cpp:555
-msgid "page down, page up"
-msgstr "page down, page up"
-
-#: src/gui.cpp:3773 src/main.cpp:555
-msgid "Seek 10 minutes backward / forward"
-msgstr "快退/快进10分钟"
-
-#: src/gui.cpp:3774 src/main.cpp:557
-msgid "Media keys"
-msgstr "媒体键"
-
-#: src/gui.cpp:3774 src/main.cpp:557
-msgid "Media keys should work as expected"
-msgstr "媒体键应该可以用"
-
-#: src/gui.cpp:3790
-#, c-format
-msgid "About %s"
-msgstr " 关于 %s"
-
-#: src/gui.cpp:3796
-#, c-format
-msgid "The %s 3D video player"
-msgstr "3D 视频播放器 %s"
-
-#: src/gui.cpp:3801
-#, c-format
-msgid ""
-"%s version %s.Copyright (C) 2014 the Bino developers.This "
-"is free software. You may redistribute copies of it under the terms of the "
-"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
-"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
-"\"%s\">%s</a> for more information on this software."
-msgstr ""
-"%s 版本 %s。Bino 开发者版权所有 (C) 2014。本软件是自由软件，"
-"你可以在 <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU GPL</a> 许可证"
-"下重新发布。在法律所允许的范围内，本软件不带任何的保证。要获取更多本软"
-"件的信息，请参见 <a href=\"%s\">%s</a>。"
-
-#: src/gui.cpp:3813 src/main.cpp:419
-msgid "Platform:"
-msgstr "平台："
-
-#: src/gui.cpp:3814 src/main.cpp:421
-msgid "Libraries used:"
-msgstr "使用的程序库："
-
-#: src/gui.cpp:3836
-msgid "About"
-msgstr "关于"
-
-#: src/gui.cpp:3837
-msgid "Libraries"
-msgstr "程序库"
-
-#: src/gui.cpp:3838
-msgid "Team"
-msgstr "团队"
-
-#: src/gui.cpp:3839
-msgid "License"
-msgstr "许可证"
-
 #: src/lib_versions.cpp:183 src/lib_versions.cpp:195
 msgid "not used"
 msgstr "未使用"
@@ -1271,7 +282,8 @@
 msgstr "%s 版本 %s"
 
 #: src/main.cpp:415
-msgid "Copyright (C) 2014 the Bino developers."
+#, fuzzy
+msgid "Copyright (C) 2016 the Bino developers."
 msgstr "Bino 开发者版权所有 (C) 2014。"
 
 #: src/main.cpp:416
@@ -1283,6 +295,14 @@
 "本软件是自由软件，你可以在 GNU GPL 许可证下重新发布。在法律所允许的范围内，本"
 "软件不带任何的保证。"
 
+#: src/main.cpp:419
+msgid "Platform:"
+msgstr "平台："
+
+#: src/main.cpp:421
+msgid "Libraries used:"
+msgstr "使用的程序库："
+
 #. TRANSLATORS: This is the --help text. Please keep the line length limited.
 #. * The --help output should look good with a line width of 80 characters.
 #: src/main.cpp:434
@@ -1381,10 +401,154 @@
 msgid "Select input type (default autodetect):"
 msgstr "选择输入类型（默认为自动检测）："
 
+#: src/main.cpp:459
+msgid "2D"
+msgstr "2D"
+
+#: src/main.cpp:460
+msgid "Separate streams, left first"
+msgstr "独立视频流，左画面在前"
+
+#: src/main.cpp:461
+msgid "Separate streams, right first"
+msgstr "独立视频流，右画面在前"
+
+#: src/main.cpp:462
+msgid "Alternating, left first"
+msgstr "交错，左画面在前"
+
+#: src/main.cpp:463
+msgid "Alternating, right first"
+msgstr "交错，右视角在前"
+
+#: src/main.cpp:464 src/main.cpp:479
+msgid "Top/bottom"
+msgstr "左画面在上/右画面在下"
+
+#: src/main.cpp:465 src/main.cpp:480
+msgid "Top/bottom, half height"
+msgstr "左画面在上/右画面在下，半高画面"
+
+#: src/main.cpp:466
+msgid "Bottom/top"
+msgstr "左画面在下/右画面在上"
+
+#: src/main.cpp:467
+msgid "Bottom/top, half height"
+msgstr "左画面在下/右画面在上，半高画面"
+
+#: src/main.cpp:468 src/main.cpp:481
+msgid "Left/right"
+msgstr "水平跨越（左画面在左/右画面在右）"
+
+#: src/main.cpp:469 src/main.cpp:482
+msgid "Left/right, half width"
+msgstr "左画面在左/右画面在右，半宽画面"
+
+#: src/main.cpp:470
+msgid "Right/left"
+msgstr "水平跨越（左画面在右/右画面在左）"
+
+#: src/main.cpp:471
+msgid "Right/left, half width"
+msgstr "右画面在左/左画面在右，半宽画面"
+
+#: src/main.cpp:472 src/main.cpp:483
+msgid "Even/odd rows"
+msgstr "隔行扫描，偶场为左画面"
+
+#: src/main.cpp:473
+msgid "Odd/even rows"
+msgstr "隔行扫描，奇场为左画面"
+
 #: src/main.cpp:474
 msgid "Select output type:"
 msgstr "选择输出类型："
 
+#: src/main.cpp:475
+msgid "OpenGL stereo"
+msgstr "OpenGL 立体"
+
+#: src/main.cpp:476
+msgid "Left/right alternating"
+msgstr "左右交错"
+
+#: src/main.cpp:477
+msgid "Left view"
+msgstr "仅左画面"
+
+#: src/main.cpp:478
+msgid "Right view"
+msgstr "仅右画面"
+
+#: src/main.cpp:484
+msgid "Even/odd columns"
+msgstr "偶/奇列"
+
+#: src/main.cpp:485
+msgid "Checkerboard pattern"
+msgstr "棋盘格模式"
+
+#: src/main.cpp:486
+msgid "HDMI frame packing mode"
+msgstr "HDMI 帧封包模式"
+
+#: src/main.cpp:487
+msgid "Red/cyan glasses, monochrome"
+msgstr "红蓝（cyan）眼镜，黑白"
+
+#: src/main.cpp:488
+msgid "Red/cyan glasses, half color"
+msgstr "红蓝眼镜，半彩色"
+
+#: src/main.cpp:489
+msgid "Red/cyan glasses, full color"
+msgstr "红蓝眼镜，全彩色"
+
+#: src/main.cpp:490
+msgid "Red/cyan glasses, Dubois"
+msgstr "红蓝眼镜，Dubois"
+
+#: src/main.cpp:491
+msgid "Green/magenta glasses, monochrome"
+msgstr "绿色/洋红眼镜，黑白"
+
+#: src/main.cpp:492
+msgid "Green/magenta glasses, half color"
+msgstr "绿色/洋红眼镜，半彩色"
+
+#: src/main.cpp:493
+msgid "Green/magenta glasses, full color"
+msgstr "绿色/洋红眼镜，全彩色"
+
+#: src/main.cpp:494
+msgid "Green/magenta glasses, Dubois"
+msgstr "绿色/洋红眼镜，Dubois"
+
+#: src/main.cpp:495
+msgid "Amber/blue glasses, monochrome"
+msgstr "黄蓝眼镜，黑白"
+
+#: src/main.cpp:496
+msgid "Amber/blue glasses, half color"
+msgstr "黄蓝眼镜，半彩色"
+
+#: src/main.cpp:497
+msgid "Amber/blue glasses, full color"
+msgstr "黄蓝眼镜，全彩色"
+
+#: src/main.cpp:498
+msgid "Amber/blue glasses, Dubois"
+msgstr "黄蓝眼镜，Dubois"
+
+#: src/main.cpp:499
+msgid "Red/green glasses, monochrome"
+msgstr "红绿眼镜，黑白"
+
+#: src/main.cpp:500
+msgid "Red/blue glasses, monochrome"
+msgstr "红蓝眼镜"
+
 #: src/main.cpp:501
 msgid "Multi-display via Equalizer (2D setup)"
 msgstr "使用 Equalizer（2D 设置）的多显示输出"
@@ -1514,6 +678,10 @@
 msgstr "交互控制："
 
 #: src/main.cpp:534
+msgid "ESC"
+msgstr "ESC"
+
+#: src/main.cpp:534
 msgid "Leave fullscreen mode, or quit"
 msgstr "离开全屏模式，或退出"
 
@@ -1521,6 +689,102 @@
 msgid "Quit"
 msgstr "退出"
 
+#: src/main.cpp:536
+msgid "SPACE"
+msgstr "空格"
+
+#: src/main.cpp:536
+msgid "Pause / unpause"
+msgstr "暂停/继续"
+
+#: src/main.cpp:537
+msgid "Toggle fullscreen"
+msgstr "切换全屏"
+
+#: src/main.cpp:538
+msgid "Center window"
+msgstr "窗口居中"
+
+#: src/main.cpp:539
+msgid "Swap left/right eye"
+msgstr "交换左右眼"
+
+#: src/main.cpp:540
+msgid "Cycle through available video streams"
+msgstr "循环切换多个视频流"
+
+#: src/main.cpp:541
+msgid "Cycle through available audio streams"
+msgstr "循环切换多个音轨"
+
+#: src/main.cpp:542
+msgid "Cycle through available subtitle streams"
+msgstr "循环切换字幕"
+
+#: src/main.cpp:543
+msgid "Adjust contrast"
+msgstr "调整对比度"
+
+#: src/main.cpp:544
+msgid "Adjust brightness"
+msgstr "调整亮度"
+
+#: src/main.cpp:545
+msgid "Adjust hue"
+msgstr "调整色调"
+
+#: src/main.cpp:546
+msgid "Adjust saturation"
+msgstr "调整饱和度"
+
+#: src/main.cpp:547
+msgid "Adjust parallax"
+msgstr "调整视差"
+
+#: src/main.cpp:548
+msgid "Adjust ghostbusting"
+msgstr "消重影调整"
+
+#: src/main.cpp:549
+msgid "Adjust zoom for wide videos"
+msgstr "调整宽屏视频的缩放"
+
+#: src/main.cpp:550
+msgid "Adjust audio volume"
+msgstr "调整音量"
+
+#: src/main.cpp:551
+msgid "Toggle audio mute"
+msgstr "切换静音"
+
+#: src/main.cpp:552
+msgid "Step a single video frame forward"
+msgstr "向前一帧"
+
+#: src/main.cpp:553
+msgid "left, right"
+msgstr "左，右"
+
+#: src/main.cpp:553
+msgid "Seek 10 seconds backward / forward"
+msgstr "快退/快进10秒"
+
+#: src/main.cpp:554
+msgid "down, up"
+msgstr "向下箭头，向上箭头"
+
+#: src/main.cpp:554
+msgid "Seek 1 minute backward / forward"
+msgstr "快退/快进1分钟"
+
+#: src/main.cpp:555
+msgid "page down, page up"
+msgstr "page down, page up"
+
+#: src/main.cpp:555
+msgid "Seek 10 minutes backward / forward"
+msgstr "快退/快进10分钟"
+
 #: src/main.cpp:556
 msgid "Mouse click"
 msgstr "鼠标点击"
@@ -1529,20 +793,28 @@
 msgid "Seek according to horizontal click position"
 msgstr "根据水平点击的位置定位播放位置"
 
-#: src/main.cpp:626
+#: src/main.cpp:557
+msgid "Media keys"
+msgstr "媒体键"
+
+#: src/main.cpp:557
+msgid "Media keys should work as expected"
+msgstr "媒体键应该可以用"
+
+#: src/main.cpp:627
 msgid "No audio devices known."
 msgstr "无已知音频设备。"
 
-#: src/main.cpp:641
+#: src/main.cpp:642
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "性能测试模式：禁用音频和时间同步"
 
-#: src/main.cpp:655
+#: src/main.cpp:656
 #, c-format
 msgid "Unknown mode %s."
 msgstr "未知模式 %s。"
 
-#: src/main.cpp:787
+#: src/main.cpp:788
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "此 Bino 版本编译时启用了 LIRC 支持。"
 
@@ -1558,6 +830,10 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d ch., %g kHz, %d bit"
 
+#: src/media_input.cpp:276
+msgid "Input:"
+msgstr "输入："
+
 #: src/media_input.cpp:281
 #, c-format
 msgid "Video %s: %s"
@@ -1615,6 +891,14 @@
 msgid "No support available for %s device."
 msgstr "不支持 %s 设备。"
 
+#: src/media_object.cpp:831
+msgid "Firewire"
+msgstr "火线"
+
+#: src/media_object.cpp:832
+msgid "X11"
+msgstr "X11"
+
 #: src/media_object.cpp:833
 msgid "default"
 msgstr "默认"
@@ -1820,6 +1104,12 @@
 msgid "Cannot create a PBO buffer."
 msgstr "无法创建一个 PBO 缓冲。"
 
+#: src/video_output_qt.cpp:291 src/video_output_qt.cpp:534
+#: src/video_output_qt.cpp:731 src/video_output_qt.cpp:743
+#: src/video_output_qt.cpp:764
+msgid "Error"
+msgstr "错误"
+
 #: src/video_output_qt.cpp:636
 #, c-format
 msgid "Cannot initialize GLEW: %s"
@@ -1853,5 +1143,545 @@
 msgid "Cannot resume screensaver."
 msgstr "无法恢复屏幕保护程序。"
 
+#~ msgid "Video:"
+#~ msgstr "视频："
+
+#~ msgid "Select the video stream."
+#~ msgstr "选择视频流。"
+
+#~ msgid "Audio:"
+#~ msgstr "音频："
+
+#~ msgid "Select the audio stream."
+#~ msgstr "选择音轨"
+
+#~ msgid "Subtitle:"
+#~ msgstr "字幕："
+
+#~ msgid "Select the subtitle stream."
+#~ msgstr "选择字幕"
+
+#~ msgid "Set the 3D layout of the video stream."
+#~ msgstr "设置视频的 3D 布局"
+
+#~ msgid "Output:"
+#~ msgstr "输出："
+
+#~ msgid "Set the 3D output type for your display."
+#~ msgstr "设置 3D 输出显示类型"
+
+#~ msgid "Swap left/right"
+#~ msgstr "交换左右眼"
+
+#~ msgid ""
+#~ "Swap the left and right view. Use this if the 3D effect seems wrong.</"
+#~ "p>"
+#~ msgstr "交换左右眼视角画面，如果 3D 效果是错的话。"
+
+#~ msgid "Off"
+#~ msgstr "关闭"
+
+#~ msgid ""
+#~ "This slider shows the progress during video playback, and can be used "
+#~ "to seek in the video."
+#~ msgstr "此滑条显示视频播放进度，并可以用来快速定位到某个时间点。"
+
+#~ msgid "Elapsed / total time."
+#~ msgstr "已播放/总时长"
+
+#~ msgid "Toggle audio mute."
+#~ msgstr "静音开关"
+
+#~ msgid "Adjust audio volume."
+#~ msgstr "调节音量"
+
+#~ msgid "Play."
+#~ msgstr "播放"
+
+#~ msgid "Pause."
+#~ msgstr "暂停"
+
+#~ msgid "Stop."
+#~ msgstr "停止"
+
+#~ msgid "Toggle loop mode."
+#~ msgstr "切换循环播放"
+
+#~ msgid ""
+#~ "Switch to fullscreen mode. You can leave fullscreen mode by pressing "
+#~ "the f key."
+#~ msgstr "按“f”键切换全屏模式"
+
+#~ msgid "Center the video area on your screen."
+#~ msgstr "视频画面居中"
+
+#~ msgid "Seek backward 10 minutes."
+#~ msgstr "后退 10 分钟"
+
+#~ msgid "Seek backward 1 minute."
+#~ msgstr "后退 1 分钟"
+
+#~ msgid "Seek backward 10 seconds."
+#~ msgstr "后退 10 秒"
+
+#~ msgid "Seek forward 10 seconds."
+#~ msgstr "快进 10 秒"
+
+#~ msgid "Seek forward 1 minute."
+#~ msgstr "快进 1 分钟"
+
+#~ msgid "Seek forward 10 minutes."
+#~ msgstr "快进 10 分钟"
+
+#~ msgid "Fullscreen/Multiscreen Settings"
+#~ msgstr "全屏/多画面设置"
+
+#~ msgid "Configure fullscreen mode:"
+#~ msgstr "配置全屏幕模式"
+
+#~ msgid "Select the screens to use in fullscreen mode."
+#~ msgstr "选择全屏模式要使用的屏幕"
+
+#~ msgid "Single screen:"
+#~ msgstr "单个屏幕："
+
+#~ msgid "Use a single screen for fullscreen mode."
+#~ msgstr "全屏时只使用一个屏幕"
+
+#~ msgid "Primary screen"
+#~ msgstr "主屏幕"
+
+#~ msgid "Screen %d"
+#~ msgstr "屏幕 %d"
+
+#~ msgid "Dual screen:"
+#~ msgstr "双屏幕："
+
+#~ msgid "Use two screens for fullscreen mode."
+#~ msgstr "全屏时使用双屏幕"
+
+#~ msgid "Multi screen:"
+#~ msgstr "多屏幕："
+
+#~ msgid "Use multiple screens for fullscreen mode."
+#~ msgstr "全屏时使用多个屏幕"
+
+#~ msgid "Comma-separated list of screens to use for fullscreen mode."
+#~ msgstr "全屏时使用的屏幕，用英文逗号分隔。"
+
+#~ msgid "When in fullscreen mode,"
+#~ msgstr "全屏模式时，"
+
+#~ msgid "Set special left/right view handling for fullscreen mode."
+#~ msgstr "全屏时设置特殊的左右画面处理方式。"
+
+#~ msgid "flip left view vertically."
+#~ msgstr "左画面垂直翻转。"
+
+#~ msgid "flop left view horizontally."
+#~ msgstr "左画面水平翻转。"
+
+#~ msgid "flip right view vertically."
+#~ msgstr "右画面垂直翻转。"
+
+#~ msgid "flop right view horizontally."
+#~ msgstr "右画面水平翻转。"
+
+#~ msgid "use DLP(R) 3-D Ready Sync"
+#~ msgstr "使用 DLP(R) 3-D Ready Sync"
+
+#~ msgid "Use DLP&reg; 3-D Ready Sync for supported output modes."
+#~ msgstr "为支持的输出模式使用 DLP&reg; 3-D Ready Sync。"
+
+#~ msgid "inhibit the screensaver"
+#~ msgstr "禁用屏幕保护"
+
+#~ msgid "Inhibit the screensaver during fullscreen playback."
+#~ msgstr "全屏播放时禁用屏幕保护"
+
+#~ msgid "OK"
+#~ msgstr "确认"
+
+#~ msgid "Display Color Adjustments"
+#~ msgstr "颜色调整"
+
+#~ msgid "Contrast:"
+#~ msgstr "对比度："
+
+#~ msgid "Brightness:"
+#~ msgstr "亮度："
+
+#~ msgid "Hue:"
+#~ msgstr "色调："
+
+#~ msgid "Saturation:"
+#~ msgstr "饱和度："
+
+#~ msgid "Display Crosstalk Calibration"
+#~ msgstr "窜扰调整"
+
+#~ msgid ""
+#~ "Please read the manual to find out how to measure the crosstalk "
+#~ "levels of your display."
+#~ msgstr "请阅读用户手册以了解 如何调整您显示器的画面窜扰。"
+
+#~ msgid "Red:"
+#~ msgstr "红色："
+
+#~ msgid "Green:"
+#~ msgstr "绿色："
+
+#~ msgid "Blue:"
+#~ msgstr "蓝色："
+
+#~ msgid "Rendering Quality Adjustments"
+#~ msgstr "渲染质量调整"
+
+#~ msgid "Rendering Quality:"
+#~ msgstr "渲染质量："
+
+#~ msgid "Zoom for wide videos"
+#~ msgstr "宽屏视频缩放"
+
+#~ msgid ""
+#~ "Set zoom level for videos that are wider than the screen: 0: "
+#~ "Show full video width. 1: Use full screen height."
+#~ msgstr ""
+#~ "设置比屏幕宽的视频缩放比例： 0：显示画面完整宽度； 1：使用屏幕完"
+#~ "全高度。<／p>"
+
+#~ msgid "Zoom:"
+#~ msgstr "缩放："
+
+#~ msgid "Set the zoom level for videos that are wider than the screen."
+#~ msgstr "设置比屏幕宽的视频缩放比例。"
+
+#~ msgid "Audio Settings"
+#~ msgstr "音频设置"
+
+#~ msgid "Audio device:"
+#~ msgstr "音频设备："
+
+#~ msgid ""
+#~ "Select the audio device. This will take effect for the next started "
+#~ "video."
+#~ msgstr "选择声音设备。 播放下一个视频时其作用。"
+
+#~ msgid "Default"
+#~ msgstr "默认"
+
+#~ msgid "Audio delay (ms):"
+#~ msgstr "声音延迟（ms）："
+
+#~ msgid ""
+#~ "Set an audio delay, in milliseconds. This is useful if audio and "
+#~ "video are not in sync."
+#~ msgstr "设置声音延迟，单位为毫秒。 音视频不同步时使用。"
+
+#~ msgid "Subtitle Settings"
+#~ msgstr "字幕设置"
+
+#~ msgid ""
+#~ "These settings apply only to soft subtitles, not to bitmaps. Some "
+#~ "changes require a restart of the video to take effect."
+#~ msgstr "此设置只对软字幕有作用， 有些改动需要重新播放视频。"
+
+#~ msgid "Encoding:"
+#~ msgstr "编码："
+
+#~ msgid "Set the subtitle character set encoding."
+#~ msgstr "设置字幕编码"
+
+#~ msgid "Override font:"
+#~ msgstr "设置字体："
+
+#~ msgid "Override the subtitle font family."
+#~ msgstr "强制使用某个字体族"
+
+#~ msgid "Override font size:"
+#~ msgstr "设置字体大小："
+
+#~ msgid "Override the subtitle font size."
+#~ msgstr "强制指定字幕字体大小"
+
+#~ msgid "Override scale factor:"
+#~ msgstr "设置缩放比例"
+
+#~ msgid "Override the subtitle scale factor."
+#~ msgstr "强制指定字幕的缩放比例"
+
+#~ msgid "Override color:"
+#~ msgstr "设置颜色"
+
+#~ msgid "Override the subtitle color."
+#~ msgstr "强制字幕使用某一颜色"
+
+#~ msgid "Override shadow:"
+#~ msgstr "设置字幕阴影"
+
+#~ msgid "Override the subtitle shadow."
+#~ msgstr "强制打开或关闭字幕阴影"
+
+#~ msgid "On"
+#~ msgstr "确认"
+
+#~ msgid "Video Settings"
+#~ msgstr "视频设置"
+
+#~ msgid "Crop to aspect ratio:"
+#~ msgstr "剪裁到指定宽高比："
+
+#~ msgid ""
+#~ "Set the real aspect ratio of the video, so that borders can be cropped."
+#~ ""
+#~ msgstr "设置视频的实际宽高比，以便裁掉黑边。"
+
+#~ msgid "Do not crop"
+#~ msgstr "不剪裁"
+
+#~ msgid "Force source aspect ratio:"
+#~ msgstr "强制视频源宽高比："
+
+#~ msgid "Force the aspect ratio of video source."
+#~ msgstr "强制指定来源视频的宽高比。"
+
+#~ msgid "Do not force"
+#~ msgstr "不指定宽高比"
+
+#~ msgid "Parallax:"
+#~ msgstr "视差："
+
+#~ msgid ""
+#~ "Adjust parallax, from -1 to +1. This changes the separation of left "
+#~ "and right view, and thus the perceived distance of the scene."
+#~ msgstr "调整视差，范围从 -1 到 1。 使感知到的深度发生变化。"
+
+#~ msgid "Subtitle parallax:"
+#~ msgstr "字幕视差："
+
+#~ msgid ""
+#~ "Adjust subtitle parallax, from -1 to +1. This changes the perceived "
+#~ "distance of the subtitles."
+#~ msgstr ""
+#~ "调整字幕视差，范围从 -1 到 1。 使感知到的字幕深度发生变化。"
+
+#~ msgid "Ghostbusting:"
+#~ msgstr "消除重影："
+
+#~ msgid ""
+#~ "Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+#~ "the crosstalk levels of your display first. Note that crosstalk "
+#~ "ghostbusting does not work with anaglyph glasses."
+#~ msgstr ""
+#~ "设置窜扰消除重影级别，从 0 到 1。 请先调整显示器的窜扰级别， 此调"
+#~ "整对色分眼睛无效。"
+
+#~ msgid "SDI Output Settings"
+#~ msgstr "SDI 输出设置"
+
+#~ msgid "SDI Output Format:"
+#~ msgstr "SDI 输出格式："
+
+#~ msgid "Select output format used for SDI output."
+#~ msgstr "选择用于 SDI 输出的输出格式"
+
+#~ msgid "Left stereo mode:"
+#~ msgstr "左视角立体模式："
+
+#~ msgid "Select stereo mode used for left SDI output."
+#~ msgstr "选择用于左视角 SDI 输出的立体模式"
+
+#~ msgid "Right stereo mode:"
+#~ msgstr "右视角立体模式："
+
+#~ msgid "Select stereo mode used for right SDI output."
+#~ msgstr "选择用于右视角 SDI 输出的立体模式"
+
+#~ msgid "Open device(s)"
+#~ msgstr "打开设备："
+
+#~ msgid "Choose a device type."
+#~ msgstr "选择一个设备类型"
+
+#~ msgid "Choose a device."
+#~ msgstr "选择一个设备"
+
+#~ msgid "Set the X11 device string. Refer to the manual for details."
+#~ msgstr "设置 X11 设备字符串，详情请参阅手册。"
+
+#~ msgid "First device:"
+#~ msgstr "第一个设备："
+
+#~ msgid "Second device:"
+#~ msgstr "第二个设备："
+
+#~ msgid "Request frame size"
+#~ msgstr "请求帧大小"
+
+#~ msgid ""
+#~ "Request a specific frame size from the device, e.g. 640x480. The "
+#~ "device must support this frame size. Some devices require a frame size to "
+#~ "be selected."
+#~ msgstr ""
+#~ "从设备请求一个特定尺寸的画面，比如 640x480。 设备必须支持该帧尺寸，"
+#~ "一些设备要求选择帧尺寸。"
+
+#~ msgid "Request frame rate"
+#~ msgstr "请求帧率"
+
+#~ msgid ""
+#~ "Request a specific frame rate from the device, e.g. 25/1. The device "
+#~ "must support this frame rate. Some devices require a frame rate to be "
+#~ "selected."
+#~ msgstr ""
+#~ "从设备请求一个特定帧率，比如 25/1。 设备必须支持该帧率，一些设备要求"
+#~ "选择帧率。"
+
+#~ msgid "Request MJPEG format"
+#~ msgstr "请求 MJPEG 格式"
+
+#~ msgid ""
+#~ "Request MJPEG data from the input device. The device may ignore this "
+#~ "request."
+#~ msgstr "从输入设备请求 MJPEG 数据，该设备可能忽略此请求。"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "&File"
+#~ msgstr "文件(&F)"
+
+#~ msgid "&Open file(s)..."
+#~ msgstr "打开文件(&O)..."
+
+#~ msgid "Open &URL(s)..."
+#~ msgstr "打开网址(&U)..."
+
+#~ msgid "Open &device(s)..."
+#~ msgstr "打开设备(&D)..."
+
+#~ msgid "&Clear recent files"
+#~ msgstr "清除最近打开文件(&C)"
+
+#~ msgid "&Quit"
+#~ msgstr "退出(&Q)"
+
+#~ msgid "&Preferences"
+#~ msgstr "首选项(&P)"
+
+#~ msgid "&Fullscreen Settings..."
+#~ msgstr "全屏幕设定(&F)…"
+
+#~ msgid "Display &Color Adjustments..."
+#~ msgstr "显示和颜色调整(&C)…"
+
+#~ msgid "Display Cross&talk Calibration..."
+#~ msgstr "显示器窜扰调整(&T)…"
+
+#~ msgid "Quality Adjustments..."
+#~ msgstr "质量调整…"
+
+#~ msgid "&Zoom for wide videos..."
+#~ msgstr "宽屏视频缩放(&Z)"
+
+#~ msgid "&Audio Settings..."
+#~ msgstr "声音设定(&A)…"
+
+#~ msgid "&Subtitle Settings..."
+#~ msgstr "字幕设定(&S)…"
+
+#~ msgid "Current &Video Settings..."
+#~ msgstr "当前视频设定(&V)…"
+
+#~ msgid "SDI &Output Settings..."
+#~ msgstr "SDI 输出设置(&O)…"
+
+#~ msgid "&Help"
+#~ msgstr "帮助(&H)"
+
+#~ msgid "&Manual..."
+#~ msgstr "手册(&M)..."
+
+#~ msgid "&Website..."
+#~ msgstr "网站(&W)..."
+
+#~ msgid "&Keyboard Shortcuts"
+#~ msgstr "快捷键(&K)"
+
+#~ msgid "&About"
+#~ msgstr "关于(&A)"
+
+#~ msgid "Tip"
+#~ msgstr "技巧"
+
+#~ msgid ""
+#~ "You can select and open multiple files at once.This is useful "
+#~ "for example if you have extra subtitle files, or if left and right "
+#~ "view are stored in separate files."
+#~ msgstr ""
+#~ "你可以选择打开多个文件。这在有多个字幕文件，或左右眼在不同文件的"
+#~ "情况时很方便。"
+
+#~ msgid "Do not show this message again."
+#~ msgstr "不再显示此消息。"
+
+#~ msgid "Open files"
+#~ msgstr "打开文件"
+
+#~ msgid "Open URL(s)"
+#~ msgstr "打开网址"
+
+#~ msgid "URL(s):"
+#~ msgstr "网址："
+
+#~ msgid "Enter one or more space separated URLs."
+#~ msgstr "输入一个网址或空格分开的多个网址。"
+
+#~ msgid "Cannot open manual."
+#~ msgstr "无法打开用户手册"
+
+#~ msgid "Cannot open website."
+#~ msgstr "无法打开网站"
+
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "快捷键"
+
+#~ msgid "Keyboard control:"
+#~ msgstr "按键："
+
+#~ msgid "Stop"
+#~ msgstr "停止"
+
+#~ msgid "About %s"
+#~ msgstr " 关于 %s"
+
+#~ msgid "The %s 3D video player"
+#~ msgstr "3D 视频播放器 %s"
+
+#~ msgid ""
+#~ "%s version %s.Copyright (C) 2014 the Bino developers.</"
+#~ "p>This is free software. You may redistribute copies of it under the "
+#~ "terms of the <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General "
+#~ "Public License</a>. There is NO WARRANTY, to the extent permitted by law."
+#~ "See <a href=\"%s\">%s</a> for more information on this software.</"
+#~ "p>"
+#~ msgstr ""
+#~ "%s 版本 %s。Bino 开发者版权所有 (C) 2014。本软件是自由软"
+#~ "件，你可以在 <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU GPL</a> "
+#~ "许可证下重新发布。在法律所允许的范围内，本软件不带任何的保证。要获"
+#~ "取更多本软件的信息，请参见 <a href=\"%s\">%s</a>。"
+
+#~ msgid "About"
+#~ msgstr "关于"
+
+#~ msgid "Libraries"
+#~ msgstr "程序库"
+
+#~ msgid "Team"
+#~ msgstr "团队"
+
+#~ msgid "License"
+#~ msgstr "许可证"
+
 #~ msgid "Need at least OpenGL 2.1."
 #~ msgstr "需要 OpenGL 2.1 以上。"

bino-1.6.1.tar.xz/src/Makefile.am -> bino-1.6.5.tar.xz/src/Makefile.am Changed

@@ -21,6 +21,20 @@
 	subtitle_renderer.h subtitle_renderer.cpp \
 	audio_output.h audio_output.cpp \
 	player.h player.cpp \
+	mainwindow.h mainwindow.cpp \
+	gui_common.h \
+	inoutwidget.h inoutwidget.cpp \
+	controlswidget.h controlswidget.cpp \
+	crosstalkdialog.h crosstalkdialog.cpp \
+	fullscreendialog.h fullscreendialog.cpp \
+	audiodialog.h audiodialog.cpp \
+	opendevicedialog.h opendevicedialog.cpp \
+	qualitydialog.h qualitydialog.cpp \
+	subtitledialog.h subtitledialog.cpp \
+	videodialog.h videodialog.cpp \
+	zoomdialog.h zoomdialog.cpp \
+	colordialog.h colordialog.cpp \
+	preferences.h preferences.cpp \
 	gui.h gui.cpp \
 	lib_versions.h lib_versions.cpp \
 	main.cpp
@@ -110,7 +124,19 @@
 nodist_bino_SOURCES = \
 	qt_resources.qrc \
 	qt_resources-rcc.cpp \
-	gui-moc.cpp \
+	colordialog-moc.cpp \
+	inoutwidget-moc.cpp \
+	controlswidget-moc.cpp \
+	crosstalkdialog-moc.cpp \
+	fullscreendialog-moc.cpp \
+	audiodialog-moc.cpp \
+	zoomdialog-moc.cpp \
+	opendevicedialog-moc.cpp \
+	qualitydialog-moc.cpp \
+	videodialog-moc.cpp \
+	subtitledialog-moc.cpp \
+	mainwindow-moc.cpp \
+	preferences-moc.cpp \
 	video_output_qt-moc.cpp \
 	video_output_color.fs.glsl.h \
 	video_output_render.fs.glsl.h
@@ -121,7 +147,7 @@
 
 DEFS += -DHTMLDIR=\"$(htmldir)\" -DLOCALEDIR=\"$(localedir)\"
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/base \
+AM_CPPFLAGS = \
 	$(libavformat_CFLAGS) $(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \
 	$(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglewmx_CFLAGS) $(libqtopengl_CFLAGS)
 
@@ -135,10 +161,10 @@
 bino_LDADD += $(libEqualizer_LIBS)
 endif
 
-if HAVE_LIBLIRCCLIENT
+if HAVE_LIRC
 bino_SOURCES += lirc.h lirc.cpp
-AM_CPPFLAGS += $(liblircclient_CFLAGS)
-bino_LDADD += $(liblircclient_LIBS)
+AM_CPPFLAGS += $(lirc_CFLAGS)
+bino_LDADD += $(lirc_LIBS)
 endif
 
 if W32
@@ -148,9 +174,10 @@
 endif
 
 if HAVE_LIBXNVCTRL
-bino_SOURCES += NvSDIout.cpp NvSDIout.h NvSDIutils.cpp NvSDIutils.h
+bino_SOURCES += NvSDIout.cpp NvSDIout.h NvSDIutils.cpp NvSDIutils.h sdioutputdialog.cpp sdioutputdialog.h
 AM_CPPFLAGS += $(xnvctrl_CFLAGS)
-bino_LDADD += $(xnvctrl_LDFLAGS) -lXNVCtrl
+bino_LDADD += $(xnvctrl_LDFLAGS) -lXNVCtrl -lX11
+nodist_bino_SOURCES += sdioutputdialog-moc.cpp
 endif
 
 iconsdatadir = $(datadir)/icons/hicolor

bino-1.6.1.tar.xz/src/Makefile.in -> bino-1.6.5.tar.xz/src/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -23,7 +23,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
 am__make_running_with_option = \
 case $${target_option-} in \
 ?) ;; \
@@ -91,22 +101,22 @@
 @HAVE_LIBEQUALIZER_TRUE@am__append_1 = player_equalizer.h player_equalizer.cpp
 @HAVE_LIBEQUALIZER_TRUE@am__append_2 = $(libEqualizer_CFLAGS)
 @HAVE_LIBEQUALIZER_TRUE@am__append_3 = $(libEqualizer_LIBS)
-@HAVE_LIBLIRCCLIENT_TRUE@am__append_4 = lirc.h lirc.cpp
-@HAVE_LIBLIRCCLIENT_TRUE@am__append_5 = $(liblircclient_CFLAGS)
-@HAVE_LIBLIRCCLIENT_TRUE@am__append_6 = $(liblircclient_LIBS)
+@HAVE_LIRC_TRUE@am__append_4 = lirc.h lirc.cpp
+@HAVE_LIRC_TRUE@am__append_5 = $(lirc_CFLAGS)
+@HAVE_LIRC_TRUE@am__append_6 = $(lirc_LIBS)
 @W32_TRUE@am__append_7 = logo/bino_logo.ico
-@HAVE_LIBXNVCTRL_TRUE@am__append_8 = NvSDIout.cpp NvSDIout.h NvSDIutils.cpp NvSDIutils.h
+@HAVE_LIBXNVCTRL_TRUE@am__append_8 = NvSDIout.cpp NvSDIout.h NvSDIutils.cpp NvSDIutils.h sdioutputdialog.cpp sdioutputdialog.h
 @HAVE_LIBXNVCTRL_TRUE@am__append_9 = $(xnvctrl_CFLAGS)
-@HAVE_LIBXNVCTRL_TRUE@am__append_10 = $(xnvctrl_LDFLAGS) -lXNVCtrl
+@HAVE_LIBXNVCTRL_TRUE@am__append_10 = $(xnvctrl_LDFLAGS) -lXNVCtrl -lX11
+@HAVE_LIBXNVCTRL_TRUE@am__append_11 = sdioutputdialog-moc.cpp
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/build-aux/depcomp $(dist_appdata_DATA) \
-	$(dist_icons16_DATA) $(dist_icons32_DATA) $(dist_icons48_DATA) \
-	$(dist_icons64_DATA) $(dist_iconsscal_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_appdata_DATA) \
+	$(dist_icons16_DATA) $(dist_icons32_DATA) $(dist_icons48_DATA) \
+	$(dist_icons64_DATA) $(dist_iconsscal_DATA) $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -122,30 +132,54 @@
 	color_matrix.cpp video_output.h video_output.cpp \
 	video_output_qt.h video_output_qt.cpp subtitle_renderer.h \
 	subtitle_renderer.cpp audio_output.h audio_output.cpp player.h \
-	player.cpp gui.h gui.cpp lib_versions.h lib_versions.cpp \
+	player.cpp mainwindow.h mainwindow.cpp gui_common.h \
+	inoutwidget.h inoutwidget.cpp controlswidget.h \
+	controlswidget.cpp crosstalkdialog.h crosstalkdialog.cpp \
+	fullscreendialog.h fullscreendialog.cpp audiodialog.h \
+	audiodialog.cpp opendevicedialog.h opendevicedialog.cpp \
+	qualitydialog.h qualitydialog.cpp subtitledialog.h \
+	subtitledialog.cpp videodialog.h videodialog.cpp zoomdialog.h \
+	zoomdialog.cpp colordialog.h colordialog.cpp preferences.h \
+	preferences.cpp gui.h gui.cpp lib_versions.h lib_versions.cpp \
 	main.cpp player_equalizer.h player_equalizer.cpp lirc.h \
 	lirc.cpp logo/bino_logo.ico NvSDIout.cpp NvSDIout.h \
-	NvSDIutils.cpp NvSDIutils.h
+	NvSDIutils.cpp NvSDIutils.h sdioutputdialog.cpp \
+	sdioutputdialog.h
 @HAVE_LIBEQUALIZER_TRUE@am__objects_1 = player_equalizer.$(OBJEXT)
-@HAVE_LIBLIRCCLIENT_TRUE@am__objects_2 = lirc.$(OBJEXT)
+@HAVE_LIRC_TRUE@am__objects_2 = lirc.$(OBJEXT)
 am__dirstamp = $(am__leading_dot)dirstamp
 @W32_TRUE@am__objects_3 = logo/bino_logo.$(OBJEXT)
 @HAVE_LIBXNVCTRL_TRUE@am__objects_4 = NvSDIout.$(OBJEXT) \
-@HAVE_LIBXNVCTRL_TRUE@	NvSDIutils.$(OBJEXT)
+@HAVE_LIBXNVCTRL_TRUE@	NvSDIutils.$(OBJEXT) \
+@HAVE_LIBXNVCTRL_TRUE@	sdioutputdialog.$(OBJEXT)
 am_bino_OBJECTS = media_data.$(OBJEXT) media_object.$(OBJEXT) \
 	media_input.$(OBJEXT) dispatch.$(OBJEXT) \
 	command_file.$(OBJEXT) color_matrix.$(OBJEXT) \
 	video_output.$(OBJEXT) video_output_qt.$(OBJEXT) \
 	subtitle_renderer.$(OBJEXT) audio_output.$(OBJEXT) \
-	player.$(OBJEXT) gui.$(OBJEXT) lib_versions.$(OBJEXT) \
+	player.$(OBJEXT) mainwindow.$(OBJEXT) inoutwidget.$(OBJEXT) \
+	controlswidget.$(OBJEXT) crosstalkdialog.$(OBJEXT) \
+	fullscreendialog.$(OBJEXT) audiodialog.$(OBJEXT) \
+	opendevicedialog.$(OBJEXT) qualitydialog.$(OBJEXT) \
+	subtitledialog.$(OBJEXT) videodialog.$(OBJEXT) \
+	zoomdialog.$(OBJEXT) colordialog.$(OBJEXT) \
+	preferences.$(OBJEXT) gui.$(OBJEXT) lib_versions.$(OBJEXT) \
 	main.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
 	$(am__objects_3) $(am__objects_4)
-nodist_bino_OBJECTS = qt_resources-rcc.$(OBJEXT) gui-moc.$(OBJEXT) \
-	video_output_qt-moc.$(OBJEXT)
+@HAVE_LIBXNVCTRL_TRUE@am__objects_5 = sdioutputdialog-moc.$(OBJEXT)
+nodist_bino_OBJECTS = qt_resources-rcc.$(OBJEXT) \
+	colordialog-moc.$(OBJEXT) inoutwidget-moc.$(OBJEXT) \
+	controlswidget-moc.$(OBJEXT) crosstalkdialog-moc.$(OBJEXT) \
+	fullscreendialog-moc.$(OBJEXT) audiodialog-moc.$(OBJEXT) \
+	zoomdialog-moc.$(OBJEXT) opendevicedialog-moc.$(OBJEXT) \
+	qualitydialog-moc.$(OBJEXT) videodialog-moc.$(OBJEXT) \
+	subtitledialog-moc.$(OBJEXT) mainwindow-moc.$(OBJEXT) \
+	preferences-moc.$(OBJEXT) video_output_qt-moc.$(OBJEXT) \
+	$(am__objects_5)
 bino_OBJECTS = $(am_bino_OBJECTS) $(nodist_bino_OBJECTS)
 am__DEPENDENCIES_1 =
 @HAVE_LIBEQUALIZER_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-@HAVE_LIBLIRCCLIENT_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+@HAVE_LIRC_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
 @HAVE_LIBXNVCTRL_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
 bino_DEPENDENCIES = $(top_builddir)/src/base/libbase.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -269,6 +303,8 @@
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/build-aux/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
 dir0=`pwd`; \
@@ -425,14 +461,14 @@
 libgl_LIBS = @libgl_LIBS@
 libglewmx_CFLAGS = @libglewmx_CFLAGS@
 libglewmx_LIBS = @libglewmx_LIBS@
-liblircclient_CFLAGS = @liblircclient_CFLAGS@
-liblircclient_LIBS = @liblircclient_LIBS@
 libopenal_CFLAGS = @libopenal_CFLAGS@
 libopenal_LIBS = @libopenal_LIBS@
 libqtopengl_CFLAGS = @libqtopengl_CFLAGS@
 libqtopengl_LIBS = @libqtopengl_LIBS@
 libswscale_CFLAGS = @libswscale_CFLAGS@
 libswscale_LIBS = @libswscale_LIBS@
+lirc_CFLAGS = @lirc_CFLAGS@
+lirc_LIBS = @lirc_LIBS@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
@@ -442,6 +478,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -463,7 +500,15 @@
 	color_matrix.cpp video_output.h video_output.cpp \
 	video_output_qt.h video_output_qt.cpp subtitle_renderer.h \
 	subtitle_renderer.cpp audio_output.h audio_output.cpp player.h \
-	player.cpp gui.h gui.cpp lib_versions.h lib_versions.cpp \
+	player.cpp mainwindow.h mainwindow.cpp gui_common.h \
+	inoutwidget.h inoutwidget.cpp controlswidget.h \
+	controlswidget.cpp crosstalkdialog.h crosstalkdialog.cpp \
+	fullscreendialog.h fullscreendialog.cpp audiodialog.h \
+	audiodialog.cpp opendevicedialog.h opendevicedialog.cpp \
+	qualitydialog.h qualitydialog.cpp subtitledialog.h \
+	subtitledialog.cpp videodialog.h videodialog.cpp zoomdialog.h \
+	zoomdialog.cpp colordialog.h colordialog.cpp preferences.h \
+	preferences.cpp gui.h gui.cpp lib_versions.h lib_versions.cpp \
 	main.cpp $(am__append_1) $(am__append_4) $(am__append_7) \
 	$(am__append_8)
 ICONS_LOCAL_IPE = \
@@ -535,21 +580,21 @@
 	icons-local/README \
 	$(ICONS) $(ICONS_LOCAL_IPE)
 
-nodist_bino_SOURCES = \
-	qt_resources.qrc \
-	qt_resources-rcc.cpp \
-	gui-moc.cpp \
-	video_output_qt-moc.cpp \
-	video_output_color.fs.glsl.h \
-	video_output_render.fs.glsl.h
-
+nodist_bino_SOURCES = qt_resources.qrc qt_resources-rcc.cpp \
+	colordialog-moc.cpp inoutwidget-moc.cpp controlswidget-moc.cpp \
+	crosstalkdialog-moc.cpp fullscreendialog-moc.cpp \
+	audiodialog-moc.cpp zoomdialog-moc.cpp \
+	opendevicedialog-moc.cpp qualitydialog-moc.cpp \
+	videodialog-moc.cpp subtitledialog-moc.cpp mainwindow-moc.cpp \
+	preferences-moc.cpp video_output_qt-moc.cpp \
+	video_output_color.fs.glsl.h video_output_render.fs.glsl.h \
+	$(am__append_11)
 BUILT_SOURCES = $(nodist_bino_SOURCES)
 CLEANFILES = $(BUILT_SOURCES)
-AM_CPPFLAGS = -I$(top_srcdir)/src/base $(libavformat_CFLAGS) \
-	$(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \
-	$(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglewmx_CFLAGS) \
-	$(libqtopengl_CFLAGS) $(am__append_2) $(am__append_5) \
-	$(am__append_9)
+AM_CPPFLAGS = $(libavformat_CFLAGS) $(libavdevice_CFLAGS) \
+	$(libswscale_CFLAGS) $(libass_CFLAGS) $(libopenal_CFLAGS) \
+	$(libgl_CFLAGS) $(libglewmx_CFLAGS) $(libqtopengl_CFLAGS) \
+	$(am__append_2) $(am__append_5) $(am__append_9)
 bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) $(LIBICONV) \
 	$(libavformat_LIBS) $(libavdevice_LIBS) $(libswscale_LIBS) \
 	$(libass_LIBS) $(libopenal_LIBS) $(libgl_LIBS) \
@@ -591,7 +636,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	 $(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	 *config.status*) \
@@ -674,24 +718,51 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NvSDIout.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NvSDIutils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_output.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audiodialog-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audiodialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color_matrix.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colordialog-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colordialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command_file.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/controlswidget-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/controlswidget.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crosstalkdialog-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crosstalkdialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dispatch.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fullscreendialog-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fullscreendialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inoutwidget-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inoutwidget.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_versions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lirc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mainwindow-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mainwindow.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/media_data.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/media_input.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/media_object.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opendevicedialog-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opendevicedialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player_equalizer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preferences-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preferences.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qt_resources-rcc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qualitydialog-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qualitydialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sdioutputdialog-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sdioutputdialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subtitle_renderer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subtitledialog-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subtitledialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_output.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_output_qt-moc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_output_qt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/videodialog-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/videodialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zoomdialog-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zoomdialog.Po@am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -1131,6 +1202,8 @@
 	uninstall-dist_icons64DATA uninstall-dist_iconsscalDATA \
 	uninstall-hook
 
+.PRECIOUS: Makefile
+
 
 qt_resources.qrc:
 	$(AM_V_GEN)(echo '<!DOCTYPE RCC><RCC version="1.0">'; \

bino-1.6.1.tar.xz/src/NvSDIout.cpp -> bino-1.6.5.tar.xz/src/NvSDIout.cpp Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012
+ * Copyright (C) 2012, 2015
 * Binocle <http://binocle.com/>
 * All rights reserved.
 *
@@ -35,13 +35,13 @@
 
 #include <GL/glx.h>
 
-#include "NVCtrlLib.h"
+#include <NVCtrl/NVCtrlLib.h>
 
-#include "gettext.h"
-#define _(string) gettext(string)
+#include "base/msg.h"
+#include "base/dbg.h"
 
-#include "msg.h"
-#include "dbg.h"
+#include "base/gettext.h"
+#define _(string) gettext(string)
 
 #include "NvSDIutils.h"
 
@@ -103,11 +103,21 @@
 return;
 }
 
+ // Get GLX functions
+ myGLXEnumerateVideoDevicesNV = reinterpret_cast<unsigned int* (*)(Display*, int, int*)>(
+ glXGetProcAddress(reinterpret_cast<const GLubyte*>("glXEnumerateVideoDevicesNV")));
+ myGLXBindVideoDeviceNV = reinterpret_cast<int (*)(Display*, unsigned int, unsigned int, const int*)>(
+ glXGetProcAddress(reinterpret_cast<const GLubyte*>("glXBindVideoDeviceNV")));
+ if (!myGLXEnumerateVideoDevicesNV || !myGLXBindVideoDeviceNV) {
+ msg::err("Error: cannot get GLX functions");
+ return;
+ }
+
 // Enumerate available video devices.
 unsigned int *videoDevices;
 int numDevices;
 
- videoDevices = glXEnumerateVideoDevicesNV(dpy, outputOptions.xscreen, &numDevices);
+ videoDevices = myGLXEnumerateVideoDevicesNV(dpy, outputOptions.xscreen, &numDevices);
 if (!videoDevices || numDevices <= 0) {
 XFree(videoDevices);
 msg::err("Error: could not enumerate video devices");
@@ -117,7 +127,7 @@
 msg::inf("Number of sdi devices: %d\n", numDevices);
 
 // Bind first video device
- int retCode = glXBindVideoDeviceNV(dpy, 1, videoDevices[0], NULL);
+ int retCode = myGLXBindVideoDeviceNV(dpy, 1, videoDevices[0], NULL);
 if (retCode != Success) {
 XFree(videoDevices);
 msg::wrn("Error: could not bind SDI video device");
@@ -200,7 +210,7 @@
 }
 }
 
- if (Success != glXBindVideoDeviceNV(_display, 1, 0, NULL))
+ if (Success != myGLXBindVideoDeviceNV(_display, 1, 0, NULL))
 {
 msg::wrn("Error: could not release video device");
 }

bino-1.6.1.tar.xz/src/NvSDIout.h -> bino-1.6.5.tar.xz/src/NvSDIout.h Changed

bino-1.6.1.tar.xz/src/NvSDIutils.cpp -> bino-1.6.5.tar.xz/src/NvSDIutils.cpp Changed

bino-1.6.1.tar.xz/src/audio_output.cpp -> bino-1.6.5.tar.xz/src/audio_output.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, 2015
 * Martin Lambers <marlam@marlam.de>
 * Gabriele Greco <gabrielegreco@gmail.com>
 *
@@ -23,17 +23,17 @@
 
 #include <limits>
 
-#include "gettext.h"
-#define _(string) gettext(string)
-
 #include "audio_output.h"
 #include "lib_versions.h"
 
-#include "exc.h"
-#include "str.h"
-#include "msg.h"
-#include "timer.h"
-#include "dbg.h"
+#include "base/exc.h"
+#include "base/str.h"
+#include "base/msg.h"
+#include "base/tmr.h"
+#include "base/dbg.h"
+
+#include "base/gettext.h"
+#define _(string) gettext(string)
 
 
 /* This code is adapted from the alffmpeg.c example available here:
@@ -231,13 +231,13 @@
 if (timestamp != _last_timestamp)
 {
 _last_timestamp = timestamp;
- _ext_timer_at_last_timestamp = timer::get_microseconds(timer::monotonic);
+ _ext_timer_at_last_timestamp = timer::get(timer::monotonic);
 _last_reported_timestamp = std::max(_last_reported_timestamp, timestamp);
 return _last_reported_timestamp;
 }
 else
 {
- _last_reported_timestamp = _last_timestamp + (timer::get_microseconds(timer::monotonic) - _ext_timer_at_last_timestamp);
+ _last_reported_timestamp = _last_timestamp + (timer::get(timer::monotonic) - _ext_timer_at_last_timestamp);
 return _last_reported_timestamp;
 }
 }
@@ -440,7 +440,7 @@
 }
 _past_time = 0;
 _last_timestamp = 0;
- _ext_timer_at_last_timestamp = timer::get_microseconds(timer::monotonic);
+ _ext_timer_at_last_timestamp = timer::get(timer::monotonic);
 _last_reported_timestamp = _last_timestamp;
 return _last_timestamp;
 }

bino-1.6.5.tar.xz/src/audiodialog.cpp Added

@@ -0,0 +1,111 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <QLabel>
+#include <QComboBox>
+#include <QSpinBox>
+#include <QGridLayout>
+
+#include "audiodialog.h"
+
+#include "gui_common.h"
+#include "audio_output.h"
+
+audio_dialog::audio_dialog(QWidget *parent) : QWidget(parent), _lock(false)
+{
+ QLabel *device_label = new QLabel(_("Audio device:"));
+ device_label->setToolTip(_("Select the audio device. "
+ "This will take effect for the next started video."));
+ _device_combobox = new QComboBox();
+ _device_combobox->setToolTip(device_label->toolTip());
+ _device_combobox->addItem(_("Default"));
+ audio_output ao;
+ for (int i = 0; i < ao.devices(); i++)
+ {
+ _device_combobox->addItem(ao.device_name(i).c_str());
+ }
+ connect(_device_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(device_changed()));
+ if (dispatch::parameters().audio_device() < 0
+ || dispatch::parameters().audio_device() >= _device_combobox->count())
+ {
+ _device_combobox->setCurrentIndex(0);
+ }
+ else
+ {
+ _device_combobox->setCurrentIndex(dispatch::parameters().audio_device() + 1);
+ }
+
+ QLabel *delay_label = new QLabel(_("Audio delay (ms):"));
+ delay_label->setToolTip(_("Set an audio delay, in milliseconds. "
+ "This is useful if audio and video are not in sync."));
+ _delay_spinbox = new QSpinBox();
+ _delay_spinbox->setToolTip(delay_label->toolTip());
+ _delay_spinbox->setRange(-10000, +10000);
+ _delay_spinbox->setSingleStep(1);
+ _delay_spinbox->setValue(dispatch::parameters().audio_delay() / 1000);
+ connect(_delay_spinbox, SIGNAL(valueChanged(int)), this, SLOT(delay_changed()));
+
+ QGridLayout *layout = new QGridLayout;
+ layout->addWidget(device_label, 0, 0);
+ layout->addWidget(_device_combobox, 0, 1);
+ layout->addWidget(delay_label, 1, 0);
+ layout->addWidget(_delay_spinbox, 1, 1);
+ setLayout(layout);
+}
+
+void audio_dialog::device_changed()
+{
+ if (!_lock)
+ send_cmd(command::set_audio_device, _device_combobox->currentIndex() - 1);
+}
+
+void audio_dialog::delay_changed()
+{
+ if (!_lock)
+ send_cmd(command::set_audio_delay, static_cast<int64_t>(_delay_spinbox->value() * 1000));
+}
+
+void audio_dialog::receive_notification(const notification &note)
+{
+ switch (note.type)
+ {
+ case notification::audio_device:
+ _lock = true;
+ _device_combobox->setCurrentIndex(dispatch::parameters().audio_device() + 1);
+ _lock = false;
+ break;
+ case notification::audio_delay:
+ _lock = true;
+ _delay_spinbox->setValue(dispatch::parameters().audio_delay() / 1000);
+ _lock = false;
+ break;
+ default:
+ /* not handled */
+ break;
+ }
+}

bino-1.6.5.tar.xz/src/audiodialog.h Added

@@ -0,0 +1,56 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AUDIODIALOG_H
+#define AUDIODIALOG_H
+
+#include "config.h"
+
+#include <QWidget>
+#include "dispatch.h"
+
+class QComboBox;
+class QSpinBox;
+
+class audio_dialog : public QWidget, public controller
+{
+ Q_OBJECT
+
+private:
+ bool _lock;
+ QComboBox *_device_combobox;
+ QSpinBox *_delay_spinbox;
+
+private slots:
+ void device_changed();
+ void delay_changed();
+
+public:
+ audio_dialog(QWidget *parent = 0);
+
+ virtual void receive_notification(const notification &note);
+};
+
+#endif

bino-1.6.1.tar.xz/src/base/Makefile.am -> bino-1.6.5.tar.xz/src/base/Makefile.am Changed

bino-1.6.1.tar.xz/src/base/Makefile.in -> bino-1.6.5.tar.xz/src/base/Makefile.in Changed

bino-1.6.5.tar.xz/src/base/blb.h Added

@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014
+ * Martin Lambers <marlam@marlam.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file blb.h
+ *
+ * This class provides an opaque memory block of a given size which can
+ * store any kind of data. Such memory blocks are a pain to manage with
+ * new/delete or new[]/delete[] or malloc()/free() because of the necessary
+ * type casting. This class provides easy access pointers and a destructor.
+ */
+
+#ifndef BLB_H
+#define BLB_H
+
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
+#include <stdexcept>
+
+#include "base/chk.h"
+
+
+class blob
+{
+private:
+
+ size_t _size;
+ void* _ptr;
+
+ static void* alloc(size_t s)
+ {
+ if (s == 0)
+ {
+ return NULL;
+ }
+ void* ptr = std::malloc(s);
+ if (!ptr) {
+ throw std::runtime_error(std::strerror(ENOMEM));
+ }
+ return ptr;
+ }
+
+ static void* realloc(void* p, size_t s)
+ {
+ if (s == 0)
+ {
+ std::free(p);
+ return NULL;
+ }
+ void* ptr = std::realloc(p, s);
+ if (!ptr) {
+ throw std::runtime_error(std::strerror(ENOMEM));
+ }
+ return ptr;
+ }
+
+public:
+
+ blob() throw () :
+ _size(0), _ptr(NULL)
+ {
+ }
+
+ blob(size_t s) :
+ _size(s), _ptr(alloc(_size))
+ {
+ }
+
+ blob(size_t s, size_t n) :
+ _size(checked_mul(s, n)), _ptr(alloc(_size))
+ {
+ }
+
+ blob(size_t s, size_t n0, size_t n1) :
+ _size(checked_mul(checked_mul(s, n0), n1)), _ptr(alloc(_size))
+ {
+ }
+
+ blob(size_t s, size_t n0, size_t n1, size_t n2) :
+ _size(checked_mul(checked_mul(s, n0), checked_mul(n1, n2))), _ptr(alloc(_size))
+ {
+ }
+
+ blob(const blob& b) :
+ _size(b._size), _ptr(alloc(_size))
+ {
+ if (_size > 0) {
+ std::memcpy(_ptr, b._ptr, _size);
+ }
+ }
+
+ const blob& operator=(const blob& b)
+ {
+ if (b.size() == 0) {
+ std::free(_ptr);
+ _size = 0;
+ _ptr = NULL;
+ } else {
+ void *ptr = alloc(b.size());
+ std::memcpy(ptr, b.ptr(), b.size());
+ std::free(_ptr);
+ _ptr = ptr;
+ _size = b.size();
+ }
+ return *this;
+ }
+
+ ~blob() throw ()
+ {
+ std::free(_ptr);
+ }
+
+ void free()
+ {
+ std::free(_ptr);
+ _ptr = NULL;
+ _size = 0;
+ }
+
+ void resize(size_t s)
+ {
+ _size = s;
+ _ptr = realloc(_ptr, _size);
+ }
+
+ void resize(size_t s, size_t n)
+ {
+ _size = checked_mul(s, n);
+ _ptr = realloc(_ptr, _size);
+ }
+
+ void resize(size_t s, size_t n0, size_t n1)
+ {
+ _size = checked_mul(checked_mul(s, n0), n1);
+ _ptr = realloc(_ptr, _size);
+ }
+
+ void resize(size_t s, size_t n0, size_t n1, size_t n2)
+ {
+ _size = checked_mul(checked_mul(s, n0), checked_mul(n1, n2));
+ _ptr = realloc(_ptr, _size);
+ }
+
+ size_t size() const throw ()
+ {
+ return _size;
+ }
+
+ const void* ptr(size_t offset = 0) const throw ()
+ {
+ return static_cast<const void*>(static_cast<const char*>(_ptr) + offset);
+ }
+
+ void* ptr(size_t offset = 0) throw ()
+ {
+ return static_cast<void*>(static_cast<char*>(_ptr) + offset);
+ }
+
+ template<typename T>
+ const T* ptr(size_t offset = 0) const throw ()
+ {
+ return static_cast<const T*>(ptr(offset * sizeof(T)));
+ }
+
+ template<typename T>
+ T* ptr(size_t offset = 0) throw ()
+ {
+ return static_cast<T*>(ptr(offset * sizeof(T)));
+ }
+};
+
+#endif

bino-1.6.5.tar.xz/src/base/chk.h Added

@@ -0,0 +1,250 @@
+/*
+ * Copyright (C) 2010, 2011, 2012, 2013
+ * Martin Lambers <marlam@marlam.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file chk.h
+ *
+ * This file provides functions that operate on integers and check
+ * for over- and underflow.
+ */
+
+#ifndef CHK_H
+#define CHK_H
+
+#include <cstring>
+#include <cerrno>
+#include <limits>
+#include <stdexcept>
+
+
+/**
+ * \param x Integer value.
+ * \return Casted integer value.
+ *
+ * Cast the integer value \a x to the given type.
+ * If over- or underflow would occur, this function throws
+ * std::overflow_error or std::underflow_error.
+ * Example: size_t a = checked_cast<size_t>(b);
+ */
+template<typename TO, typename FROM>
+TO checked_cast(FROM x)
+{
+ // The goal of this case differentiation is to
+ // a) help the compiler to optimize unnecessary checks away
+ // b) avoid compiler warnings like 'comparison of signed and unsigned'
+ if (std::numeric_limits<FROM>::is_signed && std::numeric_limits<TO>::is_signed)
+ {
+ if (sizeof(FROM) > sizeof(TO))
+ {
+ if (x < static_cast<FROM>(std::numeric_limits<TO>::min()))
+ {
+ throw std::underflow_error(std::strerror(ERANGE));
+ }
+ else if (x > static_cast<FROM>(std::numeric_limits<TO>::max()))
+ {
+ throw std::overflow_error(std::strerror(ERANGE));
+ }
+ }
+ }
+ else if (!std::numeric_limits<FROM>::is_signed && !std::numeric_limits<TO>::is_signed)
+ {
+ if (sizeof(FROM) >= sizeof(TO) && x > static_cast<FROM>(std::numeric_limits<TO>::max()))
+ {
+ throw std::overflow_error(std::strerror(ERANGE));
+ }
+ }
+ else if (std::numeric_limits<FROM>::is_signed) // TO is unsigned
+ {
+ if (x < static_cast<FROM>(std::numeric_limits<TO>::min()))
+ {
+ throw std::underflow_error(std::strerror(ERANGE));
+ }
+ else if (sizeof(FROM) > sizeof(TO) && x > static_cast<FROM>(std::numeric_limits<TO>::max()))
+ {
+ throw std::overflow_error(std::strerror(ERANGE));
+ }
+ }
+ else // FROM is unsigned, TO is signed
+ {
+ if (sizeof(FROM) >= sizeof(TO) && x > static_cast<FROM>(std::numeric_limits<TO>::max()))
+ {
+ throw std::overflow_error(std::strerror(ERANGE));
+ }
+ }
+ return x;
+}
+
+/**
+ * \param a Integer value.
+ * \param b Integer value.
+ * \return a + b
+ *
+ * Return a + b.
+ * If over- or underflow would occur, this function throws
+ * std::overflow_error or std::underflow_error.
+ */
+template<typename T>
+T checked_add(T a, T b)
+{
+ if (b < static_cast<T>(1))
+ {
+ if (a < std::numeric_limits<T>::min() - b)
+ {
+ throw std::underflow_error(std::strerror(ERANGE));
+ }
+ }
+ else
+ {
+ if (a > std::numeric_limits<T>::max() - b)
+ {
+ throw std::overflow_error(std::strerror(ERANGE));
+ }
+ }
+ return a + b;
+}
+
+/**
+ * \param a Integer value.
+ * \param b Integer value.
+ * \return a - b
+ *
+ * Return a - b.
+ * If over- or underflow would occur, this function throws
+ * std::overflow_error or std::underflow_error.
+ */
+template<typename T>
+T checked_sub(T a, T b)
+{
+ if (b < static_cast<T>(1))
+ {
+ if (a > std::numeric_limits<T>::max() + b)
+ {
+ throw std::overflow_error(std::strerror(ERANGE));
+ }
+ }
+ else
+ {
+ if (a < std::numeric_limits<T>::min() + b)
+ {
+ throw std::underflow_error(std::strerror(ERANGE));
+ }
+ }
+ return a - b;
+}
+
+/**
+ * \param a Integer value.
+ * \param b Integer value.
+ * \return a * b
+ *
+ * Return a * b.
+ * If over- or underflow would occur, this function throws
+ * std::overflow_error or std::underflow_error.
+ */
+template<typename T>
+T checked_mul(T a, T b)
+{
+ /* Adapted from the comp.lang.c FAQ, see http://c-faq.com/misc/sd26.html */
+ if (std::numeric_limits<T>::is_signed && a != static_cast<T>(0) && b != static_cast<T>(0))
+ {
+ if (a == std::numeric_limits<T>::min())
+ {
+ if (b > static_cast<T>(1))
+ {
+ throw std::underflow_error(std::strerror(ERANGE));
+ }
+ else if (b != static_cast<T>(1))
+ {
+ throw std::overflow_error(std::strerror(ERANGE));
+ }
+ }
+ else if (b == std::numeric_limits<T>::min())
+ {
+ if (a > static_cast<T>(1))
+ {
+ throw std::underflow_error(std::strerror(ERANGE));
+ }
+ else if (a != static_cast<T>(1))
+ {
+ throw std::overflow_error(std::strerror(ERANGE));
+ }
+ }
+ else
+ {
+ T aa = (a >= static_cast<T>(1) ? a : -a);
+ T bb = (b >= static_cast<T>(1) ? b : -b);
+ if (std::numeric_limits<T>::max() / bb < aa)
+ {
+ if ((a >= static_cast<T>(1)) != (b >= static_cast<T>(1)))
+ throw std::underflow_error(std::strerror(ERANGE));
+ else
+ throw std::overflow_error(std::strerror(ERANGE));
+ }
+ }
+ }
+ else
+ {
+ if (!(b == static_cast<T>(0) || !(std::numeric_limits<T>::max() / b < a)))
+ {
+ throw std::overflow_error(std::strerror(ERANGE));
+ }
+ }
+ return a * b;
+}
+
+/**
+ * \param a Integer value.
+ * \param b Integer value.
+ * \return a / b
+ *
+ * Return a / b.
+ * If over- or underflow would occur, this function throws
+ * std::overflow_error or std::underflow_error.
+ */
+template<typename T>
+T checked_div(T a, T b)
+{
+ if (b == 0
+ || (std::numeric_limits<T>::is_signed
+ && a == std::numeric_limits<T>::min()
+ && b == static_cast<T>(-1)))
+ {
+ throw std::overflow_error(std::strerror(ERANGE));
+ }
+ return a / b;
+}
+
+/**
+ * \param a Integer value.
+ * \return abs(a)
+ *
+ * Return the absolute value of a.
+ * If over- or underflow would occur, this function throws
+ * std::overflow_error or std::underflow_error.
+ */
+template<typename T>
+T checked_abs(T a)
+{
+ if (std::numeric_limits<T>::is_signed && a == std::numeric_limits<T>::min())
+ {
+ throw std::overflow_error(std::strerror(ERANGE));
+ }
+ return a < 0 ? -a : a;
+}
+
+#endif

bino-1.6.1.tar.xz/src/base/dbg.cpp -> bino-1.6.5.tar.xz/src/base/dbg.cpp Changed

bino-1.6.1.tar.xz/src/base/dbg.h -> bino-1.6.5.tar.xz/src/base/dbg.h Changed

bino-1.6.1.tar.xz/src/base/exc.cpp -> bino-1.6.5.tar.xz/src/base/exc.cpp Changed

bino-1.6.1.tar.xz/src/base/exc.h -> bino-1.6.5.tar.xz/src/base/exc.h Changed

bino-1.6.1.tar.xz/src/base/gettext.h -> bino-1.6.5.tar.xz/src/base/gettext.h Changed

bino-1.6.1.tar.xz/src/base/msg.cpp -> bino-1.6.5.tar.xz/src/base/msg.cpp Changed

bino-1.6.1.tar.xz/src/base/msg.h -> bino-1.6.5.tar.xz/src/base/msg.h Changed

bino-1.6.1.tar.xz/src/base/opt.cpp -> bino-1.6.5.tar.xz/src/base/opt.cpp Changed

bino-1.6.1.tar.xz/src/base/opt.h -> bino-1.6.5.tar.xz/src/base/opt.h Changed

bino-1.6.5.tar.xz/src/base/pth.cpp Added

@@ -0,0 +1,300 @@
+/*
+ * Copyright (C) 2011, 2012, 2013, 2015
+ * Martin Lambers <marlam@marlam.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cerrno>
+#include <cstring>
+#include <pthread.h>
+#include <sched.h>
+
+#include "base/pth.h"
+
+#include "base/gettext.h"
+#define _(string) gettext(string)
+
+
+const pthread_mutex_t mutex::_mutex_initializer = PTHREAD_MUTEX_INITIALIZER;
+
+mutex::mutex() : _mutex(_mutex_initializer)
+{
+ int e = pthread_mutex_init(&_mutex, NULL);
+ if (e != 0)
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_mutex_init(): " + std::strerror(e), e);
+}
+
+mutex::mutex(const mutex&) : _mutex(_mutex_initializer)
+{
+ // You cannot have multiple copies of the same mutex.
+ // Instead, we create a new one. This allows easier use of mutexes in STL containers.
+ int e = pthread_mutex_init(&_mutex, NULL);
+ if (e != 0)
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_mutex_init(): " + std::strerror(e), e);
+}
+
+mutex::~mutex()
+{
+ (void)pthread_mutex_destroy(&_mutex);
+}
+
+void mutex::lock()
+{
+ int e = pthread_mutex_lock(&_mutex);
+ if (e != 0)
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_mutex_lock(): " + std::strerror(e), e);
+}
+
+bool mutex::trylock()
+{
+ return (pthread_mutex_trylock(&_mutex) == 0);
+}
+
+void mutex::unlock()
+{
+ int e = pthread_mutex_unlock(&_mutex);
+ if (e != 0)
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_mutex_unlock(): " + std::strerror(e), e);
+}
+
+
+const pthread_cond_t condition::_cond_initializer = PTHREAD_COND_INITIALIZER;
+
+condition::condition() : _cond(_cond_initializer)
+{
+ int e = pthread_cond_init(&_cond, NULL);
+ if (e != 0)
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_cond_init(): " + std::strerror(e), e);
+}
+
+condition::condition(const condition&) : _cond(_cond_initializer)
+{
+ // You cannot have multiple copies of the same condition.
+ // Instead, we create a new one. This allows easier use of conditions in STL containers.
+ int e = pthread_cond_init(&_cond, NULL);
+ if (e != 0)
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_cond_init(): " + std::strerror(e), e);
+}
+
+condition::~condition()
+{
+ (void)pthread_cond_destroy(&_cond);
+}
+
+void condition::wait(mutex& m)
+{
+ int e = pthread_cond_wait(&_cond, &m._mutex);
+ if (e != 0)
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_cond_wait(): " + std::strerror(e), e);
+}
+
+void condition::wake_one()
+{
+ int e = pthread_cond_signal(&_cond);
+ if (e != 0)
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_cond_signal(): " + std::strerror(e), e);
+}
+
+void condition::wake_all()
+{
+ int e = pthread_cond_broadcast(&_cond);
+ if (e != 0)
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_cond_broadcast(): " + std::strerror(e), e);
+}
+
+
+const int thread::priority_default;
+const int thread::priority_min;
+
+thread::thread() :
+ __thread_id(pthread_self()),
+ __joinable(false),
+ __running(false),
+ __wait_mutex(),
+ __exception()
+{
+}
+
+thread::thread(const thread&) :
+ __thread_id(pthread_self()),
+ __joinable(false),
+ __running(false),
+ __wait_mutex(),
+ __exception()
+{
+ // The thread state cannot be copied; a new state is created instead.
+}
+
+thread::~thread()
+{
+ if (__joinable)
+ (void)pthread_detach(__thread_id);
+}
+
+void* thread::__run(void* p)
+{
+ thread* t = static_cast<thread*>(p);
+ try {
+ t->run();
+ }
+ catch (exc& e) {
+ t->__exception = e;
+ }
+ catch (std::exception& e) {
+ t->__exception = e;
+ }
+ catch (...) {
+ // We must assume this means thread cancellation. In this
+ // case, we *must* rethrow the exception.
+ t->__running = false;
+ throw;
+ }
+ t->__running = false;
+ return NULL;
+}
+
+void thread::start(int priority)
+{
+ if (atomic::bool_compare_and_swap(&__running, false, true)) {
+ wait();
+ int e;
+ pthread_attr_t priority_thread_attr;
+ pthread_attr_t* thread_attr = NULL;
+ if (priority != priority_default)
+ {
+ // Currently this means priority_min
+ int policy, min_priority;
+ struct sched_param param;
+ e = pthread_attr_init(&priority_thread_attr);
+ e = e || pthread_attr_getschedpolicy(&priority_thread_attr, &policy);
+ if (e == 0) {
+ min_priority = sched_get_priority_min(policy);
+ if (min_priority == -1)
+ e = errno;
+ }
+ e = e || pthread_attr_getschedparam(&priority_thread_attr, &param);
+ if (e == 0) {
+ param.sched_priority = min_priority;
+ }
+ e = e || pthread_attr_setschedparam(&priority_thread_attr, &param);
+ if (e != 0) {
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_attr_*(): " + std::strerror(e), e);
+ }
+ thread_attr = &priority_thread_attr;
+ }
+ e = pthread_create(&__thread_id, thread_attr, __run, this);
+ if (e != 0) {
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_create(): " + std::strerror(e), e);
+ }
+ __joinable = true;
+ }
+}
+
+void thread::wait()
+{
+ __wait_mutex.lock();
+ if (atomic::bool_compare_and_swap(&__joinable, true, false)) {
+ int e = pthread_join(__thread_id, NULL);
+ if (e != 0) {
+ __wait_mutex.unlock();
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_join(): " + std::strerror(e), e);
+ }
+ }
+ __wait_mutex.unlock();
+}
+
+void thread::finish()
+{
+ wait();
+ if (!exception().empty())
+ throw exception();
+}
+
+void thread::cancel()
+{
+ __wait_mutex.lock();
+ int e = pthread_cancel(__thread_id);
+ if (e != 0) {
+ __wait_mutex.unlock();
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_cancel(): " + std::strerror(e), e);
+ }
+ __wait_mutex.unlock();
+}
+
+
+thread_group::thread_group(unsigned char size) : __max_size(size)
+{
+ __active_threads.reserve(__max_size);
+ __finished_threads.reserve(__max_size);
+}
+
+thread_group::~thread_group()
+{
+ try {
+ for (size_t i = 0; i < __active_threads.size(); i++) {
+ __active_threads[i]->cancel();
+ }
+ }
+ catch (...) {
+ }
+}
+
+bool thread_group::start(thread* t, int priority)
+{
+ if (__active_threads.size() < __max_size) {
+ t->start(priority);
+ __active_threads.push_back(t);
+ return true;
+ } else {
+ return false;
+ }
+}
+
+thread* thread_group::get_next_finished_thread()
+{
+ if (__finished_threads.size() == 0) {
+ std::vector<thread*>::iterator it = __active_threads.begin();
+ while (it != __active_threads.end()) {
+ if (!(*it)->running()) {
+ __finished_threads.push_back(*it);
+ it = __active_threads.erase(it);
+ } else {
+ it++;
+ }
+ }
+ }
+ if (__finished_threads.size() > 0) {
+ thread* ret = __finished_threads.back();
+ __finished_threads.pop_back();
+ return ret;
+ } else {
+ return NULL;
+ }
+}

bino-1.6.5.tar.xz/src/base/pth.h Added

@@ -0,0 +1,226 @@
+/*
+ * Copyright (C) 2011, 2012, 2013, 2015
+ * Martin Lambers <marlam@marlam.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PTH_H
+#define PTH_H
+
+#include <vector>
+#include <pthread.h>
+
+#include "base/exc.h"
+
+
+/*
+ * Atomic operations
+ */
+
+namespace atomic
+{
+ // TODO
+ //
+ // Currently this is just an interface to the GCC atomic builtin functions; see
+ // http://gcc.gnu.org/onlinedocs/gcc-4.4.1/gcc/Atomic-Builtins.html#Atomic-Builtins
+ //
+ // This must be extended when (if) other compilers are used some day.
+ //
+ // The functions obviously only work for basic data types.
+ // The comments were copied from the GCC manual referenced above.
+
+ /* The following functions perform the operation suggested by the name,
+ * and return the value that had previously been in memory. */
+ template<typename T> T fetch_and_add(T* ptr, T value) { return __sync_fetch_and_add(ptr, value); }
+ template<typename T> T fetch_and_sub(T* ptr, T value) { return __sync_fetch_and_sub(ptr, value); }
+ template<typename T> T fetch_and_or(T* ptr, T value) { return __sync_fetch_and_or(ptr, value); }
+ template<typename T> T fetch_and_and(T* ptr, T value) { return __sync_fetch_and_and(ptr, value); }
+ template<typename T> T fetch_and_xor(T* ptr, T value) { return __sync_fetch_and_xor(ptr, value); }
+ template<typename T> T fetch_and_nand(T* ptr, T value) { return __sync_fetch_and_nand(ptr, value); }
+
+ /* The following functions perform the operation suggested by the name,
+ * and return the new value. */
+ template<typename T> T add_and_fetch(T* ptr, T value) { return __sync_add_and_fetch(ptr, value); }
+ template<typename T> T sub_and_fetch(T* ptr, T value) { return __sync_sub_and_fetch(ptr, value); }
+ template<typename T> T or_and_fetch(T* ptr, T value) { return __sync_or_and_fetch(ptr, value); }
+ template<typename T> T and_and_fetch(T* ptr, T value) { return __sync_and_and_fetch(ptr, value); }
+ template<typename T> T xor_and_fetch(T* ptr, T value) { return __sync_xor_and_fetch(ptr, value); }
+ template<typename T> T nand_and_fetch(T* ptr, T value) { return __sync_nand_and_fetch(ptr, value); }
+
+ /* The following functions perform an atomic compare and swap.
+ * That is, if the current value of *ptr is oldval, then write newval into *ptr.
+ * The "bool" version returns true if the comparison is successful and newval was written.
+ * The "val" version returns the contents of *ptr before the operation. */
+ template<typename T> bool bool_compare_and_swap(T* ptr, T oldval, T newval) { return __sync_bool_compare_and_swap(ptr, oldval, newval); }
+ template<typename T> T val_compare_and_swap(T* ptr, T oldval, T newval) { return __sync_val_compare_and_swap(ptr, oldval, newval); }
+
+ /* The following are convenience functions implemented on top of the above
+ * basic atomic operations. */
+ template<typename T> T fetch_and_inc(T* ptr) { return fetch_and_add(ptr, static_cast<T>(1)); }
+ template<typename T> T inc_and_fetch(T* ptr) { return add_and_fetch(ptr, static_cast<T>(1)); }
+ template<typename T> T fetch_and_dec(T* ptr) { return fetch_and_sub(ptr, static_cast<T>(1)); }
+ template<typename T> T dec_and_fetch(T* ptr) { return sub_and_fetch(ptr, static_cast<T>(1)); }
+}
+
+
+/*
+ * Mutex
+ */
+
+class mutex
+{
+private:
+ static const pthread_mutex_t _mutex_initializer;
+ pthread_mutex_t _mutex;
+
+public:
+ // Constructor / Destructor
+ mutex();
+ mutex(const mutex& m);
+ ~mutex();
+
+ // Lock the mutex.
+ void lock();
+ // Try to lock the mutex. Return true on success, false otherwise.
+ bool trylock();
+ // Unlock the mutex
+ void unlock();
+
+ friend class condition;
+};
+
+
+/*
+ * Wait condition
+ */
+
+class condition
+{
+private:
+ static const pthread_cond_t _cond_initializer;
+ pthread_cond_t _cond;
+
+public:
+ // Constructor / Destructor
+ condition();
+ condition(const condition& c);
+ ~condition();
+
+ // Wait for the condition. The calling thread must have the mutex locked.
+ void wait(mutex& m);
+ // Wake one thread that waits on the condition.
+ void wake_one();
+ // Wake all threads that wait on the condition.
+ void wake_all();
+};
+
+
+/*
+ * Thread
+ *
+ * Implement the run() function in a subclass.
+ */
+
+class thread
+{
+private:
+ pthread_t __thread_id;
+ bool __joinable;
+ bool __running;
+ mutex __wait_mutex;
+ exc __exception;
+
+ static void* __run(void* p);
+
+public:
+ // Priorities
+ static const int priority_default = 0;
+ static const int priority_min = 1;
+
+ // Constructor / Destructor
+ thread();
+ thread(const thread& t);
+ virtual ~thread();
+
+ // Implement this in a subclass; it will be executed from the thread via start()
+ virtual void run() = 0;
+
+ // Start a new thread that executes the run() function. If the thread is already
+ // running, this function does nothing.
+ void start(int priority = thread::priority_default);
+
+ // Returns whether this thread is currently running.
+ bool running()
+ {
+ return __running;
+ }
+
+ // Wait for the thread to finish. If the thread is not running, this function
+ // returns immediately.
+ void wait();
+
+ // Wait for the thread to finish, like wait(), and rethrow an exception that the
+ // run() function might have thrown during its execution.
+ void finish();
+
+ // Cancel a thread. This is dangerous and should not be used.
+ void cancel();
+
+ // Get an exception that the run() function might have thrown.
+ const exc& exception() const
+ {
+ return __exception;
+ }
+ // Modify the stored exception
+ exc& exception()
+ {
+ return __exception;
+ }
+};
+
+
+/*
+ * Thread group.
+ *
+ * This manages a group of threads that has a fixed maximum size. New threads
+ * can only be started if there are still free slots in the group. A finished
+ * thread makes its slot available for future threads.
+ *
+ * A thread group must be managed from a single thread. When the thread group
+ * object is destroyed, all remaining threads are cancelled.
+ */
+
+class thread_group
+{
+private:
+ unsigned char __max_size;
+ std::vector<thread*> __active_threads;
+ std::vector<thread*> __finished_threads;
+
+public:
+ thread_group(unsigned char size);
+ virtual ~thread_group();
+
+ // Start a new thread and return its slot number. If there are no free
+ // slots, the thread is not started and false is returned.
+ bool start(thread* t, int priority = thread::priority_default);
+
+ // Return a finished thread object from the group and free its slot so
+ // that future threads can use it. If there is no finished thread, NULL
+ // is returned.
+ thread* get_next_finished_thread();
+};
+
+#endif

bino-1.6.5.tar.xz/src/base/ser.cpp Added

@@ -0,0 +1,649 @@
+/*
+ * Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2015
+ * Martin Lambers <marlam@marlam.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cstring>
+
+#include "base/str.h"
+
+#include "base/ser.h"
+
+
+static const char* low_char_encodings[] = {
+ "\\(NUL)", // 0
+ "\\(SOH)", // 1
+ "\\(STX)", // 2
+ "\\(ETX)", // 3
+ "\\(EOT)", // 4
+ "\\(ENQ)", // 5
+ "\\(ACK)", // 6
+ "\\(BEL)", // 7
+ "\\(_BS)", // 8
+ "\\(_HT)", // 9
+ "\\(_LF)", // 10
+ "\\(_VT)", // 11
+ "\\(_FF)", // 12
+ "\\(_CR)", // 13
+ "\\(_SO)", // 14
+ "\\(_SI)", // 15
+ "\\(DLE)", // 16
+ "\\(DC1)", // 17
+ "\\(DC2)", // 18
+ "\\(DC3)", // 19
+ "\\(DC4)", // 20
+ "\\(NAK)", // 21
+ "\\(SYN)", // 22
+ "\\(ETB)", // 23
+ "\\(CAN)", // 24
+ "\\(_EM)", // 25
+ "\\(SUB)", // 26
+ "\\(ESC)", // 27
+ "\\(_FS)", // 28
+ "\\(_GS)", // 29
+ "\\(_RS)", // 30
+ "\\(_US)", // 31
+};
+
+
+void s11n::startgroup(std::ostream& os, const char* name)
+{
+ os << ' ' << name << "={";
+}
+
+void s11n::endgroup(std::ostream& os)
+{
+ os << " }";
+}
+
+void s11n::load(std::istream& is, std::string& name, std::string& value)
+{
+ char c;
+ // skip leading spaces
+ while (is.good() && (c = is.get()) == ' ');
+ // read name
+ name.clear();
+ while (is.good() && c != '=') {
+ name.push_back(c);
+ c = is.get();
+ }
+ c = is.get();
+ // read value
+ value.clear();
+ bool value_is_valid = false;
+ int group_depth = 0;
+ char enc_char[] = "\\(...)";
+ for (;;) {
+ bool c_is_valid = false;
+ if (c == '\\') {
+ c = is.get();
+ if (c == '\\' || c == ' ' || c == '{' || c == '}') {
+ c_is_valid = true;
+ } else {
+ enc_char[1] = c;
+ enc_char[2] = is.get();
+ enc_char[3] = is.get();
+ enc_char[4] = is.get();
+ enc_char[5] = is.get();
+ if (std::memcmp(enc_char, "\\(DEL)", 6) == 0) {
+ c = 127;
+ c_is_valid = true;
+ } else {
+ for (int j = 0; j <= 31; j++) {
+ if (std::memcmp(enc_char, low_char_encodings[j], 6) == 0) {
+ c = j;
+ c_is_valid = true;
+ break;
+ }
+ }
+ }
+ }
+ } else {
+ if (c == '{') {
+ group_depth++;
+ } else if (c == '}') {
+ group_depth--;
+ if (group_depth < 0)
+ break;
+ }
+ c_is_valid = true;
+ }
+ if (!c_is_valid || !is.good())
+ break;
+ value.append(1, c);
+ if (group_depth == 0 && (is.peek() == ' ' || is.eof())) {
+ value_is_valid = true;
+ break;
+ }
+ c = is.get();
+ }
+ if (!value_is_valid)
+ value = "";
+ else if (value.length() >= 2 && value[0] == '{' && value[value.length() - 1] == '}')
+ value = value.substr(1, value.length() - 2);
+}
+
+void serializable::save(std::ostream& os, const char* name) const
+{
+ // Default implementation: use binary save and store binary blob
+ std::ostringstream oss;
+ this->save(oss);
+ s11n::startgroup(os, name);
+ s11n::save(os, "size", oss.str().length());
+ s11n::save(os, "", oss.str().data(), oss.str().length());
+ s11n::endgroup(os);
+}
+
+void serializable::load(const std::string& s)
+{
+ // Default implementation: read and restore binary blob
+ std::istringstream iss(s);
+ std::string name, value;
+ s11n::load(iss, name, value);
+ size_t size = 0;
+ if (name == "size")
+ s11n::load(value, size);
+ s11n::load(iss, name, value);
+ std::string str;
+ char* buf = new char[size];
+ s11n::load(value, buf, size);
+ str.assign(buf, size);
+ delete[] buf;
+ std::istringstream iss2(str);
+ this->load(iss2);
+}
+
+// Return value NULL means the character can be written as is.
+static const char* enc_char(char x)
+{
+ return (x >= 0 && x <= 31 ? low_char_encodings[static_cast<int>(x)]
+ : x == 127 ? "\\(DEL)"
+ : x == '{' ? "\\{"
+ : x == '}' ? "\\}"
+ : x == ' ' ? "\\ "
+ : x == '\\' ? "\\\\"
+ : NULL);
+}
+
+// Decode a character. The index i is incremented according to the characters consumed from s.
+static char dec_char(const char* s, size_t& i)
+{
+ if (s[i] == '\\') {
+ if (s[i + 1] == '\\' || s[i + 1] == ' ' || s[i + 1] == '{' || s[i + 1] == '}') {
+ i++;
+ return s[i++];
+ } else if (s[i + 1] != '\0' && s[i + 2] != '\0' && s[i + 3] != '\0' && s[i + 4] != '\0' && s[i + 5] != '\0') {
+ if (std::memcmp(s, "\\(DEL)", 6) == 0) {
+ i += 6;
+ return 127;
+ } else {
+ for (int j = 0; j <= 31; j++) {
+ if (std::memcmp(s, low_char_encodings[j], 6) == 0) {
+ i += 6;
+ return j;
+ }
+ }
+ // invalid string!
+ return '\0';
+ }
+ } else {
+ // invalid string!
+ return '\0';
+ }
+ } else {
+ return s[i++];
+ }
+}
+
+/*
+ * Save a value to a stream
+ */
+
+// Fundamental arithmetic data types
+
+void s11n::save(std::ostream& os, bool x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, bool x)
+{
+ os << ' ' << name << '=' << (x ? '1' : '0');
+}
+
+void s11n::save(std::ostream& os, char x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, char x)
+{
+ const char* e = enc_char(x);
+ os << ' ' << name << '=';
+ if (e)
+ os << e;
+ else
+ os << x;
+}
+
+void s11n::save(std::ostream& os, signed char x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, signed char x)
+{
+ os << ' ' << name << '=' << static_cast<int>(x);
+}
+
+void s11n::save(std::ostream& os, unsigned char x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, unsigned char x)
+{
+ os << ' ' << name << '=' << static_cast<int>(x);
+}
+
+void s11n::save(std::ostream& os, short x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, short x)
+{
+ os << ' ' << name << '=' << x;
+}
+
+void s11n::save(std::ostream& os, unsigned short x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, unsigned short x)
+{
+ os << ' ' << name << '=' << x;
+}
+
+void s11n::save(std::ostream& os, int x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, int x)
+{
+ os << ' ' << name << '=' << x;
+}
+
+void s11n::save(std::ostream& os, unsigned int x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, unsigned int x)
+{
+ os << ' ' << name << '=' << x;
+}
+
+void s11n::save(std::ostream& os, long x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, long x)
+{
+ os << ' ' << name << '=' << x;
+}
+
+void s11n::save(std::ostream& os, unsigned long x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, unsigned long x)
+{
+ os << ' ' << name << '=' << x;
+}
+
+void s11n::save(std::ostream& os, long long x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, long long x)
+{
+ os << ' ' << name << '=' << x;
+}
+
+void s11n::save(std::ostream& os, unsigned long long x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, unsigned long long x)
+{
+ os << ' ' << name << '=' << x;
+}
+
+void s11n::save(std::ostream& os, float x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, float x)
+{
+ os << ' ' << name << '=' << str::from(x).c_str();
+}
+
+void s11n::save(std::ostream& os, double x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, double x)
+{
+ os << ' ' << name << '=' << str::from(x).c_str();
+}
+
+void s11n::save(std::ostream& os, long double x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, long double x)
+{
+ os << ' ' << name << '=' << str::from(x).c_str();
+}
+
+// Binary blobs
+
+void s11n::save(std::ostream& os, const void* x, const size_t n)
+{
+ os.write(reinterpret_cast<const char*>(x), n);
+}
+
+void s11n::save(std::ostream& os, const char* name, const void* x, const size_t n)
+{
+ static const char hex[] = "0123456789abcdef";
+ startgroup(os, name);
+ for (size_t i = 0; i < n; i++) {
+ unsigned char val = static_cast<const unsigned char*>(x)[i];
+ os << hex[(val >> 4) & 0xf] << hex[val & 0xf];
+ if (i < n - 1)
+ os << ' ';
+ }
+ endgroup(os);
+}
+
+// Serializable classes
+
+void s11n::save(std::ostream& os, const serializable& x)
+{
+ x.save(os);
+}
+
+void s11n::save(std::ostream& os, const char* name, const serializable& x)
+{
+ x.save(os, name);
+}
+
+// Basic STL types
+
+void s11n::save(std::ostream& os, const std::string& x)
+{
+ size_t s = x.length();
+ os.write(reinterpret_cast<const char*>(&s), sizeof(s));
+ os.write(reinterpret_cast<const char*>(x.data()), s);
+}
+
+void s11n::save(std::ostream& os, const char* name, const std::string& x)
+{
+ os << ' ' << name << '=';
+ for (size_t i = 0; i < x.length(); i++) {
+ char c = x[i];
+ const char* e = enc_char(c);
+ if (e)
+ os << e;
+ else
+ os << c;
+ }
+}
+
+
+/*
+ * Load a value from a stream
+ */
+
+// Fundamental arithmetic data types
+
+void s11n::load(std::istream& is, bool& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, bool& x)
+{
+ x = str::to<bool>(s);
+}
+
+void s11n::load(std::istream& is, char& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, char& x)
+{
+ size_t i = 0;
+ x = dec_char(s.c_str(), i);
+}
+
+void s11n::load(std::istream& is, signed char& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, signed char& x)
+{
+ x = str::to<int>(s);
+}
+
+void s11n::load(std::istream& is, unsigned char& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, unsigned char& x)
+{
+ x = str::to<unsigned int>(s);
+}
+
+void s11n::load(std::istream& is, short& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, short& x)
+{
+ x = str::to<short>(s);
+}
+
+void s11n::load(std::istream& is, unsigned short& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, unsigned short& x)
+{
+ x = str::to<unsigned short>(s);
+}
+
+void s11n::load(std::istream& is, int& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, int& x)
+{
+ x = str::to<int>(s);
+}
+
+void s11n::load(std::istream& is, unsigned int& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, unsigned int& x)
+{
+ x = str::to<unsigned int>(s);
+}
+
+void s11n::load(std::istream& is, long& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, long& x)
+{
+ x = str::to<long>(s);
+}
+
+void s11n::load(std::istream& is, unsigned long& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, unsigned long& x)
+{
+ x = str::to<unsigned long>(s);
+}
+
+void s11n::load(std::istream& is, long long& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, long long& x)
+{
+ x = str::to<long long>(s);
+}
+
+void s11n::load(std::istream& is, unsigned long long& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, unsigned long long& x)
+{
+ x = str::to<unsigned long long>(s);
+}
+
+void s11n::load(std::istream& is, float& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, float& x)
+{
+ x = str::to<float>(s);
+}
+
+void s11n::load(std::istream& is, double& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, double& x)
+{
+ x = str::to<double>(s);
+}
+
+void s11n::load(std::istream& is, long double& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, long double& x)
+{
+ x = str::to<long double>(s);
+}
+
+// Binary blobs
+
+void s11n::load(std::istream& is, void* x, const size_t n)
+{
+ is.read(reinterpret_cast<char*>(x), n);
+}
+
+void s11n::load(const std::string& s, void* x, const size_t n)
+{
+ std::memset(x, 0, n);
+ size_t i = 0;
+ while (i < n && i + 3 < s.length()) {
+ unsigned char val = 0;
+ if (s[i] == ' ') {
+ i++;
+ if (s[i] >= '0' && s[i] <= '9')
+ val |= (s[i] - '0') << 4;
+ else if (s[i] >= 'a' && s[i] <= 'z')
+ val |= (s[i] - 'a' + 10) << 4;
+ i++;
+ if (s[i] >= '0' && s[i] <= '9')
+ val |= (s[i] - '0');
+ else if (s[i] >= 'a' && s[i] <= 'z')
+ val |= (s[i] - 'a' + 10);
+ }
+ static_cast<unsigned char*>(x)[i] = val;
+ }
+}
+
+// Serializable classes
+
+void s11n::load(std::istream& is, serializable& x)
+{
+ x.load(is);
+}
+
+void s11n::load(const std::string& s, serializable& x)
+{
+ x.load(s);
+}
+
+// Basic STL types
+
+void s11n::load(std::istream& is, std::string& x)
+{
+ size_t s;
+ is.read(reinterpret_cast<char*>(&s), sizeof(s));
+ char* buf = new char[s];
+ is.read(buf, s);
+ x.assign(buf, s);
+ delete[] buf;
+}
+
+void s11n::load(const std::string& s, std::string& x)
+{
+ x.clear();
+ if (s.length() == 0)
+ return;
+ const char *sc = s.c_str();
+ size_t i = 0;
+ while (i < s.length()) {
+ x.append(1, dec_char(sc, i));
+ }
+}

bino-1.6.5.tar.xz/src/base/ser.h Added

@@ -0,0 +1,246 @@
+/*
+ * Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014
+ * Martin Lambers <marlam@marlam.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef S11N_H
+#define S11N_H
+
+/*
+ * This module provides functions s11n::save() and s11n::load() that serialize
+ * types and objects.
+ * This works for all basic data types, STL types such as std::string, and
+ * classes that implement the s11n interface.
+ * Additionally, STL containers of serializable types can also be serialized,
+ * e.g. std::vector<std::string>.
+ */
+
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <vector>
+
+
+class serializable
+{
+public:
+ /*
+ * Interface for serializable classes
+ */
+
+ // Save binary. Efficient. Needs compatible architectures and application versions on the writing and reading end.
+ virtual void save(std::ostream& os) const = 0;
+ virtual void load(std::istream& is) = 0;
+
+ // Save in human-readable and editable text format. Can be used for machine- and application version independent
+ // saving of data. The default implementation falls back on the above binary functions and stores the binary data in
+ // strings.
+ virtual void save(std::ostream& os, const char* name) const;
+ virtual void load(const std::string& s);
+};
+
+namespace s11n
+{
+ // Functions needed for human-readable save/load:
+ // - When saving a group of values contained in a serializable class, use startgroup()/endgroup()
+ // - When loading back, get the next name/value pair and interpret it
+ void startgroup(std::ostream& os, const char* name);
+ void endgroup(std::ostream& os);
+ void load(std::istream& is, std::string& name, std::string& value);
+
+ /*
+ * Save a value to a stream
+ */
+
+ // Fundamental arithmetic data types
+
+ void save(std::ostream& os, bool x);
+ void save(std::ostream& os, const char* name, bool x);
+ void save(std::ostream& os, char x);
+ void save(std::ostream& os, const char* name, char x);
+ void save(std::ostream& os, signed char x);
+ void save(std::ostream& os, const char* name, signed char x);
+ void save(std::ostream& os, unsigned char x);
+ void save(std::ostream& os, const char* name, unsigned char x);
+ void save(std::ostream& os, short x);
+ void save(std::ostream& os, const char* name, short x);
+ void save(std::ostream& os, unsigned short x);
+ void save(std::ostream& os, const char* name, unsigned short x);
+ void save(std::ostream& os, int x);
+ void save(std::ostream& os, const char* name, int x);
+ void save(std::ostream& os, unsigned int x);
+ void save(std::ostream& os, const char* name, unsigned int x);
+ void save(std::ostream& os, long x);
+ void save(std::ostream& os, const char* name, long x);
+ void save(std::ostream& os, unsigned long x);
+ void save(std::ostream& os, const char* name, unsigned long x);
+ void save(std::ostream& os, long long x);
+ void save(std::ostream& os, const char* name, long long x);
+ void save(std::ostream& os, unsigned long long x);
+ void save(std::ostream& os, const char* name, unsigned long long x);
+ void save(std::ostream& os, float x);
+ void save(std::ostream& os, const char* name, float x);
+ void save(std::ostream& os, double x);
+ void save(std::ostream& os, const char* name, double x);
+ void save(std::ostream& os, long double x);
+ void save(std::ostream& os, const char* name, long double x);
+
+ // Binary blobs
+
+ void save(std::ostream& os, const void* x, const size_t n);
+ void save(std::ostream& os, const char* name, const void* x, const size_t n);
+
+ // Serializable classes
+
+ void save(std::ostream& os, const serializable& x);
+ void save(std::ostream& os, const char* name, const serializable& x);
+
+ // Basic STL types
+
+ void save(std::ostream& os, const std::string& x);
+ void save(std::ostream& os, const char* name, const std::string& x);
+
+ // STL containters
+
+ template<typename T>
+ void save(std::ostream& os, const std::vector<T>& x)
+ {
+ size_t s = x.size();
+ save(os, s);
+ for (size_t i = 0; i < s; i++) {
+ save(os, x[i]);
+ }
+ }
+
+ template<typename T>
+ void save(std::ostream& os, const char* name, const std::vector<T>& x)
+ {
+ size_t s = x.size();
+ startgroup(os, name);
+ save(os, "size", s);
+ for (size_t i = 0; i < s; i++) {
+ save(os, "", x[i]);
+ }
+ endgroup(os);
+ }
+
+ // TODO: add more STL containers as needed
+
+ /*
+ * Load a value from a stream
+ */
+
+ // Fundamental arithmetic data types
+
+ void load(std::istream& is, bool& x);
+ void load(const std::string& s, bool& x);
+ void load(std::istream& is, char& x);
+ void load(const std::string& s, char& x);
+ void load(std::istream& is, signed char& x);
+ void load(const std::string& s, signed char& x);
+ void load(std::istream& is, unsigned char& x);
+ void load(const std::string& s, unsigned char& x);
+ void load(std::istream& is, short& x);
+ void load(const std::string& s, short& x);
+ void load(std::istream& is, unsigned short& x);
+ void load(const std::string& s, unsigned short& x);
+ void load(std::istream& is, int& x);
+ void load(const std::string& s, int& x);
+ void load(std::istream& is, unsigned int& x);
+ void load(const std::string& s, unsigned int& x);
+ void load(std::istream& is, long& x);
+ void load(const std::string& s, long& x);
+ void load(std::istream& is, unsigned long& x);
+ void load(const std::string& s, unsigned long& x);
+ void load(std::istream& is, long long& x);
+ void load(const std::string& s, long long& x);
+ void load(std::istream& is, unsigned long long& x);
+ void load(const std::string& s, unsigned long long& x);
+ void load(std::istream& is, float& x);
+ void load(const std::string& s, float& x);
+ void load(std::istream& is, double& x);
+ void load(const std::string& s, double& x);
+ void load(std::istream& is, long double& x);
+ void load(const std::string& s, long double& x);
+
+ // Binary blobs
+
+ void load(std::istream& is, void* x, const size_t n);
+ void load(const std::string& s, void* x, const size_t n);
+
+ // Serializable classes
+
+ void load(std::istream& is, serializable& x);
+ void load(const std::string& s, serializable& x);
+
+ // Basic STL types
+
+ void load(std::istream& is, std::string& x);
+ void load(const std::string& s, std::string& x);
+
+ // STL containers
+
+ template<typename T>
+ void load(std::istream& is, std::vector<T>& x)
+ {
+ size_t s;
+ load(is, s);
+ x.resize(s);
+ for (size_t i = 0; i < s; i++) {
+ load(is, x[i]);
+ }
+ }
+
+ template<typename T>
+ void load(const std::string& s, std::vector<T>& x)
+ {
+ std::stringstream ss(s);
+ std::string name, value;
+ size_t z = 0;
+ load(ss, name, value);
+ if (name == "size")
+ load(value, z);
+ x.resize(z);
+ size_t i = 0;
+ while (ss.good() && i < z) {
+ load(ss, name, value);
+ load(value, x[i]);
+ i++;
+ }
+ }
+
+ // TODO: add more STL containers as needed
+
+ // Convenience wrappers: directly return a loaded value
+
+ template<typename T>
+ T load(std::istream& is)
+ {
+ T x;
+ load(is, x);
+ return x;
+ }
+
+ template<typename T>
+ T load(const std::string& s)
+ {
+ T x;
+ load(s, x);
+ return x;
+ }
+};
+
+#endif

bino-1.6.1.tar.xz/src/base/str.cpp -> bino-1.6.5.tar.xz/src/base/str.cpp Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2010, 2011, 2012, 2013
+ * Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -19,17 +19,17 @@
 #include "config.h"
 
 #include <cstdio>
-#include <cstring>
 #include <cstdlib>
 #include <cctype>
 #include <cmath>
 #include <cerrno>
+#include <cstring>
 #include <limits>
-#include <sstream>
 #include <locale>
 #include <cwchar>
+#include <stdexcept>
 
-#ifdef HAVE_NL_LANGINFO
+#if HAVE_NL_LANGINFO
 # include <locale.h>
 # include <langinfo.h>
 #else
@@ -37,20 +37,33 @@
 # include <windows.h>
 #endif
 
-#ifdef HAVE_ICONV
+#if HAVE_ICONV
 # include <iconv.h>
 #endif
 
-#include "gettext.h"
-#define _(string) gettext(string)
+#ifdef HAVE___INT128
+# define INT128_MAX (__int128) (((unsigned __int128) 1 << 127) - 1)
+# define INT128_MIN (-INT128_MAX - 1)
+#endif
+#ifdef HAVE_UNSIGNED___INT128
+# define UINT128_MAX ((((unsigned __int128) 1 << 127) << 1) - 1)
+#endif
+#if !defined(LONG_DOUBLE_IS_IEEE_754_QUAD) && defined(HAVE___FLOAT128)
+# include <quadmath.h>
+#endif
+
+#include "base/dbg.h"
+#include "base/exc.h"
+#include "base/msg.h"
 
-#include "dbg.h"
-#include "msg.h"
+#include "base/gettext.h"
+#define _(string) gettext(string)
 
-#include "str.h"
+#include "base/str.h"
 
 
-#ifndef HAVE_VASPRINTF
+#if HAVE_VASPRINTF
+#else
 static int vasprintf(char **strp, const char *format, va_list args)
 {
 /* vasprintf() is only missing on Windows nowadays.
@@ -69,20 +82,266 @@
 }
 #endif
 
+#if !defined(HAVE_INT128_T) && defined(HAVE___INT128)
+__int128 strtoi128(const char* nptr, char** endptr, int base)
+{
+ // Adapted for __int128 from the following source:
+
+ /*	$NetBSD: strtol.c,v 1.17 2005/11/29 03:12:00 christos Exp $	*/
+
+ /*-
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+ /*
+ * Convert a string to a long integer.
+ *
+ * Ignores `locale' stuff. Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+
+ const char *s;
+ __int128 acc, cutoff;
+ int c;
+ int neg, any, cutlim;
+
+ /*
+ * Skip white space and pick up leading +/- sign if any.
+ * If base is 0, allow 0x for hex and 0 for octal, else
+ * assume decimal; if base is already 16, allow 0x.
+ */
+ s = nptr;
+ do {
+ c = (unsigned char) *s++;
+ } while (c == ' ' || c == '\n' || c == '\t' || c == '\r' || c == '\f' || c == '\v');
+ if (c == '-') {
+ neg = 1;
+ c = *s++;
+ } else {
+ neg = 0;
+ if (c == '+')
+ c = *s++;
+ }
+ if ((base == 0 || base == 16) &&
+ c == '0' && (*s == 'x' || *s == 'X')) {
+ c = s[1];
+ s += 2;
+ base = 16;
+ }
+ if (base == 0)
+ base = c == '0' ? 8 : 10;
+
+ /*
+ * Compute the cutoff value between legal numbers and illegal
+ * numbers. That is the largest legal value, divided by the
+ * base. An input number that is greater than this value, if
+ * followed by a legal input character, is too big. One that
+ * is equal to this value may be valid or not; the limit
+ * between valid and invalid numbers is then based on the last
+ * digit. For instance, if the range for longs is
+ * [-2147483648..2147483647] and the input base is 10,
+ * cutoff will be set to 214748364 and cutlim to either
+ * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated
+ * a value > 214748364, or equal but the next digit is > 7 (or 8),
+ * the number is too big, and we will return a range error.
+ *
+ * Set any if any `digits' consumed; make it negative to indicate
+ * overflow.
+ */
+ cutoff = neg ? INT128_MIN : INT128_MAX;
+ cutlim = (int)(cutoff % base);
+ cutoff /= base;
+ if (neg) {
+ if (cutlim > 0) {
+ cutlim -= base;
+ cutoff += 1;
+ }
+ cutlim = -cutlim;
+ }
+ for (acc = 0, any = 0;; c = (unsigned char) *s++) {
+ if (c >= '0' && c <= '9')
+ c -= '0';
+ else if (c >= 'a' && c <= 'a')
+ c -= 'a' - 10;
+ else if (c >= 'A' && c <= 'Z')
+ c -= 'A' - 10;
+ else
+ break;
+ if (c >= base)
+ break;
+ if (any < 0)
+ continue;
+ if (neg) {
+ if (acc < cutoff || (acc == cutoff && c > cutlim)) {
+ any = -1;
+ acc = INT128_MIN;
+ errno = ERANGE;
+ } else {
+ any = 1;
+ acc *= base;
+ acc -= c;
+ }
+ } else {
+ if (acc > cutoff || (acc == cutoff && c > cutlim)) {
+ any = -1;
+ acc = INT128_MAX;
+ errno = ERANGE;
+ } else {
+ any = 1;
+ acc *= base;
+ acc += c;
+ }
+ }
+ }
+ if (endptr != 0)
+ *endptr = const_cast<char*>(any ? s - 1 : nptr);
+ return (acc);
+}
+#endif
+
+#if !defined(HAVE_UINT128_T) && defined(HAVE_UNSIGNED___INT128)
+unsigned __int128 strtoui128(const char* nptr, char** endptr, int base)
+{
+ // Adapted for __int128 from the following source:
+
+ /*	$NetBSD: strtoul.c,v 1.17 2005/11/29 03:12:00 christos Exp $	*/
+
+ /*
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+ /*
+ * Convert a string to an unsigned long integer.
+ *
+ * Ignores `locale' stuff. Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+
+ const char *s;
+ unsigned __int128 acc, cutoff;
+ int c;
+ int neg, any, cutlim;
+
+ /*
+ * See strtol for comments as to the logic used.
+ */
+ s = nptr;
+ do {
+ c = (unsigned char) *s++;
+ } while (c == ' ' || c == '\n' || c == '\t' || c == '\r' || c == '\f' || c == '\v');
+ if (c == '-') {
+ neg = 1;
+ c = *s++;
+ } else {
+ neg = 0;
+ if (c == '+')
+ c = *s++;
+ }
+ if ((base == 0 || base == 16) &&
+ c == '0' && (*s == 'x' || *s == 'X')) {
+ c = s[1];
+ s += 2;
+ base = 16;
+ }
+ if (base == 0)
+ base = c == '0' ? 8 : 10;
+
+ cutoff = UINT128_MAX / base;
+ cutlim = (int)(UINT128_MAX % base);
+ for (acc = 0, any = 0;; c = (unsigned char) *s++) {
+ if (c >= base)
+ break;
+ if (c >= '0' && c <= '9')
+ c -= '0';
+ else if (c >= 'a' && c <= 'a')
+ c -= 'a' - 10;
+ else if (c >= 'A' && c <= 'Z')
+ c -= 'A' - 10;
+ else
+ break;
+ if (any < 0)
+ continue;
+ if (acc > cutoff || (acc == cutoff && c > cutlim)) {
+ any = -1;
+ acc = UINT128_MAX;
+ errno = ERANGE;
+ } else {
+ any = 1;
+ acc *= (unsigned long)base;
+ acc += c;
+ }
+ }
+ if (neg && any > 0)
+ acc = -acc;
+ if (endptr != 0)
+ *endptr = const_cast<char*>(any ? s - 1 : nptr);
+ return (acc);
+}
+#endif
+
 /* Convert an unsigned integer to a string.
 * We hide this function so that it cannot be called with invalid arguments. */
 template<typename T>
 static inline std::string uint_to_str(T x)
 {
- std::string s;
- do
- {
- // this assumes an ASCII-compatible character set
- s.insert(0, 1, '0' + x % 10);
+ size_t size = sizeof(T) * 8 / 3 + 1;
+ char buf[size];
+ int i = size;
+ do {
+ buf[--i] = '0' + x % 10; // this assumes an ASCII-compatible character set
 x /= 10;
- }
- while (x != 0);
- return s;
+ } while (x != 0);
+ return std::string(buf + i, size - i);
 }
 
 /* Convert a signed integer to a string.
@@ -90,34 +349,118 @@
 template<typename T>
 static inline std::string int_to_str(T x)
 {
- std::string s;
- bool negative = (x < 0);
- do
- {
- // this assumes an ASCII-compatible character set
- s.insert(0, 1, (negative ? ('0' - x % 10) : ('0' + x % 10)));
- x /= 10;
+ size_t size = sizeof(T) * 8 / 3 + 1 + 1 /* sign */;
+ char buf[size];
+ int i = size;
+ if (x < 0) {
+ do {
+ buf[--i] = '0' - x % 10; // this assumes an ASCII-compatible character set
+ x /= 10;
+ } while (x != 0);
+ buf[--i] = '-';
+ } else {
+ do {
+ buf[--i] = '0' + x % 10; // this assumes an ASCII-compatible character set
+ x /= 10;
+ } while (x != 0);
 }
- while (x != 0);
- if (negative)
- {
- s.insert(0, 1, '-');
- }
- return s;
+ return std::string(buf + i, size - i);
 }
 
-/* Convert a floating point number (float, double, long double) to a string.
+/* Convert a floating point representation to a string.
 * We hide this function so that it cannot be called with invalid arguments. */
+template<typename T> static int float_startbufsize() { return 1 << 30; /* will never be called */ }
+template<> int float_startbufsize<float>() { return 32; }
+template<> int float_startbufsize<double>() { return 64; }
+template<> int float_startbufsize<long double>() { return 128; }
+#if !defined(LONG_DOUBLE_IS_IEEE_754_QUAD) && defined(HAVE___FLOAT128)
+template<> int float_startbufsize<__float128>() { return 128; }
+#endif
+template<typename T> static int float_snprintf(char*, size_t, T) { return -1; /* will never be called */ }
+template<> int float_snprintf<float>(char* str, size_t size, float x) { return snprintf(str, size, "%.9g", x); }
+template<> int float_snprintf<double>(char* str, size_t size, double x) { return snprintf(str, size, "%.17g", x); }
+template<> int float_snprintf<long double>(char* str, size_t size, long double x) { return snprintf(str, size, "%.36Lg", x); }
+#if !defined(LONG_DOUBLE_IS_IEEE_754_QUAD) && defined(HAVE___FLOAT128)
+template<> int float_snprintf<__float128>(char* str, size_t size, __float128 x) { return quadmath_snprintf(str, size, "%.36Qg", x); }
+#endif
 template<typename T>
 static inline std::string float_to_str(T x)
 {
- std::ostringstream os;
- os.imbue(std::locale::classic());
- os.precision(std::numeric_limits<T>::digits10 + 1);
- os << x;
- return os.str();
+ std::string localebak = std::string(setlocale(LC_NUMERIC, NULL));
+ setlocale(LC_NUMERIC, "C");
+
+ std::string result;
+ const int startsize = float_startbufsize<T>();
+ char buf[startsize];
+ int length = float_snprintf(buf, startsize, x);
+ if (length < startsize) {
+ result = std::string(buf, length);
+ } else {
+ std::vector<char> buf2(length + 1);
+ length = float_snprintf<T>(&buf2[0], length + 1, x);
+ result = std::string(&buf2[0], length);
+ }
+
+ setlocale(LC_NUMERIC, localebak.c_str());
+ return result;
 }
 
+/* Read a number from a string.
+ * We hide this function so that it cannot be called with invalid arguments. */
+template<typename T> static T str_to_small_int(const char* nptr, char** endptr, int base)
+{
+ long x = std::strtol(nptr, endptr, base);
+ if (std::numeric_limits<T>::is_signed && x < std::numeric_limits<T>::min()) {
+ x = std::numeric_limits<T>::min();
+ errno = ERANGE;
+ } else if (x > std::numeric_limits<T>::max()) {
+ x = std::numeric_limits<T>::max();
+ errno = ERANGE;
+ }
+ return x;
+}
+template<typename T> static T strtox(const char*, char**, int) { return 0; /* will never be called */ }
+template<> signed char strtox<signed char>(const char* nptr, char** endptr, int base) { return str_to_small_int<signed char>(nptr, endptr, base); }
+template<> unsigned char strtox<unsigned char>(const char* nptr, char** endptr, int base) { return str_to_small_int<unsigned char>(nptr, endptr, base); }
+template<> short strtox<short>(const char* nptr, char** endptr, int base) { return str_to_small_int<short>(nptr, endptr, base); }
+template<> unsigned short strtox<unsigned short>(const char* nptr, char** endptr, int base) { return str_to_small_int<unsigned short>(nptr, endptr, base); }
+template<> int strtox<int>(const char* nptr, char** endptr, int base) { return str_to_small_int<int>(nptr, endptr, base); }
+template<> unsigned int strtox<unsigned int>(const char* nptr, char** endptr, int base) { return str_to_small_int<unsigned int>(nptr, endptr, base); }
+template<> long strtox<long>(const char* nptr, char** endptr, int base) { return std::strtol(nptr, endptr, base); }
+template<> unsigned long strtox<unsigned long>(const char* nptr, char** endptr, int base) { return std::strtoul(nptr, endptr, base); }
+template<> long long strtox<long long>(const char* nptr, char** endptr, int base) { return std::strtoll(nptr, endptr, base); }
+template<> unsigned long long strtox<unsigned long long>(const char* nptr, char** endptr, int base) { return std::strtoull(nptr, endptr, base); }
+#if !defined(HAVE_INT128_T) && defined(HAVE___INT128)
+template<> __int128 strtox<__int128>(const char* nptr, char** endptr, int base) { return strtoi128(nptr, endptr, base); }
+#endif
+#if !defined(HAVE_UINT128_T) && defined(HAVE_UNSIGNED___INT128)
+template<> unsigned __int128 strtox<unsigned __int128>(const char* nptr, char** endptr, int base) { return strtoui128(nptr, endptr, base); }
+#endif
+template<> float strtox<float>(const char* nptr, char** endptr, int /* base */) { return std::strtof(nptr, endptr); }
+template<> double strtox<double>(const char* nptr, char** endptr, int /* base */) { return std::strtod(nptr, endptr); }
+template<> long double strtox<long double>(const char* nptr, char** endptr, int /* base */) { return std::strtold(nptr, endptr); }
+#if !defined(LONG_DOUBLE_IS_IEEE_754_QUAD) && defined(HAVE___FLOAT128)
+template<> __float128 strtox<__float128>(const char* nptr, char** endptr, int /* base */) { return strtoflt128(nptr, endptr); }
+#endif
+template<typename T>
+static inline T str_to(const std::string& s, const char* t)
+{
+ T r;
+ const char* str = s.c_str();
+ char* p;
+ int errnobak = errno;
+ errno = 0;
+ std::string localebak = std::string(setlocale(LC_NUMERIC, NULL));
+ setlocale(LC_NUMERIC, "C");
+ r = strtox<T>(str, &p, 0);
+ setlocale(LC_NUMERIC, localebak.c_str());
+ if (p == str || errno == ERANGE || *p != '\0') {
+ errno = errnobak;
+ throw std::invalid_argument(str::asprintf(_("Cannot convert string to %s."), t));
+ }
+ errno = errnobak;
+ return r;
+}
 
 namespace str
 {
@@ -188,7 +531,7 @@
 
 std::string from(bool x)
 {
- return std::string(x ? "0" : "1");
+ return std::string(1, x ? '1' : '0');
 }
 
 std::string from(signed char x)
@@ -241,6 +584,20 @@
 return uint_to_str(x);
 }
 
+#if !defined(HAVE_INT128_T) && defined(HAVE___INT128)
+ std::string from(__int128 x)
+ {
+ return int_to_str(x);
+ }
+#endif
+
+#if !defined(HAVE_UINT128_T) && defined(HAVE_UNSIGNED___INT128)
+ std::string from(unsigned __int128 x)
+ {
+ return uint_to_str(x);
+ }
+#endif
+
 std::string from(float x)
 {
 return float_to_str(x);
@@ -256,35 +613,90 @@
 return float_to_str(x);
 }
 
+#if !defined(LONG_DOUBLE_IS_IEEE_754_QUAD) && defined(HAVE___FLOAT128)
+ std::string from(__float128 x)
+ {
+ return float_to_str(x);
+ }
+#endif
+
 /* Convert a string to one of the basic data types */
 
- template<typename T>
- static inline T _to(const std::string &s, const char *name)
+ template<> bool to<bool>(const std::string &s)
 {
- std::istringstream is(s);
- T v;
- is >> v;
- if (is.fail() || !is.eof())
- {
- throw exc(str::asprintf(_("Cannot convert string to %s."), name), EINVAL);
- }
- return v;
- }
-
- template<> bool to<bool>(const std::string &s) { return _to<bool>(s, "bool"); }
- template<> signed char to<signed char>(const std::string &s) { return _to<signed char>(s, "signed char"); }
- template<> unsigned char to<unsigned char>(const std::string &s) { return _to<unsigned char>(s, "unsigned char"); }
- template<> short to<short>(const std::string &s) { return _to<short>(s, "short"); }
- template<> unsigned short to<unsigned short>(const std::string &s) { return _to<unsigned short>(s, "unsigned short"); }
- template<> int to<int>(const std::string &s) { return _to<int>(s, "int"); }
- template<> unsigned int to<unsigned int>(const std::string &s) { return _to<unsigned int>(s, "unsigned int"); }
- template<> long to<long>(const std::string &s) { return _to<long>(s, "long"); }
- template<> unsigned long to<unsigned long>(const std::string &s) { return _to<unsigned long>(s, "unsigned long"); }
- template<> long long to<long long>(const std::string &s) { return _to<long long>(s, "long long"); }
- template<> unsigned long long to<unsigned long long>(const std::string &s) { return _to<unsigned long long>(s, "unsigned long long"); }
- template<> float to<float>(const std::string &s) { return _to<float>(s, "float"); }
- template<> double to<double>(const std::string &s) { return _to<double>(s, "double"); }
- template<> long double to<long double>(const std::string &s) { return _to<long double>(s, "long double"); }
+ long r = str_to<long>(s, "bool");
+ return r ? true : false;
+ }
+ template<> signed char to<signed char>(const std::string &s)
+ {
+ return str_to<signed char>(s, "signed char");
+ }
+ template<> unsigned char to<unsigned char>(const std::string &s)
+ {
+ return str_to<unsigned char>(s, "unsigned char");
+ }
+ template<> short to<short>(const std::string &s)
+ {
+ return str_to<short>(s, "short");
+ }
+ template<> unsigned short to<unsigned short>(const std::string &s)
+ {
+ return str_to<unsigned short>(s, "unsigned short");
+ }
+ template<> int to<int>(const std::string &s)
+ {
+ return str_to<int>(s, "int");
+ }
+ template<> unsigned int to<unsigned int>(const std::string &s)
+ {
+ return str_to<unsigned int>(s, "unsigned int");
+ }
+ template<> long to<long>(const std::string &s)
+ {
+ return str_to<long>(s, "long");
+ }
+ template<> unsigned long to<unsigned long>(const std::string &s)
+ {
+ return str_to<unsigned long>(s, "unsigned long");
+ }
+ template<> long long to<long long>(const std::string &s)
+ {
+ return str_to<long long>(s, "long long");
+ }
+ template<> unsigned long long to<unsigned long long>(const std::string &s)
+ {
+ return str_to<unsigned long long>(s, "unsigned long long");
+ }
+#if !defined(HAVE_INT128_T) && defined(HAVE___INT128)
+ template<> __int128 to<__int128>(const std::string &s)
+ {
+ return str_to<__int128>(s, "int128");
+ }
+#endif
+#if !defined(HAVE_UINT128_T) && defined(HAVE_UNSIGNED___INT128)
+ template<> unsigned __int128 to<unsigned __int128>(const std::string &s)
+ {
+ return str_to<unsigned __int128>(s, "unsigned int128");
+ }
+#endif
+ template<> float to<float>(const std::string &s)
+ {
+ return str_to<float>(s, "float");
+ }
+ template<> double to<double>(const std::string &s)
+ {
+ return str_to<double>(s, "double");
+ }
+ template<> long double to<long double>(const std::string &s)
+ {
+ return str_to<long double>(s, "long double");
+ }
+#if !defined(LONG_DOUBLE_IS_IEEE_754_QUAD) && defined(HAVE___FLOAT128)
+ template<> __float128 to<__float128>(const std::string &s)
+ {
+ return str_to<__float128>(s, "float128");
+ }
+#endif
 
 template<typename T>
 static inline bool _to(const std::string& s, T* x)
@@ -311,9 +723,18 @@
 template<> bool to(const std::string& s, unsigned long* x) { return _to(s, x); }
 template<> bool to(const std::string& s, long long* x) { return _to(s, x); }
 template<> bool to(const std::string& s, unsigned long long* x) { return _to(s, x); }
+#if !defined(HAVE_INT128_T) && defined(HAVE___INT128)
+ template<> bool to(const std::string& s, __int128* x) { return _to(s, x); }
+#endif
+#if !defined(HAVE_UINT128_T) && defined(HAVE_UNSIGNED___INT128)
+ template<> bool to(const std::string& s, unsigned __int128* x) { return _to(s, x); }
+#endif
 template<> bool to(const std::string& s, float* x) { return _to(s, x); }
 template<> bool to(const std::string& s, double* x) { return _to(s, x); }
 template<> bool to(const std::string& s, long double* x) { return _to(s, x); }
+#if !defined(LONG_DOUBLE_IS_IEEE_754_QUAD) && defined(HAVE___FLOAT128)
+ template<> bool to(const std::string& s, __float128* x) { return _to(s, x); }
+#endif
 
 /* Create std::strings printf-like */
 
@@ -354,18 +775,19 @@
 * Replaces all occurences of \a s in \a str with \a r.
 * Returns \a str.
 */
- std::string &replace(std::string &str, const std::string &s, const std::string &r)
+ std::string replace(const std::string &str, const std::string &s, const std::string &r)
 {
+ std::string ts(str);
 size_t s_len = s.length();
 size_t r_len = r.length();
 size_t p = 0;
 
- while ((p = str.find(s, p)) != std::string::npos)
+ while ((p = ts.find(s, p)) != std::string::npos)
 {
- str.replace(p, s_len, r);
+ ts.replace(p, s_len, r);
 p += r_len;
 }
- return str;
+ return ts;
 }
 
 /* Create a hex string from binary data */
@@ -384,7 +806,7 @@
 s.resize(2 * n);
 
 const char *hex_chars = uppercase ? hex_chars_upper : hex_chars_lower;
- const uint8_t *buffer = static_cast<const uint8_t *>(buf);
+ const unsigned char *buffer = static_cast<const unsigned char *>(buf);
 for (size_t i = 0; i < n; i++)
 {
 s[2 * i + 0] = hex_chars[buffer[i] >> 4];
@@ -396,10 +818,10 @@
 
 /* Convert various values to human readable strings */
 
- std::string human_readable_memsize(const uintmax_t size)
+ std::string human_readable_memsize(const unsigned long long size)
 {
 const double dsize = static_cast<double>(size);
- const uintmax_t u1024 = static_cast<uintmax_t>(1024);
+ const unsigned long long u1024 = static_cast<unsigned long long>(1024);
 
 if (size >= u1024 * u1024 * u1024 * u1024)
 {
@@ -461,13 +883,13 @@
 return s;
 }
 
- std::string human_readable_time(int64_t microseconds)
+ std::string human_readable_time(long long microseconds)
 {
- int64_t hours = microseconds / (1000000ll * 60ll * 60ll);
+ long long hours = microseconds / (1000000ll * 60ll * 60ll);
 microseconds -= hours * (1000000ll * 60ll * 60ll);
- int64_t minutes = microseconds / (1000000ll * 60ll);
+ long long minutes = microseconds / (1000000ll * 60ll);
 microseconds -= minutes * (1000000ll * 60ll);
- int64_t seconds = microseconds / 1000000ll;
+ long long seconds = microseconds / 1000000ll;
 std::string hr;
 if (hours > 0)
 {
@@ -477,10 +899,64 @@
 return hr;
 }
 
+ /* Create an RFC2822-style time string, like "Fri, 4 Dec 2009 22:29:43 +0100 (CET)" */
+ /* Code taken from mpop 1.0.29:
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+ * Martin Lambers <marlam@marlam.de>
+ * License: GPLv3+
+ */
+ std::string rfc2822_time(time_t t)
+ {
+ struct tm gmt, *lt;
+ char tz_offset_sign;
+ int tz_offset_hours;
+ int tz_offset_minutes;
+ const char* weekday[7] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+ const char* month[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul",
+ "Aug", "Sep", "Oct", "Nov", "Dec" };
+ char rfc2822_timestamp[32];
+
+ /* Calculate a RFC 2822 timestamp. strftime() is unreliable for this because
+ * it is locale dependant, and because the timezone offset conversion
+ * specifier %z is not portable. */
+ /* copy the struct tm, because the subsequent call to localtime() will
+ * overwrite it */
+ gmt = *gmtime(&t);
+ lt = localtime(&t);
+ tz_offset_minutes = (lt->tm_hour - gmt.tm_hour) * 60
+ + lt->tm_min - gmt.tm_min
+ + (lt->tm_year - gmt.tm_year) * 24 * 60
+ + (lt->tm_yday - gmt.tm_yday) * 24 * 60;
+ if (tz_offset_minutes < 0)
+ {
+ tz_offset_sign = '-';
+ tz_offset_minutes = -tz_offset_minutes;
+ }
+ else
+ {
+ tz_offset_sign = '+';
+ }
+ tz_offset_hours = tz_offset_minutes / 60;
+ tz_offset_minutes %= 60;
+ if (tz_offset_hours > 99)
+ {
+ /* Values equal to or larger than 24 are not meaningful, but we just
+ * make sure that the value fits into two digits. If the system time is
+ * broken, we cannot fix it. */
+ tz_offset_hours = 99;
+ }
+ snprintf(rfc2822_timestamp, sizeof(rfc2822_timestamp),
+ "%s, %02d %s %04d %02d:%02d:%02d %c%02d%02d",
+ weekday[lt->tm_wday], lt->tm_mday, month[lt->tm_mon],
+ lt->tm_year + 1900, lt->tm_hour, lt->tm_min, lt->tm_sec,
+ tz_offset_sign, tz_offset_hours, tz_offset_minutes);
+ return std::string(rfc2822_timestamp);
+ }
+
 /* Get the name of the user's character set */
 std::string localcharset()
 {
-#ifdef HAVE_NL_LANGINFO
+#if HAVE_NL_LANGINFO
 std::string bak = setlocale(LC_CTYPE, NULL);
 setlocale(LC_CTYPE, "");
 char *charset = nl_langinfo(CODESET);
@@ -510,7 +986,7 @@
 return src;
 }
 
-#ifdef HAVE_ICONV
+#if HAVE_ICONV
 iconv_t cd = iconv_open(to_charset.c_str(), from_charset.c_str());
 if (cd == reinterpret_cast<iconv_t>(static_cast<size_t>(-1)))
 {
@@ -553,7 +1029,7 @@
 {
 dst.assign(orig_outbuf);
 }
- catch (std::exception &e)
+ catch (...)
 {
 free(orig_outbuf);
 throw exc(str::asprintf(_("Cannot convert %s to %s: %s"),
@@ -584,7 +1060,7 @@
 
 size_t display_width(const std::wstring& ws)
 {
-#ifdef HAVE_WCSWIDTH
+#if HAVE_WCSWIDTH
 return std::max(0, ::wcswidth(ws.c_str(), ws.length()));
 #else
 return ws.length();

bino-1.6.1.tar.xz/src/base/str.h -> bino-1.6.5.tar.xz/src/base/str.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2010, 2011, 2012
+ * Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -25,13 +25,12 @@
 #ifndef STR_H
 #define STR_H
 
+#include "config.h"
+
 #include <string>
 #include <vector>
 #include <cstdarg>
 #include <cerrno>
-#include <stdint.h>
-
-#include "exc.h"
 
 #ifdef __GNUC__
 # define STR_AFP(a, b) __attribute__ ((format (printf, a, b)))
@@ -62,9 +61,18 @@
 std::string from(unsigned long x);
 std::string from(long long x);
 std::string from(unsigned long long x);
+#if !defined(HAVE_INT128_T) && defined(HAVE___INT128)
+ std::string from(__int128 x);
+#endif
+#if !defined(HAVE_UINT128_T) && defined(HAVE_UNSIGNED___INT128)
+ std::string from(unsigned __int128 x);
+#endif
 std::string from(float x);
 std::string from(double x);
 std::string from(long double x);
+#if !defined(LONG_DOUBLE_IS_IEEE_754_QUAD) && defined(HAVE___FLOAT128)
+ std::string from(__float128 x);
+#endif
 
 /* Convert a string to one of the basic data types */
 template<typename T> T to(const std::string &s);
@@ -79,9 +87,18 @@
 template<> unsigned long to<unsigned long>(const std::string &s);
 template<> long long to<long long>(const std::string &s);
 template<> unsigned long long to<unsigned long long>(const std::string &s);
+#if !defined(HAVE_INT128_T) && defined(HAVE___INT128)
+ template<> __int128 to<__int128>(const std::string &s);
+#endif
+#if !defined(HAVE_UINT128_T) && defined(HAVE_UNSIGNED___INT128)
+ template<> unsigned __int128 to<unsigned __int128>(const std::string &s);
+#endif
 template<> float to<float>(const std::string &s);
 template<> double to<double>(const std::string &s);
 template<> long double to<long double>(const std::string &s);
+#if !defined(LONG_DOUBLE_IS_IEEE_754_QUAD) && defined(HAVE___FLOAT128)
+ template<> __float128 to<__float128>(const std::string &s);
+#endif
 template<typename T> bool to(const std::string& s, T* x);
 template<> bool to(const std::string& s, bool* x);
 template<> bool to(const std::string& s, signed char* x);
@@ -94,26 +111,39 @@
 template<> bool to(const std::string& s, unsigned long* x);
 template<> bool to(const std::string& s, long long* x);
 template<> bool to(const std::string& s, unsigned long long* x);
+#if !defined(HAVE_INT128_T) && defined(HAVE___INT128)
+ template<> bool to(const std::string& s, __int128* x);
+#endif
+#if !defined(HAVE_UINT128_T) && defined(HAVE_UNSIGNED___INT128)
+ template<> bool to(const std::string& s, unsigned __int128* x);
+#endif
 template<> bool to(const std::string& s, float* x);
 template<> bool to(const std::string& s, double* x);
 template<> bool to(const std::string& s, long double* x);
+#if !defined(LONG_DOUBLE_IS_IEEE_754_QUAD) && defined(HAVE___FLOAT128)
+ template<> bool to(const std::string& s, __float128* x);
+#endif
 
 /* Create std::strings printf-like */
 std::string vasprintf(const char *format, va_list args) STR_AFP(1, 0);
 std::string asprintf(const char *format, ...) STR_AFP(1, 2);
 
 /* Replace all instances of s with r in str */
- std::string &replace(std::string &str, const std::string &s, const std::string &r);
+ std::string replace(const std::string &str, const std::string &s, const std::string &r);
 
 /* Create a hex string from binary data */
 std::string hex(const std::string &s, bool uppercase = false);
 std::string hex(const void *buf, size_t n, bool uppercase = false);
 
 /* Convert various values to human readable strings */
- std::string human_readable_memsize(const uintmax_t size);
- std::string human_readable_length(const double length);
+ std::string human_readable_memsize(unsigned long long size);
+ std::string human_readable_length(double length);
 std::string human_readable_geodetic(double lat, double lon, double elev);
- std::string human_readable_time(int64_t microseconds);
+ std::string human_readable_time(long long microseconds);
+
+ /* Create an RFC2822-style time string, like "Fri, 4 Dec 2009 22:29:43 +0100 (CET)".
+ * This string is locale independent. */
+ std::string rfc2822_time(time_t t);
 
 /* Get the name of the user's character set */
 std::string localcharset();

bino-1.6.5.tar.xz/src/base/tmr.cpp Added

@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2010, 2011, 2012, 2013, 2015
+ * Martin Lambers <marlam@marlam.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cerrno>
+#if HAVE_CLOCK_GETTIME
+# include <time.h>
+#else
+# include <sys/time.h>
+#endif
+
+#include "base/exc.h"
+#include "base/tmr.h"
+
+#include "base/gettext.h"
+#define _(string) gettext(string)
+
+
+long long timer::get(timer::type t)
+{
+#if HAVE_CLOCK_GETTIME
+
+ struct timespec time;
+ int r;
+ if (t == realtime) {
+ r = clock_gettime(CLOCK_REALTIME, &time);
+ } else if (t == monotonic) {
+ r = clock_gettime(CLOCK_MONOTONIC, &time);
+ } else if (t == process_cpu) {
+#if defined(CLOCK_PROCESS_CPUTIME_ID)
+ r = clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time);
+#elif defined(CLOCK_PROF)
+ r = clock_gettime(CLOCK_PROF, &time);
+#else
+ r = -1;
+ errno = ENOSYS;
+#endif
+ } else /* t == thread_cpu */ {
+#ifdef CLOCK_THREAD_CPUTIME_ID
+ r = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &time);
+#else
+ r = -1;
+ errno = ENOSYS;
+#endif
+ }
+ if (r != 0)
+ throw exc(_("Cannot get time."), errno);
+ return static_cast<long long>(time.tv_sec) * 1000000 + time.tv_nsec / 1000;
+
+#else
+
+ if (t == realtime || t == monotonic) {
+ struct timeval tv;
+ int r = gettimeofday(&tv, NULL);
+ if (r != 0)
+ throw exc(_("Cannot get time."), errno);
+ return static_cast<long long>(tv.tv_sec) * 1000000 + tv.tv_usec;
+ } else if (t == process_cpu) {
+ // In W32, clock() starts with zero on program start, so we do not need
+ // to subtract a start value.
+ // XXX: Is this also true on Mac OS X?
+ clock_t c = clock();
+ return (c * static_cast<long long>(1000000) / CLOCKS_PER_SEC);
+ } else {
+ throw exc(_("Cannot get time."), ENOSYS);
+ }
+
+#endif
+}

bino-1.6.5.tar.xz/src/base/tmr.h Added

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2010, 2011, 2012, 2013
+ * Martin Lambers <marlam@marlam.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file timer.h
+ *
+ * Timer.
+ */
+
+#ifndef TMR_H
+#define TMR_H
+
+class timer
+{
+public:
+
+ /* All timers are always in microseconds. */
+
+ enum type {
+ realtime,
+ monotonic,
+ process_cpu,
+ thread_cpu
+ };
+
+ static long long get(type type);
+
+ static float to_seconds(long long microseconds)
+ {
+ return microseconds / 1e6f;
+ }
+};
+
+#endif

bino-1.6.5.tar.xz/src/colordialog.cpp Added

@@ -0,0 +1,181 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <QLabel>
+#include <QSlider>
+#include <QDoubleSpinBox>
+#include <QGridLayout>
+
+#include "colordialog.h"
+
+#include "gui_common.h"
+
+color_dialog::color_dialog(QWidget *parent) : QWidget(parent), _lock(false)
+{
+ QLabel *c_label = new QLabel(_("Contrast:"));
+ _c_slider = new QSlider(Qt::Horizontal);
+ _c_slider->setRange(-1000, 1000);
+ _c_slider->setValue(dispatch::parameters().contrast() * 1000.0f);
+ connect(_c_slider, SIGNAL(valueChanged(int)), this, SLOT(c_slider_changed(int)));
+ _c_spinbox = new QDoubleSpinBox();
+ _c_spinbox->setRange(-1.0, +1.0);
+ _c_spinbox->setValue(dispatch::parameters().contrast());
+ _c_spinbox->setDecimals(2);
+ _c_spinbox->setSingleStep(0.01);
+ connect(_c_spinbox, SIGNAL(valueChanged(double)), this, SLOT(c_spinbox_changed(double)));
+ QLabel *b_label = new QLabel(_("Brightness:"));
+ _b_slider = new QSlider(Qt::Horizontal);
+ _b_slider->setRange(-1000, 1000);
+ _b_slider->setValue(dispatch::parameters().brightness() * 1000.0f);
+ connect(_b_slider, SIGNAL(valueChanged(int)), this, SLOT(b_slider_changed(int)));
+ _b_spinbox = new QDoubleSpinBox();
+ _b_spinbox->setRange(-1.0, +1.0);
+ _b_spinbox->setValue(dispatch::parameters().brightness());
+ _b_spinbox->setDecimals(2);
+ _b_spinbox->setSingleStep(0.01);
+ connect(_b_spinbox, SIGNAL(valueChanged(double)), this, SLOT(b_spinbox_changed(double)));
+ QLabel *h_label = new QLabel(_("Hue:"));
+ _h_slider = new QSlider(Qt::Horizontal);
+ _h_slider->setRange(-1000, 1000);
+ _h_slider->setValue(dispatch::parameters().hue() * 1000.0f);
+ connect(_h_slider, SIGNAL(valueChanged(int)), this, SLOT(h_slider_changed(int)));
+ _h_spinbox = new QDoubleSpinBox();
+ _h_spinbox->setRange(-1.0, +1.0);
+ _h_spinbox->setValue(dispatch::parameters().hue());
+ _h_spinbox->setDecimals(2);
+ _h_spinbox->setSingleStep(0.01);
+ connect(_h_spinbox, SIGNAL(valueChanged(double)), this, SLOT(h_spinbox_changed(double)));
+ QLabel *s_label = new QLabel(_("Saturation:"));
+ _s_slider = new QSlider(Qt::Horizontal);
+ _s_slider->setRange(-1000, 1000);
+ _s_slider->setValue(dispatch::parameters().saturation() * 1000.0f);
+ connect(_s_slider, SIGNAL(valueChanged(int)), this, SLOT(s_slider_changed(int)));
+ _s_spinbox = new QDoubleSpinBox();
+ _s_spinbox->setRange(-1.0, +1.0);
+ _s_spinbox->setValue(dispatch::parameters().saturation());
+ _s_spinbox->setDecimals(2);
+ _s_spinbox->setSingleStep(0.01);
+ connect(_s_spinbox, SIGNAL(valueChanged(double)), this, SLOT(s_spinbox_changed(double)));
+
+ QGridLayout *layout = new QGridLayout;
+ layout->addWidget(c_label, 0, 0);
+ layout->addWidget(_c_slider, 0, 1);
+ layout->addWidget(_c_spinbox, 0, 2);
+ layout->addWidget(b_label, 1, 0);
+ layout->addWidget(_b_slider, 1, 1);
+ layout->addWidget(_b_spinbox, 1, 2);
+ layout->addWidget(h_label, 2, 0);
+ layout->addWidget(_h_slider, 2, 1);
+ layout->addWidget(_h_spinbox, 2, 2);
+ layout->addWidget(s_label, 3, 0);
+ layout->addWidget(_s_slider, 3, 1);
+ layout->addWidget(_s_spinbox, 3, 2);
+ setLayout(layout);
+}
+
+void color_dialog::c_slider_changed(int val)
+{
+ if (!_lock)
+ send_cmd(command::set_contrast, val / 1000.0f);
+}
+
+void color_dialog::c_spinbox_changed(double val)
+{
+ if (!_lock)
+ send_cmd(command::set_contrast, static_cast<float>(val));
+}
+
+void color_dialog::b_slider_changed(int val)
+{
+ if (!_lock)
+ send_cmd(command::set_brightness, val / 1000.0f);
+}
+
+void color_dialog::b_spinbox_changed(double val)
+{
+ if (!_lock)
+ send_cmd(command::set_brightness, static_cast<float>(val));
+}
+
+void color_dialog::h_slider_changed(int val)
+{
+ if (!_lock)
+ send_cmd(command::set_hue, val / 1000.0f);
+}
+
+void color_dialog::h_spinbox_changed(double val)
+{
+ if (!_lock)
+ send_cmd(command::set_hue, static_cast<float>(val));
+}
+
+void color_dialog::s_slider_changed(int val)
+{
+ if (!_lock)
+ send_cmd(command::set_saturation, val / 1000.0f);
+}
+
+void color_dialog::s_spinbox_changed(double val)
+{
+ if (!_lock)
+ send_cmd(command::set_saturation, static_cast<float>(val));
+}
+
+void color_dialog::receive_notification(const notification &note)
+{
+ switch (note.type)
+ {
+ case notification::contrast:
+ _lock = true;
+ _c_slider->setValue(dispatch::parameters().contrast() * 1000.0f);
+ _c_spinbox->setValue(dispatch::parameters().contrast());
+ _lock = false;
+ break;
+ case notification::brightness:
+ _lock = true;
+ _b_slider->setValue(dispatch::parameters().brightness() * 1000.0f);
+ _b_spinbox->setValue(dispatch::parameters().brightness());
+ _lock = false;
+ break;
+ case notification::hue:
+ _lock = true;
+ _h_slider->setValue(dispatch::parameters().hue() * 1000.0f);
+ _h_spinbox->setValue(dispatch::parameters().hue());
+ _lock = false;
+ break;
+ case notification::saturation:
+ _lock = true;
+ _s_slider->setValue(dispatch::parameters().saturation() * 1000.0f);
+ _s_spinbox->setValue(dispatch::parameters().saturation());
+ _lock = false;
+ break;
+ default:
+ /* not handled */
+ break;
+ }
+}

bino-1.6.5.tar.xz/src/colordialog.h Added

@@ -0,0 +1,69 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef COLORDIALOG_H
+#define COLORDIALOG_H
+
+#include "config.h"
+
+#include <QWidget>
+#include "dispatch.h"
+
+class QDoubleSpinBox;
+class QSlider;
+
+class color_dialog : public QWidget, public controller
+{
+ Q_OBJECT
+
+private:
+ bool _lock;
+ QDoubleSpinBox *_c_spinbox;
+ QSlider *_c_slider;
+ QDoubleSpinBox *_b_spinbox;
+ QSlider *_b_slider;
+ QDoubleSpinBox *_h_spinbox;
+ QSlider *_h_slider;
+ QDoubleSpinBox *_s_spinbox;
+ QSlider *_s_slider;
+
+private slots:
+ void c_slider_changed(int val);
+ void c_spinbox_changed(double val);
+ void b_slider_changed(int val);
+ void b_spinbox_changed(double val);
+ void h_slider_changed(int val);
+ void h_spinbox_changed(double val);
+ void s_slider_changed(int val);
+ void s_spinbox_changed(double val);
+
+public:
+ color_dialog(QWidget *parent = 0);
+
+ virtual void receive_notification(const notification &note);
+};
+
+
+#endif

bino-1.6.1.tar.xz/src/command_file.cpp -> bino-1.6.5.tar.xz/src/command_file.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2012
+ * Copyright (C) 2012, 2015
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -27,12 +27,12 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "gettext.h"
-#define _(string) gettext(string)
+#include "base/exc.h"
+#include "base/str.h"
+#include "base/tmr.h"
 
-#include "exc.h"
-#include "str.h"
-#include "timer.h"
+#include "base/gettext.h"
+#define _(string) gettext(string)
 
 #include "command_file.h"
 
@@ -101,7 +101,7 @@
 return;
 
 if (_wait_until >= 0) {
- int64_t now = timer::get_microseconds(timer::monotonic);
+ int64_t now = timer::get(timer::monotonic);
 if (now < _wait_until)
 return;
 }
@@ -161,7 +161,7 @@
 _wait_until_stop = true;
 return;
 } else if (str::to(tokens[1], &seconds)) {
- _wait_until = timer::get_microseconds(timer::monotonic);
+ _wait_until = timer::get(timer::monotonic);
 if (seconds > 0.0f)
 _wait_until += seconds * 1e6f;
 return;

bino-1.6.5.tar.xz/src/controlswidget.cpp Added

@@ -0,0 +1,390 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2016
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <QGridLayout>
+#include <QIcon>
+#include <QLabel>
+#include <QSettings>
+#include <QSlider>
+#include <QPushButton>
+
+#include "controlswidget.h"
+#include "gui_common.h"
+#include "media_input.h"
+
+controls_widget::controls_widget(QSettings *settings, QWidget *parent)
+ : QWidget(parent), _input_duration(0), _lock(false), _settings(settings)
+{
+ QGridLayout *row0_layout = new QGridLayout;
+ _seek_slider = new QSlider(Qt::Horizontal);
+ _seek_slider->setToolTip(_("This slider shows the progress during video playback, "
+ "and can be used to seek in the video."));
+ _seek_slider->setRange(0, 2000);
+ _seek_slider->setTracking(false);
+ connect(_seek_slider, SIGNAL(valueChanged(int)), this, SLOT(seek_slider_changed()));
+ row0_layout->addWidget(_seek_slider, 0, 0);
+ _pos_label = new QLabel("0:00");
+ _pos_label->setToolTip(_("Elapsed / total time."));
+ _pos_label->setAlignment(Qt::AlignRight);
+ _pos_label->setTextFormat(Qt::PlainText);
+ _pos_label->setFrameShape(QFrame::StyledPanel);
+ _pos_label->setMinimumSize(QSize(0, 0));
+ row0_layout->addWidget(_pos_label, 0, 1);
+ _audio_mute_button = new QPushButton(get_icon("audio-volume-medium"), "");
+ _audio_mute_button->setToolTip(_("Toggle audio mute."));
+ _audio_mute_button->setCheckable(true);
+ connect(_audio_mute_button, SIGNAL(toggled(bool)), this, SLOT(audio_mute_clicked()));
+ row0_layout->addWidget(_audio_mute_button, 0, 2);
+ _audio_volume_slider = new QSlider(Qt::Horizontal);
+ _audio_volume_slider->setToolTip(_("Adjust audio volume."));
+ _audio_volume_slider->setRange(0, 1000);
+ _audio_volume_slider->setTickPosition(QSlider::TicksBelow);
+ _audio_volume_slider->setTickInterval(100);
+ _audio_volume_slider->setSingleStep(25);
+ _audio_volume_slider->setPageStep(200);
+ connect(_audio_volume_slider, SIGNAL(valueChanged(int)), this, SLOT(audio_volume_slider_changed()));
+ row0_layout->addWidget(_audio_volume_slider, 0, 3);
+ row0_layout->setColumnStretch(0, 1);
+
+ QGridLayout *row1_layout = new QGridLayout;
+ _play_button = new QPushButton(get_icon("media-playback-start"), "");
+ _play_button->setToolTip(_("Play."));
+ connect(_play_button, SIGNAL(clicked()), this, SLOT(play_clicked()));
+ row1_layout->addWidget(_play_button, 1, 0);
+ _pause_button = new QPushButton(get_icon("media-playback-pause"), "");
+ _pause_button->setToolTip(_("Pause."));
+ connect(_pause_button, SIGNAL(clicked()), this, SLOT(pause_clicked()));
+ row1_layout->addWidget(_pause_button, 1, 1);
+ _stop_button = new QPushButton(get_icon("media-playback-stop"), "");
+ _stop_button->setToolTip(_("Stop."));
+ connect(_stop_button, SIGNAL(clicked()), this, SLOT(stop_clicked()));
+ row1_layout->addWidget(_stop_button, 1, 2);
+ row1_layout->addWidget(new QWidget, 1, 3);
+ _loop_button = new QPushButton(get_icon("media-playlist-repeat"), "");
+ _loop_button->setToolTip(_("Toggle loop mode."));
+ _loop_button->setCheckable(true);
+ _loop_button->setChecked(dispatch::parameters().loop_mode() != parameters::no_loop);
+ connect(_loop_button, SIGNAL(toggled(bool)), this, SLOT(loop_clicked()));
+ row1_layout->addWidget(_loop_button, 1, 4);
+ row1_layout->addWidget(new QWidget, 1, 5);
+ _fullscreen_button = new QPushButton(get_icon("view-fullscreen"), "");
+ _fullscreen_button->setToolTip(_("Switch to fullscreen mode. "
+ "You can leave fullscreen mode by pressing the f key."));
+ _fullscreen_button->setCheckable(true);
+ connect(_fullscreen_button, SIGNAL(clicked()), this, SLOT(fullscreen_clicked()));
+ row1_layout->addWidget(_fullscreen_button, 1, 6);
+ _center_button = new QPushButton(get_icon("view-restore"), "");
+ _center_button->setToolTip(_("Center the video area on your screen."));
+ connect(_center_button, SIGNAL(clicked()), this, SLOT(center_clicked()));
+ row1_layout->addWidget(_center_button, 1, 7);
+ row1_layout->addWidget(new QWidget, 1, 8);
+ _bbb_button = new QPushButton(get_icon("media-seek-backward"), "");
+ _bbb_button->setFixedSize(_bbb_button->minimumSizeHint());
+ _bbb_button->setIconSize(_bbb_button->iconSize() * 12 / 10);
+ _bbb_button->setToolTip(_("Seek backward 10 minutes."));
+ connect(_bbb_button, SIGNAL(clicked()), this, SLOT(bbb_clicked()));
+ row1_layout->addWidget(_bbb_button, 1, 9);
+ _bb_button = new QPushButton(get_icon("media-seek-backward"), "");
+ _bb_button->setFixedSize(_bb_button->minimumSizeHint());
+ _bb_button->setToolTip(_("Seek backward 1 minute."));
+ connect(_bb_button, SIGNAL(clicked()), this, SLOT(bb_clicked()));
+ row1_layout->addWidget(_bb_button, 1, 10);
+ _b_button = new QPushButton(get_icon("media-seek-backward"), "");
+ _b_button->setFixedSize(_b_button->minimumSizeHint());
+ _b_button->setIconSize(_b_button->iconSize() * 8 / 10);
+ _b_button->setToolTip(_("Seek backward 10 seconds."));
+ connect(_b_button, SIGNAL(clicked()), this, SLOT(b_clicked()));
+ row1_layout->addWidget(_b_button, 1, 11);
+ _f_button = new QPushButton(get_icon("media-seek-forward"), "");
+ _f_button->setFixedSize(_f_button->minimumSizeHint());
+ _f_button->setIconSize(_f_button->iconSize() * 8 / 10);
+ _f_button->setToolTip(_("Seek forward 10 seconds."));
+ connect(_f_button, SIGNAL(clicked()), this, SLOT(f_clicked()));
+ row1_layout->addWidget(_f_button, 1, 12);
+ _ff_button = new QPushButton(get_icon("media-seek-forward"), "");
+ _ff_button->setFixedSize(_ff_button->minimumSizeHint());
+ _ff_button->setToolTip(_("Seek forward 1 minute."));
+ connect(_ff_button, SIGNAL(clicked()), this, SLOT(ff_clicked()));
+ row1_layout->addWidget(_ff_button, 1, 13);
+ _fff_button = new QPushButton(get_icon("media-seek-forward"), "");
+ _fff_button->setFixedSize(_fff_button->minimumSizeHint());
+ _fff_button->setIconSize(_fff_button->iconSize() * 12 / 10);
+ _fff_button->setToolTip(_("Seek forward 10 minutes."));
+ connect(_fff_button, SIGNAL(clicked()), this, SLOT(fff_clicked()));
+ row1_layout->addWidget(_fff_button, 1, 14);
+ row1_layout->setRowStretch(0, 0);
+ row1_layout->setColumnStretch(3, 1);
+ row1_layout->setColumnStretch(5, 1);
+ row1_layout->setColumnStretch(8, 1);
+
+ QGridLayout *layout = new QGridLayout;
+ layout->addLayout(row0_layout, 0, 0);
+ layout->addLayout(row1_layout, 1, 0);
+ setLayout(layout);
+
+ _play_button->setEnabled(false);
+ _pause_button->setEnabled(false);
+ _stop_button->setEnabled(false);
+ _loop_button->setEnabled(false);
+ _fullscreen_button->setEnabled(false);
+ _center_button->setEnabled(false);
+ _bbb_button->setEnabled(false);
+ _bb_button->setEnabled(false);
+ _b_button->setEnabled(false);
+ _f_button->setEnabled(false);
+ _ff_button->setEnabled(false);
+ _fff_button->setEnabled(false);
+ _seek_slider->setEnabled(false);
+ _pos_label->setEnabled(false);
+
+ update();
+ update_audio_widgets();
+}
+
+void controls_widget::update_audio_widgets()
+{
+ _lock = true;
+ _audio_mute_button->setChecked(dispatch::parameters().audio_mute());
+ _audio_mute_button->setIcon(get_icon(
+ dispatch::parameters().audio_mute() ? "audio-volume-muted"
+ : dispatch::parameters().audio_volume() < 0.33f ? "audio-volume-low"
+ : dispatch::parameters().audio_volume() < 0.66f ? "audio-volume-medium"
+ : "audio-volume-high"));
+ _audio_volume_slider->setValue(qRound(dispatch::parameters().audio_volume() * 1000.0f));
+ _lock = false;
+}
+
+void controls_widget::play_clicked()
+{
+ if (dispatch::playing())
+ {
+ send_cmd(command::toggle_pause);
+ }
+ else
+ {
+ send_cmd(command::toggle_play);
+ }
+}
+
+void controls_widget::pause_clicked()
+{
+ send_cmd(command::toggle_pause);
+}
+
+void controls_widget::stop_clicked()
+{
+ send_cmd(command::toggle_play);
+}
+
+void controls_widget::loop_clicked()
+{
+ if (!_lock)
+ {
+ parameters::loop_mode_t loop_mode = _loop_button->isChecked()
+ ? parameters::loop_current : parameters::no_loop;
+ send_cmd(command::set_loop_mode, static_cast<int>(loop_mode));
+ }
+}
+
+void controls_widget::fullscreen_clicked()
+{
+ if (!_lock)
+ {
+ send_cmd(command::toggle_fullscreen);
+ }
+}
+
+void controls_widget::center_clicked()
+{
+ send_cmd(command::center);
+}
+
+void controls_widget::bbb_clicked()
+{
+ send_cmd(command::seek, -600.0f);
+}
+
+void controls_widget::bb_clicked()
+{
+ send_cmd(command::seek, -60.0f);
+}
+
+void controls_widget::b_clicked()
+{
+ send_cmd(command::seek, -10.0f);
+}
+
+void controls_widget::f_clicked()
+{
+ send_cmd(command::seek, +10.0f);
+}
+
+void controls_widget::ff_clicked()
+{
+ send_cmd(command::seek, +60.0f);
+}
+
+void controls_widget::fff_clicked()
+{
+ send_cmd(command::seek, +600.0f);
+}
+
+void controls_widget::seek_slider_changed()
+{
+ if (!_lock)
+ {
+ send_cmd(command::set_pos, static_cast<float>(_seek_slider->value()) / 2000.0f);
+ }
+}
+
+void controls_widget::audio_mute_clicked()
+{
+ if (!_lock)
+ {
+ send_cmd(command::toggle_audio_mute);
+ }
+}
+
+void controls_widget::audio_volume_slider_changed()
+{
+ if (!_lock)
+ {
+ send_cmd(command::set_audio_volume, _audio_volume_slider->value() / 1000.0f);
+ }
+}
+
+void controls_widget::update()
+{
+ if (dispatch::media_input())
+ {
+ _play_button->setDefault(true);
+ _play_button->setFocus();
+ _loop_button->setEnabled(true);
+ _fullscreen_button->setEnabled(true);
+ _input_duration = dispatch::media_input()->duration();
+ if (_input_duration < 0)
+ _input_duration = 0;
+ std::string hr_duration = str::human_readable_time(_input_duration);
+ _pos_label->setText((hr_duration + '/' + hr_duration).c_str());
+ _pos_label->setMinimumSize(_pos_label->minimumSizeHint());
+ _pos_label->setText(hr_duration.c_str());
+ }
+ else
+ {
+ _play_button->setEnabled(false);
+ _pause_button->setEnabled(false);
+ _stop_button->setEnabled(false);
+ _loop_button->setEnabled(false);
+ _fullscreen_button->setEnabled(false);
+ _center_button->setEnabled(false);
+ _bbb_button->setEnabled(false);
+ _bb_button->setEnabled(false);
+ _b_button->setEnabled(false);
+ _f_button->setEnabled(false);
+ _ff_button->setEnabled(false);
+ _fff_button->setEnabled(false);
+ _seek_slider->setEnabled(false);
+ _seek_slider->setValue(0);
+ _pos_label->setEnabled(false);
+ _pos_label->setText("0:00");
+ _pos_label->setMinimumSize(QSize(0, 0));
+ }
+}
+
+void controls_widget::receive_notification(const notification &note)
+{
+ bool b;
+
+ switch (note.type)
+ {
+ case notification::open:
+ update();
+ break;
+ case notification::play:
+ b = dispatch::playing();
+ _play_button->setEnabled(!b);
+ _pause_button->setEnabled(b);
+ _stop_button->setEnabled(b);
+ if (b && _fullscreen_button->isChecked() && !dispatch::parameters().fullscreen())
+ {
+ _lock = true;
+ send_cmd(command::toggle_fullscreen);
+ _lock = false;
+ }
+ _center_button->setEnabled(b);
+ _bbb_button->setEnabled(b);
+ _bb_button->setEnabled(b);
+ _b_button->setEnabled(b);
+ _f_button->setEnabled(b);
+ _ff_button->setEnabled(b);
+ _fff_button->setEnabled(b);
+ _seek_slider->setEnabled(b);
+ _pos_label->setEnabled(b);
+ if (!b)
+ {
+ _seek_slider->setValue(0);
+ _pos_label->setText(str::human_readable_time(_input_duration).c_str());
+ }
+ break;
+ case notification::pause:
+ b = dispatch::pausing();
+ _play_button->setEnabled(b);
+ _pause_button->setEnabled(!b);
+ break;
+ case notification::fullscreen:
+ _lock = true;
+ _fullscreen_button->setChecked(dispatch::parameters().fullscreen());
+ _lock = false;
+ break;
+ case notification::pos:
+ if (!_seek_slider->isSliderDown())
+ {
+ _lock = true;
+ float p = dispatch::position();
+ _seek_slider->setValue(qRound(p * 2000.0f));
+ _pos_label->setText((str::human_readable_time(
+ static_cast<int64_t>(p * 1000.0f) * _input_duration / 1000)
+ + '/' + str::human_readable_time(_input_duration)).c_str());
+ _lock = false;
+ }
+ break;
+ case notification::audio_volume:
+ update_audio_widgets();
+ break;
+ case notification::audio_mute:
+ update_audio_widgets();
+ break;
+ default:
+ break;
+ }
+}
+
+QIcon controls_widget::get_icon(const QString& name)
+{
+ return QIcon::fromTheme(name, QIcon(QString(":icons/") + name));
+}

bino-1.6.5.tar.xz/src/controlswidget.h Added

@@ -0,0 +1,93 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CONTROLSWIDGET_H
+#define CONTROLSWIDGET_H
+
+#include "config.h"
+
+#include <QWidget>
+#include "dispatch.h"
+
+class QIcon;
+class QSettings;
+class QPushButton;
+class QSlider;
+class QLabel;
+
+class controls_widget : public QWidget, public controller
+{
+ Q_OBJECT
+
+private:
+ int64_t _input_duration;
+ bool _lock;
+ QSettings *_settings;
+ QPushButton *_play_button;
+ QPushButton *_pause_button;
+ QPushButton *_stop_button;
+ QPushButton *_loop_button;
+ QPushButton *_fullscreen_button;
+ QPushButton *_center_button;
+ QPushButton *_bbb_button;
+ QPushButton *_bb_button;
+ QPushButton *_b_button;
+ QPushButton *_f_button;
+ QPushButton *_ff_button;
+ QPushButton *_fff_button;
+ QSlider *_seek_slider;
+ QLabel *_pos_label;
+ QPushButton *_audio_mute_button;
+ QSlider *_audio_volume_slider;
+
+private:
+ void update_audio_widgets();
+ QIcon get_icon(const QString & name);
+
+private slots:
+ void play_clicked();
+ void pause_clicked();
+ void stop_clicked();
+ void loop_clicked();
+ void fullscreen_clicked();
+ void center_clicked();
+ void bbb_clicked();
+ void bb_clicked();
+ void b_clicked();
+ void f_clicked();
+ void ff_clicked();
+ void fff_clicked();
+ void seek_slider_changed();
+ void audio_mute_clicked();
+ void audio_volume_slider_changed();
+
+public:
+ controls_widget(QSettings *settings, QWidget *parent);
+
+ void update();
+ virtual void receive_notification(const notification &note);
+};
+
+#endif

bino-1.6.5.tar.xz/src/crosstalkdialog.cpp Added

@@ -0,0 +1,103 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <QLabel>
+#include <QDoubleSpinBox>
+#include <QGridLayout>
+
+#include "crosstalkdialog.h"
+#include "gui_common.h"
+
+crosstalk_dialog::crosstalk_dialog(QWidget *parent) : QWidget(parent), _lock(false)
+{
+ /* TRANSLATORS: Please keep the lines short using where necessary. */
+ QLabel *rtfm_label = new QLabel(_("Please read the manual to find out "
+ "how to measure the crosstalk levels "
+ "of your display."));
+
+ QLabel *r_label = new QLabel(_("Red:"));
+ _r_spinbox = new QDoubleSpinBox();
+ _r_spinbox->setRange(0.0, +1.0);
+ _r_spinbox->setValue(dispatch::parameters().crosstalk_r());
+ _r_spinbox->setDecimals(2);
+ _r_spinbox->setSingleStep(0.01);
+ connect(_r_spinbox, SIGNAL(valueChanged(double)), this, SLOT(spinbox_changed()));
+ QLabel *g_label = new QLabel(_("Green:"));
+ _g_spinbox = new QDoubleSpinBox();
+ _g_spinbox->setRange(0.0, +1.0);
+ _g_spinbox->setValue(dispatch::parameters().crosstalk_g());
+ _g_spinbox->setDecimals(2);
+ _g_spinbox->setSingleStep(0.01);
+ connect(_g_spinbox, SIGNAL(valueChanged(double)), this, SLOT(spinbox_changed()));
+ QLabel *b_label = new QLabel(_("Blue:"));
+ _b_spinbox = new QDoubleSpinBox();
+ _b_spinbox->setRange(0.0, +1.0);
+ _b_spinbox->setValue(dispatch::parameters().crosstalk_b());
+ _b_spinbox->setDecimals(2);
+ _b_spinbox->setSingleStep(0.01);
+ connect(_b_spinbox, SIGNAL(valueChanged(double)), this, SLOT(spinbox_changed()));
+
+ QGridLayout *layout = new QGridLayout;
+ layout->addWidget(rtfm_label, 0, 0, 1, 2);
+ layout->addWidget(r_label, 2, 0);
+ layout->addWidget(_r_spinbox, 2, 1);
+ layout->addWidget(g_label, 3, 0);
+ layout->addWidget(_g_spinbox, 3, 1);
+ layout->addWidget(b_label, 4, 0);
+ layout->addWidget(_b_spinbox, 4, 1);
+ setLayout(layout);
+}
+
+void crosstalk_dialog::spinbox_changed()
+{
+ if (!_lock)
+ {
+ std::ostringstream v;
+ s11n::save(v, static_cast<float>(_r_spinbox->value()));
+ s11n::save(v, static_cast<float>(_g_spinbox->value()));
+ s11n::save(v, static_cast<float>(_b_spinbox->value()));
+ send_cmd(command::set_crosstalk, v.str());
+ }
+}
+
+void crosstalk_dialog::receive_notification(const notification &note)
+{
+ switch (note.type)
+ {
+ case notification::crosstalk:
+ _lock = true;
+ _r_spinbox->setValue(dispatch::parameters().crosstalk_r());
+ _g_spinbox->setValue(dispatch::parameters().crosstalk_g());
+ _b_spinbox->setValue(dispatch::parameters().crosstalk_b());
+ _lock = false;
+ break;
+ default:
+ /* not handled */
+ break;
+ }
+}

bino-1.6.5.tar.xz/src/crosstalkdialog.h Added

@@ -0,0 +1,55 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CROSSTALKDIALOG_H
+#define CROSSTALKDIALOG_H
+
+#include "config.h"
+
+#include <QWidget>
+#include "dispatch.h"
+
+class QDoubleSpinBox;
+
+class crosstalk_dialog : public QWidget, public controller
+{
+ Q_OBJECT
+
+private:
+ bool _lock;
+ QDoubleSpinBox *_r_spinbox;
+ QDoubleSpinBox *_g_spinbox;
+ QDoubleSpinBox *_b_spinbox;
+
+private slots:
+ void spinbox_changed();
+
+public:
+ crosstalk_dialog(QWidget *parent = 0);
+
+ virtual void receive_notification(const notification &note);
+};
+
+#endif

bino-1.6.1.tar.xz/src/dispatch.cpp -> bino-1.6.5.tar.xz/src/dispatch.cpp Changed

bino-1.6.1.tar.xz/src/dispatch.h -> bino-1.6.5.tar.xz/src/dispatch.h Changed

bino-1.6.5.tar.xz/src/fullscreendialog.cpp Added

@@ -0,0 +1,211 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <QApplication>
+#include <QLabel>
+#include <QGridLayout>
+#include <QRadioButton>
+#include <QComboBox>
+#include <QCheckBox>
+#include <QLineEdit>
+#include <QDesktopWidget>
+#include <QCloseEvent>
+
+#include "fullscreendialog.h"
+
+#include "gui_common.h"
+
+fullscreen_dialog::fullscreen_dialog(QWidget* parent) : QWidget(parent)
+{
+ const int screen_count = QApplication::desktop()->screenCount();
+
+ /* Create the dialog. This dialog differs from other dialogs (e.g. the color
+ * dialog) in that its settings only take effect when the dialog is closed,
+ * and not immediately. This is necessary to allow the user full flexibility
+ * in defining the screens used in fullscreen mode. */
+
+ QLabel* lbl = new QLabel(_("Configure fullscreen mode:"));
+ lbl->setToolTip(_("Select the screens to use in fullscreen mode."));
+
+ _single_btn = new QRadioButton(_("Single screen:"));
+ _single_btn->setToolTip(_("Use a single screen for fullscreen mode."));
+ _single_box = new QComboBox();
+ _single_box->setToolTip(_single_btn->toolTip());
+ _single_box->addItem(_("Primary screen"));
+ if (screen_count > 1) {
+ for (int i = 0; i < screen_count; i++)
+ _single_box->addItem(str::asprintf(_("Screen %d"), i + 1).c_str());
+ }
+
+ _dual_btn = new QRadioButton(_("Dual screen:"));
+ _dual_btn->setToolTip(_("Use two screens for fullscreen mode."));
+ _dual_box0 = new QComboBox();
+ _dual_box0->setToolTip(_dual_btn->toolTip());
+ _dual_box1 = new QComboBox();
+ _dual_box1->setToolTip(_dual_btn->toolTip());
+ if (screen_count > 1) {
+ for (int i = 0; i < screen_count; i++) {
+ _dual_box0->addItem(str::asprintf(_("Screen %d"), i + 1).c_str());
+ _dual_box1->addItem(str::asprintf(_("Screen %d"), i + 1).c_str());
+ }
+ }
+
+ _multi_btn = new QRadioButton(_("Multi screen:"));
+ _multi_btn->setToolTip(_("Use multiple screens for fullscreen mode."));
+ _multi_edt = new QLineEdit();
+ _multi_edt->setToolTip(_("Comma-separated list of screens to use for fullscreen mode."));
+ _multi_edt->setValidator(new QRegExpValidator(QRegExp("\\d{1,2}(,\\d{1,2}){0,15}"), 0));
+
+ QLabel* lbl2 = new QLabel(_("When in fullscreen mode,"));
+ lbl2->setToolTip(_("Set special left/right view handling for fullscreen mode."));
+
+ _flip_left_box = new QCheckBox(_("flip left view vertically."));
+ _flip_left_box->setToolTip(lbl2->toolTip());
+ _flop_left_box = new QCheckBox(_("flop left view horizontally."));
+ _flop_left_box->setToolTip(lbl2->toolTip());
+ _flip_right_box = new QCheckBox(_("flip right view vertically."));
+ _flip_right_box->setToolTip(lbl2->toolTip());
+ _flop_right_box = new QCheckBox(_("flop right view horizontally."));
+ _flop_right_box->setToolTip(lbl2->toolTip());
+
+ _3d_ready_sync_box = new QCheckBox(_("use DLP(R) 3-D Ready Sync"));
+ _3d_ready_sync_box->setToolTip(_("Use DLP&reg; 3-D Ready Sync for supported output modes."));
+
+ _inhibit_screensaver_box = new QCheckBox(_("inhibit the screensaver"));
+ _inhibit_screensaver_box->setToolTip(_("Inhibit the screensaver during fullscreen playback."));
+
+ QGridLayout *layout0 = new QGridLayout();
+ layout0->addWidget(lbl, 0, 0, 1, 3);
+ layout0->addWidget(_single_btn, 1, 0);
+ layout0->addWidget(_single_box, 1, 1, 1, 2);
+ layout0->addWidget(_dual_btn, 2, 0);
+ layout0->addWidget(_dual_box0, 2, 1);
+ layout0->addWidget(_dual_box1, 2, 2);
+ layout0->addWidget(_multi_btn, 3, 0);
+ layout0->addWidget(_multi_edt, 3, 1, 1, 2);
+ layout0->addWidget(lbl2, 4, 0, 1, 3);
+ layout0->addWidget(_flip_left_box, 5, 0, 1, 3);
+ layout0->addWidget(_flop_left_box, 6, 0, 1, 3);
+ layout0->addWidget(_flip_right_box, 7, 0, 1, 3);
+ layout0->addWidget(_flop_right_box, 8, 0, 1, 3);
+ layout0->addWidget(_3d_ready_sync_box, 9, 0, 1, 3);
+ layout0->addWidget(_inhibit_screensaver_box, 10, 0, 1, 3);
+ QGridLayout *layout1 = new QGridLayout();
+ QGridLayout *layout = new QGridLayout();
+ layout->addLayout(layout0, 0, 0);
+ layout->addLayout(layout1, 1, 0);
+ setLayout(layout);
+
+ /* Fill in the current settings */
+
+ if (screen_count < 3) {
+ _multi_btn->setEnabled(false);
+ _multi_edt->setEnabled(false);
+ } else {
+ _multi_edt->setText("1,2,3");
+ }
+ if (screen_count < 2) {
+ _dual_btn->setEnabled(false);
+ _dual_box0->setEnabled(false);
+ _dual_box1->setEnabled(false);
+ } else {
+ _dual_box0->setCurrentIndex(0);
+ _dual_box1->setCurrentIndex(1);
+ }
+ std::vector<int> conf_screens;
+ for (int i = 0; i < 16; i++)
+ if (dispatch::parameters().fullscreen_screens() & (1 << i))
+ conf_screens.push_back(i);
+ if (conf_screens.size() >= 3 && screen_count >= 3) {
+ QString screen_list;
+ for (size_t i = 0; i < conf_screens.size(); i++) {
+ screen_list += str::from(conf_screens[i] + 1).c_str();
+ if (i < conf_screens.size() - 1)
+ screen_list += ',';
+ }
+ _multi_btn->setChecked(true);
+ _multi_edt->setText(screen_list);
+ } else if (conf_screens.size() == 2 && screen_count >= 2) {
+ _dual_box0->setCurrentIndex(conf_screens[0]);
+ _dual_box1->setCurrentIndex(conf_screens[1]);
+ _dual_btn->setChecked(true);
+ } else {
+ if (conf_screens.size() > 0 && conf_screens[0] < screen_count)
+ _single_box->setCurrentIndex(conf_screens[0] + 1);
+ else
+ _single_box->setCurrentIndex(0);
+ _single_btn->setChecked(true);
+ }
+ _flip_left_box->setChecked(dispatch::parameters().fullscreen_flip_left());
+ _flop_left_box->setChecked(dispatch::parameters().fullscreen_flop_left());
+ _flip_right_box->setChecked(dispatch::parameters().fullscreen_flip_right());
+ _flop_right_box->setChecked(dispatch::parameters().fullscreen_flop_right());
+ _3d_ready_sync_box->setChecked(dispatch::parameters().fullscreen_3d_ready_sync());
+#ifndef Q_OS_WIN
+ _inhibit_screensaver_box->setChecked(dispatch::parameters().fullscreen_inhibit_screensaver());
+#else
+ _inhibit_screensaver_box->setChecked(false);
+ _inhibit_screensaver_box->setEnabled(false);
+#endif
+}
+
+void fullscreen_dialog::closeEvent(QCloseEvent* e)
+{
+ /* Activate the settings chosen in the dialog, then close. */
+
+ // fullscreen_screens
+ if (_single_btn->isChecked()) {
+ if (_single_box->currentIndex() == 0)
+ send_cmd(command::set_fullscreen_screens, 0);
+ else
+ send_cmd(command::set_fullscreen_screens, 1 << (_single_box->currentIndex() - 1));
+ } else if (_dual_btn->isChecked()) {
+ send_cmd(command::set_fullscreen_screens,
+ (1 << _dual_box0->currentIndex()) | (1 << _dual_box1->currentIndex()));
+ } else {
+ 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].toLatin1().data());
+ if (s >= 1 && s <= 16)
+ fss |= (1 << (s - 1));
+ }
+ send_cmd(command::set_fullscreen_screens, fss);
+ }
+ // flip/flop settings
+ send_cmd(command::set_fullscreen_flip_left, _flip_left_box->isChecked());
+ send_cmd(command::set_fullscreen_flop_left, _flop_left_box->isChecked());
+ send_cmd(command::set_fullscreen_flip_right, _flip_right_box->isChecked());
+ send_cmd(command::set_fullscreen_flop_right, _flop_right_box->isChecked());
+ // 3d ready sync
+ send_cmd(command::set_fullscreen_3d_ready_sync, _3d_ready_sync_box->isChecked());
+ // inhibit_screensaver
+ send_cmd(command::set_fullscreen_inhibit_screensaver, _inhibit_screensaver_box->isChecked());
+
+ e->accept();
+}

bino-1.6.5.tar.xz/src/fullscreendialog.h Added

@@ -0,0 +1,63 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef FULLSCREENDIALOG_H
+#define FULLSCREENDIALOG_H
+
+#include "config.h"
+
+#include <QWidget>
+#include "dispatch.h"
+
+class QRadioButton;
+class QComboBox;
+class QLineEdit;
+class QCheckBox;
+
+class fullscreen_dialog : public QWidget, public controller
+{
+ Q_OBJECT
+
+private:
+ QRadioButton* _single_btn;
+ QComboBox* _single_box;
+ QRadioButton* _dual_btn;
+ QComboBox* _dual_box0;
+ QComboBox* _dual_box1;
+ QRadioButton* _multi_btn;
+ QLineEdit* _multi_edt;
+ QCheckBox* _flip_left_box;
+ QCheckBox* _flop_left_box;
+ QCheckBox* _flip_right_box;
+ QCheckBox* _flop_right_box;
+ QCheckBox* _3d_ready_sync_box;
+ QCheckBox* _inhibit_screensaver_box;
+
+public:
+ fullscreen_dialog(QWidget* parent = 0);
+ void closeEvent(QCloseEvent* e);
+};
+
+#endif

bino-1.6.1.tar.xz/src/gui.cpp -> bino-1.6.5.tar.xz/src/gui.cpp Changed

@@ -26,67 +26,14 @@
 
 #include "config.h"
 
-#include <limits>
-#include <cmath>
-#include <unistd.h>
-
 #include <QCoreApplication>
-#include <QApplication>
-#include <QMainWindow>
-#include <QGridLayout>
-#include <QCloseEvent>
-#include <QMenu>
-#include <QMenuBar>
-#include <QAction>
-#include <QGridLayout>
-#include <QLineEdit>
-#include <QLabel>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QComboBox>
-#include <QTimer>
 #include <QFile>
-#include <QByteArray>
-#include <QCryptographicHash>
-#include <QUrl>
-#include <QDesktopServices>
-#include <QDoubleSpinBox>
-#include <QSpinBox>
-#include <QCheckBox>
-#include <QFontComboBox>
-#include <QStandardItemModel>
-#include <QTextBrowser>
-#include <QTabWidget>
-#include <QList>
-#include <QTextCodec>
-#include <QRegExp>
-#include <QMap>
-#include <QColorDialog>
-#include <QDesktopWidget>
-#include <QRadioButton>
-#include <QRegExpValidator>
 #include <QSettings>
-#include <QGroupBox>
-#include <QStackedWidget>
-#include <QMimeData>
-
-#include "gettext.h"
-// 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"
-#include "str.h"
 
 #if HAVE_LIBXNVCTRL
-# include "NVCtrl.h"
+# include <NVCtrl/NVCtrl.h>
 # include "NvSDIutils.h"
 #endif // HAVE_LIBXNVCTRL
 
@@ -95,3771 +42,6 @@
 # define PACKAGE_URL "http://bino3d.org"
 #endif
 
-// Helper function: Get the icon with the given name from the icon theme.
-// If unavailable, fall back to the built-in icon. Icon names conform to this specification:
-// http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
-static QIcon get_icon(const QString &name)
-{
- return QIcon::fromTheme(name, QIcon(QString(":icons/") + name));
-}
-
-
-in_out_widget::in_out_widget(QSettings *settings, QWidget *parent) :
- QWidget(parent), _settings(settings), _lock(false)
-{
- QGridLayout *layout0 = new QGridLayout;
- QLabel *video_label = new QLabel(_("Video:"));
- video_label->setToolTip(_("Select the video stream."));
- layout0->addWidget(video_label, 0, 0);
- _video_combobox = new QComboBox(this);
- _video_combobox->setToolTip(video_label->toolTip());
- connect(_video_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(video_changed()));
- layout0->addWidget(_video_combobox, 0, 1);
- QLabel *audio_label = new QLabel(_("Audio:"));
- audio_label->setToolTip(_("Select the audio stream."));
- layout0->addWidget(audio_label, 0, 2);
- _audio_combobox = new QComboBox(this);
- _audio_combobox->setToolTip(audio_label->toolTip());
- connect(_audio_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(audio_changed()));
- layout0->addWidget(_audio_combobox, 0, 3);
- QLabel *subtitle_label = new QLabel(_("Subtitle:"));
- subtitle_label->setToolTip(_("Select the subtitle stream."));
- layout0->addWidget(subtitle_label, 0, 4);
- _subtitle_combobox = new QComboBox(this);
- _subtitle_combobox->setToolTip(subtitle_label->toolTip());
- connect(_subtitle_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(subtitle_changed()));
- layout0->addWidget(_subtitle_combobox, 0, 5);
- layout0->setColumnStretch(1, 1);
- layout0->setColumnStretch(3, 1);
- layout0->setColumnStretch(5, 1);
-
- QGridLayout *layout1 = new QGridLayout;
- QLabel *input_label = new QLabel(_("Input:"));
- input_label->setToolTip(_("Set the 3D layout of the video stream."));
- layout1->addWidget(input_label, 0, 0);
- _input_combobox = new QComboBox(this);
- _input_combobox->setToolTip(input_label->toolTip());
- _input_combobox->addItem(QIcon(":icons-local/input-layout-mono.png"), _("2D"));
- _input_combobox->addItem(QIcon(":icons-local/input-layout-separate-left-right.png"), _("Separate streams, left first"));
- _input_combobox->addItem(QIcon(":icons-local/input-layout-separate-right-left.png"), _("Separate streams, right first"));
- _input_combobox->addItem(QIcon(":icons-local/input-layout-alternating-left-right.png"), _("Alternating, left first"));
- _input_combobox->addItem(QIcon(":icons-local/input-layout-alternating-right-left.png"), _("Alternating, right first"));
- _input_combobox->addItem(QIcon(":icons-local/input-layout-top-bottom.png"), _("Top/bottom"));
- _input_combobox->addItem(QIcon(":icons-local/input-layout-top-bottom-half.png"), _("Top/bottom, half height"));
- _input_combobox->addItem(QIcon(":icons-local/input-layout-bottom-top.png"), _("Bottom/top"));
- _input_combobox->addItem(QIcon(":icons-local/input-layout-bottom-top-half.png"), _("Bottom/top, half height"));
- _input_combobox->addItem(QIcon(":icons-local/input-layout-left-right.png"), _("Left/right"));
- _input_combobox->addItem(QIcon(":icons-local/input-layout-left-right-half.png"), _("Left/right, half width"));
- _input_combobox->addItem(QIcon(":icons-local/input-layout-right-left.png"), _("Right/left"));
- _input_combobox->addItem(QIcon(":icons-local/input-layout-right-left-half.png"), _("Right/left, half width"));
- _input_combobox->addItem(QIcon(":icons-local/input-layout-even-odd-rows.png"), _("Even/odd rows"));
- _input_combobox->addItem(QIcon(":icons-local/input-layout-odd-even-rows.png"), _("Odd/even rows"));
- connect(_input_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(input_changed()));
- layout1->addWidget(_input_combobox, 0, 1);
- layout1->setColumnStretch(1, 1);
-
- QGridLayout *layout2 = new QGridLayout;
- QLabel *output_label = new QLabel(_("Output:"));
- output_label->setToolTip(_("Set the 3D output type for your display."));
- layout2->addWidget(output_label, 0, 0);
- _output_combobox = new QComboBox(this);
- _output_combobox->setToolTip(output_label->toolTip());
- _output_combobox->addItem(QIcon(":icons-local/output-type-mono-left.png"), _("Left view"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-mono-right.png"), _("Right view"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-stereo.png"), _("OpenGL stereo"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-alternating.png"), _("Left/right alternating"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-top-bottom.png"), _("Top/bottom"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-top-bottom-half.png"), _("Top/bottom, half height"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-left-right.png"), _("Left/right"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-left-right-half.png"), _("Left/right, half width"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-even-odd-rows.png"), _("Even/odd rows"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-even-odd-columns.png"), _("Even/odd columns"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-checkerboard.png"), _("Checkerboard pattern"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-hdmi-frame-pack.png"), _("HDMI frame packing mode"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, monochrome"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, half color"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, full color"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, Dubois"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, monochrome"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, half color"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, full color"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, Dubois"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, monochrome"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, half color"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, full color"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, Dubois"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-red-green.png"), _("Red/green glasses, monochrome"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-red-blue.png"), _("Red/blue glasses, monochrome"));
- connect(_output_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(output_changed()));
- layout2->addWidget(_output_combobox, 0, 1);
- layout2->setColumnStretch(1, 1);
- _swap_checkbox = new QCheckBox(_("Swap left/right"));
- _swap_checkbox->setToolTip(_("Swap the left and right view. "
- "Use this if the 3D effect seems wrong."));
- connect(_swap_checkbox, SIGNAL(stateChanged(int)), this, SLOT(swap_changed()));
- layout2->addWidget(_swap_checkbox, 0, 2);
-
- QGridLayout *layout = new QGridLayout;
- layout->addLayout(layout0, 0, 0);
- layout->addLayout(layout1, 1, 0);
- layout->addLayout(layout2, 2, 0);
- setLayout(layout);
-
- // Align the labels
- int minw = input_label->minimumSizeHint().width();
- if (output_label->minimumSizeHint().width() > minw)
- {
- minw = output_label->minimumSizeHint().width();
- }
- if (video_label->minimumSizeHint().width() > minw)
- {
- minw = video_label->minimumSizeHint().width();
- }
- if (audio_label->minimumSizeHint().width() > minw)
- {
- minw = audio_label->minimumSizeHint().width();
- }
- if (subtitle_label->minimumSizeHint().width() > minw)
- {
- minw = subtitle_label->minimumSizeHint().width();
- }
- input_label->setMinimumSize(QSize(minw, input_label->minimumSizeHint().height()));
- output_label->setMinimumSize(QSize(minw, output_label->minimumSizeHint().height()));
- video_label->setMinimumSize(QSize(minw, video_label->minimumSizeHint().height()));
- audio_label->setMinimumSize(QSize(minw, audio_label->minimumSizeHint().height()));
- subtitle_label->setMinimumSize(QSize(minw, subtitle_label->minimumSizeHint().height()));
-
- _video_combobox->setEnabled(false);
- _audio_combobox->setEnabled(false);
- _subtitle_combobox->setEnabled(false);
- _input_combobox->setEnabled(false);
- _output_combobox->setEnabled(false);
- _swap_checkbox->setEnabled(false);
-
- update();
-}
-
-void in_out_widget::set_stereo_layout(parameters::stereo_layout_t stereo_layout, bool stereo_layout_swap)
-{
- switch (stereo_layout)
- {
- case parameters::layout_mono:
- _input_combobox->setCurrentIndex(0);
- break;
- case parameters::layout_separate:
- _input_combobox->setCurrentIndex(stereo_layout_swap ? 2 : 1);
- break;
- case parameters::layout_alternating:
- _input_combobox->setCurrentIndex(stereo_layout_swap ? 4 : 3);
- break;
- case parameters::layout_top_bottom:
- _input_combobox->setCurrentIndex(stereo_layout_swap ? 7 : 5);
- break;
- case parameters::layout_top_bottom_half:
- _input_combobox->setCurrentIndex(stereo_layout_swap ? 8 : 6);
- break;
- case parameters::layout_left_right:
- _input_combobox->setCurrentIndex(stereo_layout_swap ? 11: 9);
- break;
- case parameters::layout_left_right_half:
- _input_combobox->setCurrentIndex(stereo_layout_swap ? 12 : 10);
- break;
- case parameters::layout_even_odd_rows:
- _input_combobox->setCurrentIndex(stereo_layout_swap ? 14 : 13);
- break;
- }
- _video_combobox->setEnabled(stereo_layout != parameters::layout_separate);
-}
-
-void in_out_widget::set_stereo_mode(parameters::stereo_mode_t stereo_mode, bool stereo_mode_swap)
-{
- switch (stereo_mode)
- {
- default:
- case parameters::mode_mono_left:
- _output_combobox->setCurrentIndex(0);
- break;
- case parameters::mode_mono_right:
- _output_combobox->setCurrentIndex(1);
- break;
- case parameters::mode_stereo:
- _output_combobox->setCurrentIndex(2);
- break;
- case parameters::mode_alternating:
- _output_combobox->setCurrentIndex(3);
- break;
- case parameters::mode_top_bottom:
- _output_combobox->setCurrentIndex(4);
- break;
- case parameters::mode_top_bottom_half:
- _output_combobox->setCurrentIndex(5);
- break;
- case parameters::mode_left_right:
- _output_combobox->setCurrentIndex(6);
- break;
- case parameters::mode_left_right_half:
- _output_combobox->setCurrentIndex(7);
- break;
- case parameters::mode_even_odd_rows:
- _output_combobox->setCurrentIndex(8);
- break;
- case parameters::mode_even_odd_columns:
- _output_combobox->setCurrentIndex(9);
- break;
- case parameters::mode_checkerboard:
- _output_combobox->setCurrentIndex(10);
- break;
- case parameters::mode_hdmi_frame_pack:
- _output_combobox->setCurrentIndex(11);
- break;
- case parameters::mode_red_cyan_monochrome:
- _output_combobox->setCurrentIndex(12);
- break;
- case parameters::mode_red_cyan_half_color:
- _output_combobox->setCurrentIndex(13);
- break;
- case parameters::mode_red_cyan_full_color:
- _output_combobox->setCurrentIndex(14);
- break;
- case parameters::mode_red_cyan_dubois:
- _output_combobox->setCurrentIndex(15);
- break;
- case parameters::mode_green_magenta_monochrome:
- _output_combobox->setCurrentIndex(16);
- break;
- case parameters::mode_green_magenta_half_color:
- _output_combobox->setCurrentIndex(17);
- break;
- case parameters::mode_green_magenta_full_color:
- _output_combobox->setCurrentIndex(18);
- break;
- case parameters::mode_green_magenta_dubois:
- _output_combobox->setCurrentIndex(19);
- break;
- case parameters::mode_amber_blue_monochrome:
- _output_combobox->setCurrentIndex(20);
- break;
- case parameters::mode_amber_blue_half_color:
- _output_combobox->setCurrentIndex(21);
- break;
- case parameters::mode_amber_blue_full_color:
- _output_combobox->setCurrentIndex(22);
- break;
- case parameters::mode_amber_blue_dubois:
- _output_combobox->setCurrentIndex(23);
- break;
- case parameters::mode_red_green_monochrome:
- _output_combobox->setCurrentIndex(24);
- break;
- case parameters::mode_red_blue_monochrome:
- _output_combobox->setCurrentIndex(25);
- break;
- }
- _swap_checkbox->setChecked(stereo_mode_swap);
-}
-
-void in_out_widget::video_changed()
-{
- if (!_lock)
- {
- parameters::stereo_layout_t stereo_layout;
- bool stereo_layout_swap;
- get_stereo_layout(stereo_layout, stereo_layout_swap);
- send_cmd(command::set_video_stream, _video_combobox->currentIndex());
- }
-}
-
-void in_out_widget::audio_changed()
-{
- if (!_lock)
- {
- send_cmd(command::set_audio_stream, _audio_combobox->currentIndex());
- }
-}
-
-void in_out_widget::subtitle_changed()
-{
- if (!_lock)
- {
- send_cmd(command::set_subtitle_stream, _subtitle_combobox->currentIndex() - 1);
- }
-}
-
-void in_out_widget::input_changed()
-{
- if (!_lock)
- {
- parameters::stereo_layout_t stereo_layout;
- bool stereo_layout_swap;
- get_stereo_layout(stereo_layout, stereo_layout_swap);
- if (stereo_layout == parameters::layout_separate)
- {
- _lock = true;
- _video_combobox->setCurrentIndex(0);
- _video_combobox->setEnabled(false);
- _lock = false;
- }
- else
- {
- _video_combobox->setEnabled(true);
- }
- send_cmd(command::set_stereo_layout, static_cast<int>(stereo_layout));
- send_cmd(command::set_stereo_layout_swap, stereo_layout_swap);
- parameters::stereo_mode_t stereo_mode;
- bool stereo_mode_swap;
- get_stereo_mode(stereo_mode, stereo_mode_swap);
- if (stereo_layout == parameters::layout_mono
- && !(stereo_mode == parameters::mode_mono_left || stereo_mode == parameters::mode_mono_right))
- {
- QString s = _settings->value("Session/2d-stereo-mode", "").toString();
- parameters::stereo_mode_from_string(s.toStdString(), stereo_mode, stereo_mode_swap);
- _lock = true;
- set_stereo_mode(stereo_mode, stereo_mode_swap);
- _lock = false;
- }
- else if (stereo_layout != parameters::layout_mono
- && (stereo_mode == parameters::mode_mono_left || stereo_mode == parameters::mode_mono_right))
- {
- QString s = _settings->value("Session/3d-stereo-mode", "").toString();
- parameters::stereo_mode_from_string(s.toStdString(), stereo_mode, stereo_mode_swap);
- _lock = true;
- set_stereo_mode(stereo_mode, stereo_mode_swap);
- _lock = false;
- }
- }
-}
-
-void in_out_widget::output_changed()
-{
- if (!_lock)
- {
- parameters::stereo_mode_t stereo_mode;
- bool stereo_mode_swap;
- get_stereo_mode(stereo_mode, stereo_mode_swap);
- send_cmd(command::set_stereo_mode, static_cast<int>(stereo_mode));
- send_cmd(command::set_stereo_mode_swap, stereo_mode_swap);
- }
-}
-
-void in_out_widget::swap_changed()
-{
- if (!_lock)
- {
- send_cmd(command::toggle_stereo_mode_swap);
- }
-}
-
-void in_out_widget::update()
-{
- const media_input *mi = dispatch::media_input();
- _lock = true;
- _video_combobox->setEnabled(mi);
- _audio_combobox->setEnabled(mi);
- _subtitle_combobox->setEnabled(mi);
- _input_combobox->setEnabled(mi);
- _output_combobox->setEnabled(mi);
- _swap_checkbox->setEnabled(mi);
- _video_combobox->clear();
- _audio_combobox->clear();
- _subtitle_combobox->clear();
- if (mi)
- {
- for (int i = 0; i < mi->video_streams(); i++)
- {
- _video_combobox->addItem(mi->video_stream_name(i).c_str());
- }
- for (int i = 0; i < mi->audio_streams(); i++)
- {
- _audio_combobox->addItem(mi->audio_stream_name(i).c_str());
- }
- _subtitle_combobox->addItem(_("Off"));
- for (int i = 0; i < mi->subtitle_streams(); i++)
- {
- _subtitle_combobox->addItem(mi->subtitle_stream_name(i).c_str());
- }
- _video_combobox->setCurrentIndex(dispatch::parameters().video_stream());
- _audio_combobox->setCurrentIndex(dispatch::parameters().audio_stream());
- _subtitle_combobox->setCurrentIndex(dispatch::parameters().subtitle_stream() + 1);
- // Disable unsupported input modes
- for (int i = 0; i < _input_combobox->count(); i++)
- {
- _input_combobox->setCurrentIndex(i);
- parameters::stereo_layout_t layout;
- bool swap;
- get_stereo_layout(layout, swap);
- qobject_cast<QStandardItemModel *>(_input_combobox->model())->item(i)->setEnabled(
- mi->stereo_layout_is_supported(layout, swap));
- }
- // Disable unsupported output modes
- if (!dispatch::video_output() || !dispatch::video_output()->supports_stereo())
- {
- set_stereo_mode(parameters::mode_stereo, false);
- qobject_cast<QStandardItemModel *>(_output_combobox->model())->item(_output_combobox->currentIndex())->setEnabled(false);
- }
- set_stereo_layout(dispatch::parameters().stereo_layout(), dispatch::parameters().stereo_layout_swap());
- set_stereo_mode(dispatch::parameters().stereo_mode(), dispatch::parameters().stereo_mode_swap());
- }
- _lock = false;
-}
-
-int in_out_widget::get_video_stream()
-{
- return _video_combobox->currentIndex();
-}
-
-int in_out_widget::get_audio_stream()
-{
- return _audio_combobox->currentIndex();
-}
-
-int in_out_widget::get_subtitle_stream()
-{
- return _subtitle_combobox->currentIndex() - 1;
-}
-
-void in_out_widget::get_stereo_layout(parameters::stereo_layout_t &stereo_layout, bool &stereo_layout_swap)
-{
- switch (_input_combobox->currentIndex())
- {
- case 0:
- stereo_layout = parameters::layout_mono;
- stereo_layout_swap = false;
- break;
- case 1:
- stereo_layout = parameters::layout_separate;
- stereo_layout_swap = false;
- break;
- case 2:
- stereo_layout = parameters::layout_separate;
- stereo_layout_swap = true;
- break;
- case 3:
- stereo_layout = parameters::layout_alternating;
- stereo_layout_swap = false;
- break;
- case 4:
- stereo_layout = parameters::layout_alternating;
- stereo_layout_swap = true;
- break;
- case 5:
- stereo_layout = parameters::layout_top_bottom;
- stereo_layout_swap = false;
- break;
- case 6:
- stereo_layout = parameters::layout_top_bottom_half;
- stereo_layout_swap = false;
- break;
- case 7:
- stereo_layout = parameters::layout_top_bottom;
- stereo_layout_swap = true;
- break;
- case 8:
- stereo_layout = parameters::layout_top_bottom_half;
- stereo_layout_swap = true;
- break;
- case 9:
- stereo_layout = parameters::layout_left_right;
- stereo_layout_swap = false;
- break;
- case 10:
- stereo_layout = parameters::layout_left_right_half;
- stereo_layout_swap = false;
- break;
- case 11:
- stereo_layout = parameters::layout_left_right;
- stereo_layout_swap = true;
- break;
- case 12:
- stereo_layout = parameters::layout_left_right_half;
- stereo_layout_swap = true;
- break;
- case 13:
- stereo_layout = parameters::layout_even_odd_rows;
- stereo_layout_swap = false;
- break;
- case 14:
- stereo_layout = parameters::layout_even_odd_rows;
- stereo_layout_swap = true;
- break;
- }
-}
-
-void in_out_widget::get_stereo_mode(parameters::stereo_mode_t &stereo_mode, bool &stereo_mode_swap)
-{
- switch (_output_combobox->currentIndex())
- {
- case 0:
- stereo_mode = parameters::mode_mono_left;
- break;
- case 1:
- stereo_mode = parameters::mode_mono_right;
- break;
- case 2:
- stereo_mode = parameters::mode_stereo;
- break;
- case 3:
- stereo_mode = parameters::mode_alternating;
- break;
- case 4:
- stereo_mode = parameters::mode_top_bottom;
- break;
- case 5:
- stereo_mode = parameters::mode_top_bottom_half;
- break;
- case 6:
- stereo_mode = parameters::mode_left_right;
- break;
- case 7:
- stereo_mode = parameters::mode_left_right_half;
- break;
- case 8:
- stereo_mode = parameters::mode_even_odd_rows;
- break;
- case 9:
- stereo_mode = parameters::mode_even_odd_columns;
- break;
- case 10:
- stereo_mode = parameters::mode_checkerboard;
- break;
- case 11:
- stereo_mode = parameters::mode_hdmi_frame_pack;
- break;
- case 12:
- stereo_mode = parameters::mode_red_cyan_monochrome;
- break;
- case 13:
- stereo_mode = parameters::mode_red_cyan_half_color;
- break;
- case 14:
- stereo_mode = parameters::mode_red_cyan_full_color;
- break;
- case 15:
- stereo_mode = parameters::mode_red_cyan_dubois;
- break;
- case 16:
- stereo_mode = parameters::mode_green_magenta_monochrome;
- break;
- case 17:
- stereo_mode = parameters::mode_green_magenta_half_color;
- break;
- case 18:
- stereo_mode = parameters::mode_green_magenta_full_color;
- break;
- case 19:
- stereo_mode = parameters::mode_green_magenta_dubois;
- break;
- case 20:
- stereo_mode = parameters::mode_amber_blue_monochrome;
- break;
- case 21:
- stereo_mode = parameters::mode_amber_blue_half_color;
- break;
- case 22:
- stereo_mode = parameters::mode_amber_blue_full_color;
- break;
- case 23:
- stereo_mode = parameters::mode_amber_blue_dubois;
- break;
- case 24:
- stereo_mode = parameters::mode_red_green_monochrome;
- break;
- case 25:
- stereo_mode = parameters::mode_red_blue_monochrome;
- break;
- }
- stereo_mode_swap = _swap_checkbox->isChecked();
-}
-
-void in_out_widget::receive_notification(const notification &note)
-{
- _lock = true;
- switch (note.type)
- {
- case notification::open:
- case notification::play:
- update();
- break;
- case notification::video_stream:
- _video_combobox->setCurrentIndex(dispatch::parameters().video_stream());
- break;
- case notification::audio_stream:
- _audio_combobox->setCurrentIndex(dispatch::parameters().audio_stream());
- break;
- case notification::subtitle_stream:
- _subtitle_combobox->setCurrentIndex(dispatch::parameters().subtitle_stream() + 1);
- break;
- case notification::stereo_mode_swap:
- _swap_checkbox->setChecked(dispatch::parameters().stereo_mode_swap());
- break;
- default:
- break;
- }
- _lock = false;
-}
-
-
-controls_widget::controls_widget(QSettings *settings, QWidget *parent)
- : QWidget(parent), _lock(false), _settings(settings)
-{
- QGridLayout *row0_layout = new QGridLayout;
- _seek_slider = new QSlider(Qt::Horizontal);
- _seek_slider->setToolTip(_("This slider shows the progress during video playback, "
- "and can be used to seek in the video."));
- _seek_slider->setRange(0, 2000);
- _seek_slider->setTracking(false);
- connect(_seek_slider, SIGNAL(valueChanged(int)), this, SLOT(seek_slider_changed()));
- row0_layout->addWidget(_seek_slider, 0, 0);
- _pos_label = new QLabel("0:00");
- _pos_label->setToolTip(_("Elapsed / total time."));
- _pos_label->setAlignment(Qt::AlignRight);
- _pos_label->setTextFormat(Qt::PlainText);
- _pos_label->setFrameShape(QFrame::StyledPanel);
- _pos_label->setMinimumSize(QSize(0, 0));
- row0_layout->addWidget(_pos_label, 0, 1);
- _audio_mute_button = new QPushButton(get_icon("audio-volume-medium"), "");
- _audio_mute_button->setToolTip(_("Toggle audio mute."));
- _audio_mute_button->setCheckable(true);
- connect(_audio_mute_button, SIGNAL(toggled(bool)), this, SLOT(audio_mute_clicked()));
- row0_layout->addWidget(_audio_mute_button, 0, 2);
- _audio_volume_slider = new QSlider(Qt::Horizontal);
- _audio_volume_slider->setToolTip(_("Adjust audio volume."));
- _audio_volume_slider->setRange(0, 1000);
- _audio_volume_slider->setTickPosition(QSlider::TicksBelow);
- _audio_volume_slider->setTickInterval(100);
- _audio_volume_slider->setSingleStep(25);
- _audio_volume_slider->setPageStep(200);
- connect(_audio_volume_slider, SIGNAL(valueChanged(int)), this, SLOT(audio_volume_slider_changed()));
- row0_layout->addWidget(_audio_volume_slider, 0, 3);
- row0_layout->setColumnStretch(0, 1);
-
- QGridLayout *row1_layout = new QGridLayout;
- _play_button = new QPushButton(get_icon("media-playback-start"), "");
- _play_button->setToolTip(_("Play."));
- connect(_play_button, SIGNAL(clicked()), this, SLOT(play_clicked()));
- row1_layout->addWidget(_play_button, 1, 0);
- _pause_button = new QPushButton(get_icon("media-playback-pause"), "");
- _pause_button->setToolTip(_("Pause."));
- connect(_pause_button, SIGNAL(clicked()), this, SLOT(pause_clicked()));
- row1_layout->addWidget(_pause_button, 1, 1);
- _stop_button = new QPushButton(get_icon("media-playback-stop"), "");
- _stop_button->setToolTip(_("Stop."));
- connect(_stop_button, SIGNAL(clicked()), this, SLOT(stop_clicked()));
- row1_layout->addWidget(_stop_button, 1, 2);
- row1_layout->addWidget(new QWidget, 1, 3);
- _loop_button = new QPushButton(get_icon("media-playlist-repeat"), "");
- _loop_button->setToolTip(_("Toggle loop mode."));
- _loop_button->setCheckable(true);
- _loop_button->setChecked(dispatch::parameters().loop_mode() != parameters::no_loop);
- connect(_loop_button, SIGNAL(toggled(bool)), this, SLOT(loop_clicked()));
- row1_layout->addWidget(_loop_button, 1, 4);
- row1_layout->addWidget(new QWidget, 1, 5);
- _fullscreen_button = new QPushButton(get_icon("view-fullscreen"), "");
- _fullscreen_button->setToolTip(_("Switch to fullscreen mode. "
- "You can leave fullscreen mode by pressing the f key."));
- _fullscreen_button->setCheckable(true);
- connect(_fullscreen_button, SIGNAL(clicked()), this, SLOT(fullscreen_clicked()));
- row1_layout->addWidget(_fullscreen_button, 1, 6);
- _center_button = new QPushButton(get_icon("view-restore"), "");
- _center_button->setToolTip(_("Center the video area on your screen."));
- connect(_center_button, SIGNAL(clicked()), this, SLOT(center_clicked()));
- row1_layout->addWidget(_center_button, 1, 7);
- row1_layout->addWidget(new QWidget, 1, 8);
- _bbb_button = new QPushButton(get_icon("media-seek-backward"), "");
- _bbb_button->setFixedSize(_bbb_button->minimumSizeHint());
- _bbb_button->setIconSize(_bbb_button->iconSize() * 12 / 10);
- _bbb_button->setToolTip(_("Seek backward 10 minutes."));
- connect(_bbb_button, SIGNAL(clicked()), this, SLOT(bbb_clicked()));
- row1_layout->addWidget(_bbb_button, 1, 9);
- _bb_button = new QPushButton(get_icon("media-seek-backward"), "");
- _bb_button->setFixedSize(_bb_button->minimumSizeHint());
- _bb_button->setToolTip(_("Seek backward 1 minute."));
- connect(_bb_button, SIGNAL(clicked()), this, SLOT(bb_clicked()));
- row1_layout->addWidget(_bb_button, 1, 10);
- _b_button = new QPushButton(get_icon("media-seek-backward"), "");
- _b_button->setFixedSize(_b_button->minimumSizeHint());
- _b_button->setIconSize(_b_button->iconSize() * 8 / 10);
- _b_button->setToolTip(_("Seek backward 10 seconds."));
- connect(_b_button, SIGNAL(clicked()), this, SLOT(b_clicked()));
- row1_layout->addWidget(_b_button, 1, 11);
- _f_button = new QPushButton(get_icon("media-seek-forward"), "");
- _f_button->setFixedSize(_f_button->minimumSizeHint());
- _f_button->setIconSize(_f_button->iconSize() * 8 / 10);
- _f_button->setToolTip(_("Seek forward 10 seconds."));
- connect(_f_button, SIGNAL(clicked()), this, SLOT(f_clicked()));
- row1_layout->addWidget(_f_button, 1, 12);
- _ff_button = new QPushButton(get_icon("media-seek-forward"), "");
- _ff_button->setFixedSize(_ff_button->minimumSizeHint());
- _ff_button->setToolTip(_("Seek forward 1 minute."));
- connect(_ff_button, SIGNAL(clicked()), this, SLOT(ff_clicked()));
- row1_layout->addWidget(_ff_button, 1, 13);
- _fff_button = new QPushButton(get_icon("media-seek-forward"), "");
- _fff_button->setFixedSize(_fff_button->minimumSizeHint());
- _fff_button->setIconSize(_fff_button->iconSize() * 12 / 10);
- _fff_button->setToolTip(_("Seek forward 10 minutes."));
- connect(_fff_button, SIGNAL(clicked()), this, SLOT(fff_clicked()));
- row1_layout->addWidget(_fff_button, 1, 14);
- row1_layout->setRowStretch(0, 0);
- row1_layout->setColumnStretch(3, 1);
- row1_layout->setColumnStretch(5, 1);
- row1_layout->setColumnStretch(8, 1);
-
- QGridLayout *layout = new QGridLayout;
- layout->addLayout(row0_layout, 0, 0);
- layout->addLayout(row1_layout, 1, 0);
- setLayout(layout);
-
- _play_button->setEnabled(false);
- _pause_button->setEnabled(false);
- _stop_button->setEnabled(false);
- _loop_button->setEnabled(false);
- _fullscreen_button->setEnabled(false);
- _center_button->setEnabled(false);
- _bbb_button->setEnabled(false);
- _bb_button->setEnabled(false);
- _b_button->setEnabled(false);
- _f_button->setEnabled(false);
- _ff_button->setEnabled(false);
- _fff_button->setEnabled(false);
- _seek_slider->setEnabled(false);
- _pos_label->setEnabled(false);
-
- update();
- update_audio_widgets();
-}
-
-void controls_widget::update_audio_widgets()
-{
- _lock = true;
- _audio_mute_button->setChecked(dispatch::parameters().audio_mute());
- _audio_mute_button->setIcon(get_icon(
- dispatch::parameters().audio_mute() ? "audio-volume-muted"
- : dispatch::parameters().audio_volume() < 0.33f ? "audio-volume-low"
- : dispatch::parameters().audio_volume() < 0.66f ? "audio-volume-medium"
- : "audio-volume-high"));
- _audio_volume_slider->setValue(qRound(dispatch::parameters().audio_volume() * 1000.0f));
- _lock = false;
-}
-
-void controls_widget::play_clicked()
-{
- if (dispatch::playing())
- {
- send_cmd(command::toggle_pause);
- }
- else
- {
- send_cmd(command::toggle_play);
- }
-}
-
-void controls_widget::pause_clicked()
-{
- send_cmd(command::toggle_pause);
-}
-
-void controls_widget::stop_clicked()
-{
- send_cmd(command::toggle_play);
-}
-
-void controls_widget::loop_clicked()
-{
- if (!_lock)
- {
- parameters::loop_mode_t loop_mode = _loop_button->isChecked()
- ? parameters::loop_current : parameters::no_loop;
- send_cmd(command::set_loop_mode, static_cast<int>(loop_mode));
- }
-}
-
-void controls_widget::fullscreen_clicked()
-{
- if (!_lock)
- {
- send_cmd(command::toggle_fullscreen);
- }
-}
-
-void controls_widget::center_clicked()
-{
- send_cmd(command::center);
-}
-
-void controls_widget::bbb_clicked()
-{
- send_cmd(command::seek, -600.0f);
-}
-
-void controls_widget::bb_clicked()
-{
- send_cmd(command::seek, -60.0f);
-}
-
-void controls_widget::b_clicked()
-{
- send_cmd(command::seek, -10.0f);
-}
-
-void controls_widget::f_clicked()
-{
- send_cmd(command::seek, +10.0f);
-}
-
-void controls_widget::ff_clicked()
-{
- send_cmd(command::seek, +60.0f);
-}
-
-void controls_widget::fff_clicked()
-{
- send_cmd(command::seek, +600.0f);
-}
-
-void controls_widget::seek_slider_changed()
-{
- if (!_lock)
- {
- send_cmd(command::set_pos, static_cast<float>(_seek_slider->value()) / 2000.0f);
- }
-}
-
-void controls_widget::audio_mute_clicked()
-{
- if (!_lock)
- {
- send_cmd(command::toggle_audio_mute);
- }
-}
-
-void controls_widget::audio_volume_slider_changed()
-{
- if (!_lock)
- {
- send_cmd(command::set_audio_volume, _audio_volume_slider->value() / 1000.0f);
- }
-}
-
-void controls_widget::update()
-{
- if (dispatch::media_input())
- {
- _play_button->setDefault(true);
- _play_button->setFocus();
- _loop_button->setEnabled(true);
- _fullscreen_button->setEnabled(true);
- _input_duration = dispatch::media_input()->duration();
- if (_input_duration < 0)
- _input_duration = 0;
- std::string hr_duration = str::human_readable_time(_input_duration);
- _pos_label->setText((hr_duration + '/' + hr_duration).c_str());
- _pos_label->setMinimumSize(_pos_label->minimumSizeHint());
- _pos_label->setText(hr_duration.c_str());
- }
- else
- {
- _play_button->setEnabled(false);
- _pause_button->setEnabled(false);
- _stop_button->setEnabled(false);
- _loop_button->setEnabled(false);
- _fullscreen_button->setEnabled(false);
- _center_button->setEnabled(false);
- _bbb_button->setEnabled(false);
- _bb_button->setEnabled(false);
- _b_button->setEnabled(false);
- _f_button->setEnabled(false);
- _ff_button->setEnabled(false);
- _fff_button->setEnabled(false);
- _seek_slider->setEnabled(false);
- _seek_slider->setValue(0);
- _pos_label->setEnabled(false);
- _pos_label->setText("0:00");
- _pos_label->setMinimumSize(QSize(0, 0));
- }
-}
-
-void controls_widget::receive_notification(const notification &note)
-{
- bool b;
-
- switch (note.type)
- {
- case notification::open:
- update();
- break;
- case notification::play:
- b = dispatch::playing();
- _play_button->setEnabled(!b);
- _pause_button->setEnabled(b);
- _stop_button->setEnabled(b);
- if (b && _fullscreen_button->isChecked() && !dispatch::parameters().fullscreen())
- {
- _lock = true;
- send_cmd(command::toggle_fullscreen);
- _lock = false;
- }
- _center_button->setEnabled(b);
- _bbb_button->setEnabled(b);
- _bb_button->setEnabled(b);
- _b_button->setEnabled(b);
- _f_button->setEnabled(b);
- _ff_button->setEnabled(b);
- _fff_button->setEnabled(b);
- _seek_slider->setEnabled(b);
- _pos_label->setEnabled(b);
- if (!b)
- {
- _seek_slider->setValue(0);
- _pos_label->setText(str::human_readable_time(_input_duration).c_str());
- }
- break;
- case notification::pause:
- b = dispatch::pausing();
- _play_button->setEnabled(b);
- _pause_button->setEnabled(!b);
- break;
- case notification::fullscreen:
- _lock = true;
- _fullscreen_button->setChecked(dispatch::parameters().fullscreen());
- _lock = false;
- break;
- case notification::pos:
- if (!_seek_slider->isSliderDown())
- {
- _lock = true;
- float p = dispatch::position();
- _seek_slider->setValue(qRound(p * 2000.0f));
- _pos_label->setText((str::human_readable_time(
- static_cast<int64_t>(p * 1000.0f) * _input_duration / 1000)
- + '/' + str::human_readable_time(_input_duration)).c_str());
- _lock = false;
- }
- break;
- case notification::audio_volume:
- update_audio_widgets();
- break;
- case notification::audio_mute:
- update_audio_widgets();
- break;
- default:
- break;
- }
-}
-
-
-fullscreen_dialog::fullscreen_dialog(QWidget* parent) : QDialog(parent)
-{
- const int screen_count = QApplication::desktop()->screenCount();
-
- /* Create the dialog. This dialog differs from other dialogs (e.g. the color
- * dialog) in that its settings only take effect when the dialog is closed,
- * and not immediately. This is necessary to allow the user full flexibility
- * in defining the screens used in fullscreen mode. */
-
- setModal(false);
- setWindowTitle(_("Fullscreen/Multiscreen Settings"));
-
- QLabel* lbl = new QLabel(_("Configure fullscreen mode:"));
- lbl->setToolTip(_("Select the screens to use in fullscreen mode."));
-
- _single_btn = new QRadioButton(_("Single screen:"));
- _single_btn->setToolTip(_("Use a single screen for fullscreen mode."));
- _single_box = new QComboBox();
- _single_box->setToolTip(_single_btn->toolTip());
- _single_box->addItem(_("Primary screen"));
- if (screen_count > 1) {
- for (int i = 0; i < screen_count; i++)
- _single_box->addItem(str::asprintf(_("Screen %d"), i + 1).c_str());
- }
-
- _dual_btn = new QRadioButton(_("Dual screen:"));
- _dual_btn->setToolTip(_("Use two screens for fullscreen mode."));
- _dual_box0 = new QComboBox();
- _dual_box0->setToolTip(_dual_btn->toolTip());
- _dual_box1 = new QComboBox();
- _dual_box1->setToolTip(_dual_btn->toolTip());
- if (screen_count > 1) {
- for (int i = 0; i < screen_count; i++) {
- _dual_box0->addItem(str::asprintf(_("Screen %d"), i + 1).c_str());
- _dual_box1->addItem(str::asprintf(_("Screen %d"), i + 1).c_str());
- }
- }
-
- _multi_btn = new QRadioButton(_("Multi screen:"));
- _multi_btn->setToolTip(_("Use multiple screens for fullscreen mode."));
- _multi_edt = new QLineEdit();
- _multi_edt->setToolTip(_("Comma-separated list of screens to use for fullscreen mode."));
- _multi_edt->setValidator(new QRegExpValidator(QRegExp("\\d{1,2}(,\\d{1,2}){0,15}"), 0));
-
- QLabel* lbl2 = new QLabel(_("When in fullscreen mode,"));
- lbl2->setToolTip(_("Set special left/right view handling for fullscreen mode."));
-
- _flip_left_box = new QCheckBox(_("flip left view vertically."));
- _flip_left_box->setToolTip(lbl2->toolTip());
- _flop_left_box = new QCheckBox(_("flop left view horizontally."));
- _flop_left_box->setToolTip(lbl2->toolTip());
- _flip_right_box = new QCheckBox(_("flip right view vertically."));
- _flip_right_box->setToolTip(lbl2->toolTip());
- _flop_right_box = new QCheckBox(_("flop right view horizontally."));
- _flop_right_box->setToolTip(lbl2->toolTip());
-
- _3d_ready_sync_box = new QCheckBox(_("use DLP(R) 3-D Ready Sync"));
- _3d_ready_sync_box->setToolTip(_("Use DLP&reg; 3-D Ready Sync for supported output modes."));
-
- _inhibit_screensaver_box = new QCheckBox(_("inhibit the screensaver"));
- _inhibit_screensaver_box->setToolTip(_("Inhibit the screensaver during fullscreen playback."));
-
- QPushButton* ok_btn = new QPushButton(_("OK"));
- connect(ok_btn, SIGNAL(clicked()), this, SLOT(close()));
-
- QGridLayout *layout0 = new QGridLayout();
- layout0->addWidget(lbl, 0, 0, 1, 3);
- layout0->addWidget(_single_btn, 1, 0);
- layout0->addWidget(_single_box, 1, 1, 1, 2);
- layout0->addWidget(_dual_btn, 2, 0);
- layout0->addWidget(_dual_box0, 2, 1);
- layout0->addWidget(_dual_box1, 2, 2);
- layout0->addWidget(_multi_btn, 3, 0);
- layout0->addWidget(_multi_edt, 3, 1, 1, 2);
- layout0->addWidget(lbl2, 4, 0, 1, 3);
- layout0->addWidget(_flip_left_box, 5, 0, 1, 3);
- layout0->addWidget(_flop_left_box, 6, 0, 1, 3);
- layout0->addWidget(_flip_right_box, 7, 0, 1, 3);
- layout0->addWidget(_flop_right_box, 8, 0, 1, 3);
- layout0->addWidget(_3d_ready_sync_box, 9, 0, 1, 3);
- layout0->addWidget(_inhibit_screensaver_box, 10, 0, 1, 3);
- QGridLayout *layout1 = new QGridLayout();
- layout1->addWidget(ok_btn, 0, 0);
- QGridLayout *layout = new QGridLayout();
- layout->addLayout(layout0, 0, 0);
- layout->addLayout(layout1, 1, 0);
- setLayout(layout);
-
- /* Fill in the current settings */
-
- if (screen_count < 3) {
- _multi_btn->setEnabled(false);
- _multi_edt->setEnabled(false);
- } else {
- _multi_edt->setText("1,2,3");
- }
- if (screen_count < 2) {
- _dual_btn->setEnabled(false);
- _dual_box0->setEnabled(false);
- _dual_box1->setEnabled(false);
- } else {
- _dual_box0->setCurrentIndex(0);
- _dual_box1->setCurrentIndex(1);
- }
- std::vector<int> conf_screens;
- for (int i = 0; i < 16; i++)
- if (dispatch::parameters().fullscreen_screens() & (1 << i))
- conf_screens.push_back(i);
- if (conf_screens.size() >= 3 && screen_count >= 3) {
- QString screen_list;
- for (size_t i = 0; i < conf_screens.size(); i++) {
- screen_list += str::from(conf_screens[i] + 1).c_str();
- if (i < conf_screens.size() - 1)
- screen_list += ',';
- }
- _multi_btn->setChecked(true);
- _multi_edt->setText(screen_list);
- } else if (conf_screens.size() == 2 && screen_count >= 2) {
- _dual_box0->setCurrentIndex(conf_screens[0]);
- _dual_box1->setCurrentIndex(conf_screens[1]);
- _dual_btn->setChecked(true);
- } else {
- if (conf_screens.size() > 0 && conf_screens[0] < screen_count)
- _single_box->setCurrentIndex(conf_screens[0] + 1);
- else
- _single_box->setCurrentIndex(0);
- _single_btn->setChecked(true);
- }
- _flip_left_box->setChecked(dispatch::parameters().fullscreen_flip_left());
- _flop_left_box->setChecked(dispatch::parameters().fullscreen_flop_left());
- _flip_right_box->setChecked(dispatch::parameters().fullscreen_flip_right());
- _flop_right_box->setChecked(dispatch::parameters().fullscreen_flop_right());
- _3d_ready_sync_box->setChecked(dispatch::parameters().fullscreen_3d_ready_sync());
-#ifndef Q_OS_WIN
- _inhibit_screensaver_box->setChecked(dispatch::parameters().fullscreen_inhibit_screensaver());
-#else
- _inhibit_screensaver_box->setChecked(false);
- _inhibit_screensaver_box->setEnabled(false);
-#endif
-}
-
-void fullscreen_dialog::closeEvent(QCloseEvent* e)
-{
- /* Activate the settings chosen in the dialog, then close. */
-
- // fullscreen_screens
- if (_single_btn->isChecked()) {
- if (_single_box->currentIndex() == 0)
- send_cmd(command::set_fullscreen_screens, 0);
- else
- send_cmd(command::set_fullscreen_screens, 1 << (_single_box->currentIndex() - 1));
- } else if (_dual_btn->isChecked()) {
- send_cmd(command::set_fullscreen_screens,
- (1 << _dual_box0->currentIndex()) | (1 << _dual_box1->currentIndex()));
- } else {
- 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].toLatin1().data());
- if (s >= 1 && s <= 16)
- fss |= (1 << (s - 1));
- }
- send_cmd(command::set_fullscreen_screens, fss);
- }
- // flip/flop settings
- send_cmd(command::set_fullscreen_flip_left, _flip_left_box->isChecked());
- send_cmd(command::set_fullscreen_flop_left, _flop_left_box->isChecked());
- send_cmd(command::set_fullscreen_flip_right, _flip_right_box->isChecked());
- send_cmd(command::set_fullscreen_flop_right, _flop_right_box->isChecked());
- // 3d ready sync
- send_cmd(command::set_fullscreen_3d_ready_sync, _3d_ready_sync_box->isChecked());
- // inhibit_screensaver
- send_cmd(command::set_fullscreen_inhibit_screensaver, _inhibit_screensaver_box->isChecked());
-
- e->accept();
-}
-
-
-color_dialog::color_dialog(QWidget *parent) : QDialog(parent), _lock(false)
-{
- setModal(false);
- setWindowTitle(_("Display Color Adjustments"));
-
- QLabel *c_label = new QLabel(_("Contrast:"));
- _c_slider = new QSlider(Qt::Horizontal);
- _c_slider->setRange(-1000, 1000);
- _c_slider->setValue(dispatch::parameters().contrast() * 1000.0f);
- connect(_c_slider, SIGNAL(valueChanged(int)), this, SLOT(c_slider_changed(int)));
- _c_spinbox = new QDoubleSpinBox();
- _c_spinbox->setRange(-1.0, +1.0);
- _c_spinbox->setValue(dispatch::parameters().contrast());
- _c_spinbox->setDecimals(2);
- _c_spinbox->setSingleStep(0.01);
- connect(_c_spinbox, SIGNAL(valueChanged(double)), this, SLOT(c_spinbox_changed(double)));
- QLabel *b_label = new QLabel(_("Brightness:"));
- _b_slider = new QSlider(Qt::Horizontal);
- _b_slider->setRange(-1000, 1000);
- _b_slider->setValue(dispatch::parameters().brightness() * 1000.0f);
- connect(_b_slider, SIGNAL(valueChanged(int)), this, SLOT(b_slider_changed(int)));
- _b_spinbox = new QDoubleSpinBox();
- _b_spinbox->setRange(-1.0, +1.0);
- _b_spinbox->setValue(dispatch::parameters().brightness());
- _b_spinbox->setDecimals(2);
- _b_spinbox->setSingleStep(0.01);
- connect(_b_spinbox, SIGNAL(valueChanged(double)), this, SLOT(b_spinbox_changed(double)));
- QLabel *h_label = new QLabel(_("Hue:"));
- _h_slider = new QSlider(Qt::Horizontal);
- _h_slider->setRange(-1000, 1000);
- _h_slider->setValue(dispatch::parameters().hue() * 1000.0f);
- connect(_h_slider, SIGNAL(valueChanged(int)), this, SLOT(h_slider_changed(int)));
- _h_spinbox = new QDoubleSpinBox();
- _h_spinbox->setRange(-1.0, +1.0);
- _h_spinbox->setValue(dispatch::parameters().hue());
- _h_spinbox->setDecimals(2);
- _h_spinbox->setSingleStep(0.01);
- connect(_h_spinbox, SIGNAL(valueChanged(double)), this, SLOT(h_spinbox_changed(double)));
- QLabel *s_label = new QLabel(_("Saturation:"));
- _s_slider = new QSlider(Qt::Horizontal);
- _s_slider->setRange(-1000, 1000);
- _s_slider->setValue(dispatch::parameters().saturation() * 1000.0f);
- connect(_s_slider, SIGNAL(valueChanged(int)), this, SLOT(s_slider_changed(int)));
- _s_spinbox = new QDoubleSpinBox();
- _s_spinbox->setRange(-1.0, +1.0);
- _s_spinbox->setValue(dispatch::parameters().saturation());
- _s_spinbox->setDecimals(2);
- _s_spinbox->setSingleStep(0.01);
- connect(_s_spinbox, SIGNAL(valueChanged(double)), this, SLOT(s_spinbox_changed(double)));
-
- QPushButton *ok_button = new QPushButton(_("OK"));
- connect(ok_button, SIGNAL(clicked()), this, SLOT(close()));
-
- QGridLayout *layout = new QGridLayout;
- layout->addWidget(c_label, 0, 0);
- layout->addWidget(_c_slider, 0, 1);
- layout->addWidget(_c_spinbox, 0, 2);
- layout->addWidget(b_label, 1, 0);
- layout->addWidget(_b_slider, 1, 1);
- layout->addWidget(_b_spinbox, 1, 2);
- layout->addWidget(h_label, 2, 0);
- layout->addWidget(_h_slider, 2, 1);
- layout->addWidget(_h_spinbox, 2, 2);
- layout->addWidget(s_label, 3, 0);
- layout->addWidget(_s_slider, 3, 1);
- layout->addWidget(_s_spinbox, 3, 2);
- layout->addWidget(ok_button, 4, 0, 1, 3);
- setLayout(layout);
-}
-
-void color_dialog::c_slider_changed(int val)
-{
- if (!_lock)
- send_cmd(command::set_contrast, val / 1000.0f);
-}
-
-void color_dialog::c_spinbox_changed(double val)
-{
- if (!_lock)
- send_cmd(command::set_contrast, static_cast<float>(val));
-}
-
-void color_dialog::b_slider_changed(int val)
-{
- if (!_lock)
- send_cmd(command::set_brightness, val / 1000.0f);
-}
-
-void color_dialog::b_spinbox_changed(double val)
-{
- if (!_lock)
- send_cmd(command::set_brightness, static_cast<float>(val));
-}
-
-void color_dialog::h_slider_changed(int val)
-{
- if (!_lock)
- send_cmd(command::set_hue, val / 1000.0f);
-}
-
-void color_dialog::h_spinbox_changed(double val)
-{
- if (!_lock)
- send_cmd(command::set_hue, static_cast<float>(val));
-}
-
-void color_dialog::s_slider_changed(int val)
-{
- if (!_lock)
- send_cmd(command::set_saturation, val / 1000.0f);
-}
-
-void color_dialog::s_spinbox_changed(double val)
-{
- if (!_lock)
- send_cmd(command::set_saturation, static_cast<float>(val));
-}
-
-void color_dialog::receive_notification(const notification &note)
-{
- switch (note.type)
- {
- case notification::contrast:
- _lock = true;
- _c_slider->setValue(dispatch::parameters().contrast() * 1000.0f);
- _c_spinbox->setValue(dispatch::parameters().contrast());
- _lock = false;
- break;
- case notification::brightness:
- _lock = true;
- _b_slider->setValue(dispatch::parameters().brightness() * 1000.0f);
- _b_spinbox->setValue(dispatch::parameters().brightness());
- _lock = false;
- break;
- case notification::hue:
- _lock = true;
- _h_slider->setValue(dispatch::parameters().hue() * 1000.0f);
- _h_spinbox->setValue(dispatch::parameters().hue());
- _lock = false;
- break;
- case notification::saturation:
- _lock = true;
- _s_slider->setValue(dispatch::parameters().saturation() * 1000.0f);
- _s_spinbox->setValue(dispatch::parameters().saturation());
- _lock = false;
- break;
- default:
- /* not handled */
- break;
- }
-}
-
-
-crosstalk_dialog::crosstalk_dialog(QWidget *parent) : QDialog(parent), _lock(false)
-{
- setModal(false);
- setWindowTitle(_("Display Crosstalk Calibration"));
-
- /* TRANSLATORS: Please keep the lines short using where necessary. */
- QLabel *rtfm_label = new QLabel(_("Please read the manual to find out "
- "how to measure the crosstalk levels "
- "of your display."));
-
- QLabel *r_label = new QLabel(_("Red:"));
- _r_spinbox = new QDoubleSpinBox();
- _r_spinbox->setRange(0.0, +1.0);
- _r_spinbox->setValue(dispatch::parameters().crosstalk_r());
- _r_spinbox->setDecimals(2);
- _r_spinbox->setSingleStep(0.01);
- connect(_r_spinbox, SIGNAL(valueChanged(double)), this, SLOT(spinbox_changed()));
- QLabel *g_label = new QLabel(_("Green:"));
- _g_spinbox = new QDoubleSpinBox();
- _g_spinbox->setRange(0.0, +1.0);
- _g_spinbox->setValue(dispatch::parameters().crosstalk_g());
- _g_spinbox->setDecimals(2);
- _g_spinbox->setSingleStep(0.01);
- connect(_g_spinbox, SIGNAL(valueChanged(double)), this, SLOT(spinbox_changed()));
- QLabel *b_label = new QLabel(_("Blue:"));
- _b_spinbox = new QDoubleSpinBox();
- _b_spinbox->setRange(0.0, +1.0);
- _b_spinbox->setValue(dispatch::parameters().crosstalk_b());
- _b_spinbox->setDecimals(2);
- _b_spinbox->setSingleStep(0.01);
- connect(_b_spinbox, SIGNAL(valueChanged(double)), this, SLOT(spinbox_changed()));
-
- QPushButton *ok_button = new QPushButton(_("OK"));
- connect(ok_button, SIGNAL(clicked()), this, SLOT(close()));
-
- QGridLayout *layout = new QGridLayout;
- layout->addWidget(rtfm_label, 0, 0, 1, 2);
- layout->addWidget(r_label, 2, 0);
- layout->addWidget(_r_spinbox, 2, 1);
- layout->addWidget(g_label, 3, 0);
- layout->addWidget(_g_spinbox, 3, 1);
- layout->addWidget(b_label, 4, 0);
- layout->addWidget(_b_spinbox, 4, 1);
- layout->addWidget(ok_button, 5, 0, 1, 2);
- setLayout(layout);
-}
-
-void crosstalk_dialog::spinbox_changed()
-{
- if (!_lock)
- {
- std::ostringstream v;
- s11n::save(v, static_cast<float>(_r_spinbox->value()));
- s11n::save(v, static_cast<float>(_g_spinbox->value()));
- s11n::save(v, static_cast<float>(_b_spinbox->value()));
- send_cmd(command::set_crosstalk, v.str());
- }
-}
-
-void crosstalk_dialog::receive_notification(const notification &note)
-{
- switch (note.type)
- {
- case notification::crosstalk:
- _lock = true;
- _r_spinbox->setValue(dispatch::parameters().crosstalk_r());
- _g_spinbox->setValue(dispatch::parameters().crosstalk_g());
- _b_spinbox->setValue(dispatch::parameters().crosstalk_b());
- _lock = false;
- break;
- default:
- /* not handled */
- break;
- }
-}
-
-
-quality_dialog::quality_dialog(QWidget *parent) : QDialog(parent), _lock(false)
-{
- setModal(false);
- setWindowTitle(_("Rendering Quality Adjustments"));
-
- QLabel *q_label = new QLabel(_("Rendering Quality:"));
- _q_slider = new QSlider(Qt::Horizontal);
- _q_slider->setRange(0, 4);
- _q_slider->setValue(dispatch::parameters().quality());
- connect(_q_slider, SIGNAL(valueChanged(int)), this, SLOT(q_slider_changed(int)));
- _q_spinbox = new QSpinBox();
- _q_spinbox->setRange(0, 4);
- _q_spinbox->setValue(dispatch::parameters().quality());
- _q_spinbox->setSingleStep(1);
- connect(_q_spinbox, SIGNAL(valueChanged(int)), this, SLOT(q_spinbox_changed(int)));
-
- QPushButton *ok_button = new QPushButton(_("OK"));
- connect(ok_button, SIGNAL(clicked()), this, SLOT(close()));
-
- QGridLayout *layout = new QGridLayout;
- layout->addWidget(q_label, 0, 0);
- layout->addWidget(_q_slider, 0, 1);
- layout->addWidget(_q_spinbox, 0, 2);
- layout->addWidget(ok_button, 1, 0, 1, 3);
- setLayout(layout);
-}
-
-void quality_dialog::q_slider_changed(int val)
-{
- if (!_lock)
- send_cmd(command::set_quality, val);
-}
-
-void quality_dialog::q_spinbox_changed(int val)
-{
- if (!_lock)
- send_cmd(command::set_quality, val);
-}
-
-void quality_dialog::receive_notification(const notification &note)
-{
- switch (note.type)
- {
- case notification::quality:
- _lock = true;
- _q_slider->setValue(dispatch::parameters().quality());
- _q_spinbox->setValue(dispatch::parameters().quality());
- _lock = false;
- break;
- default:
- /* not handled */
- break;
- }
-}
-
-
-zoom_dialog::zoom_dialog(QWidget *parent) : QDialog(parent), _lock(false)
-{
- setModal(false);
- setWindowTitle(_("Zoom for wide videos"));
-
- QLabel *info_label = new QLabel(_(
- "Set zoom level for videos that "
- "are wider than the screen: "
- "0: Show full video width. "
- "1: Use full screen height."));
- QLabel *z_label = new QLabel(_("Zoom:"));
- z_label->setToolTip(_("Set the zoom level for videos that are wider than the screen."));
- _z_slider = new QSlider(Qt::Horizontal);
- _z_slider->setRange(0, 1000);
- _z_slider->setValue(dispatch::parameters().zoom() * 1000.0f);
- _z_slider->setToolTip(z_label->toolTip());
- connect(_z_slider, SIGNAL(valueChanged(int)), this, SLOT(z_slider_changed(int)));
- _z_spinbox = new QDoubleSpinBox();
- _z_spinbox->setRange(0.0, 1.0);
- _z_spinbox->setValue(dispatch::parameters().zoom());
- _z_spinbox->setDecimals(2);
- _z_spinbox->setSingleStep(0.01);
- _z_spinbox->setToolTip(z_label->toolTip());
- connect(_z_spinbox, SIGNAL(valueChanged(double)), this, SLOT(z_spinbox_changed(double)));
-
- QPushButton *ok_button = new QPushButton(_("OK"));
- connect(ok_button, SIGNAL(clicked()), this, SLOT(close()));
-
- QGridLayout *layout = new QGridLayout;
- layout->addWidget(info_label, 0, 0, 1, 3);
- layout->addWidget(z_label, 1, 0);
- layout->addWidget(_z_slider, 1, 1);
- layout->addWidget(_z_spinbox, 1, 2);
- layout->addWidget(ok_button, 2, 0, 1, 3);
- setLayout(layout);
-}
-
-void zoom_dialog::z_slider_changed(int val)
-{
- if (!_lock)
- send_cmd(command::set_zoom, val / 1000.0f);
-}
-
-void zoom_dialog::z_spinbox_changed(double val)
-{
- if (!_lock)
- send_cmd(command::set_zoom, static_cast<float>(val));
-}
-
-void zoom_dialog::receive_notification(const notification &note)
-{
- switch (note.type)
- {
- case notification::zoom:
- _lock = true;
- _z_slider->setValue(dispatch::parameters().zoom() * 1000.0f);
- _z_spinbox->setValue(dispatch::parameters().zoom());
- _lock = false;
- break;
- default:
- /* not handled */
- break;
- }
-}
-
-
-audio_dialog::audio_dialog(QWidget *parent) : QDialog(parent), _lock(false)
-{
- setModal(false);
- setWindowTitle(_("Audio Settings"));
-
- QLabel *device_label = new QLabel(_("Audio device:"));
- device_label->setToolTip(_("Select the audio device. "
- "This will take effect for the next started video."));
- _device_combobox = new QComboBox();
- _device_combobox->setToolTip(device_label->toolTip());
- _device_combobox->addItem(_("Default"));
- audio_output ao;
- for (int i = 0; i < ao.devices(); i++)
- {
- _device_combobox->addItem(ao.device_name(i).c_str());
- }
- connect(_device_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(device_changed()));
- if (dispatch::parameters().audio_device() < 0
- || dispatch::parameters().audio_device() >= _device_combobox->count())
- {
- _device_combobox->setCurrentIndex(0);
- }
- else
- {
- _device_combobox->setCurrentIndex(dispatch::parameters().audio_device() + 1);
- }
-
- QLabel *delay_label = new QLabel(_("Audio delay (ms):"));
- delay_label->setToolTip(_("Set an audio delay, in milliseconds. "
- "This is useful if audio and video are not in sync."));
- _delay_spinbox = new QSpinBox();
- _delay_spinbox->setToolTip(delay_label->toolTip());
- _delay_spinbox->setRange(-10000, +10000);
- _delay_spinbox->setSingleStep(1);
- _delay_spinbox->setValue(dispatch::parameters().audio_delay() / 1000);
- connect(_delay_spinbox, SIGNAL(valueChanged(int)), this, SLOT(delay_changed()));
-
- QPushButton *ok_button = new QPushButton(_("OK"));
- connect(ok_button, SIGNAL(clicked()), this, SLOT(close()));
-
- QGridLayout *layout = new QGridLayout;
- layout->addWidget(device_label, 0, 0);
- layout->addWidget(_device_combobox, 0, 1);
- layout->addWidget(delay_label, 1, 0);
- layout->addWidget(_delay_spinbox, 1, 1);
- layout->addWidget(ok_button, 2, 0, 1, 2);
- setLayout(layout);
-}
-
-void audio_dialog::device_changed()
-{
- if (!_lock)
- send_cmd(command::set_audio_device, _device_combobox->currentIndex() - 1);
-}
-
-void audio_dialog::delay_changed()
-{
- if (!_lock)
- send_cmd(command::set_audio_delay, static_cast<int64_t>(_delay_spinbox->value() * 1000));
-}
-
-void audio_dialog::receive_notification(const notification &note)
-{
- switch (note.type)
- {
- case notification::audio_device:
- _lock = true;
- _device_combobox->setCurrentIndex(dispatch::parameters().audio_device() + 1);
- _lock = false;
- break;
- case notification::audio_delay:
- _lock = true;
- _delay_spinbox->setValue(dispatch::parameters().audio_delay() / 1000);
- _lock = false;
- break;
- default:
- /* not handled */
- break;
- }
-}
-
-
-subtitle_dialog::subtitle_dialog(QWidget *parent) : QDialog(parent), _lock(false)
-{
- setModal(false);
- setWindowTitle(_("Subtitle Settings"));
-
- QLabel *info_label = new QLabel(_(
- "These settings apply only to soft subtitles, not to bitmaps. "
- "Some changes require a restart of the video to take effect."));
-
- _encoding_checkbox = new QCheckBox(_("Encoding:"));
- _encoding_checkbox->setToolTip(_("Set the subtitle character set encoding."));
- _encoding_checkbox->setChecked(!dispatch::parameters().subtitle_encoding_is_default());
- connect(_encoding_checkbox, SIGNAL(stateChanged(int)), this, SLOT(encoding_changed()));
- _encoding_combobox = new QComboBox();
- _encoding_combobox->setToolTip(_encoding_checkbox->toolTip());
- QList<QTextCodec *> codecs = find_codecs();
- foreach (QTextCodec *codec, codecs)
- {
- _encoding_combobox->addItem(codec->name(), codec->mibEnum());
- }
- _encoding_combobox->setCurrentIndex(_encoding_combobox->findText(
- dispatch::parameters().subtitle_encoding() == ""
- ? "UTF-8" : dispatch::parameters().subtitle_encoding().c_str()));
- connect(_encoding_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(encoding_changed()));
-
- _font_checkbox = new QCheckBox(_("Override font:"));
- _font_checkbox->setToolTip(_("Override the subtitle font family."));
- _font_checkbox->setChecked(!dispatch::parameters().subtitle_font_is_default());
- connect(_font_checkbox, SIGNAL(stateChanged(int)), this, SLOT(font_changed()));
- _font_combobox = new QFontComboBox();
- _font_combobox->setToolTip(_font_checkbox->toolTip());
- _font_combobox->setCurrentFont(QFont(QString(dispatch::parameters().subtitle_font() == ""
- ? "sans-serif" : dispatch::parameters().subtitle_font().c_str())));
- connect(_font_combobox, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(font_changed()));
-
- _size_checkbox = new QCheckBox(_("Override font size:"));
- _size_checkbox->setToolTip(_("Override the subtitle font size."));
- _size_checkbox->setChecked(dispatch::parameters().subtitle_size() > 0);
- connect(_size_checkbox, SIGNAL(stateChanged(int)), this, SLOT(size_changed()));
- _size_spinbox = new QSpinBox();
- _size_spinbox->setToolTip(_size_checkbox->toolTip());
- _size_spinbox->setRange(1, 999);
- _size_spinbox->setValue(dispatch::parameters().subtitle_size() <= 0
- ? 12 : dispatch::parameters().subtitle_size());
- connect(_size_spinbox, SIGNAL(valueChanged(int)), this, SLOT(size_changed()));
-
- _scale_checkbox = new QCheckBox(_("Override scale factor:"));
- _scale_checkbox->setToolTip(_("Override the subtitle scale factor."));
- _scale_checkbox->setChecked(dispatch::parameters().subtitle_scale() >= 0.0f);
- connect(_scale_checkbox, SIGNAL(stateChanged(int)), this, SLOT(scale_changed()));
- _scale_spinbox = new QDoubleSpinBox();
- _scale_spinbox->setToolTip(_scale_checkbox->toolTip());
- _scale_spinbox->setRange(0.01, 100.0);
- _scale_spinbox->setSingleStep(0.1);
- _scale_spinbox->setValue(dispatch::parameters().subtitle_scale() < 0.0f
- ? 1.0f : dispatch::parameters().subtitle_scale());
- connect(_scale_spinbox, SIGNAL(valueChanged(double)), this, SLOT(scale_changed()));
-
- _color_checkbox = new QCheckBox(_("Override color:"));
- _color_checkbox->setToolTip(_("Override the subtitle color."));
- _color_checkbox->setChecked(dispatch::parameters().subtitle_color() <= std::numeric_limits<uint32_t>::max());
- connect(_color_checkbox, SIGNAL(stateChanged(int)), this, SLOT(color_changed()));
- _color_button = new QPushButton();
- _color_button->setToolTip(_color_checkbox->toolTip());
- set_color_button(dispatch::parameters().subtitle_color() > std::numeric_limits<uint32_t>::max()
- ? 0xffffffu : dispatch::parameters().subtitle_color());
- connect(_color_button, SIGNAL(clicked()), this, SLOT(color_button_clicked()));
-
- _shadow_checkbox = new QCheckBox(_("Override shadow:"));
- _shadow_checkbox->setToolTip(_("Override the subtitle shadow."));
- _shadow_checkbox->setChecked(dispatch::parameters().subtitle_shadow() != -1);
- connect(_shadow_checkbox, SIGNAL(stateChanged(int)), this, SLOT(shadow_changed()));
- _shadow_combobox = new QComboBox();
- _shadow_combobox->setToolTip(_shadow_checkbox->toolTip());
- _shadow_combobox->addItem(_("On"));
- _shadow_combobox->addItem(_("Off"));
- _shadow_combobox->setCurrentIndex(dispatch::parameters().subtitle_shadow() == 0 ? 1 : 0);
- connect(_shadow_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(shadow_changed()));
-
- QPushButton *ok_button = new QPushButton(_("OK"));
- connect(ok_button, SIGNAL(clicked()), this, SLOT(close()));
-
- QGridLayout *layout = new QGridLayout;
- layout->addWidget(info_label, 0, 0, 1, 2);
- layout->addWidget(_encoding_checkbox, 1, 0);
- layout->addWidget(_encoding_combobox, 1, 1);
- layout->addWidget(_font_checkbox, 2, 0);
- layout->addWidget(_font_combobox, 2, 1);
- layout->addWidget(_size_checkbox, 3, 0);
- layout->addWidget(_size_spinbox, 3, 1);
- layout->addWidget(_scale_checkbox, 4, 0);
- layout->addWidget(_scale_spinbox, 4, 1);
- layout->addWidget(_color_checkbox, 5, 0);
- layout->addWidget(_color_button, 5, 1);
- layout->addWidget(_shadow_checkbox, 6, 0);
- layout->addWidget(_shadow_combobox, 6, 1);
- layout->addWidget(ok_button, 7, 0, 1, 2);
- setLayout(layout);
-}
-
-QList<QTextCodec *> subtitle_dialog::find_codecs()
-{
- QMap<QString, QTextCodec *> codec_map;
- QRegExp iso8859_regexp("ISO[- ]8859-([0-9]+).*");
-
- foreach (int mib, QTextCodec::availableMibs())
- {
- QTextCodec *codec = QTextCodec::codecForMib(mib);
-
- QString sort_key = codec->name().toUpper();
- int rank;
-
- if (sort_key.startsWith("UTF-8"))
- {
- rank = 1;
- }
- else if (sort_key.startsWith("UTF-16"))
- {
- rank = 2;
- }
- else if (iso8859_regexp.exactMatch(sort_key))
- {
- if (iso8859_regexp.cap(1).size() == 1)
- {
- rank = 3;
- }
- else
- {
- rank = 4;
- }
- }
- else
- {
- rank = 5;
- }
- sort_key.prepend(QChar('0' + rank));
-
- codec_map.insert(sort_key, codec);
- }
- return codec_map.values();
-}
-
-void subtitle_dialog::set_color_button(uint32_t c)
-{
- int r = (c >> 16u) & 0xffu;
- int g = (c >> 8u) & 0xffu;
- int b = c & 0xffu;
- _color = QColor(r, g, b);
- QPixmap pm(64, 64);
- pm.fill(_color);
- _color_button->setIcon(QIcon(pm));
-}
-
-void subtitle_dialog::color_button_clicked()
-{
- _color = QColorDialog::getColor(_color, this);
- QPixmap pm(64, 64);
- pm.fill(_color);
- _color_button->setIcon(QIcon(pm));
- color_changed();
-}
-
-void subtitle_dialog::encoding_changed()
-{
- if (!_lock)
- {
- std::string encoding = _encoding_checkbox->isChecked()
- ? _encoding_combobox->currentText().toStdString() : "";
- std::ostringstream v;
- s11n::save(v, encoding);
- send_cmd(command::set_subtitle_encoding, v.str());
- }
-}
-
-void subtitle_dialog::font_changed()
-{
- if (!_lock)
- {
- std::string font = _font_checkbox->isChecked()
- ? _font_combobox->currentFont().family().toLocal8Bit().constData()
- : "";
- std::ostringstream v;
- s11n::save(v, font);
- send_cmd(command::set_subtitle_font, v.str());
- }
-}
-
-void subtitle_dialog::size_changed()
-{
- if (!_lock)
- send_cmd(command::set_subtitle_size, _size_checkbox->isChecked() ? _size_spinbox->value() : -1);
-}
-
-void subtitle_dialog::scale_changed()
-{
- if (!_lock)
- send_cmd(command::set_subtitle_scale, _scale_checkbox->isChecked()
- ? static_cast<float>(_scale_spinbox->value()) : -1.0f);
-}
-
-void subtitle_dialog::color_changed()
-{
- if (!_lock)
- {
- uint64_t color;
- if (_color_checkbox->isChecked())
- {
- unsigned int a = _color.alpha();
- unsigned int r = _color.red();
- unsigned int g = _color.green();
- unsigned int b = _color.blue();
- color = (a << 24u) | (r << 16u) | (g << 8u) | b;
- }
- else
- {
- color = std::numeric_limits<uint64_t>::max();
- }
- send_cmd(command::set_subtitle_color, color);
- }
-}
-
-void subtitle_dialog::shadow_changed()
-{
- if (!_lock)
- send_cmd(command::set_subtitle_shadow, _shadow_checkbox->isChecked()
- ? 1 - _shadow_combobox->currentIndex() : -1);
-}
-
-void subtitle_dialog::receive_notification(const notification &note)
-{
- std::string s;
- int i;
- float f;
- uint64_t c;
-
- _lock = true;
- switch (note.type)
- {
- case notification::subtitle_encoding:
- s = dispatch::parameters().subtitle_encoding();
- _encoding_checkbox->setChecked(!s.empty());
- if (!s.empty())
- _encoding_combobox->setCurrentIndex(_encoding_combobox->findText(s.c_str()));
- break;
- case notification::subtitle_font:
- s = dispatch::parameters().subtitle_font();
- _font_checkbox->setChecked(!s.empty());
- if (!s.empty())
- _font_combobox->setCurrentFont(QFont(QString(s.c_str())));
- break;
- case notification::subtitle_size:
- i = dispatch::parameters().subtitle_size();
- _size_checkbox->setChecked(i > 0);
- if (i > 0)
- _size_spinbox->setValue(i);
- break;
- case notification::subtitle_scale:
- f = dispatch::parameters().subtitle_scale();
- _scale_checkbox->setChecked(f >= 0.0f);
- if (f >= 0.0f)
- _scale_spinbox->setValue(f);
- break;
- case notification::subtitle_color:
- c = dispatch::parameters().subtitle_color();
- _color_checkbox->setChecked(c <= std::numeric_limits<uint32_t>::max());
- if (c <= std::numeric_limits<uint32_t>::max())
- set_color_button(c);
- break;
- case notification::subtitle_shadow:
- i = dispatch::parameters().subtitle_shadow();
- _shadow_checkbox->setChecked(i >= 0);
- if (i >= 0)
- _shadow_combobox->setCurrentIndex(1 - i);
- break;
- default:
- /* not handled */
- break;
- }
- _lock = false;
-}
-
-
-video_dialog::video_dialog(QWidget *parent) : QDialog(parent), _lock(false)
-{
- setModal(false);
- setWindowTitle(_("Video Settings"));
-
- QLabel *crop_ar_label = new QLabel(_("Crop to aspect ratio:"));
- crop_ar_label->setToolTip(_("Set the real aspect ratio of the video, so that borders can be cropped."));
- _crop_ar_combobox = new QComboBox();
- _crop_ar_combobox->setToolTip(crop_ar_label->toolTip());
- _crop_ar_combobox->addItem(_("Do not crop"));
- _crop_ar_combobox->addItem("16:10");
- _crop_ar_combobox->addItem("16:9");
- _crop_ar_combobox->addItem("1.85:1");
- _crop_ar_combobox->addItem("2.21:1");
- _crop_ar_combobox->addItem("2.35:1");
- _crop_ar_combobox->addItem("2.39:1");
- _crop_ar_combobox->addItem("5:3");
- _crop_ar_combobox->addItem("4:3");
- _crop_ar_combobox->addItem("5:4");
- _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."));
- _p_slider = new QSlider(Qt::Horizontal);
- _p_slider->setToolTip(p_label->toolTip());
- _p_slider->setRange(-1000, 1000);
- connect(_p_slider, SIGNAL(valueChanged(int)), this, SLOT(p_slider_changed(int)));
- _p_spinbox = new QDoubleSpinBox();
- _p_spinbox->setToolTip(p_label->toolTip());
- _p_spinbox->setRange(-1.0, +1.0);
- _p_spinbox->setDecimals(2);
- _p_spinbox->setSingleStep(0.01);
- connect(_p_spinbox, SIGNAL(valueChanged(double)), this, SLOT(p_spinbox_changed(double)));
-
- QLabel *sp_label = new QLabel(_("Subtitle parallax:"));
- sp_label->setToolTip(_("Adjust subtitle parallax, from -1 to +1. This changes the perceived distance "
- "of the subtitles."));
- _sp_slider = new QSlider(Qt::Horizontal);
- _sp_slider->setToolTip(sp_label->toolTip());
- _sp_slider->setRange(-1000, 1000);
- connect(_sp_slider, SIGNAL(valueChanged(int)), this, SLOT(sp_slider_changed(int)));
- _sp_spinbox = new QDoubleSpinBox();
- _sp_spinbox->setToolTip(sp_label->toolTip());
- _sp_spinbox->setRange(-1.0, +1.0);
- _sp_spinbox->setDecimals(2);
- _sp_spinbox->setSingleStep(0.01);
- connect(_sp_spinbox, SIGNAL(valueChanged(double)), this, SLOT(sp_spinbox_changed(double)));
-
- QLabel *g_label = new QLabel(_("Ghostbusting:"));
- g_label->setToolTip(_("Set the amount of crosstalk ghostbusting, from 0 to 1. "
- "You need to set the crosstalk levels of your display first. "
- "Note that crosstalk ghostbusting does not work with anaglyph glasses."));
- _g_slider = new QSlider(Qt::Horizontal);
- _g_slider->setToolTip(g_label->toolTip());
- _g_slider->setRange(0, 1000);
- connect(_g_slider, SIGNAL(valueChanged(int)), this, SLOT(g_slider_changed(int)));
- _g_spinbox = new QDoubleSpinBox();
- _g_spinbox->setToolTip(g_label->toolTip());
- _g_spinbox->setRange(0.0, +1.0);
- _g_spinbox->setDecimals(2);
- _g_spinbox->setSingleStep(0.01);
- connect(_g_spinbox, SIGNAL(valueChanged(double)), this, SLOT(g_spinbox_changed(double)));
-
- QPushButton *ok_button = new QPushButton(_("OK"));
- connect(ok_button, SIGNAL(clicked()), this, SLOT(close()));
-
- QGridLayout *layout = new QGridLayout;
- layout->addWidget(crop_ar_label, 0, 0);
- layout->addWidget(_crop_ar_combobox, 0, 1, 1, 2);
- 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();
-}
-
-void video_dialog::update()
-{
- _lock = true;
- set_crop_ar(dispatch::parameters().crop_aspect_ratio());
- _p_slider->setValue(dispatch::parameters().parallax() * 1000.0f);
- _p_spinbox->setValue(dispatch::parameters().parallax());
- _sp_slider->setValue(dispatch::parameters().subtitle_parallax() * 1000.0f);
- _sp_spinbox->setValue(dispatch::parameters().subtitle_parallax());
- _g_slider->setValue(dispatch::parameters().ghostbust() * 1000.0f);
- _g_spinbox->setValue(dispatch::parameters().ghostbust());
- _lock = false;
-}
-
-void video_dialog::set_crop_ar(float value)
-{
- _crop_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::crop_ar_changed()
-{
- if (!_lock)
- {
- int i = _crop_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_crop_aspect_ratio, ar);
- }
-}
-
-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)
- send_cmd(command::set_parallax, val / 1000.0f);
-}
-
-void video_dialog::p_spinbox_changed(double val)
-{
- if (!_lock)
- send_cmd(command::set_parallax, static_cast<float>(val));
-}
-
-void video_dialog::sp_slider_changed(int val)
-{
- if (!_lock)
- send_cmd(command::set_subtitle_parallax, val / 1000.0f);
-}
-
-void video_dialog::sp_spinbox_changed(double val)
-{
- if (!_lock)
- send_cmd(command::set_subtitle_parallax, static_cast<float>(val));
-}
-
-void video_dialog::g_slider_changed(int val)
-{
- if (!_lock)
- send_cmd(command::set_ghostbust, val / 1000.0f);
-}
-
-void video_dialog::g_spinbox_changed(double val)
-{
- if (!_lock)
- send_cmd(command::set_ghostbust, static_cast<float>(val));
-}
-
-void video_dialog::receive_notification(const notification &note)
-{
- switch (note.type)
- {
- case notification::crop_aspect_ratio:
- case notification::source_aspect_ratio:
- case notification::parallax:
- case notification::subtitle_parallax:
- case notification::ghostbust:
- update();
- break;
- default:
- /* not handled */
- break;
- }
-}
-
-
-sdi_output_dialog::sdi_output_dialog(QWidget *parent) : QDialog(parent),
- _lock(false)
-{
-#if HAVE_LIBXNVCTRL
-
- setModal(false);
- setWindowTitle(_("SDI Output Settings"));
-
- QLabel *sdi_output_format_label = new QLabel(_("SDI Output Format:"));
- sdi_output_format_label->setToolTip(_("Select output format used for SDI output."));
- _sdi_output_format_combobox = new QComboBox();
- _sdi_output_format_combobox->setToolTip(sdi_output_format_label->toolTip());
- for (int i=NV_CTRL_GVIO_VIDEO_FORMAT_487I_59_94_SMPTE259_NTSC; i < NV_CTRL_GVIO_VIDEO_FORMAT_2048I_47_96_SMPTE372+1; ++i) {
- _sdi_output_format_combobox->addItem(decodeSignalFormat(i));
- }
- connect(_sdi_output_format_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(sdi_output_format_changed(int)));
-
- QLabel *sdi_output_left_stereo_mode_label = new QLabel(_("Left stereo mode:"));
- sdi_output_left_stereo_mode_label->setToolTip(_("Select stereo mode used for left SDI output."));
- _sdi_output_left_stereo_mode_combobox = new QComboBox();
- _sdi_output_left_stereo_mode_combobox->setToolTip(sdi_output_left_stereo_mode_label->toolTip());
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-mono-left.png"), _("Left view"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-mono-right.png"), _("Right view"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-top-bottom.png"), _("Top/bottom"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-top-bottom-half.png"), _("Top/bottom, half height"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-left-right.png"), _("Left/right"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-left-right-half.png"), _("Left/right, half width"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-even-odd-rows.png"), _("Even/odd rows"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-even-odd-columns.png"), _("Even/odd columns"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-checkerboard.png"), _("Checkerboard pattern"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, monochrome"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, half color"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, full color"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, Dubois"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, monochrome"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, half color"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, full color"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, Dubois"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, monochrome"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, half color"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, full color"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, Dubois"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-green.png"), _("Red/green glasses, monochrome"));
- _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-blue.png"), _("Red/blue glasses, monochrome"));
- connect(_sdi_output_left_stereo_mode_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(sdi_output_left_stereo_mode_changed(int)));
-
- QLabel *sdi_output_right_stereo_mode_label = new QLabel(_("Right stereo mode:"));
- sdi_output_right_stereo_mode_label->setToolTip(_("Select stereo mode used for right SDI output."));
- _sdi_output_right_stereo_mode_combobox = new QComboBox();
- _sdi_output_right_stereo_mode_combobox->setToolTip(sdi_output_right_stereo_mode_label->toolTip());
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-mono-left.png"), _("Left view"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-mono-right.png"), _("Right view"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-top-bottom.png"), _("Top/bottom"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-top-bottom-half.png"), _("Top/bottom, half height"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-left-right.png"), _("Left/right"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-left-right-half.png"), _("Left/right, half width"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-even-odd-rows.png"), _("Even/odd rows"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-even-odd-columns.png"), _("Even/odd columns"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-checkerboard.png"), _("Checkerboard pattern"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, monochrome"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, half color"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, full color"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, Dubois"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, monochrome"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, half color"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, full color"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, Dubois"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, monochrome"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, half color"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, full color"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, Dubois"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-green.png"), _("Red/green glasses, monochrome"));
- _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-blue.png"), _("Red/blue glasses, monochrome"));
- connect(_sdi_output_right_stereo_mode_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(sdi_output_right_stereo_mode_changed(int)));
-
- QPushButton *ok_button = new QPushButton(_("OK"));
- ok_button->setDefault(true);
- connect(ok_button, SIGNAL(clicked()), this, SLOT(close()));
-
- QGridLayout *layout = new QGridLayout;
- layout->addWidget(sdi_output_format_label, 0, 0);
- layout->addWidget(_sdi_output_format_combobox, 0, 1, 1, 1);
- layout->addWidget(sdi_output_left_stereo_mode_label, 1, 0);
- layout->addWidget(_sdi_output_left_stereo_mode_combobox, 1, 1);
- layout->addWidget(sdi_output_right_stereo_mode_label, 2, 0);
- layout->addWidget(_sdi_output_right_stereo_mode_combobox, 2, 1);
- layout->addWidget(ok_button, 3, 0, 1, 2);
- setLayout(layout);
-
- update();
-#endif // HAVE_LIBXNVCTRL
-}
-
-void sdi_output_dialog::update()
-{
-#if HAVE_LIBXNVCTRL
- _lock = true;
- set_sdi_output_format(dispatch::parameters().sdi_output_format());
- set_sdi_output_left_stereo_mode(dispatch::parameters().sdi_output_left_stereo_mode());
- set_sdi_output_right_stereo_mode(dispatch::parameters().sdi_output_right_stereo_mode());
- _lock = false;
-#endif // HAVE_LIBXNVCTRL
-}
-
-void sdi_output_dialog::set_sdi_output_format(int val)
-{
-#if HAVE_LIBXNVCTRL
- _sdi_output_format_combobox->setCurrentIndex(val-1);
-#else
- (void)val;
-#endif // HAVE_LIBXNVCTRL
-}
-
-void sdi_output_dialog::set_sdi_output_left_stereo_mode(parameters::stereo_mode_t stereo_mode)
-{
-#if HAVE_LIBXNVCTRL
- switch (stereo_mode)
- {
- default:
- case parameters::mode_mono_left:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(0);
- break;
- case parameters::mode_mono_right:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(1);
- break;
- case parameters::mode_top_bottom:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(2);
- break;
- case parameters::mode_top_bottom_half:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(3);
- break;
- case parameters::mode_left_right:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(4);
- break;
- case parameters::mode_left_right_half:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(5);
- break;
- case parameters::mode_even_odd_rows:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(6);
- break;
- case parameters::mode_even_odd_columns:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(7);
- break;
- case parameters::mode_checkerboard:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(8);
- break;
- case parameters::mode_red_cyan_monochrome:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(9);
- break;
- case parameters::mode_red_cyan_half_color:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(10);
- break;
- case parameters::mode_red_cyan_full_color:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(11);
- break;
- case parameters::mode_red_cyan_dubois:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(12);
- break;
- case parameters::mode_green_magenta_monochrome:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(13);
- break;
- case parameters::mode_green_magenta_half_color:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(14);
- break;
- case parameters::mode_green_magenta_full_color:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(15);
- break;
- case parameters::mode_green_magenta_dubois:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(16);
- break;
- case parameters::mode_amber_blue_monochrome:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(17);
- break;
- case parameters::mode_amber_blue_half_color:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(18);
- break;
- case parameters::mode_amber_blue_full_color:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(19);
- break;
- case parameters::mode_amber_blue_dubois:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(20);
- break;
- case parameters::mode_red_green_monochrome:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(21);
- break;
- case parameters::mode_red_blue_monochrome:
- _sdi_output_left_stereo_mode_combobox->setCurrentIndex(22);
- break;
- }
-#else
- (void)stereo_mode;
-#endif // HAVE_LIBXNVCTRL
-}
-
-void sdi_output_dialog::set_sdi_output_right_stereo_mode(parameters::stereo_mode_t stereo_mode)
-{
-#if HAVE_LIBXNVCTRL
- switch (stereo_mode)
- {
- default:
- case parameters::mode_mono_left:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(0);
- break;
- case parameters::mode_mono_right:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(1);
- break;
- case parameters::mode_top_bottom:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(2);
- break;
- case parameters::mode_top_bottom_half:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(3);
- break;
- case parameters::mode_left_right:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(4);
- break;
- case parameters::mode_left_right_half:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(5);
- break;
- case parameters::mode_even_odd_rows:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(6);
- break;
- case parameters::mode_even_odd_columns:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(7);
- break;
- case parameters::mode_checkerboard:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(8);
- break;
- case parameters::mode_red_cyan_monochrome:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(9);
- break;
- case parameters::mode_red_cyan_half_color:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(10);
- break;
- case parameters::mode_red_cyan_full_color:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(11);
- break;
- case parameters::mode_red_cyan_dubois:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(12);
- break;
- case parameters::mode_green_magenta_monochrome:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(13);
- break;
- case parameters::mode_green_magenta_half_color:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(14);
- break;
- case parameters::mode_green_magenta_full_color:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(15);
- break;
- case parameters::mode_green_magenta_dubois:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(16);
- break;
- case parameters::mode_amber_blue_monochrome:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(17);
- break;
- case parameters::mode_amber_blue_half_color:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(18);
- break;
- case parameters::mode_amber_blue_full_color:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(19);
- break;
- case parameters::mode_amber_blue_dubois:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(20);
- break;
- case parameters::mode_red_green_monochrome:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(21);
- break;
- case parameters::mode_red_blue_monochrome:
- _sdi_output_right_stereo_mode_combobox->setCurrentIndex(22);
- break;
- }
-#else
- (void)stereo_mode;
-#endif // HAVE_LIBXNVCTRL
-}
-
-void sdi_output_dialog::sdi_output_format_changed(int val)
-{
-#if HAVE_LIBXNVCTRL
- if (!_lock)
- send_cmd(command::set_sdi_output_format, val+1);
-#else
- (void)val;
-#endif // HAVE_LIBXNVCTRL
-}
-
-void sdi_output_dialog::sdi_output_left_stereo_mode_changed(int val)
-{
-#if HAVE_LIBXNVCTRL
- parameters::stereo_mode_t stereo_mode = parameters::mode_mono_left;
-
- switch (val)
- {
- case 0:
- stereo_mode = parameters::mode_mono_left;
- break;
- case 1:
- stereo_mode = parameters::mode_mono_right;
- break;
- case 2:
- stereo_mode = parameters::mode_top_bottom;
- break;
- case 3:
- stereo_mode = parameters::mode_top_bottom_half;
- break;
- case 4:
- stereo_mode = parameters::mode_left_right;
- break;
- case 5:
- stereo_mode = parameters::mode_left_right_half;
- break;
- case 6:
- stereo_mode = parameters::mode_even_odd_rows;
- break;
- case 7:
- stereo_mode = parameters::mode_even_odd_columns;
- break;
- case 8:
- stereo_mode = parameters::mode_checkerboard;
- break;
- case 9:
- stereo_mode = parameters::mode_red_cyan_monochrome;
- break;
- case 10:
- stereo_mode = parameters::mode_red_cyan_half_color;
- break;
- case 11:
- stereo_mode = parameters::mode_red_cyan_full_color;
- break;
- case 12:
- stereo_mode = parameters::mode_red_cyan_dubois;
- break;
- case 13:
- stereo_mode = parameters::mode_green_magenta_monochrome;
- break;
- case 14:
- stereo_mode = parameters::mode_green_magenta_half_color;
- break;
- case 15:
- stereo_mode = parameters::mode_green_magenta_full_color;
- break;
- case 16:
- stereo_mode = parameters::mode_green_magenta_dubois;
- break;
- case 17:
- stereo_mode = parameters::mode_amber_blue_monochrome;
- break;
- case 18:
- stereo_mode = parameters::mode_amber_blue_half_color;
- break;
- case 19:
- stereo_mode = parameters::mode_amber_blue_full_color;
- break;
- case 20:
- stereo_mode = parameters::mode_amber_blue_dubois;
- break;
- case 21:
- stereo_mode = parameters::mode_red_green_monochrome;
- break;
- case 22:
- stereo_mode = parameters::mode_red_blue_monochrome;
- break;
- }
-
- if (!_lock)
- send_cmd(command::set_sdi_output_left_stereo_mode, static_cast<int>(stereo_mode));
-#else
- (void)val;
-#endif // HAVE_LIBXNVCTRL
-}
-
-void sdi_output_dialog::sdi_output_right_stereo_mode_changed(int val)
-{
-#if HAVE_LIBXNVCTRL
- parameters::stereo_mode_t stereo_mode = parameters::mode_mono_left;
-
- switch (val)
- {
- case 0:
- stereo_mode = parameters::mode_mono_left;
- break;
- case 1:
- stereo_mode = parameters::mode_mono_right;
- break;
- case 2:
- stereo_mode = parameters::mode_top_bottom;
- break;
- case 3:
- stereo_mode = parameters::mode_top_bottom_half;
- break;
- case 4:
- stereo_mode = parameters::mode_left_right;
- break;
- case 5:
- stereo_mode = parameters::mode_left_right_half;
- break;
- case 6:
- stereo_mode = parameters::mode_even_odd_rows;
- break;
- case 7:
- stereo_mode = parameters::mode_even_odd_columns;
- break;
- case 8:
- stereo_mode = parameters::mode_checkerboard;
- break;
- case 9:
- stereo_mode = parameters::mode_red_cyan_monochrome;
- break;
- case 10:
- stereo_mode = parameters::mode_red_cyan_half_color;
- break;
- case 11:
- stereo_mode = parameters::mode_red_cyan_full_color;
- break;
- case 12:
- stereo_mode = parameters::mode_red_cyan_dubois;
- break;
- case 13:
- stereo_mode = parameters::mode_green_magenta_monochrome;
- break;
- case 14:
- stereo_mode = parameters::mode_green_magenta_half_color;
- break;
- case 15:
- stereo_mode = parameters::mode_green_magenta_full_color;
- break;
- case 16:
- stereo_mode = parameters::mode_green_magenta_dubois;
- break;
- case 17:
- stereo_mode = parameters::mode_amber_blue_monochrome;
- break;
- case 18:
- stereo_mode = parameters::mode_amber_blue_half_color;
- break;
- case 19:
- stereo_mode = parameters::mode_amber_blue_full_color;
- break;
- case 20:
- stereo_mode = parameters::mode_amber_blue_dubois;
- break;
- case 21:
- stereo_mode = parameters::mode_red_green_monochrome;
- break;
- case 22:
- stereo_mode = parameters::mode_red_blue_monochrome;
- break;
- }
-
- if (!_lock)
- send_cmd(command::set_sdi_output_right_stereo_mode, static_cast<int>(stereo_mode));
-#else
- (void)val;
-#endif // HAVE_LIBXNVCTRL
-}
-
-void sdi_output_dialog::receive_notification(const notification &note)
-{
-#if HAVE_LIBXNVCTRL
- switch (note.type)
- {
- case notification::sdi_output_format:
- update();
- break;
- case notification::sdi_output_left_stereo_mode:
- update();
- break;
- case notification::sdi_output_right_stereo_mode:
- update();
- break;
- default:
- /* not handled */
- break;
- }
-#else
- (void)note;
-#endif // HAVE_LIBXNVCTRL
-}
-
-
-open_device_dialog::open_device_dialog(
- const QStringList &default_devices,
- const QStringList &firewire_devices,
- const QStringList &last_devices,
- const device_request &dev_request,
- QWidget *parent) :
- QDialog(parent)
-{
- setWindowTitle(_("Open device(s)"));
-
- _type_combobox = new QComboBox();
- _type_combobox->setToolTip(_("Choose a device type."));
- _type_combobox->addItem(_("Default"));
- _type_combobox->addItem(_("Firewire"));
- _type_combobox->addItem(_("X11"));
- for (int i = 0; i < 2; i++) {
- _default_device_combobox[i] = new QComboBox();
- _default_device_combobox[i]->setToolTip(_("Choose a device."));
- _default_device_combobox[i]->addItems(default_devices);
- _firewire_device_combobox[i] = new QComboBox();
- _firewire_device_combobox[i]->setToolTip(_("Choose a device."));
- _firewire_device_combobox[i]->addItems(firewire_devices);
- _x11_device_field[i] = new QLineEdit();
- _x11_device_field[i]->setToolTip(_("Set the X11 device string. "
- "Refer to the manual for details."));
- _x11_device_field[i]->setText("localhost:0.0+0,0");
- _device_chooser_stack[i] = new QStackedWidget();
- _device_chooser_stack[i]->addWidget(_default_device_combobox[i]);
- _device_chooser_stack[i]->addWidget(_firewire_device_combobox[i]);
- _device_chooser_stack[i]->addWidget(_x11_device_field[i]);
- if (last_devices.size() > i) {
- int j;
- if (dev_request.device == device_request::sys_default
- && (j = _default_device_combobox[i]->findText(last_devices[i])) >= 0) {
- _default_device_combobox[i]->setCurrentIndex(j);
- } else if (dev_request.device == device_request::firewire
- && (j = _firewire_device_combobox[i]->findText(last_devices[i])) >= 0) {
- _firewire_device_combobox[i]->setCurrentIndex(j);
- } else if (dev_request.device == device_request::x11) {
- _x11_device_field[i]->setText(last_devices[i]);
- }
- }
- }
- connect(_type_combobox, SIGNAL(currentIndexChanged(int)), _device_chooser_stack[0], SLOT(setCurrentIndex(int)));
- connect(_type_combobox, SIGNAL(currentIndexChanged(int)), _device_chooser_stack[1], SLOT(setCurrentIndex(int)));
- _type_combobox->setCurrentIndex(dev_request.device == device_request::firewire ? 1
- : dev_request.device == device_request::x11 ? 2 : 0);
- QLabel *first_device_label = new QLabel(_("First device:"));
- _second_device_checkbox = new QCheckBox(_("Second device:"));
- _second_device_checkbox->setChecked(last_devices.size() > 1);
- _device_chooser_stack[1]->setEnabled(last_devices.size() > 1);
- connect(_second_device_checkbox, SIGNAL(toggled(bool)), _device_chooser_stack[1], SLOT(setEnabled(bool)));
- _frame_size_groupbox = new QGroupBox(_("Request frame size"));
- _frame_size_groupbox->setToolTip(_("Request a specific frame size from the device, e.g. 640x480. "
- "The device must support this frame size. Some devices require a frame size to be selected."));
- _frame_size_groupbox->setCheckable(true);
- _frame_size_groupbox->setChecked(dev_request.width != 0 && dev_request.height != 0);
- connect(_frame_size_groupbox, SIGNAL(clicked(bool)), this, SLOT(frame_size_groupbox_clicked(bool)));
- _frame_width_spinbox = new QSpinBox();
- _frame_width_spinbox->setRange(_frame_size_groupbox->isChecked() ? 1 : 0, 65535);
- _frame_width_spinbox->setValue(dev_request.width);
- _frame_height_spinbox = new QSpinBox();
- _frame_height_spinbox->setRange(_frame_size_groupbox->isChecked() ? 1 : 0, 65535);
- _frame_height_spinbox->setValue(dev_request.height);
- _frame_rate_groupbox = new QGroupBox(_("Request frame rate"));
- _frame_rate_groupbox->setToolTip(_("Request a specific frame rate from the device, e.g. 25/1. "
- "The device must support this frame rate. Some devices require a frame rate to be selected."));
- _frame_rate_groupbox->setCheckable(true);
- _frame_rate_groupbox->setChecked(dev_request.frame_rate_num != 0 && dev_request.frame_rate_den != 0);
- connect(_frame_rate_groupbox, SIGNAL(clicked(bool)), this, SLOT(frame_rate_groupbox_clicked(bool)));
- _frame_rate_num_spinbox = new QSpinBox();
- _frame_rate_num_spinbox->setRange(_frame_rate_groupbox->isChecked() ? 1 : 0, 65535);
- _frame_rate_num_spinbox->setValue(dev_request.frame_rate_num);
- _frame_rate_den_spinbox = new QSpinBox();
- _frame_rate_den_spinbox->setRange(_frame_rate_groupbox->isChecked() ? 1 : 0, 65535);
- _frame_rate_den_spinbox->setValue(dev_request.frame_rate_den);
- _mjpeg_checkbox = new QCheckBox(_("Request MJPEG format"));
- _mjpeg_checkbox->setToolTip(_("Request MJPEG data from the input device. "
- "The device may ignore this request."));
- _mjpeg_checkbox->setChecked(dev_request.request_mjpeg);
- QPushButton *cancel_btn = new QPushButton(_("Cancel"));
- connect(cancel_btn, SIGNAL(clicked()), this, SLOT(reject()));
- QPushButton *ok_btn = new QPushButton(_("OK"));
- connect(ok_btn, SIGNAL(clicked()), this, SLOT(accept()));
-
- QGridLayout *frame_size_layout = new QGridLayout;
- frame_size_layout->addWidget(_frame_width_spinbox, 0, 0);
- frame_size_layout->addWidget(new QLabel("x"), 0, 1);
- frame_size_layout->addWidget(_frame_height_spinbox, 0, 2);
- _frame_size_groupbox->setLayout(frame_size_layout);
- QGridLayout *frame_rate_layout = new QGridLayout;
- frame_rate_layout->addWidget(_frame_rate_num_spinbox, 0, 0);
- frame_rate_layout->addWidget(new QLabel("/"), 0, 1);
- frame_rate_layout->addWidget(_frame_rate_den_spinbox, 0, 2);
- _frame_rate_groupbox->setLayout(frame_rate_layout);
-
- QGridLayout *layout = new QGridLayout;
- layout->addWidget(_type_combobox, 0, 0, 1, 2);
- layout->addWidget(first_device_label, 1, 0);
- layout->addWidget(_device_chooser_stack[0], 1, 1);
- layout->addWidget(_second_device_checkbox, 2, 0);
- layout->addWidget(_device_chooser_stack[1], 2, 1);
- layout->addWidget(_frame_size_groupbox, 3, 0, 1, 2);
- layout->addWidget(_frame_rate_groupbox, 4, 0, 1, 2);
- layout->addWidget(_mjpeg_checkbox, 5, 0, 1, 2);
- layout->addWidget(cancel_btn, 6, 0);
- layout->addWidget(ok_btn, 6, 1);
- layout->setRowStretch(1, 1);
- setLayout(layout);
-}
-
-void open_device_dialog::frame_size_groupbox_clicked(bool checked)
-{
- _frame_width_spinbox->setRange(checked ? 1 : 0, 65535);
- _frame_width_spinbox->setValue(checked ? 640 : 0);
- _frame_height_spinbox->setRange(checked ? 1 : 0, 65535);
- _frame_height_spinbox->setValue(checked ? 480 : 0);
-}
-
-void open_device_dialog::frame_rate_groupbox_clicked(bool checked)
-{
- _frame_rate_num_spinbox->setRange(checked ? 1 : 0, 65535);
- _frame_rate_num_spinbox->setValue(checked ? 25 : 0);
- _frame_rate_den_spinbox->setRange(checked ? 1 : 0, 65535);
- _frame_rate_den_spinbox->setValue(checked ? 1 : 0);
-}
-
-void open_device_dialog::request(QStringList &devices, device_request &dev_request)
-{
- if (_type_combobox->currentIndex() == 1)
- {
- dev_request.device = device_request::firewire;
- devices.push_back(_firewire_device_combobox[0]->currentText());
- if (_second_device_checkbox->isChecked())
- devices.push_back(_firewire_device_combobox[1]->currentText());
- }
- else if (_type_combobox->currentIndex() == 2)
- {
- dev_request.device = device_request::x11;
- devices.push_back(_x11_device_field[0]->text());
- if (_second_device_checkbox->isChecked())
- devices.push_back(_x11_device_field[1]->text());
- }
- else
- {
- dev_request.device = device_request::sys_default;
- devices.push_back(_default_device_combobox[0]->currentText());
- if (_second_device_checkbox->isChecked())
- devices.push_back(_default_device_combobox[1]->currentText());
- }
- dev_request.width = _frame_size_groupbox->isChecked() ? _frame_width_spinbox->value() : 0;
- dev_request.height = _frame_size_groupbox->isChecked() ? _frame_height_spinbox->value() : 0;
- dev_request.frame_rate_num = _frame_rate_groupbox->isChecked() ? _frame_rate_num_spinbox->value() : 0;
- dev_request.frame_rate_den = _frame_rate_groupbox->isChecked() ? _frame_rate_den_spinbox->value() : 0;
- dev_request.request_mjpeg = _mjpeg_checkbox->isChecked();
-}
-
-main_window::main_window(QSettings *settings) :
- _settings(settings),
- _fullscreen_dialog(NULL),
- _color_dialog(NULL),
- _crosstalk_dialog(NULL),
- _quality_dialog(NULL),
- _zoom_dialog(NULL),
- _audio_dialog(NULL),
- _subtitle_dialog(NULL),
- _video_dialog(NULL),
-#if HAVE_LIBXNVCTRL
- _sdi_output_dialog(NULL),
-#endif // HAVE_LIBXNVCTRL
- _max_recent_files(5)
-{
- // Application properties
- setWindowTitle(PACKAGE_NAME);
- setWindowIcon(QIcon(":logo/64x64/bino.png"));
-
- // Load preferences
- QString saved_session_params = _settings->value("Session/parameters", QString("")).toString();
- if (!saved_session_params.isEmpty())
- {
- parameters session_params;
- session_params.load_session_parameters(saved_session_params.toStdString());
- if (!dispatch::parameters().audio_device_is_set() && !session_params.audio_device_is_default())
- send_cmd(command::set_audio_device, session_params.audio_device());
- if (!dispatch::parameters().audio_delay_is_set() && !session_params.audio_delay_is_default())
- send_cmd(command::set_audio_delay, session_params.audio_delay());
- if (!dispatch::parameters().quality_is_set() && !session_params.quality_is_default())
- send_cmd(command::set_quality, session_params.quality());
- if (!dispatch::parameters().contrast_is_set() && !session_params.contrast_is_default())
- send_cmd(command::set_contrast, session_params.contrast());
- if (!dispatch::parameters().brightness_is_set() && !session_params.brightness_is_default())
- send_cmd(command::set_brightness, session_params.brightness());
- if (!dispatch::parameters().hue_is_set() && !session_params.hue_is_default())
- send_cmd(command::set_hue, session_params.hue());
- if (!dispatch::parameters().saturation_is_set() && !session_params.saturation_is_default())
- send_cmd(command::set_saturation, session_params.saturation());
- if (!dispatch::parameters().crosstalk_r_is_set()
- && !dispatch::parameters().crosstalk_g_is_set()
- && !dispatch::parameters().crosstalk_b_is_set()
- && !(session_params.crosstalk_r_is_default()
- && session_params.crosstalk_g_is_default()
- && session_params.crosstalk_b_is_default())) {
- std::ostringstream v;
- s11n::save(v, session_params.crosstalk_r());
- s11n::save(v, session_params.crosstalk_g());
- s11n::save(v, session_params.crosstalk_b());
- send_cmd(command::set_crosstalk, v.str());
- }
- if (!dispatch::parameters().subtitle_encoding_is_set() && !session_params.subtitle_encoding_is_default()) {
- std::ostringstream v;
- s11n::save(v, session_params.subtitle_encoding());
- send_cmd(command::set_subtitle_encoding, v.str());
- }
- if (!dispatch::parameters().subtitle_font_is_set() && !session_params.subtitle_font_is_default()) {
- std::ostringstream v;
- s11n::save(v, session_params.subtitle_font());
- send_cmd(command::set_subtitle_font, v.str());
- }
- if (!dispatch::parameters().subtitle_size_is_set() && !session_params.subtitle_size_is_default())
- send_cmd(command::set_subtitle_size, session_params.subtitle_size());
- if (!dispatch::parameters().subtitle_scale_is_set() && !session_params.subtitle_scale_is_default())
- send_cmd(command::set_subtitle_scale, session_params.subtitle_scale());
- if (!dispatch::parameters().subtitle_color_is_set() && !session_params.subtitle_color_is_default())
- send_cmd(command::set_subtitle_color, session_params.subtitle_color());
- if (!dispatch::parameters().fullscreen_screens_is_set() && !session_params.fullscreen_screens_is_default())
- send_cmd(command::set_fullscreen_screens, session_params.fullscreen_screens());
- if (!dispatch::parameters().fullscreen_flip_left_is_set() && !session_params.fullscreen_flip_left_is_default())
- send_cmd(command::set_fullscreen_flip_left, session_params.fullscreen_flip_left());
- if (!dispatch::parameters().fullscreen_flop_left_is_set() && !session_params.fullscreen_flop_left_is_default())
- send_cmd(command::set_fullscreen_flop_left, session_params.fullscreen_flop_left());
- if (!dispatch::parameters().fullscreen_flip_right_is_set() && !session_params.fullscreen_flip_right_is_default())
- send_cmd(command::set_fullscreen_flip_right, session_params.fullscreen_flip_right());
- if (!dispatch::parameters().fullscreen_flop_right_is_set() && !session_params.fullscreen_flop_right_is_default())
- send_cmd(command::set_fullscreen_flop_right, session_params.fullscreen_flop_right());
- if (!dispatch::parameters().fullscreen_inhibit_screensaver_is_set() && !session_params.fullscreen_inhibit_screensaver_is_default())
- send_cmd(command::set_fullscreen_inhibit_screensaver, session_params.fullscreen_inhibit_screensaver());
- if (!dispatch::parameters().fullscreen_3d_ready_sync_is_set() && !session_params.fullscreen_3d_ready_sync_is_default())
- send_cmd(command::set_fullscreen_3d_ready_sync, session_params.fullscreen_3d_ready_sync());
- if (!dispatch::parameters().zoom_is_set() && !session_params.zoom_is_default())
- send_cmd(command::set_zoom, session_params.zoom());
-#if HAVE_LIBXNVCTRL
- if (!dispatch::parameters().sdi_output_format_is_set() && !session_params.sdi_output_format_is_default())
- send_cmd(command::set_sdi_output_format, session_params.sdi_output_format());
- if (!dispatch::parameters().sdi_output_left_stereo_mode_is_set() && !session_params.sdi_output_left_stereo_mode_is_default())
- send_cmd(command::set_sdi_output_left_stereo_mode, session_params.sdi_output_left_stereo_mode());
- if (!dispatch::parameters().sdi_output_right_stereo_mode_is_set() && !session_params.sdi_output_right_stereo_mode_is_default())
- send_cmd(command::set_sdi_output_right_stereo_mode, session_params.sdi_output_right_stereo_mode());
-#endif // HAVE_LIBXNVCTRL
- }
- else
- {
- // This code block is only for compatibility with Bino <= 1.2.x:
- _settings->beginGroup("Session");
- if (!dispatch::parameters().audio_device_is_set() && _settings->contains("audio-device"))
- {
- send_cmd(command::set_audio_device, _settings->value("audio-device").toInt());
- _settings->remove("audio-device");
- }
- if (!dispatch::parameters().audio_delay_is_set() && _settings->contains("audio-delay"))
- {
- send_cmd(command::set_audio_delay, static_cast<int64_t>(_settings->value("audio-delay").toLongLong()));
- _settings->remove("audio-delay");
- }
- if (!dispatch::parameters().contrast_is_set() && _settings->contains("contrast"))
- {
- send_cmd(command::set_contrast, _settings->value("contrast").toFloat());
- _settings->remove("contrast");
- }
- if (!dispatch::parameters().brightness_is_set() && _settings->contains("brightness"))
- {
- send_cmd(command::set_brightness, _settings->value("brightness").toFloat());
- _settings->remove("brightness");
- }
- if (!dispatch::parameters().hue_is_set() && _settings->contains("hue"))
- {
- send_cmd(command::set_hue, _settings->value("hue").toFloat());
- _settings->remove("hue");
- }
- if (!dispatch::parameters().saturation_is_set() && _settings->contains("saturation"))
- {
- send_cmd(command::set_saturation, _settings->value("saturation").toFloat());
- _settings->remove("saturation");
- }
- if (!dispatch::parameters().crosstalk_r_is_set()
- && !dispatch::parameters().crosstalk_g_is_set()
- && !dispatch::parameters().crosstalk_b_is_set()
- && _settings->contains("crosstalk_r")
- && _settings->contains("crosstalk_g")
- && _settings->contains("crosstalk_b"))
- {
- std::ostringstream v;
- s11n::save(v, _settings->value("crosstalk_r").toFloat());
- s11n::save(v, _settings->value("crosstalk_g").toFloat());
- s11n::save(v, _settings->value("crosstalk_b").toFloat());
- send_cmd(command::set_crosstalk, v.str());
- _settings->remove("crosstalk_r");
- _settings->remove("crosstalk_g");
- _settings->remove("crosstalk_b");
- }
- if (!dispatch::parameters().fullscreen_screens_is_set() && _settings->contains("fullscreen-screens"))
- {
- send_cmd(command::set_fullscreen_screens, _settings->value("fullscreen-screens").toInt());
- _settings->remove("fullscreen-screens");
- }
- if (!dispatch::parameters().fullscreen_flip_left_is_set() && _settings->contains("fullscreen-flip-left"))
- {
- send_cmd(command::set_fullscreen_flip_left, _settings->value("fullscreen-flip-left").toInt());
- _settings->remove("fullscreen-flip-left");
- }
- if (!dispatch::parameters().fullscreen_flop_left_is_set() && _settings->contains("fullscreen-flop-left"))
- {
- send_cmd(command::set_fullscreen_flop_left, _settings->value("fullscreen-flop-left").toInt());
- _settings->remove("fullscreen-flop-left");
- }
- if (!dispatch::parameters().fullscreen_flip_right_is_set() && _settings->contains("fullscreen-flip-right"))
- {
- send_cmd(command::set_fullscreen_flip_right, _settings->value("fullscreen-flip-right").toInt());
- _settings->remove("fullscreen-flip-right");
- }
- if (!dispatch::parameters().fullscreen_flop_right_is_set() && _settings->contains("fullscreen-flop-right"))
- {
- send_cmd(command::set_fullscreen_flop_right, _settings->value("fullscreen-flop-right").toInt());
- _settings->remove("fullscreen-flop-right");
- }
- if (!dispatch::parameters().subtitle_encoding_is_set() && _settings->contains("subtitle-encoding"))
- {
- std::ostringstream v;
- s11n::save(v, _settings->value("subtitle-encoding").toString().toStdString());
- send_cmd(command::set_subtitle_encoding, v.str());
- _settings->remove("subtitle-encoding");
- }
- if (!dispatch::parameters().subtitle_font_is_set() && _settings->contains("subtitle-font"))
- {
- std::ostringstream v;
- s11n::save(v, _settings->value("subtitle-font").toString().toStdString());
- send_cmd(command::set_subtitle_font, v.str());
- _settings->remove("subtitle-font");
- }
- if (!dispatch::parameters().subtitle_size_is_set() && _settings->contains("subtitle-size"))
- {
- send_cmd(command::set_subtitle_size, _settings->value("subtitle-size").toInt());
- _settings->remove("subtitle-size");
- }
- if (!dispatch::parameters().subtitle_scale_is_set() && _settings->contains("subtitle-scale"))
- {
- send_cmd(command::set_subtitle_scale, _settings->value("subtitle-scale").toFloat());
- _settings->remove("subtitle-scale");
- }
- if (!dispatch::parameters().subtitle_color_is_set() && _settings->contains("subtitle-color"))
- {
- send_cmd(command::set_subtitle_color, static_cast<uint64_t>(_settings->value("subtitle-color").toULongLong()));
- _settings->remove("subtitle-color");
- }
- if (!dispatch::parameters().zoom_is_set() && _settings->contains("zoom"))
- {
- send_cmd(command::set_zoom, _settings->value("zoom").toFloat());
- _settings->remove("zoom");
- }
- _settings->endGroup();
- }
-
- // Central widget and timer
- QWidget *central_widget = new QWidget(this);
- QGridLayout *layout = new QGridLayout();
- _video_container_widget = new video_container_widget(central_widget);
- layout->addWidget(_video_container_widget, 0, 0);
- _timer = new QTimer(this);
- connect(_timer, SIGNAL(timeout()), this, SLOT(playloop_step()));
- _in_out_widget = new in_out_widget(_settings, central_widget);
- layout->addWidget(_in_out_widget, 1, 0);
- _controls_widget = new controls_widget(_settings, central_widget);
- layout->addWidget(_controls_widget, 2, 0);
- layout->setRowStretch(0, 1);
- layout->setColumnStretch(0, 1);
- central_widget->setLayout(layout);
- setCentralWidget(central_widget);
-
- // Menus
- QMenu *file_menu = menuBar()->addMenu(_("&File"));
- QAction *file_open_act = new QAction(_("&Open file(s)..."), this);
- file_open_act->setShortcut(QKeySequence::Open);
- file_open_act->setIcon(get_icon("document-open"));
- connect(file_open_act, SIGNAL(triggered()), this, SLOT(file_open()));
- file_menu->addAction(file_open_act);
- QAction *file_open_urls_act = new QAction(_("Open &URL(s)..."), this);
- file_open_urls_act->setIcon(get_icon("document-open"));
- connect(file_open_urls_act, SIGNAL(triggered()), this, SLOT(file_open_urls()));
- file_menu->addAction(file_open_urls_act);
- QAction *file_open_device_act = new QAction(_("Open &device(s)..."), this);
- file_open_device_act->setIcon(get_icon("camera-web"));
- connect(file_open_device_act, SIGNAL(triggered()), this, SLOT(file_open_device()));
- file_menu->addAction(file_open_device_act);
-
- _recent_files_separator = file_menu->addSeparator();
-
- for (int i = 0; i < _max_recent_files; ++i) {
- QAction * recent = new QAction(this);
- recent->setVisible(false);
- file_menu->addAction(recent);
- connect(recent, SIGNAL(triggered()),
- this, SLOT(open_recent_file()));
- _recent_file_actions.append(recent);
- }
- _clear_recent_files_act = new QAction(_("&Clear recent files"), this);
- connect(_clear_recent_files_act,SIGNAL(triggered()), this, SLOT(clear_recent_files()));
-
- _clear_recent_separator = file_menu->addSeparator();
- file_menu->addAction(_clear_recent_files_act);
- update_recent_file_actions();
-
- file_menu->addSeparator();
- QAction *file_quit_act = new QAction(_("&Quit"), this);
- 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()));
- file_menu->addAction(file_quit_act);
- QMenu *preferences_menu = menuBar()->addMenu(_("&Preferences"));
- // note: whenever the preferences menu becomes a preferences panel, don't forget
- // to preferences_act->setMenuRole(QAction::PreferencesRole) on the menu item
- QAction *preferences_fullscreen_act = new QAction(_("&Fullscreen Settings..."), this);
- connect(preferences_fullscreen_act, SIGNAL(triggered()), this, SLOT(preferences_fullscreen()));
- preferences_menu->addAction(preferences_fullscreen_act);
- QAction *preferences_colors_act = new QAction(_("Display &Color Adjustments..."), this);
- connect(preferences_colors_act, SIGNAL(triggered()), this, SLOT(preferences_colors()));
- preferences_menu->addAction(preferences_colors_act);
- QAction *preferences_crosstalk_act = new QAction(_("Display Cross&talk Calibration..."), this);
- connect(preferences_crosstalk_act, SIGNAL(triggered()), this, SLOT(preferences_crosstalk()));
- preferences_menu->addAction(preferences_crosstalk_act);
- preferences_menu->addSeparator();
- QAction *preferences_quality_act = new QAction(_("Quality Adjustments..."), this);
- connect(preferences_quality_act, SIGNAL(triggered()), this, SLOT(preferences_quality()));
- preferences_menu->addAction(preferences_quality_act);
- preferences_menu->addSeparator();
- QAction *preferences_zoom_act = new QAction(_("&Zoom for wide videos..."), this);
- connect(preferences_zoom_act, SIGNAL(triggered()), this, SLOT(preferences_zoom()));
- preferences_menu->addAction(preferences_zoom_act);
- preferences_menu->addSeparator();
- QAction *preferences_audio_act = new QAction(_("&Audio Settings..."), this);
- connect(preferences_audio_act, SIGNAL(triggered()), this, SLOT(preferences_audio()));
- preferences_menu->addAction(preferences_audio_act);
- preferences_menu->addSeparator();
- QAction *preferences_subtitle_act = new QAction(_("&Subtitle Settings..."), this);
- connect(preferences_subtitle_act, SIGNAL(triggered()), this, SLOT(preferences_subtitle()));
- preferences_menu->addAction(preferences_subtitle_act);
- preferences_menu->addSeparator();
- QAction *preferences_video_act = new QAction(_("Current &Video Settings..."), this);
- connect(preferences_video_act, SIGNAL(triggered()), this, SLOT(preferences_video()));
- preferences_menu->addAction(preferences_video_act);
-#if HAVE_LIBXNVCTRL
- preferences_menu->addSeparator();
- QAction *preferences_sdi_output_act = new QAction(_("SDI &Output Settings..."), this);
- connect(preferences_sdi_output_act, SIGNAL(triggered()), this, SLOT(preferences_sdi_output()));
- preferences_menu->addAction(preferences_sdi_output_act);
-#endif // HAVE_LIBXNVCTRL
- QMenu *help_menu = menuBar()->addMenu(_("&Help"));
- QAction *help_manual_act = new QAction(_("&Manual..."), this);
- help_manual_act->setShortcut(QKeySequence::HelpContents);
- help_manual_act->setIcon(get_icon("help-contents"));
- connect(help_manual_act, SIGNAL(triggered()), this, SLOT(help_manual()));
- help_menu->addAction(help_manual_act);
- QAction *help_website_act = new QAction(_("&Website..."), this);
- help_website_act->setIcon(get_icon("applications-internet"));
- connect(help_website_act, SIGNAL(triggered()), this, SLOT(help_website()));
- help_menu->addAction(help_website_act);
- QAction *help_keyboard_act = new QAction(_("&Keyboard Shortcuts"), this);
- help_keyboard_act->setIcon(get_icon("preferences-desktop-keyboard"));
- connect(help_keyboard_act, SIGNAL(triggered()), this, SLOT(help_keyboard()));
- help_menu->addAction(help_keyboard_act);
- QAction *help_about_act = new QAction(_("&About"), this);
- help_about_act->setMenuRole(QAction::AboutRole);
- help_about_act->setIcon(get_icon("help-about"));
- connect(help_about_act, SIGNAL(triggered()), this, SLOT(help_about()));
- help_menu->addAction(help_about_act);
-
- // Handle FileOpen events
- QApplication::instance()->installEventFilter(this);
- // Handle Drop events
- setAcceptDrops(true);
-
- // Restore Mainwindow state
- _settings->beginGroup("Mainwindow");
- restoreGeometry(_settings->value("geometry").toByteArray());
- restoreState(_settings->value("windowstate").toByteArray());
- _settings->endGroup();
-
- // 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.
- // This seems to be another X11 thing; maybe Wayland will solve this stuff...
-#ifdef Q_WS_X11
- {
- QComboBox* box = new QComboBox();
- box->addItem("foo");
- box->addItem("bar");
- box->show();
- box->showPopup();
- box->close();
- }
-#endif
-
-#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
-
- // Show window. Must happen before opening initial files!
- show();
- raise();
-
- // Start the event and play loop
- _timer->start(0);
-}
-
-main_window::~main_window()
-{
-}
-
-void main_window::open_recent_file()
-{
- QAction *action = qobject_cast<QAction *>(sender());
- if (action)
- open(action->data().toStringList());
-}
-
-void main_window::update_recent_file_actions()
-{
- QVariantList files = _settings->value("Session/recent-files").toList();
-
- int num_recent_files = qMin(files.size(), _max_recent_files);
- bool have_recent_files = num_recent_files > 0;
-
- for (int i = 0; i < num_recent_files; ++i) {
- QStringList recentFilesEntry = files[i].toStringList();
- QString text = QString("&%1 %2").arg(i + 1).arg(stripped_name(recentFilesEntry));
- _recent_file_actions[i]->setText(text);
- _recent_file_actions[i]->setData(recentFilesEntry);
- _recent_file_actions[i]->setVisible(true);
- }
- for (int j = num_recent_files; j < _max_recent_files; ++j)
- _recent_file_actions[j]->setVisible(false);
-
- _recent_files_separator->setVisible(have_recent_files);
- _clear_recent_separator->setVisible(have_recent_files);
- _clear_recent_files_act->setVisible(have_recent_files);
-
-}
-
-void main_window::clear_recent_files()
-{
- _settings->remove("Session/recent-files");
- update_recent_file_actions();
-}
-
-QString main_window::stripped_name(const QStringList & filenames)
-{
- QStringList stripped;
- foreach(QString file, filenames) {
- stripped.append(QFileInfo(file).fileName());
- }
- QString strippedNames = stripped.join(", ");
- if(strippedNames.length() >= 50)
- strippedNames = strippedNames.left(47).append("...");
- return strippedNames;
-}
-
-static QString urls_hash(const std::vector<std::string>& urls)
-{
- // Return SHA1 hash of the name of the current file as a hex string
- QString name;
- for (size_t i = 0; i < urls.size(); i++) {
- if (i > 0)
- name += QString("/"); // '/' can never be part of a file name
- name += QFileInfo(QFile::decodeName(urls[i].c_str())).fileName();
- }
- QString hash = QCryptographicHash::hash(name.toUtf8(), QCryptographicHash::Sha1).toHex();
- return hash;
-}
-
-void main_window::receive_notification(const notification &note)
-{
- switch (note.type) {
- case notification::quit:
- _timer->stop();
- QApplication::quit();
- break;
- case notification::play:
- if (dispatch::playing()) {
- // Force a size adjustment of the main window
- adjustSize();
- // Remember what we're playing
- _now_playing.clear();
- assert(dispatch::media_input());
- for (size_t i = 0; i < dispatch::media_input()->urls(); i++) {
- _now_playing.push_back(dispatch::media_input()->url(i));
- }
- } else {
- // Remember the settings of this video
- std::string video_parameters = dispatch::parameters().save_video_parameters();
- if (!video_parameters.empty())
- _settings->setValue("Video/" + urls_hash(_now_playing), QString::fromStdString(video_parameters));
- // Remember the 2D or 3D video output mode.
- _settings->setValue((dispatch::parameters().stereo_layout() == parameters::layout_mono
- ? "Session/2d-stereo-mode" : "Session/3d-stereo-mode"),
- QString::fromStdString(parameters::stereo_mode_to_string(
- dispatch::parameters().stereo_mode(),
- dispatch::parameters().stereo_mode_swap())));
- }
- break;
- default:
- break;
- }
-}
-
-void main_window::dragEnterEvent(QDragEnterEvent *event)
-{
- if (event->mimeData()->hasUrls())
- {
- event->acceptProposedAction();
- }
-}
-
-void main_window::dropEvent(QDropEvent *event)
-{
- if (event->mimeData()->hasUrls())
- {
- QList<QUrl> url_list = event->mimeData()->urls();
- QStringList urls;
- for (int i = 0; i < url_list.size(); i++)
- {
- if (url_list[i].toString().startsWith("file://", Qt::CaseInsensitive))
- {
- urls.append(url_list[i].toLocalFile());
- }
- else
- {
- urls.append(url_list[i].toString());
- }
- }
- open(urls);
- event->acceptProposedAction();
- }
-}
-
-void main_window::moveEvent(QMoveEvent*)
-{
- send_cmd(command::update_display_pos);
-}
-
-void main_window::closeEvent(QCloseEvent *event)
-{
- // Close a currently opened video. This also stops the video if it is
- // playing, so that its settings are remembered.
- send_cmd(command::close);
- // Stop the event and play loop
- _timer->stop();
- // Remember the Session preferences
- _settings->setValue("Session/parameters", QString::fromStdString(dispatch::parameters().save_session_parameters()));
- // Remember the Mainwindow state
- _settings->beginGroup("Mainwindow");
- _settings->setValue("geometry", saveGeometry());
- _settings->setValue("windowState", saveState());
- _settings->endGroup();
-
- event->accept();
-}
-
-bool main_window::eventFilter(QObject *obj, QEvent *event)
-{
- if (event->type() == QEvent::FileOpen)
- {
- open(QStringList(static_cast<QFileOpenEvent *>(event)->file()));
- return true;
- }
- else
- {
- // pass the event on to the parent class
- return QMainWindow::eventFilter(obj, event);
- }
-}
-
-void main_window::playloop_step()
-{
- try {
- dispatch::step();
- dispatch::process_all_events();
- }
- catch (std::exception& e) {
- send_cmd(command::close);
- QMessageBox::critical(this, "Error", e.what());
- }
-}
-
-void main_window::open(QStringList filenames,
- const device_request &dev_request,
- const parameters& initial_params)
-{
- try {
- open_input_data input_data;
- input_data.dev_request = dev_request;
- for (int i = 0; i < filenames.size(); i++) {
- input_data.urls.push_back(filenames[i].toLocal8Bit().constData());
- }
- // Get the settings for this video
- QString saved_video_parameters = _settings->value("Video/" + urls_hash(input_data.urls), QString("")).toString();
- if (!saved_video_parameters.isEmpty()) {
- input_data.params.load_video_parameters(saved_video_parameters.toStdString());
- } else {
- // This code block is only for compatibility with Bino <= 1.2.x:
- _settings->beginGroup("Video/" + urls_hash(input_data.urls));
- if (_settings->contains("stereo-layout")) {
- QString layout_name = _settings->value("stereo-layout").toString();
- parameters::stereo_layout_t stereo_layout;
- bool stereo_layout_swap;
- parameters::stereo_layout_from_string(layout_name.toStdString(), stereo_layout, stereo_layout_swap);
- input_data.params.set_stereo_layout(stereo_layout);
- input_data.params.set_stereo_layout_swap(stereo_layout_swap);
- _settings->remove("stereo-layout");
- }
- if (_settings->contains("video-stream")) {
- input_data.params.set_video_stream(_settings->value("video-stream").toInt());
- _settings->remove("video-stream");
- }
- if (_settings->contains("audio-stream")) {
- input_data.params.set_audio_stream(_settings->value("audio-stream").toInt());
- _settings->remove("audio-stream");
- }
- if (_settings->contains("subtitle-stream")) {
- input_data.params.set_subtitle_stream(_settings->value("subtitle-stream").toInt());
- _settings->remove("subtitle-stream");
- }
- if (_settings->contains("parallax")) {
- input_data.params.set_parallax(_settings->value("parallax").toFloat());
- _settings->remove("parallax");
- }
- if (_settings->contains("ghostbust")) {
- input_data.params.set_ghostbust(_settings->value("ghostbust").toFloat());
- _settings->remove("ghostbust");
- }
- if (_settings->contains("subtitle-parallax")) {
- input_data.params.set_subtitle_parallax(_settings->value("subtitle-parallax").toFloat());
- _settings->remove("subtitle-parallax");
- }
- _settings->endGroup();
- }
- // Allow the initial parameters to override our remembered per-video parameters.
- // This is intended to be used to enforce command line parameters.
- if (initial_params.video_stream_is_set())
- input_data.params.set_video_stream(initial_params.video_stream());
- if (initial_params.audio_stream_is_set())
- input_data.params.set_audio_stream(initial_params.audio_stream());
- if (initial_params.subtitle_stream_is_set())
- input_data.params.set_subtitle_stream(initial_params.subtitle_stream());
- if (initial_params.stereo_layout_is_set())
- input_data.params.set_stereo_layout(initial_params.stereo_layout());
- if (initial_params.stereo_layout_swap_is_set())
- 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())
- input_data.params.set_ghostbust(initial_params.ghostbust());
- if (initial_params.subtitle_parallax_is_set())
- input_data.params.set_subtitle_parallax(initial_params.subtitle_parallax());
- // Now open the input data
- std::ostringstream v;
- s11n::save(v, input_data);
- controller::send_cmd(command::open, v.str());
- // Get stereo mode
- bool mono = (dispatch::media_input()->video_frame_template().stereo_layout == parameters::layout_mono);
- if (initial_params.stereo_mode_is_set()) {
- send_cmd(command::set_stereo_mode, initial_params.stereo_mode());
- send_cmd(command::set_stereo_mode_swap, initial_params.stereo_mode_swap());
- } else if (_settings->contains(mono ? "Session/2d-stereo-mode" : "Session/3d-stereo-mode")) {
- parameters::stereo_mode_t stereo_mode;
- bool stereo_mode_swap;
- QString mode_name = _settings->value(
- mono ? "Session/2d-stereo-mode" : "Session/3d-stereo-mode").toString();
- parameters::stereo_mode_from_string(mode_name.toStdString(), stereo_mode, stereo_mode_swap);
- if (initial_params.stereo_mode_swap_is_set())
- stereo_mode_swap = initial_params.stereo_mode_swap();
- send_cmd(command::set_stereo_mode, stereo_mode);
- send_cmd(command::set_stereo_mode_swap, stereo_mode_swap);
- }
- // Automatically start playing
- send_cmd(command::toggle_play);
- }
- catch (std::exception& e) {
- QMessageBox::critical(this, "Error", e.what());
- }
-}
-
-void main_window::file_open()
-{
- if (_settings->value("Session/show-multi-open-tip", true).toBool())
- {
- QDialog *dlg = new QDialog(this);
- dlg->setModal(true);
- dlg->setWindowTitle(_("Tip"));
- QLabel *dlg_icon_label = new QLabel;
- dlg_icon_label->setPixmap(get_icon("dialog-information").pixmap(48));
- QLabel *dlg_tip_label = new QLabel(_("You can select and open multiple files at once."
- "This is useful for example if you have extra subtitle files, "
- "or if left and right view are stored in separate files."));
- QCheckBox *dlg_checkbox = new QCheckBox(_("Do not show this message again."));
- QPushButton *dlg_ok_button = new QPushButton(_("OK"));
- connect(dlg_ok_button, SIGNAL(clicked()), dlg, SLOT(accept()));
- QGridLayout *dlg_layout = new QGridLayout;
- dlg_layout->addWidget(dlg_icon_label, 0, 0);
- dlg_layout->addWidget(dlg_tip_label, 0, 1);
- dlg_layout->addWidget(new QLabel, 1, 0, 1, 2);
- dlg_layout->addWidget(dlg_checkbox, 2, 0, 1, 2, Qt::AlignHCenter);
- dlg_layout->addWidget(dlg_ok_button, 3, 0, 1, 2, Qt::AlignHCenter);
- dlg_layout->setColumnStretch(1, 1);
- dlg_layout->setRowStretch(1, 1);
- dlg->setLayout(dlg_layout);
- dlg_ok_button->setFocus();
- dlg->exec();
- _settings->setValue("Session/show-multi-open-tip", !dlg_checkbox->isChecked());
- }
-
- QStringList file_names = QFileDialog::getOpenFileNames(this, _("Open files"),
- _settings->value("Session/file-open-dir", QDir::currentPath()).toString());
- if (file_names.empty())
- {
- return;
- }
-
- _settings->setValue("Session/file-open-dir", QFileInfo(file_names[0]).path());
- open(file_names);
-
- QVariantList files = _settings->value("Session/recent-files").toList();
-
- files.removeAll(file_names);
- files.prepend(file_names);
-
- while (files.size() > _max_recent_files)
- files.removeLast();
- _settings->setValue("Session/recent-files", files);
- update_recent_file_actions();
-}
-
-void main_window::file_open_urls()
-{
- QDialog *url_dialog = new QDialog(this);
- url_dialog->setWindowTitle(_("Open URL(s)"));
- QLabel *url_label = new QLabel(_("URL(s):"));
- url_label->setToolTip(_("Enter one or more space separated URLs."));
- QLineEdit *url_edit = new QLineEdit("");
- url_edit->setToolTip(url_label->toolTip());
- url_edit->setMinimumWidth(256);
- QPushButton *cancel_btn = new QPushButton(_("Cancel"));
- QPushButton *ok_btn = new QPushButton(_("OK"));
- ok_btn->setDefault(true);
- connect(cancel_btn, SIGNAL(clicked()), url_dialog, SLOT(reject()));
- connect(ok_btn, SIGNAL(clicked()), url_dialog, SLOT(accept()));
- QGridLayout *layout = new QGridLayout();
- layout->addWidget(url_label, 0, 0);
- layout->addWidget(url_edit, 0, 1, 1, 3);
- layout->addWidget(cancel_btn, 2, 2);
- layout->addWidget(ok_btn, 2, 3);
- layout->setColumnStretch(1, 1);
- url_dialog->setLayout(layout);
- url_dialog->exec();
- if (url_dialog->result() == QDialog::Accepted
- && !url_edit->text().isEmpty())
- {
- open(url_edit->text().split(" ", QString::SkipEmptyParts));
- }
-}
-
-void main_window::file_open_device()
-{
- // Gather list of available devices
- QStringList default_devices;
- QStringList firewire_devices;
-#ifdef Q_OS_WIN
- // libavdevice supports devices "0" through "9" in the vfwcap driver on Windows.
- // Simply list them all here since I don't know how to find out which are actually available.
- for (int i = 0; i <= 9; i++)
- {
- default_devices << QString(QChar('0' + i));
- }
- firewire_devices << "/dev/video1394"; // TODO: this is definitely not correct
-#else
- // video4linux2 devices dynamically create device files /dev/video0 - /dev/video63.
- // TODO: does this also work on BSD and Mac OS?
- for (int i = 0; i < 64; i++)
- {
- QString device = QString("/dev/video") + QString::number(i);
- if (QFileInfo(device).exists())
- {
- default_devices << device;
- }
- }
- if (default_devices.empty())
- {
- // add a fallback entry
- default_devices << QString("/dev/video0");
- }
- firewire_devices << "/dev/video1394"; // TODO: this is probably not correct
-#endif
-
- // Get saved settings
- QStringList last_devices;
- device_request dev_request;
- _settings->beginGroup("Session");
- last_devices = _settings->value("device-last").toStringList();
- if (last_devices.empty() && _settings->contains("device-x11")) {
- // For compatibility with Bino <= 1.3.2:
- last_devices.push_back(_settings->value("device-x11").toString());
- _settings->remove("device-x11");
- }
- QString saved_type = _settings->value("device-type", QString("default")).toString();
- dev_request.device = (saved_type == "firewire" ? device_request::firewire
- : saved_type == "x11" ? device_request::x11 : device_request::sys_default);
- dev_request.width = _settings->value("device-request-frame-width", QString("0")).toInt();
- dev_request.height = _settings->value("device-request-frame-height", QString("0")).toInt();
- dev_request.frame_rate_num = _settings->value("device-request-frame-rate-num", QString("0")).toInt();
- dev_request.frame_rate_den = _settings->value("device-request-frame-rate-den", QString("0")).toInt();
- dev_request.request_mjpeg = _settings->value("device-request-mjpeg", QString("0")).toInt();
- _settings->endGroup();
-
- // Run dialog
- open_device_dialog *dlg = new open_device_dialog(default_devices, firewire_devices, last_devices, dev_request, this);
- dlg->exec();
- if (dlg->result() != QDialog::Accepted)
- {
- return;
- }
- QStringList devices;
- dlg->request(devices, dev_request);
-
- // Save settings
- _settings->beginGroup("Session");
- _settings->setValue("device-last", devices);
- _settings->setValue("device-type", QString(dev_request.device == device_request::firewire ? "firewire"
- : dev_request.device == device_request::x11 ? "x11" : "default"));
- _settings->setValue("device-request-frame-width", QVariant(dev_request.width).toString());
- _settings->setValue("device-request-frame-height", QVariant(dev_request.height).toString());
- _settings->setValue("device-request-frame-rate-num", QVariant(dev_request.frame_rate_num).toString());
- _settings->setValue("device-request-frame-rate-den", QVariant(dev_request.frame_rate_den).toString());
- _settings->setValue("device-request-mjpeg", QVariant(dev_request.request_mjpeg ? 1 : 0).toString());
- _settings->endGroup();
-
- // Open device
- open(devices, dev_request);
-}
-
-void main_window::preferences_fullscreen()
-{
- if (!_fullscreen_dialog)
- _fullscreen_dialog = new fullscreen_dialog(this);
- _fullscreen_dialog->show();
- _fullscreen_dialog->raise();
- _fullscreen_dialog->activateWindow();
-}
-
-void main_window::preferences_colors()
-{
- if (!_color_dialog)
- {
- _color_dialog = new color_dialog(this);
- }
- _color_dialog->show();
- _color_dialog->raise();
- _color_dialog->activateWindow();
-}
-
-void main_window::preferences_crosstalk()
-{
- if (!_crosstalk_dialog)
- {
- _crosstalk_dialog = new crosstalk_dialog(this);
- }
- _crosstalk_dialog->show();
- _crosstalk_dialog->raise();
- _crosstalk_dialog->activateWindow();
-}
-
-void main_window::preferences_quality()
-{
- if (!_quality_dialog)
- {
- _quality_dialog = new quality_dialog(this);
- }
- _quality_dialog->show();
- _quality_dialog->raise();
- _quality_dialog->activateWindow();
-}
-
-void main_window::preferences_zoom()
-{
- if (!_zoom_dialog)
- {
- _zoom_dialog = new zoom_dialog(this);
- }
- _zoom_dialog->show();
- _zoom_dialog->raise();
- _zoom_dialog->activateWindow();
-}
-
-void main_window::preferences_audio()
-{
- if (!_audio_dialog)
- {
- _audio_dialog = new audio_dialog(this);
- }
- _audio_dialog->show();
- _audio_dialog->raise();
- _audio_dialog->activateWindow();
-}
-
-void main_window::preferences_subtitle()
-{
- if (!_subtitle_dialog)
- {
- _subtitle_dialog = new subtitle_dialog(this);
- }
- _subtitle_dialog->show();
- _subtitle_dialog->raise();
- _subtitle_dialog->activateWindow();
-}
-
-void main_window::preferences_video()
-{
- if (!_video_dialog)
- {
- _video_dialog = new video_dialog(this);
- }
- _video_dialog->show();
- _video_dialog->raise();
- _video_dialog->activateWindow();
-}
-
-void main_window::preferences_sdi_output()
-{
-#if HAVE_LIBXNVCTRL
- if (!_sdi_output_dialog)
- {
- _sdi_output_dialog = new sdi_output_dialog(this);
- }
- _sdi_output_dialog->show();
- _sdi_output_dialog->raise();
- _sdi_output_dialog->activateWindow();
-#endif // HAVE_LIBXNVCTRL
-}
-
-void main_window::help_manual()
-{
- QUrl manual_url;
-#if defined(Q_OS_WIN)
- manual_url = QUrl::fromLocalFile(QCoreApplication::applicationDirPath() + "/../doc/bino.html");
-#elif defined(Q_OS_MAC)
- manual_url = QUrl::fromLocalFile(QCoreApplication::applicationDirPath() + "/../Resources/Bino Help/bino.html");
-#else
- manual_url = QUrl::fromLocalFile(HTMLDIR "/bino.html");
-#endif
- if (!QDesktopServices::openUrl(manual_url))
- {
- QMessageBox::critical(this, _("Error"), _("Cannot open manual."));
- }
-}
-
-void main_window::help_website()
-{
- if (!QDesktopServices::openUrl(QUrl(PACKAGE_URL)))
- {
- QMessageBox::critical(this, _("Error"), _("Cannot open website."));
- }
-}
-
-void main_window::help_keyboard()
-{
- static QMessageBox* msgbox = NULL;
- if (!msgbox) {
- msgbox = new QMessageBox(QMessageBox::Information, _("Keyboard Shortcuts"),
- // A list of keyboard shortcuts. Keep the translatable strings in sync with
- // the --help output in main.cpp, to reduce the burden for translators.
- QString("") + _("Keyboard control:") + " "
- "<table>"
- "<tr><td>q, " + _("ESC") + "</td><td>" + _("Stop") + "</td></tr>"
- "<tr><td>p / " + _("SPACE") + "</td><td>" + _("Pause / unpause") + "</td></tr>"
- "<tr><td>f</td><td>" + _("Toggle fullscreen") + "</td></tr>"
- "<tr><td>c</td><td>" + _("Center window") + "</td></tr>"
- "<tr><td>e / F7</td><td>" + _("Swap left/right eye") + "</td></tr>"
- "<tr><td>v</td><td>" + _("Cycle through available video streams") + "</td></tr>"
- "<tr><td>a</td><td>" + _("Cycle through available audio streams") + "</td></tr>"
- "<tr><td>s</td><td>" + _("Cycle through available subtitle streams") + "</td></tr>"
- "<tr><td>1, 2</td><td>" + _("Adjust contrast") + "</td></tr>"
- "<tr><td>3, 4</td><td>" + _("Adjust brightness") + "</td></tr>"
- "<tr><td>5, 6</td><td>" + _("Adjust hue") + "</td></tr>"
- "<tr><td>7, 8</td><td>" + _("Adjust saturation") + "</td></tr>"
- "<tr><td>[, ]</td><td>" + _("Adjust parallax") + "</td></tr>"
- "<tr><td>(, )</td><td>" + _("Adjust ghostbusting") + "</td></tr>"
- "<tr><td>&lt;, &gt;</td><td>" + _("Adjust zoom for wide videos") + "</td></tr>"
- "<tr><td>/, *</td><td>" + _("Adjust audio volume") + "</td></tr>"
- "<tr><td>m</td><td>" + _("Toggle audio mute") + "</td></tr>"
- "<tr><td>.</td><td>" + _("Step a single video frame forward") + "</td></tr>"
- "<tr><td>" + _("left, right") + "</td><td>" + _("Seek 10 seconds backward / forward") + "</td></tr>"
- "<tr><td>" + _("down, up") + "</td><td>" + _("Seek 1 minute backward / forward") + "</td></tr>"
- "<tr><td>" + _("page down, page up") + "</td><td>" + _("Seek 10 minutes backward / forward") + "</td></tr>"
- "<tr><td>" + _("Media keys") + "</td><td>" + _("Media keys should work as expected") + "</td></tr>"
- "</table>"
- "", QMessageBox::Ok, this);
- msgbox->setModal(false);
- }
- msgbox->show();
- msgbox->raise();
- msgbox->activateWindow();
-}
-
-void main_window::help_about()
-{
- static QDialog* dialog = NULL;
-
- if (!dialog) {
- dialog = new QDialog(this);
- dialog->setWindowTitle(str::asprintf(_("About %s"), PACKAGE_NAME).c_str());
-
- QLabel* logo = new QLabel();
- logo->setPixmap(QPixmap(":logo/bino_logo.png").scaledToHeight(128, Qt::SmoothTransformation));
- QLabel* spacer = new QLabel();
- spacer->setMinimumWidth(16);
- QLabel* title = new QLabel(str::asprintf(_("The %s 3D video player"), PACKAGE_NAME).c_str());
-
- QTextBrowser* about_text = new QTextBrowser(this);
- about_text->setOpenExternalLinks(true);
- about_text->setText(str::asprintf(_(
- "%s version %s."
- "Copyright (C) 2014 the Bino developers."
- "This is free software. You may redistribute copies of it "
- "under the terms of the <a href=\"http://www.gnu.org/licenses/gpl.html\">"
- "GNU General Public License</a>. "
- "There is NO WARRANTY, to the extent permitted by law."
- "See <a href=\"%s\">%s</a> for more information on this software."),
- PACKAGE_NAME, VERSION, PACKAGE_URL, PACKAGE_URL).c_str());
-
- QTextBrowser* libs_text = new QTextBrowser(this);
- libs_text->setOpenExternalLinks(true);
- libs_text->setWordWrapMode(QTextOption::NoWrap);
- QString libs_blurb = QString(str::asprintf("%s<ul><li>%s</li></ul>", _("Platform:"), PLATFORM).c_str());
- libs_blurb += QString("") + QString(_("Libraries used:"));
- std::vector<std::string> libs = lib_versions(true);
- for (size_t i = 0; i < libs.size(); i++)
- libs_blurb += libs[i].c_str();
- libs_blurb += QString("");
- libs_text->setText(libs_blurb);
-
- QTextBrowser* team_text = new QTextBrowser(this);
- team_text->setOpenExternalLinks(false);
- team_text->setWordWrapMode(QTextOption::NoWrap);
- QFile team_file(":AUTHORS");
- team_file.open(QIODevice::ReadOnly | QIODevice::Text);
- team_text->setText(QTextCodec::codecForName("UTF-8")->toUnicode(team_file.readAll()));
-
- QTextBrowser* license_text = new QTextBrowser(this);
- license_text->setOpenExternalLinks(false);
- license_text->setWordWrapMode(QTextOption::NoWrap);
- QFile license_file(":LICENSE");
- license_file.open(QIODevice::ReadOnly | QIODevice::Text);
- license_text->setText(license_file.readAll());
-
- QTabWidget* tab_widget = new QTabWidget();
- tab_widget->addTab(about_text, _("About"));
- tab_widget->addTab(libs_text, _("Libraries"));
- tab_widget->addTab(team_text, _("Team"));
- tab_widget->addTab(license_text, _("License"));
-
- QPushButton* ok_btn = new QPushButton(_("OK"));
- connect(ok_btn, SIGNAL(clicked()), dialog, SLOT(accept()));
-
- QGridLayout* layout = new QGridLayout();
- layout->addWidget(logo, 0, 0);
- layout->addWidget(spacer, 0, 1);
- layout->addWidget(title, 0, 2, 1, 2);
- layout->addWidget(spacer, 0, 4);
- layout->addWidget(tab_widget, 1, 0, 1, 5);
- layout->addWidget(ok_btn, 2, 3, 1, 2);
- layout->setColumnStretch(1, 1);
- layout->setColumnStretch(4, 1);
- layout->setRowStretch(1, 1);
- dialog->setLayout(layout);
- about_text->setMinimumWidth(384);
- }
-
- dialog->show();
- dialog->raise();
- dialog->activateWindow();
-}
-
 gui::gui()
 {
 QCoreApplication::setOrganizationName(PACKAGE_NAME);

bino-1.6.1.tar.xz/src/gui.h -> bino-1.6.5.tar.xz/src/gui.h Changed

@@ -28,453 +28,11 @@
 
 #include "config.h"
 
-#include <QMainWindow>
-#include <QWidget>
-#include <QDialog>
-
-#include "dispatch.h"
-
-class QLabel;
-class QComboBox;
-class QPushButton;
-class QDoubleSpinBox;
-class QSpinBox;
-class QCheckBox;
-class QFontComboBox;
 class QSettings;
-class QGroupBox;
-class QSlider;
-class QRadioButton;
-class QLineEdit;
-class QStackedWidget;
-class QTimer;
-
-class video_container_widget;
-
-class in_out_widget : public QWidget, public controller
-{
- Q_OBJECT
-
-private:
- QSettings *_settings;
- QComboBox *_video_combobox;
- QComboBox *_audio_combobox;
- QComboBox *_subtitle_combobox;
- QComboBox *_input_combobox;
- QComboBox *_output_combobox;
- QCheckBox *_swap_checkbox;
- bool _lock;
-
- void set_stereo_layout(parameters::stereo_layout_t stereo_layout, bool stereo_layout_swap);
- void set_stereo_mode(parameters::stereo_mode_t stereo_mode, bool stereo_mode_swap);
-
-private slots:
- void video_changed();
- void audio_changed();
- void subtitle_changed();
- void input_changed();
- void output_changed();
- void swap_changed();
-
-public:
- in_out_widget(QSettings *settings, QWidget *parent);
-
- void update();
-
- int get_video_stream();
- int get_audio_stream();
- int get_subtitle_stream();
- void get_stereo_layout(parameters::stereo_layout_t &stereo_layout, bool &stereo_layout_swap);
- void get_stereo_mode(parameters::stereo_mode_t &stereo_mode, bool &stereo_mode_swap);
-
- virtual void receive_notification(const notification &note);
-};
-
-class controls_widget : public QWidget, public controller
-{
- Q_OBJECT
-
-private:
- int64_t _input_duration;
- bool _lock;
- QSettings *_settings;
- QPushButton *_play_button;
- QPushButton *_pause_button;
- QPushButton *_stop_button;
- QPushButton *_loop_button;
- QPushButton *_fullscreen_button;
- QPushButton *_center_button;
- QPushButton *_bbb_button;
- QPushButton *_bb_button;
- QPushButton *_b_button;
- QPushButton *_f_button;
- QPushButton *_ff_button;
- QPushButton *_fff_button;
- QSlider *_seek_slider;
- QLabel *_pos_label;
- QPushButton *_audio_mute_button;
- QSlider *_audio_volume_slider;
-
-private:
- void update_audio_widgets();
-
-private slots:
- void play_clicked();
- void pause_clicked();
- void stop_clicked();
- void loop_clicked();
- void fullscreen_clicked();
- void center_clicked();
- void bbb_clicked();
- void bb_clicked();
- void b_clicked();
- void f_clicked();
- void ff_clicked();
- void fff_clicked();
- void seek_slider_changed();
- void audio_mute_clicked();
- void audio_volume_slider_changed();
-
-public:
- controls_widget(QSettings *settings, QWidget *parent);
-
- void update();
- virtual void receive_notification(const notification &note);
-};
-
-class fullscreen_dialog : public QDialog, public controller
-{
- Q_OBJECT
-
-private:
- QRadioButton* _single_btn;
- QComboBox* _single_box;
- QRadioButton* _dual_btn;
- QComboBox* _dual_box0;
- QComboBox* _dual_box1;
- QRadioButton* _multi_btn;
- QLineEdit* _multi_edt;
- QCheckBox* _flip_left_box;
- QCheckBox* _flop_left_box;
- QCheckBox* _flip_right_box;
- QCheckBox* _flop_right_box;
- QCheckBox* _3d_ready_sync_box;
- QCheckBox* _inhibit_screensaver_box;
-
-public:
- fullscreen_dialog(QWidget* parent);
- void closeEvent(QCloseEvent* e);
-};
-
-class color_dialog : public QDialog, public controller
-{
- Q_OBJECT
-
-private:
- bool _lock;
- QDoubleSpinBox *_c_spinbox;
- QSlider *_c_slider;
- QDoubleSpinBox *_b_spinbox;
- QSlider *_b_slider;
- QDoubleSpinBox *_h_spinbox;
- QSlider *_h_slider;
- QDoubleSpinBox *_s_spinbox;
- QSlider *_s_slider;
-
-private slots:
- void c_slider_changed(int val);
- void c_spinbox_changed(double val);
- void b_slider_changed(int val);
- void b_spinbox_changed(double val);
- void h_slider_changed(int val);
- void h_spinbox_changed(double val);
- void s_slider_changed(int val);
- void s_spinbox_changed(double val);
-
-public:
- color_dialog(QWidget *parent);
-
- virtual void receive_notification(const notification &note);
-};
-
-class crosstalk_dialog : public QDialog, public controller
-{
- Q_OBJECT
-
-private:
- bool _lock;
- QDoubleSpinBox *_r_spinbox;
- QDoubleSpinBox *_g_spinbox;
- QDoubleSpinBox *_b_spinbox;
-
-private slots:
- void spinbox_changed();
-
-public:
- crosstalk_dialog(QWidget *parent);
-
- virtual void receive_notification(const notification &note);
-};
-
-class quality_dialog : public QDialog, public controller
-{
- Q_OBJECT
 
-private:
- bool _lock;
- QSpinBox *_q_spinbox;
- QSlider *_q_slider;
-
-private slots:
- void q_slider_changed(int val);
- void q_spinbox_changed(int val);
-
-public:
- quality_dialog(QWidget *parent);
+#include "mainwindow.h"
 
- virtual void receive_notification(const notification &note);
-};
-
-class zoom_dialog : public QDialog, public controller
-{
- Q_OBJECT
-
-private:
- bool _lock;
- QDoubleSpinBox *_z_spinbox;
- QSlider *_z_slider;
-
-private slots:
- void z_slider_changed(int val);
- void z_spinbox_changed(double val);
-
-public:
- zoom_dialog(QWidget *parent);
-
- virtual void receive_notification(const notification &note);
-};
-
-class audio_dialog : public QDialog, public controller
-{
- Q_OBJECT
-
-private:
- bool _lock;
- QComboBox *_device_combobox;
- QSpinBox *_delay_spinbox;
-
-private slots:
- void device_changed();
- void delay_changed();
-
-public:
- audio_dialog(QWidget *parent);
-
- virtual void receive_notification(const notification &note);
-};
-
-class subtitle_dialog: public QDialog, public controller
-{
- Q_OBJECT
-
-private:
- bool _lock;
- QCheckBox *_encoding_checkbox;
- QComboBox *_encoding_combobox;
- QCheckBox *_font_checkbox;
- QFontComboBox *_font_combobox;
- QCheckBox *_size_checkbox;
- QSpinBox *_size_spinbox;
- QCheckBox *_scale_checkbox;
- QDoubleSpinBox *_scale_spinbox;
- QCheckBox *_color_checkbox;
- QPushButton *_color_button;
- QCheckBox *_shadow_checkbox;
- QComboBox *_shadow_combobox;
- QColor _color;
-
- QList<QTextCodec *> find_codecs();
- void set_color_button(uint32_t c);
-
-private slots:
- void color_button_clicked();
- void encoding_changed();
- void font_changed();
- void size_changed();
- void scale_changed();
- void color_changed();
- void shadow_changed();
-
-public:
- subtitle_dialog(QWidget *parent);
-
- virtual void receive_notification(const notification &note);
-};
-
-class video_dialog : public QDialog, public controller
-{
- Q_OBJECT
-
-private:
- bool _lock;
- QComboBox *_crop_ar_combobox;
- QComboBox *_source_ar_combobox;
- QDoubleSpinBox *_p_spinbox;
- QSlider *_p_slider;
- QDoubleSpinBox *_sp_spinbox;
- QSlider *_sp_slider;
- QDoubleSpinBox *_g_spinbox;
- 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);
- void sp_spinbox_changed(double val);
- void g_slider_changed(int val);
- void g_spinbox_changed(double val);
-
-public:
- video_dialog(QWidget *parent);
- void update();
-
- virtual void receive_notification(const notification &note);
-};
-
-class sdi_output_dialog : public QDialog, public controller
-{
- Q_OBJECT
-
-private:
- bool _lock;
- QComboBox *_sdi_output_format_combobox;
- QComboBox *_sdi_output_left_stereo_mode_combobox;
- QComboBox *_sdi_output_right_stereo_mode_combobox;
-
- void set_sdi_output_format(int val);
- void set_sdi_output_left_stereo_mode(parameters::stereo_mode_t stereo_mode);
- void set_sdi_output_right_stereo_mode(parameters::stereo_mode_t stereo_mode);
-
-private slots:
- void sdi_output_format_changed(int val);
- void sdi_output_left_stereo_mode_changed(int val);
- void sdi_output_right_stereo_mode_changed(int val);
-
-public:
- sdi_output_dialog(QWidget *parent);
- void update();
-
- virtual void receive_notification(const notification &note);
-};
-
-class open_device_dialog : public QDialog
-{
- Q_OBJECT
-
-private:
- QComboBox *_type_combobox;
- QStackedWidget *_device_chooser_stack[2];
- QComboBox *_default_device_combobox[2];
- QComboBox *_firewire_device_combobox[2];
- QLineEdit *_x11_device_field[2];
- QCheckBox *_second_device_checkbox;
- QGroupBox *_frame_size_groupbox;
- QSpinBox *_frame_width_spinbox;
- QSpinBox *_frame_height_spinbox;
- QGroupBox *_frame_rate_groupbox;
- QSpinBox *_frame_rate_num_spinbox;
- QSpinBox *_frame_rate_den_spinbox;
- QCheckBox *_mjpeg_checkbox;
-
-private slots:
- void frame_size_groupbox_clicked(bool checked);
- void frame_rate_groupbox_clicked(bool checked);
-
-public:
- open_device_dialog(const QStringList &default_devices, const QStringList &firewire_devices,
- const QStringList &last_devices, const device_request &dev_request, QWidget *parent);
- void request(QStringList &devices, device_request &dev_request);
-};
-
-class main_window : public QMainWindow, public controller
-{
- Q_OBJECT
-
-private:
- QSettings *_settings;
- video_container_widget *_video_container_widget;
- in_out_widget *_in_out_widget;
- controls_widget *_controls_widget;
- fullscreen_dialog *_fullscreen_dialog;
- color_dialog *_color_dialog;
- crosstalk_dialog *_crosstalk_dialog;
- quality_dialog *_quality_dialog;
- zoom_dialog *_zoom_dialog;
- audio_dialog *_audio_dialog;
- subtitle_dialog *_subtitle_dialog;
- video_dialog *_video_dialog;
-#if HAVE_LIBXNVCTRL
- sdi_output_dialog *_sdi_output_dialog;
-#endif // HAVE_LIBXNVCTRL
- QTimer *_timer;
- std::vector<std::string> _now_playing;
-
- int _max_recent_files;
- QList<QAction *> _recent_file_actions;
- QAction *_recent_files_separator;
- QAction *_clear_recent_separator;
- QAction *_clear_recent_files_act;
-
- void update_recent_file_actions();
- QString stripped_name(const QStringList & filenames);
-
-private slots:
- void playloop_step();
- void file_open();
- void file_open_urls();
- void file_open_device();
- void preferences_fullscreen();
- void preferences_colors();
- void preferences_crosstalk();
- void preferences_quality();
- void preferences_zoom();
- void preferences_audio();
- void preferences_subtitle();
- void preferences_video();
- void preferences_sdi_output();
- void help_manual();
- void help_website();
- void help_keyboard();
- void help_about();
-
- void open_recent_file();
- void clear_recent_files();
-
-protected:
- void dragEnterEvent(QDragEnterEvent *event);
- void dropEvent(QDropEvent *event);
- void moveEvent(QMoveEvent* event);
- void closeEvent(QCloseEvent *event);
- bool eventFilter(QObject *obj, QEvent *event);
-
-public:
- main_window(QSettings *settings);
- virtual ~main_window();
-
- void open(QStringList urls, const device_request &dev_request = device_request(),
- const parameters& initial_params = parameters());
- video_container_widget* container_widget()
- {
- return _video_container_widget;
- }
-
- virtual void receive_notification(const notification &note);
-};
+class video_container_widget;
 
 class gui
 {

bino-1.6.5.tar.xz/src/gui_common.h Added

bino-1.6.5.tar.xz/src/inoutwidget.cpp Added

@@ -0,0 +1,633 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <QGridLayout>
+#include <QLabel>
+#include <QComboBox>
+#include <QSettings>
+#include <QCheckBox>
+#include <QStandardItemModel>
+
+#include "inoutwidget.h"
+
+#include "gui_common.h"
+#include "media_input.h"
+#include "video_output.h"
+
+in_out_widget::in_out_widget(QSettings *settings, QWidget *parent) :
+ QWidget(parent), _settings(settings), _lock(false)
+{
+ QGridLayout *layout0 = new QGridLayout;
+ QLabel *video_label = new QLabel(_("Video:"));
+ video_label->setToolTip(_("Select the video stream."));
+ layout0->addWidget(video_label, 0, 0);
+ _video_combobox = new QComboBox(this);
+ _video_combobox->setToolTip(video_label->toolTip());
+ connect(_video_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(video_changed()));
+ layout0->addWidget(_video_combobox, 0, 1);
+ QLabel *audio_label = new QLabel(_("Audio:"));
+ audio_label->setToolTip(_("Select the audio stream."));
+ layout0->addWidget(audio_label, 0, 2);
+ _audio_combobox = new QComboBox(this);
+ _audio_combobox->setToolTip(audio_label->toolTip());
+ connect(_audio_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(audio_changed()));
+ layout0->addWidget(_audio_combobox, 0, 3);
+ QLabel *subtitle_label = new QLabel(_("Subtitle:"));
+ subtitle_label->setToolTip(_("Select the subtitle stream."));
+ layout0->addWidget(subtitle_label, 0, 4);
+ _subtitle_combobox = new QComboBox(this);
+ _subtitle_combobox->setToolTip(subtitle_label->toolTip());
+ connect(_subtitle_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(subtitle_changed()));
+ layout0->addWidget(_subtitle_combobox, 0, 5);
+ layout0->setColumnStretch(1, 1);
+ layout0->setColumnStretch(3, 1);
+ layout0->setColumnStretch(5, 1);
+
+ QGridLayout *layout1 = new QGridLayout;
+ QLabel *input_label = new QLabel(_("Input:"));
+ input_label->setToolTip(_("Set the 3D layout of the video stream."));
+ layout1->addWidget(input_label, 0, 0);
+ _input_combobox = new QComboBox(this);
+ _input_combobox->setToolTip(input_label->toolTip());
+ _input_combobox->addItem(QIcon(":icons-local/input-layout-mono.png"), _("2D"));
+ _input_combobox->addItem(QIcon(":icons-local/input-layout-separate-left-right.png"), _("Separate streams, left first"));
+ _input_combobox->addItem(QIcon(":icons-local/input-layout-separate-right-left.png"), _("Separate streams, right first"));
+ _input_combobox->addItem(QIcon(":icons-local/input-layout-alternating-left-right.png"), _("Alternating, left first"));
+ _input_combobox->addItem(QIcon(":icons-local/input-layout-alternating-right-left.png"), _("Alternating, right first"));
+ _input_combobox->addItem(QIcon(":icons-local/input-layout-top-bottom.png"), _("Top/bottom"));
+ _input_combobox->addItem(QIcon(":icons-local/input-layout-top-bottom-half.png"), _("Top/bottom, half height"));
+ _input_combobox->addItem(QIcon(":icons-local/input-layout-bottom-top.png"), _("Bottom/top"));
+ _input_combobox->addItem(QIcon(":icons-local/input-layout-bottom-top-half.png"), _("Bottom/top, half height"));
+ _input_combobox->addItem(QIcon(":icons-local/input-layout-left-right.png"), _("Left/right"));
+ _input_combobox->addItem(QIcon(":icons-local/input-layout-left-right-half.png"), _("Left/right, half width"));
+ _input_combobox->addItem(QIcon(":icons-local/input-layout-right-left.png"), _("Right/left"));
+ _input_combobox->addItem(QIcon(":icons-local/input-layout-right-left-half.png"), _("Right/left, half width"));
+ _input_combobox->addItem(QIcon(":icons-local/input-layout-even-odd-rows.png"), _("Even/odd rows"));
+ _input_combobox->addItem(QIcon(":icons-local/input-layout-odd-even-rows.png"), _("Odd/even rows"));
+ connect(_input_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(input_changed()));
+ layout1->addWidget(_input_combobox, 0, 1);
+ layout1->setColumnStretch(1, 1);
+
+ QGridLayout *layout2 = new QGridLayout;
+ QLabel *output_label = new QLabel(_("Output:"));
+ output_label->setToolTip(_("Set the 3D output type for your display."));
+ layout2->addWidget(output_label, 0, 0);
+ _output_combobox = new QComboBox(this);
+ _output_combobox->setToolTip(output_label->toolTip());
+ _output_combobox->addItem(QIcon(":icons-local/output-type-mono-left.png"), _("Left view"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-mono-right.png"), _("Right view"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-stereo.png"), _("OpenGL stereo"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-alternating.png"), _("Left/right alternating"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-top-bottom.png"), _("Top/bottom"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-top-bottom-half.png"), _("Top/bottom, half height"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-left-right.png"), _("Left/right"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-left-right-half.png"), _("Left/right, half width"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-even-odd-rows.png"), _("Even/odd rows"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-even-odd-columns.png"), _("Even/odd columns"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-checkerboard.png"), _("Checkerboard pattern"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-hdmi-frame-pack.png"), _("HDMI frame packing mode"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, monochrome"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, half color"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, full color"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, Dubois"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, monochrome"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, half color"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, full color"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, Dubois"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, monochrome"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, half color"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, full color"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, Dubois"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-red-green.png"), _("Red/green glasses, monochrome"));
+ _output_combobox->addItem(QIcon(":icons-local/output-type-red-blue.png"), _("Red/blue glasses, monochrome"));
+ connect(_output_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(output_changed()));
+ layout2->addWidget(_output_combobox, 0, 1);
+ layout2->setColumnStretch(1, 1);
+ _swap_checkbox = new QCheckBox(_("Swap left/right"));
+ _swap_checkbox->setToolTip(_("Swap the left and right view. "
+ "Use this if the 3D effect seems wrong."));
+ connect(_swap_checkbox, SIGNAL(stateChanged(int)), this, SLOT(swap_changed()));
+ layout2->addWidget(_swap_checkbox, 0, 2);
+
+ QGridLayout *layout = new QGridLayout;
+ layout->addLayout(layout0, 0, 0);
+ layout->addLayout(layout1, 1, 0);
+ layout->addLayout(layout2, 2, 0);
+ setLayout(layout);
+
+ // Align the labels
+ int minw = input_label->minimumSizeHint().width();
+ if (output_label->minimumSizeHint().width() > minw)
+ {
+ minw = output_label->minimumSizeHint().width();
+ }
+ if (video_label->minimumSizeHint().width() > minw)
+ {
+ minw = video_label->minimumSizeHint().width();
+ }
+ if (audio_label->minimumSizeHint().width() > minw)
+ {
+ minw = audio_label->minimumSizeHint().width();
+ }
+ if (subtitle_label->minimumSizeHint().width() > minw)
+ {
+ minw = subtitle_label->minimumSizeHint().width();
+ }
+ input_label->setMinimumSize(QSize(minw, input_label->minimumSizeHint().height()));
+ output_label->setMinimumSize(QSize(minw, output_label->minimumSizeHint().height()));
+ video_label->setMinimumSize(QSize(minw, video_label->minimumSizeHint().height()));
+ audio_label->setMinimumSize(QSize(minw, audio_label->minimumSizeHint().height()));
+ subtitle_label->setMinimumSize(QSize(minw, subtitle_label->minimumSizeHint().height()));
+
+ _video_combobox->setEnabled(false);
+ _audio_combobox->setEnabled(false);
+ _subtitle_combobox->setEnabled(false);
+ _input_combobox->setEnabled(false);
+ _output_combobox->setEnabled(false);
+ _swap_checkbox->setEnabled(false);
+
+ update();
+}
+
+void in_out_widget::set_stereo_layout(parameters::stereo_layout_t stereo_layout, bool stereo_layout_swap)
+{
+ switch (stereo_layout)
+ {
+ case parameters::layout_mono:
+ _input_combobox->setCurrentIndex(0);
+ break;
+ case parameters::layout_separate:
+ _input_combobox->setCurrentIndex(stereo_layout_swap ? 2 : 1);
+ break;
+ case parameters::layout_alternating:
+ _input_combobox->setCurrentIndex(stereo_layout_swap ? 4 : 3);
+ break;
+ case parameters::layout_top_bottom:
+ _input_combobox->setCurrentIndex(stereo_layout_swap ? 7 : 5);
+ break;
+ case parameters::layout_top_bottom_half:
+ _input_combobox->setCurrentIndex(stereo_layout_swap ? 8 : 6);
+ break;
+ case parameters::layout_left_right:
+ _input_combobox->setCurrentIndex(stereo_layout_swap ? 11: 9);
+ break;
+ case parameters::layout_left_right_half:
+ _input_combobox->setCurrentIndex(stereo_layout_swap ? 12 : 10);
+ break;
+ case parameters::layout_even_odd_rows:
+ _input_combobox->setCurrentIndex(stereo_layout_swap ? 14 : 13);
+ break;
+ }
+ _video_combobox->setEnabled(stereo_layout != parameters::layout_separate);
+}
+
+void in_out_widget::set_stereo_mode(parameters::stereo_mode_t stereo_mode, bool stereo_mode_swap)
+{
+ switch (stereo_mode)
+ {
+ default:
+ case parameters::mode_mono_left:
+ _output_combobox->setCurrentIndex(0);
+ break;
+ case parameters::mode_mono_right:
+ _output_combobox->setCurrentIndex(1);
+ break;
+ case parameters::mode_stereo:
+ _output_combobox->setCurrentIndex(2);
+ break;
+ case parameters::mode_alternating:
+ _output_combobox->setCurrentIndex(3);
+ break;
+ case parameters::mode_top_bottom:
+ _output_combobox->setCurrentIndex(4);
+ break;
+ case parameters::mode_top_bottom_half:
+ _output_combobox->setCurrentIndex(5);
+ break;
+ case parameters::mode_left_right:
+ _output_combobox->setCurrentIndex(6);
+ break;
+ case parameters::mode_left_right_half:
+ _output_combobox->setCurrentIndex(7);
+ break;
+ case parameters::mode_even_odd_rows:
+ _output_combobox->setCurrentIndex(8);
+ break;
+ case parameters::mode_even_odd_columns:
+ _output_combobox->setCurrentIndex(9);
+ break;
+ case parameters::mode_checkerboard:
+ _output_combobox->setCurrentIndex(10);
+ break;
+ case parameters::mode_hdmi_frame_pack:
+ _output_combobox->setCurrentIndex(11);
+ break;
+ case parameters::mode_red_cyan_monochrome:
+ _output_combobox->setCurrentIndex(12);
+ break;
+ case parameters::mode_red_cyan_half_color:
+ _output_combobox->setCurrentIndex(13);
+ break;
+ case parameters::mode_red_cyan_full_color:
+ _output_combobox->setCurrentIndex(14);
+ break;
+ case parameters::mode_red_cyan_dubois:
+ _output_combobox->setCurrentIndex(15);
+ break;
+ case parameters::mode_green_magenta_monochrome:
+ _output_combobox->setCurrentIndex(16);
+ break;
+ case parameters::mode_green_magenta_half_color:
+ _output_combobox->setCurrentIndex(17);
+ break;
+ case parameters::mode_green_magenta_full_color:
+ _output_combobox->setCurrentIndex(18);
+ break;
+ case parameters::mode_green_magenta_dubois:
+ _output_combobox->setCurrentIndex(19);
+ break;
+ case parameters::mode_amber_blue_monochrome:
+ _output_combobox->setCurrentIndex(20);
+ break;
+ case parameters::mode_amber_blue_half_color:
+ _output_combobox->setCurrentIndex(21);
+ break;
+ case parameters::mode_amber_blue_full_color:
+ _output_combobox->setCurrentIndex(22);
+ break;
+ case parameters::mode_amber_blue_dubois:
+ _output_combobox->setCurrentIndex(23);
+ break;
+ case parameters::mode_red_green_monochrome:
+ _output_combobox->setCurrentIndex(24);
+ break;
+ case parameters::mode_red_blue_monochrome:
+ _output_combobox->setCurrentIndex(25);
+ break;
+ }
+ _swap_checkbox->setChecked(stereo_mode_swap);
+}
+
+void in_out_widget::video_changed()
+{
+ if (!_lock)
+ {
+ parameters::stereo_layout_t stereo_layout;
+ bool stereo_layout_swap;
+ get_stereo_layout(stereo_layout, stereo_layout_swap);
+ send_cmd(command::set_video_stream, _video_combobox->currentIndex());
+ }
+}
+
+void in_out_widget::audio_changed()
+{
+ if (!_lock)
+ {
+ send_cmd(command::set_audio_stream, _audio_combobox->currentIndex());
+ }
+}
+
+void in_out_widget::subtitle_changed()
+{
+ if (!_lock)
+ {
+ send_cmd(command::set_subtitle_stream, _subtitle_combobox->currentIndex() - 1);
+ }
+}
+
+void in_out_widget::input_changed()
+{
+ if (!_lock)
+ {
+ parameters::stereo_layout_t stereo_layout;
+ bool stereo_layout_swap;
+ get_stereo_layout(stereo_layout, stereo_layout_swap);
+ if (stereo_layout == parameters::layout_separate)
+ {
+ _lock = true;
+ _video_combobox->setCurrentIndex(0);
+ _video_combobox->setEnabled(false);
+ _lock = false;
+ }
+ else
+ {
+ _video_combobox->setEnabled(true);
+ }
+ send_cmd(command::set_stereo_layout, static_cast<int>(stereo_layout));
+ send_cmd(command::set_stereo_layout_swap, stereo_layout_swap);
+ parameters::stereo_mode_t stereo_mode;
+ bool stereo_mode_swap;
+ get_stereo_mode(stereo_mode, stereo_mode_swap);
+ if (stereo_layout == parameters::layout_mono
+ && !(stereo_mode == parameters::mode_mono_left || stereo_mode == parameters::mode_mono_right))
+ {
+ QString s = _settings->value("Session/2d-stereo-mode", "").toString();
+ parameters::stereo_mode_from_string(s.toStdString(), stereo_mode, stereo_mode_swap);
+ _lock = true;
+ set_stereo_mode(stereo_mode, stereo_mode_swap);
+ _lock = false;
+ }
+ else if (stereo_layout != parameters::layout_mono
+ && (stereo_mode == parameters::mode_mono_left || stereo_mode == parameters::mode_mono_right))
+ {
+ QString s = _settings->value("Session/3d-stereo-mode", "").toString();
+ parameters::stereo_mode_from_string(s.toStdString(), stereo_mode, stereo_mode_swap);
+ _lock = true;
+ set_stereo_mode(stereo_mode, stereo_mode_swap);
+ _lock = false;
+ }
+ }
+}
+
+void in_out_widget::output_changed()
+{
+ if (!_lock)
+ {
+ parameters::stereo_mode_t stereo_mode;
+ bool stereo_mode_swap;
+ get_stereo_mode(stereo_mode, stereo_mode_swap);
+ send_cmd(command::set_stereo_mode, static_cast<int>(stereo_mode));
+ send_cmd(command::set_stereo_mode_swap, stereo_mode_swap);
+ }
+}
+
+void in_out_widget::swap_changed()
+{
+ if (!_lock)
+ {
+ send_cmd(command::toggle_stereo_mode_swap);
+ }
+}
+
+void in_out_widget::update()
+{
+ const media_input *mi = dispatch::media_input();
+ _lock = true;
+ _video_combobox->setEnabled(mi);
+ _audio_combobox->setEnabled(mi);
+ _subtitle_combobox->setEnabled(mi);
+ _input_combobox->setEnabled(mi);
+ _output_combobox->setEnabled(mi);
+ _swap_checkbox->setEnabled(mi);
+ _video_combobox->clear();
+ _audio_combobox->clear();
+ _subtitle_combobox->clear();
+ if (mi)
+ {
+ for (int i = 0; i < mi->video_streams(); i++)
+ {
+ _video_combobox->addItem(mi->video_stream_name(i).c_str());
+ }
+ for (int i = 0; i < mi->audio_streams(); i++)
+ {
+ _audio_combobox->addItem(mi->audio_stream_name(i).c_str());
+ }
+ _subtitle_combobox->addItem(_("Off"));
+ for (int i = 0; i < mi->subtitle_streams(); i++)
+ {
+ _subtitle_combobox->addItem(mi->subtitle_stream_name(i).c_str());
+ }
+ _video_combobox->setCurrentIndex(dispatch::parameters().video_stream());
+ _audio_combobox->setCurrentIndex(dispatch::parameters().audio_stream());
+ _subtitle_combobox->setCurrentIndex(dispatch::parameters().subtitle_stream() + 1);
+ // Disable unsupported input modes
+ for (int i = 0; i < _input_combobox->count(); i++)
+ {
+ _input_combobox->setCurrentIndex(i);
+ parameters::stereo_layout_t layout;
+ bool swap;
+ get_stereo_layout(layout, swap);
+ qobject_cast<QStandardItemModel *>(_input_combobox->model())->item(i)->setEnabled(
+ mi->stereo_layout_is_supported(layout, swap));
+ }
+ // Disable unsupported output modes
+ if (!dispatch::video_output() || !dispatch::video_output()->supports_stereo())
+ {
+ set_stereo_mode(parameters::mode_stereo, false);
+ qobject_cast<QStandardItemModel *>(_output_combobox->model())->item(_output_combobox->currentIndex())->setEnabled(false);
+ }
+ set_stereo_layout(dispatch::parameters().stereo_layout(), dispatch::parameters().stereo_layout_swap());
+ set_stereo_mode(dispatch::parameters().stereo_mode(), dispatch::parameters().stereo_mode_swap());
+ }
+ _lock = false;
+}
+
+int in_out_widget::get_video_stream()
+{
+ return _video_combobox->currentIndex();
+}
+
+int in_out_widget::get_audio_stream()
+{
+ return _audio_combobox->currentIndex();
+}
+
+int in_out_widget::get_subtitle_stream()
+{
+ return _subtitle_combobox->currentIndex() - 1;
+}
+
+void in_out_widget::get_stereo_layout(parameters::stereo_layout_t &stereo_layout, bool &stereo_layout_swap)
+{
+ switch (_input_combobox->currentIndex())
+ {
+ case 0:
+ stereo_layout = parameters::layout_mono;
+ stereo_layout_swap = false;
+ break;
+ case 1:
+ stereo_layout = parameters::layout_separate;
+ stereo_layout_swap = false;
+ break;
+ case 2:
+ stereo_layout = parameters::layout_separate;
+ stereo_layout_swap = true;
+ break;
+ case 3:
+ stereo_layout = parameters::layout_alternating;
+ stereo_layout_swap = false;
+ break;
+ case 4:
+ stereo_layout = parameters::layout_alternating;
+ stereo_layout_swap = true;
+ break;
+ case 5:
+ stereo_layout = parameters::layout_top_bottom;
+ stereo_layout_swap = false;
+ break;
+ case 6:
+ stereo_layout = parameters::layout_top_bottom_half;
+ stereo_layout_swap = false;
+ break;
+ case 7:
+ stereo_layout = parameters::layout_top_bottom;
+ stereo_layout_swap = true;
+ break;
+ case 8:
+ stereo_layout = parameters::layout_top_bottom_half;
+ stereo_layout_swap = true;
+ break;
+ case 9:
+ stereo_layout = parameters::layout_left_right;
+ stereo_layout_swap = false;
+ break;
+ case 10:
+ stereo_layout = parameters::layout_left_right_half;
+ stereo_layout_swap = false;
+ break;
+ case 11:
+ stereo_layout = parameters::layout_left_right;
+ stereo_layout_swap = true;
+ break;
+ case 12:
+ stereo_layout = parameters::layout_left_right_half;
+ stereo_layout_swap = true;
+ break;
+ case 13:
+ stereo_layout = parameters::layout_even_odd_rows;
+ stereo_layout_swap = false;
+ break;
+ case 14:
+ stereo_layout = parameters::layout_even_odd_rows;
+ stereo_layout_swap = true;
+ break;
+ }
+}
+
+void in_out_widget::get_stereo_mode(parameters::stereo_mode_t &stereo_mode, bool &stereo_mode_swap)
+{
+ switch (_output_combobox->currentIndex())
+ {
+ case 0:
+ stereo_mode = parameters::mode_mono_left;
+ break;
+ case 1:
+ stereo_mode = parameters::mode_mono_right;
+ break;
+ case 2:
+ stereo_mode = parameters::mode_stereo;
+ break;
+ case 3:
+ stereo_mode = parameters::mode_alternating;
+ break;
+ case 4:
+ stereo_mode = parameters::mode_top_bottom;
+ break;
+ case 5:
+ stereo_mode = parameters::mode_top_bottom_half;
+ break;
+ case 6:
+ stereo_mode = parameters::mode_left_right;
+ break;
+ case 7:
+ stereo_mode = parameters::mode_left_right_half;
+ break;
+ case 8:
+ stereo_mode = parameters::mode_even_odd_rows;
+ break;
+ case 9:
+ stereo_mode = parameters::mode_even_odd_columns;
+ break;
+ case 10:
+ stereo_mode = parameters::mode_checkerboard;
+ break;
+ case 11:
+ stereo_mode = parameters::mode_hdmi_frame_pack;
+ break;
+ case 12:
+ stereo_mode = parameters::mode_red_cyan_monochrome;
+ break;
+ case 13:
+ stereo_mode = parameters::mode_red_cyan_half_color;
+ break;
+ case 14:
+ stereo_mode = parameters::mode_red_cyan_full_color;
+ break;
+ case 15:
+ stereo_mode = parameters::mode_red_cyan_dubois;
+ break;
+ case 16:
+ stereo_mode = parameters::mode_green_magenta_monochrome;
+ break;
+ case 17:
+ stereo_mode = parameters::mode_green_magenta_half_color;
+ break;
+ case 18:
+ stereo_mode = parameters::mode_green_magenta_full_color;
+ break;
+ case 19:
+ stereo_mode = parameters::mode_green_magenta_dubois;
+ break;
+ case 20:
+ stereo_mode = parameters::mode_amber_blue_monochrome;
+ break;
+ case 21:
+ stereo_mode = parameters::mode_amber_blue_half_color;
+ break;
+ case 22:
+ stereo_mode = parameters::mode_amber_blue_full_color;
+ break;
+ case 23:
+ stereo_mode = parameters::mode_amber_blue_dubois;
+ break;
+ case 24:
+ stereo_mode = parameters::mode_red_green_monochrome;
+ break;
+ case 25:
+ stereo_mode = parameters::mode_red_blue_monochrome;
+ break;
+ }
+ stereo_mode_swap = _swap_checkbox->isChecked();
+}
+
+void in_out_widget::receive_notification(const notification &note)
+{
+ _lock = true;
+ switch (note.type)
+ {
+ case notification::open:
+ case notification::play:
+ update();
+ break;
+ case notification::video_stream:
+ _video_combobox->setCurrentIndex(dispatch::parameters().video_stream());
+ break;
+ case notification::audio_stream:
+ _audio_combobox->setCurrentIndex(dispatch::parameters().audio_stream());
+ break;
+ case notification::subtitle_stream:
+ _subtitle_combobox->setCurrentIndex(dispatch::parameters().subtitle_stream() + 1);
+ break;
+ case notification::stereo_mode_swap:
+ _swap_checkbox->setChecked(dispatch::parameters().stereo_mode_swap());
+ break;
+ default:
+ break;
+ }
+ _lock = false;
+}

bino-1.6.5.tar.xz/src/inoutwidget.h Added

@@ -0,0 +1,78 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef INOUTWIDGET_H
+#define INOUTWIDGET_H
+
+#include "config.h"
+
+#include <QWidget>
+
+#include "dispatch.h"
+
+class QSettings;
+class QComboBox;
+class QCheckBox;
+
+class in_out_widget : public QWidget, public controller
+{
+ Q_OBJECT
+
+private:
+ QSettings *_settings;
+ QComboBox *_video_combobox;
+ QComboBox *_audio_combobox;
+ QComboBox *_subtitle_combobox;
+ QComboBox *_input_combobox;
+ QComboBox *_output_combobox;
+ QCheckBox *_swap_checkbox;
+ bool _lock;
+
+ void set_stereo_layout(parameters::stereo_layout_t stereo_layout, bool stereo_layout_swap);
+ void set_stereo_mode(parameters::stereo_mode_t stereo_mode, bool stereo_mode_swap);
+
+private slots:
+ void video_changed();
+ void audio_changed();
+ void subtitle_changed();
+ void input_changed();
+ void output_changed();
+ void swap_changed();
+
+public:
+ in_out_widget(QSettings *settings, QWidget *parent);
+
+ void update();
+
+ int get_video_stream();
+ int get_audio_stream();
+ int get_subtitle_stream();
+ void get_stereo_layout(parameters::stereo_layout_t &stereo_layout, bool &stereo_layout_swap);
+ void get_stereo_mode(parameters::stereo_mode_t &stereo_mode, bool &stereo_mode_swap);
+
+ virtual void receive_notification(const notification &note);
+};
+
+#endif

bino-1.6.1.tar.xz/src/lib_versions.cpp -> bino-1.6.5.tar.xz/src/lib_versions.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010-2011
+ * Copyright (C) 2010, 2011, 2015, 2016
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -47,10 +47,10 @@
 # include <eq/eq.h>
 #endif
 
-#include "gettext.h"
-#define _(string) gettext(string)
+#include "base/str.h"
 
-#include "str.h"
+#include "base/gettext.h"
+#define _(string) gettext(string)
 
 
 static std::vector<std::string> ffmpeg_v;
@@ -59,7 +59,7 @@
 static std::vector<std::string> opengl_v;
 static std::vector<std::string> glew_v;
 static std::vector<std::string> equalizer_v;
-static std::vector<std::string> lircclient_v;
+static std::vector<std::string> lirc_v;
 static std::vector<std::string> qt_v;
 
 static void ffmpeg_versions()
@@ -185,14 +185,14 @@
 }
 }
 
-static void lircclient_versions()
+static void lirc_versions()
 {
- if (lircclient_v.size() == 0)
+ if (lirc_v.size() == 0)
 {
-#if HAVE_LIBLIRCCLIENT
- lircclient_v.push_back(LIBLIRCCLIENT_PKGCONFIG_VERSION);
+#if HAVE_LIRC
+ lirc_v.push_back(LIRC_PKGCONFIG_VERSION);
 #else
- lircclient_v.push_back(_("not used"));
+ lirc_v.push_back(_("not used"));
 #endif
 }
 }
@@ -213,7 +213,7 @@
 opengl_versions();
 glew_versions();
 equalizer_versions();
- lircclient_versions();
+ lirc_versions();
 qt_versions();
 
 std::vector<std::string> v;
@@ -256,10 +256,10 @@
 v.push_back(std::string(" ") + equalizer_v[i]);
 }
 v.push_back("</li>");
- v.push_back("<li><a href=\"http://www.lirc.org/\">LIRC Client</a>");
- for (size_t i = 0; i < lircclient_v.size(); i++)
+ v.push_back("<li><a href=\"http://www.lirc.org/\">LIRC</a>");
+ for (size_t i = 0; i < lirc_v.size(); i++)
 {
- v.push_back(std::string(" ") + lircclient_v[i]);
+ v.push_back(std::string(" ") + lirc_v[i]);
 }
 v.push_back("</li>");
 v.push_back("<li><a href=\"http://qt.nokia.com/\">Qt</a>");
@@ -302,10 +302,10 @@
 {
 v.push_back(std::string(" ") + equalizer_v[i]);
 }
- v.push_back("LIRC Client:");
- for (size_t i = 0; i < lircclient_v.size(); i++)
+ v.push_back("LIRC:");
+ for (size_t i = 0; i < lirc_v.size(); i++)
 {
- v.push_back(std::string(" ") + lircclient_v[i]);
+ v.push_back(std::string(" ") + lirc_v[i]);
 }
 v.push_back("Qt:");
 for (size_t i = 0; i < qt_v.size(); i++)

bino-1.6.1.tar.xz/src/lirc.cpp -> bino-1.6.5.tar.xz/src/lirc.cpp Changed

bino-1.6.1.tar.xz/src/main.cpp -> bino-1.6.5.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, 2014
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016
 * Martin Lambers <marlam@marlam.de>
 * Stefan Eilemann <eile@eyescale.ch>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
@@ -39,18 +39,22 @@
 # include <mach-o/dyld.h> // for _NSGetExecutablePath()
 #endif
 
+#if HAVE_LIBXNVCTRL
+# include <NVCtrl/NVCtrl.h>
+#endif // HAVE_LIBXNVCTRL
+
 #include <QCoreApplication>
 #include <QApplication>
 #include <QtGlobal>
 #include <QTextCodec>
 
-#include "gettext.h"
-#define _(string) gettext(string)
+#include "base/dbg.h"
+#include "base/msg.h"
+#include "base/str.h"
+#include "base/opt.h"
 
-#include "dbg.h"
-#include "msg.h"
-#include "str.h"
-#include "opt.h"
+#include "base/gettext.h"
+#define _(string) gettext(string)
 
 #include "dispatch.h"
 #include "audio_output.h"
@@ -58,15 +62,11 @@
 # include "player_equalizer.h"
 #endif
 #include "command_file.h"
-#if HAVE_LIBLIRCCLIENT
+#if HAVE_LIRC
 # include "lirc.h"
 #endif
 #include "lib_versions.h"
 
-#if HAVE_LIBXNVCTRL
-#include "NVCtrl.h"
-#endif // HAVE_LIBXNVCTRL
-
 
 /* Return the directory containing our locale data (translated messages). */
 static const char *localedir()
@@ -165,12 +165,12 @@
 }
 
 // Handle a log file that may be set via the --log-file option; see below
-static FILE *logf = NULL;
+static FILE *logfile = NULL;
 static void close_log_file(void)
 {
- if (logf)
+ if (logfile)
 {
- (void)std::fclose(logf);
+ (void)std::fclose(logfile);
 }
 }
 
@@ -396,14 +396,14 @@
 }
 if (!log_file.value().empty())
 {
- logf = std::fopen(log_file.value().c_str(), "a");
- if (!logf)
+ logfile = std::fopen(log_file.value().c_str(), "a");
+ if (!logfile)
 {
 msg::err(_("%s: %s"), log_file.value().c_str(), std::strerror(errno));
 return 1;
 }
 std::atexit(close_log_file);
- msg::set_file(logf);
+ msg::set_file(logfile);
 msg::set_columns(80);
 }
 
@@ -412,7 +412,7 @@
 if (msg::file() == stderr)
 msg::set_file(stdout);
 msg::req(_("%s version %s"), PACKAGE_NAME, VERSION);
- msg::req(4, _("Copyright (C) 2014 the Bino developers."));
+ msg::req(4, _("Copyright (C) 2016 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."));
@@ -558,6 +558,7 @@
 }
 if (version.value() || help.value())
 {
+ delete qt_app;
 return 0;
 }
 
@@ -774,7 +775,7 @@
 command_files.push_back(new command_file(read_commands.values()[i]));
 command_files[i]->init();
 }
-#if HAVE_LIBLIRCCLIENT
+#if HAVE_LIRC
 lircclient lirc(PACKAGE, lirc_config.values());
 try {
 lirc.init();
@@ -797,7 +798,7 @@
 } else {
 QApplication::exec();
 }
-#if HAVE_LIBLIRCCLIENT
+#if HAVE_LIRC
 lirc.deinit();
 #endif
 global_dispatch.deinit();

bino-1.6.5.tar.xz/src/mainwindow.cpp Added

@@ -0,0 +1,1013 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <limits>
+#include <cmath>
+#include <unistd.h>
+
+#include <QCoreApplication>
+#include <QApplication>
+#include <QMainWindow>
+#include <QGridLayout>
+#include <QCloseEvent>
+#include <QMenu>
+#include <QMenuBar>
+#include <QAction>
+#include <QGridLayout>
+#include <QLineEdit>
+#include <QLabel>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QComboBox>
+#include <QTimer>
+#include <QFile>
+#include <QByteArray>
+#include <QCryptographicHash>
+#include <QUrl>
+#include <QDesktopServices>
+#include <QDoubleSpinBox>
+#include <QSpinBox>
+#include <QCheckBox>
+#include <QFontComboBox>
+#include <QStandardItemModel>
+#include <QTextBrowser>
+#include <QTabWidget>
+#include <QList>
+#include <QTextCodec>
+#include <QRegExp>
+#include <QMap>
+#include <QColorDialog>
+#include <QDesktopWidget>
+#include <QRadioButton>
+#include <QRegExpValidator>
+#include <QSettings>
+#include <QGroupBox>
+#include <QStackedWidget>
+#include <QMimeData>
+
+#include "mainwindow.h"
+
+#include "inoutwidget.h"
+#include "controlswidget.h"
+#include "preferences.h"
+#include "opendevicedialog.h"
+
+#include "lib_versions.h"
+#include "audio_output.h"
+#include "media_input.h"
+#include "video_output_qt.h"
+
+#include "base/dbg.h"
+#include "base/msg.h"
+#include "base/str.h"
+
+#include "base/gettext.h"
+// Qt requires strings from gettext to be in UTF-8 encoding.
+#define _(string) (str::convert(gettext(string), str::localcharset(), "UTF-8").c_str())
+
+#if HAVE_LIBXNVCTRL
+# include <NVCtrl/NVCtrl.h>
+# include "NvSDIutils.h"
+#endif // HAVE_LIBXNVCTRL
+
+// for autoconf < 2.65:
+#ifndef PACKAGE_URL
+# define PACKAGE_URL "http://bino3d.org"
+#endif
+
+main_window::main_window(QSettings *settings) :
+ _settings(settings),
+ _preferences_dialog(NULL),
+ _max_recent_files(5)
+{
+ // Application properties
+ setWindowTitle(PACKAGE_NAME);
+ setWindowIcon(QIcon(":logo/64x64/bino.png"));
+
+ // Load preferences
+ QString saved_session_params = _settings->value("Session/parameters", QString("")).toString();
+ if (!saved_session_params.isEmpty())
+ {
+ parameters session_params;
+ session_params.load_session_parameters(saved_session_params.toStdString());
+ if (!dispatch::parameters().audio_device_is_set() && !session_params.audio_device_is_default())
+ send_cmd(command::set_audio_device, session_params.audio_device());
+ if (!dispatch::parameters().audio_delay_is_set() && !session_params.audio_delay_is_default())
+ send_cmd(command::set_audio_delay, session_params.audio_delay());
+ if (!dispatch::parameters().quality_is_set() && !session_params.quality_is_default())
+ send_cmd(command::set_quality, session_params.quality());
+ if (!dispatch::parameters().contrast_is_set() && !session_params.contrast_is_default())
+ send_cmd(command::set_contrast, session_params.contrast());
+ if (!dispatch::parameters().brightness_is_set() && !session_params.brightness_is_default())
+ send_cmd(command::set_brightness, session_params.brightness());
+ if (!dispatch::parameters().hue_is_set() && !session_params.hue_is_default())
+ send_cmd(command::set_hue, session_params.hue());
+ if (!dispatch::parameters().saturation_is_set() && !session_params.saturation_is_default())
+ send_cmd(command::set_saturation, session_params.saturation());
+ if (!dispatch::parameters().crosstalk_r_is_set()
+ && !dispatch::parameters().crosstalk_g_is_set()
+ && !dispatch::parameters().crosstalk_b_is_set()
+ && !(session_params.crosstalk_r_is_default()
+ && session_params.crosstalk_g_is_default()
+ && session_params.crosstalk_b_is_default())) {
+ std::ostringstream v;
+ s11n::save(v, session_params.crosstalk_r());
+ s11n::save(v, session_params.crosstalk_g());
+ s11n::save(v, session_params.crosstalk_b());
+ send_cmd(command::set_crosstalk, v.str());
+ }
+ if (!dispatch::parameters().subtitle_encoding_is_set() && !session_params.subtitle_encoding_is_default()) {
+ std::ostringstream v;
+ s11n::save(v, session_params.subtitle_encoding());
+ send_cmd(command::set_subtitle_encoding, v.str());
+ }
+ if (!dispatch::parameters().subtitle_font_is_set() && !session_params.subtitle_font_is_default()) {
+ std::ostringstream v;
+ s11n::save(v, session_params.subtitle_font());
+ send_cmd(command::set_subtitle_font, v.str());
+ }
+ if (!dispatch::parameters().subtitle_size_is_set() && !session_params.subtitle_size_is_default())
+ send_cmd(command::set_subtitle_size, session_params.subtitle_size());
+ if (!dispatch::parameters().subtitle_scale_is_set() && !session_params.subtitle_scale_is_default())
+ send_cmd(command::set_subtitle_scale, session_params.subtitle_scale());
+ if (!dispatch::parameters().subtitle_color_is_set() && !session_params.subtitle_color_is_default())
+ send_cmd(command::set_subtitle_color, session_params.subtitle_color());
+ if (!dispatch::parameters().fullscreen_screens_is_set() && !session_params.fullscreen_screens_is_default())
+ send_cmd(command::set_fullscreen_screens, session_params.fullscreen_screens());
+ if (!dispatch::parameters().fullscreen_flip_left_is_set() && !session_params.fullscreen_flip_left_is_default())
+ send_cmd(command::set_fullscreen_flip_left, session_params.fullscreen_flip_left());
+ if (!dispatch::parameters().fullscreen_flop_left_is_set() && !session_params.fullscreen_flop_left_is_default())
+ send_cmd(command::set_fullscreen_flop_left, session_params.fullscreen_flop_left());
+ if (!dispatch::parameters().fullscreen_flip_right_is_set() && !session_params.fullscreen_flip_right_is_default())
+ send_cmd(command::set_fullscreen_flip_right, session_params.fullscreen_flip_right());
+ if (!dispatch::parameters().fullscreen_flop_right_is_set() && !session_params.fullscreen_flop_right_is_default())
+ send_cmd(command::set_fullscreen_flop_right, session_params.fullscreen_flop_right());
+ if (!dispatch::parameters().fullscreen_inhibit_screensaver_is_set() && !session_params.fullscreen_inhibit_screensaver_is_default())
+ send_cmd(command::set_fullscreen_inhibit_screensaver, session_params.fullscreen_inhibit_screensaver());
+ if (!dispatch::parameters().fullscreen_3d_ready_sync_is_set() && !session_params.fullscreen_3d_ready_sync_is_default())
+ send_cmd(command::set_fullscreen_3d_ready_sync, session_params.fullscreen_3d_ready_sync());
+ if (!dispatch::parameters().zoom_is_set() && !session_params.zoom_is_default())
+ send_cmd(command::set_zoom, session_params.zoom());
+#if HAVE_LIBXNVCTRL
+ if (!dispatch::parameters().sdi_output_format_is_set() && !session_params.sdi_output_format_is_default())
+ send_cmd(command::set_sdi_output_format, session_params.sdi_output_format());
+ if (!dispatch::parameters().sdi_output_left_stereo_mode_is_set() && !session_params.sdi_output_left_stereo_mode_is_default())
+ send_cmd(command::set_sdi_output_left_stereo_mode, session_params.sdi_output_left_stereo_mode());
+ if (!dispatch::parameters().sdi_output_right_stereo_mode_is_set() && !session_params.sdi_output_right_stereo_mode_is_default())
+ send_cmd(command::set_sdi_output_right_stereo_mode, session_params.sdi_output_right_stereo_mode());
+#endif // HAVE_LIBXNVCTRL
+ }
+ else
+ {
+ // This code block is only for compatibility with Bino <= 1.2.x:
+ _settings->beginGroup("Session");
+ if (!dispatch::parameters().audio_device_is_set() && _settings->contains("audio-device"))
+ {
+ send_cmd(command::set_audio_device, _settings->value("audio-device").toInt());
+ _settings->remove("audio-device");
+ }
+ if (!dispatch::parameters().audio_delay_is_set() && _settings->contains("audio-delay"))
+ {
+ send_cmd(command::set_audio_delay, static_cast<int64_t>(_settings->value("audio-delay").toLongLong()));
+ _settings->remove("audio-delay");
+ }
+ if (!dispatch::parameters().contrast_is_set() && _settings->contains("contrast"))
+ {
+ send_cmd(command::set_contrast, _settings->value("contrast").toFloat());
+ _settings->remove("contrast");
+ }
+ if (!dispatch::parameters().brightness_is_set() && _settings->contains("brightness"))
+ {
+ send_cmd(command::set_brightness, _settings->value("brightness").toFloat());
+ _settings->remove("brightness");
+ }
+ if (!dispatch::parameters().hue_is_set() && _settings->contains("hue"))
+ {
+ send_cmd(command::set_hue, _settings->value("hue").toFloat());
+ _settings->remove("hue");
+ }
+ if (!dispatch::parameters().saturation_is_set() && _settings->contains("saturation"))
+ {
+ send_cmd(command::set_saturation, _settings->value("saturation").toFloat());
+ _settings->remove("saturation");
+ }
+ if (!dispatch::parameters().crosstalk_r_is_set()
+ && !dispatch::parameters().crosstalk_g_is_set()
+ && !dispatch::parameters().crosstalk_b_is_set()
+ && _settings->contains("crosstalk_r")
+ && _settings->contains("crosstalk_g")
+ && _settings->contains("crosstalk_b"))
+ {
+ std::ostringstream v;
+ s11n::save(v, _settings->value("crosstalk_r").toFloat());
+ s11n::save(v, _settings->value("crosstalk_g").toFloat());
+ s11n::save(v, _settings->value("crosstalk_b").toFloat());
+ send_cmd(command::set_crosstalk, v.str());
+ _settings->remove("crosstalk_r");
+ _settings->remove("crosstalk_g");
+ _settings->remove("crosstalk_b");
+ }
+ if (!dispatch::parameters().fullscreen_screens_is_set() && _settings->contains("fullscreen-screens"))
+ {
+ send_cmd(command::set_fullscreen_screens, _settings->value("fullscreen-screens").toInt());
+ _settings->remove("fullscreen-screens");
+ }
+ if (!dispatch::parameters().fullscreen_flip_left_is_set() && _settings->contains("fullscreen-flip-left"))
+ {
+ send_cmd(command::set_fullscreen_flip_left, _settings->value("fullscreen-flip-left").toInt());
+ _settings->remove("fullscreen-flip-left");
+ }
+ if (!dispatch::parameters().fullscreen_flop_left_is_set() && _settings->contains("fullscreen-flop-left"))
+ {
+ send_cmd(command::set_fullscreen_flop_left, _settings->value("fullscreen-flop-left").toInt());
+ _settings->remove("fullscreen-flop-left");
+ }
+ if (!dispatch::parameters().fullscreen_flip_right_is_set() && _settings->contains("fullscreen-flip-right"))
+ {
+ send_cmd(command::set_fullscreen_flip_right, _settings->value("fullscreen-flip-right").toInt());
+ _settings->remove("fullscreen-flip-right");
+ }
+ if (!dispatch::parameters().fullscreen_flop_right_is_set() && _settings->contains("fullscreen-flop-right"))
+ {
+ send_cmd(command::set_fullscreen_flop_right, _settings->value("fullscreen-flop-right").toInt());
+ _settings->remove("fullscreen-flop-right");
+ }
+ if (!dispatch::parameters().subtitle_encoding_is_set() && _settings->contains("subtitle-encoding"))
+ {
+ std::ostringstream v;
+ s11n::save(v, _settings->value("subtitle-encoding").toString().toStdString());
+ send_cmd(command::set_subtitle_encoding, v.str());
+ _settings->remove("subtitle-encoding");
+ }
+ if (!dispatch::parameters().subtitle_font_is_set() && _settings->contains("subtitle-font"))
+ {
+ std::ostringstream v;
+ s11n::save(v, _settings->value("subtitle-font").toString().toStdString());
+ send_cmd(command::set_subtitle_font, v.str());
+ _settings->remove("subtitle-font");
+ }
+ if (!dispatch::parameters().subtitle_size_is_set() && _settings->contains("subtitle-size"))
+ {
+ send_cmd(command::set_subtitle_size, _settings->value("subtitle-size").toInt());
+ _settings->remove("subtitle-size");
+ }
+ if (!dispatch::parameters().subtitle_scale_is_set() && _settings->contains("subtitle-scale"))
+ {
+ send_cmd(command::set_subtitle_scale, _settings->value("subtitle-scale").toFloat());
+ _settings->remove("subtitle-scale");
+ }
+ if (!dispatch::parameters().subtitle_color_is_set() && _settings->contains("subtitle-color"))
+ {
+ send_cmd(command::set_subtitle_color, static_cast<uint64_t>(_settings->value("subtitle-color").toULongLong()));
+ _settings->remove("subtitle-color");
+ }
+ if (!dispatch::parameters().zoom_is_set() && _settings->contains("zoom"))
+ {
+ send_cmd(command::set_zoom, _settings->value("zoom").toFloat());
+ _settings->remove("zoom");
+ }
+ _settings->endGroup();
+ }
+
+ // Central widget and timer
+ QWidget *central_widget = new QWidget(this);
+ QGridLayout *layout = new QGridLayout();
+ _video_container_widget = new video_container_widget(central_widget);
+ layout->addWidget(_video_container_widget, 0, 0);
+ _timer = new QTimer(this);
+ connect(_timer, SIGNAL(timeout()), this, SLOT(playloop_step()));
+ _in_out_widget = new in_out_widget(_settings, central_widget);
+ layout->addWidget(_in_out_widget, 1, 0);
+ _controls_widget = new controls_widget(_settings, central_widget);
+ layout->addWidget(_controls_widget, 2, 0);
+ layout->setRowStretch(0, 1);
+ layout->setColumnStretch(0, 1);
+ central_widget->setLayout(layout);
+ setCentralWidget(central_widget);
+
+ // Menus
+ QMenu *file_menu = menuBar()->addMenu(_("&File"));
+ QAction *file_open_act = new QAction(_("&Open file(s)..."), this);
+ file_open_act->setShortcut(QKeySequence::Open);
+ file_open_act->setIcon(get_icon("document-open"));
+ connect(file_open_act, SIGNAL(triggered()), this, SLOT(file_open()));
+ file_menu->addAction(file_open_act);
+ QAction *file_open_urls_act = new QAction(_("Open &URL(s)..."), this);
+ file_open_urls_act->setIcon(get_icon("document-open"));
+ connect(file_open_urls_act, SIGNAL(triggered()), this, SLOT(file_open_urls()));
+ file_menu->addAction(file_open_urls_act);
+ QAction *file_open_device_act = new QAction(_("Open &device(s)..."), this);
+ file_open_device_act->setIcon(get_icon("camera-web"));
+ connect(file_open_device_act, SIGNAL(triggered()), this, SLOT(file_open_device()));
+ file_menu->addAction(file_open_device_act);
+
+ _recent_files_separator = file_menu->addSeparator();
+
+ for (int i = 0; i < _max_recent_files; ++i) {
+ QAction * recent = new QAction(this);
+ recent->setVisible(false);
+ file_menu->addAction(recent);
+ connect(recent, SIGNAL(triggered()),
+ this, SLOT(open_recent_file()));
+ _recent_file_actions.append(recent);
+ }
+ _clear_recent_files_act = new QAction(_("&Clear recent files"), this);
+ connect(_clear_recent_files_act,SIGNAL(triggered()), this, SLOT(clear_recent_files()));
+
+ _clear_recent_separator = file_menu->addSeparator();
+ file_menu->addAction(_clear_recent_files_act);
+ update_recent_file_actions();
+
+ file_menu->addSeparator();
+ QAction *file_quit_act = new QAction(_("&Quit"), this);
+ 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()));
+ file_menu->addAction(file_quit_act);
+ QMenu *preferences_menu = menuBar()->addMenu(_("&Preferences"));
+ // note: whenever the preferences menu becomes a preferences panel, don't forget
+ // to preferences_act->setMenuRole(QAction::PreferencesRole) on the menu item
+ QAction *preferences_act = new QAction(_("&Settings..."), this);
+ connect(preferences_act, SIGNAL(triggered()), this, SLOT(preferences()));
+ preferences_menu->addAction(preferences_act);
+ QMenu *help_menu = menuBar()->addMenu(_("&Help"));
+ QAction *help_manual_act = new QAction(_("&Manual..."), this);
+ help_manual_act->setShortcut(QKeySequence::HelpContents);
+ help_manual_act->setIcon(get_icon("help-contents"));
+ connect(help_manual_act, SIGNAL(triggered()), this, SLOT(help_manual()));
+ help_menu->addAction(help_manual_act);
+ QAction *help_website_act = new QAction(_("&Website..."), this);
+ help_website_act->setIcon(get_icon("applications-internet"));
+ connect(help_website_act, SIGNAL(triggered()), this, SLOT(help_website()));
+ help_menu->addAction(help_website_act);
+ QAction *help_keyboard_act = new QAction(_("&Keyboard Shortcuts"), this);
+ help_keyboard_act->setIcon(get_icon("preferences-desktop-keyboard"));
+ connect(help_keyboard_act, SIGNAL(triggered()), this, SLOT(help_keyboard()));
+ help_menu->addAction(help_keyboard_act);
+ QAction *help_about_act = new QAction(_("&About"), this);
+ help_about_act->setMenuRole(QAction::AboutRole);
+ help_about_act->setIcon(get_icon("help-about"));
+ connect(help_about_act, SIGNAL(triggered()), this, SLOT(help_about()));
+ help_menu->addAction(help_about_act);
+
+ // Handle FileOpen events
+ QApplication::instance()->installEventFilter(this);
+ // Handle Drop events
+ setAcceptDrops(true);
+
+ // Restore Mainwindow state
+ _settings->beginGroup("Mainwindow");
+ restoreGeometry(_settings->value("geometry").toByteArray());
+ restoreState(_settings->value("windowstate").toByteArray());
+ _settings->endGroup();
+
+ // 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.
+ // This seems to be another X11 thing; maybe Wayland will solve this stuff...
+#ifdef Q_WS_X11
+ {
+ QComboBox* box = new QComboBox();
+ box->addItem("foo");
+ box->addItem("bar");
+ box->show();
+ box->showPopup();
+ box->close();
+ }
+#endif
+
+#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
+
+ // Show window. Must happen before opening initial files!
+ show();
+ raise();
+
+ // Start the event and play loop
+ _timer->start(0);
+}
+
+main_window::~main_window()
+{
+}
+
+void main_window::open_recent_file()
+{
+ QAction *action = qobject_cast<QAction *>(sender());
+ if (action)
+ open(action->data().toStringList());
+}
+
+void main_window::update_recent_file_actions()
+{
+ QVariantList files = _settings->value("Session/recent-files").toList();
+
+ int num_recent_files = qMin(files.size(), _max_recent_files);
+ bool have_recent_files = num_recent_files > 0;
+
+ for (int i = 0; i < num_recent_files; ++i) {
+ QStringList recentFilesEntry = files[i].toStringList();
+ QString text = QString("&%1 %2").arg(i + 1).arg(stripped_name(recentFilesEntry));
+ _recent_file_actions[i]->setText(text);
+ _recent_file_actions[i]->setData(recentFilesEntry);
+ _recent_file_actions[i]->setVisible(true);
+ }
+ for (int j = num_recent_files; j < _max_recent_files; ++j)
+ _recent_file_actions[j]->setVisible(false);
+
+ _recent_files_separator->setVisible(have_recent_files);
+ _clear_recent_separator->setVisible(have_recent_files);
+ _clear_recent_files_act->setVisible(have_recent_files);
+
+}
+
+void main_window::clear_recent_files()
+{
+ _settings->remove("Session/recent-files");
+ update_recent_file_actions();
+}
+
+QString main_window::stripped_name(const QStringList & filenames)
+{
+ QStringList stripped;
+ foreach(QString file, filenames) {
+ stripped.append(QFileInfo(file).fileName());
+ }
+ QString strippedNames = stripped.join(", ");
+ if(strippedNames.length() >= 50)
+ strippedNames = strippedNames.left(47).append("...");
+ return strippedNames;
+}
+
+static QString urls_hash(const std::vector<std::string>& urls)
+{
+ // Return SHA1 hash of the name of the current file as a hex string
+ QString name;
+ for (size_t i = 0; i < urls.size(); i++) {
+ if (i > 0)
+ name += QString("/"); // '/' can never be part of a file name
+ name += QFileInfo(QFile::decodeName(urls[i].c_str())).fileName();
+ }
+ QString hash = QCryptographicHash::hash(name.toUtf8(), QCryptographicHash::Sha1).toHex();
+ return hash;
+}
+
+void main_window::receive_notification(const notification &note)
+{
+ switch (note.type) {
+ case notification::quit:
+ _timer->stop();
+ QApplication::quit();
+ break;
+ case notification::play:
+ if (dispatch::playing()) {
+ // Force a size adjustment of the main window
+ adjustSize();
+ // Remember what we're playing
+ _now_playing.clear();
+ assert(dispatch::media_input());
+ for (size_t i = 0; i < dispatch::media_input()->urls(); i++) {
+ _now_playing.push_back(dispatch::media_input()->url(i));
+ }
+ } else {
+ // Remember the settings of this video
+ std::string video_parameters = dispatch::parameters().save_video_parameters();
+ if (!video_parameters.empty())
+ _settings->setValue("Video/" + urls_hash(_now_playing), QString::fromStdString(video_parameters));
+ // Remember the 2D or 3D video output mode.
+ _settings->setValue((dispatch::parameters().stereo_layout() == parameters::layout_mono
+ ? "Session/2d-stereo-mode" : "Session/3d-stereo-mode"),
+ QString::fromStdString(parameters::stereo_mode_to_string(
+ dispatch::parameters().stereo_mode(),
+ dispatch::parameters().stereo_mode_swap())));
+ }
+ break;
+ default:
+ break;
+ }
+}
+
+void main_window::dragEnterEvent(QDragEnterEvent *event)
+{
+ if (event->mimeData()->hasUrls())
+ {
+ event->acceptProposedAction();
+ }
+}
+
+void main_window::dropEvent(QDropEvent *event)
+{
+ if (event->mimeData()->hasUrls())
+ {
+ QList<QUrl> url_list = event->mimeData()->urls();
+ QStringList urls;
+ for (int i = 0; i < url_list.size(); i++)
+ {
+ if (url_list[i].toString().startsWith("file://", Qt::CaseInsensitive))
+ {
+ urls.append(url_list[i].toLocalFile());
+ }
+ else
+ {
+ urls.append(url_list[i].toString());
+ }
+ }
+ open(urls);
+ event->acceptProposedAction();
+ }
+}
+
+void main_window::moveEvent(QMoveEvent*)
+{
+ send_cmd(command::update_display_pos);
+}
+
+void main_window::closeEvent(QCloseEvent *event)
+{
+ // Close a currently opened video. This also stops the video if it is
+ // playing, so that its settings are remembered.
+ send_cmd(command::close);
+ // Stop the event and play loop
+ _timer->stop();
+ // Remember the Session preferences
+ _settings->setValue("Session/parameters", QString::fromStdString(dispatch::parameters().save_session_parameters()));
+ // Remember the Mainwindow state
+ _settings->beginGroup("Mainwindow");
+ _settings->setValue("geometry", saveGeometry());
+ _settings->setValue("windowState", saveState());
+ _settings->endGroup();
+
+ event->accept();
+}
+
+bool main_window::eventFilter(QObject *obj, QEvent *event)
+{
+ if (event->type() == QEvent::FileOpen)
+ {
+ open(QStringList(static_cast<QFileOpenEvent *>(event)->file()));
+ return true;
+ }
+ else
+ {
+ // pass the event on to the parent class
+ return QMainWindow::eventFilter(obj, event);
+ }
+}
+
+void main_window::playloop_step()
+{
+ try {
+ dispatch::step();
+ dispatch::process_all_events();
+ }
+ catch (std::exception& e) {
+ send_cmd(command::close);
+ QMessageBox::critical(this, "Error", e.what());
+ }
+}
+
+void main_window::open(QStringList filenames,
+ const device_request &dev_request,
+ const parameters& initial_params)
+{
+ try {
+ open_input_data input_data;
+ input_data.dev_request = dev_request;
+ for (int i = 0; i < filenames.size(); i++) {
+ input_data.urls.push_back(filenames[i].toLocal8Bit().constData());
+ }
+ // Get the settings for this video
+ QString saved_video_parameters = _settings->value("Video/" + urls_hash(input_data.urls), QString("")).toString();
+ if (!saved_video_parameters.isEmpty()) {
+ input_data.params.load_video_parameters(saved_video_parameters.toStdString());
+ } else {
+ // This code block is only for compatibility with Bino <= 1.2.x:
+ _settings->beginGroup("Video/" + urls_hash(input_data.urls));
+ if (_settings->contains("stereo-layout")) {
+ QString layout_name = _settings->value("stereo-layout").toString();
+ parameters::stereo_layout_t stereo_layout;
+ bool stereo_layout_swap;
+ parameters::stereo_layout_from_string(layout_name.toStdString(), stereo_layout, stereo_layout_swap);
+ input_data.params.set_stereo_layout(stereo_layout);
+ input_data.params.set_stereo_layout_swap(stereo_layout_swap);
+ _settings->remove("stereo-layout");
+ }
+ if (_settings->contains("video-stream")) {
+ input_data.params.set_video_stream(_settings->value("video-stream").toInt());
+ _settings->remove("video-stream");
+ }
+ if (_settings->contains("audio-stream")) {
+ input_data.params.set_audio_stream(_settings->value("audio-stream").toInt());
+ _settings->remove("audio-stream");
+ }
+ if (_settings->contains("subtitle-stream")) {
+ input_data.params.set_subtitle_stream(_settings->value("subtitle-stream").toInt());
+ _settings->remove("subtitle-stream");
+ }
+ if (_settings->contains("parallax")) {
+ input_data.params.set_parallax(_settings->value("parallax").toFloat());
+ _settings->remove("parallax");
+ }
+ if (_settings->contains("ghostbust")) {
+ input_data.params.set_ghostbust(_settings->value("ghostbust").toFloat());
+ _settings->remove("ghostbust");
+ }
+ if (_settings->contains("subtitle-parallax")) {
+ input_data.params.set_subtitle_parallax(_settings->value("subtitle-parallax").toFloat());
+ _settings->remove("subtitle-parallax");
+ }
+ _settings->endGroup();
+ }
+ // Allow the initial parameters to override our remembered per-video parameters.
+ // This is intended to be used to enforce command line parameters.
+ if (initial_params.video_stream_is_set())
+ input_data.params.set_video_stream(initial_params.video_stream());
+ if (initial_params.audio_stream_is_set())
+ input_data.params.set_audio_stream(initial_params.audio_stream());
+ if (initial_params.subtitle_stream_is_set())
+ input_data.params.set_subtitle_stream(initial_params.subtitle_stream());
+ if (initial_params.stereo_layout_is_set())
+ input_data.params.set_stereo_layout(initial_params.stereo_layout());
+ if (initial_params.stereo_layout_swap_is_set())
+ 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())
+ input_data.params.set_ghostbust(initial_params.ghostbust());
+ if (initial_params.subtitle_parallax_is_set())
+ input_data.params.set_subtitle_parallax(initial_params.subtitle_parallax());
+ // Now open the input data
+ std::ostringstream v;
+ s11n::save(v, input_data);
+ controller::send_cmd(command::open, v.str());
+ // Get stereo mode
+ bool mono = (dispatch::media_input()->video_frame_template().stereo_layout == parameters::layout_mono);
+ if (initial_params.stereo_mode_is_set()) {
+ send_cmd(command::set_stereo_mode, initial_params.stereo_mode());
+ send_cmd(command::set_stereo_mode_swap, initial_params.stereo_mode_swap());
+ } else if (_settings->contains(mono ? "Session/2d-stereo-mode" : "Session/3d-stereo-mode")) {
+ parameters::stereo_mode_t stereo_mode;
+ bool stereo_mode_swap;
+ QString mode_name = _settings->value(
+ mono ? "Session/2d-stereo-mode" : "Session/3d-stereo-mode").toString();
+ parameters::stereo_mode_from_string(mode_name.toStdString(), stereo_mode, stereo_mode_swap);
+ if (initial_params.stereo_mode_swap_is_set())
+ stereo_mode_swap = initial_params.stereo_mode_swap();
+ send_cmd(command::set_stereo_mode, stereo_mode);
+ send_cmd(command::set_stereo_mode_swap, stereo_mode_swap);
+ }
+ // Automatically start playing
+ send_cmd(command::toggle_play);
+ }
+ catch (std::exception& e) {
+ QMessageBox::critical(this, "Error", e.what());
+ }
+}
+
+void main_window::file_open()
+{
+ if (_settings->value("Session/show-multi-open-tip", true).toBool())
+ {
+ QDialog *dlg = new QDialog(this);
+ dlg->setModal(true);
+ dlg->setWindowTitle(_("Tip"));
+ QLabel *dlg_icon_label = new QLabel;
+ dlg_icon_label->setPixmap(get_icon("dialog-information").pixmap(48));
+ QLabel *dlg_tip_label = new QLabel(_("You can select and open multiple files at once."
+ "This is useful for example if you have extra subtitle files, "
+ "or if left and right view are stored in separate files."));
+ QCheckBox *dlg_checkbox = new QCheckBox(_("Do not show this message again."));
+ QPushButton *dlg_ok_button = new QPushButton(_("OK"));
+ connect(dlg_ok_button, SIGNAL(clicked()), dlg, SLOT(accept()));
+ QGridLayout *dlg_layout = new QGridLayout;
+ dlg_layout->addWidget(dlg_icon_label, 0, 0);
+ dlg_layout->addWidget(dlg_tip_label, 0, 1);
+ dlg_layout->addWidget(new QLabel, 1, 0, 1, 2);
+ dlg_layout->addWidget(dlg_checkbox, 2, 0, 1, 2, Qt::AlignHCenter);
+ dlg_layout->addWidget(dlg_ok_button, 3, 0, 1, 2, Qt::AlignHCenter);
+ dlg_layout->setColumnStretch(1, 1);
+ dlg_layout->setRowStretch(1, 1);
+ dlg->setLayout(dlg_layout);
+ dlg_ok_button->setFocus();
+ dlg->exec();
+ _settings->setValue("Session/show-multi-open-tip", !dlg_checkbox->isChecked());
+ }
+
+ QStringList file_names = QFileDialog::getOpenFileNames(this, _("Open files"),
+ _settings->value("Session/file-open-dir", QDir::currentPath()).toString());
+ if (file_names.empty())
+ {
+ return;
+ }
+
+ _settings->setValue("Session/file-open-dir", QFileInfo(file_names[0]).path());
+ open(file_names);
+
+ QVariantList files = _settings->value("Session/recent-files").toList();
+
+ files.removeAll(file_names);
+ files.prepend(file_names);
+
+ while (files.size() > _max_recent_files)
+ files.removeLast();
+ _settings->setValue("Session/recent-files", files);
+ update_recent_file_actions();
+}
+
+void main_window::file_open_urls()
+{
+ QDialog *url_dialog = new QDialog(this);
+ url_dialog->setWindowTitle(_("Open URL(s)"));
+ QLabel *url_label = new QLabel(_("URL(s):"));
+ url_label->setToolTip(_("Enter one or more space separated URLs."));
+ QLineEdit *url_edit = new QLineEdit("");
+ url_edit->setToolTip(url_label->toolTip());
+ url_edit->setMinimumWidth(256);
+ QPushButton *cancel_btn = new QPushButton(_("Cancel"));
+ QPushButton *ok_btn = new QPushButton(_("OK"));
+ ok_btn->setDefault(true);
+ connect(cancel_btn, SIGNAL(clicked()), url_dialog, SLOT(reject()));
+ connect(ok_btn, SIGNAL(clicked()), url_dialog, SLOT(accept()));
+ QGridLayout *layout = new QGridLayout();
+ layout->addWidget(url_label, 0, 0);
+ layout->addWidget(url_edit, 0, 1, 1, 3);
+ layout->addWidget(cancel_btn, 2, 2);
+ layout->addWidget(ok_btn, 2, 3);
+ layout->setColumnStretch(1, 1);
+ url_dialog->setLayout(layout);
+ url_dialog->exec();
+ if (url_dialog->result() == QDialog::Accepted
+ && !url_edit->text().isEmpty())
+ {
+ open(url_edit->text().split(" ", QString::SkipEmptyParts));
+ }
+}
+
+void main_window::file_open_device()
+{
+ // Gather list of available devices
+ QStringList default_devices;
+ QStringList firewire_devices;
+#ifdef Q_OS_WIN
+ // libavdevice supports devices "0" through "9" in the vfwcap driver on Windows.
+ // Simply list them all here since I don't know how to find out which are actually available.
+ for (int i = 0; i <= 9; i++)
+ {
+ default_devices << QString(QChar('0' + i));
+ }
+ firewire_devices << "/dev/video1394"; // TODO: this is definitely not correct
+#else
+ // video4linux2 devices dynamically create device files /dev/video0 - /dev/video63.
+ // TODO: does this also work on BSD and Mac OS?
+ for (int i = 0; i < 64; i++)
+ {
+ QString device = QString("/dev/video") + QString::number(i);
+ if (QFileInfo(device).exists())
+ {
+ default_devices << device;
+ }
+ }
+ if (default_devices.empty())
+ {
+ // add a fallback entry
+ default_devices << QString("/dev/video0");
+ }
+ firewire_devices << "/dev/video1394"; // TODO: this is probably not correct
+#endif
+
+ // Get saved settings
+ QStringList last_devices;
+ device_request dev_request;
+ _settings->beginGroup("Session");
+ last_devices = _settings->value("device-last").toStringList();
+ if (last_devices.empty() && _settings->contains("device-x11")) {
+ // For compatibility with Bino <= 1.3.2:
+ last_devices.push_back(_settings->value("device-x11").toString());
+ _settings->remove("device-x11");
+ }
+ QString saved_type = _settings->value("device-type", QString("default")).toString();
+ dev_request.device = (saved_type == "firewire" ? device_request::firewire
+ : saved_type == "x11" ? device_request::x11 : device_request::sys_default);
+ dev_request.width = _settings->value("device-request-frame-width", QString("0")).toInt();
+ dev_request.height = _settings->value("device-request-frame-height", QString("0")).toInt();
+ dev_request.frame_rate_num = _settings->value("device-request-frame-rate-num", QString("0")).toInt();
+ dev_request.frame_rate_den = _settings->value("device-request-frame-rate-den", QString("0")).toInt();
+ dev_request.request_mjpeg = _settings->value("device-request-mjpeg", QString("0")).toInt();
+ _settings->endGroup();
+
+ // Run dialog
+ open_device_dialog *dlg = new open_device_dialog(default_devices, firewire_devices, last_devices, dev_request, this);
+ dlg->exec();
+ if (dlg->result() != QDialog::Accepted)
+ {
+ return;
+ }
+ QStringList devices;
+ dlg->request(devices, dev_request);
+
+ // Save settings
+ _settings->beginGroup("Session");
+ _settings->setValue("device-last", devices);
+ _settings->setValue("device-type", QString(dev_request.device == device_request::firewire ? "firewire"
+ : dev_request.device == device_request::x11 ? "x11" : "default"));
+ _settings->setValue("device-request-frame-width", QVariant(dev_request.width).toString());
+ _settings->setValue("device-request-frame-height", QVariant(dev_request.height).toString());
+ _settings->setValue("device-request-frame-rate-num", QVariant(dev_request.frame_rate_num).toString());
+ _settings->setValue("device-request-frame-rate-den", QVariant(dev_request.frame_rate_den).toString());
+ _settings->setValue("device-request-mjpeg", QVariant(dev_request.request_mjpeg ? 1 : 0).toString());
+ _settings->endGroup();
+
+ // Open device
+ open(devices, dev_request);
+}
+
+void main_window::preferences()
+{
+ if (!_preferences_dialog)
+ _preferences_dialog = new preferences_dialog(this);
+ _preferences_dialog->show();
+ _preferences_dialog->raise();
+ _preferences_dialog->activateWindow();
+}
+
+void main_window::help_manual()
+{
+ QUrl manual_url;
+#if defined(Q_OS_WIN)
+ manual_url = QUrl::fromLocalFile(QCoreApplication::applicationDirPath() + "/../doc/bino.html");
+#elif defined(Q_OS_MAC)
+ manual_url = QUrl::fromLocalFile(QCoreApplication::applicationDirPath() + "/../Resources/Bino Help/bino.html");
+#else
+ manual_url = QUrl::fromLocalFile(HTMLDIR "/bino.html");
+#endif
+ if (!QDesktopServices::openUrl(manual_url))
+ {
+ QMessageBox::critical(this, _("Error"), _("Cannot open manual."));
+ }
+}
+
+void main_window::help_website()
+{
+ if (!QDesktopServices::openUrl(QUrl(PACKAGE_URL)))
+ {
+ QMessageBox::critical(this, _("Error"), _("Cannot open website."));
+ }
+}
+
+void main_window::help_keyboard()
+{
+ static QMessageBox* msgbox = NULL;
+ if (!msgbox) {
+ msgbox = new QMessageBox(QMessageBox::Information, _("Keyboard Shortcuts"),
+ // A list of keyboard shortcuts. Keep the translatable strings in sync with
+ // the --help output in main.cpp, to reduce the burden for translators.
+ QString("") + _("Keyboard control:") + " "
+ "<table>"
+ "<tr><td>q, " + _("ESC") + "</td><td>" + _("Stop") + "</td></tr>"
+ "<tr><td>p / " + _("SPACE") + "</td><td>" + _("Pause / unpause") + "</td></tr>"
+ "<tr><td>f</td><td>" + _("Toggle fullscreen") + "</td></tr>"
+ "<tr><td>c</td><td>" + _("Center window") + "</td></tr>"
+ "<tr><td>e / F7</td><td>" + _("Swap left/right eye") + "</td></tr>"
+ "<tr><td>v</td><td>" + _("Cycle through available video streams") + "</td></tr>"
+ "<tr><td>a</td><td>" + _("Cycle through available audio streams") + "</td></tr>"
+ "<tr><td>s</td><td>" + _("Cycle through available subtitle streams") + "</td></tr>"
+ "<tr><td>1, 2</td><td>" + _("Adjust contrast") + "</td></tr>"
+ "<tr><td>3, 4</td><td>" + _("Adjust brightness") + "</td></tr>"
+ "<tr><td>5, 6</td><td>" + _("Adjust hue") + "</td></tr>"
+ "<tr><td>7, 8</td><td>" + _("Adjust saturation") + "</td></tr>"
+ "<tr><td>[, ]</td><td>" + _("Adjust parallax") + "</td></tr>"
+ "<tr><td>(, )</td><td>" + _("Adjust ghostbusting") + "</td></tr>"
+ "<tr><td>&lt;, &gt;</td><td>" + _("Adjust zoom for wide videos") + "</td></tr>"
+ "<tr><td>/, *</td><td>" + _("Adjust audio volume") + "</td></tr>"
+ "<tr><td>m</td><td>" + _("Toggle audio mute") + "</td></tr>"
+ "<tr><td>.</td><td>" + _("Step a single video frame forward") + "</td></tr>"
+ "<tr><td>" + _("left, right") + "</td><td>" + _("Seek 10 seconds backward / forward") + "</td></tr>"
+ "<tr><td>" + _("down, up") + "</td><td>" + _("Seek 1 minute backward / forward") + "</td></tr>"
+ "<tr><td>" + _("page down, page up") + "</td><td>" + _("Seek 10 minutes backward / forward") + "</td></tr>"
+ "<tr><td>" + _("Media keys") + "</td><td>" + _("Media keys should work as expected") + "</td></tr>"
+ "</table>"
+ "", QMessageBox::Ok, this);
+ msgbox->setModal(false);
+ }
+ msgbox->show();
+ msgbox->raise();
+ msgbox->activateWindow();
+}
+
+void main_window::help_about()
+{
+ static QDialog* dialog = NULL;
+
+ if (!dialog) {
+ dialog = new QDialog(this);
+ dialog->setWindowTitle(str::asprintf(_("About %s"), PACKAGE_NAME).c_str());
+
+ QLabel* logo = new QLabel();
+ logo->setPixmap(QPixmap(":logo/bino_logo.png").scaledToHeight(128, Qt::SmoothTransformation));
+ QLabel* spacer = new QLabel();
+ spacer->setMinimumWidth(16);
+ QLabel* title = new QLabel(str::asprintf(_("The %s 3D video player"), PACKAGE_NAME).c_str());
+
+ QTextBrowser* about_text = new QTextBrowser(this);
+ about_text->setOpenExternalLinks(true);
+ about_text->setText(str::asprintf(_(
+ "%s version %s."
+ "Copyright (C) 2016 the Bino developers."
+ "This is free software. You may redistribute copies of it "
+ "under the terms of the <a href=\"http://www.gnu.org/licenses/gpl.html\">"
+ "GNU General Public License</a>. "
+ "There is NO WARRANTY, to the extent permitted by law."
+ "See <a href=\"%s\">%s</a> for more information on this software."),
+ PACKAGE_NAME, VERSION, PACKAGE_URL, PACKAGE_URL).c_str());
+
+ QTextBrowser* libs_text = new QTextBrowser(this);
+ libs_text->setOpenExternalLinks(true);
+ libs_text->setWordWrapMode(QTextOption::NoWrap);
+ QString libs_blurb = QString(str::asprintf("%s<ul><li>%s</li></ul>", _("Platform:"), PLATFORM).c_str());
+ libs_blurb += QString("") + QString(_("Libraries used:"));
+ std::vector<std::string> libs = lib_versions(true);
+ for (size_t i = 0; i < libs.size(); i++)
+ libs_blurb += libs[i].c_str();
+ libs_blurb += QString("");
+ libs_text->setText(libs_blurb);
+
+ QTextBrowser* team_text = new QTextBrowser(this);
+ team_text->setOpenExternalLinks(false);
+ team_text->setWordWrapMode(QTextOption::NoWrap);
+ QFile team_file(":AUTHORS");
+ team_file.open(QIODevice::ReadOnly | QIODevice::Text);
+ team_text->setText(QTextCodec::codecForName("UTF-8")->toUnicode(team_file.readAll()));
+
+ QTextBrowser* license_text = new QTextBrowser(this);
+ license_text->setOpenExternalLinks(false);
+ license_text->setWordWrapMode(QTextOption::NoWrap);
+ QFile license_file(":LICENSE");
+ license_file.open(QIODevice::ReadOnly | QIODevice::Text);
+ license_text->setText(license_file.readAll());
+
+ QTabWidget* tab_widget = new QTabWidget();
+ tab_widget->addTab(about_text, _("About"));
+ tab_widget->addTab(libs_text, _("Libraries"));
+ tab_widget->addTab(team_text, _("Team"));
+ tab_widget->addTab(license_text, _("License"));
+
+ QPushButton* ok_btn = new QPushButton(_("OK"));
+ connect(ok_btn, SIGNAL(clicked()), dialog, SLOT(accept()));
+
+ QGridLayout* layout = new QGridLayout();
+ layout->addWidget(logo, 0, 0);
+ layout->addWidget(spacer, 0, 1);
+ layout->addWidget(title, 0, 2, 1, 2);
+ layout->addWidget(spacer, 0, 4);
+ layout->addWidget(tab_widget, 1, 0, 1, 5);
+ layout->addWidget(ok_btn, 2, 3, 1, 2);
+ layout->setColumnStretch(1, 1);
+ layout->setColumnStretch(4, 1);
+ layout->setRowStretch(1, 1);
+ dialog->setLayout(layout);
+ about_text->setMinimumWidth(384);
+ }
+
+ dialog->show();
+ dialog->raise();
+ dialog->activateWindow();
+}
+
+QIcon main_window::get_icon(const QString& name)
+{
+ return QIcon::fromTheme(name, QIcon(QString(":icons/") + name));
+}

bino-1.6.5.tar.xz/src/mainwindow.h Added

@@ -0,0 +1,116 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include "config.h"
+
+#include <QMainWindow>
+#include <QWidget>
+#include <QDialog>
+
+#include "dispatch.h"
+
+class QLabel;
+class QComboBox;
+class QPushButton;
+class QDoubleSpinBox;
+class QSpinBox;
+class QCheckBox;
+class QFontComboBox;
+class QSettings;
+class QGroupBox;
+class QSlider;
+class QRadioButton;
+class QLineEdit;
+class QStackedWidget;
+class QTimer;
+class QIcon;
+
+class video_container_widget;
+class in_out_widget;
+class controls_widget;
+class preferences_dialog;
+
+class main_window : public QMainWindow, public controller
+{
+ Q_OBJECT
+
+private:
+ QSettings *_settings;
+ video_container_widget *_video_container_widget;
+ in_out_widget *_in_out_widget;
+ controls_widget *_controls_widget;
+ preferences_dialog * _preferences_dialog;
+ QTimer *_timer;
+ std::vector<std::string> _now_playing;
+
+ int _max_recent_files;
+ QList<QAction *> _recent_file_actions;
+ QAction *_recent_files_separator;
+ QAction *_clear_recent_separator;
+ QAction *_clear_recent_files_act;
+
+ void update_recent_file_actions();
+ QString stripped_name(const QStringList & filenames);
+ QIcon get_icon(const QString & name);
+
+private slots:
+ void playloop_step();
+ void file_open();
+ void file_open_urls();
+ void file_open_device();
+ void preferences();
+ void help_manual();
+ void help_website();
+ void help_keyboard();
+ void help_about();
+
+ void open_recent_file();
+ void clear_recent_files();
+
+protected:
+ void dragEnterEvent(QDragEnterEvent *event);
+ void dropEvent(QDropEvent *event);
+ void moveEvent(QMoveEvent* event);
+ void closeEvent(QCloseEvent *event);
+ bool eventFilter(QObject *obj, QEvent *event);
+
+public:
+ main_window(QSettings *settings);
+ virtual ~main_window();
+
+ void open(QStringList urls, const device_request &dev_request = device_request(),
+ const parameters& initial_params = parameters());
+ video_container_widget* container_widget()
+ {
+ return _video_container_widget;
+ }
+
+ virtual void receive_notification(const notification &note);
+};
+
+#endif

bino-1.6.1.tar.xz/src/media_data.cpp -> bino-1.6.5.tar.xz/src/media_data.cpp Changed

bino-1.6.1.tar.xz/src/media_data.h -> bino-1.6.5.tar.xz/src/media_data.h Changed

bino-1.6.1.tar.xz/src/media_input.cpp -> bino-1.6.5.tar.xz/src/media_input.cpp Changed

bino-1.6.1.tar.xz/src/media_object.cpp -> bino-1.6.5.tar.xz/src/media_object.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010, 2011, 2012, 2013, 2014
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <frederic.devernay@inrialpes.fr>
 * Joe <cuchac@email.cz>
@@ -45,15 +45,15 @@
 # include <windows.h>
 #endif
 
-#include "gettext.h"
-#define _(string) gettext(string)
+#include "base/dbg.h"
+#include "base/blb.h"
+#include "base/exc.h"
+#include "base/msg.h"
+#include "base/str.h"
+#include "base/pth.h"
 
-#include "dbg.h"
-#include "blob.h"
-#include "exc.h"
-#include "msg.h"
-#include "str.h"
-#include "thread.h"
+#include "base/gettext.h"
+#define _(string) gettext(string)
 
 #include "media_object.h"
 
@@ -427,20 +427,20 @@
 video_frame_template.value_range = video_frame::u8_full;
 video_frame_template.chroma_location = video_frame::center;
 if (!_always_convert_to_bgra32
- && (video_codec_ctx->pix_fmt == PIX_FMT_YUV444P
- || video_codec_ctx->pix_fmt == PIX_FMT_YUV444P10
- || video_codec_ctx->pix_fmt == PIX_FMT_YUV422P
- || video_codec_ctx->pix_fmt == PIX_FMT_YUV422P10
- || video_codec_ctx->pix_fmt == PIX_FMT_YUV420P
- || video_codec_ctx->pix_fmt == PIX_FMT_YUV420P10))
- {
- if (video_codec_ctx->pix_fmt == PIX_FMT_YUV444P
- || video_codec_ctx->pix_fmt == PIX_FMT_YUV444P10)
+ && (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV444P
+ || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV444P10
+ || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV422P
+ || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV422P10
+ || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV420P
+ || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV420P10))
+ {
+ if (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV444P
+ || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV444P10)
 {
 video_frame_template.layout = video_frame::yuv444p;
 }
- else if (video_codec_ctx->pix_fmt == PIX_FMT_YUV422P
- || video_codec_ctx->pix_fmt == PIX_FMT_YUV422P10)
+ else if (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV422P
+ || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV422P10)
 {
 video_frame_template.layout = video_frame::yuv422p;
 }
@@ -453,9 +453,9 @@
 {
 video_frame_template.color_space = video_frame::yuv709;
 }
- if (video_codec_ctx->pix_fmt == PIX_FMT_YUV444P10
- || video_codec_ctx->pix_fmt == PIX_FMT_YUV422P10
- || video_codec_ctx->pix_fmt == PIX_FMT_YUV420P10)
+ if (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV444P10
+ || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV422P10
+ || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV420P10)
 {
 video_frame_template.value_range = video_frame::u10_mpeg;
 if (video_codec_ctx->color_range == AVCOL_RANGE_JPEG)
@@ -482,15 +482,15 @@
 }
 }
 else if (!_always_convert_to_bgra32
- && (video_codec_ctx->pix_fmt == PIX_FMT_YUVJ444P
- || video_codec_ctx->pix_fmt == PIX_FMT_YUVJ422P
- || video_codec_ctx->pix_fmt == PIX_FMT_YUVJ420P))
+ && (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUVJ444P
+ || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUVJ422P
+ || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUVJ420P))
 {
- if (video_codec_ctx->pix_fmt == PIX_FMT_YUVJ444P)
+ if (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUVJ444P)
 {
 video_frame_template.layout = video_frame::yuv444p;
 }
- else if (video_codec_ctx->pix_fmt == PIX_FMT_YUVJ422P)
+ else if (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUVJ422P)
 {
 video_frame_template.layout = video_frame::yuv422p;
 }
@@ -944,8 +944,8 @@
 _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);
+ enum AVPixelFormat frame_fmt = (_ffmpeg->video_frame_templates[j].layout == video_frame::bgra32
+ ? AV_PIX_FMT_BGRA : _ffmpeg->video_codec_ctxs[j]->pix_fmt);
 int frame_bufsize = (avpicture_get_size(frame_fmt,
 _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height));
 _ffmpeg->video_buffers.push_back(static_cast<uint8_t *>(av_malloc(frame_bufsize)));
@@ -958,7 +958,7 @@
 if (_ffmpeg->video_frame_templates[j].layout == video_frame::bgra32)
 {
 // Initialize things needed for software pixel format conversion
- int sws_bufsize = avpicture_get_size(PIX_FMT_BGRA,
+ int sws_bufsize = avpicture_get_size(AV_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());
@@ -971,11 +971,11 @@
 throw exc(HERE + ": " + strerror(ENOMEM));
 }
 avpicture_fill(reinterpret_cast<AVPicture *>(_ffmpeg->video_sws_frames[j]), _ffmpeg->video_sws_buffers[j],
- PIX_FMT_BGRA, _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height);
+ AV_PIX_FMT_BGRA, _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height);
 // Call sws_getCachedContext(NULL, ...) instead of sws_getContext(...) just to avoid a deprecation warning.
 _ffmpeg->video_sws_ctxs.push_back(sws_getCachedContext(NULL,
 _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height, _ffmpeg->video_codec_ctxs[j]->pix_fmt,
- _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height, PIX_FMT_BGRA,
+ _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height, AV_PIX_FMT_BGRA,
 SWS_POINT, NULL, NULL, NULL));
 if (!_ffmpeg->video_sws_ctxs[j])
 {
@@ -1529,7 +1529,7 @@
 // We need to buffer the data because FFmpeg will clubber it when decoding the next frame.
 av_picture_copy(reinterpret_cast<AVPicture *>(_ffmpeg->video_buffered_frames[_video_stream]),
 reinterpret_cast<AVPicture *>(_ffmpeg->video_frames[_video_stream]),
- static_cast<enum PixelFormat>(_ffmpeg->video_codec_ctxs[_video_stream]->pix_fmt),
+ static_cast<enum AVPixelFormat>(_ffmpeg->video_codec_ctxs[_video_stream]->pix_fmt),
 _ffmpeg->video_codec_ctxs[_video_stream]->width,
 _ffmpeg->video_codec_ctxs[_video_stream]->height);
 src_frame = _ffmpeg->video_buffered_frames[_video_stream];

bino-1.6.5.tar.xz/src/opendevicedialog.cpp Added

@@ -0,0 +1,198 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <QComboBox>
+#include <QCheckBox>
+#include <QSpinBox>
+#include <QLineEdit>
+#include <QLabel>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QStackedWidget>
+#include <QPushButton>
+
+#include "opendevicedialog.h"
+
+#include "gui_common.h"
+
+open_device_dialog::open_device_dialog(
+ const QStringList &default_devices,
+ const QStringList &firewire_devices,
+ const QStringList &last_devices,
+ const device_request &dev_request,
+ QWidget *parent) :
+ QDialog(parent)
+{
+ setWindowTitle(_("Open device(s)"));
+
+ _type_combobox = new QComboBox();
+ _type_combobox->setToolTip(_("Choose a device type."));
+ _type_combobox->addItem(_("Default"));
+ _type_combobox->addItem(_("Firewire"));
+ _type_combobox->addItem(_("X11"));
+ for (int i = 0; i < 2; i++) {
+ _default_device_combobox[i] = new QComboBox();
+ _default_device_combobox[i]->setToolTip(_("Choose a device."));
+ _default_device_combobox[i]->addItems(default_devices);
+ _firewire_device_combobox[i] = new QComboBox();
+ _firewire_device_combobox[i]->setToolTip(_("Choose a device."));
+ _firewire_device_combobox[i]->addItems(firewire_devices);
+ _x11_device_field[i] = new QLineEdit();
+ _x11_device_field[i]->setToolTip(_("Set the X11 device string. "
+ "Refer to the manual for details."));
+ _x11_device_field[i]->setText("localhost:0.0+0,0");
+ _device_chooser_stack[i] = new QStackedWidget();
+ _device_chooser_stack[i]->addWidget(_default_device_combobox[i]);
+ _device_chooser_stack[i]->addWidget(_firewire_device_combobox[i]);
+ _device_chooser_stack[i]->addWidget(_x11_device_field[i]);
+ if (last_devices.size() > i) {
+ int j;
+ if (dev_request.device == device_request::sys_default
+ && (j = _default_device_combobox[i]->findText(last_devices[i])) >= 0) {
+ _default_device_combobox[i]->setCurrentIndex(j);
+ } else if (dev_request.device == device_request::firewire
+ && (j = _firewire_device_combobox[i]->findText(last_devices[i])) >= 0) {
+ _firewire_device_combobox[i]->setCurrentIndex(j);
+ } else if (dev_request.device == device_request::x11) {
+ _x11_device_field[i]->setText(last_devices[i]);
+ }
+ }
+ }
+ connect(_type_combobox, SIGNAL(currentIndexChanged(int)), _device_chooser_stack[0], SLOT(setCurrentIndex(int)));
+ connect(_type_combobox, SIGNAL(currentIndexChanged(int)), _device_chooser_stack[1], SLOT(setCurrentIndex(int)));
+ _type_combobox->setCurrentIndex(dev_request.device == device_request::firewire ? 1
+ : dev_request.device == device_request::x11 ? 2 : 0);
+ QLabel *first_device_label = new QLabel(_("First device:"));
+ _second_device_checkbox = new QCheckBox(_("Second device:"));
+ _second_device_checkbox->setChecked(last_devices.size() > 1);
+ _device_chooser_stack[1]->setEnabled(last_devices.size() > 1);
+ connect(_second_device_checkbox, SIGNAL(toggled(bool)), _device_chooser_stack[1], SLOT(setEnabled(bool)));
+ _frame_size_groupbox = new QGroupBox(_("Request frame size"));
+ _frame_size_groupbox->setToolTip(_("Request a specific frame size from the device, e.g. 640x480. "
+ "The device must support this frame size. Some devices require a frame size to be selected."));
+ _frame_size_groupbox->setCheckable(true);
+ _frame_size_groupbox->setChecked(dev_request.width != 0 && dev_request.height != 0);
+ connect(_frame_size_groupbox, SIGNAL(clicked(bool)), this, SLOT(frame_size_groupbox_clicked(bool)));
+ _frame_width_spinbox = new QSpinBox();
+ _frame_width_spinbox->setRange(_frame_size_groupbox->isChecked() ? 1 : 0, 65535);
+ _frame_width_spinbox->setValue(dev_request.width);
+ _frame_height_spinbox = new QSpinBox();
+ _frame_height_spinbox->setRange(_frame_size_groupbox->isChecked() ? 1 : 0, 65535);
+ _frame_height_spinbox->setValue(dev_request.height);
+ _frame_rate_groupbox = new QGroupBox(_("Request frame rate"));
+ _frame_rate_groupbox->setToolTip(_("Request a specific frame rate from the device, e.g. 25/1. "
+ "The device must support this frame rate. Some devices require a frame rate to be selected."));
+ _frame_rate_groupbox->setCheckable(true);
+ _frame_rate_groupbox->setChecked(dev_request.frame_rate_num != 0 && dev_request.frame_rate_den != 0);
+ connect(_frame_rate_groupbox, SIGNAL(clicked(bool)), this, SLOT(frame_rate_groupbox_clicked(bool)));
+ _frame_rate_num_spinbox = new QSpinBox();
+ _frame_rate_num_spinbox->setRange(_frame_rate_groupbox->isChecked() ? 1 : 0, 65535);
+ _frame_rate_num_spinbox->setValue(dev_request.frame_rate_num);
+ _frame_rate_den_spinbox = new QSpinBox();
+ _frame_rate_den_spinbox->setRange(_frame_rate_groupbox->isChecked() ? 1 : 0, 65535);
+ _frame_rate_den_spinbox->setValue(dev_request.frame_rate_den);
+ _mjpeg_checkbox = new QCheckBox(_("Request MJPEG format"));
+ _mjpeg_checkbox->setToolTip(_("Request MJPEG data from the input device. "
+ "The device may ignore this request."));
+ _mjpeg_checkbox->setChecked(dev_request.request_mjpeg);
+ QPushButton *cancel_btn = new QPushButton(_("Cancel"));
+ connect(cancel_btn, SIGNAL(clicked()), this, SLOT(reject()));
+ QPushButton *ok_btn = new QPushButton(_("OK"));
+ connect(ok_btn, SIGNAL(clicked()), this, SLOT(accept()));
+
+ QGridLayout *frame_size_layout = new QGridLayout;
+ frame_size_layout->addWidget(_frame_width_spinbox, 0, 0);
+ frame_size_layout->addWidget(new QLabel("x"), 0, 1);
+ frame_size_layout->addWidget(_frame_height_spinbox, 0, 2);
+ _frame_size_groupbox->setLayout(frame_size_layout);
+ QGridLayout *frame_rate_layout = new QGridLayout;
+ frame_rate_layout->addWidget(_frame_rate_num_spinbox, 0, 0);
+ frame_rate_layout->addWidget(new QLabel("/"), 0, 1);
+ frame_rate_layout->addWidget(_frame_rate_den_spinbox, 0, 2);
+ _frame_rate_groupbox->setLayout(frame_rate_layout);
+
+ QGridLayout *layout = new QGridLayout;
+ layout->addWidget(_type_combobox, 0, 0, 1, 2);
+ layout->addWidget(first_device_label, 1, 0);
+ layout->addWidget(_device_chooser_stack[0], 1, 1);
+ layout->addWidget(_second_device_checkbox, 2, 0);
+ layout->addWidget(_device_chooser_stack[1], 2, 1);
+ layout->addWidget(_frame_size_groupbox, 3, 0, 1, 2);
+ layout->addWidget(_frame_rate_groupbox, 4, 0, 1, 2);
+ layout->addWidget(_mjpeg_checkbox, 5, 0, 1, 2);
+ layout->addWidget(cancel_btn, 6, 0);
+ layout->addWidget(ok_btn, 6, 1);
+ layout->setRowStretch(1, 1);
+ setLayout(layout);
+}
+
+void open_device_dialog::frame_size_groupbox_clicked(bool checked)
+{
+ _frame_width_spinbox->setRange(checked ? 1 : 0, 65535);
+ _frame_width_spinbox->setValue(checked ? 640 : 0);
+ _frame_height_spinbox->setRange(checked ? 1 : 0, 65535);
+ _frame_height_spinbox->setValue(checked ? 480 : 0);
+}
+
+void open_device_dialog::frame_rate_groupbox_clicked(bool checked)
+{
+ _frame_rate_num_spinbox->setRange(checked ? 1 : 0, 65535);
+ _frame_rate_num_spinbox->setValue(checked ? 25 : 0);
+ _frame_rate_den_spinbox->setRange(checked ? 1 : 0, 65535);
+ _frame_rate_den_spinbox->setValue(checked ? 1 : 0);
+}
+
+void open_device_dialog::request(QStringList &devices, device_request &dev_request)
+{
+ if (_type_combobox->currentIndex() == 1)
+ {
+ dev_request.device = device_request::firewire;
+ devices.push_back(_firewire_device_combobox[0]->currentText());
+ if (_second_device_checkbox->isChecked())
+ devices.push_back(_firewire_device_combobox[1]->currentText());
+ }
+ else if (_type_combobox->currentIndex() == 2)
+ {
+ dev_request.device = device_request::x11;
+ devices.push_back(_x11_device_field[0]->text());
+ if (_second_device_checkbox->isChecked())
+ devices.push_back(_x11_device_field[1]->text());
+ }
+ else
+ {
+ dev_request.device = device_request::sys_default;
+ devices.push_back(_default_device_combobox[0]->currentText());
+ if (_second_device_checkbox->isChecked())
+ devices.push_back(_default_device_combobox[1]->currentText());
+ }
+ dev_request.width = _frame_size_groupbox->isChecked() ? _frame_width_spinbox->value() : 0;
+ dev_request.height = _frame_size_groupbox->isChecked() ? _frame_height_spinbox->value() : 0;
+ dev_request.frame_rate_num = _frame_rate_groupbox->isChecked() ? _frame_rate_num_spinbox->value() : 0;
+ dev_request.frame_rate_den = _frame_rate_groupbox->isChecked() ? _frame_rate_den_spinbox->value() : 0;
+ dev_request.request_mjpeg = _mjpeg_checkbox->isChecked();
+}

bino-1.6.5.tar.xz/src/opendevicedialog.h Added

@@ -0,0 +1,70 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef OPENDEVICEDIALOG_H
+#define OPENDEVICEDIALOG_H
+
+#include "config.h"
+
+#include <QDialog>
+#include "dispatch.h"
+
+class QComboBox;
+class QSpinBox;
+class QStackedWidget;
+class QLineEdit;
+class QCheckBox;
+class QGroupBox;
+
+class open_device_dialog : public QDialog
+{
+ Q_OBJECT
+
+private:
+ QComboBox *_type_combobox;
+ QStackedWidget *_device_chooser_stack[2];
+ QComboBox *_default_device_combobox[2];
+ QComboBox *_firewire_device_combobox[2];
+ QLineEdit *_x11_device_field[2];
+ QCheckBox *_second_device_checkbox;
+ QGroupBox *_frame_size_groupbox;
+ QSpinBox *_frame_width_spinbox;
+ QSpinBox *_frame_height_spinbox;
+ QGroupBox *_frame_rate_groupbox;
+ QSpinBox *_frame_rate_num_spinbox;
+ QSpinBox *_frame_rate_den_spinbox;
+ QCheckBox *_mjpeg_checkbox;
+
+private slots:
+ void frame_size_groupbox_clicked(bool checked);
+ void frame_rate_groupbox_clicked(bool checked);
+
+public:
+ open_device_dialog(const QStringList &default_devices, const QStringList &firewire_devices,
+ const QStringList &last_devices, const device_request &dev_request, QWidget *parent);
+ void request(QStringList &devices, device_request &dev_request);
+};
+
+#endif

bino-1.6.1.tar.xz/src/player.cpp -> bino-1.6.5.tar.xz/src/player.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, 2015
 * Martin Lambers <marlam@marlam.de>
 * Alexey Osipov <lion-simba@pridelands.ru>
 * Joe <cuchac@email.cz>
@@ -25,14 +25,14 @@
 #include <vector>
 #include <unistd.h>
 
-#include "gettext.h"
-#define _(string) gettext(string)
+#include "base/exc.h"
+#include "base/dbg.h"
+#include "base/str.h"
+#include "base/msg.h"
+#include "base/tmr.h"
 
-#include "exc.h"
-#include "dbg.h"
-#include "str.h"
-#include "msg.h"
-#include "timer.h"
+#include "base/gettext.h"
+#define _(string) gettext(string)
 
 #include "audio_output.h"
 #include "video_output.h"
@@ -157,12 +157,12 @@
 }
 else
 {
- _master_time_start = timer::get_microseconds(timer::monotonic);
+ _master_time_start = timer::get(timer::monotonic);
 _master_time_pos = _video_pos;
 _current_pos = _video_pos;
 }
 _start_pos = _current_pos;
- _fps_mark_time = timer::get_microseconds(timer::monotonic);
+ _fps_mark_time = timer::get(timer::monotonic);
 _frames_shown = 0;
 _running = true;
 if (global_dispatch->get_media_input()->initial_skip() > 0)
@@ -259,7 +259,7 @@
 }
 else
 {
- _master_time_start = timer::get_microseconds(timer::monotonic);
+ _master_time_start = timer::get(timer::monotonic);
 _master_time_pos = _video_pos;
 _current_pos = _video_pos;
 }
@@ -291,7 +291,7 @@
 }
 else
 {
- _pause_start = timer::get_microseconds(timer::monotonic);
+ _pause_start = timer::get(timer::monotonic);
 }
 _in_pause = true;
 global_dispatch->set_pausing(true);
@@ -376,7 +376,7 @@
 }
 else
 {
- _master_time_start += timer::get_microseconds(timer::monotonic) - _pause_start;
+ _master_time_start += timer::get(timer::monotonic) - _pause_start;
 }
 _in_pause = false;
 global_dispatch->set_pausing(false);
@@ -414,7 +414,7 @@
 else
 {
 // Use our own timer
- _master_time_current = timer::get_microseconds(timer::monotonic) - _master_time_start
+ _master_time_current = timer::get(timer::monotonic) - _master_time_start
 + _master_time_pos;
 }
 
@@ -449,7 +449,7 @@
 _frames_shown++;
 if (_frames_shown == 100) //show fps each 100 frames
 {
- int64_t now = timer::get_microseconds(timer::monotonic);
+ int64_t now = timer::get(timer::monotonic);
 msg::inf(_("FPS: %.2f"), static_cast<float>(_frames_shown) / ((now - _fps_mark_time) / 1e6f));
 _fps_mark_time = now;
 _frames_shown = 0;

bino-1.6.1.tar.xz/src/player.h -> bino-1.6.5.tar.xz/src/player.h Changed

bino-1.6.1.tar.xz/src/player_equalizer.cpp -> bino-1.6.5.tar.xz/src/player_equalizer.cpp Changed

bino-1.6.5.tar.xz/src/preferences.cpp Added

@@ -0,0 +1,94 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <QLabel>
+#include <QGridLayout>
+#include <QPushButton>
+#include <QStackedWidget>
+#include <QListWidget>
+
+#include "preferences.h"
+
+#include "fullscreendialog.h"
+#include "colordialog.h"
+#include "crosstalkdialog.h"
+#include "qualitydialog.h"
+#include "zoomdialog.h"
+#include "audiodialog.h"
+#include "subtitledialog.h"
+#include "videodialog.h"
+
+#if HAVE_LIBXNVCTRL
+#include "sdioutputdialog.h"
+#endif
+
+#include "gui_common.h"
+
+preferences_dialog::preferences_dialog(QWidget *parent) : 
+ QDialog(parent)
+{
+ setModal(false);
+ setWindowTitle(_("Preferences"));
+ 
+ list_widget = new QListWidget(this);
+ stacked_widget = new QStackedWidget(this);
+ 
+ add_preferences_page(new fullscreen_dialog(),_("Fullscreen"),"view-fullscreen");
+ add_preferences_page(new color_dialog(),_("Display Color"),"fill-color");
+ add_preferences_page(new crosstalk_dialog(),_("Display Crosstalk"),"video-display");
+ add_preferences_page(new quality_dialog(),_("Rendering Quality"),"rating");
+ add_preferences_page(new zoom_dialog(),_("Zoom"),"zoom-in");
+ add_preferences_page(new audio_dialog(),_("Audio"),"audio-volume-high");
+ add_preferences_page(new subtitle_dialog(),_("Subtitle"),"draw-text");
+ add_preferences_page(new video_dialog(),_("Video"),"video-display");
+
+#if HAVE_LIBXNVCTRL
+ add_preferences_page(new sdi_output_dialog(),_("SDI Output"),"video-display");
+#endif
+ 
+ connect(list_widget,SIGNAL(currentRowChanged(int)),stacked_widget,SLOT(setCurrentIndex(int)));
+
+ QPushButton *ok_button = new QPushButton(_("OK"));
+ connect(ok_button, SIGNAL(clicked()), this, SLOT(close()));
+
+ QGridLayout *layout = new QGridLayout;
+ layout->addWidget(list_widget, 0, 0, 1, 1);
+ layout->addWidget(stacked_widget, 0, 1, 1, 1);
+ layout->addWidget(ok_button, 1, 0, 1, 2);
+ layout->setColumnStretch(0,1);
+ layout->setColumnStretch(1,3);
+ 
+ setLayout(layout);
+}
+
+void preferences_dialog::add_preferences_page(QWidget * dialog, const QString& title, const QString& icon_name)
+{
+ stacked_widget->addWidget(dialog);
+ QListWidgetItem *qlistwidgetitem = new QListWidgetItem(title, list_widget);
+ qlistwidgetitem->setIcon(QIcon::fromTheme(icon_name, QIcon(QString(":icons/") + icon_name)));
+}

bino-1.6.5.tar.xz/src/preferences.h Added

@@ -0,0 +1,54 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PREFERENCESDIALOG_H
+#define PREFERENCESDIALOG_H
+
+#include "config.h"
+
+#include <QDialog>
+
+class QIcon;
+class QListWidgetItem;
+class QListWidget;
+class QStackedWidget;
+
+class preferences_dialog : public QDialog
+{
+ Q_OBJECT
+
+private:
+ QListWidget * list_widget;
+ QStackedWidget * stacked_widget;
+
+ void add_preferences_page(QWidget * dialog, const QString & title, const QString & icon_name);
+ 
+private slots:
+
+public:
+ preferences_dialog(QWidget *parent);
+};
+
+#endif

bino-1.6.5.tar.xz/src/qualitydialog.cpp Added

@@ -0,0 +1,84 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <QLabel>
+#include <QSlider>
+#include <QSpinBox>
+#include <QGridLayout>
+
+#include "qualitydialog.h"
+
+#include "gui_common.h"
+
+quality_dialog::quality_dialog(QWidget *parent) : QWidget(parent), _lock(false)
+{
+ QLabel *q_label = new QLabel(_("Rendering Quality:"));
+ _q_slider = new QSlider(Qt::Horizontal);
+ _q_slider->setRange(0, 4);
+ _q_slider->setValue(dispatch::parameters().quality());
+ connect(_q_slider, SIGNAL(valueChanged(int)), this, SLOT(q_slider_changed(int)));
+ _q_spinbox = new QSpinBox();
+ _q_spinbox->setRange(0, 4);
+ _q_spinbox->setValue(dispatch::parameters().quality());
+ _q_spinbox->setSingleStep(1);
+ connect(_q_spinbox, SIGNAL(valueChanged(int)), this, SLOT(q_spinbox_changed(int)));
+
+ QGridLayout *layout = new QGridLayout;
+ layout->addWidget(q_label, 0, 0);
+ layout->addWidget(_q_slider, 0, 1);
+ layout->addWidget(_q_spinbox, 0, 2);
+ setLayout(layout);
+}
+
+void quality_dialog::q_slider_changed(int val)
+{
+ if (!_lock)
+ send_cmd(command::set_quality, val);
+}
+
+void quality_dialog::q_spinbox_changed(int val)
+{
+ if (!_lock)
+ send_cmd(command::set_quality, val);
+}
+
+void quality_dialog::receive_notification(const notification &note)
+{
+ switch (note.type)
+ {
+ case notification::quality:
+ _lock = true;
+ _q_slider->setValue(dispatch::parameters().quality());
+ _q_spinbox->setValue(dispatch::parameters().quality());
+ _lock = false;
+ break;
+ default:
+ /* not handled */
+ break;
+ }
+}

bino-1.6.5.tar.xz/src/qualitydialog.h Added

@@ -0,0 +1,56 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef QUALITYDIALOG_H
+#define QUALITYDIALOG_H
+
+#include "config.h"
+
+#include <QWidget>
+#include "dispatch.h"
+
+class QSpinBox;
+class QSlider;
+
+class quality_dialog : public QWidget, public controller
+{
+ Q_OBJECT
+
+private:
+ bool _lock;
+ QSpinBox *_q_spinbox;
+ QSlider *_q_slider;
+
+private slots:
+ void q_slider_changed(int val);
+ void q_spinbox_changed(int val);
+
+public:
+ quality_dialog(QWidget *parent = 0);
+
+ virtual void receive_notification(const notification &note);
+};
+
+#endif

bino-1.6.5.tar.xz/src/sdioutputdialog.cpp Added

@@ -0,0 +1,510 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <QLabel>
+#include <QComboBox>
+#include <QGridLayout>
+
+#include "sdioutputdialog.h"
+
+#include "gui_common.h"
+
+#if HAVE_LIBXNVCTRL
+#include <NVCtrl/NVCtrl.h>
+#include "NvSDIutils.h"
+#endif // HAVE_LIBXNVCTRL
+
+sdi_output_dialog::sdi_output_dialog(QWidget *parent) : QWidget(parent),
+ _lock(false)
+{
+#if HAVE_LIBXNVCTRL
+
+ QLabel *sdi_output_format_label = new QLabel(_("SDI Output Format:"));
+ sdi_output_format_label->setToolTip(_("Select output format used for SDI output."));
+ _sdi_output_format_combobox = new QComboBox();
+ _sdi_output_format_combobox->setToolTip(sdi_output_format_label->toolTip());
+ for (int i=NV_CTRL_GVIO_VIDEO_FORMAT_487I_59_94_SMPTE259_NTSC; i < NV_CTRL_GVIO_VIDEO_FORMAT_2048I_47_96_SMPTE372+1; ++i) {
+ _sdi_output_format_combobox->addItem(decodeSignalFormat(i));
+ }
+ connect(_sdi_output_format_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(sdi_output_format_changed(int)));
+
+ QLabel *sdi_output_left_stereo_mode_label = new QLabel(_("Left stereo mode:"));
+ sdi_output_left_stereo_mode_label->setToolTip(_("Select stereo mode used for left SDI output."));
+ _sdi_output_left_stereo_mode_combobox = new QComboBox();
+ _sdi_output_left_stereo_mode_combobox->setToolTip(sdi_output_left_stereo_mode_label->toolTip());
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-mono-left.png"), _("Left view"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-mono-right.png"), _("Right view"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-top-bottom.png"), _("Top/bottom"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-top-bottom-half.png"), _("Top/bottom, half height"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-left-right.png"), _("Left/right"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-left-right-half.png"), _("Left/right, half width"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-even-odd-rows.png"), _("Even/odd rows"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-even-odd-columns.png"), _("Even/odd columns"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-checkerboard.png"), _("Checkerboard pattern"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, monochrome"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, half color"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, full color"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, Dubois"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, monochrome"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, half color"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, full color"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, Dubois"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, monochrome"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, half color"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, full color"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, Dubois"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-green.png"), _("Red/green glasses, monochrome"));
+ _sdi_output_left_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-blue.png"), _("Red/blue glasses, monochrome"));
+ connect(_sdi_output_left_stereo_mode_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(sdi_output_left_stereo_mode_changed(int)));
+
+ QLabel *sdi_output_right_stereo_mode_label = new QLabel(_("Right stereo mode:"));
+ sdi_output_right_stereo_mode_label->setToolTip(_("Select stereo mode used for right SDI output."));
+ _sdi_output_right_stereo_mode_combobox = new QComboBox();
+ _sdi_output_right_stereo_mode_combobox->setToolTip(sdi_output_right_stereo_mode_label->toolTip());
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-mono-left.png"), _("Left view"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-mono-right.png"), _("Right view"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-top-bottom.png"), _("Top/bottom"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-top-bottom-half.png"), _("Top/bottom, half height"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-left-right.png"), _("Left/right"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-left-right-half.png"), _("Left/right, half width"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-even-odd-rows.png"), _("Even/odd rows"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-even-odd-columns.png"), _("Even/odd columns"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-checkerboard.png"), _("Checkerboard pattern"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, monochrome"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, half color"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, full color"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, Dubois"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, monochrome"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, half color"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, full color"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, Dubois"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, monochrome"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, half color"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, full color"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, Dubois"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-green.png"), _("Red/green glasses, monochrome"));
+ _sdi_output_right_stereo_mode_combobox->addItem(QIcon(":icons-local/output-type-red-blue.png"), _("Red/blue glasses, monochrome"));
+ connect(_sdi_output_right_stereo_mode_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(sdi_output_right_stereo_mode_changed(int)));
+
+ QGridLayout *layout = new QGridLayout;
+ layout->addWidget(sdi_output_format_label, 0, 0);
+ layout->addWidget(_sdi_output_format_combobox, 0, 1, 1, 1);
+ layout->addWidget(sdi_output_left_stereo_mode_label, 1, 0);
+ layout->addWidget(_sdi_output_left_stereo_mode_combobox, 1, 1);
+ layout->addWidget(sdi_output_right_stereo_mode_label, 2, 0);
+ layout->addWidget(_sdi_output_right_stereo_mode_combobox, 2, 1);
+ setLayout(layout);
+
+ update();
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::update()
+{
+#if HAVE_LIBXNVCTRL
+ _lock = true;
+ set_sdi_output_format(dispatch::parameters().sdi_output_format());
+ set_sdi_output_left_stereo_mode(dispatch::parameters().sdi_output_left_stereo_mode());
+ set_sdi_output_right_stereo_mode(dispatch::parameters().sdi_output_right_stereo_mode());
+ _lock = false;
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::set_sdi_output_format(int val)
+{
+#if HAVE_LIBXNVCTRL
+ _sdi_output_format_combobox->setCurrentIndex(val-1);
+#else
+ (void)val;
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::set_sdi_output_left_stereo_mode(parameters::stereo_mode_t stereo_mode)
+{
+#if HAVE_LIBXNVCTRL
+ switch (stereo_mode)
+ {
+ default:
+ case parameters::mode_mono_left:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(0);
+ break;
+ case parameters::mode_mono_right:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(1);
+ break;
+ case parameters::mode_top_bottom:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(2);
+ break;
+ case parameters::mode_top_bottom_half:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(3);
+ break;
+ case parameters::mode_left_right:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(4);
+ break;
+ case parameters::mode_left_right_half:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(5);
+ break;
+ case parameters::mode_even_odd_rows:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(6);
+ break;
+ case parameters::mode_even_odd_columns:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(7);
+ break;
+ case parameters::mode_checkerboard:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(8);
+ break;
+ case parameters::mode_red_cyan_monochrome:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(9);
+ break;
+ case parameters::mode_red_cyan_half_color:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(10);
+ break;
+ case parameters::mode_red_cyan_full_color:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(11);
+ break;
+ case parameters::mode_red_cyan_dubois:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(12);
+ break;
+ case parameters::mode_green_magenta_monochrome:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(13);
+ break;
+ case parameters::mode_green_magenta_half_color:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(14);
+ break;
+ case parameters::mode_green_magenta_full_color:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(15);
+ break;
+ case parameters::mode_green_magenta_dubois:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(16);
+ break;
+ case parameters::mode_amber_blue_monochrome:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(17);
+ break;
+ case parameters::mode_amber_blue_half_color:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(18);
+ break;
+ case parameters::mode_amber_blue_full_color:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(19);
+ break;
+ case parameters::mode_amber_blue_dubois:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(20);
+ break;
+ case parameters::mode_red_green_monochrome:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(21);
+ break;
+ case parameters::mode_red_blue_monochrome:
+ _sdi_output_left_stereo_mode_combobox->setCurrentIndex(22);
+ break;
+ }
+#else
+ (void)stereo_mode;
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::set_sdi_output_right_stereo_mode(parameters::stereo_mode_t stereo_mode)
+{
+#if HAVE_LIBXNVCTRL
+ switch (stereo_mode)
+ {
+ default:
+ case parameters::mode_mono_left:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(0);
+ break;
+ case parameters::mode_mono_right:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(1);
+ break;
+ case parameters::mode_top_bottom:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(2);
+ break;
+ case parameters::mode_top_bottom_half:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(3);
+ break;
+ case parameters::mode_left_right:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(4);
+ break;
+ case parameters::mode_left_right_half:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(5);
+ break;
+ case parameters::mode_even_odd_rows:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(6);
+ break;
+ case parameters::mode_even_odd_columns:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(7);
+ break;
+ case parameters::mode_checkerboard:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(8);
+ break;
+ case parameters::mode_red_cyan_monochrome:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(9);
+ break;
+ case parameters::mode_red_cyan_half_color:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(10);
+ break;
+ case parameters::mode_red_cyan_full_color:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(11);
+ break;
+ case parameters::mode_red_cyan_dubois:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(12);
+ break;
+ case parameters::mode_green_magenta_monochrome:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(13);
+ break;
+ case parameters::mode_green_magenta_half_color:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(14);
+ break;
+ case parameters::mode_green_magenta_full_color:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(15);
+ break;
+ case parameters::mode_green_magenta_dubois:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(16);
+ break;
+ case parameters::mode_amber_blue_monochrome:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(17);
+ break;
+ case parameters::mode_amber_blue_half_color:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(18);
+ break;
+ case parameters::mode_amber_blue_full_color:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(19);
+ break;
+ case parameters::mode_amber_blue_dubois:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(20);
+ break;
+ case parameters::mode_red_green_monochrome:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(21);
+ break;
+ case parameters::mode_red_blue_monochrome:
+ _sdi_output_right_stereo_mode_combobox->setCurrentIndex(22);
+ break;
+ }
+#else
+ (void)stereo_mode;
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::sdi_output_format_changed(int val)
+{
+#if HAVE_LIBXNVCTRL
+ if (!_lock)
+ send_cmd(command::set_sdi_output_format, val+1);
+#else
+ (void)val;
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::sdi_output_left_stereo_mode_changed(int val)
+{
+#if HAVE_LIBXNVCTRL
+ parameters::stereo_mode_t stereo_mode = parameters::mode_mono_left;
+
+ switch (val)
+ {
+ case 0:
+ stereo_mode = parameters::mode_mono_left;
+ break;
+ case 1:
+ stereo_mode = parameters::mode_mono_right;
+ break;
+ case 2:
+ stereo_mode = parameters::mode_top_bottom;
+ break;
+ case 3:
+ stereo_mode = parameters::mode_top_bottom_half;
+ break;
+ case 4:
+ stereo_mode = parameters::mode_left_right;
+ break;
+ case 5:
+ stereo_mode = parameters::mode_left_right_half;
+ break;
+ case 6:
+ stereo_mode = parameters::mode_even_odd_rows;
+ break;
+ case 7:
+ stereo_mode = parameters::mode_even_odd_columns;
+ break;
+ case 8:
+ stereo_mode = parameters::mode_checkerboard;
+ break;
+ case 9:
+ stereo_mode = parameters::mode_red_cyan_monochrome;
+ break;
+ case 10:
+ stereo_mode = parameters::mode_red_cyan_half_color;
+ break;
+ case 11:
+ stereo_mode = parameters::mode_red_cyan_full_color;
+ break;
+ case 12:
+ stereo_mode = parameters::mode_red_cyan_dubois;
+ break;
+ case 13:
+ stereo_mode = parameters::mode_green_magenta_monochrome;
+ break;
+ case 14:
+ stereo_mode = parameters::mode_green_magenta_half_color;
+ break;
+ case 15:
+ stereo_mode = parameters::mode_green_magenta_full_color;
+ break;
+ case 16:
+ stereo_mode = parameters::mode_green_magenta_dubois;
+ break;
+ case 17:
+ stereo_mode = parameters::mode_amber_blue_monochrome;
+ break;
+ case 18:
+ stereo_mode = parameters::mode_amber_blue_half_color;
+ break;
+ case 19:
+ stereo_mode = parameters::mode_amber_blue_full_color;
+ break;
+ case 20:
+ stereo_mode = parameters::mode_amber_blue_dubois;
+ break;
+ case 21:
+ stereo_mode = parameters::mode_red_green_monochrome;
+ break;
+ case 22:
+ stereo_mode = parameters::mode_red_blue_monochrome;
+ break;
+ }
+
+ if (!_lock)
+ send_cmd(command::set_sdi_output_left_stereo_mode, static_cast<int>(stereo_mode));
+#else
+ (void)val;
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::sdi_output_right_stereo_mode_changed(int val)
+{
+#if HAVE_LIBXNVCTRL
+ parameters::stereo_mode_t stereo_mode = parameters::mode_mono_left;
+
+ switch (val)
+ {
+ case 0:
+ stereo_mode = parameters::mode_mono_left;
+ break;
+ case 1:
+ stereo_mode = parameters::mode_mono_right;
+ break;
+ case 2:
+ stereo_mode = parameters::mode_top_bottom;
+ break;
+ case 3:
+ stereo_mode = parameters::mode_top_bottom_half;
+ break;
+ case 4:
+ stereo_mode = parameters::mode_left_right;
+ break;
+ case 5:
+ stereo_mode = parameters::mode_left_right_half;
+ break;
+ case 6:
+ stereo_mode = parameters::mode_even_odd_rows;
+ break;
+ case 7:
+ stereo_mode = parameters::mode_even_odd_columns;
+ break;
+ case 8:
+ stereo_mode = parameters::mode_checkerboard;
+ break;
+ case 9:
+ stereo_mode = parameters::mode_red_cyan_monochrome;
+ break;
+ case 10:
+ stereo_mode = parameters::mode_red_cyan_half_color;
+ break;
+ case 11:
+ stereo_mode = parameters::mode_red_cyan_full_color;
+ break;
+ case 12:
+ stereo_mode = parameters::mode_red_cyan_dubois;
+ break;
+ case 13:
+ stereo_mode = parameters::mode_green_magenta_monochrome;
+ break;
+ case 14:
+ stereo_mode = parameters::mode_green_magenta_half_color;
+ break;
+ case 15:
+ stereo_mode = parameters::mode_green_magenta_full_color;
+ break;
+ case 16:
+ stereo_mode = parameters::mode_green_magenta_dubois;
+ break;
+ case 17:
+ stereo_mode = parameters::mode_amber_blue_monochrome;
+ break;
+ case 18:
+ stereo_mode = parameters::mode_amber_blue_half_color;
+ break;
+ case 19:
+ stereo_mode = parameters::mode_amber_blue_full_color;
+ break;
+ case 20:
+ stereo_mode = parameters::mode_amber_blue_dubois;
+ break;
+ case 21:
+ stereo_mode = parameters::mode_red_green_monochrome;
+ break;
+ case 22:
+ stereo_mode = parameters::mode_red_blue_monochrome;
+ break;
+ }
+
+ if (!_lock)
+ send_cmd(command::set_sdi_output_right_stereo_mode, static_cast<int>(stereo_mode));
+#else
+ (void)val;
+#endif // HAVE_LIBXNVCTRL
+}
+
+void sdi_output_dialog::receive_notification(const notification &note)
+{
+#if HAVE_LIBXNVCTRL
+ switch (note.type)
+ {
+ case notification::sdi_output_format:
+ update();
+ break;
+ case notification::sdi_output_left_stereo_mode:
+ update();
+ break;
+ case notification::sdi_output_right_stereo_mode:
+ update();
+ break;
+ default:
+ /* not handled */
+ break;
+ }
+#else
+ (void)note;
+#endif // HAVE_LIBXNVCTRL
+}

bino-1.6.5.tar.xz/src/sdioutputdialog.h Added

@@ -0,0 +1,62 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDIOUTPUTDIALOG_H
+#define SDIOUTPUTDIALOG_H
+
+#include "config.h"
+
+#include <QWidget>
+#include "dispatch.h"
+
+class QComboBox;
+
+class sdi_output_dialog : public QWidget, public controller
+{
+ Q_OBJECT
+
+private:
+ bool _lock;
+ QComboBox *_sdi_output_format_combobox;
+ QComboBox *_sdi_output_left_stereo_mode_combobox;
+ QComboBox *_sdi_output_right_stereo_mode_combobox;
+
+ void set_sdi_output_format(int val);
+ void set_sdi_output_left_stereo_mode(parameters::stereo_mode_t stereo_mode);
+ void set_sdi_output_right_stereo_mode(parameters::stereo_mode_t stereo_mode);
+
+private slots:
+ void sdi_output_format_changed(int val);
+ void sdi_output_left_stereo_mode_changed(int val);
+ void sdi_output_right_stereo_mode_changed(int val);
+
+public:
+ sdi_output_dialog(QWidget *parent = 0);
+ void update();
+
+ virtual void receive_notification(const notification &note);
+};
+
+#endif

bino-1.6.1.tar.xz/src/subtitle_renderer.cpp -> bino-1.6.5.tar.xz/src/subtitle_renderer.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2011, 2012
+ * Copyright (C) 2011, 2012, 2015
 * Martin Lambers <marlam@marlam.de>
 * Joe <cuchac@email.cz>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
@@ -42,15 +42,15 @@
 #include <ass/ass.h>
 }
 
-#include "gettext.h"
-#define _(string) gettext(string)
+#include "base/dbg.h"
+#include "base/exc.h"
+#include "base/str.h"
+#include "base/blb.h"
+#include "base/msg.h"
+#include "base/pth.h"
 
-#include "dbg.h"
-#include "exc.h"
-#include "str.h"
-#include "blob.h"
-#include "msg.h"
-#include "thread.h"
+#include "base/gettext.h"
+#define _(string) gettext(string)
 
 #include "subtitle_renderer.h"
 
@@ -94,7 +94,7 @@
 
 subtitle_renderer::~subtitle_renderer()
 {
- if (_initializer.is_running())
+ if (_initializer.running())
 {
 try
 {
@@ -253,7 +253,7 @@
 
 bool subtitle_renderer::is_initialized()
 {
- if (_initializer.is_running())
+ if (_initializer.running())
 {
 return false;
 }
@@ -439,8 +439,8 @@
 "\n";
 ass_process_codec_private(_ass_track, const_cast<char *>(style.c_str()), style.length());
 // Convert text to ASS
- str::replace(conv_str, "\r\n", "\\N");
- str::replace(conv_str, "\n", "\\N");
+ conv_str = str::replace(conv_str, "\r\n", "\\N");
+ conv_str = str::replace(conv_str, "\n", "\\N");
 std::string str = "Dialogue: 0,0:00:00.00,9:59:59.99," + conv_str;
 ass_process_data(_ass_track, const_cast<char *>(str.c_str()), str.length());
 }

bino-1.6.1.tar.xz/src/subtitle_renderer.h -> bino-1.6.5.tar.xz/src/subtitle_renderer.h Changed

bino-1.6.5.tar.xz/src/subtitledialog.cpp Added

@@ -0,0 +1,317 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <limits>
+
+#include <QLabel>
+#include <QComboBox>
+#include <QFontComboBox>
+#include <QCheckBox>
+#include <QTextCodec>
+#include <QSpinBox>
+#include <QPushButton>
+#include <QGridLayout>
+#include <QColorDialog>
+
+#include "subtitledialog.h"
+
+#include "gui_common.h"
+
+subtitle_dialog::subtitle_dialog(QWidget *parent) : QWidget(parent), _lock(false)
+{
+ QLabel *info_label = new QLabel(_(
+ "These settings apply only to soft subtitles, not to bitmaps. "
+ "Some changes require a restart of the video to take effect."));
+
+ _encoding_checkbox = new QCheckBox(_("Encoding:"));
+ _encoding_checkbox->setToolTip(_("Set the subtitle character set encoding."));
+ _encoding_checkbox->setChecked(!dispatch::parameters().subtitle_encoding_is_default());
+ connect(_encoding_checkbox, SIGNAL(stateChanged(int)), this, SLOT(encoding_changed()));
+ _encoding_combobox = new QComboBox();
+ _encoding_combobox->setToolTip(_encoding_checkbox->toolTip());
+ QList<QTextCodec *> codecs = find_codecs();
+ foreach (QTextCodec *codec, codecs)
+ {
+ _encoding_combobox->addItem(codec->name(), codec->mibEnum());
+ }
+ _encoding_combobox->setCurrentIndex(_encoding_combobox->findText(
+ dispatch::parameters().subtitle_encoding() == ""
+ ? "UTF-8" : dispatch::parameters().subtitle_encoding().c_str()));
+ connect(_encoding_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(encoding_changed()));
+
+ _font_checkbox = new QCheckBox(_("Override font:"));
+ _font_checkbox->setToolTip(_("Override the subtitle font family."));
+ _font_checkbox->setChecked(!dispatch::parameters().subtitle_font_is_default());
+ connect(_font_checkbox, SIGNAL(stateChanged(int)), this, SLOT(font_changed()));
+ _font_combobox = new QFontComboBox();
+ _font_combobox->setToolTip(_font_checkbox->toolTip());
+ _font_combobox->setCurrentFont(QFont(QString(dispatch::parameters().subtitle_font() == ""
+ ? "sans-serif" : dispatch::parameters().subtitle_font().c_str())));
+ connect(_font_combobox, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(font_changed()));
+
+ _size_checkbox = new QCheckBox(_("Override font size:"));
+ _size_checkbox->setToolTip(_("Override the subtitle font size."));
+ _size_checkbox->setChecked(dispatch::parameters().subtitle_size() > 0);
+ connect(_size_checkbox, SIGNAL(stateChanged(int)), this, SLOT(size_changed()));
+ _size_spinbox = new QSpinBox();
+ _size_spinbox->setToolTip(_size_checkbox->toolTip());
+ _size_spinbox->setRange(1, 999);
+ _size_spinbox->setValue(dispatch::parameters().subtitle_size() <= 0
+ ? 12 : dispatch::parameters().subtitle_size());
+ connect(_size_spinbox, SIGNAL(valueChanged(int)), this, SLOT(size_changed()));
+
+ _scale_checkbox = new QCheckBox(_("Override scale factor:"));
+ _scale_checkbox->setToolTip(_("Override the subtitle scale factor."));
+ _scale_checkbox->setChecked(dispatch::parameters().subtitle_scale() >= 0.0f);
+ connect(_scale_checkbox, SIGNAL(stateChanged(int)), this, SLOT(scale_changed()));
+ _scale_spinbox = new QDoubleSpinBox();
+ _scale_spinbox->setToolTip(_scale_checkbox->toolTip());
+ _scale_spinbox->setRange(0.01, 100.0);
+ _scale_spinbox->setSingleStep(0.1);
+ _scale_spinbox->setValue(dispatch::parameters().subtitle_scale() < 0.0f
+ ? 1.0f : dispatch::parameters().subtitle_scale());
+ connect(_scale_spinbox, SIGNAL(valueChanged(double)), this, SLOT(scale_changed()));
+
+ _color_checkbox = new QCheckBox(_("Override color:"));
+ _color_checkbox->setToolTip(_("Override the subtitle color."));
+ _color_checkbox->setChecked(dispatch::parameters().subtitle_color() <= std::numeric_limits<uint32_t>::max());
+ connect(_color_checkbox, SIGNAL(stateChanged(int)), this, SLOT(color_changed()));
+ _color_button = new QPushButton();
+ _color_button->setToolTip(_color_checkbox->toolTip());
+ set_color_button(dispatch::parameters().subtitle_color() > std::numeric_limits<uint32_t>::max()
+ ? 0xffffffu : dispatch::parameters().subtitle_color());
+ connect(_color_button, SIGNAL(clicked()), this, SLOT(color_button_clicked()));
+
+ _shadow_checkbox = new QCheckBox(_("Override shadow:"));
+ _shadow_checkbox->setToolTip(_("Override the subtitle shadow."));
+ _shadow_checkbox->setChecked(dispatch::parameters().subtitle_shadow() != -1);
+ connect(_shadow_checkbox, SIGNAL(stateChanged(int)), this, SLOT(shadow_changed()));
+ _shadow_combobox = new QComboBox();
+ _shadow_combobox->setToolTip(_shadow_checkbox->toolTip());
+ _shadow_combobox->addItem(_("On"));
+ _shadow_combobox->addItem(_("Off"));
+ _shadow_combobox->setCurrentIndex(dispatch::parameters().subtitle_shadow() == 0 ? 1 : 0);
+ connect(_shadow_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(shadow_changed()));
+
+ QGridLayout *layout = new QGridLayout;
+ layout->addWidget(info_label, 0, 0, 1, 2);
+ layout->addWidget(_encoding_checkbox, 1, 0);
+ layout->addWidget(_encoding_combobox, 1, 1);
+ layout->addWidget(_font_checkbox, 2, 0);
+ layout->addWidget(_font_combobox, 2, 1);
+ layout->addWidget(_size_checkbox, 3, 0);
+ layout->addWidget(_size_spinbox, 3, 1);
+ layout->addWidget(_scale_checkbox, 4, 0);
+ layout->addWidget(_scale_spinbox, 4, 1);
+ layout->addWidget(_color_checkbox, 5, 0);
+ layout->addWidget(_color_button, 5, 1);
+ layout->addWidget(_shadow_checkbox, 6, 0);
+ layout->addWidget(_shadow_combobox, 6, 1);
+ setLayout(layout);
+}
+
+QList<QTextCodec *> subtitle_dialog::find_codecs()
+{
+ QMap<QString, QTextCodec *> codec_map;
+ QRegExp iso8859_regexp("ISO[- ]8859-([0-9]+).*");
+
+ foreach (int mib, QTextCodec::availableMibs())
+ {
+ QTextCodec *codec = QTextCodec::codecForMib(mib);
+
+ QString sort_key = codec->name().toUpper();
+ int rank;
+
+ if (sort_key.startsWith("UTF-8"))
+ {
+ rank = 1;
+ }
+ else if (sort_key.startsWith("UTF-16"))
+ {
+ rank = 2;
+ }
+ else if (iso8859_regexp.exactMatch(sort_key))
+ {
+ if (iso8859_regexp.cap(1).size() == 1)
+ {
+ rank = 3;
+ }
+ else
+ {
+ rank = 4;
+ }
+ }
+ else
+ {
+ rank = 5;
+ }
+ sort_key.prepend(QChar('0' + rank));
+
+ codec_map.insert(sort_key, codec);
+ }
+ return codec_map.values();
+}
+
+void subtitle_dialog::set_color_button(uint32_t c)
+{
+ int r = (c >> 16u) & 0xffu;
+ int g = (c >> 8u) & 0xffu;
+ int b = c & 0xffu;
+ _color = QColor(r, g, b);
+ QPixmap pm(64, 64);
+ pm.fill(_color);
+ _color_button->setIcon(QIcon(pm));
+}
+
+void subtitle_dialog::color_button_clicked()
+{
+ _color = QColorDialog::getColor(_color, this);
+ QPixmap pm(64, 64);
+ pm.fill(_color);
+ _color_button->setIcon(QIcon(pm));
+ color_changed();
+}
+
+void subtitle_dialog::encoding_changed()
+{
+ if (!_lock)
+ {
+ std::string encoding = _encoding_checkbox->isChecked()
+ ? _encoding_combobox->currentText().toStdString() : "";
+ std::ostringstream v;
+ s11n::save(v, encoding);
+ send_cmd(command::set_subtitle_encoding, v.str());
+ }
+}
+
+void subtitle_dialog::font_changed()
+{
+ if (!_lock)
+ {
+ std::string font = _font_checkbox->isChecked()
+ ? _font_combobox->currentFont().family().toLocal8Bit().constData()
+ : "";
+ std::ostringstream v;
+ s11n::save(v, font);
+ send_cmd(command::set_subtitle_font, v.str());
+ }
+}
+
+void subtitle_dialog::size_changed()
+{
+ if (!_lock)
+ send_cmd(command::set_subtitle_size, _size_checkbox->isChecked() ? _size_spinbox->value() : -1);
+}
+
+void subtitle_dialog::scale_changed()
+{
+ if (!_lock)
+ send_cmd(command::set_subtitle_scale, _scale_checkbox->isChecked()
+ ? static_cast<float>(_scale_spinbox->value()) : -1.0f);
+}
+
+void subtitle_dialog::color_changed()
+{
+ if (!_lock)
+ {
+ uint64_t color;
+ if (_color_checkbox->isChecked())
+ {
+ unsigned int a = _color.alpha();
+ unsigned int r = _color.red();
+ unsigned int g = _color.green();
+ unsigned int b = _color.blue();
+ color = (a << 24u) | (r << 16u) | (g << 8u) | b;
+ }
+ else
+ {
+ color = std::numeric_limits<uint64_t>::max();
+ }
+ send_cmd(command::set_subtitle_color, color);
+ }
+}
+
+void subtitle_dialog::shadow_changed()
+{
+ if (!_lock)
+ send_cmd(command::set_subtitle_shadow, _shadow_checkbox->isChecked()
+ ? 1 - _shadow_combobox->currentIndex() : -1);
+}
+
+void subtitle_dialog::receive_notification(const notification &note)
+{
+ std::string s;
+ int i;
+ float f;
+ uint64_t c;
+
+ _lock = true;
+ switch (note.type)
+ {
+ case notification::subtitle_encoding:
+ s = dispatch::parameters().subtitle_encoding();
+ _encoding_checkbox->setChecked(!s.empty());
+ if (!s.empty())
+ _encoding_combobox->setCurrentIndex(_encoding_combobox->findText(s.c_str()));
+ break;
+ case notification::subtitle_font:
+ s = dispatch::parameters().subtitle_font();
+ _font_checkbox->setChecked(!s.empty());
+ if (!s.empty())
+ _font_combobox->setCurrentFont(QFont(QString(s.c_str())));
+ break;
+ case notification::subtitle_size:
+ i = dispatch::parameters().subtitle_size();
+ _size_checkbox->setChecked(i > 0);
+ if (i > 0)
+ _size_spinbox->setValue(i);
+ break;
+ case notification::subtitle_scale:
+ f = dispatch::parameters().subtitle_scale();
+ _scale_checkbox->setChecked(f >= 0.0f);
+ if (f >= 0.0f)
+ _scale_spinbox->setValue(f);
+ break;
+ case notification::subtitle_color:
+ c = dispatch::parameters().subtitle_color();
+ _color_checkbox->setChecked(c <= std::numeric_limits<uint32_t>::max());
+ if (c <= std::numeric_limits<uint32_t>::max())
+ set_color_button(c);
+ break;
+ case notification::subtitle_shadow:
+ i = dispatch::parameters().subtitle_shadow();
+ _shadow_checkbox->setChecked(i >= 0);
+ if (i >= 0)
+ _shadow_combobox->setCurrentIndex(1 - i);
+ break;
+ default:
+ /* not handled */
+ break;
+ }
+ _lock = false;
+}

bino-1.6.5.tar.xz/src/subtitledialog.h Added

@@ -0,0 +1,81 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SUBTITLEDIALOG_H
+#define SUBTITLEDIALOG_H
+
+#include "config.h"
+
+#include <QWidget>
+#include <QList>
+#include "dispatch.h"
+
+class QCheckBox;
+class QComboBox;
+class QFontComboBox;
+class QSpinBox;
+class QDoubleSpinBox;
+class QTextCodec;
+class QPushButton;
+
+class subtitle_dialog: public QWidget, public controller
+{
+ Q_OBJECT
+
+private:
+ bool _lock;
+ QCheckBox *_encoding_checkbox;
+ QComboBox *_encoding_combobox;
+ QCheckBox *_font_checkbox;
+ QFontComboBox *_font_combobox;
+ QCheckBox *_size_checkbox;
+ QSpinBox *_size_spinbox;
+ QCheckBox *_scale_checkbox;
+ QDoubleSpinBox *_scale_spinbox;
+ QCheckBox *_color_checkbox;
+ QPushButton *_color_button;
+ QCheckBox *_shadow_checkbox;
+ QComboBox *_shadow_combobox;
+ QColor _color;
+
+ QList<QTextCodec *> find_codecs();
+ void set_color_button(uint32_t c);
+
+private slots:
+ void color_button_clicked();
+ void encoding_changed();
+ void font_changed();
+ void size_changed();
+ void scale_changed();
+ void color_changed();
+ void shadow_changed();
+
+public:
+ subtitle_dialog(QWidget *parent = 0);
+
+ virtual void receive_notification(const notification &note);
+};
+
+#endif

bino-1.6.1.tar.xz/src/video_output.cpp -> bino-1.6.5.tar.xz/src/video_output.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, 2015
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <frederic.devernay@inrialpes.fr>
 * Joe <cuchac@email.cz>
@@ -31,15 +31,15 @@
 
 #include <GL/glew.h>
 
-#include "gettext.h"
-#define _(string) gettext(string)
+#include "base/exc.h"
+#include "base/msg.h"
+#include "base/str.h"
+#include "base/tmr.h"
+#include "base/blb.h"
+#include "base/dbg.h"
 
-#include "exc.h"
-#include "msg.h"
-#include "str.h"
-#include "timer.h"
-#include "blob.h"
-#include "dbg.h"
+#include "base/gettext.h"
+#define _(string) gettext(string)
 
 #include "color_matrix.h"
 #include "video_output.h"
@@ -841,13 +841,13 @@
 }
 
 std::string color_fs_src(VIDEO_OUTPUT_COLOR_FS_GLSL_STR);
- str::replace(color_fs_src, "$quality", quality_str);
- str::replace(color_fs_src, "$layout", layout_str);
- str::replace(color_fs_src, "$color_space", color_space_str);
- str::replace(color_fs_src, "$value_range", value_range_str);
- str::replace(color_fs_src, "$chroma_offset_x", chroma_offset_x_str);
- str::replace(color_fs_src, "$chroma_offset_y", chroma_offset_y_str);
- str::replace(color_fs_src, "$storage", storage_str);
+ color_fs_src = str::replace(color_fs_src, "$quality", quality_str);
+ color_fs_src = str::replace(color_fs_src, "$layout", layout_str);
+ color_fs_src = str::replace(color_fs_src, "$color_space", color_space_str);
+ color_fs_src = str::replace(color_fs_src, "$value_range", value_range_str);
+ color_fs_src = str::replace(color_fs_src, "$chroma_offset_x", chroma_offset_x_str);
+ color_fs_src = str::replace(color_fs_src, "$chroma_offset_y", chroma_offset_y_str);
+ color_fs_src = str::replace(color_fs_src, "$storage", storage_str);
 _color_prg[index] = xglCreateProgram("video_output_color", "", color_fs_src);
 xglLinkProgram("video_output_color", _color_prg[index]);
 for (int i = 0; i < (frame.stereo_layout == parameters::layout_mono ? 1 : 2); i++) {
@@ -926,11 +926,11 @@
 std::string coloradjust_str = (render_needs_coloradjust(_render_params) ? "coloradjust_enabled" : "coloradjust_disabled");
 std::string ghostbust_str = (render_needs_ghostbust(_render_params) ? "ghostbust_enabled" : "ghostbust_disabled");
 std::string render_fs_src(VIDEO_OUTPUT_RENDER_FS_GLSL_STR);
- str::replace(render_fs_src, "$quality", quality_str);
- str::replace(render_fs_src, "$mode", mode_str);
- str::replace(render_fs_src, "$subtitle", subtitle_str);
- str::replace(render_fs_src, "$coloradjust", coloradjust_str);
- str::replace(render_fs_src, "$ghostbust", ghostbust_str);
+ render_fs_src = str::replace(render_fs_src, "$quality", quality_str);
+ render_fs_src = str::replace(render_fs_src, "$mode", mode_str);
+ render_fs_src = str::replace(render_fs_src, "$subtitle", subtitle_str);
+ render_fs_src = str::replace(render_fs_src, "$coloradjust", coloradjust_str);
+ render_fs_src = str::replace(render_fs_src, "$ghostbust", ghostbust_str);
 _render_prg = xglCreateProgram("video_output_render", "", render_fs_src);
 xglLinkProgram("video_output_render", _render_prg);
 uint32_t dummy_texture = 0;

bino-1.6.1.tar.xz/src/video_output.h -> bino-1.6.5.tar.xz/src/video_output.h Changed

bino-1.6.1.tar.xz/src/video_output_qt.cpp -> bino-1.6.5.tar.xz/src/video_output_qt.cpp Changed

bino-1.6.1.tar.xz/src/video_output_qt.h -> bino-1.6.5.tar.xz/src/video_output_qt.h Changed

bino-1.6.5.tar.xz/src/videodialog.cpp Added

@@ -0,0 +1,276 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <complex>
+
+#include <QLabel>
+#include <QComboBox>
+#include <QDoubleSpinBox>
+#include <QGridLayout>
+
+#include "videodialog.h"
+
+#include "gui_common.h"
+
+video_dialog::video_dialog(QWidget *parent) : QWidget(parent), _lock(false)
+{
+ QLabel *crop_ar_label = new QLabel(_("Crop to aspect ratio:"));
+ crop_ar_label->setToolTip(_("Set the real aspect ratio of the video, so that borders can be cropped."));
+ _crop_ar_combobox = new QComboBox();
+ _crop_ar_combobox->setToolTip(crop_ar_label->toolTip());
+ _crop_ar_combobox->addItem(_("Do not crop"));
+ _crop_ar_combobox->addItem("16:10");
+ _crop_ar_combobox->addItem("16:9");
+ _crop_ar_combobox->addItem("1.85:1");
+ _crop_ar_combobox->addItem("2.21:1");
+ _crop_ar_combobox->addItem("2.35:1");
+ _crop_ar_combobox->addItem("2.39:1");
+ _crop_ar_combobox->addItem("5:3");
+ _crop_ar_combobox->addItem("4:3");
+ _crop_ar_combobox->addItem("5:4");
+ _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."));
+ _p_slider = new QSlider(Qt::Horizontal);
+ _p_slider->setToolTip(p_label->toolTip());
+ _p_slider->setRange(-1000, 1000);
+ connect(_p_slider, SIGNAL(valueChanged(int)), this, SLOT(p_slider_changed(int)));
+ _p_spinbox = new QDoubleSpinBox();
+ _p_spinbox->setToolTip(p_label->toolTip());
+ _p_spinbox->setRange(-1.0, +1.0);
+ _p_spinbox->setDecimals(2);
+ _p_spinbox->setSingleStep(0.01);
+ connect(_p_spinbox, SIGNAL(valueChanged(double)), this, SLOT(p_spinbox_changed(double)));
+
+ QLabel *sp_label = new QLabel(_("Subtitle parallax:"));
+ sp_label->setToolTip(_("Adjust subtitle parallax, from -1 to +1. This changes the perceived distance "
+ "of the subtitles."));
+ _sp_slider = new QSlider(Qt::Horizontal);
+ _sp_slider->setToolTip(sp_label->toolTip());
+ _sp_slider->setRange(-1000, 1000);
+ connect(_sp_slider, SIGNAL(valueChanged(int)), this, SLOT(sp_slider_changed(int)));
+ _sp_spinbox = new QDoubleSpinBox();
+ _sp_spinbox->setToolTip(sp_label->toolTip());
+ _sp_spinbox->setRange(-1.0, +1.0);
+ _sp_spinbox->setDecimals(2);
+ _sp_spinbox->setSingleStep(0.01);
+ connect(_sp_spinbox, SIGNAL(valueChanged(double)), this, SLOT(sp_spinbox_changed(double)));
+
+ QLabel *g_label = new QLabel(_("Ghostbusting:"));
+ g_label->setToolTip(_("Set the amount of crosstalk ghostbusting, from 0 to 1. "
+ "You need to set the crosstalk levels of your display first. "
+ "Note that crosstalk ghostbusting does not work with anaglyph glasses."));
+ _g_slider = new QSlider(Qt::Horizontal);
+ _g_slider->setToolTip(g_label->toolTip());
+ _g_slider->setRange(0, 1000);
+ connect(_g_slider, SIGNAL(valueChanged(int)), this, SLOT(g_slider_changed(int)));
+ _g_spinbox = new QDoubleSpinBox();
+ _g_spinbox->setToolTip(g_label->toolTip());
+ _g_spinbox->setRange(0.0, +1.0);
+ _g_spinbox->setDecimals(2);
+ _g_spinbox->setSingleStep(0.01);
+ connect(_g_spinbox, SIGNAL(valueChanged(double)), this, SLOT(g_spinbox_changed(double)));
+
+ QGridLayout *layout = new QGridLayout;
+ layout->addWidget(crop_ar_label, 0, 0);
+ layout->addWidget(_crop_ar_combobox, 0, 1, 1, 2);
+ 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);
+ setLayout(layout);
+
+ update();
+}
+
+void video_dialog::update()
+{
+ _lock = true;
+ set_crop_ar(dispatch::parameters().crop_aspect_ratio());
+ _p_slider->setValue(dispatch::parameters().parallax() * 1000.0f);
+ _p_spinbox->setValue(dispatch::parameters().parallax());
+ _sp_slider->setValue(dispatch::parameters().subtitle_parallax() * 1000.0f);
+ _sp_spinbox->setValue(dispatch::parameters().subtitle_parallax());
+ _g_slider->setValue(dispatch::parameters().ghostbust() * 1000.0f);
+ _g_spinbox->setValue(dispatch::parameters().ghostbust());
+ _lock = false;
+}
+
+void video_dialog::set_crop_ar(float value)
+{
+ _crop_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::crop_ar_changed()
+{
+ if (!_lock)
+ {
+ int i = _crop_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_crop_aspect_ratio, ar);
+ }
+}
+
+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)
+ send_cmd(command::set_parallax, val / 1000.0f);
+}
+
+void video_dialog::p_spinbox_changed(double val)
+{
+ if (!_lock)
+ send_cmd(command::set_parallax, static_cast<float>(val));
+}
+
+void video_dialog::sp_slider_changed(int val)
+{
+ if (!_lock)
+ send_cmd(command::set_subtitle_parallax, val / 1000.0f);
+}
+
+void video_dialog::sp_spinbox_changed(double val)
+{
+ if (!_lock)
+ send_cmd(command::set_subtitle_parallax, static_cast<float>(val));
+}
+
+void video_dialog::g_slider_changed(int val)
+{
+ if (!_lock)
+ send_cmd(command::set_ghostbust, val / 1000.0f);
+}
+
+void video_dialog::g_spinbox_changed(double val)
+{
+ if (!_lock)
+ send_cmd(command::set_ghostbust, static_cast<float>(val));
+}
+
+void video_dialog::receive_notification(const notification &note)
+{
+ switch (note.type)
+ {
+ case notification::crop_aspect_ratio:
+ case notification::source_aspect_ratio:
+ case notification::parallax:
+ case notification::subtitle_parallax:
+ case notification::ghostbust:
+ update();
+ break;
+ default:
+ /* not handled */
+ break;
+ }
+}

bino-1.6.5.tar.xz/src/videodialog.h Added

@@ -0,0 +1,73 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef VIDEODIALOG_H
+#define VIDEODIALOG_H
+
+#include "config.h"
+
+#include <QWidget>
+#include "dispatch.h"
+
+class QComboBox;
+class QDoubleSpinBox;
+class QSlider;
+
+class video_dialog : public QWidget, public controller
+{
+ Q_OBJECT
+
+private:
+ bool _lock;
+ QComboBox *_crop_ar_combobox;
+ QComboBox *_source_ar_combobox;
+ QDoubleSpinBox *_p_spinbox;
+ QSlider *_p_slider;
+ QDoubleSpinBox *_sp_spinbox;
+ QSlider *_sp_slider;
+ QDoubleSpinBox *_g_spinbox;
+ 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);
+ void sp_spinbox_changed(double val);
+ void g_slider_changed(int val);
+ void g_spinbox_changed(double val);
+
+public:
+ video_dialog(QWidget *parent = 0);
+ void update();
+
+ virtual void receive_notification(const notification &note);
+};
+
+#endif

bino-1.6.5.tar.xz/src/zoomdialog.cpp Added

@@ -0,0 +1,95 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <QLabel>
+#include <QDoubleSpinBox>
+#include <QSlider>
+#include <QPushButton>
+#include <QGridLayout>
+
+#include "zoomdialog.h"
+
+#include "gui_common.h"
+
+zoom_dialog::zoom_dialog(QWidget *parent) : QWidget(parent), _lock(false)
+{
+ QLabel *info_label = new QLabel(_(
+ "Set zoom level for videos that "
+ "are wider than the screen: "
+ "0: Show full video width. "
+ "1: Use full screen height."));
+ QLabel *z_label = new QLabel(_("Zoom:"));
+ z_label->setToolTip(_("Set the zoom level for videos that are wider than the screen."));
+ _z_slider = new QSlider(Qt::Horizontal);
+ _z_slider->setRange(0, 1000);
+ _z_slider->setValue(dispatch::parameters().zoom() * 1000.0f);
+ _z_slider->setToolTip(z_label->toolTip());
+ connect(_z_slider, SIGNAL(valueChanged(int)), this, SLOT(z_slider_changed(int)));
+ _z_spinbox = new QDoubleSpinBox();
+ _z_spinbox->setRange(0.0, 1.0);
+ _z_spinbox->setValue(dispatch::parameters().zoom());
+ _z_spinbox->setDecimals(2);
+ _z_spinbox->setSingleStep(0.01);
+ _z_spinbox->setToolTip(z_label->toolTip());
+ connect(_z_spinbox, SIGNAL(valueChanged(double)), this, SLOT(z_spinbox_changed(double)));
+
+ QGridLayout *layout = new QGridLayout;
+ layout->addWidget(info_label, 0, 0, 1, 3);
+ layout->addWidget(z_label, 1, 0);
+ layout->addWidget(_z_slider, 1, 1);
+ layout->addWidget(_z_spinbox, 1, 2);
+ setLayout(layout);
+}
+
+void zoom_dialog::z_slider_changed(int val)
+{
+ if (!_lock)
+ send_cmd(command::set_zoom, val / 1000.0f);
+}
+
+void zoom_dialog::z_spinbox_changed(double val)
+{
+ if (!_lock)
+ send_cmd(command::set_zoom, static_cast<float>(val));
+}
+
+void zoom_dialog::receive_notification(const notification &note)
+{
+ switch (note.type)
+ {
+ case notification::zoom:
+ _lock = true;
+ _z_slider->setValue(dispatch::parameters().zoom() * 1000.0f);
+ _z_spinbox->setValue(dispatch::parameters().zoom());
+ _lock = false;
+ break;
+ default:
+ /* not handled */
+ break;
+ }
+}

bino-1.6.5.tar.xz/src/zoomdialog.h Added

@@ -0,0 +1,56 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ZOOMDIALOG_H
+#define ZOOMDIALOG_H
+
+#include "config.h"
+
+#include <QWidget>
+#include "dispatch.h"
+
+class QDoubleSpinBox;
+class QSlider;
+
+class zoom_dialog : public QWidget, public controller
+{
+ Q_OBJECT
+
+private:
+ bool _lock;
+ QDoubleSpinBox *_z_spinbox;
+ QSlider *_z_slider;
+
+private slots:
+ void z_slider_changed(int val);
+ void z_spinbox_changed(double val);
+
+public:
+ zoom_dialog(QWidget *parent = 0);
+
+ virtual void receive_notification(const notification &note);
+};
+
+#endif