Packman Build Service PMBS

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

Changes of Revision 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;

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()

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;
- }

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();

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) {

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.

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

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))

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/[^.]*//'`

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

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2014-05-01'
+timestamp='2016-11-04'
 
 # 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
@@ -25,7 +25,7 @@
 # of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -33,7 +33,7 @@
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# 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
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,8 +53,7 @@
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
- $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
@@ -68,7 +67,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-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."
@@ -117,8 +116,8 @@
 case $maybe_os in
 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
 linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+ kopensolaris*-gnu* | cloudabi*-eabi* | \
 storm-chaos* | os2-emx* | rtmk-nova*)
 os=-$maybe_os
 basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
@@ -255,12 +254,13 @@
 	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
+	| ba \
 	| be32 | be64 \
 	| bfin \
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
+	| e2k | epiphany \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
@@ -301,10 +301,12 @@
 	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pru \
 	| pyramid \
+	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -312,6 +314,7 @@
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -326,6 +329,9 @@
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -371,12 +377,13 @@
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| ba-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
+	| e2k-* | elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -422,13 +429,15 @@
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pru-* \
 	| pyramid-* \
+	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile*-* \
@@ -436,6 +445,7 @@
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -512,6 +522,9 @@
 		basic_machine=i386-pc
 		os=-aros
 		;;
+	asmjs)
+		basic_machine=asmjs-unknown
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -632,6 +645,14 @@
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
+	e500v[12])
+		basic_machine=powerpc-unknown
+		os=$os"spe"
+		;;
+	e500v[12]-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=$os"spe"
+		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
@@ -773,6 +794,9 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -828,6 +852,10 @@
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -1004,7 +1032,7 @@
 	ppc-* | ppcbe-*)
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
+	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown

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/

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 @@

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"
+

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"

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

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"

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

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 "Красно-голубые очки, половина цветности"

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 "红蓝眼镜，半彩色"

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) \

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));
+ }
+ }
+ }

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) {

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.

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;
+ }

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;

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;

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()

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);
+ }

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();

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;

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:

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");
+ }

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);

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();
+}
+

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

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