Packman Build Service PMBS

Changes of Revision 11

bino.changes Changed

@@ -1,4 +1,28 @@
 -------------------------------------------------------------------
+Sun Mar 18 14:38:26 UTC 2012 - pascal.bleser@opensuse.org
+
+- update to 1.3.2:
+  * several bugs were fixed and compatibility with different systems and
+    graphics drivers was improved
+  * support for single-frame stepping was added
+
+-------------------------------------------------------------------
+Thu Mar 15 18:57:54 UTC 2012 - pascal.bleser@opensuse.org
+
+- update to 1.3.1:
+  * the internal structure was reworked completely, and needs to be tested for
+    compatibility with graphics drivers
+  * a new output mode, "Left/right view alternating" (also known as "frame
+    sequential"), has been added for "3-D Ready" projectors
+- changes from 1.3.0:
+  * better support for audio control
+  * support for high precision color input and output with 30 bits per pixel
+  * support for the MPO file format
+  * adjustable zoom mode
+  * support for multimedia keyboards
+  * various user interface tweaks
+
+-------------------------------------------------------------------
 Fri Oct 14 21:59:50 UTC 2011 - pascal.bleser@opensuse.org
 
 - update to 1.2.1:

bino.spec Changed

@@ -1,37 +1,41 @@
 # vim: set sw=4 ts=4 et nu:
+# Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
 
-%if 0
-# not yet
-%if 0%{?suse_version} >= 1120
-%define with_equalizer 1
-%endif
-%endif
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 
-Name: bino
-Version: 1.2.1
-Release: 0.pm.1
-Summary: Video Player with 3D and Multi-Display Video Support
-# http://download.savannah.gnu.org/releases/bino/bino-%{version}.tar.xz
-Source: bino-%{version}.tar.bz2
-Source1: bino.desktop
-Patch1: bino-backport-qvariant.patch
-URL: http://www.nongnu.org/bino/
-Group: Productivity/Multimedia/Video/Players
-License: GNU General Public License version 2 or later (GPL v2 or later)
-BuildRoot: %{_tmppath}/build-%{name}-%{version}
-BuildRequires: libqt4-devel
-BuildRequires: glew-devel >= 1.5.0
-BuildRequires: ffmpeg-devel
-BuildRequires: libass-devel
-BuildRequires: openal-devel
-BuildRequires: gcc-c++ make glibc-devel pkgconfig
-BuildRequires: autoconf automake libtool
-BuildRequires: hicolor-icon-theme
-BuildRequires: update-desktop-files
-%if 0%{?with_equalizer}
-BuildRequires: equalizer-devel
-%endif
-Requires: %install_info_prereq
+Name: bino
+Version: 1.3.2
+Release: 0.pm.1
+Summary: Video Player with 3D and Multi-Display Video Support
+Source: http://download.savannah.gnu.org/releases/bino/bino-%{version}.tar.xz
+##Source: bino-%{version}.tar.bz2
+Source1: bino.desktop
+Patch1: bino-backport-qvariant.patch
+URL: http://www.nongnu.org/bino/
+Group: Productivity/Multimedia/Video/Players
+License: GNU General Public License version 2 or later (GPL v2 or later)
+BuildRoot: %{_tmppath}/build-%{name}-%{version}
+BuildRequires: libqt4-devel
+BuildRequires: glew-devel >= 1.5.0
+BuildRequires: ffmpeg-devel
+BuildRequires: libass-devel
+BuildRequires: openal-devel
+BuildRequires: gcc-c++ make glibc-devel pkgconfig
+BuildRequires: autoconf automake libtool
+BuildRequires: hicolor-icon-theme
+BuildRequires: update-desktop-files
+BuildRequires: equalizer-devel
+BuildRequires: xz
+Requires: %install_info_prereq
 
 %description
 Bino is a video player with two special features:
@@ -47,12 +51,10 @@
 
 %build
 %configure \
-%if 0%{?with_equalizer}
 --with-equalizer \
-%endif
 --disable-silent-rules
 
-%__make %{?jobs:-j%{jobs}}
+%__make %{?_smp_flags}
 
 %install
 %makeinstall
@@ -82,3 +84,5 @@
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/*/*/apps/bino.*
 
+%changelog
+

bino-1.2.1.tar.bz2/src/controller.cpp Deleted

@@ -1,172 +0,0 @@
-/*
- * This file is part of bino, a 3D video player.
- *
- * Copyright (C) 2010-2011
- * 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 <vector>
-
-#include "exc.h"
-#include "dbg.h"
-#include "msg.h"
-#include "timer.h"
-#include "thread.h"
-
-#include "controller.h"
-#include "player.h"
-
-
-// The single player instance
-static player *global_player;
-
-// The list of registered controllers
-static std::vector<controller *> global_controllers;
-static unsigned int global_controllers_version;
-static mutex global_controllers_mutex;
-
-// Note about thread safety:
-// Only the constructor and destructor are thread safe (by using a lock on the
-// global_controllers vector). The visitation of controllers and the actions
-// performed as a result are supposed to happen inside a single thread.
-
-controller::controller() throw ()
-{
- global_controllers_mutex.lock();
- global_controllers.push_back(this);
- global_controllers_version++;
- global_controllers_mutex.unlock();
-}
-
-controller::~controller()
-{
- global_controllers_mutex.lock();
- for (size_t i = 0; i < global_controllers.size(); i++)
- {
- if (global_controllers[i] == this)
- {
- global_controllers.erase(global_controllers.begin() + i);
- break;
- }
- }
- global_controllers_version++;
- global_controllers_mutex.unlock();
-}
-
-void controller::send_cmd(const command &cmd)
-{
- if (global_player)
- {
- global_player->receive_cmd(cmd);
- }
-}
-
-void controller::receive_notification(const notification &)
-{
- /* default: ignore the notification */
-}
-
-void controller::process_events()
-{
- /* default: do nothing */
-}
-
-void *controller::get_global_player()
-{
- return global_player;
-}
-
-void controller::set_global_player(void *p)
-{
- assert(!p || !global_player); // there can be at most one global player
- global_player = static_cast<player *>(p);
-}
-
-void controller::visit_all_controllers(int action, const notification &note)
-{
- std::vector<controller *> visited_controllers;
- visited_controllers.reserve(global_controllers.size());
-
- // First, try to visit all controllers in one row without extra checks. This
- // only works as long as controllers do not vanish or appear as a result of
- // the function we call. This is the common case.
- unsigned int controllers_version = global_controllers_version;
- for (size_t i = 0; i < global_controllers.size(); i++)
- {
- controller *c = global_controllers[i];
- if (action == 0)
- {
- c->process_events();
- }
- else
- {
- c->receive_notification(note);
- }
- visited_controllers.push_back(c);
- if (controllers_version != global_controllers_version)
- {
- break;
- }
- }
- // If some controllers vanished or appeared, we need to redo the loop and
- // check for each controller if it was visited before. This is costly, but
- // it happens seldomly.
- while (controllers_version != global_controllers_version)
- {
- controllers_version = global_controllers_version;
- for (size_t i = 0; i < global_controllers.size(); i++)
- {
- controller *c = global_controllers[i];
- bool visited = false;
- for (size_t j = 0; j < visited_controllers.size(); j++)
- {
- if (visited_controllers[j] == c)
- {
- visited = true;
- break;
- }
- }
- if (!visited)
- {
- if (action == 0)
- {
- c->process_events();
- }
- else
- {
- c->receive_notification(note);
- }
- visited_controllers.push_back(c);
- if (controllers_version != global_controllers_version)
- {
- break;
- }
- }
- }
- }
-}
-
-void controller::process_all_events()
-{
- visit_all_controllers(0, notification(notification::play));
-}
-
-void controller::notify_all(const notification &note)
-{
- visit_all_controllers(1, note);
-}

bino-1.2.1.tar.bz2/src/controller.h Deleted

@@ -1,277 +0,0 @@
-/*
- * This file is part of bino, a 3D video player.
- *
- * Copyright (C) 2010-2011
- * Martin Lambers <marlam@marlam.de>
- * Joe <cuchac@email.cz>
- *
- * 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 CONTROLLER_H
-#define CONTROLLER_H
-
-#include <string>
-#include <sstream>
-#include <stdint.h>
-
-#include "s11n.h"
-
-
-/* A controller can send commands to the player (e.g. "pause", "seek",
- * "adjust colors", ...). The player then reacts on this command, and sends
- * a notification to all controllers afterwards. The controllers may react
- * on the notification or ignore it.
- *
- * For example, the video output controller may notice that the user pressed the
- * 'p' key to pause the video. So it sends the "pause" command to the player.
- * The player updates its state accordingly, and notifies all controllers that
- * the video is now paused. The video output could use this notification to display
- * a pause symbol on screen, and the audio output controller may play a pause jingle
- * (however, in the case of pause, both currently simply ignore the notification).
- */
-
-// A command that can be sent to the player by a controller.
-
-class command
-{
-public:
- enum type
- {
- noop, // no parameters
- toggle_play, // no parameters
- toggle_pause, // no parameters
- cycle_video_stream, // no parameters
- set_video_stream, // int
- cycle_audio_stream, // no parameters
- set_audio_stream, // int
- cycle_subtitle_stream, // no parameters
- set_subtitle_stream, // int
- set_stereo_layout, // video_frame::stereo_layout, bool
- set_stereo_mode, // parameters::stereo_mode, bool
- toggle_stereo_mode_swap, // no parameters
- toggle_fullscreen, // no parameters
- center, // no parameters
- adjust_contrast, // float (relative adjustment)
- set_contrast, // float (absolute value)
- adjust_brightness, // float (relative adjustment)
- set_brightness, // float (absolute value)
- adjust_hue, // float (relative adjustment)
- set_hue, // float (absolute value)
- adjust_saturation, // float (relative adjustment)
- set_saturation, // float (absolute value)
- adjust_parallax, // float (relative adjustment)
- set_parallax, // float (absolute value)
- set_crosstalk, // 3 floats (absolute values)
- adjust_ghostbust, // float (relative adjustment)
- set_ghostbust, // float (absolute value)
- set_subtitle_encoding, // string (encoding name)
- set_subtitle_font, // string (font name)
- set_subtitle_size, // int
- set_subtitle_scale, // float
- set_subtitle_color, // uint64_t
- adjust_subtitle_parallax, // float (relative adjustment)
- set_subtitle_parallax, // float (absolute value)
- seek, // float (relative adjustment)
- set_pos, // float (absolute position)
- set_loop_mode, // parameters::loop_mode_t
- set_fullscreen_screens, // int
- set_fullscreen_flip_left, // int
- set_fullscreen_flop_left, // int
- set_fullscreen_flip_right, // int
- set_fullscreen_flop_right, // int
- };
- 
- type type;
- std::string param;
-
- command() :
- type(noop)
- {
- }
-
- command(enum type t) :
- type(t)
- {
- }
-
- command(enum type t, int p) :
- type(t)
- {
- std::ostringstream oss;
- s11n::save(oss, p);
- param = oss.str();
- }
-
- command(enum type t, float p) :
- type(t)
- {
- std::ostringstream oss;
- s11n::save(oss, p);
- param = oss.str();
- }
-
- command(enum type t, const std::string &p) :
- type(t), param(p)
- {
- }
-};
-
-// A notification that can be sent to controllers by the player.
-
-class notification
-{
-public:
- enum type
- {
- play, // bool
- pause, // bool
- video_stream, // int
- audio_stream, // int
- subtitle_stream, // int
- stereo_layout, // video_frame::stereo_layout, bool
- stereo_mode, // parameters::stereo_mode, bool
- stereo_mode_swap, // bool
- fullscreen, // bool
- center, // bool
- contrast, // float
- brightness, // float
- hue, // float
- saturation, // float
- parallax, // float
- crosstalk, // 3 floats
- ghostbust, // float
- subtitle_encoding, // string
- subtitle_font, // string
- subtitle_size, // int
- subtitle_scale, // float
- subtitle_color, // uint64_t
- subtitle_parallax, // float
- pos, // float
- loop_mode, // parameters::loop_mode_t
- fullscreen_screens, // int
- fullscreen_flip_left, // int
- fullscreen_flop_left, // int
- fullscreen_flip_right, // int
- fullscreen_flop_right, // int
- };
- 
- type type;
- std::string previous; // previous value of the state indicated by type
- std::string current; // current value of the state indicated by type
-
- notification(enum type t) :
- type(t)
- {
- }
-
- notification(enum type t, bool p, bool c) :
- type(t)
- {
- std::ostringstream ossp;
- s11n::save(ossp, p);
- previous = ossp.str();
- std::ostringstream ossc;
- s11n::save(ossc, c);
- current = ossc.str();
- }
-
- notification(enum type t, int p, int c) :
- type(t)
- {
- std::ostringstream ossp;
- s11n::save(ossp, p);
- previous = ossp.str();
- std::ostringstream ossc;
- s11n::save(ossc, c);
- current = ossc.str();
- }
-
- notification(enum type t, float p, float c) :
- type(t)
- {
- std::ostringstream ossp;
- s11n::save(ossp, p);
- previous = ossp.str();
- std::ostringstream ossc;
- s11n::save(ossc, c);
- current = ossc.str();
- }
-
- notification(enum type t, uint64_t p, uint64_t c) :
- type(t)
- {
- std::ostringstream ossp;
- s11n::save(ossp, p);
- previous = ossp.str();
- std::ostringstream ossc;
- s11n::save(ossc, c);
- current = ossc.str();
- }
-
- notification(enum type t, const std::string &p, const std::string &c) :
- type(t)
- {
- std::ostringstream ossp;
- s11n::save(ossp, p);
- previous = ossp.str();
- std::ostringstream ossc;
- s11n::save(ossc, c);
- current = ossc.str();
- }
-};
-
-// The controller interface.
-
-class controller
-{
-private:
- static void visit_all_controllers(int action, const notification &note);
-
-public:
- controller() throw ();
- virtual ~controller();
-
- /* The controller uses this function to send a command to the player. */
- void send_cmd(const command &cmd);
- // Convenience wrappers:
- void send_cmd(enum command::type t) { send_cmd(command(t)); }
- void send_cmd(enum command::type t, int p) { send_cmd(command(t, p)); }
- void send_cmd(enum command::type t, float p) { send_cmd(command(t, p)); }
- void send_cmd(enum command::type t, const std::string &p) { send_cmd(command(t, p)); }
-
- /* The controller receives notifications via this function. The default
- * implementation simply ignores the notification. */
- virtual void receive_notification(const notification &note);
-
- /* The controller is asked to process events via this function. The default
- * implementation simply does nothing. */
- virtual void process_events();
-
- /* The following functions can be used by command dispatchers to handle all
- * controller-related tasks: managing the global player object, and notifying
- * registered controllers. */
- static void *get_global_player();
- static void set_global_player(void *p);
- static void process_all_events();
- static void notify_all(const notification &note);
- // Convenience wrappers:
- static void notify_all(enum notification::type t, bool p, bool c) { notify_all(notification(t, p, c)); }
- static void notify_all(enum notification::type t, int p, int c) { notify_all(notification(t, p, c)); }
- static void notify_all(enum notification::type t, float p, float c) { notify_all(notification(t, p, c)); }
- static void notify_all(enum notification::type t, uint64_t p, uint64_t c) { notify_all(notification(t, p, c)); }
- static void notify_all(enum notification::type t, const std::string &p, const std::string &c) { notify_all(notification(t, p, c)); }
-};
-
-#endif

bino-1.2.1.tar.bz2/src/player_qt.cpp Deleted

@@ -1,3034 +0,0 @@
-/*
- * This file is part of bino, a 3D video player.
- *
- * Copyright (C) 2010-2011
- * Martin Lambers <marlam@marlam.de>
- * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
- * Joe <cuchac@email.cz>
- *
- * 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 <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 <QStandardItemModel>
-#include <QTextBrowser>
-#include <QTabWidget>
-#include <QList>
-#include <QTextCodec>
-#include <QRegExp>
-#include <QMap>
-#include <QColorDialog>
-#include <QDesktopWidget>
-#include <QRadioButton>
-#include <QRegExpValidator>
-
-#include "gettext.h"
-#define _(string) gettext(string)
-
-#include "player_qt.h"
-#include "video_output_qt.h"
-#include "lib_versions.h"
-
-#include "dbg.h"
-#include "msg.h"
-
-
-// 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));
-}
-
-
-player_qt_internal::player_qt_internal(video_output_qt *video_output) :
- player(player::master), _playing(false), _video_output(video_output)
-{
-}
-
-player_qt_internal::~player_qt_internal()
-{
-}
-
-video_output *player_qt_internal::create_video_output()
-{
- return _video_output;
-}
-
-void player_qt_internal::destroy_video_output(video_output *)
-{
- // do nothing; we reuse our video output later
-}
-
-void player_qt_internal::receive_cmd(const command &cmd)
-{
- if (cmd.type == command::toggle_play && has_media_input() && !_playing)
- {
- controller::notify_all(notification::play, false, true);
- }
- else if (_playing)
- {
- player::receive_cmd(cmd);
- }
-}
-
-void player_qt_internal::receive_notification(const notification &note)
-{
- if (note.type == notification::play)
- {
- std::istringstream iss(note.current);
- s11n::load(iss, _playing);
- }
-}
-
-const video_output_qt *player_qt_internal::get_video_output() const
-{
- return _video_output;
-}
-
-video_output_qt *player_qt_internal::get_video_output()
-{
- return _video_output;
-}
-
-bool player_qt_internal::is_playing() const
-{
- return _playing;
-}
-
-bool player_qt_internal::playloop_step()
-{
- return run_step();
-}
-
-void player_qt_internal::force_stop()
-{
- controller::notify_all(notification::play, false, false);
-}
-
-void player_qt_internal::move_event()
-{
- if (_video_output)
- {
- _video_output->move_event();
- }
-}
-
-
-in_out_widget::in_out_widget(QSettings *settings, const player_qt_internal *player, QWidget *parent) :
- QWidget(parent), _settings(settings), _player(player), _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-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-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 method"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, half-color method"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, full-color method"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, high-quality Dubois method"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, monochrome method"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, half-color method"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, full-color method"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, high-quality Dubois method"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, monochrome method"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, half-color method"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, full-color method"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, high-quality Dubois method"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-red-green.png"), _("Red/green glasses, monochrome method"));
- _output_combobox->addItem(QIcon(":icons-local/output-type-red-blue.png"), _("Red/blue glasses, monochrome method"));
- 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);
-}
-
-in_out_widget::~in_out_widget()
-{
-}
-
-void in_out_widget::set_stereo_layout(video_frame::stereo_layout_t stereo_layout, bool stereo_layout_swap)
-{
- switch (stereo_layout)
- {
- case video_frame::mono:
- _input_combobox->setCurrentIndex(0);
- break;
- case video_frame::separate:
- _input_combobox->setCurrentIndex(stereo_layout_swap ? 2 : 1);
- break;
- case video_frame::top_bottom:
- _input_combobox->setCurrentIndex(stereo_layout_swap ? 5 : 3);
- break;
- case video_frame::top_bottom_half:
- _input_combobox->setCurrentIndex(stereo_layout_swap ? 6 : 4);
- break;
- case video_frame::left_right:
- _input_combobox->setCurrentIndex(stereo_layout_swap ? 9: 7);
- break;
- case video_frame::left_right_half:
- _input_combobox->setCurrentIndex(stereo_layout_swap ? 10 : 8);
- break;
- case video_frame::even_odd_rows:
- _input_combobox->setCurrentIndex(stereo_layout_swap ? 12 : 11);
- break;
- }
- _video_combobox->setEnabled(stereo_layout != video_frame::separate);
-}
-
-void in_out_widget::set_stereo_mode(parameters::stereo_mode_t stereo_mode, bool stereo_mode_swap)
-{
- switch (stereo_mode)
- {
- default:
- case parameters::mono_left:
- _output_combobox->setCurrentIndex(0);
- break;
- case parameters::mono_right:
- _output_combobox->setCurrentIndex(1);
- break;
- case parameters::stereo:
- _output_combobox->setCurrentIndex(2);
- break;
- case parameters::top_bottom:
- _output_combobox->setCurrentIndex(3);
- break;
- case parameters::top_bottom_half:
- _output_combobox->setCurrentIndex(4);
- break;
- case parameters::left_right:
- _output_combobox->setCurrentIndex(5);
- break;
- case parameters::left_right_half:
- _output_combobox->setCurrentIndex(6);
- break;
- case parameters::even_odd_rows:
- _output_combobox->setCurrentIndex(7);
- break;
- case parameters::even_odd_columns:
- _output_combobox->setCurrentIndex(8);
- break;
- case parameters::checkerboard:
- _output_combobox->setCurrentIndex(9);
- break;
- case parameters::hdmi_frame_pack:
- _output_combobox->setCurrentIndex(10);
- break;
- case parameters::red_cyan_monochrome:
- _output_combobox->setCurrentIndex(11);
- break;
- case parameters::red_cyan_half_color:
- _output_combobox->setCurrentIndex(12);
- break;
- case parameters::red_cyan_full_color:
- _output_combobox->setCurrentIndex(13);
- break;
- case parameters::red_cyan_dubois:
- _output_combobox->setCurrentIndex(14);
- break;
- case parameters::green_magenta_monochrome:
- _output_combobox->setCurrentIndex(15);
- break;
- case parameters::green_magenta_half_color:
- _output_combobox->setCurrentIndex(16);
- break;
- case parameters::green_magenta_full_color:
- _output_combobox->setCurrentIndex(17);
- break;
- case parameters::green_magenta_dubois:
- _output_combobox->setCurrentIndex(18);
- break;
- case parameters::amber_blue_monochrome:
- _output_combobox->setCurrentIndex(19);
- break;
- case parameters::amber_blue_half_color:
- _output_combobox->setCurrentIndex(20);
- break;
- case parameters::amber_blue_full_color:
- _output_combobox->setCurrentIndex(21);
- break;
- case parameters::amber_blue_dubois:
- _output_combobox->setCurrentIndex(22);
- break;
- case parameters::red_green_monochrome:
- _output_combobox->setCurrentIndex(23);
- break;
- case parameters::red_blue_monochrome:
- _output_combobox->setCurrentIndex(24);
- break;
- }
- _swap_checkbox->setChecked(stereo_mode_swap);
-}
-
-void in_out_widget::video_changed()
-{
- if (!_lock)
- {
- video_frame::stereo_layout_t stereo_layout;
- bool stereo_layout_swap;
- get_stereo_layout(stereo_layout, stereo_layout_swap);
- send_cmd(command::set_video_stream, _video_combobox->currentIndex());
- }
-}
-
-void in_out_widget::audio_changed()
-{
- if (!_lock)
- {
- send_cmd(command::set_audio_stream, _audio_combobox->currentIndex());
- }
-}
-
-void in_out_widget::subtitle_changed()
-{
- if (!_lock)
- {
- send_cmd(command::set_subtitle_stream, _subtitle_combobox->currentIndex() - 1);
- }
-}
-
-void in_out_widget::input_changed()
-{
- video_frame::stereo_layout_t stereo_layout;
- bool stereo_layout_swap;
- get_stereo_layout(stereo_layout, stereo_layout_swap);
- if (stereo_layout == video_frame::separate)
- {
- _lock = true;
- _video_combobox->setCurrentIndex(0);
- _video_combobox->setEnabled(false);
- _lock = false;
- }
- else
- {
- _video_combobox->setEnabled(true);
- }
- std::ostringstream oss;
- s11n::save(oss, static_cast<int>(stereo_layout));
- s11n::save(oss, stereo_layout_swap);
- send_cmd(command::set_stereo_layout, oss.str());
- parameters::stereo_mode_t stereo_mode;
- bool stereo_mode_swap;
- get_stereo_mode(stereo_mode, stereo_mode_swap);
- if (stereo_layout == video_frame::mono
- && !(stereo_mode == parameters::mono_left || stereo_mode == parameters::mono_right))
- {
- QString s = _settings->value("Session/2d-stereo-mode", "").toString();
- parameters::stereo_mode_from_string(s.toStdString(), stereo_mode, stereo_mode_swap);
- set_stereo_mode(stereo_mode, stereo_mode_swap);
- }
- else if (stereo_layout != video_frame::mono
- && (stereo_mode == parameters::mono_left || stereo_mode == parameters::mono_right))
- {
- QString s = _settings->value("Session/3d-stereo-mode", "").toString();
- parameters::stereo_mode_from_string(s.toStdString(), stereo_mode, stereo_mode_swap);
- set_stereo_mode(stereo_mode, stereo_mode_swap);
- }
-}
-
-void in_out_widget::output_changed()
-{
- parameters::stereo_mode_t stereo_mode;
- bool stereo_mode_swap;
- get_stereo_mode(stereo_mode, stereo_mode_swap);
- std::ostringstream oss;
- s11n::save(oss, static_cast<int>(stereo_mode));
- s11n::save(oss, stereo_mode_swap);
- send_cmd(command::set_stereo_mode, oss.str());
-}
-
-void in_out_widget::swap_changed()
-{
- if (!_lock)
- {
- send_cmd(command::toggle_stereo_mode_swap);
- }
-}
-
-void in_out_widget::update(const player_init_data &init_data, bool have_valid_input, bool playing)
-{
- _lock = true;
- _video_combobox->setEnabled(have_valid_input);
- _audio_combobox->setEnabled(have_valid_input);
- _subtitle_combobox->setEnabled(have_valid_input);
- _input_combobox->setEnabled(have_valid_input);
- _output_combobox->setEnabled(have_valid_input);
- _swap_checkbox->setEnabled(have_valid_input);
- _video_combobox->clear();
- _audio_combobox->clear();
- _subtitle_combobox->clear();
- if (have_valid_input)
- {
- for (int i = 0; i < _player->get_media_input().video_streams(); i++)
- {
- _video_combobox->addItem(_player->get_media_input().video_stream_name(i).c_str());
- }
- for (int i = 0; i < _player->get_media_input().audio_streams(); i++)
- {
- _audio_combobox->addItem(_player->get_media_input().audio_stream_name(i).c_str());
- }
- _subtitle_combobox->addItem(_("Off"));
- for (int i = 0; i < _player->get_media_input().subtitle_streams(); i++)
- {
- _subtitle_combobox->addItem(_player->get_media_input().subtitle_stream_name(i).c_str());
- }
- _video_combobox->setCurrentIndex(init_data.video_stream);
- _audio_combobox->setCurrentIndex(init_data.audio_stream);
- _subtitle_combobox->setCurrentIndex(init_data.subtitle_stream + 1);
- // Disable unsupported input modes
- for (int i = 0; i < _input_combobox->count(); i++)
- {
- _input_combobox->setCurrentIndex(i);
- video_frame::stereo_layout_t layout;
- bool swap;
- get_stereo_layout(layout, swap);
- qobject_cast<QStandardItemModel *>(_input_combobox->model())->item(i)->setEnabled(
- _player->get_media_input().stereo_layout_is_supported(layout, swap));
- }
- // Disable unsupported output modes
- if (!_player->get_video_output()->supports_stereo())
- {
- set_stereo_mode(parameters::stereo, false);
- qobject_cast<QStandardItemModel *>(_output_combobox->model())->item(_output_combobox->currentIndex())->setEnabled(false);
- }
- set_stereo_layout(init_data.stereo_layout, init_data.stereo_layout_swap);
- set_stereo_mode(init_data.stereo_mode, init_data.stereo_mode_swap);
- }
- _lock = false;
- if (have_valid_input)
- {
- receive_notification(notification(notification::play, !playing, playing));
- }
-}
-
-int in_out_widget::get_video_stream()
-{
- return _video_combobox->currentIndex();
-}
-
-int in_out_widget::get_audio_stream()
-{
- return _audio_combobox->currentIndex();
-}
-
-int in_out_widget::get_subtitle_stream()
-{
- return _subtitle_combobox->currentIndex() - 1;
-}
-
-void in_out_widget::get_stereo_layout(video_frame::stereo_layout_t &stereo_layout, bool &stereo_layout_swap)
-{
- switch (_input_combobox->currentIndex())
- {
- case 0:
- stereo_layout = video_frame::mono;
- stereo_layout_swap = false;
- break;
- case 1:
- stereo_layout = video_frame::separate;
- stereo_layout_swap = false;
- break;
- case 2:
- stereo_layout = video_frame::separate;
- stereo_layout_swap = true;
- break;
- case 3:
- stereo_layout = video_frame::top_bottom;
- stereo_layout_swap = false;
- break;
- case 4:
- stereo_layout = video_frame::top_bottom_half;
- stereo_layout_swap = false;
- break;
- case 5:
- stereo_layout = video_frame::top_bottom;
- stereo_layout_swap = true;
- break;
- case 6:
- stereo_layout = video_frame::top_bottom_half;
- stereo_layout_swap = true;
- break;
- case 7:
- stereo_layout = video_frame::left_right;
- stereo_layout_swap = false;
- break;
- case 8:
- stereo_layout = video_frame::left_right_half;
- stereo_layout_swap = false;
- break;
- case 9:
- stereo_layout = video_frame::left_right;
- stereo_layout_swap = true;
- break;
- case 10:
- stereo_layout = video_frame::left_right_half;
- stereo_layout_swap = true;
- break;
- case 11:
- stereo_layout = video_frame::even_odd_rows;
- stereo_layout_swap = false;
- break;
- case 12:
- stereo_layout = video_frame::even_odd_rows;
- stereo_layout_swap = true;
- break;
- }
-}
-
-void in_out_widget::get_stereo_mode(parameters::stereo_mode_t &stereo_mode, bool &stereo_mode_swap)
-{
- switch (_output_combobox->currentIndex())
- {
- case 0:
- stereo_mode = parameters::mono_left;
- break;
- case 1:
- stereo_mode = parameters::mono_right;
- break;
- case 2:
- stereo_mode = parameters::stereo;
- break;
- case 3:
- stereo_mode = parameters::top_bottom;
- break;
- case 4:
- stereo_mode = parameters::top_bottom_half;
- break;
- case 5:
- stereo_mode = parameters::left_right;
- break;
- case 6:
- stereo_mode = parameters::left_right_half;
- break;
- case 7:
- stereo_mode = parameters::even_odd_rows;
- break;
- case 8:
- stereo_mode = parameters::even_odd_columns;
- break;
- case 9:
- stereo_mode = parameters::checkerboard;
- break;
- case 10:
- stereo_mode = parameters::hdmi_frame_pack;
- break;
- case 11:
- stereo_mode = parameters::red_cyan_monochrome;
- break;
- case 12:
- stereo_mode = parameters::red_cyan_half_color;
- break;
- case 13:
- stereo_mode = parameters::red_cyan_full_color;
- break;
- case 14:
- stereo_mode = parameters::red_cyan_dubois;
- break;
- case 15:
- stereo_mode = parameters::green_magenta_monochrome;
- break;
- case 16:
- stereo_mode = parameters::green_magenta_half_color;
- break;
- case 17:
- stereo_mode = parameters::green_magenta_full_color;
- break;
- case 18:
- stereo_mode = parameters::green_magenta_dubois;
- break;
- case 19:
- stereo_mode = parameters::amber_blue_monochrome;
- break;
- case 20:
- stereo_mode = parameters::amber_blue_half_color;
- break;
- case 21:
- stereo_mode = parameters::amber_blue_full_color;
- break;
- case 22:
- stereo_mode = parameters::amber_blue_dubois;
- break;
- case 23:
- stereo_mode = parameters::red_green_monochrome;
- break;
- case 24:
- stereo_mode = parameters::red_blue_monochrome;
- break;
- }
- stereo_mode_swap = _swap_checkbox->isChecked();
-}
-
-void in_out_widget::receive_notification(const notification &note)
-{
- std::istringstream current(note.current);
- int stream;
- bool flag;
-
- switch (note.type)
- {
- case notification::video_stream:
- s11n::load(current, stream);
- _lock = true;
- _video_combobox->setCurrentIndex(stream);
- _lock = false;
- break;
- case notification::audio_stream:
- s11n::load(current, stream);
- _lock = true;
- _audio_combobox->setCurrentIndex(stream);
- _lock = false;
- break;
- case notification::subtitle_stream:
- s11n::load(current, stream);
- _lock = true;
- _subtitle_combobox->setCurrentIndex(stream + 1);
- _lock = false;
- break;
- case notification::stereo_mode_swap:
- s11n::load(current, flag);
- _lock = true;
- _swap_checkbox->setChecked(flag);
- _lock = false;
- break;
- default:
- break;
- }
-}
-
-
-controls_widget::controls_widget(QSettings *settings, const player_init_data &init_data, QWidget *parent)
- : QWidget(parent), _lock(false), _settings(settings), _playing(false)
-{
- 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);
- 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(pressed()), this, SLOT(play_pressed()));
- row1_layout->addWidget(_play_button, 1, 0);
- _pause_button = new QPushButton(get_icon("media-playback-pause"), "");
- _pause_button->setToolTip(_("Pause."));
- connect(_pause_button, SIGNAL(pressed()), this, SLOT(pause_pressed()));
- row1_layout->addWidget(_pause_button, 1, 1);
- _stop_button = new QPushButton(get_icon("media-playback-stop"), "");
- _stop_button->setToolTip(_("Stop."));
- connect(_stop_button, SIGNAL(pressed()), this, SLOT(stop_pressed()));
- 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(init_data.params.loop_mode != parameters::no_loop);
- connect(_loop_button, SIGNAL(toggled(bool)), this, SLOT(loop_pressed()));
- 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(pressed()), this, SLOT(fullscreen_pressed()));
- 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(pressed()), this, SLOT(center_pressed()));
- 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(pressed()), this, SLOT(bbb_pressed()));
- 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(pressed()), this, SLOT(bb_pressed()));
- 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(pressed()), this, SLOT(b_pressed()));
- 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(pressed()), this, SLOT(f_pressed()));
- 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(pressed()), this, SLOT(ff_pressed()));
- 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(pressed()), this, SLOT(fff_pressed()));
- 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);
-}
-
-controls_widget::~controls_widget()
-{
-}
-
-void controls_widget::play_pressed()
-{
- if (_playing)
- {
- send_cmd(command::toggle_pause);
- }
- else
- {
- send_cmd(command::toggle_play);
- }
-}
-
-void controls_widget::pause_pressed()
-{
- send_cmd(command::toggle_pause);
-}
-
-void controls_widget::stop_pressed()
-{
- send_cmd(command::toggle_play);
-}
-
-void controls_widget::loop_pressed()
-{
- if (!_lock)
- {
- parameters::loop_mode_t loop_mode = _loop_button->isChecked()
- ? parameters::loop_current : parameters::no_loop;
- send_cmd(command::set_loop_mode, static_cast<int>(loop_mode));
- }
-}
-
-void controls_widget::fullscreen_pressed()
-{
- if (!_lock)
- {
- send_cmd(command::toggle_fullscreen);
- }
-}
-
-void controls_widget::center_pressed()
-{
- send_cmd(command::center);
-}
-
-void controls_widget::bbb_pressed()
-{
- send_cmd(command::seek, -600.0f);
-}
-
-void controls_widget::bb_pressed()
-{
- send_cmd(command::seek, -60.0f);
-}
-
-void controls_widget::b_pressed()
-{
- send_cmd(command::seek, -10.0f);
-}
-
-void controls_widget::f_pressed()
-{
- send_cmd(command::seek, +10.0f);
-}
-
-void controls_widget::ff_pressed()
-{
- send_cmd(command::seek, +60.0f);
-}
-
-void controls_widget::fff_pressed()
-{
- send_cmd(command::seek, +600.0f);
-}
-
-void controls_widget::seek_slider_changed()
-{
- if (!_lock)
- {
- send_cmd(command::set_pos, static_cast<float>(_seek_slider->value()) / 2000.0f);
- }
-}
-
-void controls_widget::update(const player_init_data &, bool have_valid_input, bool playing, int64_t input_duration)
-{
- if (have_valid_input)
- {
- _play_button->setDefault(true);
- _loop_button->setEnabled(true);
- _fullscreen_button->setEnabled(true);
- receive_notification(notification(notification::play, !playing, playing));
- _input_duration = input_duration;
- std::string hr_duration = str::human_readable_time(_input_duration);
- _pos_label->setText((hr_duration + '/' + hr_duration).c_str());
- _pos_label->setMinimumSize(_pos_label->minimumSizeHint());
- _pos_label->setText(hr_duration.c_str());
- }
- else
- {
- _playing = false;
- _play_button->setEnabled(false);
- _pause_button->setEnabled(false);
- _stop_button->setEnabled(false);
- _loop_button->setEnabled(false);
- _fullscreen_button->setEnabled(false);
- _center_button->setEnabled(false);
- _bbb_button->setEnabled(false);
- _bb_button->setEnabled(false);
- _b_button->setEnabled(false);
- _f_button->setEnabled(false);
- _ff_button->setEnabled(false);
- _fff_button->setEnabled(false);
- _seek_slider->setEnabled(false);
- _seek_slider->setValue(0);
- _pos_label->setEnabled(false);
- _pos_label->setText("0:00");
- _pos_label->setMinimumSize(QSize(0, 0));
- }
-}
-
-void controls_widget::receive_notification(const notification &note)
-{
- std::istringstream current(note.current);
- bool flag;
- float value;
-
- switch (note.type)
- {
- case notification::play:
- s11n::load(current, flag);
- _playing = flag;
- _play_button->setEnabled(!flag);
- _pause_button->setEnabled(flag);
- _stop_button->setEnabled(flag);
- if (flag)
- {
- _lock = true;
- parameters::loop_mode_t loop_mode = _loop_button->isChecked()
- ? parameters::loop_current : parameters::no_loop;
- send_cmd(command::set_loop_mode, static_cast<int>(loop_mode));
- _lock = false;
- }
- if (flag && _fullscreen_button->isChecked())
- {
- _lock = true;
- send_cmd(command::toggle_fullscreen);
- _lock = false;
- }
- _center_button->setEnabled(flag);
- _bbb_button->setEnabled(flag);
- _bb_button->setEnabled(flag);
- _b_button->setEnabled(flag);
- _f_button->setEnabled(flag);
- _ff_button->setEnabled(flag);
- _fff_button->setEnabled(flag);
- _seek_slider->setEnabled(flag);
- _pos_label->setEnabled(flag);
- if (!flag)
- {
- _seek_slider->setValue(0);
- _pos_label->setText(str::human_readable_time(_input_duration).c_str());
- }
- break;
- case notification::pause:
- s11n::load(current, flag);
- _play_button->setEnabled(flag);
- _pause_button->setEnabled(!flag);
- break;
- case notification::pos:
- if (!_seek_slider->isSliderDown())
- {
- _lock = true;
- s11n::load(current, value);
- _seek_slider->setValue(qRound(value * 2000.0f));
- _pos_label->setText((str::human_readable_time(
- static_cast<int64_t>(value * 1000.0f) * _input_duration / 1000)
- + '/' + str::human_readable_time(_input_duration)).c_str());
- _lock = false;
- }
- break;
- case notification::fullscreen:
- s11n::load(current, flag);
- _lock = true;
- _fullscreen_button->setChecked(!flag);
- _lock = false;
- break;
- default:
- break;
- }
-}
-
-
-color_dialog::color_dialog(parameters *params, QWidget *parent) : QDialog(parent),
- _params(params), _lock(false)
-{
- setModal(false);
- setWindowTitle(_("Display Color Adjustments"));
-
- QLabel *c_label = new QLabel(_("Contrast:"));
- _c_slider = new QSlider(Qt::Horizontal);
- _c_slider->setRange(-1000, 1000);
- _c_slider->setValue(params->contrast * 1000.0f);
- connect(_c_slider, SIGNAL(valueChanged(int)), this, SLOT(c_slider_changed(int)));
- _c_spinbox = new QDoubleSpinBox();
- _c_spinbox->setRange(-1.0, +1.0);
- _c_spinbox->setValue(params->contrast);
- _c_spinbox->setDecimals(2);
- _c_spinbox->setSingleStep(0.01);
- connect(_c_spinbox, SIGNAL(valueChanged(double)), this, SLOT(c_spinbox_changed(double)));
- QLabel *b_label = new QLabel(_("Brightness:"));
- _b_slider = new QSlider(Qt::Horizontal);
- _b_slider->setRange(-1000, 1000);
- _b_slider->setValue(params->brightness * 1000.0f);
- connect(_b_slider, SIGNAL(valueChanged(int)), this, SLOT(b_slider_changed(int)));
- _b_spinbox = new QDoubleSpinBox();
- _b_spinbox->setRange(-1.0, +1.0);
- _b_spinbox->setValue(params->brightness);
- _b_spinbox->setDecimals(2);
- _b_spinbox->setSingleStep(0.01);
- connect(_b_spinbox, SIGNAL(valueChanged(double)), this, SLOT(b_spinbox_changed(double)));
- QLabel *h_label = new QLabel(_("Hue:"));
- _h_slider = new QSlider(Qt::Horizontal);
- _h_slider->setRange(-1000, 1000);
- _h_slider->setValue(params->hue * 1000.0f);
- connect(_h_slider, SIGNAL(valueChanged(int)), this, SLOT(h_slider_changed(int)));
- _h_spinbox = new QDoubleSpinBox();
- _h_spinbox->setRange(-1.0, +1.0);
- _h_spinbox->setValue(params->hue);
- _h_spinbox->setDecimals(2);
- _h_spinbox->setSingleStep(0.01);
- connect(_h_spinbox, SIGNAL(valueChanged(double)), this, SLOT(h_spinbox_changed(double)));
- QLabel *s_label = new QLabel(_("Saturation:"));
- _s_slider = new QSlider(Qt::Horizontal);
- _s_slider->setRange(-1000, 1000);
- _s_slider->setValue(params->saturation * 1000.0f);
- connect(_s_slider, SIGNAL(valueChanged(int)), this, SLOT(s_slider_changed(int)));
- _s_spinbox = new QDoubleSpinBox();
- _s_spinbox->setRange(-1.0, +1.0);
- _s_spinbox->setValue(params->saturation);
- _s_spinbox->setDecimals(2);
- _s_spinbox->setSingleStep(0.01);
- connect(_s_spinbox, SIGNAL(valueChanged(double)), this, SLOT(s_spinbox_changed(double)));
-
- QPushButton *ok_button = new QPushButton(_("OK"));
- connect(ok_button, SIGNAL(pressed()), this, SLOT(close()));
-
- QGridLayout *layout = new QGridLayout;
- layout->addWidget(c_label, 0, 0);
- layout->addWidget(_c_slider, 0, 1);
- layout->addWidget(_c_spinbox, 0, 2);
- layout->addWidget(b_label, 1, 0);
- layout->addWidget(_b_slider, 1, 1);
- layout->addWidget(_b_spinbox, 1, 2);
- layout->addWidget(h_label, 2, 0);
- layout->addWidget(_h_slider, 2, 1);
- layout->addWidget(_h_spinbox, 2, 2);
- layout->addWidget(s_label, 3, 0);
- layout->addWidget(_s_slider, 3, 1);
- layout->addWidget(_s_spinbox, 3, 2);
- layout->addWidget(ok_button, 4, 0, 1, 3);
- setLayout(layout);
-}
-
-void color_dialog::c_slider_changed(int val)
-{
- if (!_lock)
- {
- _params->contrast = val / 1000.0f;
- _lock = true;
- _c_spinbox->setValue(val / 1000.0f);
- _lock = false;
- send_cmd(command::set_contrast, val / 1000.0f);
- }
-}
-
-void color_dialog::c_spinbox_changed(double val)
-{
- if (!_lock)
- {
- _params->contrast = val;
- _lock = true;
- _c_slider->setValue(val * 1000.0);
- _lock = false;
- send_cmd(command::set_contrast, static_cast<float>(val));
- }
-}
-
-void color_dialog::b_slider_changed(int val)
-{
- if (!_lock)
- {
- _params->brightness = val / 1000.0f;
- _lock = true;
- _b_spinbox->setValue(val / 1000.0f);
- _lock = false;
- send_cmd(command::set_brightness, val / 1000.0f);
- }
-}
-
-void color_dialog::b_spinbox_changed(double val)
-{
- if (!_lock)
- {
- _params->brightness = val;
- _lock = true;
- _b_slider->setValue(val * 1000.0);
- _lock = false;
- send_cmd(command::set_brightness, static_cast<float>(val));
- }
-}
-
-void color_dialog::h_slider_changed(int val)
-{
- if (!_lock)
- {
- _params->hue = val / 1000.0f;
- _lock = true;
- _h_spinbox->setValue(val / 1000.0f);
- _lock = false;
- send_cmd(command::set_hue, val / 1000.0f);
- }
-}
-
-void color_dialog::h_spinbox_changed(double val)
-{
- if (!_lock)
- {
- _params->hue = val;
- _lock = true;
- _h_slider->setValue(val * 1000.0);
- _lock = false;
- send_cmd(command::set_hue, static_cast<float>(val));
- }
-}
-
-void color_dialog::s_slider_changed(int val)
-{
- if (!_lock)
- {
- _params->saturation = val / 1000.0f;
- _lock = true;
- _s_spinbox->setValue(val / 1000.0f);
- _lock = false;
- send_cmd(command::set_saturation, val / 1000.0f);
- }
-}
-
-void color_dialog::s_spinbox_changed(double val)
-{
- if (!_lock)
- {
- _params->saturation = val;
- _lock = true;
- _s_slider->setValue(val * 1000.0);
- _lock = false;
- send_cmd(command::set_saturation, static_cast<float>(val));
- }
-}
-
-void color_dialog::receive_notification(const notification &note)
-{
- std::istringstream current(note.current);
- float value;
-
- switch (note.type)
- {
- case notification::contrast:
- s11n::load(current, value);
- _lock = true;
- _c_slider->setValue(value * 1000.0f);
- _c_spinbox->setValue(value);
- _lock = false;
- break;
- case notification::brightness:
- s11n::load(current, value);
- _lock = true;
- _b_slider->setValue(value * 1000.0f);
- _b_spinbox->setValue(value);
- _lock = false;
- break;
- case notification::hue:
- s11n::load(current, value);
- _lock = true;
- _h_slider->setValue(value * 1000.0f);
- _h_spinbox->setValue(value);
- _lock = false;
- break;
- case notification::saturation:
- s11n::load(current, value);
- _lock = true;
- _s_slider->setValue(value * 1000.0f);
- _s_spinbox->setValue(value);
- _lock = false;
- break;
- default:
- /* not handled */
- break;
- }
-}
-
-
-crosstalk_dialog::crosstalk_dialog(parameters *params, QWidget *parent) : QDialog(parent),
- _params(params), _lock(false)
-{
- setModal(false);
- setWindowTitle(_("Display Crosstalk Calibration"));
-
- /* TRANSLATORS: Please keep the lines short using where necessary. */
- QLabel *rtfm_label = new QLabel(_("Please read the manual to find out "
- "how to measure the crosstalk levels "
- "of your display."));
-
- QLabel *r_label = new QLabel(_("Red:"));
- _r_spinbox = new QDoubleSpinBox();
- _r_spinbox->setRange(0.0, +1.0);
- _r_spinbox->setValue(params->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(params->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(params->crosstalk_b);
- _b_spinbox->setDecimals(2);
- _b_spinbox->setSingleStep(0.01);
- connect(_b_spinbox, SIGNAL(valueChanged(double)), this, SLOT(spinbox_changed()));
-
- QPushButton *ok_button = new QPushButton(_("OK"));
- connect(ok_button, SIGNAL(pressed()), this, SLOT(close()));
-
- QGridLayout *layout = new QGridLayout;
- layout->addWidget(rtfm_label, 0, 0, 1, 2);
- layout->addWidget(r_label, 2, 0);
- layout->addWidget(_r_spinbox, 2, 1);
- layout->addWidget(g_label, 3, 0);
- layout->addWidget(_g_spinbox, 3, 1);
- layout->addWidget(b_label, 4, 0);
- layout->addWidget(_b_spinbox, 4, 1);
- layout->addWidget(ok_button, 5, 0, 1, 2);
- setLayout(layout);
-}
-
-void crosstalk_dialog::spinbox_changed()
-{
- if (!_lock)
- {
- _params->crosstalk_r = _r_spinbox->value();
- _params->crosstalk_g = _g_spinbox->value();
- _params->crosstalk_b = _b_spinbox->value();
- std::ostringstream v;
- s11n::save(v, static_cast<float>(_r_spinbox->value()));
- s11n::save(v, static_cast<float>(_g_spinbox->value()));
- s11n::save(v, static_cast<float>(_b_spinbox->value()));
- send_cmd(command::set_crosstalk, v.str());
- }
-}
-
-void crosstalk_dialog::receive_notification(const notification &note)
-{
- std::istringstream current(note.current);
- float r, g, b;
-
- switch (note.type)
- {
- case notification::crosstalk:
- s11n::load(current, r);
- s11n::load(current, g);
- s11n::load(current, b);
- _lock = true;
- _r_spinbox->setValue(r);
- _g_spinbox->setValue(g);
- _b_spinbox->setValue(b);
- _lock = false;
- break;
- default:
- /* not handled */
- break;
- }
-}
-
-
-subtitle_dialog::subtitle_dialog(parameters *params, QWidget *parent) : QDialog(parent),
- _params(params), _lock(false)
-{
- setModal(false);
- setWindowTitle(_("Subtitle Settings"));
-
- QLabel *info_label = new QLabel(_("These settings apply to soft subtitles, but not to bitmaps."));
-
- _encoding_checkbox = new QCheckBox(_("Encoding:"));
- _encoding_checkbox->setToolTip(_("Set the subtitle character set encoding."));
- _encoding_checkbox->setChecked(params->subtitle_encoding != "");
- 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(
- params->subtitle_encoding == "" ? "UTF-8" : params->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(params->subtitle_font != "");
- 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(params->subtitle_font == "" ? "sans-serif" : params->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(params->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(params->subtitle_size <= 0 ? 12 : params->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(params->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(params->subtitle_scale < 0.0f ? 1.0f : params->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(params->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(params->subtitle_color > std::numeric_limits<uint32_t>::max() ? 0xffffffu : params->subtitle_color);
- connect(_color_button, SIGNAL(pressed()), this, SLOT(color_button_pressed()));
-
- QPushButton *ok_button = new QPushButton(_("OK"));
- connect(ok_button, SIGNAL(pressed()), this, SLOT(close()));
-
- QGridLayout *layout = new QGridLayout;
- layout->addWidget(info_label, 0, 0, 1, 2);
- layout->addWidget(_encoding_checkbox, 1, 0);
- layout->addWidget(_encoding_combobox, 1, 1);
- layout->addWidget(_font_checkbox, 2, 0);
- layout->addWidget(_font_combobox, 2, 1);
- layout->addWidget(_size_checkbox, 3, 0);
- layout->addWidget(_size_spinbox, 3, 1);
- layout->addWidget(_scale_checkbox, 4, 0);
- layout->addWidget(_scale_spinbox, 4, 1);
- layout->addWidget(_color_checkbox, 5, 0);
- layout->addWidget(_color_button, 5, 1);
- layout->addWidget(ok_button, 6, 0, 1, 2);
- setLayout(layout);
-}
-
-QList<QTextCodec *> subtitle_dialog::find_codecs()
-{
- QMap<QString, QTextCodec *> codec_map;
- QRegExp iso8859_regexp("ISO[- ]8859-([0-9]+).*");
-
- foreach (int mib, QTextCodec::availableMibs())
- {
- QTextCodec *codec = QTextCodec::codecForMib(mib);
-
- QString sort_key = codec->name().toUpper();
- int rank;
-
- if (sort_key.startsWith("UTF-8"))
- {
- rank = 1;
- }
- else if (sort_key.startsWith("UTF-16"))
- {
- rank = 2;
- }
- else if (iso8859_regexp.exactMatch(sort_key))
- {
- if (iso8859_regexp.cap(1).size() == 1)
- {
- rank = 3;
- }
- else
- {
- rank = 4;
- }
- }
- else
- {
- rank = 5;
- }
- sort_key.prepend(QChar('0' + rank));
-
- codec_map.insert(sort_key, codec);
- }
- return codec_map.values();
-}
-
-void subtitle_dialog::set_color_button(uint32_t c)
-{
- int r = (c >> 16u) & 0xffu;
- int g = (c >> 8u) & 0xffu;
- int b = c & 0xffu;
- _color = QColor(r, g, b);
- QPixmap pm(64, 64);
- pm.fill(_color);
- _color_button->setIcon(QIcon(pm));
-}
-
-void subtitle_dialog::color_button_pressed()
-{
- _color = QColorDialog::getColor(_color, this);
- QPixmap pm(64, 64);
- pm.fill(_color);
- _color_button->setIcon(QIcon(pm));
- color_changed();
-}
-
-void subtitle_dialog::encoding_changed()
-{
- if (!_lock)
- {
- std::string encoding = _encoding_checkbox->isChecked()
- ? _encoding_combobox->currentText().toStdString() : "";
- _params->subtitle_encoding = encoding;
- std::ostringstream v;
- s11n::save(v, encoding);
- send_cmd(command::set_subtitle_encoding, v.str());
- }
-}
-
-void subtitle_dialog::font_changed()
-{
- if (!_lock)
- {
- std::string font = _font_checkbox->isChecked()
- ? _font_combobox->currentFont().family().toLocal8Bit().constData()
- : "";
- _params->subtitle_font = font;
- std::ostringstream v;
- s11n::save(v, font);
- send_cmd(command::set_subtitle_font, v.str());
- }
-}
-
-void subtitle_dialog::size_changed()
-{
- if (!_lock)
- {
- int size = _size_checkbox->isChecked() ? _size_spinbox->value() : -1;
- _params->subtitle_size = size;
- std::ostringstream v;
- s11n::save(v, size);
- send_cmd(command::set_subtitle_size, v.str());
- }
-}
-
-void subtitle_dialog::scale_changed()
-{
- if (!_lock)
- {
- float scale = _scale_checkbox->isChecked() ? _scale_spinbox->value() : -1.0f;
- _params->subtitle_scale = scale;
- std::ostringstream v;
- s11n::save(v, scale);
- send_cmd(command::set_subtitle_scale, v.str());
- }
-}
-
-void subtitle_dialog::color_changed()
-{
- if (!_lock)
- {
- uint64_t color;
- if (_color_checkbox->isChecked())
- {
- unsigned int a = _color.alpha();
- unsigned int r = _color.red();
- unsigned int g = _color.green();
- unsigned int b = _color.blue();
- color = (a << 24u) | (r << 16u) | (g << 8u) | b;
- }
- else
- {
- color = std::numeric_limits<uint64_t>::max();
- }
- _params->subtitle_color = color;
- std::ostringstream v;
- s11n::save(v, color);
- send_cmd(command::set_subtitle_color, v.str());
- }
-}
-
-void subtitle_dialog::receive_notification(const notification &note)
-{
- std::istringstream current(note.current);
-
- switch (note.type)
- {
- case notification::subtitle_encoding:
- {
- std::string encoding;
- s11n::load(current, encoding);
- _lock = true;
- _encoding_checkbox->setChecked(encoding != "");
- if (encoding != "")
- {
- _encoding_combobox->setCurrentIndex(_encoding_combobox->findText(encoding.c_str()));
- }
- _lock = false;
- }
- break;
- case notification::subtitle_font:
- {
- std::string font;
- s11n::load(current, font);
- _lock = true;
- _font_checkbox->setChecked(font != "");
- if (font != "")
- {
- _font_combobox->setCurrentFont(QFont(QString(font.c_str())));
- }
- _lock = false;
- }
- break;
- case notification::subtitle_size:
- {
- int size;
- s11n::load(current, size);
- _lock = true;
- _size_checkbox->setChecked(size > 0);
- if (size > 0)
- {
- _size_spinbox->setValue(size);
- }
- _lock = false;
- }
- break;
- case notification::subtitle_scale:
- {
- float scale;
- s11n::load(current, scale);
- _lock = true;
- _scale_checkbox->setChecked(scale >= 0.0f);
- if (scale >= 0.0f)
- {
- _scale_spinbox->setValue(scale);
- }
- _lock = false;
- }
- break;
- case notification::subtitle_color:
- {
- uint64_t color;
- s11n::load(current, color);
- _lock = true;
- _color_checkbox->setChecked(color <= std::numeric_limits<uint32_t>::max());
- if (color <= std::numeric_limits<uint32_t>::max())
- {
- set_color_button(color);
- }
- _lock = false;
- }
- break;
- default:
- /* not handled */
- break;
- }
-}
-
-
-stereoscopic_dialog::stereoscopic_dialog(parameters *params, QWidget *parent) : QDialog(parent),
- _params(params), _lock(false)
-{
- setModal(false);
- setWindowTitle(_("Stereoscopic Video Settings"));
-
- 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);
- _p_slider->setValue(params->parallax * 1000.0f);
- 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->setValue(params->parallax);
- _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);
- _sp_slider->setValue(params->subtitle_parallax * 1000.0f);
- 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->setValue(params->subtitle_parallax);
- _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);
- _g_slider->setValue(params->ghostbust * 1000.0f);
- 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->setValue(params->ghostbust);
- _g_spinbox->setDecimals(2);
- _g_spinbox->setSingleStep(0.01);
- connect(_g_spinbox, SIGNAL(valueChanged(double)), this, SLOT(g_spinbox_changed(double)));
-
- QPushButton *ok_button = new QPushButton(_("OK"));
- connect(ok_button, SIGNAL(pressed()), this, SLOT(close()));
-
- QGridLayout *layout = new QGridLayout;
- layout->addWidget(p_label, 0, 0);
- layout->addWidget(_p_slider, 0, 1);
- layout->addWidget(_p_spinbox, 0, 2);
- layout->addWidget(sp_label, 1, 0);
- layout->addWidget(_sp_slider, 1, 1);
- layout->addWidget(_sp_spinbox, 1, 2);
- layout->addWidget(g_label, 2, 0);
- layout->addWidget(_g_slider, 2, 1);
- layout->addWidget(_g_spinbox, 2, 2);
- layout->addWidget(ok_button, 3, 0, 1, 3);
- setLayout(layout);
-}
-
-void stereoscopic_dialog::p_slider_changed(int val)
-{
- if (!_lock)
- {
- _params->parallax = val / 1000.0f;
- _lock = true;
- _p_spinbox->setValue(val / 1000.0f);
- _lock = false;
- send_cmd(command::set_parallax, val / 1000.0f);
- }
-}
-
-void stereoscopic_dialog::p_spinbox_changed(double val)
-{
- if (!_lock)
- {
- _params->parallax = val;
- _lock = true;
- _p_slider->setValue(val * 1000.0);
- _lock = false;
- send_cmd(command::set_parallax, static_cast<float>(val));
- }
-}
-
-void stereoscopic_dialog::sp_slider_changed(int val)
-{
- if (!_lock)
- {
- _params->subtitle_parallax = val / 1000.0f;
- _lock = true;
- _sp_spinbox->setValue(val / 1000.0f);
- _lock = false;
- send_cmd(command::set_subtitle_parallax, val / 1000.0f);
- }
-}
-
-void stereoscopic_dialog::sp_spinbox_changed(double val)
-{
- if (!_lock)
- {
- _params->subtitle_parallax = val;
- _lock = true;
- _sp_slider->setValue(val * 1000.0);
- _lock = false;
- send_cmd(command::set_subtitle_parallax, static_cast<float>(val));
- }
-}
-
-void stereoscopic_dialog::g_slider_changed(int val)
-{
- if (!_lock)
- {
- _params->ghostbust = val / 1000.0f;
- _lock = true;
- _g_spinbox->setValue(val / 1000.0f);
- _lock = false;
- send_cmd(command::set_ghostbust, val / 1000.0f);
- }
-}
-
-void stereoscopic_dialog::g_spinbox_changed(double val)
-{
- if (!_lock)
- {
- _params->ghostbust = val;
- _lock = true;
- _g_slider->setValue(val * 1000.0);
- _lock = false;
- send_cmd(command::set_ghostbust, static_cast<float>(val));
- }
-}
-
-void stereoscopic_dialog::receive_notification(const notification &note)
-{
- std::istringstream current(note.current);
- float value;
-
- switch (note.type)
- {
- case notification::parallax:
- s11n::load(current, value);
- _lock = true;
- _p_slider->setValue(value * 1000.0f);
- _p_spinbox->setValue(value);
- _lock = false;
- break;
- case notification::subtitle_parallax:
- s11n::load(current, value);
- _lock = true;
- _sp_slider->setValue(value * 1000.0f);
- _sp_spinbox->setValue(value);
- _lock = false;
- break;
- case notification::ghostbust:
- s11n::load(current, value);
- _lock = true;
- _g_slider->setValue(value * 1000.0f);
- _g_spinbox->setValue(value);
- _lock = false;
- break;
- default:
- /* not handled */
- break;
- }
-}
-
-open_device_dialog::open_device_dialog(
- const QStringList &default_devices,
- const QStringList &firewire_devices,
- const QString &x11_device,
- const device_request &dev_request,
- QWidget *parent) :
- QDialog(parent)
-{
- setWindowTitle(_("Open device"));
-
- _type_combobox = new QComboBox();
- _type_combobox->setToolTip(_("Choose a device type."));
- _type_combobox->addItem(_("Default"));
- _type_combobox->addItem(_("Firewire"));
- _type_combobox->addItem(_("X11"));
- _default_device_combobox = new QComboBox();
- _default_device_combobox->setToolTip(_("Choose a device."));
- _default_device_combobox->addItems(default_devices);
- _firewire_device_combobox = new QComboBox();
- _firewire_device_combobox->setToolTip(_("Choose a device."));
- _firewire_device_combobox->addItems(firewire_devices);
- _x11_device_field = new QLineEdit(x11_device);
- _x11_device_field->setToolTip(_("Set the X11 device string. "
- "Refer to the manual for details."));
- _device_chooser_stack = new QStackedWidget();
- _device_chooser_stack->addWidget(_default_device_combobox);
- _device_chooser_stack->addWidget(_firewire_device_combobox);
- _device_chooser_stack->addWidget(_x11_device_field);
- connect(_type_combobox, SIGNAL(currentIndexChanged(int)), _device_chooser_stack, SLOT(setCurrentIndex(int)));
- _type_combobox->setCurrentIndex(dev_request.device == device_request::firewire ? 1
- : dev_request.device == device_request::x11 ? 2 : 0);
- _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);
- QPushButton *cancel_btn = new QPushButton(_("Cancel"));
- connect(cancel_btn, SIGNAL(pressed()), this, SLOT(reject()));
- QPushButton *ok_btn = new QPushButton(_("OK"));
- connect(ok_btn, SIGNAL(pressed()), 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(_device_chooser_stack, 1, 0, 1, 2);
- layout->addWidget(_frame_size_groupbox, 2, 0, 1, 2);
- layout->addWidget(_frame_rate_groupbox, 3, 0, 1, 2);
- layout->addWidget(cancel_btn, 4, 0);
- layout->addWidget(ok_btn, 4, 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(QString &device, device_request &dev_request)
-{
- if (_type_combobox->currentIndex() == 1)
- {
- dev_request.device = device_request::firewire;
- device = _firewire_device_combobox->currentText();
- }
- else if (_type_combobox->currentIndex() == 2)
- {
- dev_request.device = device_request::x11;
- device = _x11_device_field->text();
- }
- else
- {
- dev_request.device = device_request::sys_default;
- device = _default_device_combobox->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;
-}
-
-main_window::main_window(QSettings *settings, const player_init_data &init_data) :
- _settings(settings),
- _color_dialog(NULL),
- _crosstalk_dialog(NULL),
- _subtitle_dialog(NULL),
- _stereoscopic_dialog(NULL),
- _player(NULL),
- _init_data(init_data),
- _init_data_template(init_data),
- _stop_request(false)
-{
- // Application properties
- setWindowTitle(PACKAGE_NAME);
- setWindowIcon(QIcon(":logo/64x64/bino.png"));
-
- // Load preferences
- _settings->beginGroup("Session");
- if (!(_init_data.params.contrast >= -1.0f && _init_data.params.contrast <= +1.0f))
- {
- _init_data.params.contrast = _settings->value("contrast", QString("0")).toFloat();
- }
- if (!(_init_data.params.brightness >= -1.0f && _init_data.params.brightness <= +1.0f))
- {
- _init_data.params.brightness = _settings->value("brightness", QString("0")).toFloat();
- }
- if (!(_init_data.params.hue >= -1.0f && _init_data.params.hue <= +1.0f))
- {
- _init_data.params.hue = _settings->value("hue", QString("0")).toFloat();
- }
- if (!(_init_data.params.saturation >= -1.0f && _init_data.params.saturation <= +1.0f))
- {
- _init_data.params.saturation = _settings->value("saturation", QString("0")).toFloat();
- }
- if (!(_init_data.params.crosstalk_r >= 0.0f && _init_data.params.crosstalk_r <= 1.0f))
- {
- _init_data.params.crosstalk_r = _settings->value("crosstalk_r", QString("0")).toFloat();
- }
- if (!(_init_data.params.crosstalk_g >= 0.0f && _init_data.params.crosstalk_g <= 1.0f))
- {
- _init_data.params.crosstalk_g = _settings->value("crosstalk_g", QString("0")).toFloat();
- }
- if (!(_init_data.params.crosstalk_b >= 0.0f && _init_data.params.crosstalk_b <= 1.0f))
- {
- _init_data.params.crosstalk_b = _settings->value("crosstalk_b", QString("0")).toFloat();
- }
- if (_init_data.params.subtitle_encoding.length() == 1 && _init_data.params.subtitle_encoding[0] == '\0')
- {
- _init_data.params.subtitle_encoding = _settings->value("subtitle-encoding", QString(1, '\0')).toString().toLocal8Bit().constData();
- }
- if (_init_data.params.subtitle_font.length() == 1 && _init_data.params.subtitle_font[0] == '\0')
- {
- _init_data.params.subtitle_font = _settings->value("subtitle-font", QString(1, '\0')).toString().toLocal8Bit().constData();
- }
- if (_init_data.params.subtitle_size < 0)
- {
- _init_data.params.subtitle_size = _settings->value("subtitle-size", QString("-1")).toInt();
- }
- if (_init_data.params.subtitle_scale < 0.0f)
- {
- _init_data.params.subtitle_scale = _settings->value("subtitle-scale", QString("-1")).toFloat();
- }
- if (_init_data.params.subtitle_color > std::numeric_limits<uint32_t>::max())
- {
- _init_data.params.subtitle_color = _settings->value("subtitle-color",
- QString(str::from(std::numeric_limits<uint64_t>::max()).c_str())).toULongLong();
- }
- if (_init_data.params.fullscreen_screens < 0)
- {
- _init_data.params.fullscreen_screens = _settings->value("fullscreen-screens", QString("-1")).toInt();
- }
- if (_init_data.params.fullscreen_flip_left < 0)
- {
- _init_data.params.fullscreen_flip_left = _settings->value("fullscreen-flip-left", QString("-1")).toInt();
- }
- if (_init_data.params.fullscreen_flop_left < 0)
- {
- _init_data.params.fullscreen_flop_left = _settings->value("fullscreen-flop-left", QString("-1")).toInt();
- }
- if (_init_data.params.fullscreen_flip_right < 0)
- {
- _init_data.params.fullscreen_flip_right = _settings->value("fullscreen-flip-right", QString("-1")).toInt();
- }
- if (_init_data.params.fullscreen_flop_right < 0)
- {
- _init_data.params.fullscreen_flop_right = _settings->value("fullscreen-flop-right", QString("-1")).toInt();
- }
- _settings->endGroup();
- _init_data.params.set_defaults();
-
- // Central widget, player, and timer
- QWidget *central_widget = new QWidget(this);
- QGridLayout *layout = new QGridLayout();
- _video_container_widget = new video_container_widget(central_widget);
- connect(_video_container_widget, SIGNAL(move_event()), this, SLOT(move_event()));
- layout->addWidget(_video_container_widget, 0, 0);
- _video_output = new video_output_qt(_init_data.benchmark, _video_container_widget);
- _player = new player_qt_internal(_video_output);
- _timer = new QTimer(this);
- connect(_timer, SIGNAL(timeout()), this, SLOT(playloop_step()));
- _in_out_widget = new in_out_widget(_settings, _player, central_widget);
- layout->addWidget(_in_out_widget, 1, 0);
- _controls_widget = new controls_widget(_settings, _init_data, central_widget);
- layout->addWidget(_controls_widget, 2, 0);
- layout->setRowStretch(0, 1);
- layout->setColumnStretch(0, 1);
- central_widget->setLayout(layout);
- setCentralWidget(central_widget);
-
- // Menus
- QMenu *file_menu = menuBar()->addMenu(_("&File"));
- QAction *file_open_act = new QAction(_("&Open..."), this);
- file_open_act->setShortcut(QKeySequence::Open);
- file_open_act->setIcon(get_icon("document-open"));
- connect(file_open_act, SIGNAL(triggered()), this, SLOT(file_open()));
- file_menu->addAction(file_open_act);
- QAction *file_open_url_act = new QAction(_("Open &URL..."), this);
- file_open_url_act->setIcon(get_icon("document-open"));
- connect(file_open_url_act, SIGNAL(triggered()), this, SLOT(file_open_url()));
- file_menu->addAction(file_open_url_act);
- QAction *file_open_device_act = new QAction(_("Open &device..."), this);
- file_open_device_act->setIcon(get_icon("camera-web"));
- connect(file_open_device_act, SIGNAL(triggered()), this, SLOT(file_open_device()));
- file_menu->addAction(file_open_device_act);
- file_menu->addSeparator();
- QAction *file_quit_act = new QAction(_("&Quit..."), this);
- file_quit_act->setShortcut(QKeySequence::Quit);
- file_quit_act->setMenuRole(QAction::QuitRole);
- file_quit_act->setIcon(get_icon("application-exit"));
- connect(file_quit_act, SIGNAL(triggered()), this, SLOT(close()));
- file_menu->addAction(file_quit_act);
- QMenu *preferences_menu = menuBar()->addMenu(_("&Preferences"));
- // note: whenever the preferences menu becomes a preferences panel, don't forget
- // to preferences_act->setMenuRole(QAction::PreferencesRole) on the menu item
- QAction *preferences_fullscreen_act = new QAction(_("&Fullscreen Settings..."), this);
- connect(preferences_fullscreen_act, SIGNAL(triggered()), this, SLOT(preferences_fullscreen()));
- preferences_menu->addAction(preferences_fullscreen_act);
- QAction *preferences_colors_act = new QAction(_("Display &Color Adjustments..."), this);
- connect(preferences_colors_act, SIGNAL(triggered()), this, SLOT(preferences_colors()));
- preferences_menu->addAction(preferences_colors_act);
- QAction *preferences_crosstalk_act = new QAction(_("Display Cross&talk Calibration..."), this);
- connect(preferences_crosstalk_act, SIGNAL(triggered()), this, SLOT(preferences_crosstalk()));
- preferences_menu->addAction(preferences_crosstalk_act);
- preferences_menu->addSeparator();
- QAction *preferences_subtitle_act = new QAction(_("&Subtitle Settings..."), this);
- connect(preferences_subtitle_act, SIGNAL(triggered()), this, SLOT(preferences_subtitle()));
- preferences_menu->addAction(preferences_subtitle_act);
- preferences_menu->addSeparator();
- QAction *preferences_stereoscopic_act = new QAction(_("Stereoscopic Video Settings..."), this);
- connect(preferences_stereoscopic_act, SIGNAL(triggered()), this, SLOT(preferences_stereoscopic()));
- preferences_menu->addAction(preferences_stereoscopic_act);
- QMenu *help_menu = menuBar()->addMenu(_("&Help"));
- QAction *help_manual_act = new QAction(_("&Manual..."), this);
- help_manual_act->setShortcut(QKeySequence::HelpContents);
- help_manual_act->setIcon(get_icon("help-contents"));
- connect(help_manual_act, SIGNAL(triggered()), this, SLOT(help_manual()));
- help_menu->addAction(help_manual_act);
- QAction *help_website_act = new QAction(_("&Website..."), this);
- help_website_act->setIcon(get_icon("applications-internet"));
- connect(help_website_act, SIGNAL(triggered()), this, SLOT(help_website()));
- help_menu->addAction(help_website_act);
- QAction *help_keyboard_act = new QAction(_("&Keyboard Shortcuts"), this);
- help_keyboard_act->setIcon(get_icon("preferences-desktop-keyboard"));
- connect(help_keyboard_act, SIGNAL(triggered()), this, SLOT(help_keyboard()));
- help_menu->addAction(help_keyboard_act);
- QAction *help_about_act = new QAction(_("&About"), this);
- help_about_act->setMenuRole(QAction::AboutRole);
- help_about_act->setIcon(get_icon("help-about"));
- connect(help_about_act, SIGNAL(triggered()), this, SLOT(help_about()));
- help_menu->addAction(help_about_act);
-
- // Handle FileOpen events
- QApplication::instance()->installEventFilter(this);
- // Handle Drop events
- setAcceptDrops(true);
-
- // Update widget contents
- _in_out_widget->update(_init_data, false, false);
- _controls_widget->update(_init_data, false, false, -1);
-
- // Restore Mainwindow state
- _settings->beginGroup("Mainwindow");
- restoreGeometry(_settings->value("geometry").toByteArray());
- restoreState(_settings->value("windowstate").toByteArray());
- _settings->endGroup();
-
- // Show window. Must happen before opening initial files!
- show();
- raise();
-
- // Open files if any
- if (init_data.urls.size() > 0)
- {
- QStringList urls;
- for (size_t i = 0; i < init_data.urls.size(); i++)
- {
- urls.push_back(QFile::decodeName(init_data.urls[i].c_str()));
- }
- open(urls, init_data.dev_request);
- }
-
- // Start the event and play loop
- _timer->start(0);
-}
-
-main_window::~main_window()
-{
- if (_player)
- {
- try { _player->close(); } catch (...) { }
- delete _player;
- }
- delete _video_output;
-}
-
-QString main_window::current_file_hash()
-{
- // Return SHA1 hash of the name of the current file as a hex string
- QString name = QFileInfo(QFile::decodeName(_init_data.urls[0].c_str())).fileName();
- QString hash = QCryptographicHash::hash(name.toUtf8(), QCryptographicHash::Sha1).toHex();
- return hash;
-}
-
-bool main_window::open_player()
-{
- try
- {
- _player->open(_init_data);
- }
- catch (std::exception &e)
- {
- QMessageBox::critical(this, _("Error"), e.what());
- return false;
- }
- adjustSize();
- return true;
-}
-
-void main_window::receive_notification(const notification &note)
-{
- std::istringstream current(note.current);
- bool flag;
-
- switch (note.type)
- {
- case notification::play:
- s11n::load(current, flag);
- if (flag)
- {
- // Close and re-open the player. This resets the video state in case
- // we played it before, and it sets the input/output modes to the
- // current choice.
- _player->close();
- _init_data.stereo_layout_override = true;
- _in_out_widget->get_stereo_layout(_init_data.stereo_layout, _init_data.stereo_layout_swap);
- _init_data.video_stream = _in_out_widget->get_video_stream();
- _init_data.audio_stream = std::max(0, _in_out_widget->get_audio_stream());
- _init_data.subtitle_stream = std::max(-1, _in_out_widget->get_subtitle_stream());
- _init_data.stereo_mode_override = true;
- _in_out_widget->get_stereo_mode(_init_data.stereo_mode, _init_data.stereo_mode_swap);
- if (!open_player())
- {
- _stop_request = true;
- }
- // Remember the settings of this video
- _settings->beginGroup("Video/" + current_file_hash());
- _settings->setValue("stereo-layout", QString(video_frame::stereo_layout_to_string(_init_data.stereo_layout, _init_data.stereo_layout_swap).c_str()));
- _settings->setValue("video-stream", QVariant(_init_data.video_stream).toString());
- _settings->setValue("audio-stream", QVariant(_init_data.audio_stream).toString());
- _settings->setValue("subtitle-stream", QVariant(_init_data.subtitle_stream).toString());
- _settings->setValue("parallax", QVariant(_init_data.params.parallax).toString());
- _settings->setValue("ghostbust", QVariant(_init_data.params.ghostbust).toString());
- _settings->setValue("subtitle-parallax", QVariant(_init_data.params.subtitle_parallax).toString());
- _settings->endGroup();
- // Remember the 2D or 3D video output mode.
- _settings->setValue((_init_data.stereo_layout == video_frame::mono ? "Session/2d-stereo-mode" : "Session/3d-stereo-mode"),
- QString(parameters::stereo_mode_to_string(_init_data.stereo_mode, _init_data.stereo_mode_swap).c_str()));
- // Update widgets: we're now playing
- _in_out_widget->update(_init_data, true, true);
- _controls_widget->update(_init_data, true, true, _player->get_media_input().duration());
- // Give the keyboard focus to the video widget
- _player->get_video_output()->grab_focus();
- }
- break;
-
- case notification::video_stream:
- s11n::load(current, _init_data.video_stream);
- _settings->beginGroup("Video/" + current_file_hash());
- _settings->setValue("video-stream", QVariant(_init_data.video_stream).toString());
- _settings->endGroup();
- break;
-
- case notification::audio_stream:
- s11n::load(current, _init_data.audio_stream);
- _settings->beginGroup("Video/" + current_file_hash());
- _settings->setValue("audio-stream", QVariant(_init_data.audio_stream).toString());
- _settings->endGroup();
- break;
-
- case notification::subtitle_stream:
- s11n::load(current, _init_data.subtitle_stream);
- _settings->beginGroup("Video/" + current_file_hash());
- _settings->setValue("subtitle-stream", QVariant(_init_data.subtitle_stream).toString());
- _settings->endGroup();
- break;
-
- case notification::contrast:
- s11n::load(current, _init_data.params.contrast);
- break;
-
- case notification::brightness:
- s11n::load(current, _init_data.params.brightness);
- break;
-
- case notification::hue:
- s11n::load(current, _init_data.params.hue);
- break;
-
- case notification::saturation:
- s11n::load(current, _init_data.params.saturation);
- break;
-
- case notification::stereo_mode_swap:
- s11n::load(current, _init_data.params.stereo_mode_swap);
- // TODO: save this is Session/?d-stereo-mode?
- break;
-
- case notification::parallax:
- s11n::load(current, _init_data.params.parallax);
- _settings->beginGroup("Video/" + current_file_hash());
- _settings->setValue("parallax", QVariant(_init_data.params.parallax).toString());
- _settings->endGroup();
- break;
-
- case notification::crosstalk:
- s11n::load(current, _init_data.params.crosstalk_r);
- s11n::load(current, _init_data.params.crosstalk_g);
- s11n::load(current, _init_data.params.crosstalk_b);
- break;
-
- case notification::ghostbust:
- s11n::load(current, _init_data.params.ghostbust);
- _settings->beginGroup("Video/" + current_file_hash());
- _settings->setValue("ghostbust", QVariant(_init_data.params.ghostbust).toString());
- _settings->endGroup();
- break;
-
- case notification::subtitle_encoding:
- s11n::load(current, _init_data.params.subtitle_encoding);
- break;
-
- case notification::subtitle_font:
- s11n::load(current, _init_data.params.subtitle_font);
- break;
-
- case notification::subtitle_size:
- s11n::load(current, _init_data.params.subtitle_size);
- break;
-
- case notification::subtitle_scale:
- s11n::load(current, _init_data.params.subtitle_scale);
- break;
-
- case notification::subtitle_color:
- s11n::load(current, _init_data.params.subtitle_color);
- break;
-
- case notification::subtitle_parallax:
- s11n::load(current, _init_data.params.subtitle_parallax);
- _settings->beginGroup("Video/" + current_file_hash());
- _settings->setValue("subtitle-parallax", QVariant(_init_data.params.subtitle_parallax).toString());
- _settings->endGroup();
- break;
-
- case notification::loop_mode:
- {
- int loop_mode;
- s11n::load(current, loop_mode);
- _init_data.params.loop_mode = static_cast<parameters::loop_mode_t>(loop_mode);
- }
- break;
-
- case notification::fullscreen_screens:
- s11n::load(current, _init_data.params.fullscreen_screens);
- break;
-
- case notification::fullscreen_flip_left:
- s11n::load(current, _init_data.params.fullscreen_flip_left);
- break;
-
- case notification::fullscreen_flop_left:
- s11n::load(current, _init_data.params.fullscreen_flop_left);
- break;
-
- case notification::fullscreen_flip_right:
- s11n::load(current, _init_data.params.fullscreen_flip_right);
- break;
-
- case notification::fullscreen_flop_right:
- s11n::load(current, _init_data.params.fullscreen_flop_right);
- break;
-
- case notification::pause:
- case notification::stereo_layout:
- case notification::stereo_mode:
- case notification::fullscreen:
- case notification::center:
- case notification::pos:
- /* currently not handled */
- break;
- }
-}
-
-void main_window::dragEnterEvent(QDragEnterEvent *event)
-{
- if (event->mimeData()->hasUrls())
- {
- event->acceptProposedAction();
- }
-}
-
-void main_window::dropEvent(QDropEvent *event)
-{
- if (event->mimeData()->hasUrls())
- {
- QList<QUrl> url_list = event->mimeData()->urls();
- QStringList urls;
- for (int i = 0; i < url_list.size(); i++)
- {
- if (url_list[i].toString().startsWith("file://", Qt::CaseInsensitive))
- {
- urls.append(url_list[i].toLocalFile());
- }
- else
- {
- urls.append(url_list[i].toString());
- }
- }
- open(urls);
- event->acceptProposedAction();
- }
-}
-
-void main_window::moveEvent(QMoveEvent *)
-{
- move_event();
-}
-
-void main_window::closeEvent(QCloseEvent *event)
-{
- // Stop the event and play loop
- _timer->stop();
- // Remember the Session preferences
- _settings->beginGroup("Session");
- _settings->setValue("contrast", QVariant(_init_data.params.contrast).toString());
- _settings->setValue("brightness", QVariant(_init_data.params.brightness).toString());
- _settings->setValue("hue", QVariant(_init_data.params.hue).toString());
- _settings->setValue("saturation", QVariant(_init_data.params.saturation).toString());
- _settings->setValue("crosstalk_r", QVariant(_init_data.params.crosstalk_r).toString());
- _settings->setValue("crosstalk_g", QVariant(_init_data.params.crosstalk_g).toString());
- _settings->setValue("crosstalk_b", QVariant(_init_data.params.crosstalk_b).toString());
- _settings->setValue("subtitle-encoding", QVariant(_init_data.params.subtitle_encoding.c_str()).toString());
- _settings->setValue("subtitle-font", QVariant(_init_data.params.subtitle_font.c_str()).toString());
- _settings->setValue("subtitle-size", QVariant(_init_data.params.subtitle_size).toString());
- _settings->setValue("subtitle-scale", QVariant(_init_data.params.subtitle_scale).toString());
- _settings->setValue("subtitle-color", QVariant(static_cast<qulonglong>(_init_data.params.subtitle_color)).toString());
- _settings->setValue("fullscreen-screens", QVariant(_init_data.params.fullscreen_screens).toString());
- _settings->setValue("fullscreen-flip-left", QVariant(_init_data.params.fullscreen_flip_left).toString());
- _settings->setValue("fullscreen-flop-left", QVariant(_init_data.params.fullscreen_flop_left).toString());
- _settings->setValue("fullscreen-flip-right", QVariant(_init_data.params.fullscreen_flip_right).toString());
- _settings->setValue("fullscreen-flop-right", QVariant(_init_data.params.fullscreen_flop_right).toString());
- _settings->endGroup();
- // Remember the Mainwindow state
- _settings->beginGroup("Mainwindow");
- _settings->setValue("geometry", saveGeometry());
- _settings->setValue("windowState", saveState());
- _settings->endGroup();
-
- event->accept();
-}
-
-bool main_window::eventFilter(QObject *obj, QEvent *event)
-{
- if (event->type() == QEvent::FileOpen)
- {
- open(QStringList(static_cast<QFileOpenEvent *>(event)->file()));
- return true;
- }
- else
- {
- // pass the event on to the parent class
- return QMainWindow::eventFilter(obj, event);
- }
-}
-
-void main_window::move_event()
-{
- if (_player)
- {
- _player->move_event();
- }
-}
-
-void main_window::playloop_step()
-{
- if (_player->is_playing() && _stop_request)
- {
- _player->force_stop();
- _in_out_widget->update(_init_data, false, false);
- _controls_widget->update(_init_data, false, false, -1);
- _stop_request = false;
- }
- else if (_player->is_playing() && !_stop_request)
- {
- try
- {
- _player->playloop_step();
- }
- catch (std::exception &e)
- {
- send_cmd(command::toggle_play);
- _player->playloop_step(); // react on command
- QMessageBox::critical(this, "Error", e.what());
- }
- }
- else
- {
- /* Process controller events. When we're playing, the player does this. */
- controller::process_all_events();
- usleep(5000); // don't busy loop for controller events
- }
-}
-
-void main_window::open(QStringList filenames, const device_request &dev_request)
-{
- _player->force_stop();
- _player->close();
- parameters params_bak = _init_data.params;
- _init_data = _init_data_template;
- _init_data.params = params_bak;
- _init_data.dev_request = dev_request;
- _init_data.urls.clear();
- for (int i = 0; i < filenames.size(); i++)
- {
- _init_data.urls.push_back(filenames[i].toLocal8Bit().constData());
- }
- if (open_player())
- {
- // Get the settings for this video
- _settings->beginGroup("Video/" + current_file_hash());
- QString layout_fallback = QString(video_frame::stereo_layout_to_string(
- _player->get_media_input().video_frame_template().stereo_layout,
- _player->get_media_input().video_frame_template().stereo_layout_swap).c_str());
- QString layout_name = _settings->value("stereo-layout", layout_fallback).toString();
- video_frame::stereo_layout_from_string(layout_name.toStdString(), _init_data.stereo_layout, _init_data.stereo_layout_swap);
- _init_data.stereo_layout_override = true;
- _init_data.video_stream = QVariant(_settings->value("video-stream", QVariant(_init_data.video_stream)).toString()).toInt();
- _init_data.video_stream = std::max(0, std::min(_init_data.video_stream, _player->get_media_input().video_streams() - 1));
- _init_data.audio_stream = QVariant(_settings->value("audio-stream", QVariant(_init_data.audio_stream)).toString()).toInt();
- _init_data.audio_stream = std::max(0, std::min(_init_data.audio_stream, _player->get_media_input().audio_streams() - 1));
- _init_data.subtitle_stream = QVariant(_settings->value("subtitle-stream", QVariant(_init_data.subtitle_stream)).toString()).toInt();
- _init_data.subtitle_stream = std::max(-1, std::min(_init_data.subtitle_stream, _player->get_media_input().subtitle_streams() - 1));
- _init_data.params.parallax = QVariant(_settings->value("parallax", QVariant(_init_data.params.parallax)).toString()).toFloat();
- _init_data.params.ghostbust = QVariant(_settings->value("ghostbust", QVariant(_init_data.params.ghostbust)).toString()).toFloat();
- _init_data.params.subtitle_parallax = QVariant(_settings->value("subtitle-parallax", QVariant(_init_data.params.parallax)).toString()).toFloat();
- _settings->endGroup();
- // Get stereo mode
- QString mode_fallback = QString(parameters::stereo_mode_to_string(
- _player->get_parameters().stereo_mode,
- _player->get_parameters().stereo_mode_swap).c_str());
- QString mode_name = _settings->value(
- (_init_data.stereo_layout == video_frame::mono ? "Session/2d-stereo-mode" : "Session/3d-stereo-mode"),
- mode_fallback).toString();
- parameters::stereo_mode_from_string(mode_name.toStdString(), _init_data.stereo_mode, _init_data.stereo_mode_swap);
- _init_data.stereo_mode_override = true;
- // Fill in the rest with defaults
- _init_data.params.set_defaults();
- // Update the widget with the new settings
- _in_out_widget->update(_init_data, true, false);
- _controls_widget->update(_init_data, true, false, _player->get_media_input().duration());
- }
- else
- {
- _in_out_widget->update(_init_data, false, false);
- _controls_widget->update(_init_data, false, false, -1);
- }
-}
-
-void main_window::file_open()
-{
- QStringList file_names = QFileDialog::getOpenFileNames(this, _("Open files"),
- _settings->value("Session/file-open-dir", QDir::currentPath()).toString());
- if (file_names.empty())
- {
- return;
- }
- _settings->setValue("Session/file-open-dir", QFileInfo(file_names[0]).path());
- open(file_names);
-}
-
-void main_window::file_open_url()
-{
- QDialog *url_dialog = new QDialog(this);
- url_dialog->setWindowTitle(_("Open URL"));
- QLabel *url_label = new QLabel(_("URL:"));
- QLineEdit *url_edit = new QLineEdit("");
- url_edit->setMinimumWidth(256);
- QPushButton *cancel_btn = new QPushButton(_("Cancel"));
- QPushButton *ok_btn = new QPushButton(_("OK"));
- ok_btn->setDefault(true);
- connect(cancel_btn, SIGNAL(pressed()), url_dialog, SLOT(reject()));
- connect(ok_btn, SIGNAL(pressed()), url_dialog, SLOT(accept()));
- QGridLayout *layout = new QGridLayout();
- layout->addWidget(url_label, 0, 0);
- layout->addWidget(url_edit, 0, 1, 1, 3);
- layout->addWidget(cancel_btn, 2, 2);
- layout->addWidget(ok_btn, 2, 3);
- layout->setColumnStretch(1, 1);
- url_dialog->setLayout(layout);
- url_dialog->exec();
- if (url_dialog->result() == QDialog::Accepted
- && !url_edit->text().isEmpty())
- {
- QString url = url_edit->text();
- open(QStringList(url));
- }
-}
-
-void main_window::file_open_device()
-{
- // Gather list of available devices
- QStringList default_devices;
- QStringList firewire_devices;
- QString x11_device;
-#ifdef Q_OS_WIN
- // libavdevice supports devices "0" through "9" in the vfwcap driver on Windows.
- // Simply list them all here since I don't know how to find out which are actually available.
- for (int i = 0; i <= 9; i++)
- {
- default_devices << QString(QChar('0' + i));
- }
- firewire_devices << "/dev/video1394"; // TODO: this is definitely not correct
-#else
- // video4linux2 devices dynamically create device files /dev/video0 - /dev/video63.
- // TODO: does this also work on BSD and Mac OS?
- for (int i = 0; i < 64; i++)
- {
- QString device = QString("/dev/video") + QString::number(i);
- if (QFileInfo(device).exists())
- {
- default_devices << device;
- }
- }
- if (default_devices.empty())
- {
- // add a fallback entry
- default_devices << QString("/dev/video0");
- }
- firewire_devices << "/dev/video1394"; // TODO: this is probably not correct
-#endif
- x11_device = _settings->value("Session/device-x11", QString(":0.0+400,300")).toString();
-
- // Get saved settings
- device_request dev_request;
- _settings->beginGroup("Session");
- QString saved_type = _settings->value("device-type", QString("default")).toString();
- dev_request.device = (saved_type == "firewire" ? device_request::firewire
- : saved_type == "x11" ? device_request::x11 : device_request::sys_default);
- dev_request.width = _settings->value("device-request-frame-width", QString("0")).toInt();
- dev_request.height = _settings->value("device-request-frame-height", QString("0")).toInt();
- dev_request.frame_rate_num = _settings->value("device-request-frame-rate-num", QString("0")).toInt();
- dev_request.frame_rate_den = _settings->value("device-request-frame-rate-den", QString("0")).toInt();
- _settings->endGroup();
-
- // Run dialog
- open_device_dialog *dlg = new open_device_dialog(default_devices, firewire_devices, x11_device, dev_request, this);
- dlg->exec();
- if (dlg->result() != QDialog::Accepted)
- {
- return;
- }
- QString device;
- dlg->request(device, dev_request);
-
- // Save settings
- if (dev_request.device == device_request::x11)
- {
- _settings->setValue("Session/device-x11", device);
- }
- _settings->beginGroup("Session");
- _settings->setValue("device-type", QString(dev_request.device == device_request::firewire ? "firewire"
- : dev_request.device == device_request::x11 ? "x11" : "default"));
- _settings->setValue("device-request-frame-width", QVariant(dev_request.width).toString());
- _settings->setValue("device-request-frame-height", QVariant(dev_request.height).toString());
- _settings->setValue("device-request-frame-rate-num", QVariant(dev_request.frame_rate_num).toString());
- _settings->setValue("device-request-frame-rate-den", QVariant(dev_request.frame_rate_den).toString());
- _settings->endGroup();
-
- // Open device
- open(QStringList(device), dev_request);
-}
-
-void main_window::preferences_colors()
-{
- if (!_color_dialog)
- {
- _color_dialog = new color_dialog(&_init_data.params, this);
- }
- _color_dialog->show();
- _color_dialog->raise();
- _color_dialog->activateWindow();
-}
-
-void main_window::preferences_crosstalk()
-{
- if (!_crosstalk_dialog)
- {
- _crosstalk_dialog = new crosstalk_dialog(&_init_data.params, this);
- }
- _crosstalk_dialog->show();
- _crosstalk_dialog->raise();
- _crosstalk_dialog->activateWindow();
-}
-
-void main_window::preferences_subtitle()
-{
- if (!_subtitle_dialog)
- {
- _subtitle_dialog = new subtitle_dialog(&_init_data.params, this);
- }
- _subtitle_dialog->show();
- _subtitle_dialog->raise();
- _subtitle_dialog->activateWindow();
-}
-
-void main_window::preferences_stereoscopic()
-{
- if (!_stereoscopic_dialog)
- {
- _stereoscopic_dialog = new stereoscopic_dialog(&_init_data.params, this);
- }
- _stereoscopic_dialog->show();
- _stereoscopic_dialog->raise();
- _stereoscopic_dialog->activateWindow();
-}
-
-void main_window::preferences_fullscreen()
-{
- int n = QApplication::desktop()->screenCount();
-
- QDialog *dlg = new QDialog(this);
- dlg->setWindowTitle(_("Fullscreen/Multiscreen Settings"));
-
- QLabel *lbl = new QLabel(_("Configure fullscreen mode:"));
- lbl->setToolTip(_("Select the screens to use in fullscreen mode."));
-
- QRadioButton *single_btn = new QRadioButton(_("Single screen:"));
- single_btn->setToolTip(_("Use a single screen for fullscreen mode."));
- QComboBox *single_box = new QComboBox();
- single_box->setToolTip(single_btn->toolTip());
- single_box->addItem(_("Primary screen"));
- if (n > 1)
- {
- for (int i = 0; i < n; i++)
- {
- single_box->addItem(str::asprintf(_("Screen %d"), i + 1).c_str());
- }
- }
-
- QRadioButton *dual_btn = new QRadioButton(_("Dual screen:"));
- dual_btn->setToolTip(_("Use two screens for fullscreen mode."));
- QComboBox *dual_box0 = new QComboBox();
- dual_box0->setToolTip(dual_btn->toolTip());
- QComboBox *dual_box1 = new QComboBox();
- dual_box1->setToolTip(dual_btn->toolTip());
- if (n > 1)
- {
- for (int i = 0; i < n; i++)
- {
- dual_box0->addItem(str::asprintf(_("Screen %d"), i + 1).c_str());
- dual_box1->addItem(str::asprintf(_("Screen %d"), i + 1).c_str());
- }
- }
-
- QRadioButton *multi_btn = new QRadioButton(_("Multi screen:"));
- multi_btn->setToolTip(_("Use multiple screens for fullscreen mode."));
- QLineEdit *multi_edt = new QLineEdit();
- multi_edt->setToolTip(_("Comma-separated list of screens to use for fullscreen mode."));
- QRegExp rx("\\d{1,2}(,\\d{1,2}){0,15}");
- multi_edt->setValidator(new QRegExpValidator(rx, 0));
-
- QLabel *lbl2 = new QLabel(_("When in fullscreen mode,"));
- lbl2->setToolTip(_("Set special left/right view handling for fullscreen mode."));
-
- QCheckBox *flip_left_box = new QCheckBox(_("flip left view vertically."));
- flip_left_box->setToolTip(lbl2->toolTip());
- QCheckBox *flop_left_box = new QCheckBox(_("flop left view horizontally."));
- flop_left_box->setToolTip(lbl2->toolTip());
- QCheckBox *flip_right_box = new QCheckBox(_("flip right view vertically."));
- flip_right_box->setToolTip(lbl2->toolTip());
- QCheckBox *flop_right_box = new QCheckBox(_("flop right view horizontally."));
- flop_right_box->setToolTip(lbl2->toolTip());
-
- QPushButton *cancel_btn = new QPushButton(_("Cancel"));
- QPushButton *ok_btn = new QPushButton(_("OK"));
- ok_btn->setDefault(true);
- connect(cancel_btn, SIGNAL(pressed()), dlg, SLOT(reject()));
- connect(ok_btn, SIGNAL(pressed()), dlg, SLOT(accept()));
-
- 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);
- QGridLayout *layout1 = new QGridLayout();
- layout1->addWidget(cancel_btn, 0, 0);
- layout1->addWidget(ok_btn, 0, 1);
- QGridLayout *layout = new QGridLayout();
- layout->addLayout(layout0, 0, 0);
- layout->addLayout(layout1, 1, 0);
- dlg->setLayout(layout);
-
- // Set initial values from fullscreen_screens value
- if (n < 3)
- {
- multi_btn->setEnabled(false);
- multi_edt->setEnabled(false);
- }
- else
- {
- multi_edt->setText("1,2,3");
- }
- if (n < 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 (_init_data.params.fullscreen_screens & (1 << i))
- {
- conf_screens.push_back(i);
- }
- }
- if (conf_screens.size() >= 3 && n >= 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 && n >= 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] < n)
- {
- single_box->setCurrentIndex(conf_screens[0] + 1);
- }
- else
- {
- single_box->setCurrentIndex(0);
- }
- single_btn->setChecked(true);
- }
- flip_left_box->setChecked(_init_data.params.fullscreen_flip_left);
- flop_left_box->setChecked(_init_data.params.fullscreen_flop_left);
- flip_right_box->setChecked(_init_data.params.fullscreen_flip_right);
- flop_right_box->setChecked(_init_data.params.fullscreen_flop_right);
-
- dlg->exec();
- if (dlg->result() == QDialog::Accepted)
- {
- if (single_btn->isChecked())
- {
- if (single_box->currentIndex() == 0)
- {
- _init_data.params.fullscreen_screens = 0;
- }
- else
- {
- _init_data.params.fullscreen_screens = (1 << (single_box->currentIndex() - 1));
- }
- }
- else if (dual_btn->isChecked())
- {
- _init_data.params.fullscreen_screens = (1 << dual_box0->currentIndex());
- _init_data.params.fullscreen_screens |= (1 << dual_box1->currentIndex());
- }
- else
- {
- _init_data.params.fullscreen_screens = 0;
- QStringList screens = multi_edt->text().split(',', QString::SkipEmptyParts);
- for (int i = 0; i < screens.size(); i++)
- {
- int s = str::to<int>(screens[i].toAscii().data());
- if (s >= 1 && s <= 16)
- {
- _init_data.params.fullscreen_screens |= (1 << (s - 1));
- }
- }
- }
- send_cmd(command::set_fullscreen_screens, _init_data.params.fullscreen_screens);
- _init_data.params.fullscreen_flip_left = flip_left_box->isChecked() ? 1 : 0;
- send_cmd(command::set_fullscreen_flip_left, _init_data.params.fullscreen_flip_left);
- _init_data.params.fullscreen_flop_left = flop_left_box->isChecked() ? 1 : 0;
- send_cmd(command::set_fullscreen_flop_left, _init_data.params.fullscreen_flop_left);
- _init_data.params.fullscreen_flip_right = flip_right_box->isChecked() ? 1 : 0;
- send_cmd(command::set_fullscreen_flip_right, _init_data.params.fullscreen_flip_right);
- _init_data.params.fullscreen_flop_right = flop_right_box->isChecked() ? 1 : 0;
- send_cmd(command::set_fullscreen_flop_right, _init_data.params.fullscreen_flop_right);
- }
-}
-
-void main_window::help_manual()
-{
- QUrl manual_url;
-#if defined(Q_OS_WIN)
- manual_url = QUrl::fromLocalFile(QCoreApplication::applicationDirPath() + "/../doc/bino.html");
-#elif defined(Q_OS_MAC)
- manual_url = QUrl::fromLocalFile(QCoreApplication::applicationDirPath() + "/../Resources/Bino Help/bino.html");
-#else
- manual_url = QUrl::fromLocalFile(HTMLDIR "/bino.html");
-#endif
- if (!QDesktopServices::openUrl(manual_url))
- {
- QMessageBox::critical(this, _("Error"), _("Cannot open manual."));
- }
-}
-
-void main_window::help_website()
-{
- if (!QDesktopServices::openUrl(QUrl(PACKAGE_URL)))
- {
- QMessageBox::critical(this, _("Error"), _("Cannot open website."));
- }
-}
-
-void main_window::help_keyboard()
-{
- QMessageBox::information(this, _("Keyboard Shortcuts"),
- /* TRANSLATORS: This is a HTML table, shown under Help->Keyboard Shortcuts.
- Please make sure that your translation formats properly. */
- _("Keyboard control: "
- "<table>"
- "<tr><td>q or ESC</td><td>Stop</td></tr>"
- "<tr><td>p or SPACE</td><td>Pause / unpause</td></tr>"
- "<tr><td>f</td><td>Toggle fullscreen</td></tr>"
- "<tr><td>c</td><td>Center window</td></tr>"
- "<tr><td>e</td><td>Swap left/right eye</td></tr>"
- "<tr><td>v</td><td>Cycle through available video streams</td></tr>"
- "<tr><td>a</td><td>Cycle through available audio streams</td></tr>"
- "<tr><td>s</td><td>Cycle through available subtitle streams</td></tr>"
- "<tr><td>1, 2</td><td>Adjust contrast</td></tr>"
- "<tr><td>3, 4</td><td>Adjust brightness</td></tr>"
- "<tr><td>5, 6</td><td>Adjust hue</td></tr>"
- "<tr><td>7, 8</td><td>Adjust saturation</td></tr>"
- "<tr><td>&lt;, &gt;</td><td>Adjust parallax</td></tr>"
- "<tr><td>(, )</td><td>Adjust ghostbusting</td></tr>"
- "<tr><td>left, right</td><td>Seek 10 seconds backward / forward</td></tr>"
- "<tr><td>up, down</td><td>Seek 1 minute backward / forward</td></tr>"
- "<tr><td>page up, page down</td><td>Seek 10 minutes backward / forward</td></tr>"
- "</table>"
- ""));
-}
-
-void main_window::help_about()
-{
- QDialog *dialog = new QDialog(this);
- dialog->setModal(true);
- dialog->setWindowTitle(str::asprintf(_("About %s"), PACKAGE_NAME).c_str());
-
- QLabel *logo = new QLabel();
- logo->setPixmap(QPixmap(":logo/bino_logo.png").scaledToHeight(128, Qt::SmoothTransformation));
- QLabel *spacer = new QLabel();
- spacer->setMinimumWidth(16);
- QLabel *title = new QLabel(str::asprintf(_("The %s 3D video player"), PACKAGE_NAME).c_str());
-
- QTextBrowser *about_text = new QTextBrowser(this);
- about_text->setOpenExternalLinks(true);
- about_text->setText(str::asprintf(_(
- "%s version %s."
- "Copyright (C) 2011 the Bino developers."
- "This is free software. You may redistribute copies of it "
- "under the terms of the <a href=\"http://www.gnu.org/licenses/gpl.html\">"
- "GNU General Public License</a>. "
- "There is NO WARRANTY, to the extent permitted by law."
- "See <a href=\"%s\">%s</a> for more information on this software."),
- PACKAGE_NAME, VERSION, PACKAGE_URL, PACKAGE_URL).c_str());
-
- QTextBrowser *libs_text = new QTextBrowser(this);
- libs_text->setOpenExternalLinks(true);
- libs_text->setWordWrapMode(QTextOption::NoWrap);
- QString libs_blurb = QString(str::asprintf("%s<ul><li>%s</li></ul>", _("Platform:"), PLATFORM).c_str());
- libs_blurb += QString("") + QString(_("Libraries used:"));
- std::vector<std::string> libs = lib_versions(true);
- for (size_t i = 0; i < libs.size(); i++)
- {
- libs_blurb += libs[i].c_str();
- }
- libs_blurb += QString("");
- libs_text->setText(libs_blurb);
-
- QTextBrowser *team_text = new QTextBrowser(this);
- team_text->setOpenExternalLinks(false);
- team_text->setWordWrapMode(QTextOption::NoWrap);
- QFile team_file(":AUTHORS");
- team_file.open(QIODevice::ReadOnly | QIODevice::Text);
- team_text->setText(QTextCodec::codecForName("UTF-8")->toUnicode(team_file.readAll()));
-
- QTextBrowser *license_text = new QTextBrowser(this);
- license_text->setOpenExternalLinks(false);
- license_text->setWordWrapMode(QTextOption::NoWrap);
- QFile license_file(":LICENSE");
- license_file.open(QIODevice::ReadOnly | QIODevice::Text);
- license_text->setText(license_file.readAll());
-
- QTabWidget *tab_widget = new QTabWidget();
- tab_widget->addTab(about_text, _("About"));
- tab_widget->addTab(libs_text, _("Libraries"));
- tab_widget->addTab(team_text, _("Team"));
- tab_widget->addTab(license_text, _("License"));
-
- QPushButton *ok_btn = new QPushButton(_("OK"));
- connect(ok_btn, SIGNAL(pressed()), dialog, SLOT(accept()));
-
- QGridLayout *layout = new QGridLayout();
- layout->addWidget(logo, 0, 0);
- layout->addWidget(spacer, 0, 1);
- layout->addWidget(title, 0, 2, 1, 2);
- layout->addWidget(spacer, 0, 4);
- layout->addWidget(tab_widget, 1, 0, 1, 5);
- layout->addWidget(ok_btn, 2, 3, 1, 2);
- layout->setColumnStretch(1, 1);
- layout->setColumnStretch(4, 1);
- layout->setRowStretch(1, 1);
- dialog->setLayout(layout);
- about_text->setMinimumWidth(384);
-
- dialog->exec();
-}
-
-player_qt::player_qt() : player(player::slave)
-{
- QCoreApplication::setOrganizationName(PACKAGE_NAME);
- QCoreApplication::setApplicationName(PACKAGE_NAME);
- _settings = new QSettings;
-}
-
-player_qt::~player_qt()
-{
- delete _settings;
-}
-
-void player_qt::open(const player_init_data &init_data)
-{
- msg::set_level(init_data.log_level);
- _main_window = new main_window(_settings, init_data);
-}
-
-void player_qt::run()
-{
- QApplication::exec();
- delete _main_window;
- _main_window = NULL;
-}
-
-void player_qt::close()
-{
-}

bino-1.2.1.tar.bz2/src/player_qt.h Deleted

@@ -1,377 +0,0 @@
-/*
- * This file is part of bino, a 3D video player.
- *
- * Copyright (C) 2010-2011
- * Martin Lambers <marlam@marlam.de>
- * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
- * Joe <cuchac@email.cz>
- *
- * 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 PLAYER_GUI_H
-#define PLAYER_GUI_H
-
-#include <QMainWindow>
-#include <QWidget>
-#include <QComboBox>
-#include <QPushButton>
-#include <QLabel>
-#include <QDoubleSpinBox>
-#include <QSpinBox>
-#include <QCheckBox>
-#include <QFontComboBox>
-#include <QTimer>
-#include <QSettings>
-#include <QDialog>
-#include <QGroupBox>
-#include <QStackedWidget>
-
-#include "controller.h"
-#include "video_output_qt.h"
-#include "player.h"
-
-
-class player_qt_internal : public player, public controller
-{
-private:
- bool _playing;
- video_output_qt *_video_output;
-
-protected:
- virtual video_output *create_video_output();
- virtual void destroy_video_output(video_output *vo);
-
-public:
- player_qt_internal(video_output_qt *video_output);
- virtual ~player_qt_internal();
-
- virtual void receive_cmd(const command &cmd);
-
- virtual void receive_notification(const notification &note);
-
- const video_output_qt *get_video_output() const;
- video_output_qt *get_video_output();
- bool is_playing() const;
- bool playloop_step();
- void force_stop();
- void move_event();
-};
-
-class in_out_widget : public QWidget, public controller
-{
- Q_OBJECT
-
-private:
- QSettings *_settings;
- const player_qt_internal *_player;
- QComboBox *_video_combobox;
- QComboBox *_audio_combobox;
- QComboBox *_subtitle_combobox;
- QComboBox *_input_combobox;
- QComboBox *_output_combobox;
- QCheckBox *_swap_checkbox;
- bool _lock;
-
- void set_stereo_layout(video_frame::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, const player_qt_internal *player, QWidget *parent);
- virtual ~in_out_widget();
-
- void update(const player_init_data &init_data, bool have_valid_input, bool playing);
-
- int get_video_stream();
- int get_audio_stream();
- int get_subtitle_stream();
- void get_stereo_layout(video_frame::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;
- bool _playing;
-
-private slots:
- void play_pressed();
- void pause_pressed();
- void stop_pressed();
- void loop_pressed();
- void fullscreen_pressed();
- void center_pressed();
- void bbb_pressed();
- void bb_pressed();
- void b_pressed();
- void f_pressed();
- void ff_pressed();
- void fff_pressed();
- void seek_slider_changed();
-
-public:
- controls_widget(QSettings *settings, const player_init_data &init_data, QWidget *parent);
- virtual ~controls_widget();
-
- void update(const player_init_data &init_data, bool have_valid_input, bool playing, int64_t input_duration);
- virtual void receive_notification(const notification &note);
-};
-
-class color_dialog : public QDialog, public controller
-{
- Q_OBJECT
-
-private:
- parameters *_params;
- 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(parameters *params, QWidget *parent);
-
- virtual void receive_notification(const notification &note);
-};
-
-class crosstalk_dialog : public QDialog, public controller
-{
- Q_OBJECT
-
-private:
- parameters *_params;
- bool _lock;
- QDoubleSpinBox *_r_spinbox;
- QDoubleSpinBox *_g_spinbox;
- QDoubleSpinBox *_b_spinbox;
-
-private slots:
- void spinbox_changed();
-
-public:
- crosstalk_dialog(parameters *params, QWidget *parent);
-
- virtual void receive_notification(const notification &note);
-};
-
-class subtitle_dialog: public QDialog, public controller
-{
- Q_OBJECT
-
-private:
- parameters *_params;
- 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;
- QColor _color;
-
- QList<QTextCodec *> find_codecs();
- void set_color_button(uint32_t c);
-
-private slots:
- void color_button_pressed();
- void encoding_changed();
- void font_changed();
- void size_changed();
- void scale_changed();
- void color_changed();
-
-public:
- subtitle_dialog(parameters *params, QWidget *parent);
-
- virtual void receive_notification(const notification &note);
-};
-
-class stereoscopic_dialog : public QDialog, public controller
-{
- Q_OBJECT
-
-private:
- parameters *_params;
- bool _lock;
- QDoubleSpinBox *_p_spinbox;
- QSlider *_p_slider;
- QDoubleSpinBox *_sp_spinbox;
- QSlider *_sp_slider;
- QDoubleSpinBox *_g_spinbox;
- QSlider *_g_slider;
-
-private slots:
- 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:
- stereoscopic_dialog(parameters *params, QWidget *parent);
-
- virtual void receive_notification(const notification &note);
-};
-
-class open_device_dialog : public QDialog
-{
- Q_OBJECT
-
-private:
- QComboBox *_type_combobox;
- QStackedWidget *_device_chooser_stack;
- QComboBox *_default_device_combobox;
- QComboBox *_firewire_device_combobox;
- QLineEdit *_x11_device_field;
- QGroupBox *_frame_size_groupbox;
- QSpinBox *_frame_width_spinbox;
- QSpinBox *_frame_height_spinbox;
- QGroupBox *_frame_rate_groupbox;
- QSpinBox *_frame_rate_num_spinbox;
- QSpinBox *_frame_rate_den_spinbox;
-
-private slots:
- void frame_size_groupbox_clicked(bool checked);
- void frame_rate_groupbox_clicked(bool checked);
-
-public:
- open_device_dialog(const QStringList &default_devices, const QStringList &firewire_devices,
- const QString &x11_device, const device_request &dev_request, QWidget *parent);
- void request(QString &device, device_request &dev_request);
-};
-
-class main_window : public QMainWindow, public controller
-{
- Q_OBJECT
-
-private:
- QSettings *_settings;
- video_container_widget *_video_container_widget;
- video_output_qt *_video_output;
- in_out_widget *_in_out_widget;
- controls_widget *_controls_widget;
- color_dialog *_color_dialog;
- crosstalk_dialog *_crosstalk_dialog;
- subtitle_dialog *_subtitle_dialog;
- stereoscopic_dialog *_stereoscopic_dialog;
- player_qt_internal *_player;
- QTimer *_timer;
- player_init_data _init_data;
- const player_init_data _init_data_template;
- bool _stop_request;
-
- QString current_file_hash();
- bool open_player();
- void open(QStringList urls, const device_request &dev_request = device_request());
-
-private slots:
- void move_event();
- void playloop_step();
- void file_open();
- void file_open_url();
- void file_open_device();
- void preferences_colors();
- void preferences_crosstalk();
- void preferences_subtitle();
- void preferences_stereoscopic();
- void preferences_fullscreen();
- void help_manual();
- void help_website();
- void help_keyboard();
- void help_about();
-
-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, const player_init_data &init_data);
- virtual ~main_window();
-
- virtual void receive_notification(const notification &note);
-};
-
-class player_qt : public player
-{
-private:
- main_window *_main_window;
- QSettings *_settings;
-
-public:
- player_qt();
- virtual ~player_qt();
-
- QSettings *settings()
- {
- return _settings;
- }
-
- virtual void open(const player_init_data &init_data);
- virtual void run();
- virtual void close();
-};
-
-#endif

bino-1.2.1.tar.bz2/src/xgl.cpp Deleted

@@ -1,389 +0,0 @@
-/*
- * This file is part of bino, a 3D video player.
- *
- * Copyright (C) 2010-2011
- * 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 <GL/glew.h>
-
-#include "gettext.h"
-#define _(string) gettext(string)
-
-#include "dbg.h"
-#include "exc.h"
-#include "str.h"
-#include "msg.h"
-
-#include "xgl.h"
-
-
-/*
- * Push and Pop things
- */
-
-static void *xglPush(std::vector<unsigned char> &stack, size_t s)
-{
- stack.resize(stack.size() + s);
- return &(stack[stack.size() - s]);
-}
-
-static void *xglTop(std::vector<unsigned char> &stack, size_t s)
-{
- return &(stack[stack.size() - s]);
-}
-
-static void xglPop(std::vector<unsigned char> &stack, size_t s)
-{
- stack.resize(stack.size() - s);
-}
-
-void xgl::PushProgram(std::vector<unsigned char> &stack)
-{
- glGetIntegerv(GL_CURRENT_PROGRAM, static_cast<GLint *>(xglPush(stack, sizeof(GLint))));
-}
-
-void xgl::PopProgram(std::vector<unsigned char> &stack)
-{
- const GLint *prg = static_cast<const GLint *>(xglTop(stack, sizeof(GLint)));
- glUseProgram(*prg);
- xglPop(stack, sizeof(GLint));
-}
-
-void xgl::PushViewport(std::vector<unsigned char> &stack)
-{
- glGetIntegerv(GL_VIEWPORT, static_cast<GLint *>(xglPush(stack, 4 * sizeof(GLint))));
-}
-
-void xgl::PopViewport(std::vector<unsigned char> &stack)
-{
- const GLint *vp = static_cast<const GLint *>(xglTop(stack, 4 * sizeof(GLint)));
- glViewport(vp[0], vp[1], vp[2], vp[3]);
- xglPop(stack, 4 * sizeof(GLint));
-}
-
-void xgl::PushFBO(std::vector<unsigned char> &stack)
-{
- glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, static_cast<GLint *>(xglPush(stack, sizeof(GLint))));
-}
-
-void xgl::PopFBO(std::vector<unsigned char> &stack)
-{
- const GLint *fbo = static_cast<const GLint *>(xglTop(stack, sizeof(GLint)));
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, *fbo);
- xglPop(stack, sizeof(GLint));
-}
-
-void xgl::PushModelViewMatrix(std::vector<unsigned char> &stack)
-{
- glGetFloatv(GL_MODELVIEW_MATRIX, static_cast<GLfloat *>(xglPush(stack, 16 * sizeof(GLfloat))));
-}
-
-void xgl::PopModelViewMatrix(std::vector<unsigned char> &stack)
-{
- GLint m;
- glGetIntegerv(GL_MATRIX_MODE, &m);
- glMatrixMode(GL_MODELVIEW);
- glLoadMatrixf(static_cast<const GLfloat *>(xglTop(stack, 16 * sizeof(GLfloat))));
- xglPop(stack, 16 * sizeof(GLfloat));
- glMatrixMode(m);
-}
-
-void xgl::PushProjectionMatrix(std::vector<unsigned char> &stack)
-{
- glGetFloatv(GL_PROJECTION_MATRIX, static_cast<GLfloat *>(xglPush(stack, 16 * sizeof(GLfloat))));
-}
-
-void xgl::PopProjectionMatrix(std::vector<unsigned char> &stack)
-{
- GLint m;
- glGetIntegerv(GL_MATRIX_MODE, &m);
- glMatrixMode(GL_PROJECTION);
- glLoadMatrixf(static_cast<const GLfloat *>(xglTop(stack, 16 * sizeof(GLfloat))));
- xglPop(stack, 16 * sizeof(GLfloat));
- glMatrixMode(m);
-}
-
-void xgl::PushEverything(std::vector<unsigned char> &stack)
-{
- glPushAttrib(GL_ALL_ATTRIB_BITS);
- glPushClientAttrib(GL_CLIENT_ALL_ATTRIB_BITS);
- xgl::PushModelViewMatrix(stack);
- xgl::PushProjectionMatrix(stack);
- xgl::PushFBO(stack);
- xgl::PushViewport(stack);
- xgl::PushProgram(stack);
-}
-
-void xgl::PopEverything(std::vector<unsigned char> &stack)
-{
- xgl::PopProgram(stack);
- xgl::PopViewport(stack);
- xgl::PopFBO(stack);
- xgl::PopProjectionMatrix(stack);
- xgl::PopModelViewMatrix(stack);
- glPopClientAttrib();
- glPopAttrib();
-}
-
-
-/*
- * Error checking
- */
-
-bool xgl::CheckFBO(const GLenum target, const std::string &where)
-{
- GLenum status = glCheckFramebufferStatusEXT(target);
- if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
- {
- std::string errstr;
- switch (status)
- {
- case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT:
- errstr = "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT";
- break;
-
- case GL_FRAMEBUFFER_UNSUPPORTED_EXT:
- errstr = "GL_FRAMEBUFFER_UNSUPPORTED_EXT";
- break;
-
- case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT:
- errstr = "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT";
- break;
-
- case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT:
- errstr = "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT";
- break;
-
- case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT:
- errstr = "GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT";
- break;
-
- case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT:
- errstr = "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT";
- break;
-
- case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT:
- errstr = "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT";
- break;
-
- case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT:
- errstr = "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT";
- break;
-
- case 0:
- errstr = "in glCheckFramebufferStatus";
- break;
-
- default:
- errstr = str::asprintf("0x%X", static_cast<unsigned int>(status));
- break;
- }
- std::string pfx = (where.length() > 0 ? where + ": " : "");
- throw exc(pfx + str::asprintf(_("OpenGL FBO error %s."), errstr.c_str()));
- return false;
- }
- return true;
-}
-
-bool xgl::CheckFBO(const GLenum target)
-{
- return xgl::CheckFBO(target, "");
-}
-
-bool xgl::CheckError(const std::string &where)
-{
- GLenum e = glGetError();
- if (e != GL_NO_ERROR)
- {
- std::string pfx = (where.length() > 0 ? where + ": " : "");
- throw exc(pfx + str::asprintf(_("OpenGL error 0x%04X."), static_cast<unsigned int>(e)));
- // Don't use gluErrorString(e) here to avoid depending on libGLU just for this
- return false;
- }
- return true;
-}
-
-bool xgl::CheckError()
-{
- return xgl::CheckError("");
-}
-
-
-/*
- * Shaders and Programs
- */
-
-static void xglKillCrlf(char *str)
-{
- size_t l = strlen(str);
- if (l > 0 && str[l - 1] == '\n')
- str[--l] = '\0';
- if (l > 0 && str[l - 1] == '\r')
- str[l - 1] = '\0';
-}
-
-GLuint xgl::CompileShader(const std::string &name, GLenum type, const std::string &src)
-{
- msg::dbg("Compiling %s shader %s.",
- type == GL_VERTEX_SHADER ? "vertex" : type == GL_GEOMETRY_SHADER_EXT ? "geometry" : "fragment",
- name.c_str());
-
- // XXX: Work around a bad bad bug in the free OpenGL drivers for ATI cards on Ubuntu
- // 10.10: the compilation of shader source depends on the locale, and gives wrong
- // results e.g. in de_DE.UTF-8. So we backup the locale, set it to "C", and restore
- // the backup after compilation.
- std::string locale_backup = setlocale(LC_ALL, NULL);
- setlocale(LC_ALL, "C");
-
- GLuint shader = glCreateShader(type);
- const GLchar *glsrc = src.c_str();
- glShaderSource(shader, 1, &glsrc, NULL);
- glCompileShader(shader);
-
- setlocale(LC_ALL, locale_backup.c_str());
-
- std::string log;
- GLint e, l;
- glGetShaderiv(shader, GL_COMPILE_STATUS, &e);
- glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &l);
- if (l > 0)
- {
- char *tmplog = new char[l];
- glGetShaderInfoLog(shader, l, NULL, tmplog);
- xglKillCrlf(tmplog);
- log = std::string(tmplog);
- delete[] tmplog;
- }
- else
- {
- log = std::string("");
- }
-
- if (e == GL_TRUE && log.length() > 0)
- {
- msg::wrn(_("OpenGL %s '%s': compiler warning:"),
- type == GL_VERTEX_SHADER ? _("vertex shader")
- : type == GL_GEOMETRY_SHADER_EXT ? _("geometry shader")
- : _("fragment shader"),
- name.c_str());
- msg::wrn_txt("%s", log.c_str());
- }
- else if (e != GL_TRUE)
- {
- std::string when = str::asprintf(_("OpenGL %s '%s': compilation failed."),
- type == GL_VERTEX_SHADER ? _("vertex shader")
- : type == GL_GEOMETRY_SHADER_EXT ? _("geometry shader")
- : _("fragment shader"),
- name.c_str());
- std::string what = str::asprintf("\n%s", log.length() > 0 ? log.c_str() : _("unknown error"));
- throw exc(str::asprintf(_("%s: %s"), when.c_str(), what.c_str()));
- }
- return shader;
-}
-
-GLuint xgl::CreateProgram(GLuint vshader, GLuint gshader, GLuint fshader)
-{
- assert(vshader != 0 || gshader != 0 || fshader != 0);
-
- GLuint program = glCreateProgram();
- if (vshader != 0)
- glAttachShader(program, vshader);
- if (gshader != 0)
- glAttachShader(program, gshader);
- if (fshader != 0)
- glAttachShader(program, fshader);
-
- return program;
-}
-
-GLuint xgl::CreateProgram(const std::string &name,
- const std::string &vshader_src, const std::string &gshader_src, const std::string &fshader_src)
-{
- GLuint vshader = 0, gshader = 0, fshader = 0;
-
- if (vshader_src.length() > 0)
- vshader = xgl::CompileShader(name, GL_VERTEX_SHADER, vshader_src);
- if (gshader_src.length() > 0)
- gshader = xgl::CompileShader(name, GL_GEOMETRY_SHADER_EXT, gshader_src);
- if (fshader_src.length() > 0)
- fshader = xgl::CompileShader(name, GL_FRAGMENT_SHADER, fshader_src);
-
- return xgl::CreateProgram(vshader, gshader, fshader);
-}
-
-void xgl::LinkProgram(const std::string &name, const GLuint prg)
-{
- msg::dbg("Linking OpenGL program %s.", name.c_str());
-
- glLinkProgram(prg);
-
- std::string log;
- GLint e, l;
- glGetProgramiv(prg, GL_LINK_STATUS, &e);
- glGetProgramiv(prg, GL_INFO_LOG_LENGTH, &l);
- if (l > 0)
- {
- char *tmplog = new char[l];
- glGetProgramInfoLog(prg, l, NULL, tmplog);
- xglKillCrlf(tmplog);
- log = std::string(tmplog);
- delete[] tmplog;
- }
- else
- {
- log = std::string("");
- }
-
- if (e == GL_TRUE && log.length() > 0)
- {
- msg::wrn(_("OpenGL program '%s': linker warning:"), name.c_str());
- msg::wrn_txt("%s", log.c_str());
- }
- else if (e != GL_TRUE)
- {
- std::string when = str::asprintf(_("OpenGL program '%s': linking failed."), name.c_str());
- std::string what = str::asprintf("\n%s", log.length() > 0 ? log.c_str() : _("unknown error"));
- throw exc(when + ": " + what);
- }
-}
-
-void xgl::DeleteProgram(GLuint program)
-{
- if (glIsProgram(program))
- {
- GLint shader_count;
- glGetProgramiv(program, GL_ATTACHED_SHADERS, &shader_count);
- GLuint *shaders = new GLuint[shader_count];
- glGetAttachedShaders(program, shader_count, NULL, shaders);
- for (int i = 0; i < shader_count; i++)
- glDeleteShader(shaders[i]);
- delete[] shaders;
- glDeleteProgram(program);
- }
-}
-
-void xgl::DeletePrograms(GLsizei n, const GLuint *programs)
-{
- for (GLsizei i = 0; i < n; i++)
- {
- xgl::DeleteProgram(programs[i]);
- }
-}

bino-1.2.1.tar.bz2/src/xgl.h Deleted

@@ -1,145 +0,0 @@
-/*
- * This file is part of bino, a 3D video player.
- *
- * Copyright (C) 2010-2011
- * 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 XGL_H
-#define XGL_H
-
-#include <vector>
-#include <string>
-
-#include <GL/glew.h>
-
-
-namespace xgl
-{
- void PushProgram(std::vector<unsigned char> &stack);
- void PopProgram(std::vector<unsigned char> &stack);
- void PushViewport(std::vector<unsigned char> &stack);
- void PopViewport(std::vector<unsigned char> &stack);
- void PushFBO(std::vector<unsigned char> &stack);
- void PopFBO(std::vector<unsigned char> &stack);
- void PushModelViewMatrix(std::vector<unsigned char> &stack);
- void PopModelViewMatrix(std::vector<unsigned char> &stack);
- void PushProjectionMatrix(std::vector<unsigned char> &stack);
- void PopProjectionMatrix(std::vector<unsigned char> &stack);
-
- void PushEverything(std::vector<unsigned char> &stack);
- void PopEverything(std::vector<unsigned char> &stack);
-
-
- /*
- * Error checking
- */
-
- /**
- * \param target One of GL_FRAMEBUFFER_EXT, GL_READ_FRAMEBUFFER_EXT, GL_DRAW_FRAMEBUFFER_EXT.
- * \param where Location of the check.
- * \returns True.
- *
- * Checks the status of the current GL framebuffer object of the given type.
- * If an error occured, an appropriate exception is thrown.\n
- * The purpose of the return value is to be able to put this function
- * into an assert statement.
- */
- bool CheckFBO(const GLenum target, const std::string &where);
- bool CheckFBO(const GLenum target);
-
- /**
- * \param where Location of the check.
- * \returns True.
- *
- * Checks if a GL error occured.
- * If an error occured, an appropriate exception is thrown.\n
- * The purpose of the return value is to be able to put this function
- * into an assert statement.
- */
- bool CheckError(const std::string &where);
- bool CheckError();
-
-
- /*
- * Shaders and Programs
- */
-
- /**
- * \param name Name of the shader. Can be an arbitrary string.
- * \param type GL_VERTEX_SHADER or GL_GEOMETRY_SHADER or GL_FRAGMENT_SHADER.
- * \param src The source code of the shader.
- * \returns The GL shader object.
- *
- * Creates a GL shader object. The \a name of the shader is only used
- * for error reporting purposes. If compilation fails, an exception is thrown.
- */
- GLuint CompileShader(const std::string &name, GLenum type, const std::string &src);
-
- /**
- * \param vshader A vertex shader, or 0.
- * \param gshader A geometry shader, or 0.
- * \param fshader A fragment shader, or 0.
- * \returns The GL program object.
- *
- * Creates a GL program object.
- */
- GLuint CreateProgram(GLuint vshader, GLuint gshader, GLuint fshader);
-
- /**
- * \param name Name of the program. Can be an arbitrary string.
- * \param vshader_src Source of the vertex shader, or an empty string.
- * \param gshader_src Source of the geometry shader, or an empty string.
- * \param fshader_src Source of the fragment shader, or an empty string.
- * \returns The GL program object.
- *
- * Creates a GL program object. The \a name of the program is only used
- * for error reporting purposes.
- */
- GLuint CreateProgram(const std::string &name,
- const std::string &vshader_src,
- const std::string &gshader_src,
- const std::string &fshader_src);
-
- /**
- * \param name Name of the program. Can be an arbitrary string.
- * \param prg The GL program object.
- * \returns The relinked GL program object.
- *
- * Links a GL program object. The \a name of the program is only used
- * for error reporting purposes. If linking fails, an exception is thrown.
- */
- void LinkProgram(const std::string &name, const GLuint prg);
-
- /**
- * \param program The program.
- *
- * Deletes a GL program and all its associated shaders. Does nothing if
- * \a program is not a valid program.
- */
- void DeleteProgram(GLuint program);
-
- /**
- * \param n The number of programs.
- * \param program The programs.
- *
- * Deletes the given GL programs and all their associated shaders. Does nothing if
- * \a program is not a valid program.
- */
- void DeletePrograms(GLsizei n, const GLuint *programs);
-};
-
-#endif

bino-1.2.1.tar.bz2/AUTHORS -> bino-1.3.2.tar.xz/AUTHORS Changed

bino-1.2.1.tar.bz2/ChangeLog -> bino-1.3.2.tar.xz/ChangeLog Changed

@@ -1,22 +1,1817 @@
-commit 87f080ccaf37d97ad9a7959100e5241f44f71638
+commit 92813d40b7d425ee2621a3530cbf4ae0b6085e71
 Author: Martin Lambers <marlam@marlam.de>
-Date: 2011-10-10 21:17:25 +0200
+Date: 2012-03-16 19:39:10 +0100
 
- Update AUTHORS.
+ GUI: make Keyboard Shortcuts dialog non-modal.
 
- AUTHORS | 4 +++-
+ src/gui.cpp | 65 ++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 36 insertions(+), 29 deletions(-)
+
+commit 39eda0dd68ffefd31b2f1b2576eb0d8f0fd1fe8e
+Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+Date: 2012-03-16 19:27:10 +0100
+
+ Mac OS X: GUI: don't let the user close the main window.
+
+ src/gui.cpp | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit d97e6ac6bcb7783c384fde2416477e77d125e95c
+Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+Date: 2012-03-16 19:25:06 +0100
+
+ GUI: make About dialog non-modal.
+
+ src/gui.cpp | 147 ++++++++++++++++++++++++++++++-----------------------------
+ 1 files changed, 75 insertions(+), 72 deletions(-)
+
+commit 9f40859d3f7078789bc4c22b2b8492014b6ec0e3
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-15 19:10:33 +0100
+
+ Reduce CPU usage: don't busy-loop when there's nothing to do.
+
+ src/dispatch.cpp | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit c053f8e0822f01a778bfd9c265e6e7a332ea541a
+Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+Date: 2012-03-15 19:03:28 +0100
+
+ GUI: make button react on signal clicked(), not on pressed().
+
+ src/gui.cpp | 82 +++++++++++++++++++++++++++++-----------------------------
+ src/gui.h | 28 ++++++++++----------
+ 2 files changed, 55 insertions(+), 55 deletions(-)
+
+commit c7e55ccd03a6f12c55d0b8dd2b67c7736f4b773e
+Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+Date: 2012-03-15 18:58:51 +0100
+
+ Mac OS X: update packaging Makefile.
+
+ Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit aef04f7c398dec6b8b18fa7e84cc15a9df539dc7
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-15 18:57:17 +0100
+
+ Equalizer: fix pausing and stepping.
+
+ src/player_equalizer.cpp | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 50a8801544ccc63bd8fc8a48ff3fdc2d9894163a
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-15 18:54:33 +0100
+
+ Add single-frame stepping using the '.' key.
+
+ NEWS | 1 +
+ doc/bino.1 | 2 ++
+ doc/bino.texi | 2 ++
+ src/dispatch.cpp | 4 ++++
+ src/dispatch.h | 1 +
+ src/gui.cpp | 3 +++
+ src/main.cpp | 1 +
+ src/player.cpp | 15 ++++++++++++++-
+ src/player.h | 2 ++
+ src/player_equalizer.cpp | 3 +++
+ src/video_output_qt.cpp | 3 +++
+ 11 files changed, 36 insertions(+), 1 deletions(-)
+
+commit c9ed557472a1c4e2b016ba955fbc68d8be17d91f
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-15 09:50:02 +0100
+
+ Require GLEWMX >= 1.6.0. Version 1.5.x crashes on Ubuntu 10.04.
+
+ configure.ac | 4 ++--
+ src/Makefile.am | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 06fed120393a53e85ef4d1b8c9f6f71afa5b7c07
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-15 09:11:09 +0100
+
+ Video output: simplify synchronization of GL thread and main thread.
+
+ src/video_output_qt.cpp | 22 +++++++++++-----------
+ 1 files changed, 11 insertions(+), 11 deletions(-)
+
+commit 5e023364615dc4c51bfec72f1c4db768bbf4ad55
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-15 09:10:41 +0100
+
+ Media object: flush buffers before seeking.
+
+ src/media_object.cpp | 18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+commit 3a54785c87480df727bed3ff28d9b4ff711a2f63
+Merge: 9ce1983 584bc3c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-15 07:30:41 +0100
+
+ Merge branch 'master' of git.sv.gnu.org:/srv/git/bino
+
+commit 9ce1983b957fde1188792467f2f18577755b3649
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-15 07:25:18 +0100
+
+ Always update the video output after a seek occurred, even in pause mode.
+ 
+ This fixes bug #35834.
+
+ src/player.cpp | 17 +++++++++++++----
+ src/player.h | 1 +
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+commit d1ae3fdc7ed6455168caae45b7ffb98148828577
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-15 07:24:19 +0100
+
+ Fix synchronization of main thread with GL thread.
+ 
+ This is important to not miss prepare_next_frame() and/or activate_next_frame()
+ actions submitted by the player.
+
+ src/video_output_qt.cpp | 91 +++++++++++++----------------------------------
+ src/video_output_qt.h | 13 +++----
+ 2 files changed, 30 insertions(+), 74 deletions(-)
+
+commit 3e6d883a62c33a6000a7a0976db0283a20035de3
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-15 07:23:49 +0100
+
+ Update base modules.
+
+ src/base/dbg.cpp | 88 ++++++++++++++++++++++++++++++++++++++++++++++++---
+ src/base/exc.h | 2 -
+ src/base/thread.cpp | 77 ++++++++++++++++++++++++++++++++++++++------
+ src/base/thread.h | 34 ++++++++++++++++++--
+ 4 files changed, 181 insertions(+), 20 deletions(-)
+
+commit 584bc3ca56af6fbc24a9eb464377a76d9ae225c9
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-14 13:54:49 +0100
+
+ Fix typo in fullscreen code.
+
+ src/video_output_qt.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit deb739142f80ad34880d8fdbb769db97ca5b5cf5
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-14 13:53:43 +0100
+
+ Fix type in fullscreen code.
+
+ src/video_output_qt.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a2a0d1531acf29044b86e047b86809a94b3294b8
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-14 10:18:48 +0100
+
+ Fullscreen mode improvements.
+ 
+ - In non-GUI mode, restore original geometry when leavin fullscreen mode.
+ - Don't set invalid geometry if fullscreen_screens contains garbage.
+
+ src/video_output_qt.cpp | 37 ++++++++++++++++++++++---------------
+ src/video_output_qt.h | 1 +
+ 2 files changed, 23 insertions(+), 15 deletions(-)
+
+commit 07e5162dc49e0b41cd134a861f45bf676c5ea000
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-14 09:35:57 +0100
+
+ Fix and simplify fullscreen mode and settings dialog.
+
+ src/gui.cpp | 108 +++++++++++++----------------------------------
+ src/gui.h | 15 +------
+ src/video_output_qt.cpp | 104 +++++++++++++++++++--------------------------
+ 3 files changed, 75 insertions(+), 152 deletions(-)
+
+commit 36bafd06135c347f23287c8ce5ee5e0f42bcda4f
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-13 20:45:00 +0100
+
+ Improve icons for input layout alternating-*.
+
+ .../input-layout-alternating-left-right.ipe | 26 ++++++++++++-------
+ .../input-layout-alternating-left-right.png | Bin 861 -> 473 bytes
+ .../input-layout-alternating-right-left.ipe | 26 ++++++++++++-------
+ .../input-layout-alternating-right-left.png | Bin 872 -> 670 bytes
+ 4 files changed, 32 insertions(+), 20 deletions(-)
+
+commit 2475c61ff7598f4698f154a363a2ac94b87d5823
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-13 20:40:08 +0100
+
+ Fix building with older GLEW versions.
+ 
+ Some older GLEW version lack '-DGLEW_MX' in their pkgconfig file.
+
+ src/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit dc3153ab6ca54bb7c07c264fc48065567ddea163
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-13 20:31:14 +0100
+
+ Simplify video widget resizing, and reduce GUI flicker.
+
+ src/gui.cpp | 3 ---
+ src/video_output_qt.cpp | 11 ++++++-----
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+commit 5f53b19f513fa305d647df1575ecf8834f7e0933
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-13 16:05:16 +0100
+
+ Media object: fix crash on closing when opening did not succeed.
+
+ src/media_object.cpp | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 4882a5682d3a065fb30e3a573f41616b0ee2e2a5
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-12 21:17:10 +0100
+
+ Apply workaround for Qt bug only on X11 systems.
+
+ src/video_output_qt.h | 4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
 
-commit 6e0dc435c3b8ef8a9ffab8bc9e07db8d6ba4d7a2
+commit d95b4b0acfa0f0e75c026f8d3511b8765d963a36
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-12 21:01:49 +0100
+
+ Work around a bug in the Mesa 7.6.11 GLSL compiler.
+ 
+ The compiler complained about l being defined more than once.
+
+ src/video_output_render.fs.glsl | 15 ++++++++-------
+ 1 files changed, 8 insertions(+), 7 deletions(-)
+
+commit d801d60615cafcbe55dfacfc3ad137625e418dc8
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-12 20:50:36 +0100
+
+ Work around a bug in Qt < 4.8, and remove previous unnecessary precautions.
+
+ src/video_output_qt.cpp | 2 --
+ src/video_output_qt.h | 8 +++++++-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+commit 082312ccb0df51517330a1d5105f1bc1524dce15
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-12 19:26:50 +0100
+
+ Simplify / improve GL context handling.
+
+ src/player_equalizer.cpp | 1 -
+ src/video_output.h | 1 -
+ src/video_output_qt.cpp | 57 +++++++++++++++++++++-------------------------
+ src/video_output_qt.h | 1 -
+ 4 files changed, 26 insertions(+), 34 deletions(-)
+
+commit 075453f2bb78cecb9d769e56ee90b29292bfe26b
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-11 16:10:40 +0100
+
+ Bump version to 1.3.1.
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 8f8cd6f777fb9e6a5c9e1aa8f0d2452eb4390fa3
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-11 16:09:10 +0100
+
+ Update AUTHORS, NEWS.
+
+ AUTHORS | 1 +
+ NEWS | 9 ++++++---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+commit 15609d88c776d49b3b27ac866854da0ff0c00889
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-11 11:45:22 +0100
+
+ Windows: update build instructions.
+
+ README.Windows | 15 ++++++++-------
+ 1 files changed, 8 insertions(+), 7 deletions(-)
+
+commit 019193c41b44ce8a6a04664f28afbc7c86be515d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-11 09:47:32 +0100
+
+ Support the new output mode "left/right view alternating" on all systems.
+
+ src/gui.cpp | 5 -----
+ src/player_equalizer.cpp | 1 -
+ src/video_output.h | 1 -
+ src/video_output_qt.cpp | 36 +++++++++---------------------------
+ src/video_output_qt.h | 5 +++--
+ 5 files changed, 12 insertions(+), 36 deletions(-)
+
+commit 565d22cfc2241fdfb9a9e9858eabaf968f16d2dd
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-09 23:10:01 +0100
+
+ Add new output mode: left/right view alternating.
+ 
+ This displays left and right view alternating at display refresh. It should
+ work e.g. for "3D ready" DLP projectors, but that is currently untested.
+ 
+ Currently, this mode is only supported on X11.
+
+ doc/Makefile.am | 12 +-
+ doc/bino.1 | 8 +-
+ doc/bino.texi | 9 +-
+ src/Makefile.am | 5 +-
+ src/gui.cpp | 98 ++++++-----
+ src/icons-local/README | 2 +-
+ src/icons-local/output-type-alternating.ipe | 266 +++++++++++++++++++++++++++
+ src/icons-local/output-type-alternating.png | Bin 0 -> 473 bytes
+ src/main.cpp | 6 +-
+ src/media_data.cpp | 5 +
+ src/media_data.h | 1 +
+ src/player_equalizer.cpp | 3 +-
+ src/video_output.cpp | 8 +-
+ src/video_output.h | 9 +-
+ src/video_output_qt.cpp | 47 +++++-
+ src/video_output_qt.h | 16 ++
+ 16 files changed, 430 insertions(+), 65 deletions(-)
+
+commit eaf9278782b32a13cea19d1be331cb74a6cddce9
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-09 21:17:19 +0100
+
+ Always use GLEWmx, do not fall back to GLEW.
+
+ configure.ac | 15 ++-------------
+ src/Makefile.am | 8 ++------
+ src/video_output.h | 2 --
+ src/video_output_qt.cpp | 2 --
+ src/video_output_qt.h | 4 ----
+ 5 files changed, 4 insertions(+), 27 deletions(-)
+
+commit 428594794e23e4f79c29d4af6b5de68f91bfbd71
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-09 20:18:51 +0100
+
+ Improve video sync by predicting next frame display.
+
+ src/player.cpp | 17 +++++++++++------
+ src/video_output.cpp | 5 +++++
+ src/video_output.h | 2 ++
+ src/video_output_qt.cpp | 40 ++++++++++++++++++++++++++++++++++++++++
+ src/video_output_qt.h | 14 +++++++++++++-
+ 5 files changed, 71 insertions(+), 7 deletions(-)
+
+commit d5261c6f94f72dcdcc2ea25051dfe6cfed530f07
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-08 21:25:34 +0100
+
+ Make translations easier.
+
+ src/gui.cpp | 72 ++++++++++++++++++++++++++++-----------------------------
+ src/main.cpp | 2 +-
+ 2 files changed, 36 insertions(+), 38 deletions(-)
+
+commit 1efabe71a507325a7b29d12d5324a5f61fb7ae74
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-08 20:59:16 +0100
+
+ GUI: sanitize input duration before displaying it.
+
+ src/gui.cpp | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 30142c70b68e4f7946df4c348c738fe652a7b605
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-08 13:43:34 +0100
+
+ Fix building with GLEWmx on Windows.
+
+ src/player_equalizer.cpp | 2 +-
+ src/video_output.cpp | 14 +++++++-------
+ src/video_output.h | 20 ++++++++++----------
+ src/video_output_qt.cpp | 5 ++---
+ src/video_output_qt.h | 5 ++++-
+ 5 files changed, 24 insertions(+), 22 deletions(-)
+
+commit fcf75ee9285943609ae974bb7da2b7727651d948
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-08 13:34:18 +0100
+
+ Do not call Qt functions from the GL thread.
+ 
+ This may sometimes block on X11. Instead, record all required information in
+ member variables from within the main thread.
+ 
+ This required making some previously public functions of video_output
+ protected, but there were no public users anyway.
+
+ src/player_equalizer.cpp | 30 ++++++++--------
+ src/video_output.cpp | 6 ++--
+ src/video_output.h | 44 +++++++++++-----------
+ src/video_output_qt.cpp | 87 +++++++++++++++++++++++++++++++--------------
+ src/video_output_qt.h | 26 +++++++++----
+ 5 files changed, 118 insertions(+), 75 deletions(-)
+
+commit 2a8eff2758c2e945db14de2f481185968117e4e8
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-08 07:24:17 +0100
+
+ Fix setting of streams when closing/reopening a media input.
+
+ src/dispatch.cpp | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 4af205fc0e416c7fa7de8f694db688d7b77ba355
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-08 07:21:20 +0100
+
+ Video output: synchronize X11 when starting/stopping GL thread.
+
+ src/video_output_qt.cpp | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 8dc11a6117d3cfedbbd286d59294bb59c064dcc2
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-08 06:43:43 +0100
+
+ GUI: allow command line to override initial output mode.
+
+ src/gui.cpp | 33 +++++++++++++++++++++------------
+ 1 files changed, 21 insertions(+), 12 deletions(-)
+
+commit 27c9a5fecff1dee34694dee7104802eecb80c1c1
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-07 22:52:47 +0100
+
+ GUI: allow command line to override of remembered per-video settings.
+ 
+ This applies only to the initially opened input, if any.
+
+ src/gui.cpp | 27 +++++++++++++++++++++++++--
+ src/gui.h | 3 ++-
+ 2 files changed, 27 insertions(+), 3 deletions(-)
+
+commit d0126b9046702f9098ee176aa37de6cb33dfa04c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-07 22:22:31 +0100
+
+ Fix parameter initalization on open/play/stop.
+
+ src/dispatch.cpp | 136 +++++++++++++++++++++++++++--------------------------
+ 1 files changed, 69 insertions(+), 67 deletions(-)
+
+commit 70a0c32d7d60a0e405659a305821cc348b9dcf6d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-07 22:22:02 +0100
+
+ GUI: fix loading of old-style per-video settings.
+
+ src/gui.cpp | 14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 98ab291898cc760b9dd159679e7d6cd61ddb5923
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-07 18:08:30 +0100
+
+ Make OpenGL Stereo support more robust.
+
+ src/video_output_qt.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit f4992100b873a977a8952e1979194c83291eb45e
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-07 14:24:10 +0100
+
+ Fix OpenGL Stereo support.
+
+ src/video_output.cpp | 2 +-
+ src/video_output_qt.cpp | 35 ++++++++++++++++-------------------
+ src/video_output_qt.h | 13 ++-----------
+ 3 files changed, 19 insertions(+), 31 deletions(-)
+
+commit 8ef2542cc3c1959dc3c743fdb5ebe1165f48d451
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-07 13:04:51 +0100
+
+ Fix usage of GLEWmx.
+ 
+ This required
+ - correct handling of GLEWContext and glewGetContext
+ - merging the required parts of the xgl modules into video_output, so that
+ they can access glewGetContext
+ 
+ Now using GLEWmx also works on Windows.
+
+ po/POTFILES.in | 1 -
+ src/Makefile.am | 7 +-
+ src/player_equalizer.cpp | 1 +
+ src/video_output.cpp | 246 +++++++++++++++++++++++++----
+ src/video_output.h | 17 ++
+ src/video_output_qt.cpp | 12 +-
+ src/video_output_qt.h | 3 +
+ src/xgl.cpp | 389 ----------------------------------------------
+ src/xgl.h | 145 -----------------
+ 9 files changed, 246 insertions(+), 575 deletions(-)
+
+commit ea8a27aebf0a8335fcceffc036667612531e045d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-07 08:51:25 +0100
+
+ video_output_qt: minor cleanup.
+
+ src/video_output_qt.cpp | 18 +++++++++---------
+ src/video_output_qt.h | 4 +++-
+ 2 files changed, 12 insertions(+), 10 deletions(-)
+
+commit d1ccb2d068225a66977a9bdba44d643caa72e85c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-07 06:57:21 +0100
+
+ Video output: prevent display of obsolete frames.
+
+ src/video_output.cpp | 7 +++++++
+ src/video_output_qt.cpp | 9 ++++++---
+ src/video_output_qt.h | 1 +
+ 3 files changed, 14 insertions(+), 3 deletions(-)
+
+commit b74966d781a261544b9013e8ba0ce33ed10e07d0
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-07 06:35:39 +0100
+
+ Fix notifications sent on open/close/play.
+
+ src/dispatch.cpp | 6 ++++--
+ src/dispatch.h | 1 -
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+commit e0152050d833d5cdf1248c0a10671bbb56d95623
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-06 21:32:01 +0100
+
+ Fix build for window systems other than X11.
+
+ src/gui.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit dcb1af00370cebc28ce7ce9a09910805710a53f0
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-06 21:27:32 +0100
+
+ Fix handling of string arguments to dispatch commands.
+
+ src/gui.cpp | 22 ++++++++++++++++------
+ src/main.cpp | 14 ++++++++++----
+ 2 files changed, 26 insertions(+), 10 deletions(-)
+
+commit d2c729d5eccdecf738d60e166db0c2c935a8c769
+Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+Date: 2012-03-06 20:43:15 +0100
+
+ Fix build with Qt 4.6.4 on Mac OS X.
+
+ src/video_output_qt.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 8b8fd4336626e93229c639a86286c4d11181f48f
+Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+Date: 2012-03-06 20:42:50 +0100
+
+ Mac OS X: prefer <AL/al.h> over <OpenAL/al.h>, part 2.
+
+ src/lib_versions.cpp | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 5d696fd885d3bd3a8033a64bdee76036476f6d76
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-06 07:28:01 +0100
+
+ Fullscreen mode: make inhibition of screensaver optional.
+
+ src/dispatch.cpp | 4 ++++
+ src/dispatch.h | 2 ++
+ src/gui.cpp | 20 ++++++++++++++++++++
+ src/gui.h | 2 ++
+ src/media_data.cpp | 11 +++++++++++
+ src/media_data.h | 1 +
+ src/video_output_qt.cpp | 13 ++++++++++---
+ src/video_output_qt.h | 1 +
+ 8 files changed, 51 insertions(+), 3 deletions(-)
+
+commit 56c448a858f3dc099f1ae9eaa27bf0a5686ffb71
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-06 07:08:01 +0100
+
+ Fix leaving of fullscreen mode when playing stops.
+
+ src/dispatch.cpp | 5 ++++-
+ src/gui.cpp | 3 +--
+ src/video_output_qt.cpp | 24 +++++++++++++++++-------
+ src/video_output_qt.h | 5 +++--
+ 4 files changed, 25 insertions(+), 12 deletions(-)
+
+commit 50ff801f64a91295257ab3ee9d8de9bc4ea06d18
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-06 06:39:28 +0100
+
+ Fix opening of initial file in Equalizer mode.
+
+ src/dispatch.cpp | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 7756f6621a55bcc0219cf0545e0781984f96c507
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-05 21:58:08 +0100
+
+ Fix handling of file/URL open errors.
+
+ src/dispatch.cpp | 30 ++++++++++--
+ src/dispatch.h | 2 +-
+ src/gui.cpp | 137 ++++++++++++++++++++++++++++++------------------------
+ src/gui.h | 4 +-
+ src/main.cpp | 10 +----
+ 5 files changed, 106 insertions(+), 77 deletions(-)
+
+commit 4d66732614169744434d7acae27fd2525bbc9cd4
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-05 21:24:43 +0100
+
+ GUI: make fullscreen dialog non-blocking.
+
+ src/gui.cpp | 399 +++++++++++++++++++++++++++++++----------------------------
+ src/gui.h | 60 +++++++--
+ 2 files changed, 261 insertions(+), 198 deletions(-)
+
+commit 7cd95313a76fe1155b5512bff43a49b43c559425
+Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+Date: 2012-03-05 17:15:18 +0100
+
+ Fix build errors introduced during the restructuring.
+ 
+ This fixes compilation without liblircclient and Equalizer, and updates the
+ list of translatable files.
+
+ po/POTFILES.in | 4 ++--
+ src/main.cpp | 6 +++++-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+commit 0f91745808f54f6cc784892c6f9301be3ee76bf6
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-05 07:17:05 +0100
+
+ GUI: Rename "File->Open" to "File->Open file(s)".
+ 
+ This should hopefully help to discover how external subtitle streams can be
+ opened.
+
+ src/gui.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f70c8b94ca6efcd574109c95b9b0020152c23b55
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-05 07:12:51 +0100
+
+ Base module opt: in debug mode, check that all options are unique.
+
+ src/base/opt.cpp | 19 +++++++++++++++++++
+ 1 files changed, 19 insertions(+), 0 deletions(-)
+
+commit 5a888e706dd4879ee778f728a7162ba146ffa009
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-05 06:59:34 +0100
+
+ Equalizer: fix --crop option.
+
+ src/player_equalizer.cpp | 63 ++++++++++++++++++++++++++-------------------
+ 1 files changed, 36 insertions(+), 27 deletions(-)
+
+commit 7b333549166212588942f561860e0085750636a6
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-05 06:59:10 +0100
+
+ Fix short option conflict between -C/--crop and --crosstalk.
+
+ doc/bino.1 | 4 ++--
+ doc/bino.texi | 6 ++----
+ src/main.cpp | 10 +++++-----
+ 3 files changed, 9 insertions(+), 11 deletions(-)
+
+commit b4889b09dc4811c5bee8a4f1cbcec99ae1d07920
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-04 16:28:08 +0100
+
+ GUI: Fix in/out widget when starting video from the command line.
+
+ src/gui.cpp | 5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+commit c5b9e2fe4414aaf9d7cc790af4318c4ed7c36087
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-04 16:03:21 +0100
+
+ configure: add a check for atomic builtins.
+ 
+ This avoids strange and misleading linker errors when the true problem is that
+ GCC style atomic builtins are not available.
+
+ configure.ac | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 7ee8379e071102ce1cee02a886c8e50da2db077e
+Author: Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+Date: 2012-03-04 15:45:37 +0100
+
+ Mac OS X: prefer <AL/al.h> over <OpenAL/al.h>.
+
+ configure.ac | 8 +++++++-
+ src/audio_output.h | 9 +++++----
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
+commit 98ded83ecd91d0de4fc760e4d1bcc344cc1aad6e
+Merge: 2e61ba7 b72846f
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-04 15:39:45 +0100
+
+ Merge branch 'master' of git.sv.gnu.org:/srv/git/bino
+
+commit 2e61ba7e31edc68861b0e28167741d8bee968de7
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-04 12:03:54 +0100
+
+ Make GL render thread more robust.
+
+ src/video_output_qt.cpp | 52 ++++++++++++++++++++++------------------------
+ src/video_output_qt.h | 9 +++----
+ 2 files changed, 29 insertions(+), 32 deletions(-)
+
+commit 03b695adc24952fc17d4324ef58acf8853a6f695
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-04 00:07:18 +0100
+
+ GUI: fix center button.
+
+ src/dispatch.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit adf667e2ca211ac7c559de5ead5a1fd068af344f
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-04 15:34:50 +0100
+
+ Big restructuring, part 5.
+ 
+ This fixes Equalizer mode to work with the new structure.
+
+ src/dispatch.cpp | 54 ++++++++-
+ src/dispatch.h | 11 ++-
+ src/main.cpp | 17 ++--
+ src/player.h | 22 +++-
+ src/player_equalizer.cpp | 294 ++++++++++++++++++----------------------------
+ src/player_equalizer.h | 15 ++-
+ 6 files changed, 203 insertions(+), 210 deletions(-)
+
+commit cd4d3204a6f417c5066edd480380231ec47d0a37
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-03 17:09:29 +0100
+
+ Big restructuring, part 4.
+ 
+ This fixes GUI mode to work with the new structure.
+
+ src/dispatch.cpp | 128 +++++++++++++++++++++++------------------------
+ src/dispatch.h | 1 +
+ src/gui.cpp | 88 +++++++++++++++++++-------------
+ src/video_output_qt.cpp | 58 ++++++++++-----------
+ src/video_output_qt.h | 23 ++++++--
+ 5 files changed, 161 insertions(+), 137 deletions(-)
+
+commit 4bb823917b04b9a4e0a7c7b70c1a256c96214369
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-03-03 11:18:11 +0100
+
+ Big restructuring, part 3.
+ 
+ This changes the video output from request-based rendering to loop-based
+ rendering in a separate GL thread.
+ 
+ This is necessary for future features such as alternating left/right output.
+ 
+ It also simplifies things because updates do not need to be triggered manually
+ anymore, e.g. on parameter changes or window movement.
+
+ src/dispatch.cpp | 38 +++++----
+ src/main.cpp | 6 ++
+ src/video_output.cpp | 26 +++----
+ src/video_output.h | 5 +-
+ src/video_output_qt.cpp | 201 ++++++++++++++++++++++++++++++++++++++++-------
+ src/video_output_qt.h | 63 ++++++++++++++-
+ 6 files changed, 271 insertions(+), 68 deletions(-)
+
+commit 14baff7c96d41dc4763b629f93cd8436d9e2686c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-26 22:50:14 +0100
+
+ Big restructuring, part 2.
+ 
+ This moves the management of media input, audio and video output, and player
+ objects to the central dispatch.
+
+ src/Makefile.am | 6 +-
+ src/audio_output.h | 3 +-
+ src/controller.cpp | 584 ---------
+ src/controller.h | 300 -----
+ src/dispatch.cpp | 739 +++++++++++
+ src/dispatch.h | 350 +++++
+ src/gui.cpp | 3073 ++++++++++++++++++++++++++++++++++++++++++++
+ src/gui.h | 403 ++++++
+ src/lirc.h | 2 +-
+ src/main.cpp | 144 +--
+ src/player.cpp | 413 ++-----
+ src/player.h | 105 +--
+ src/player_qt.cpp | 3246 -----------------------------------------------
+ src/player_qt.h | 434 -------
+ src/video_output.cpp | 29 +-
+ src/video_output.h | 5 +-
+ src/video_output_qt.cpp | 61 +-
+ src/video_output_qt.h | 28 +-
+ 18 files changed, 4782 insertions(+), 5143 deletions(-)
+
+commit 5e05468c6656dce8775816bbc2bf5a9584ce4cf8
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-26 12:01:36 +0100
+
+ Big restructuring, part 1.
+ 
+ This moves all parameter management to a single central dispatch
+ that exists independent of the player object.
+
+ src/audio_output.cpp | 40 ++-
+ src/audio_output.h | 12 +-
+ src/base/opt.cpp | 4 +
+ src/base/opt.h | 13 +-
+ src/base/s11n.h | 18 +
+ src/controller.cpp | 500 ++++++++++++++++++++--
+ src/controller.h | 303 +++++++-------
+ src/lirc.cpp | 33 +--
+ src/lirc.h | 9 +-
+ src/main.cpp | 268 +++++-------
+ src/player.cpp | 599 +++++----------------------
+ src/player.h | 26 +-
+ src/player_equalizer.cpp | 2 +-
+ src/player_qt.cpp | 1044 +++++++++++++---------------------------------
+ src/player_qt.h | 40 +--
+ src/video_output.cpp | 2 +-
+ src/video_output.h | 9 +-
+ src/video_output_qt.cpp | 66 +---
+ src/video_output_qt.h | 11 +-
+ 19 files changed, 1230 insertions(+), 1769 deletions(-)
+
+commit b72846f6c29e1998fbe9a9d9d3c5bb76e572ee90
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-27 08:51:26 +0100
+
+ Fix compilation with ffmpeg-0.7.
+
+ src/media_object.cpp | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit c84de60dec96897b282db008ec50486f908249c2
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-25 00:58:01 +0100
+
+ Media object: drop frames with unexpected sizes.
+ 
+ Drop frames that do not have the same dimensions as the initial frame in the
+ stream.
+ 
+ This fixes crashes with streams that change resolution.
+ 
+ And it also fixes Sony MPO files which store thumbnails inside: the thumbnails
+ are ignored, and only the full frames are seen.
+ 
+ In the long run, Bino should probably support resolution changes during
+ playback. When it does, the problem of thumbnails in image files will have to
+ be revisited.
+
+ src/media_object.cpp | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+commit b3fdb525f8b5a8960dccb3db2b1dd09d53458ae9
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-25 00:49:55 +0100
+
+ Fix automatic setting of stereo mode in non-GUI mode.
+
+ src/main.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f8115052e164befc2eefe19c192329f042160a40
+Merge: 7043fe4 77be369
+Author: Stefan Eilemann <eilemann@gmail.com>
+Date: 2012-02-23 17:25:38 +0100
+
+ Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/bino
+
+commit 7043fe4235eabd29a89195288fe3b80e7f5ea199
+Author: Stefan Eilemann <eilemann@gmail.com>
+Date: 2012-02-23 17:25:27 +0100
+
+ Fix swap synchronization in Equalizer mode: The master player alternatingly produces "prep_frame" and "display_frame" signals, each one causing an eq::Config frame. Since the config frames are swaplocked, the maximum video framerate is then half of the display refresh. Fix by only swapping buffers when "display_frame" is set. This causes still too many eq frames to be rendered, but they can be rendered faster than the display refresh rate
+
+ src/player_equalizer.cpp | 27 ++++++++++++---------------
+ 1 files changed, 12 insertions(+), 15 deletions(-)
+
+commit 77be3693f5f272be678c34498a5ce1e867e639e9
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-23 06:57:22 +0100
+
+ Reverse meaning of Up/Down and PgUp/PgDown keys.
+ 
+ This is for compatibility with mplayer, as originally intended.
+ Reported by Daniel Kottmair.
+
+ doc/bino.1 | 4 ++--
+ doc/bino.texi | 4 ++--
+ src/main.cpp | 4 ++--
+ src/player_equalizer.cpp | 8 ++++----
+ src/player_qt.cpp | 4 ++--
+ src/video_output_qt.cpp | 8 ++++----
+ 6 files changed, 16 insertions(+), 16 deletions(-)
+
+commit 37f01268074d8af71f719b54aed26e602e4ab1b5
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-23 06:37:16 +0100
+
+ de.po: fix typo
+
+ po/de.po | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 8a56a4c95fd547f9df407770b9973dcece4420bf
+Merge: 06bed46 dd068a9
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-18 17:17:39 +0100
+
+ Merge branch 'master' of git.sv.gnu.org:/srv/git/bino
+
+commit 06bed46f19b62efd41e0b0afcd756ec94ef4f49f
 Author: Martin Lambers <marlam@marlam.de>
-Date: 2011-10-10 21:17:13 +0200
+Date: 2012-02-18 17:14:26 +0100
+
+ GUI: Extend File->OpenURL to allow opening multple URLs at once.
+ 
+ This fixes #35563.
+
+ src/player_qt.cpp | 19 ++++++++++---------
+ src/player_qt.h | 2 +-
+ 2 files changed, 11 insertions(+), 10 deletions(-)
+
+commit 3b6a676c017e5bc613f544c93c3deec880abbb64
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-18 17:09:03 +0100
+
+ Media object: set codec flags in the same way that ffplay does it.
+ 
+ This fixes a problem with flipped images; see the comments.
+
+ src/media_object.cpp | 26 +++++++++++++++-----------
+ 1 files changed, 15 insertions(+), 11 deletions(-)
+
+commit dd068a9758610b59306357c64cfa921ade9fa2ac
+Author: Stefan Eilemann <eilemann@gmail.com>
+Date: 2012-02-16 09:47:42 +0100
+
+ Equalizer/RHEL improvements:
+ - Fix compile with Qt < 4.7
+ - Improve logging when frames are dropped
+ - Force latency 0 with Eq, latency not applicable for bino
+ - Deactivate Eq's swap sync, unless set to ON
+
+ src/lib_versions.cpp | 2 +-
+ src/player.cpp | 15 ++++++++-------
+ src/player_equalizer.cpp | 9 +++++++++
+ src/video_output_qt.cpp | 2 ++
+ 4 files changed, 20 insertions(+), 8 deletions(-)
+
+commit e66a35a6d91dee3d3dab343b88a37435f9063052
+Author: Frédéric Devernay <frederic.devernay@inrialpes.fr>
+Date: 2012-02-07 19:53:10 +0100
+
+ Translations: break the "--help" string into smaller segments.
+
+ src/main.cpp | 239 +++++++++++++++++++++++++++++-----------------------------
+ 1 files changed, 118 insertions(+), 121 deletions(-)
+
+commit 5d60a1ea7b47f1b3792753b8b1bb3d256d7c6a6d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-06 18:06:28 +0100
+
+ GUI: reset video dialog when necessary.
 
- Bump version to 1.2.1.
+ src/player_qt.cpp | 28 +++++++++++++++++++---------
+ src/player_qt.h | 1 +
+ 2 files changed, 20 insertions(+), 9 deletions(-)
+
+commit 656c02c53b518dfdc6a7f3c896f655c8c9375522
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-06 09:11:31 +0100
+
+ Fix setting and remembering the stereo layout and stereo mode parameters.
+
+ src/controller.h | 11 ++++++---
+ src/player.cpp | 55 +++++++++++++++++++++++++++++++++++-----------------
+ src/player_qt.cpp | 36 ++++++++++++++++++++++++----------
+ 3 files changed, 69 insertions(+), 33 deletions(-)
+
+commit baa06207e9ec7490b036bfbeb2e192eeeda6c594
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-06 09:10:54 +0100
+
+ Audio output: accept device numbers < -1, for compatibility with Bino <= 1.3.0.
+
+ src/audio_output.cpp | 4 ++--
+ src/audio_output.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 4c85c074996df93564ac4b82534e113c446a9c6f
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-05 14:40:34 +0100
+
+ Fix setting of correct stereo layout when opening a new file.
+
+ src/player_qt.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 1ef33bd9241964f42fec31e54644ade36acec953
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-05 14:35:55 +0100
+
+ Update base modules.
+ 
+ This has a required bug fix in the s11n module.
+
+ src/base/blob.h | 2 +-
+ src/base/dbg.cpp | 2 +-
+ src/base/dbg.h | 2 +-
+ src/base/exc.cpp | 2 +-
+ src/base/exc.h | 2 +-
+ src/base/intcheck.h | 2 +-
+ src/base/msg.cpp | 2 +-
+ src/base/msg.h | 2 +-
+ src/base/opt.cpp | 2 +-
+ src/base/opt.h | 2 +-
+ src/base/s11n.cpp | 4 ++--
+ src/base/s11n.h | 2 +-
+ src/base/str.cpp | 11 ++++++++++-
+ src/base/str.h | 3 ++-
+ src/base/thread.cpp | 2 +-
+ src/base/thread.h | 2 +-
+ src/base/timer.cpp | 2 +-
+ src/base/timer.h | 2 +-
+ 18 files changed, 29 insertions(+), 19 deletions(-)
+
+commit 44ae8c72e929fdd10b48b8a982a835b90d03d2e8
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-05 13:59:40 +0100
+
+ Fix: subtitle_parallax is per-video, not per-session.
+
+ src/media_data.cpp | 23 ++++++++++++-----------
+ src/media_data.h | 2 +-
+ 2 files changed, 13 insertions(+), 12 deletions(-)
+
+commit 73045e7c3cd037fe09a05a43ea93fb7162c26f4c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-05 13:56:22 +0100
+
+ Make the new parameter load/save scheme compatible to Bino <= 1.2.x.
+
+ src/media_data.cpp | 138 ++++++++++++++++++++++------------------------
+ src/media_data.h | 12 ++--
+ src/player_qt.cpp | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 227 insertions(+), 78 deletions(-)
+
+commit 8f1bb9250fc88a846f2fe8b598cd0e031f0a8cb7
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-04 16:05:47 +0100
+
+ Move most settings from player_init_data to parameters.
+ 
+ Also update all callers.
+
+ src/main.cpp | 106 ++--
+ src/media_data.cpp | 1899 ++++++++++++++++++++++++----------------------
+ src/media_data.h | 289 ++++----
+ src/media_input.cpp | 26 +-
+ src/media_input.h | 6 +-
+ src/media_object.cpp | 68 +-
+ src/player.cpp | 121 +--
+ src/player.h | 15 -
+ src/player_equalizer.cpp | 3 +-
+ src/player_qt.cpp | 333 ++++----
+ src/player_qt.h | 7 +-
+ src/video_output.cpp | 176 +++---
+ 12 files changed, 1538 insertions(+), 1511 deletions(-)
+
+commit c7b9194e33508ef48a396fc84cee393d202a62d9
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-04 13:24:35 +0100
+
+ Restructure the parameter class, and update all callers.
+
+ src/audio_output.cpp | 4 +-
+ src/controller.h | 18 +-
+ src/main.cpp | 114 +++++---
+ src/media_data.cpp | 662 ++++++++++++++++++++++++++-------------------
+ src/media_data.h | 114 +++++---
+ src/player.cpp | 273 ++++++++++---------
+ src/player_equalizer.cpp | 4 +-
+ src/player_qt.cpp | 462 +++++++++++++++----------------
+ src/subtitle_renderer.cpp | 20 +-
+ src/video_output.cpp | 228 ++++++++--------
+ 10 files changed, 1043 insertions(+), 856 deletions(-)
+
+commit 5b2e081a04c6eb148891ad08f2553ba5045d0d20
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-03 06:47:28 +0100
+
+ Fix "crop to aspect ratio" for stereo modes left-right-half and top-bottom-half.
+
+ src/video_output.cpp | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit eabb69501353af2553ee8b4439403c9198a753e0
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-02 22:16:41 +0100
+
+ Add "crop to aspect ratio" functionality.
+ 
+ This allows to remove hard coded black borders from videos, thus fixing e.g.
+ zoom mode.
+
+ doc/bino.1 | 2 +
+ doc/bino.texi | 3 ++
+ src/controller.h | 2 +
+ src/main.cpp | 19 ++++++++++-
+ src/media_data.cpp | 7 ++++
+ src/media_data.h | 1 +
+ src/player.cpp | 11 +++++-
+ src/player_qt.cpp | 92 ++++++++++++++++++++++++++++++++++++++++++++-----
+ src/player_qt.h | 4 ++
+ src/video_output.cpp | 50 +++++++++++++++++++--------
+ 10 files changed, 165 insertions(+), 26 deletions(-)
+
+commit a1d4b676cbbe4d5c287cbe348fa6ff9559543895
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-02 21:32:17 +0100
+
+ Video output: correctly remember last rendering parameters.
+
+ src/video_output.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ccb68fb5ceb8fba19e5a2ff8d536e987b6579c65
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-02 20:39:33 +0100
+
+ Partially revert changes to the zoom functionality.
+ 
+ It now again goes from 0 (full video width) to 1 (full screen height), but it
+ remains in its own dialog.
+
+ doc/bino.1 | 4 ++--
+ doc/bino.texi | 4 ++--
+ src/main.cpp | 2 +-
+ src/player.cpp | 4 ++--
+ src/player_qt.cpp | 7 +++----
+ src/video_output.cpp | 2 +-
+ 6 files changed, 11 insertions(+), 12 deletions(-)
+
+commit 7bc35078dc3c04041e34fad02c357dfff72dfe34
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-01 10:03:21 +0100
+
+ Tweak zoom: extent the range to 0..4, and avoid overshoot for very narrow screens.
+
+ src/main.cpp | 2 +-
+ src/player.cpp | 4 ++--
+ src/player_qt.cpp | 4 ++--
+ src/video_output.cpp | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+commit c3a899956699a246ed238c5104d3f9d50167e6af
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-01 09:17:10 +0100
+
+ configure: reject Qt < 4.6.
 
 configure.ac | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
 
-commit 95ed4ddc4a8327396162d5781b6200d070360768
+commit fe5a518eec90427f1eff916c6361422062081c50
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-02-01 07:58:03 +0100
+
+ Improve zoom, and put it into its own GUI dialog.
+
+ doc/bino.1 | 4 +-
+ doc/bino.texi | 4 +-
+ src/main.cpp | 2 +-
+ src/player.cpp | 4 +-
+ src/player_qt.cpp | 170 ++++++++++++++++++++++++++++++++++-------------------
+ src/player_qt.h | 26 +++++++-
+ 6 files changed, 139 insertions(+), 71 deletions(-)
+
+commit 27095573fee12acc90bc5b181ba7516f06b83779
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-31 21:38:50 +0100
+
+ Equalizer: partially improve the abysmal performance with swap sync.
+ 
+ The real fix is to make sure that player::step() is run at a *much* higher
+ frequency than the 60 Hz with which Config::startFrame() is called when swap
+ sync is enabled.
+ 
+ For now, if you run into performance problems, disable swap sync in your
+ Equalizer configuration.
+
+ src/player_equalizer.cpp | 15 +++++++++++----
+ 1 files changed, 11 insertions(+), 4 deletions(-)
+
+commit 184ee32fe707ab8daebff1caeb68116898406ac6
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-31 21:26:02 +0100
+
+ Fix delay reported in frame drop warning message.
+
+ src/player.cpp | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit dc6ccec9f2ca3a9a8b029caf621b9f6586050dab
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-31 09:05:18 +0100
+
+ Equalizer: toggle statistics overlay with key 'S' (uppercase).
+
+ src/player_equalizer.cpp | 15 ++++++++++++++-
+ 1 files changed, 14 insertions(+), 1 deletions(-)
+
+commit 5c3ca62f6cdfebf047cee1bad921b0e0d74a1d9b
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-31 09:04:48 +0100
+
+ Video output: reset some GL state when finished with rendering the current frame.
+
+ src/video_output.cpp | 12 ++++++++++--
+ 1 files changed, 10 insertions(+), 2 deletions(-)
+
+commit fb88f42afac68fb1ca833b19801495af8c141c58
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-30 21:08:08 +0100
+
+ Add support for JPS and PNS stereoscopic images.
+ 
+ This requires support in FFmpeg. See
+ http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=6fe12c7ff2094c68a8b6e9aeea7744ca15594091
+
+ NEWS | 2 +-
+ src/media_object.cpp | 25 ++++++++++++++++++++-----
+ 2 files changed, 21 insertions(+), 6 deletions(-)
+
+commit 5c9f3253d872e11a081e10d5d1ae660ffb62ae42
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-29 11:48:53 +0100
+
+ Update AUTHORS, NEWS.
+
+ AUTHORS | 4 +++-
+ NEWS | 10 ++++++++++
+ 2 files changed, 13 insertions(+), 1 deletions(-)
+
+commit 8271a9c354f9513fbebe5171ee263437193db44a
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-29 11:35:42 +0100
+
+ GUI: automatically start playing after successfully opening an input.
+
+ src/player_qt.cpp | 8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+commit a8e2d57702cdc256bdc0080e510c2e06d1678ff7
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-29 11:13:46 +0100
+
+ GUI: Remember the audio delay setting between sessions.
+
+ src/player_qt.cpp | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit d4135448a2ab8b57f3af4f074808d4651e9a3b5e
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-29 11:04:50 +0100
+
+ Add support for an adjustable audio delay.
+ 
+ The delay is useful if audio and video are not exactly in sync.
+ This is a workaround for problems described in #35103.
+ 
+ There are some limitations for A/V sync because we do not have precise
+ presentation time stamps for OpenGL frames, especially in the presence of
+ compositing window managers. See https://savannah.nongnu.org/bugs/?35103 for
+ a discussion.
+
+ doc/bino.1 | 2 +
+ doc/bino.texi | 3 ++
+ src/controller.h | 23 ++++++++++++++++++++++
+ src/main.cpp | 7 ++++++
+ src/media_data.cpp | 9 +++++++-
+ src/media_data.h | 1 +
+ src/player.cpp | 14 +++++++++++-
+ src/player_qt.cpp | 53 +++++++++++++++++++++++++++++++++++++++++++++------
+ src/player_qt.h | 2 +
+ 9 files changed, 104 insertions(+), 10 deletions(-)
+
+commit dd9332cfdf594c99dcaaaff5efcb40ab22a7f4cb
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-29 11:02:17 +0100
+
+ Subtitles: do not cancel renderer initializer; always let it finish.
+
+ src/subtitle_renderer.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 8badab16a4ba0b2180f7d566e55e8aef0741ef1a
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-29 10:21:54 +0100
+
+ Fix -A shortcut for --audio-device.
+
+ src/main.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f5dd97491eee06ad5309e229ee9fee5ac66fc2dd
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-29 10:18:59 +0100
+
+ Tweak documentation of the --audio-device option.
+
+ doc/bino.1 | 4 ++--
+ doc/bino.texi | 4 ++--
+ src/main.cpp | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 0801b16bc6deaa2eb780ebf96d2ef7c382cd9bac
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-29 10:11:00 +0100
+
+ Add support for audio volume control and mute, via keyboard, GUI, and LIRC.
+
+ doc/bino.1 | 8 +++
+ doc/bino.texi | 14 ++++++
+ src/Makefile.am | 4 ++
+ src/audio_output.cpp | 15 ++++++
+ src/audio_output.h | 6 +++
+ src/controller.h | 7 +++-
+ src/icons/audio-volume-high.png | Bin 0 -> 2280 bytes
+ src/icons/audio-volume-low.png | Bin 0 -> 1652 bytes
+ src/icons/audio-volume-medium.png | Bin 0 -> 1998 bytes
+ src/icons/audio-volume-muted.png | Bin 0 -> 2689 bytes
+ src/lirc.cpp | 10 ++++-
+ src/main.cpp | 16 +++++++
+ src/media_data.cpp | 16 ++++++-
+ src/media_data.h | 2 +
+ src/player.cpp | 34 ++++++++++++++-
+ src/player_qt.cpp | 86 +++++++++++++++++++++++++++++++++---
+ src/player_qt.h | 12 ++++-
+ src/video_output_qt.cpp | 26 +++++++++--
+ 18 files changed, 237 insertions(+), 19 deletions(-)
+
+commit 7a43101f570af37189f7890e0a8baba068a579d4
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-28 19:10:53 +0100
+
+ Bump year in copyright messages.
+
+ src/main.cpp | 2 +-
+ src/player_qt.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 7dc2939801a53b10b50333b5de14480a6c4a335c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-28 19:10:14 +0100
+
+ Add support for selecting an audio device.
+
+ doc/bino.1 | 4 +++
+ doc/bino.texi | 5 +++
+ src/audio_output.cpp | 48 +++++++++++++++++++++++++++++++---
+ src/audio_output.h | 13 +++++++--
+ src/main.cpp | 28 +++++++++++++++++++-
+ src/player.cpp | 7 +++-
+ src/player.h | 3 +-
+ src/player_qt.cpp | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/player_qt.h | 21 +++++++++++++++
+ 9 files changed, 187 insertions(+), 11 deletions(-)
+
+commit 3e6ea1acfffacdb12f737802d0078539b5f29bbb
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-28 18:35:23 +0100
+
+ GUI: integrate zoom preferences into video preferences.
+
+ src/player_qt.cpp | 277 ++++++++++++++++++++++------------------------------
+ src/player_qt.h | 36 ++-----
+ 2 files changed, 126 insertions(+), 187 deletions(-)
+
+commit eedaa6443e7c2aff4613a103f0e68e1a50a1176c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-28 17:26:06 +0100
+
+ GUI: show tip about opening multiple files.
+
+ src/Makefile.am | 1 +
+ src/icons/dialog-information.png | Bin 0 -> 2742 bytes
+ src/player_qt.cpp | 27 +++++++++++++++++++++++++++
+ 3 files changed, 28 insertions(+), 0 deletions(-)
+
+commit d53cf8cd91d92b506ee623a514ead44b60452b6d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-28 16:02:59 +0100
+
+ GUI: update oxygen icons to 4.7.4.
+
+ src/icons/README | 2 +-
+ src/icons/document-open.png | Bin 1616 -> 2798 bytes
+ src/icons/help-about.png | Bin 2261 -> 2742 bytes
+ 3 files changed, 1 insertions(+), 1 deletions(-)
+
+commit c5e7afd5e85d31de31247eb48ea9f82799967a6d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-28 11:06:02 +0100
+
+ Fix previous commit: add missing image files to documentation.
+
+ doc/Makefile.am | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 3a877a1766231838b7952d8decd7bce0e6e9ec84
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-28 11:04:14 +0100
+
+ Document support for alternating left/right video frames.
+
+ doc/bino.1 | 8 ++++++--
+ doc/bino.texi | 8 +++++++-
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+commit 6496c90cbbbde5560aa7b147557ca469055777e1
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-28 10:53:11 +0100
+
+ Add support for alternating left/right video frames, as used for MPO stereo images.
+ 
+ This is based on the discussion in #33366, with contributions by D. Matz.
+ MPO image files should now work out of the box.
+
+ AUTHORS | 1 +
+ src/Makefile.am | 4 +-
+ .../input-layout-alternating-left-right.ipe | 260 ++++++++++++++++++++
+ .../input-layout-alternating-left-right.png | Bin 0 -> 861 bytes
+ .../input-layout-alternating-right-left.ipe | 260 ++++++++++++++++++++
+ .../input-layout-alternating-right-left.png | Bin 0 -> 872 bytes
+ src/main.cpp | 6 +-
+ src/media_data.cpp | 18 ++-
+ src/media_data.h | 4 +-
+ src/media_input.cpp | 18 +-
+ src/media_object.cpp | 232 +++++++++++-------
+ src/media_object.h | 8 +-
+ src/player_qt.cpp | 44 +++--
+ 13 files changed, 742 insertions(+), 113 deletions(-)
+
+commit 4fe593c1918edfacf5914c4b0d2777514ad4ef78
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-01-28 08:02:36 +0100
+
+ configure: allow overriding the rcc and moc commands for Qt.
+
+ configure.ac | 4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+commit 83ef7caaa6ca977b6433550e9d1ca2621e59ab3d
+Author: Daniel Schaal <farbing@web.de>
+Date: 2012-01-07 17:34:32 +0100
+
+ GUI: When opening multiple files add only one entry to recent file list.
+
+ src/player_qt.cpp | 36 +++++++++++++++++++-----------------
+ src/player_qt.h | 4 +---
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+commit 9a9f79ce4cab7fb8a464aaa7026359e167e2c652
+Author: Daniel Schaal <farbing@web.de>
+Date: 2012-01-07 16:46:28 +0100
+
+ GUI: list recent files in file menu
+ 
+ Adds the 5 most recently opened files to the file menu.
+ It also adds an option to clear the recent files list again.
+
+ src/player_qt.cpp | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ src/player_qt.h | 16 ++++++++++-
+ 2 files changed, 94 insertions(+), 3 deletions(-)
+
+commit 418f877a76d9f61393ec8f0151da219e2337e84e
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-12-05 21:37:37 +0100
+
+ Update/merge base modules.
+
+ configure.ac | 2 +-
+ src/base/blob.h | 88 ++++----
+ src/base/dbg.cpp | 4 +-
+ src/base/dbg.h | 16 +-
+ src/base/exc.cpp | 10 +-
+ src/base/exc.h | 4 +-
+ src/base/intcheck.h | 4 +-
+ src/base/msg.cpp | 10 +-
+ src/base/msg.h | 20 ++-
+ src/base/opt.cpp | 4 +-
+ src/base/opt.h | 4 +-
+ src/base/s11n.cpp | 566 ++++++++++++++++++++++++++++++++++++++++++++-------
+ src/base/s11n.h | 179 ++++++++++++-----
+ src/base/str.cpp | 46 ++++-
+ src/base/str.h | 7 +-
+ src/base/thread.cpp | 132 +++++++++----
+ src/base/thread.h | 86 ++++++---
+ src/base/timer.cpp | 42 ++---
+ src/base/timer.h | 9 +-
+ src/media_data.h | 8 +-
+ src/player.h | 2 +-
+ src/player_qt.cpp | 1 +
+ 22 files changed, 932 insertions(+), 312 deletions(-)
+
+commit 81e5b0954e008094a3a6d1e5cbd8ced8e090433b
+Author: Stefan Eilemann <eilemann@gmail.com>
+Date: 2011-11-28 11:08:36 +0100
+
+ Media keys: Only enable on Qt 4.7 or later
+
+ src/video_output_qt.cpp | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 8ae7263c23202415c6800954aef90ce6ba3a6f74
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-11-27 19:10:44 +0100
+
+ Print --version and --help output to stdout, not stderr.
+
+ src/main.cpp | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit ed8b29a349048a49cc586b509cbab1350324a2e9
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-11-27 19:05:56 +0100
+
+ Add documentation for --swap-interval.
+
+ doc/bino.1 | 3 +++
+ doc/bino.texi | 3 +++
+ src/main.cpp | 3 ++-
+ 3 files changed, 8 insertions(+), 1 deletions(-)
+
+commit f7f2f7c7c03b31af6855edb88143fc7746337953
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-11-27 19:00:44 +0100
+
+ Minor tweak to f1f2df5805ff7e0829267b8a5e337701c7d0821b.
+
+ src/player_qt.cpp | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit b0cee1642d009a0455bbcc72c6bfb9786db1154d
+Author: Stefan Eilemann <eilemann@gmail.com>
+Date: 2011-11-25 10:31:23 +0100
+
+ Implement --swap-interval option as WAR for RHEL6.1 deadlock in QGLContext::swapBuffers/glXWaitVideoSyncSGI
+
+ src/main.cpp | 9 +++++++++
+ src/player.cpp | 6 +++++-
+ src/player.h | 2 ++
+ src/video_output_qt.cpp | 7 ++-----
+ src/video_output_qt.h | 2 +-
+ 5 files changed, 19 insertions(+), 7 deletions(-)
+
+commit f1f2df5805ff7e0829267b8a5e337701c7d0821b
+Author: Stefan Eilemann <eilemann@gmail.com>
+Date: 2011-11-25 10:18:04 +0100
+
+ Lower autoconf requirement for RHEL6.1
+
+ configure.ac | 2 +-
+ src/player_qt.cpp | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit e2f32f3a5a1ba95b0e8ff7525892fa897ab066ee
+Author: Stefan Eilemann <eilemann@gmail.com>
+Date: 2011-11-25 10:16:33 +0100
+
+ add object files to .gitignore
+
+ .gitignore | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit aa057a953b21b10aae8dc8c18bb658bd649469cf
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-11-19 21:31:29 +0100
+
+ Windows: compile with -mthreads.
+
+ configure.ac | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit a95247da920d46613bff4c02e7c03513526dc6d0
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-11-12 12:40:32 +0100
+
+ Make parameter setting more robust.
+
+ src/media_data.cpp | 24 ++++++++++++------------
+ src/player_qt.cpp | 15 ++++++++-------
+ 2 files changed, 20 insertions(+), 19 deletions(-)
+
+commit 9473128daefead2770ac8d992b1b239526e5ab3f
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-11-12 12:39:10 +0100
+
+ Update autotools files.
+
+ build-aux/config.guess | 360 +++++++++++++++++++++++-------------------------
+ build-aux/config.sub | 181 +++++++++++++++++--------
+ 2 files changed, 296 insertions(+), 245 deletions(-)
+
+commit fc6877bf30561e90fe7e0862432b28b68f1af109
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-11-08 06:20:45 +0100
+
+ Fix typo that broke GLEWMX/GLEW detection in configure.
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4837f6b3491cb94aa6ad437ee923752034f589a3
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-11-06 18:31:48 +0100
+
+ Do not crash in Equalizer mode if there is no video to play.
+
+ src/main.cpp | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit aad94f78ec0dede4501b34f43586c572f65263cf
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-11-06 11:44:27 +0100
+
+ Always link a glew library explicitly. Use either GLEWMX or GLEW.
+ 
+ We now expect Equalizer to use an external GLEW library (bundling libraries is
+ a bad idea and not allowed for packages in the major Linux distributions).
+ 
+ With Equalizer, we need GLEWMX. Without Equalizer, we first try GLEWMX, and
+ fall back to GLEW.
+
+ configure.ac | 31 ++++++++++++++++++++++---------
+ src/Makefile.am | 10 +++++++---
+ 2 files changed, 29 insertions(+), 12 deletions(-)
+
+commit 776d6f2e7a4d44390d449c3dc01ca744aac38daf
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-10-26 21:05:58 +0200
+
+ Add support for multimedia keyboards.
+
+ doc/bino.1 | 2 ++
+ doc/bino.texi | 2 ++
+ src/main.cpp | 3 ++-
+ src/player_qt.cpp | 1 +
+ src/video_output_qt.cpp | 24 +++++++++++++++++++++++-
+ src/video_output_qt.h | 1 +
+ 6 files changed, 31 insertions(+), 2 deletions(-)
+
+commit 58f2c4a5876d5ddaaa5cc231e50e12995e4333e0
+Author: Daniel Schaal <farbing@web.de>
+Date: 2011-10-24 18:09:23 +0200
+
+ configure.ac: print correct warning when pkg-config for libass failed.
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit df04c82ab2ae60aa30354527fdd2d62a36b11f86
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-10-18 22:01:04 +0200
+
+ Simplify and improve the SRGB_TEXTURES_ARE_BROKEN hack.
+
+ src/video_output.cpp | 14 ++++++++------
+ src/video_output.h | 1 -
+ src/video_output_render.fs.glsl | 14 +++++---------
+ 3 files changed, 13 insertions(+), 16 deletions(-)
+
+commit 049bc096ed5ded74be4a84cc4756d098aed77218
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-10-18 21:54:34 +0200
+
+ Add support for full-precision intermediate representation of 30bpp video.
+ 
+ This avoids losing precision e.g. for 10-bit YUV input video.
+
+ src/video_output.cpp | 69 +++++++++++++++++++++++----------------
+ src/video_output.h | 2 +-
+ src/video_output_color.fs.glsl | 24 ++++++++++++++
+ 3 files changed, 66 insertions(+), 29 deletions(-)
+
+commit a2e4bc9f200d2026f48f6eb14cc6c33893ef7914
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-10-18 21:48:13 +0200
+
+ Add a debugging message about OpenGL framebuffer properties.
+
+ src/video_output_qt.cpp | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit a41443cc8b105cfaa9fcd866fddb8d97cda18323
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-10-13 22:30:21 +0200
+
+ Add support for accelerated color space conversion of 10-bit YUV formats.
+
+ src/media_data.cpp | 21 ++++++++++++++-------
+ src/media_data.h | 4 +++-
+ src/media_object.cpp | 30 ++++++++++++++++++++++++------
+ src/video_output.cpp | 38 ++++++++++++++++++++++++++++----------
+ src/video_output_color.fs.glsl | 14 ++++++++++++--
+ 5 files changed, 81 insertions(+), 26 deletions(-)
+
+commit 544b102441593c1f7c78efed946cea51b5d2afcb
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-10-12 22:00:39 +0200
+
+ Change an unnecessary warning into a debugging message.
+
+ src/media_object.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 456443e23fe5bd02013b4feb7c1004a5b5c0c84f
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-10-10 21:40:48 +0200
+
+ Update AUTHORS.
+
+ AUTHORS | 8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+commit c93dfb70b8d1be3383c1d53a77169d3891a8d5e5
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-10-10 21:38:54 +0200
+
+ Bump version to 1.3.0.
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 55babc31588b156bb931207a44156cc4c24f9bfa
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-10-09 15:20:54 +0200
+
+ Improve an error message.
+
+ src/video_output_qt.cpp | 4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+commit 950b69b375f1e85343e8ea774c203770cbc64639
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-10-09 14:45:56 +0200
+
+ Add a --log-file option.
+
+ doc/bino.1 | 2 ++
+ doc/bino.texi | 2 ++
+ src/main.cpp | 29 +++++++++++++++++++++++++++++
+ 3 files changed, 33 insertions(+), 0 deletions(-)
+
+commit edb74e45585c84121958e0d3258ced0b928b96ae
 Author: Daniel Schaal <farbing@web.de>
 Date: 2011-10-09 13:56:07 +0200
 
@@ -25,17 +1820,39 @@
 src/player_qt.cpp | 12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
 
-commit ea31318eb7d3862aee627164e19eb5557e4881b6
+commit dfdd1496b2b3ffcb7045915f55eef5adccef3801
 Author: Martin Lambers <marlam@marlam.de>
 Date: 2011-10-08 19:00:53 +0200
 
 GUI: Fix all preferences dialogs to work when no video is opened.
 
- src/player_qt.cpp | 127 +++++++++++++++++++++++++++++++++++-----------------
- src/player_qt.h | 8 ++-
- 2 files changed, 90 insertions(+), 45 deletions(-)
+ src/player_qt.cpp | 145 ++++++++++++++++++++++++++++++++++++-----------------
+ src/player_qt.h | 11 +++--
+ 2 files changed, 105 insertions(+), 51 deletions(-)
+
+commit 104ce9d380a5cffa93651d8cd99f7fb124e18b11
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-10-08 18:44:55 +0200
+
+ Add a zoom mode for videos that are wider than the screen.
 
-commit 0d1688e876c7acc8a8bae9a42e2930e4932b2a7a
+ doc/bino.1 | 7 ++-
+ doc/bino.texi | 10 +++-
+ src/controller.h | 3 +
+ src/lirc.cpp | 4 +
+ src/main.cpp | 7 ++-
+ src/media_data.cpp | 9 ++-
+ src/media_data.h | 1 +
+ src/player.cpp | 14 ++++
+ src/player_equalizer.cpp | 181 ++++++++++++++++++++++++++++------------------
+ src/player_qt.cpp | 97 ++++++++++++++++++++++++-
+ src/player_qt.h | 21 ++++++
+ src/video_output.cpp | 155 +++++++++++++++++++++++-----------------
+ src/video_output.h | 8 ++-
+ src/video_output_qt.cpp | 10 ++-
+ 14 files changed, 381 insertions(+), 146 deletions(-)
+
+commit debdddaecae81da1c3de9e14c45841ec76efb749
 Author: Martin Lambers <marlam@marlam.de>
 Date: 2011-10-07 06:52:07 +0200
 
@@ -50,7 +1867,7 @@
 src/media_object.h | 2 +-
 2 files changed, 26 insertions(+), 3 deletions(-)
 
-commit a7e9e5372d8ad35185bd6291997cc943fb940408
+commit 39a9cca31187ef1c4a6a0869dd9ae4079095d154
 Author: Daniel Schaal <farbing@web.de>
 Date: 2011-10-01 08:58:50 +0200
 
@@ -61,7 +1878,7 @@
 src/player_qt.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 
-commit 11509a922d6fdd2789dd4c30c1ce4a1a4a58a0fd
+commit b66c0e952bc85550eeccdbd8ad170c0444817c82
 Author: Daniel Schaal <farbing@web.de>
 Date: 2011-10-01 08:56:47 +0200
 
@@ -70,7 +1887,7 @@
 doc/bino.1 | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 
-commit 2b0a8a739c356083ca9c880baba48a6bfc7a0123
+commit 7ecb5706d2d3eed1c79af1879ba32b619ba5592c
 Author: Martin Lambers <marlam@marlam.de>
 Date: 2011-09-21 06:42:25 +0200
 
@@ -79,7 +1896,7 @@
 pkg/w32/bino.nsi | 6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 
-commit 72b8750ca7376d92b39e647ba547b8f24087aef2
+commit f9f24e9c39ac07dc1f888fba386f05e078bf1bfa
 Author: Joe <cuchac@email.cz>
 Date: 2011-09-21 06:41:36 +0200
 
@@ -89,6 +1906,16 @@
 po/cs.po | 790 +++++++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 522 insertions(+), 270 deletions(-)
 
+commit 62c315157cfff5c0c39701f54dcf3256bda578b8
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-09-19 20:30:21 +0200
+
+ Media input: add functions to access URL information.
+
+ src/media_input.cpp | 10 ++++++++++
+ src/media_input.h | 5 +++++
+ 2 files changed, 15 insertions(+), 0 deletions(-)
+
 commit 273d89b639bb49c1917b3a71ad0c2964534798ca
 Author: Martin Lambers <marlam@marlam.de>
 Date: 2011-09-08 20:12:35 +0200

bino-1.2.1.tar.bz2/Makefile.am -> bino-1.3.2.tar.xz/Makefile.am Changed

bino-1.2.1.tar.bz2/Makefile.in -> bino-1.3.2.tar.xz/Makefile.in Changed

@@ -136,6 +136,7 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -247,8 +248,8 @@
 libexecdir = @libexecdir@
 libgl_CFLAGS = @libgl_CFLAGS@
 libgl_LIBS = @libgl_LIBS@
-libglew_CFLAGS = @libglew_CFLAGS@
-libglew_LIBS = @libglew_LIBS@
+libglewmx_CFLAGS = @libglewmx_CFLAGS@
+libglewmx_LIBS = @libglewmx_LIBS@
 liblircclient_CFLAGS = @liblircclient_CFLAGS@
 liblircclient_LIBS = @liblircclient_LIBS@
 libopenal_CFLAGS = @libopenal_CFLAGS@
@@ -807,7 +808,7 @@
 	$(INSTALL) -m 755 src/bino "$$BINO_APP/Contents/MacOS/Bino" && \
 	$(INSTALL) -m 644 $(top_srcdir)/pkg/macosx/Bino.icns "$$BINO_APP/Contents/Resources" && \
 	$(INSTALL) -m 644 $(top_srcdir)/pkg/macosx/Info.plist "$$BINO_APP/Contents" && \
-	$(MAKE) -C doc install-dist_docDATA docdir="$$BINO_APP/Contents/Resources/Bino Help" && \
+	$(MAKE) -C doc install-dist_htmlDATA htmldir="$$BINO_APP/Contents/Resources/Bino Help" && \
 	$(MAKE) -C po install-strip localedir="$$BINO_APP/Contents/Resources/locale" && \
 	macdeployqt "$$BINO_APP" && \
 	rm -rf Bino.app && \

bino-1.2.1.tar.bz2/NEWS -> bino-1.3.2.tar.xz/NEWS Changed

bino-1.2.1.tar.bz2/README.Windows -> bino-1.3.2.tar.xz/README.Windows Changed

@@ -5,22 +5,23 @@
 Mingw-cross-env not only provides a recent version of gcc as a cross compiler,
 but also all required libraries, and the nsis package to build an installer.
 
-Mingw-cross-env version 2.22 will provide the required up-to-date libraries, but
-this version is not yet released at the time of writing. In the meantime, you
-can use development revision 1955:
-$ hg clone -r 1955 http://hg.savannah.nongnu.org/hgweb/mingw-cross-env
+The current development version of Mingw-cross-env should work fine. Revision
+2271 is known to work as of 2012-03-11, so we recommend to use that version.
 
-The following is known to work with Mingw-cross-env installed in /path/to/mce:
+Use the following steps to build Bino using a Mingw-cross-env installation in
+/path/to/mingw-cross-env:
 
 1. Build the required Mingw-cross-env packages:
 
-   $ cd /path/to/mce
+   $ cd /path/to
+   $ hg clone -r 2271 http://hg.savannah.nongnu.org/hgweb/mingw-cross-env
+   $ cd mingw-cross-env
    $ make gettext pthreads ffmpeg libass openal glew qt nsis
 
    (If you do not need to build a Bino installer package, you can skip nsis).
 
    Add Mingw-cross-env to your PATH:
-   $ export PATH="/path/to/mce/usr/bin:$PATH"
+   $ export PATH="/path/to/mingw-cross-env/usr/bin:$PATH"
 
 2. Build Bino

bino-1.2.1.tar.bz2/aclocal.m4 -> bino-1.3.2.tar.xz/aclocal.m4 Changed

@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 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'.])])
@@ -99,7 +99,8 @@
 # ----------------------------------
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -145,7 +146,8 @@
     pkg_cv_[]$1="$$1"
  elif test -n "$PKG_CONFIG"; then
     PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
 		     [pkg_failed=yes])
  else
     pkg_failed=untried
@@ -193,9 +195,9 @@
    	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD

bino-1.2.1.tar.bz2/build-aux/config.guess -> bino-1.3.2.tar.xz/build-aux/config.guess Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
 
-timestamp='2009-06-10'
+timestamp='2011-05-11'
 
 # 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
@@ -27,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub. If it succeeds, it prints the system name on stdout, and
 # exits with 0. Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# 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
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +56,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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."
@@ -180,7 +181,7 @@
 		fi
 		;;
 	 *)
-	 os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -223,7 +224,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +270,10 @@
 	# 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'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
 Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,7 +299,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
 *:OS400:*:*)
- echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -333,6 +337,9 @@
 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -391,23 +398,23 @@
 # MiNT. But MiNT is downward compatible to TOS, so this should
 # be no problem.
 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+	exit ;;
 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
 m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -477,8 +484,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
 AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -491,7 +498,7 @@
 	else
 	 echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
 M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -548,7 +555,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -591,52 +598,52 @@
 	 9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
+		 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		 case "${sc_cpu_version}" in
+		 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		 532) # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			 32) HP_ARCH="hppa2.0n" ;;
+			 64) HP_ARCH="hppa2.0w" ;;
 			 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
+			esac ;;
+		 esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		 eval $set_cc_for_build
-		 sed 's/^ //' << EOF >$dummy.c
+		 sed 's/^		//' << EOF >$dummy.c
 
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		 long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		 long cpu = sysconf (_SC_CPU_VERSION);
 
- switch (cpu)
- 	{
- 	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- 	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- 	case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- 	 switch (bits)
- 		{
- 		case 64: puts ("hppa2.0w"); break;
- 		case 32: puts ("hppa2.0n"); break;
- 		default: puts ("hppa2.0"); break;
- 		} break;
- #else /* !defined(_SC_KERNEL_BITS) */
- 	 puts ("hppa2.0"); break;
- #endif
- 	default: puts ("hppa1.0"); break;
- 	}
- exit (0);
- }
+		 switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			 switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else /* !defined(_SC_KERNEL_BITS) */
+			 puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		 exit (0);
+		}
 EOF
 		 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		 test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -727,22 +734,22 @@
 	exit ;;
 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
- exit ;;
+	exit ;;
 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
- exit ;;
+	exit ;;
 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
- exit ;;
+	exit ;;
 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
- exit ;;
+	exit ;;
 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
- exit ;;
+	exit ;;
 CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -766,14 +773,14 @@
 	exit ;;
 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
 5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -801,18 +808,18 @@
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
 i*:windows32*:*)
- 	# uname -m includes "-pc" on this system.
- 	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
 i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
- *:Interix*:[3456]*)
- 	case ${UNAME_MACHINE} in
+ *:Interix*:*)
+	case ${UNAME_MACHINE} in
 	 x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	 EM64T | authenticamd | genuineintel)
+	 authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	 IA64)
@@ -854,6 +861,20 @@
 i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+ alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
+	 EV5) UNAME_MACHINE=alphaev5 ;;
+	 EV56) UNAME_MACHINE=alphaev56 ;;
+	 PCA56) UNAME_MACHINE=alphapca56 ;;
+	 PCA57) UNAME_MACHINE=alphapca56 ;;
+	 EV6) UNAME_MACHINE=alphaev6 ;;
+	 EV67) UNAME_MACHINE=alphaev67 ;;
+	 EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
 arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -861,7 +882,13 @@
 	then
 	 echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	 echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	 then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	 else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	 fi
 	fi
 	exit ;;
 avr32*:Linux:*:*)
@@ -874,7 +901,18 @@
 	echo crisv32-axis-linux-gnu
 	exit ;;
 frv:Linux:*:*)
- 	echo frv-unknown-linux-gnu
+	echo frv-unknown-linux-gnu
+	exit ;;
+ i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
 ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -901,39 +939,18 @@
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^CPU/{
-		s: ::g
-		p
-	 }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
 or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
- ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
- ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
- alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
-	 EV5) UNAME_MACHINE=alphaev5 ;;
-	 EV56) UNAME_MACHINE=alphaev56 ;;
-	 PCA56) UNAME_MACHINE=alphapca56 ;;
-	 PCA57) UNAME_MACHINE=alphapca56 ;;
-	 EV6) UNAME_MACHINE=alphaev6 ;;
-	 EV67) UNAME_MACHINE=alphaev67 ;;
-	 EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
 padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
 parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -942,14 +959,17 @@
 	 *) echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+ ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+ ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
 s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
 sh64*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
 sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -957,6 +977,9 @@
 sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+ tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	exit ;;
 vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
@@ -964,60 +987,8 @@
 	echo x86_64-unknown-linux-gnu
 	exit ;;
 xtensa*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
- i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				 s/[ 	][ 	]*/ /g
-				 s/.*supported targets: *//
-				 s/ .*//
-				 p'`
- case "$ld_supported_targets" in
-	 elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	# if __GLIBC__ >= 2
-	LIBC=gnu
-	# else
-	LIBC=gnulibc1
-	# endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^LIBC/{
-		s: ::g
-		p
-	 }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
 i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1025,11 +996,11 @@
 	echo i386-sequent-sysv4
 	exit ;;
 i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
 i*86:OS/2:*:*)
@@ -1061,7 +1032,7 @@
 	fi
 	exit ;;
 i*86:*:5:[678]*)
- 	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	 *486*)	 UNAME_MACHINE=i486 ;;
 	 *Pentium)	 UNAME_MACHINE=i586 ;;
@@ -1089,13 +1060,13 @@
 	exit ;;
 pc:*:*:*)
 	# Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
- exit ;;
+	exit ;;
 Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1130,8 +1101,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	 && { echo i486-ncr-sysv4; exit; } ;;
 NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1174,10 +1145,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel@ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
+ PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
 *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1203,11 +1174,11 @@
 	exit ;;
 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	 echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	 echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
- exit ;;
+	exit ;;
 BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1247,6 +1218,16 @@
 *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	 i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		 grep IS_64BIT_ARCH >/dev/null
+		 then
+		 UNAME_PROCESSOR="x86_64"
+		 fi
+		fi ;;
 	 unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1262,6 +1243,9 @@
 *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+ NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
 NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1307,13 +1291,13 @@
 	echo pdp10-unknown-its
 	exit ;;
 SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
 *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
 *:*VMS:*:*)
- 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	 A*) echo alpha-dec-vms ; exit ;;
 	 I*) echo ia64-dec-vms ; exit ;;
@@ -1353,11 +1337,11 @@
 #include <sys/param.h>
 printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
- "4"
+	"4"
 #else
-	 ""
+	""
 #endif
- ); exit (0);
+	); exit (0);
 #endif
 #endif

bino-1.2.1.tar.bz2/build-aux/config.sub -> bino-1.3.2.tar.xz/build-aux/config.sub Changed

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

@@ -7,6 +7,9 @@
 language is requested. */
 #undef ENABLE_NLS
 
+/* Define to 1 if you have the <AL/al.h> header file. */
+#undef HAVE_AL_AL_H
+
 /* Define to 1 if you have the `backtrace' function. */
 #undef HAVE_BACKTRACE
 
@@ -29,6 +32,21 @@
 don't. */
 #undef HAVE_DECL_OPTRESET
 
+/* Define to 1 if you have the `fdatasync' function. */
+#undef HAVE_FDATASYNC
+
+/* Define to 1 if you have the `fnmatch' function. */
+#undef HAVE_FNMATCH
+
+/* Define to 1 if you have the `fseeko' function. */
+#undef HAVE_FSEEKO
+
+/* Define to 1 if you have the `ftello' function. */
+#undef HAVE_FTELLO
+
+/* Define to 1 if you have the `getpwuid' function. */
+#undef HAVE_GETPWUID
+
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
@@ -44,9 +62,24 @@
 /* Have liblircclient? */
 #undef HAVE_LIBLIRCCLIENT
 
+/* Define to 1 if you have the `link' function. */
+#undef HAVE_LINK
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the `mmap' function. */
+#undef HAVE_MMAP
+
+/* Define to 1 if you have the `nl_langinfo' function. */
+#undef HAVE_NL_LANGINFO
+
+/* Define to 1 if you have the `posix_fadvise' function. */
+#undef HAVE_POSIX_FADVISE
+
+/* Define to 1 if you have the `readdir_r' function. */
+#undef HAVE_READDIR_R
+
 /* Define to 1 if you have the `sigaction' function. */
 #undef HAVE_SIGACTION
 
@@ -62,6 +95,9 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
+/* Define to 1 if you have the `symlink' function. */
+#undef HAVE_SYMLINK
+
 /* Define to 1 if you have the `sysconf' function. */
 #undef HAVE_SYSCONF

bino-1.2.1.tar.bz2/configure -> bino-1.3.2.tar.xz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for Bino 1.2.1.
+# Generated by GNU Autoconf 2.68 for Bino 1.3.2.
 #
 # Report bugs to <bino-list@nongnu.org>.
 #
@@ -91,6 +91,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are. Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
 *[\\/]* ) as_myself=$0 ;;
 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -216,11 +217,18 @@
 # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	case $- in # ((((
+	 *v*x* | *x*v* ) as_opts=-vx ;;
+	 *v* ) as_opts=-v ;;
+	 *x* ) as_opts=-x ;;
+	 * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
 if test x$as_have_required = xno; then :
@@ -552,8 +560,8 @@
 # Identity of this package.
 PACKAGE_NAME='Bino'
 PACKAGE_TARNAME='bino'
-PACKAGE_VERSION='1.2.1'
-PACKAGE_STRING='Bino 1.2.1'
+PACKAGE_VERSION='1.3.2'
+PACKAGE_STRING='Bino 1.3.2'
 PACKAGE_BUGREPORT='bino-list@nongnu.org'
 PACKAGE_URL='http://bino3d.org/'
 
@@ -607,10 +615,12 @@
 liblircclient_CFLAGS
 libgl_LIBS
 libgl_CFLAGS
+HAVE_LIBGLEWMX_FALSE
+HAVE_LIBGLEWMX_TRUE
+libglewmx_LIBS
+libglewmx_CFLAGS
 HAVE_LIBEQUALIZER_FALSE
 HAVE_LIBEQUALIZER_TRUE
-libglew_LIBS
-libglew_CFLAGS
 libEqualizer_LIBS
 libEqualizer_CFLAGS
 libX11_LIBS
@@ -621,6 +631,7 @@
 libqtopengl_CFLAGS
 MOC
 RCC
+CXXCPP
 libopenal_LIBS
 libopenal_CFLAGS
 libass_LIBS
@@ -799,6 +810,7 @@
 libass_LIBS
 libopenal_CFLAGS
 libopenal_LIBS
+CXXCPP
 RCC
 MOC
 libqtopengl_CFLAGS
@@ -807,8 +819,8 @@
 libX11_LIBS
 libEqualizer_CFLAGS
 libEqualizer_LIBS
-libglew_CFLAGS
-libglew_LIBS
+libglewmx_CFLAGS
+libglewmx_LIBS
 libgl_CFLAGS
 libgl_LIBS
 liblircclient_CFLAGS
@@ -1219,7 +1231,7 @@
 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
 ;;
 
 esac
@@ -1357,7 +1369,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.2.1 to adapt to many kinds of systems.
+\`configure' configures Bino 1.3.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1428,7 +1440,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of Bino 1.2.1:";;
+ short | recursive ) echo "Configuration of Bino 1.3.2:";;
 esac
 cat <<\_ACEOF
 
@@ -1493,6 +1505,7 @@
 C compiler flags for libopenal, overriding pkg-config
 libopenal_LIBS
 linker flags for libopenal, overriding pkg-config
+ CXXCPP C++ preprocessor
 RCC rcc command
 MOC moc command
 libqtopengl_CFLAGS
@@ -1506,10 +1519,10 @@
 C compiler flags for libEqualizer, overriding pkg-config
 libEqualizer_LIBS
 linker flags for libEqualizer, overriding pkg-config
- libglew_CFLAGS
- C compiler flags for libglew, overriding pkg-config
- libglew_LIBS
- linker flags for libglew, overriding pkg-config
+ libglewmx_CFLAGS
+ C compiler flags for libglewmx, overriding pkg-config
+ libglewmx_LIBS
+ linker flags for libglewmx, overriding pkg-config
 libgl_CFLAGS
 C compiler flags for libgl, overriding pkg-config
 libgl_LIBS linker flags for libgl, overriding pkg-config
@@ -1589,8 +1602,8 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-Bino configure 1.2.1
-generated by GNU Autoconf 2.67
+Bino configure 1.3.2
+generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1636,7 +1649,7 @@
 
 	ac_retval=1
 fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1673,7 +1686,7 @@
 
 ac_retval=1
 fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1686,10 +1699,10 @@
 ac_fn_c_check_header_mongrel ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval "test \"\${$3+set}\"" = set; then :
+ if eval \${$3+:} false; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1756,7 +1769,7 @@
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 eval "$3=\$ac_header_compiler"
@@ -1765,7 +1778,7 @@
 	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -1806,7 +1819,7 @@
 ac_retval=$ac_status
 fi
 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -1820,7 +1833,7 @@
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1838,7 +1851,7 @@
 eval ac_res=\$$3
 	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
@@ -1875,7 +1888,7 @@
 
 	ac_retval=1
 fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
@@ -1917,7 +1930,7 @@
 ac_retval=$ac_status
 fi
 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_run
@@ -1933,7 +1946,7 @@
 as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
 $as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1964,7 +1977,7 @@
 eval ac_res=\$$3
 	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_decl
 
@@ -2009,7 +2022,7 @@
 # interfere with the next link command; also delete a directory that is
 # left behind by Apple's compiler. We do this before executing the actions.
 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_link
@@ -2022,7 +2035,7 @@
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2077,7 +2090,7 @@
 eval ac_res=\$$3
 	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_func
 
@@ -2122,16 +2135,144 @@
 # interfere with the next link command; also delete a directory that is
 # left behind by Apple's compiler. We do this before executing the actions.
 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_cpp
+
+# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_cxx_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if eval \${$3+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ----------------------------------- ##
+## Report this to bino-list@nongnu.org ##
+## ----------------------------------- ##"
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_cxx_check_header_mongrel
 cat >config.log <<_ACEOF
 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.2.1, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+It was created by Bino $as_me 1.3.2, which was
+generated by GNU Autoconf 2.68. Invocation command line was
 
 $ $0 $@
 
@@ -2389,7 +2530,7 @@
 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 done
 
@@ -2518,7 +2659,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_build_alias=$build_alias
@@ -2534,7 +2675,7 @@
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -2552,7 +2693,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test "x$host_alias" = x; then
@@ -2567,7 +2708,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -2585,7 +2726,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
 $as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then :
+if ${ac_cv_target+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test "x$target_alias" = x; then
@@ -2600,7 +2741,7 @@
 $as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
 esac
 target=$ac_cv_target
 ac_save_IFS=$IFS; IFS='-'
@@ -2632,7 +2773,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
@@ -2672,7 +2813,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_CC"; then
@@ -2725,7 +2866,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
@@ -2765,7 +2906,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
@@ -2824,7 +2965,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
@@ -2868,7 +3009,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_CC"; then
@@ -2923,7 +3064,7 @@
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3038,7 +3179,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3081,7 +3222,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3140,7 +3281,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 fi
 fi
@@ -3151,7 +3292,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3192,7 +3333,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3202,7 +3343,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3239,7 +3380,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_save_c_werror_flag=$ac_c_werror_flag
@@ -3317,7 +3458,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_cv_prog_cc_c89=no
@@ -3425,7 +3566,7 @@
 CPP=
 fi
 if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then :
+ if ${ac_cv_prog_CPP+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 # Double quotes because CPP needs to be expanded
@@ -3541,7 +3682,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -3553,7 +3694,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -z "$GREP"; then
@@ -3616,7 +3757,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -3683,7 +3824,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3812,7 +3953,7 @@
 
 
 ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = x""yes; then :
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
 MINIX=yes
 else
 MINIX=
@@ -3834,7 +3975,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3880,7 +4021,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
 $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if test "${ac_cv_sys_largefile_CC+set}" = set; then :
+if ${ac_cv_sys_largefile_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_cv_sys_largefile_CC=no
@@ -3931,7 +4072,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
+if ${ac_cv_sys_file_offset_bits+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 while :; do
@@ -4000,7 +4141,7 @@
 if test $ac_cv_sys_file_offset_bits = unknown; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if test "${ac_cv_sys_large_files+set}" = set; then :
+if ${ac_cv_sys_large_files+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 while :; do
@@ -4088,7 +4229,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4175,11 +4316,11 @@
 '
 case `pwd` in
 *[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
 *[\\\"\#\$\&\'\`$am_lf\ \	]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -4265,7 +4406,7 @@
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$STRIP"; then
@@ -4305,7 +4446,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_STRIP"; then
@@ -4358,7 +4499,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then :
+ if ${ac_cv_path_mkdir+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4409,7 +4550,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$AWK"; then
@@ -4449,7 +4590,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat >conftest.make <<\_ACEOF
@@ -4581,7 +4722,7 @@
 
 # Define the identity of the package.
 PACKAGE='bino'
- VERSION='1.2.1'
+ VERSION='1.3.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4689,7 +4830,7 @@
 done
 rm -rf conftest.dir
 
-if test "${am_cv_prog_tar_pax+set}" = set; then :
+if ${am_cv_prog_tar_pax+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 am_cv_prog_tar_pax=$_am_tool
@@ -4705,7 +4846,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4857,7 +4998,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CXX"; then
@@ -4901,7 +5042,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_CXX"; then
@@ -4979,7 +5120,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5016,7 +5157,7 @@
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -5102,7 +5243,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -5231,7 +5372,7 @@
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$RANLIB"; then
@@ -5271,7 +5412,7 @@
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_RANLIB"; then
@@ -5338,7 +5479,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then :
+if ${ac_cv_c_bigendian+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_cv_c_bigendian=unknown
@@ -5557,7 +5698,7 @@
 ;; #(
 *)
 as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
 esac
 
 
@@ -5569,13 +5710,14 @@
 
 case "${target}" in *-*-mingw32*) w32="yes" ;; *) w32="no " ;; esac
 if test "$w32" = "yes"; then
- LDFLAGS="-mwindows $LDFLAGS"
+ CXXFLAGS="-mthreads $CXXFLAGS"
+ LDFLAGS="-mthreads -mwindows $LDFLAGS"
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_WINDRES+set}" = set; then :
+if ${ac_cv_prog_WINDRES+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$WINDRES"; then
@@ -5615,7 +5757,7 @@
 set dummy windres; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then :
+if ${ac_cv_prog_ac_ct_WINDRES+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_WINDRES"; then
@@ -5670,7 +5812,7 @@
 set dummy ${ac_tool_prefix}makensis; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MAKENSIS+set}" = set; then :
+if ${ac_cv_prog_MAKENSIS+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$MAKENSIS"; then
@@ -5710,7 +5852,7 @@
 set dummy makensis; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_MAKENSIS+set}" = set; then :
+if ${ac_cv_prog_ac_ct_MAKENSIS+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_MAKENSIS"; then
@@ -5796,8 +5938,35 @@
 
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC atomic builtins" >&5
+$as_echo_n "checking for GCC atomic builtins... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+int b, x = 0; b = __sync_bool_compare_and_swap(&x, 0, 1);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ HAVE_GCC_ATOMIC_BUILTINS=1
+else
+ HAVE_GCC_ATOMIC_BUILTINS=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if test "$HAVE_GCC_ATOMIC_BUILTINS" = "1"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ as_fn_error $? "GCC atomic builtins not found. Please use a newer compiler." "$LINENO" 5
+fi
 ac_fn_cxx_check_decl "$LINENO" "optreset" "ac_cv_have_decl_optreset" "$ac_includes_default"
-if test "x$ac_cv_have_decl_optreset" = x""yes; then :
+if test "x$ac_cv_have_decl_optreset" = xyes; then :
 ac_have_decl=1
 else
 ac_have_decl=0
@@ -5812,7 +5981,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
 $as_echo_n "checking for library containing clock_gettime... " >&6; }
-if test "${ac_cv_search_clock_gettime+set}" = set; then :
+if ${ac_cv_search_clock_gettime+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_func_search_save_LIBS=$LIBS
@@ -5846,11 +6015,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext
- if test "${ac_cv_search_clock_gettime+set}" = set; then :
+ if ${ac_cv_search_clock_gettime+:} false; then :
 break
 fi
 done
-if test "${ac_cv_search_clock_gettime+set}" = set; then :
+if ${ac_cv_search_clock_gettime+:} false; then :
 
 else
 ac_cv_search_clock_gettime=no
@@ -5868,7 +6037,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
 $as_echo_n "checking for library containing pthread_create... " >&6; }
-if test "${ac_cv_search_pthread_create+set}" = set; then :
+if ${ac_cv_search_pthread_create+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_func_search_save_LIBS=$LIBS
@@ -5902,11 +6071,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext
- if test "${ac_cv_search_pthread_create+set}" = set; then :
+ if ${ac_cv_search_pthread_create+:} false; then :
 break
 fi
 done
-if test "${ac_cv_search_pthread_create+set}" = set; then :
+if ${ac_cv_search_pthread_create+:} false; then :
 
 else
 ac_cv_search_pthread_create=no
@@ -5922,7 +6091,7 @@
 
 fi
 
-for ac_func in backtrace clock_gettime sigaction vasprintf wcwidth
+for ac_func in backtrace clock_gettime fdatasync fnmatch fseeko ftello getpwuid link mmap nl_langinfo posix_fadvise readdir_r sigaction symlink sysconf vasprintf wcwidth
 do :
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -6038,7 +6207,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${acl_cv_path_LD+set}" = set; then :
+if ${acl_cv_path_LD+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -z "$LD"; then
@@ -6075,7 +6244,7 @@
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${acl_cv_prog_gnu_ld+set}" = set; then :
+if ${acl_cv_prog_gnu_ld+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 # I'd rather use --version here, but apparently some GNU ld's only accept -v.
@@ -6095,7 +6264,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
 $as_echo_n "checking for shared library run path origin... " >&6; }
-if test "${acl_cv_rpath+set}" = set; then :
+if ${acl_cv_rpath+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 
@@ -6133,7 +6302,7 @@
 solaris*)
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
 $as_echo_n "checking for 64-bit host... " >&6; }
-if test "${gl_cv_solaris_64bit+set}" = set; then :
+if ${gl_cv_solaris_64bit+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6686,7 +6855,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 $as_echo_n "checking for iconv... " >&6; }
-if test "${am_cv_func_iconv+set}" = set; then :
+if ${am_cv_func_iconv+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 
@@ -6743,7 +6912,7 @@
 if test "$am_cv_func_iconv" = yes; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 $as_echo_n "checking for working iconv... " >&6; }
-if test "${am_cv_func_iconv_works+set}" = set; then :
+if ${am_cv_func_iconv_works+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 
@@ -6878,7 +7047,7 @@
 if test "$am_cv_func_iconv" = yes; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
 $as_echo_n "checking for iconv declaration... " >&6; }
- if test "${am_cv_proto_iconv+set}" = set; then :
+ if ${am_cv_proto_iconv+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 
@@ -6983,7 +7152,7 @@
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 case "$MSGFMT" in
@@ -7024,7 +7193,7 @@
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 case $GMSGFMT in
@@ -7106,7 +7275,7 @@
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 case "$XGETTEXT" in
@@ -7184,7 +7353,7 @@
 set dummy msgmerge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+if ${ac_cv_path_MSGMERGE+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 case "$MSGMERGE" in
@@ -7256,7 +7425,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
+if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 gt_save_LIBS="$LIBS"
@@ -7290,7 +7459,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
 $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
+if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 gt_save_LIBS="$LIBS"
@@ -7366,7 +7535,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 $as_echo_n "checking for GNU gettext in libc... " >&6; }
-if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then :
+if eval \${$gt_func_gnugettext_libc+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7429,7 +7598,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 $as_echo_n "checking for iconv... " >&6; }
-if test "${am_cv_func_iconv+set}" = set; then :
+if ${am_cv_func_iconv+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 
@@ -7486,7 +7655,7 @@
 if test "$am_cv_func_iconv" = yes; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 $as_echo_n "checking for working iconv... " >&6; }
-if test "${am_cv_func_iconv_works+set}" = set; then :
+if ${am_cv_func_iconv_works+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 
@@ -8082,7 +8251,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 $as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then :
+if eval \${$gt_func_gnugettext_libintl+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 gt_save_CPPFLAGS="$CPPFLAGS"
@@ -8270,13 +8439,14 @@
 
 
 
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 case $PKG_CONFIG in
@@ -8319,7 +8489,7 @@
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 case $ac_pt_PKG_CONFIG in
@@ -8407,6 +8577,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libavformat_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 52.110.0 libavcodec libavutil" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -8423,6 +8594,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libavformat_LIBS=`$PKG_CONFIG --libs "libavformat >= 52.110.0 libavcodec libavutil" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -8442,9 +8614,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 libavformat_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavformat >= 52.110.0 libavcodec libavutil" 2>&1`
+	 libavformat_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavformat >= 52.110.0 libavcodec libavutil" 2>&1`
 else
-	 libavformat_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavformat >= 52.110.0 libavcodec libavutil" 2>&1`
+	 libavformat_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavformat >= 52.110.0 libavcodec libavutil" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libavformat_PKG_ERRORS" >&5
@@ -8484,6 +8656,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libavdevice_CFLAGS=`$PKG_CONFIG --cflags "libavdevice >= 52.5.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -8500,6 +8673,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libavdevice_LIBS=`$PKG_CONFIG --libs "libavdevice >= 52.5.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -8519,9 +8693,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 libavdevice_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavdevice >= 52.5.0" 2>&1`
+	 libavdevice_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavdevice >= 52.5.0" 2>&1`
 else
-	 libavdevice_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavdevice >= 52.5.0" 2>&1`
+	 libavdevice_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavdevice >= 52.5.0" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libavdevice_PKG_ERRORS" >&5
@@ -8561,6 +8735,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libswscale_CFLAGS=`$PKG_CONFIG --cflags "libswscale >= 0.14.1 libavutil" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -8577,6 +8752,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libswscale_LIBS=`$PKG_CONFIG --libs "libswscale >= 0.14.1 libavutil" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -8596,9 +8772,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 libswscale_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libswscale >= 0.14.1 libavutil" 2>&1`
+	 libswscale_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libswscale >= 0.14.1 libavutil" 2>&1`
 else
-	 libswscale_PKG_ERRORS=`$PKG_CONFIG --print-errors "libswscale >= 0.14.1 libavutil" 2>&1`
+	 libswscale_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libswscale >= 0.14.1 libavutil" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libswscale_PKG_ERRORS" >&5
@@ -8626,7 +8802,7 @@
 for ac_func in sysconf
 do :
 ac_fn_cxx_check_func "$LINENO" "sysconf" "ac_cv_func_sysconf"
-if test "x$ac_cv_func_sysconf" = x""yes; then :
+if test "x$ac_cv_func_sysconf" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SYSCONF 1
 _ACEOF
@@ -8651,6 +8827,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libass_CFLAGS=`$PKG_CONFIG --cflags "libass >= 0.9.9" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -8667,6 +8844,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libass_LIBS=`$PKG_CONFIG --libs "libass >= 0.9.9" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -8686,9 +8864,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 libass_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libass >= 0.9.9" 2>&1`
+	 libass_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libass >= 0.9.9" 2>&1`
 else
-	 libass_PKG_ERRORS=`$PKG_CONFIG --print-errors "libass >= 0.9.9" 2>&1`
+	 libass_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libass >= 0.9.9" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libass_PKG_ERRORS" >&5
@@ -8708,8 +8886,8 @@
 if test "$HAVE_LIBASS" != "1"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: required library libass not found:" >&5
 $as_echo "$as_me: WARNING: required library libass not found:" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $libopenal_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $libopenal_PKG_ERRORS" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $libass_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $libass_PKG_ERRORS" >&2;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libass is provided by LibASS; Debian package: libass-dev" >&5
 $as_echo "$as_me: WARNING: libass is provided by LibASS; Debian package: libass-dev" >&2;}
 else
@@ -8736,6 +8914,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libopenal_CFLAGS=`$PKG_CONFIG --cflags "openal >= 0.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -8752,6 +8931,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libopenal_LIBS=`$PKG_CONFIG --libs "openal >= 0.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -8771,9 +8951,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 libopenal_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openal >= 0.0" 2>&1`
+	 libopenal_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openal >= 0.0" 2>&1`
 else
-	 libopenal_PKG_ERRORS=`$PKG_CONFIG --print-errors "openal >= 0.0" 2>&1`
+	 libopenal_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openal >= 0.0" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libopenal_PKG_ERRORS" >&5
@@ -8790,7 +8970,157 @@
 $as_echo "yes" >&6; }
 	HAVE_LIBOPENAL=1
 fi
-if test "$HAVE_LIBOPENAL" != "1"; then
+if test "$HAVE_LIBOPENAL" = "1"; then
+ CPPFLAGS_BAK="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $libopenal_CFLAGS"
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+ if ${ac_cv_prog_CXXCPP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ # Double quotes because CXXCPP needs to be expanded
+ for CXXCPP in "$CXX -E" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		 Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+ break
+fi
+
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+ CXXCPP=$ac_cv_prog_CXXCPP
+else
+ ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		 Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+for ac_header in AL/al.h
+do :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "AL/al.h" "ac_cv_header_AL_al_h" "$ac_includes_default"
+if test "x$ac_cv_header_AL_al_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_AL_AL_H 1
+_ACEOF
+
+fi
+
+done
+
+ CPPFLAGS="$CPPFLAGS_BAK"
+else
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: required library libopenal not found:" >&5
 $as_echo "$as_me: WARNING: required library libopenal not found:" >&2;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $libopenal_PKG_ERRORS" >&5
@@ -8799,9 +9129,7 @@
 $as_echo "$as_me: WARNING: libopenal is provided by OpenAL; Debian package: libopenal-dev" >&2;}
 fi
 
-RCC=""
 
-MOC=""
 
 
 pkg_failed=no
@@ -8812,12 +9140,13 @@
 pkg_cv_libqtopengl_CFLAGS="$libqtopengl_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtOpenGL >= 0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "QtOpenGL >= 0.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtOpenGL >= 4.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "QtOpenGL >= 4.6") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_libqtopengl_CFLAGS=`$PKG_CONFIG --cflags "QtOpenGL >= 0.0" 2>/dev/null`
+ pkg_cv_libqtopengl_CFLAGS=`$PKG_CONFIG --cflags "QtOpenGL >= 4.6" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -8828,12 +9157,13 @@
 pkg_cv_libqtopengl_LIBS="$libqtopengl_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtOpenGL >= 0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "QtOpenGL >= 0.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtOpenGL >= 4.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "QtOpenGL >= 4.6") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_libqtopengl_LIBS=`$PKG_CONFIG --libs "QtOpenGL >= 0.0" 2>/dev/null`
+ pkg_cv_libqtopengl_LIBS=`$PKG_CONFIG --libs "QtOpenGL >= 4.6" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -8853,9 +9183,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 libqtopengl_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "QtOpenGL >= 0.0" 2>&1`
+	 libqtopengl_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "QtOpenGL >= 4.6" 2>&1`
 else
-	 libqtopengl_PKG_ERRORS=`$PKG_CONFIG --print-errors "QtOpenGL >= 0.0" 2>&1`
+	 libqtopengl_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "QtOpenGL >= 4.6" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libqtopengl_PKG_ERRORS" >&5
@@ -8887,7 +9217,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RCC+set}" = set; then :
+if ${ac_cv_prog_RCC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$RCC"; then
@@ -8931,7 +9261,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RCC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RCC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_RCC"; then
@@ -8987,7 +9317,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MOC+set}" = set; then :
+if ${ac_cv_prog_MOC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$MOC"; then
@@ -9031,7 +9361,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_MOC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_MOC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_MOC"; then
@@ -9131,6 +9461,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libX11_CFLAGS=`$PKG_CONFIG --cflags "x11 >= 0.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -9147,6 +9478,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libX11_LIBS=`$PKG_CONFIG --libs "x11 >= 0.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -9166,9 +9498,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 libX11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 >= 0.0" 2>&1`
+	 libX11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11 >= 0.0" 2>&1`
 else
-	 libX11_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 >= 0.0" 2>&1`
+	 libX11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11 >= 0.0" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libX11_PKG_ERRORS" >&5
@@ -9221,6 +9553,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libEqualizer_CFLAGS=`$PKG_CONFIG --cflags "Equalizer >= 0.9.3" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -9237,6 +9570,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libEqualizer_LIBS=`$PKG_CONFIG --libs "Equalizer >= 0.9.3" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -9256,9 +9590,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 libEqualizer_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "Equalizer >= 0.9.3" 2>&1`
+	 libEqualizer_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Equalizer >= 0.9.3" 2>&1`
 else
-	 libEqualizer_PKG_ERRORS=`$PKG_CONFIG --print-errors "Equalizer >= 0.9.3" 2>&1`
+	 libEqualizer_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Equalizer >= 0.9.3" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libEqualizer_PKG_ERRORS" >&5
@@ -9284,40 +9618,56 @@
 $as_echo "$as_me: WARNING: libEqualizer is provided by Equalizer" >&2;}
 	equalizer="no"
 fi
-fi
-if test "$equalizer" = "no"; then
+else
 HAVE_LIBEQUALIZER=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBEQUALIZER $HAVE_LIBEQUALIZER
+_ACEOF
+
+ if test "$HAVE_LIBEQUALIZER" = "1"; then
+ HAVE_LIBEQUALIZER_TRUE=
+ HAVE_LIBEQUALIZER_FALSE='#'
+else
+ HAVE_LIBEQUALIZER_TRUE='#'
+ HAVE_LIBEQUALIZER_FALSE=
+fi
+
+
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libglew" >&5
-$as_echo_n "checking for libglew... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libglewmx" >&5
+$as_echo_n "checking for libglewmx... " >&6; }
 
-if test -n "$libglew_CFLAGS"; then
- pkg_cv_libglew_CFLAGS="$libglew_CFLAGS"
+if test -n "$libglewmx_CFLAGS"; then
+ pkg_cv_libglewmx_CFLAGS="$libglewmx_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glew >= 1.5.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glew >= 1.5.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glewmx >= 1.6.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glewmx >= 1.6.0") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_libglew_CFLAGS=`$PKG_CONFIG --cflags "glew >= 1.5.0" 2>/dev/null`
+ pkg_cv_libglewmx_CFLAGS=`$PKG_CONFIG --cflags "glewmx >= 1.6.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 pkg_failed=untried
 fi
-if test -n "$libglew_LIBS"; then
- pkg_cv_libglew_LIBS="$libglew_LIBS"
+if test -n "$libglewmx_LIBS"; then
+ pkg_cv_libglewmx_LIBS="$libglewmx_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glew >= 1.5.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glew >= 1.5.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glewmx >= 1.6.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glewmx >= 1.6.0") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_libglew_LIBS=`$PKG_CONFIG --libs "glew >= 1.5.0" 2>/dev/null`
+ pkg_cv_libglewmx_LIBS=`$PKG_CONFIG --libs "glewmx >= 1.6.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -9337,45 +9687,39 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 libglew_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glew >= 1.5.0" 2>&1`
+	 libglewmx_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glewmx >= 1.6.0" 2>&1`
 else
-	 libglew_PKG_ERRORS=`$PKG_CONFIG --print-errors "glew >= 1.5.0" 2>&1`
+	 libglewmx_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glewmx >= 1.6.0" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$libglew_PKG_ERRORS" >&5
+	echo "$libglewmx_PKG_ERRORS" >&5
 
-	HAVE_LIBGLEW=0
+	HAVE_LIBGLEWMX=0
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	HAVE_LIBGLEW=0
+	HAVE_LIBGLEWMX=0
 else
-	libglew_CFLAGS=$pkg_cv_libglew_CFLAGS
-	libglew_LIBS=$pkg_cv_libglew_LIBS
+	libglewmx_CFLAGS=$pkg_cv_libglewmx_CFLAGS
+	libglewmx_LIBS=$pkg_cv_libglewmx_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVE_LIBGLEW=1
+	HAVE_LIBGLEWMX=1
 fi
- if test "$HAVE_LIBGLEW" != "1"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: required library libglew >= 1.5.0 not found:" >&5
-$as_echo "$as_me: WARNING: required library libglew >= 1.5.0 not found:" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $libglew_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $libglew_PKG_ERRORS" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libglew is provided by glew; Debian package: libglew-dev" >&5
-$as_echo "$as_me: WARNING: libglew is provided by glew; Debian package: libglew-dev" >&2;}
- fi
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBEQUALIZER $HAVE_LIBEQUALIZER
-_ACEOF
-
- if test "$HAVE_LIBEQUALIZER" = "1"; then
- HAVE_LIBEQUALIZER_TRUE=
- HAVE_LIBEQUALIZER_FALSE='#'
+if test "$HAVE_LIBGLEWMX" != "1"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: required library libglewmx >= 1.6.0 not found:" >&5
+$as_echo "$as_me: WARNING: required library libglewmx >= 1.6.0 not found:" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $libglewmx_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $libglewmx_PKG_ERRORS" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libglewmx is provided by glew; Debian package: libglewmx-dev" >&5
+$as_echo "$as_me: WARNING: libglewmx is provided by glew; Debian package: libglewmx-dev" >&2;}
+fi
+ if test "$HAVE_LIBGLEWMX" = "1"; then
+ HAVE_LIBGLEWMX_TRUE=
+ HAVE_LIBGLEWMX_FALSE='#'
 else
- HAVE_LIBEQUALIZER_TRUE='#'
- HAVE_LIBEQUALIZER_FALSE=
+ HAVE_LIBGLEWMX_TRUE='#'
+ HAVE_LIBGLEWMX_FALSE=
 fi
 
 
@@ -9394,6 +9738,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libgl_CFLAGS=`$PKG_CONFIG --cflags "gl >= 0.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -9410,6 +9755,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_libgl_LIBS=`$PKG_CONFIG --libs "gl >= 0.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -9429,9 +9775,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 libgl_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gl >= 0.0" 2>&1`
+	 libgl_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gl >= 0.0" 2>&1`
 else
-	 libgl_PKG_ERRORS=`$PKG_CONFIG --print-errors "gl >= 0.0" 2>&1`
+	 libgl_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gl >= 0.0" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libgl_PKG_ERRORS" >&5
@@ -9474,6 +9820,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_liblircclient_CFLAGS=`$PKG_CONFIG --cflags "liblircclient0 >= 0.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -9490,6 +9837,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_liblircclient_LIBS=`$PKG_CONFIG --libs "liblircclient0 >= 0.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -9509,9 +9857,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 liblircclient_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "liblircclient0 >= 0.0" 2>&1`
+	 liblircclient_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liblircclient0 >= 0.0" 2>&1`
 else
-	 liblircclient_PKG_ERRORS=`$PKG_CONFIG --print-errors "liblircclient0 >= 0.0" 2>&1`
+	 liblircclient_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liblircclient0 >= 0.0" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$liblircclient_PKG_ERRORS" >&5
@@ -9569,7 +9917,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_GTK_UPDATE_ICON_CACHE+set}" = set; then :
+if ${ac_cv_prog_GTK_UPDATE_ICON_CACHE+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$GTK_UPDATE_ICON_CACHE"; then
@@ -9613,7 +9961,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_UPDATE_DESKTOP_DATABASE+set}" = set; then :
+if ${ac_cv_prog_UPDATE_DESKTOP_DATABASE+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$UPDATE_DESKTOP_DATABASE"; then
@@ -9657,8 +10005,8 @@
 -o "$HAVE_LIBASS" != "1" \
 -o "$HAVE_LIBOPENAL" != "1" \
 -o "$HAVE_LIBQTOPENGL" != "1" \
+ -o "$HAVE_LIBGLEWMX" != "1" \
 -o $ "$equalizer" = "yes" -a "$HAVE_LIBEQUALIZER" != "1" $ \
- -o $ "$HAVE_LIBEQUALIZER" != "1" -a "$HAVE_LIBGLEW" != "1" $ \
 -o $ "$lirc" = "yes" -a "$HAVE_LIBLIRCCLIENT" != "1" $ ; then
 as_fn_error $? "One or more libraries were not found. See messages above." "$LINENO" 5
 fi
@@ -9729,10 +10077,21 @@
 :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
+ if test "x$cache_file" != "x/dev/null"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+	 mv -f confcache "$cache_file"$$ &&
+	 mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+	 mv -f confcache "$cache_file" ;;
+	esac
+ fi
+ fi
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -9796,12 +10155,16 @@
 as_fn_error $? "conditional \"HAVE_LIBEQUALIZER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_LIBGLEWMX_TRUE}" && test -z "${HAVE_LIBGLEWMX_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_LIBGLEWMX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_LIBLIRCCLIENT_TRUE}" && test -z "${HAVE_LIBLIRCCLIENT_FALSE}"; then
 as_fn_error $? "conditional \"HAVE_LIBLIRCCLIENT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -9902,6 +10265,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are. Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
 *[\\/]* ) as_myself=$0 ;;
 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10208,8 +10572,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Bino $as_me 1.2.1, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+This file was extended by Bino $as_me 1.3.2, which was
+generated by GNU Autoconf 2.68. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -10275,8 +10639,8 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Bino config.status 1.2.1
-configured by $0, generated by GNU Autoconf 2.67,
+Bino config.status 1.3.2
+configured by $0, generated by GNU Autoconf 2.68,
 with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -10421,7 +10785,7 @@
 "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
 "pkg/macosx/Info.plist") CONFIG_FILES="$CONFIG_FILES pkg/macosx/Info.plist" ;;
 
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
 esac
 done
 
@@ -10444,9 +10808,10 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
- tmp=
+ tmp= ac_tmp=
 trap 'exit_status=$?
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
 trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -10454,12 +10819,13 @@
 
 {
 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
+ test -d "$tmp"
 } ||
 {
 tmp=./conf$$-$RANDOM
 (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -10481,7 +10847,7 @@
 ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -10509,7 +10875,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -10557,7 +10923,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 for (key in S) S_is_set[key] = 1
 FS = "&#x7;"
 
@@ -10589,7 +10955,7 @@
 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
 cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
@@ -10623,7 +10989,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -10635,8 +11001,8 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_t"; then
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_tt"; then
 break
 elif $ac_last_try; then
 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -10737,7 +11103,7 @@
 esac
 case $ac_mode$ac_tag in
 :[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
 :[FH]-) ac_tag=-:-;;
 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
 esac
@@ -10756,7 +11122,7 @@
 for ac_f
 do
 case $ac_f in
- -) ac_f="$tmp/stdin";;
+ -) ac_f="$ac_tmp/stdin";;
 *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute). The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -10765,7 +11131,7 @@
 	 [\\/$]*) false;;
 	 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	 esac ||
-	 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
 esac
 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
 as_fn_append ac_file_inputs " '$ac_f'"
@@ -10791,8 +11157,8 @@
 esac
 
 case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
 esac
 ;;
 esac
@@ -10928,21 +11294,22 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined. Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined. Please make sure it is defined" >&2;}
 
- rm -f "$tmp/stdin"
+ rm -f "$ac_tmp/stdin"
 case $ac_file in
- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
 esac \
 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 ;;
@@ -10953,20 +11320,20 @@
 if test x"$ac_file" != x-; then
 {
 $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- } >"$tmp/config.h" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+ } >"$ac_tmp/config.h" \
 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
 else
 rm -f "$ac_file"
- mv "$tmp/config.h" "$ac_file" \
+ mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
 fi
 else
 $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
 || as_fn_error $? "could not create -" "$LINENO" 5
 fi
 # Compute "$ac_file"'s index in $config_headers.

bino-1.2.1.tar.bz2/configure.ac -> bino-1.3.2.tar.xz/configure.ac Changed

@@ -4,8 +4,9 @@
 dnl
 dnl This file is part of bino, a 3D video player.
 dnl
-dnl Copyright (C) 2010-2011
+dnl Copyright (C) 2010, 2011, 2012
 dnl Martin Lambers <marlam@marlam.de>
+dnl Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -21,8 +22,8 @@
 dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 dnl Autotools init stuff
-AC_PREREQ([2.65])
-AC_INIT([Bino], [1.2.1], [bino-list@nongnu.org], [bino], [http://bino3d.org/])
+AC_PREREQ([2.63])
+AC_INIT([Bino], [1.3.2], [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])
@@ -45,7 +46,8 @@
 dnl Special handling of W32
 case "${target}" in *-*-mingw32*) w32="yes" ;; *) w32="no " ;; esac
 if test "$w32" = "yes"; then
- LDFLAGS="-mwindows $LDFLAGS"
+ CXXFLAGS="-mthreads $CXXFLAGS"
+ LDFLAGS="-mthreads -mwindows $LDFLAGS"
 AC_CHECK_TOOL([WINDRES], [windres], [:])
 if test "$WINDRES" = ":"; then
 AC_MSG_ERROR([windres not found])
@@ -69,10 +71,20 @@
 fi
 
 dnl Feature checks needed by the base module
+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);]])],
+ HAVE_GCC_ATOMIC_BUILTINS=1, HAVE_GCC_ATOMIC_BUILTINS=0)
+if test "$HAVE_GCC_ATOMIC_BUILTINS" = "1"; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([GCC atomic builtins not found. Please use a newer compiler.])
+fi
 AC_CHECK_DECLS([optreset], [#include <getopt.h>])
 AC_SEARCH_LIBS([clock_gettime], [rt])
 AC_SEARCH_LIBS([pthread_create], [pthread])
-AC_CHECK_FUNCS([backtrace clock_gettime sigaction vasprintf wcwidth])
+AC_CHECK_FUNCS([backtrace clock_gettime fdatasync fnmatch fseeko ftello getpwuid link mmap nl_langinfo posix_fadvise readdir_r sigaction symlink sysconf vasprintf wcwidth])
 CPPFLAGS_bak="$CPPFLAGS"
 LDFLAGS_bak="$LDFLAGS"
 CPPFLAGS="-pthread $CPPFLAGS"
@@ -122,7 +134,7 @@
 PKG_CHECK_MODULES([libass], [libass >= 0.9.9], [HAVE_LIBASS=1], [HAVE_LIBASS=0])
 if test "$HAVE_LIBASS" != "1"; then
 AC_MSG_WARN([required library libass not found:])
- AC_MSG_WARN([$libopenal_PKG_ERRORS])
+ AC_MSG_WARN([$libass_PKG_ERRORS])
 AC_MSG_WARN([libass is provided by LibASS; Debian package: libass-dev])
 else
 LIBASS_PKGCONFIG_VERSION="\"`$PKG_CONFIG --modversion libass`\""
@@ -131,18 +143,21 @@
 
 dnl OpenAL
 PKG_CHECK_MODULES([libopenal], [openal >= 0.0], [HAVE_LIBOPENAL=1], [HAVE_LIBOPENAL=0])
-if test "$HAVE_LIBOPENAL" != "1"; then
+if test "$HAVE_LIBOPENAL" = "1"; then
+ CPPFLAGS_BAK="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $libopenal_CFLAGS"
+ AC_CHECK_HEADERS([AL/al.h])
+ CPPFLAGS="$CPPFLAGS_BAK"
+else
 AC_MSG_WARN([required library libopenal not found:])
 AC_MSG_WARN([$libopenal_PKG_ERRORS])
 AC_MSG_WARN([libopenal is provided by OpenAL; Debian package: libopenal-dev])
 fi
 
 dnl Qt
-RCC=""
 AC_ARG_VAR([RCC], [rcc command])
-MOC=""
 AC_ARG_VAR([MOC], [moc command])
-PKG_CHECK_MODULES([libqtopengl], [QtOpenGL >= 0.0], [HAVE_LIBQTOPENGL=1], [HAVE_LIBQTOPENGL=0])
+PKG_CHECK_MODULES([libqtopengl], [QtOpenGL >= 4.6], [HAVE_LIBQTOPENGL=1], [HAVE_LIBQTOPENGL=0])
 if test "$HAVE_LIBQTOPENGL" != "1"; then
 AC_MSG_WARN([required library QtOpenGL not found:])
 AC_MSG_WARN([$libqtopengl_PKG_ERRORS])
@@ -183,7 +198,7 @@
 fi
 
 dnl Equalizer
-dnl We assume that Equalizer includes GLEW. If we don't use Equalizer, we need GLEW separately.
+dnl We assume that Equalizer does not use an included GLEW!
 AC_ARG_WITH([equalizer],
 [AS_HELP_STRING([--without-equalizer], [Disable multi-display support via Equalizer (enabled by default)])],
 [if test "$withval" = "yes"; then equalizer="yes"; else equalizer="no"; fi], [equalizer="yes"])
@@ -195,24 +210,26 @@
 AC_MSG_WARN([libEqualizer is provided by Equalizer])
 	equalizer="no"
 fi
-fi
-if test "$equalizer" = "no"; then
+else
 HAVE_LIBEQUALIZER=0
- dnl glew
- PKG_CHECK_MODULES([libglew], [glew >= 1.5.0], [HAVE_LIBGLEW=1], [HAVE_LIBGLEW=0])
- if test "$HAVE_LIBGLEW" != "1"; then
- AC_MSG_WARN([required library libglew >= 1.5.0 not found:])
- AC_MSG_WARN([$libglew_PKG_ERRORS])
- AC_MSG_WARN([libglew is provided by glew; Debian package: libglew-dev])
- fi
 fi
 AC_DEFINE_UNQUOTED([HAVE_LIBEQUALIZER], [$HAVE_LIBEQUALIZER], [Have Equalizer?])
 AM_CONDITIONAL([HAVE_LIBEQUALIZER], [test "$HAVE_LIBEQUALIZER" = "1"])
 
+dnl glewmx
+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:])
+ AC_MSG_WARN([$libglewmx_PKG_ERRORS])
+ AC_MSG_WARN([libglewmx is provided by glew; Debian package: libglewmx-dev])
+fi
+AM_CONDITIONAL([HAVE_LIBGLEWMX], [test "$HAVE_LIBGLEWMX" = "1"])
+
 dnl OpenGL
 dnl We need to explicitly link with OpenGL since we use its functions directly.
-dnl However, this is most probably not necessary on Windows and Mac OS X (for now),
-dnl so we just use a pkg-config check and ignore a failure.
+dnl However, this is most probably not necessary on Windows and Mac OS X (for
+dnl now), so we just use a pkg-config check (which usually only works on Linux)
+dnl and ignore a failure.
 PKG_CHECK_MODULES([libgl], [gl >= 0.0], [HAVE_LIBGL=1], [HAVE_LIBGL=0])
 
 dnl LIRC
@@ -253,8 +270,8 @@
 -o "$HAVE_LIBASS" != "1" \
 -o "$HAVE_LIBOPENAL" != "1" \
 -o "$HAVE_LIBQTOPENGL" != "1" \
+ -o "$HAVE_LIBGLEWMX" != "1" \
 -o $ "$equalizer" = "yes" -a "$HAVE_LIBEQUALIZER" != "1" $ \
- -o $ "$HAVE_LIBEQUALIZER" != "1" -a "$HAVE_LIBGLEW" != "1" $ \
 -o $ "$lirc" = "yes" -a "$HAVE_LIBLIRCCLIENT" != "1" $ ; then
 AC_MSG_ERROR([One or more libraries were not found. See messages above.])
 fi

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

@@ -1,3 +1,10 @@
+# Copyright (C) 2010, 2011, 2012
+# Martin Lambers <marlam@marlam.de>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved. This file is offered as-is, without any warranty.
+
 man_MANS = bino.1
 
 info_TEXINFOS = bino.texi
@@ -6,6 +13,8 @@
 	input-layout-mono.png \
 	input-layout-separate-left-right.png \
 	input-layout-separate-right-left.png \
+	input-layout-alternating-left-right.png \
+	input-layout-alternating-right-left.png \
 	input-layout-top-bottom.png \
 	input-layout-top-bottom-half.png \
 	input-layout-bottom-top.png \
@@ -16,6 +25,8 @@
 	input-layout-right-left-half.png \
 	input-layout-even-odd-rows.png \
 	input-layout-odd-even-rows.png \
+	output-type-stereo.png \
+	output-type-alternating.png \
 	output-type-mono-left.png \
 	output-type-mono-right.png \
 	output-type-top-bottom.png \
@@ -30,8 +41,7 @@
 	output-type-green-magenta.png \
 	output-type-amber-blue.png \
 	output-type-red-green.png \
-	output-type-red-blue.png \
-	output-type-stereo.png
+	output-type-red-blue.png
 
 input-layout-%.png:
 	$(LN_S) $(top_srcdir)/src/icons-local/$@

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

@@ -15,6 +15,13 @@
 
 @SET_MAKE@
 
+# Copyright (C) 2010, 2011, 2012
+# Martin Lambers <marlam@marlam.de>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved. This file is offered as-is, without any warranty.
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -112,6 +119,7 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -223,8 +231,8 @@
 libexecdir = @libexecdir@
 libgl_CFLAGS = @libgl_CFLAGS@
 libgl_LIBS = @libgl_LIBS@
-libglew_CFLAGS = @libglew_CFLAGS@
-libglew_LIBS = @libglew_LIBS@
+libglewmx_CFLAGS = @libglewmx_CFLAGS@
+libglewmx_LIBS = @libglewmx_LIBS@
 liblircclient_CFLAGS = @liblircclient_CFLAGS@
 liblircclient_LIBS = @liblircclient_LIBS@
 libopenal_CFLAGS = @libopenal_CFLAGS@
@@ -260,6 +268,8 @@
 	input-layout-mono.png \
 	input-layout-separate-left-right.png \
 	input-layout-separate-right-left.png \
+	input-layout-alternating-left-right.png \
+	input-layout-alternating-right-left.png \
 	input-layout-top-bottom.png \
 	input-layout-top-bottom-half.png \
 	input-layout-bottom-top.png \
@@ -270,6 +280,8 @@
 	input-layout-right-left-half.png \
 	input-layout-even-odd-rows.png \
 	input-layout-odd-even-rows.png \
+	output-type-stereo.png \
+	output-type-alternating.png \
 	output-type-mono-left.png \
 	output-type-mono-right.png \
 	output-type-top-bottom.png \
@@ -284,8 +296,7 @@
 	output-type-green-magenta.png \
 	output-type-amber-blue.png \
 	output-type-red-green.png \
-	output-type-red-blue.png \
-	output-type-stereo.png
+	output-type-red-blue.png
 
 IMAGES = \
 	multi-display-vrlab.jpg \

bino-1.2.1.tar.bz2/doc/bino.1 -> bino-1.3.2.tar.xz/doc/bino.1 Changed

@@ -1,13 +1,13 @@
 .\" -*-nroff-*-
 .\"
-.\" Copyright (C) 2010-2011
+.\" Copyright (C) 2010, 2011, 2012
 .\" Martin Lambers <marlam@marlam.de>
 .\" Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
 .\"
 .\" Copying and distribution of this file, with or without modification, are
 .\" permitted in any medium without royalty provided the copyright notice and this
 .\" notice are preserved. This file is offered as-is, without any warranty.
-.TH Bino 1 2011-04
+.TH Bino 1 2012-03
 .SH NAME
 Bino - a 3D video player with multi-display support.
 .SH SYNOPSIS
@@ -29,9 +29,21 @@
 .IP "\-n|\-\-no\-gui"
 Do not use the GUI, just play the given input in a plain window using the
 parameters given on the command line.
+.IP "\-\-log\-file=\fIFILE\fP"
+Append all log messages to the given file.
 .IP "\-L|\-\-log\-level=\fILEVEL\fP"
 Select log level:
 \fIdebug\fP, \fIinfo\fP, \fIwarning\fP, \fIerror\fP, or \fIquiet\fP.
+.IP "\-\-list\-audio\-devices"
+Print a list of known audio devices and exit.
+.IP "\-A|\-\-audio\-device=\fIN\fP"
+Use audio device number N. N=0 is the default device.
+.IP "\-D|\-\-audio\-delay=\fID\fP"
+Delay audio by D milliseconds. Default is 0.
+.IP "\-V|\-\-audio\-volume=\fIV\fP"
+Set audio volume (0 to 1). Default is 1.
+.IP "\-m|\-\-audio\-mute"
+Mute audio.
 .IP "\-\-device\-type=\fITYPE\fP"
 Type of input device: \fIdefault\fP, \fIfirewire\fP, or \fIx11\fP.
 .IP "\-\-device\-frame\-size=\fIW\fPx\fIH\fP"
@@ -55,6 +67,10 @@
 Left/right view in separate streams, left first.
 .IP "\fIseparate\-right\-left\fP"
 Left/right view in separate streams, right first.
+.IP "\fIalternating\-left\-right\fP"
+Left/right alternating, left first.
+.IP "\fIalternating\-right\-left\fP"
+Left/right alternating, right first.
 .IP "\fItop\-bottom\fP"
 Left view top, right view bottom.
 .IP "\fItop\-bottom\-half\fP"
@@ -108,6 +124,10 @@
 .IP "\-o|\-\-output=\fITYPE\fP"
 Select output type.
 .RS
+.IP "\fIstereo\fP"
+OpenGL quad\-buffer stereo.
+.IP "\fIalternating\fP"
+Left and right view alternating.
 .IP "\fImono\-left\fP"
 Left view only.
 .IP "\fImono\-right\fP"
@@ -158,8 +178,6 @@
 Red/green anaglyph, monochrome method.
 .IP "\fIred\-blue\-monochrome\fP"
 Red/blue anaglyph, monochrome method.
-.IP "\fIstereo\fP"
-OpenGL quad\-buffer stereo.
 .IP "\fIequalizer\fP"
 Multi-display OpenGL via Equalizer with a 2D canvas setup.
 .IP "\fIequalizer\-3d\fP"
@@ -185,6 +203,11 @@
 Flip right view vertically when in fullscreen mode.
 .IP "\-\-fullscreen\-flop\-right"
 Flop right view horizontally when in fullscreen mode.
+.IP "\-z|\-\-zoom=\fIZ\fP"
+Set zoom for videos that are wider than the screen, from 0 (off; show full
+video width) to 1 (full; use full screen height). The default is 0.
+.IP "\-C|\-\-crop=\fIW:H\fP"
+Crop the video to the given aspect ratio, to remove borders. 0:0 disables cropping.
 .IP "\-c|\-\-center"
 Center window on screen.
 .IP "\-\-subtitle\-encoding=\fIENC\fP"
@@ -201,13 +224,16 @@
 Subtitle parallax adjustment (\-1 to +1).
 .IP "\-P|\-\-parallax=\fIVAL\fP"
 Parallax adjustment (\-1 to +1).
-.IP "\-C|\-\-crosstalk=\fIVAL\fP"
+.IP "\-\-crosstalk=\fIVAL\fP"
 Crosstalk leak level (0 to 1). Comma-separated values for the R,G,B channels.
-.IP "\-G|\-\-ghostbust=\fIVAL\fP"
+.IP "\-\-ghostbust=\fIVAL\fP"
 Amount of crosstalk ghostbusting to apply (0 to 1).
 .IP "\-b|\-\-benchmark"
 Benchmark mode: no audio, no time synchronization, output of frames-per-second
 measurements.
+.IP "\-\-swap\-interval=\fID\fP"
+Frame rate divisor relative to display refresh rate. The default is 0 for
+benchmark mode and 1 otherwise.
 .IP "\-l|\-\-loop"
 Loop the input media.
 .SH INTERACTIVE CONTROL
@@ -237,18 +263,28 @@
 Adjust hue.
 .IP "7, 8"
 Adjust saturation.
-.IP "<, >"
+.IP "[, ]"
 Adjust parallax.
 .IP "(, )"
 Adjust ghostbusting.
+.IP "<, >"
+Adjust zoom for videos that are wider than the screen.
+.IP "/, *"
+Adjust audio volume.
+.IP "m"
+Toggle audio mute.
+.IP "."
+Step a single video frame forward.
 .IP "left, right"
 Seek 10 seconds backward / forward.
-.IP "up, down"
+.IP "down, up"
 Seek 1 minute backward / forward.
-.IP "page up, page down"
+.IP "page down, page up"
 Seek 10 minutes backward / forward.
 .IP "Mouse click"
 Seek according to the horizontal click position.
+.IP "Media Keys"
+Media keys (if available) should work as expected.
 .SH AUTHORS
 The Bino developers.
 .SH SEE ALSO

bino-1.2.1.tar.bz2/doc/bino.html -> bino-1.3.2.tar.xz/doc/bino.html Changed

@@ -1,16 +1,16 @@
 <html lang="en">
 <head>
-<title>Bino 1.2.1</title>
+<title>Bino 1.3.2</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="Bino 1.2.1">
+<meta name="description" content="Bino 1.3.2">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 </style>
 </head>
 <body>
-<h1 class="settitle">Bino 1.2.1</h1>
+<h1 class="settitle">Bino 1.3.2</h1>
 <div class="node">
 <a name="Top"></a>
 <hr>
@@ -45,10 +45,10 @@
 
 <h2 class="unnumbered">Bino</h2>
 
-This manual was last updated 10 October 2011 for version
-1.2.1 of Bino.
+This manual was last updated 15 March 2012 for version
+1.3.2 of Bino.
 
- Copyright &copy; 2011
+ Copyright &copy; 2011, 2012
 Martin Lambers (<a href="mailto:marlam@marlam.de">marlam@marlam.de</a>),
 Stefan Eilemann (<a href="mailto:eile@eyescale.ch">eile@eyescale.ch</a>),
 Frédéric Devernay (<a href="mailto:Frederic.Devernay@inrialpes.fr">Frederic.Devernay@inrialpes.fr</a>)
@@ -161,8 +161,14 @@
 <dt>&lsquo;<samp>--version</samp>&rsquo;<dd>Print version. 
 <dt>&lsquo;<samp>-n</samp>&rsquo;<dt>&lsquo;<samp>--no-gui</samp>&rsquo;<dd>Do not use the GUI, just play the given input in a plain window using the
 parameters given on the command line. 
+<dt>&lsquo;<samp>--log-file=<var>FILE</var></samp>&rsquo;<dd>Append all log messages to the given file. 
 <dt>&lsquo;<samp>-L</samp>&rsquo;<dt>&lsquo;<samp>--log-level=<var>LEVEL</var></samp>&rsquo;<dd>Select log level: <var>debug</var>, <var>info</var>, <var>warning</var>, <var>error</var>, or
 <var>quiet</var>. 
+ <dt>&lsquo;<samp>--list-audio-devices</samp>&rsquo;<dd>Print a list of known audio devices and exit. 
+ <dt>&lsquo;<samp>-A</samp>&rsquo;<dt>&lsquo;<samp>--audio-device=<var>N</var></samp>&rsquo;<dd>Use audio device number <var>N</var>. <var>N</var>=0 is the default device. 
+ <dt>&lsquo;<samp>D</samp>&rsquo;<dt>&lsquo;<samp>--audio-delay=<var>D</var></samp>&rsquo;<dd>Delay audio by D milliseconds. Default is 0. 
+ <dt>&lsquo;<samp>-V</samp>&rsquo;<dt>&lsquo;<samp>--audio-volume=<var>V</var></samp>&rsquo;<dd>Set audio volume (0 to 1). Default is 1. 
+ <dt>&lsquo;<samp>-m</samp>&rsquo;<dt>&lsquo;<samp>--audio-mute</samp>&rsquo;<dd>Mute audio. 
 <dt>&lsquo;<samp>--device-type=<var>TYPE</var></samp>&rsquo;<dd>Type of input device: <var>default</var>, <var>firewire</var>, or <var>x11</var>. 
 <dt>&lsquo;<samp>--device-frame-size=<var>W</var>x<var>H</var></samp>&rsquo;<dd>If the input is a device, request the given frame size, e.g. 640x480. 
 <dt>&lsquo;<samp>--device-frame-rate=<var>N</var>/<var>D</var></samp>&rsquo;<dd>If the input is a device, request the given frame rate, e.g. 25/1. 
@@ -181,6 +187,9 @@
 <dt>&lsquo;<samp>--fullscreen-flop-left</samp>&rsquo;<dd>Flop left view horizontally when in fullscreen mode. 
 <dt>&lsquo;<samp>--fullscreen-flip-right</samp>&rsquo;<dd>Flip right view vertically when in fullscreen mode. 
 <dt>&lsquo;<samp>--fullscreen-flop-right</samp>&rsquo;<dd>Flop right view horizontally when in fullscreen mode. 
+ <dt>&lsquo;<samp>-z</samp>&rsquo;<dt>&lsquo;<samp>--zoom=<var>Z</var></samp>&rsquo;<dd>Set zoom for videos that are wider than the screen, from 0 (off; show full
+video width) to 1 (full; use full screen height). The default is 0. 
+ <dt>&lsquo;<samp>-C</samp>&rsquo;<dt>&lsquo;<samp>--crop=<var>W:H</var></samp>&rsquo;<dd>Crop the video to the given aspect ratio, to remove borders. 0:0 disables cropping. 
 <dt>&lsquo;<samp>-c</samp>&rsquo;<dt>&lsquo;<samp>--center</samp>&rsquo;<dd>Center window on screen. 
 <dt>&lsquo;<samp>--subtitle-encoding=<var>ENC</var></samp>&rsquo;<dd>Set subtitle encoding. 
 <dt>&lsquo;<samp>--subtitle-font=<var>FONT</var></samp>&rsquo;<dd>Set subtitle font name. 
@@ -189,10 +198,12 @@
 <dt>&lsquo;<samp>--subtitle-color=<var>COLOR</var></samp>&rsquo;<dd>Set subtitle color, in [AA]RRGGBB format. 
 <dt>&lsquo;<samp>--subtitle-parallax=<var>VAL</var></samp>&rsquo;<dd>Subtitle parallax adjustment (-1 to +1). 
 <dt>&lsquo;<samp>-P</samp>&rsquo;<dt>&lsquo;<samp>--parallax=<var>VAL</var></samp>&rsquo;<dd>Parallax adjustment (-1 to +1). 
- <dt>&lsquo;<samp>-C</samp>&rsquo;<dt>&lsquo;<samp>--crosstalk=<var>VAL</var></samp>&rsquo;<dd>Crosstalk leak level (0 to 1). Comma-separated values for the R,G,B channels. 
- <dt>&lsquo;<samp>-G</samp>&rsquo;<dt>&lsquo;<samp>--ghostbust=<var>VAL</var></samp>&rsquo;<dd>Amount of crosstalk ghostbusting to apply (0 to 1). 
+ <dt>&lsquo;<samp>--crosstalk=<var>VAL</var></samp>&rsquo;<dd>Crosstalk leak level (0 to 1). Comma-separated values for the R,G,B channels. 
+ <dt>&lsquo;<samp>--ghostbust=<var>VAL</var></samp>&rsquo;<dd>Amount of crosstalk ghostbusting to apply (0 to 1). 
 <dt>&lsquo;<samp>-b</samp>&rsquo;<dt>&lsquo;<samp>--benchmark</samp>&rsquo;<dd>Benchmark mode: no audio, no time synchronization, output of frames-per-second
 measurements. 
+ <dt>&lsquo;<samp>--swap-interval=<var>D</var></samp>&rsquo;<dd>Frame rate divisor relative to display refresh rate. The default is 0 for
+benchmark mode and 1 otherwise. 
 <dt>&lsquo;<samp>-l</samp>&rsquo;<dt>&lsquo;<samp>--loop</samp>&rsquo;<dd>Loop the input media. 
 </dl>
 
@@ -231,6 +242,10 @@
 <img src="input-layout-separate-left-right.png" alt="input-layout-separate-left-right.png">
 <dt><var>separate-right-left</var><dd>Separate streams: right view first, left view second. 
 <img src="input-layout-separate-right-left.png" alt="input-layout-separate-right-left.png">
+ <dt><var>alternating-left-right</var><dd>Alternating frames: left view first, right view second. 
+<img src="input-layout-alternating-left-right.png" alt="input-layout-alternating-left-right.png">
+ <dt><var>alternating-right-left</var><dd>Alternating frames: right view first, left view second. 
+<img src="input-layout-alternating-right-left.png" alt="input-layout-alternating-right-left.png">
 <dt><var>top-bottom</var><dd>Single stream: left view top, right view bottom. 
 <img src="input-layout-top-bottom.png" alt="input-layout-top-bottom.png">
 <dt><var>top-bottom-half</var><dd>Single stream: left view top, right view bottom, both with half height. 
@@ -335,7 +350,11 @@
 <h3 class="section">4.2 Supported Output Techniques</h3>
 
 <dl>
-<dt><var>mono-left</var><dd>Left view only. 
+<dt><var>stereo</var><dd>OpenGL quad-buffer stereo. 
+<img src="output-type-stereo.png" alt="output-type-stereo.png">
+ <dt><var>alternating</var><dd>Left and right view alternating. 
+<img src="output-type-alternating.png" alt="output-type-alternating.png">
+ <dt><var>mono-left</var><dd>Left view only. 
 <img src="output-type-mono-left.png" alt="output-type-mono-left.png">
 <dt><var>mono-right</var><dd>Right view only. 
 <img src="output-type-mono-right.png" alt="output-type-mono-right.png">
@@ -387,8 +406,6 @@
 <img src="output-type-red-green.png" alt="output-type-red-green.png">
 <dt><var>red-blue-monochrome</var><dd>Red/blue anaglyph glasses, monochrome method. 
 <img src="output-type-red-blue.png" alt="output-type-red-blue.png">
- <dt><var>stereo</var><dd>OpenGL quad-buffer stereo. 
-<img src="output-type-stereo.png" alt="output-type-stereo.png">
 <dt><var>equalizer</var><dd>Multi-display OpenGL via Equalizer with a 2D canvas setup. 
 <dt><var>equalizer-3d</var><dd>Multi-display OpenGL via Equalizer with a 3D screen setup. 
 </dl>
@@ -778,12 +795,17 @@
 <dt><kbd>3, 4</kbd><dd>Adjust brightness. 
 <dt><kbd>5, 6</kbd><dd>Adjust hue. 
 <dt><kbd>7, 8</kbd><dd>Adjust saturation. 
- <dt><kbd>&lt;, &gt;</kbd><dd>Adjust parallax. 
+ <dt><kbd>[, ]</kbd><dd>Adjust parallax. 
 <dt><kbd>(, )</kbd><dd>Adjust ghostbusting. 
+ <dt><kbd>&lt;, &gt;</kbd><dd>Adjust zoom for videos that are wider than the screen. 
+ <dt><kbd>/, *</kbd><dd>Adjust audio volume. 
+ <dt><kbd>m</kbd><dd>Toggle audio mute. 
+ <dt><kbd>.</kbd><dd>Step a single video frame forward. 
 <dt><kbd>LEFT, RIGHT</kbd><dd>Seek 10 seconds backward / forward. 
- <dt><kbd>UP, DOWN</kbd><dd>Seek 1 minute backward / forward. 
- <dt><kbd>PAGE UP, PAGE DOWN</kbd><dd>Seek 10 minutes backward / forward. 
+ <dt><kbd>DOWN, UP</kbd><dd>Seek 1 minute backward / forward. 
+ <dt><kbd>PAGE DOWN, PAGE UP</kbd><dd>Seek 10 minutes backward / forward. 
 <dt><kbd>Mouse click</kbd><dd>Seek according to the horizontal click position. 
+ <dt><kbd>"Media Keys"</kbd><dd>Media keys (if available) should work as expected. 
 </dl>
 
 <h3 class="section">5.2 Remote Controls</h3>
@@ -807,6 +829,7 @@
 <dt>&lsquo;<samp>toggle-stereo-mode-swap</samp>&rsquo;<dd>Swap left/right eye. 
 <dt>&lsquo;<samp>toggle-fullscreen</samp>&rsquo;<dd>Toggle fullscreen. 
 <dt>&lsquo;<samp>center</samp>&rsquo;<dd>Center window. 
+ <dt>&lsquo;<samp>adjust-zoom <var>delta</var></samp>&rsquo;<dd>Adjust zoom for wide videos by adding <var>delta</var>, e.g. -0.1 or +0.1. 
 <dt>&lsquo;<samp>adjust-contrast <var>delta</var></samp>&rsquo;<dd>Adjust contrast by adding <var>delta</var>, e.g. -0.05 or +0.05. 
 <dt>&lsquo;<samp>adjust-brightness <var>delta</var></samp>&rsquo;<dd>Adjust brightness by adding <var>delta</var>, e.g. -0.05 or +0.05. 
 <dt>&lsquo;<samp>adjust-hue <var>delta</var></samp>&rsquo;<dd>Adjust hue by adding <var>delta</var>, e.g. -0.05 or +0.05. 
@@ -817,6 +840,8 @@
 example -60.0 seeks backwards one minute, and +60.0 seeks forward one minute. 
 <dt>&lsquo;<samp>set-pos <var>pos</var></samp>&rsquo;<dd>Seek by setting an absolute position in the stream, with <var>pos</var> between 0 and
 1. For example, to seek to the middle of the video, use 0.5. 
+ <dt>&lsquo;<samp>adjust-audio-volume <var>delta</var></samp>&rsquo;<dd>Adjust audio volume by adding <var>delta</var>, e.g. -0.05 or +0.05. 
+ <dt>&lsquo;<samp>toggle-audio-mute</samp>&rsquo;<dd>Toggle audio mute. 
 </dl>
 
 Example LIRC configuration file excerpt:

bino-1.2.1.tar.bz2/doc/bino.info -> bino-1.3.2.tar.xz/doc/bino.info Changed

@@ -1,9 +1,9 @@
 This is ../../sources/bino/doc/bino.info, produced by makeinfo version
 4.13 from ../../sources/bino/doc/bino.texi.
 
-This manual was last updated 10 October 2011 for version 1.2.1 of Bino.
+This manual was last updated 15 March 2012 for version 1.3.2 of Bino.
 
- Copyright (C) 2011 Martin Lambers (<marlam@marlam.de>), Stefan
+ Copyright (C) 2011, 2012 Martin Lambers (<marlam@marlam.de>), Stefan
 Eilemann (<eile@eyescale.ch>), Frédéric Devernay
 (<Frederic.Devernay@inrialpes.fr>)
 
@@ -23,9 +23,9 @@
 Bino
 ****
 
-This manual was last updated 10 October 2011 for version 1.2.1 of Bino.
+This manual was last updated 15 March 2012 for version 1.3.2 of Bino.
 
- Copyright (C) 2011 Martin Lambers (<marlam@marlam.de>), Stefan
+ Copyright (C) 2011, 2012 Martin Lambers (<marlam@marlam.de>), Stefan
 Eilemann (<eile@eyescale.ch>), Frédéric Devernay
 (<Frederic.Devernay@inrialpes.fr>)
 
@@ -94,10 +94,32 @@
 Do not use the GUI, just play the given input in a plain window
 using the parameters given on the command line.
 
+`--log-file=FILE'
+ Append all log messages to the given file.
+
 `-L'
 `--log-level=LEVEL'
 Select log level: DEBUG, INFO, WARNING, ERROR, or QUIET.
 
+`--list-audio-devices'
+ Print a list of known audio devices and exit.
+
+`-A'
+`--audio-device=N'
+ Use audio device number N. N=0 is the default device.
+
+`D'
+`--audio-delay=D'
+ Delay audio by D milliseconds. Default is 0.
+
+`-V'
+`--audio-volume=V'
+ Set audio volume (0 to 1). Default is 1.
+
+`-m'
+`--audio-mute'
+ Mute audio.
+
 `--device-type=TYPE'
 Type of input device: DEFAULT, FIREWIRE, or X11.
 
@@ -157,6 +179,17 @@
 `--fullscreen-flop-right'
 Flop right view horizontally when in fullscreen mode.
 
+`-z'
+`--zoom=Z'
+ Set zoom for videos that are wider than the screen, from 0 (off;
+ show full video width) to 1 (full; use full screen height). The
+ default is 0.
+
+`-C'
+`--crop=W:H'
+ Crop the video to the given aspect ratio, to remove borders. 0:0
+ disables cropping.
+
 `-c'
 `--center'
 Center window on screen.
@@ -183,12 +216,10 @@
 `--parallax=VAL'
 Parallax adjustment (-1 to +1).
 
-`-C'
 `--crosstalk=VAL'
 Crosstalk leak level (0 to 1). Comma-separated values for the
 R,G,B channels.
 
-`-G'
 `--ghostbust=VAL'
 Amount of crosstalk ghostbusting to apply (0 to 1).
 
@@ -197,6 +228,10 @@
 Benchmark mode: no audio, no time synchronization, output of
 frames-per-second measurements.
 
+`--swap-interval=D'
+ Frame rate divisor relative to display refresh rate. The default
+ is 0 for benchmark mode and 1 otherwise.
+
 `-l'
 `--loop'
 Loop the input media.
@@ -238,6 +273,14 @@
 Separate streams: right view first, left view second.
 &#x0;&#x8;[image src="input-layout-separate-right-left.png"&#x0;&#x8;]
 
+ALTERNATING-LEFT-RIGHT
+ Alternating frames: left view first, right view second.
+ &#x0;&#x8;[image src="input-layout-alternating-left-right.png"&#x0;&#x8;]
+
+ALTERNATING-RIGHT-LEFT
+ Alternating frames: right view first, left view second.
+ &#x0;&#x8;[image src="input-layout-alternating-right-left.png"&#x0;&#x8;]
+
 TOP-BOTTOM
 Single stream: left view top, right view bottom.
 &#x0;&#x8;[image src="input-layout-top-bottom.png"&#x0;&#x8;]
@@ -391,6 +434,14 @@
 4.2 Supported Output Techniques
 ===============================
 
+STEREO
+ OpenGL quad-buffer stereo.
+ &#x0;&#x8;[image src="output-type-stereo.png"&#x0;&#x8;]
+
+ALTERNATING
+ Left and right view alternating.
+ &#x0;&#x8;[image src="output-type-alternating.png"&#x0;&#x8;]
+
 MONO-LEFT
 Left view only.
 &#x0;&#x8;[image src="output-type-mono-left.png"&#x0;&#x8;]
@@ -492,10 +543,6 @@
 Red/blue anaglyph glasses, monochrome method.
 &#x0;&#x8;[image src="output-type-red-blue.png"&#x0;&#x8;]
 
-STEREO
- OpenGL quad-buffer stereo.
- &#x0;&#x8;[image src="output-type-stereo.png"&#x0;&#x8;]
-
 EQUALIZER
 Multi-display OpenGL via Equalizer with a 2D canvas setup.
 EQUALIZER-3D
@@ -927,24 +974,39 @@
 `7, 8'
 Adjust saturation.
 
-`<, >'
+`[, ]'
 Adjust parallax.
 
 `(, )'
 Adjust ghostbusting.
 
+`<, >'
+ Adjust zoom for videos that are wider than the screen.
+
+`/, *'
+ Adjust audio volume.
+
+`m'
+ Toggle audio mute.
+
+`.'
+ Step a single video frame forward.
+
 `LEFT, RIGHT'
 Seek 10 seconds backward / forward.
 
-`UP, DOWN'
+`DOWN, UP'
 Seek 1 minute backward / forward.
 
-`PAGE UP, PAGE DOWN'
+`PAGE DOWN, PAGE UP'
 Seek 10 minutes backward / forward.
 
 `Mouse click'
 Seek according to the horizontal click position.
 
+`"Media Keys"'
+ Media keys (if available) should work as expected.
+
 5.2 Remote Controls
 ===================
 
@@ -984,6 +1046,9 @@
 `center'
 Center window.
 
+`adjust-zoom DELTA'
+ Adjust zoom for wide videos by adding DELTA, e.g. -0.1 or +0.1.
+
 `adjust-contrast DELTA'
 Adjust contrast by adding DELTA, e.g. -0.05 or +0.05.
 
@@ -1012,6 +1077,12 @@
 between 0 and 1. For example, to seek to the middle of the video,
 use 0.5.
 
+`adjust-audio-volume DELTA'
+ Adjust audio volume by adding DELTA, e.g. -0.05 or +0.05.
+
+`toggle-audio-mute'
+ Toggle audio mute.
+
 Example LIRC configuration file excerpt:
 begin
 remote = ...
@@ -1048,17 +1119,17 @@
 
 &#x1f;
 Tag Table:
-Node: Top&#x7f;770
-Node: Introduction&#x7f;1475
-Node: Invocation&#x7f;2498
-Node: Input Layouts&#x7f;5529
-Ref: File Name Conventions&#x7f;8218
-Node: Output Techniques&#x7f;9052
-Ref: Crosstalk Ghostbusting&#x7f;15320
-Ref: Basic Multi Display Support&#x7f;17296
-Ref: Advanced Multi Display Support&#x7f;18427
-Node: Interactive Control&#x7f;29672
-Node: Camera Devices&#x7f;32597
+Node: Top&#x7f;774
+Node: Introduction&#x7f;1483
+Node: Invocation&#x7f;2506
+Node: Input Layouts&#x7f;6360
+Ref: File Name Conventions&#x7f;9345
+Node: Output Techniques&#x7f;10179
+Ref: Crosstalk Ghostbusting&#x7f;16549
+Ref: Basic Multi Display Support&#x7f;18525
+Ref: Advanced Multi Display Support&#x7f;19656
+Node: Interactive Control&#x7f;30901
+Node: Camera Devices&#x7f;34301
 &#x1f;
 End Tag Table

bino-1.2.1.tar.bz2/doc/bino.texi -> bino-1.3.2.tar.xz/doc/bino.texi Changed

@@ -10,7 +10,7 @@
 This manual was last updated @value{UPDATED} for version
 @value{VERSION} of Bino.
 
-Copyright @copyright{} 2011
+Copyright @copyright{} 2011, 2012
 Martin Lambers (@email{marlam@@marlam.de}),
 Stefan Eilemann (@email{eile@@eyescale.ch}),
 Frédéric Devernay (@email{Frederic.Devernay@@inrialpes.fr})
@@ -107,10 +107,26 @@
 @itemx --no-gui
 Do not use the GUI, just play the given input in a plain window using the
 parameters given on the command line.
+@itemx --log-file=@var{FILE}
+Append all log messages to the given file.
 @item -L
 @itemx --log-level=@var{LEVEL}
 Select log level: @var{debug}, @var{info}, @var{warning}, @var{error}, or
 @var{quiet}.
+@item --list-audio-devices
+Print a list of known audio devices and exit.
+@item -A
+@itemx --audio-device=@var{N}
+Use audio device number @var{N}. @var{N}=0 is the default device.
+@item D
+@itemx --audio-delay=@var{D}
+Delay audio by D milliseconds. Default is 0.
+@item -V
+@itemx --audio-volume=@var{V}
+Set audio volume (0 to 1). Default is 1.
+@item -m
+@itemx --audio-mute
+Mute audio.
 @item --device-type=@var{TYPE}
 Type of input device: @var{default}, @var{firewire}, or @var{x11}.
 @item --device-frame-size=@var{W}x@var{H}
@@ -152,6 +168,13 @@
 Flip right view vertically when in fullscreen mode.
 @item --fullscreen-flop-right
 Flop right view horizontally when in fullscreen mode.
+@item -z
+@itemx --zoom=@var{Z}
+Set zoom for videos that are wider than the screen, from 0 (off; show full
+video width) to 1 (full; use full screen height). The default is 0.
+@item -C
+@itemx --crop=@var{W:H}
+Crop the video to the given aspect ratio, to remove borders. 0:0 disables cropping.
 @item -c
 @itemx --center
 Center window on screen.
@@ -170,16 +193,17 @@
 @item -P
 @itemx --parallax=@var{VAL}
 Parallax adjustment (-1 to +1).
-@item -C
-@itemx --crosstalk=@var{VAL}
+@item --crosstalk=@var{VAL}
 Crosstalk leak level (0 to 1). Comma-separated values for the R,G,B channels.
-@item -G
-@itemx --ghostbust=@var{VAL}
+@item --ghostbust=@var{VAL}
 Amount of crosstalk ghostbusting to apply (0 to 1).
 @item -b
 @itemx --benchmark
 Benchmark mode: no audio, no time synchronization, output of frames-per-second
 measurements.
+@item --swap-interval=@var{D}
+Frame rate divisor relative to display refresh rate. The default is 0 for
+benchmark mode and 1 otherwise.
 @item -l
 @itemx --loop
 Loop the input media.
@@ -215,6 +239,12 @@
 @item separate-right-left
 Separate streams: right view first, left view second.@*
 @image{input-layout-separate-right-left,,,,png}
+@item alternating-left-right
+Alternating frames: left view first, right view second.@*
+@image{input-layout-alternating-left-right,,,,png}
+@item alternating-right-left
+Alternating frames: right view first, left view second.@*
+@image{input-layout-alternating-right-left,,,,png}
 @item top-bottom
 Single stream: left view top, right view bottom.@*
 @image{input-layout-top-bottom,,,,png}
@@ -344,6 +374,12 @@
 @section Supported Output Techniques
 
 @table @var
+@item stereo
+OpenGL quad-buffer stereo.@*
+@image{output-type-stereo,,,,png}
+@item alternating
+Left and right view alternating.@*
+@image{output-type-alternating,,,,png}
 @item mono-left
 Left view only.@*
 @image{output-type-mono-left,,,,png}
@@ -420,9 +456,6 @@
 @item red-blue-monochrome
 Red/blue anaglyph glasses, monochrome method.@*
 @image{output-type-red-blue,,,,png}
-@item stereo
-OpenGL quad-buffer stereo.@*
-@image{output-type-stereo,,,,png}
 @item equalizer
 Multi-display OpenGL via Equalizer with a 2D canvas setup.@*
 @item equalizer-3d
@@ -846,18 +879,28 @@
 Adjust hue.
 @item 7, 8
 Adjust saturation.
-@item <, >
+@item [, ]
 Adjust parallax.
 @item (, )
 Adjust ghostbusting.
+@item <, >
+Adjust zoom for videos that are wider than the screen.
+@item /, *
+Adjust audio volume.
+@item m
+Toggle audio mute.
+@item .
+Step a single video frame forward.
 @item LEFT, RIGHT
 Seek 10 seconds backward / forward.
-@item UP, DOWN
+@item DOWN, UP
 Seek 1 minute backward / forward.
-@item PAGE UP, PAGE DOWN
+@item PAGE DOWN, PAGE UP
 Seek 10 minutes backward / forward.
 @item Mouse click
 Seek according to the horizontal click position.
+@item "Media Keys"
+Media keys (if available) should work as expected.
 @end table
 
 @section Remote Controls
@@ -890,6 +933,8 @@
 Toggle fullscreen.
 @item center
 Center window.
+@item adjust-zoom @var{delta}
+Adjust zoom for wide videos by adding @var{delta}, e.g. -0.1 or +0.1.
 @item adjust-contrast @var{delta}
 Adjust contrast by adding @var{delta}, e.g. -0.05 or +0.05.
 @item adjust-brightness @var{delta}
@@ -908,6 +953,10 @@
 @item set-pos @var{pos}
 Seek by setting an absolute position in the stream, with @var{pos} between 0 and
 1. For example, to seek to the middle of the video, use 0.5.
+@item adjust-audio-volume @var{delta}
+Adjust audio volume by adding @var{delta}, e.g. -0.05 or +0.05.
+@item toggle-audio-mute
+Toggle audio mute.
 @end table
 
 Example LIRC configuration file excerpt:

bino-1.3.2.tar.xz/doc/input-layout-alternating-left-right.png Added

bino-1.3.2.tar.xz/doc/input-layout-alternating-right-left.png Added

bino-1.3.2.tar.xz/doc/output-type-alternating.png Added

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

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

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

bino-1.2.1.tar.bz2/po/bino.pot -> bino-1.3.2.tar.xz/po/bino.pot Changed

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: bino 1.2.1\n"
+"Project-Id-Version: bino 1.3.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2011-10-10 21:25+0200\n"
+"POT-Creation-Date: 2012-03-16 19:49+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"
@@ -17,1281 +17,1704 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/base/dbg.cpp:50
+#: src/base/dbg.cpp:49
 #, c-format
 msgid "Caught signal %d (%s). Aborting."
 msgstr ""
 
-#: src/base/dbg.cpp:57
+#: src/base/dbg.cpp:56
 msgid "Unexpected exception."
 msgstr ""
 
 #. TRANSLATORS: %s will be a mail address.
-#: src/base/dbg.cpp:145
+#: src/base/dbg.cpp:221
 #, c-format
 msgid "Report bugs to <%s>."
 msgstr ""
 
-#: src/base/exc.cpp:54 src/base/exc.cpp:72 src/base/exc.cpp:106
+#: src/base/exc.cpp:52 src/base/exc.cpp:70 src/base/exc.cpp:104
 #, c-format
 msgid "Exception: %s"
 msgstr ""
 
-#: src/base/opt.cpp:151
+#: src/base/opt.cpp:168
 #, c-format
 msgid "Invalid option %s."
 msgstr ""
 
-#: src/base/opt.cpp:155
+#: src/base/opt.cpp:172
 #, c-format
 msgid "Option --%s does not take an argument."
 msgstr ""
 
-#: src/base/opt.cpp:160
+#: src/base/opt.cpp:177
 #, c-format
 msgid "Invalid option -%c."
 msgstr ""
 
-#: src/base/opt.cpp:169
+#: src/base/opt.cpp:186
 #, c-format
 msgid "Option --%s requires an argument."
 msgstr ""
 
-#: src/base/opt.cpp:174
+#: src/base/opt.cpp:191
 #, c-format
 msgid "Option -%c requires an argument."
 msgstr ""
 
-#: src/base/opt.cpp:195
+#: src/base/opt.cpp:212
 #, c-format
 msgid "Invalid argument for -%c."
 msgstr ""
 
-#: src/base/opt.cpp:199
+#: src/base/opt.cpp:216
 #, c-format
 msgid "Invalid argument for --%s."
 msgstr ""
 
-#: src/base/opt.cpp:218
+#: src/base/opt.cpp:239
 #, c-format
 msgid "Option --%s (-%c) is mandatory."
 msgstr ""
 
-#: src/base/opt.cpp:222
+#: src/base/opt.cpp:243
 #, c-format
 msgid "Option --%s is mandatory."
 msgstr ""
 
-#: src/base/opt.cpp:236
+#: src/base/opt.cpp:257
 msgid "Too few arguments."
 msgstr ""
 
-#: src/base/opt.cpp:241
+#: src/base/opt.cpp:262
 msgid "Too many arguments."
 msgstr ""
 
-#: src/base/str.cpp:226
+#: src/base/str.cpp:236
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr ""
 
-#: src/base/str.cpp:411 src/base/str.cpp:429 src/base/str.cpp:439
-#: src/base/str.cpp:450
+#: src/base/str.cpp:455 src/base/str.cpp:473 src/base/str.cpp:483
+#: src/base/str.cpp:494 src/base/str.cpp:499
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr ""
 
-#: src/base/thread.cpp:40 src/base/thread.cpp:51
-#, c-format
-msgid "Cannot initialize mutex: %s"
-msgstr ""
-
-#: src/base/thread.cpp:65
-#, c-format
-msgid "Cannot lock mutex: %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
+msgid "System function failed: "
 msgstr ""
 
-#: src/base/thread.cpp:79
-#, c-format
-msgid "Cannot unlock mutex: %s"
-msgstr ""
-
-#: src/base/thread.cpp:145
-#, c-format
-msgid "Cannot create thread: %s"
+#: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
+msgid "Cannot get time."
 msgstr ""
 
-#: src/base/thread.cpp:160
-#, c-format
-msgid "Cannot join with thread: %s"
+#: src/audio_output.cpp:88
+msgid "No OpenAL device available."
 msgstr ""
 
-#: src/base/thread.cpp:182
+#: src/audio_output.cpp:93 src/audio_output.cpp:99
 #, c-format
-msgid "Cannot cancel thread: %s"
-msgstr ""
-
-#: src/base/timer.cpp:69 src/base/timer.cpp:81 src/base/timer.cpp:95
-msgid "Cannot get time."
+msgid "OpenAL device '%s' is not available."
 msgstr ""
 
-#: src/audio_output.cpp:61
-msgid "No OpenAL device available."
+#: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
+#: src/media_data.cpp:1067 src/media_data.cpp:1090 src/media_data.cpp:1128
+#: src/media_data.cpp:1133
+msgid "unknown"
 msgstr ""
 
-#: src/audio_output.cpp:66
+#: src/audio_output.cpp:106
 msgid "No OpenAL context available."
 msgstr ""
 
-#: src/audio_output.cpp:77
+#: src/audio_output.cpp:117
 msgid "Cannot create OpenAL buffers."
 msgstr ""
 
-#: src/audio_output.cpp:86
+#: src/audio_output.cpp:126
 msgid "Cannot create OpenAL source."
 msgstr ""
 
-#: src/audio_output.cpp:99
+#: src/audio_output.cpp:139
 msgid "Cannot set OpenAL source parameters."
 msgstr ""
 
-#: src/audio_output.cpp:153
+#: src/audio_output.cpp:193
 msgid "Cannot check OpenAL source state."
 msgstr ""
 
-#: src/audio_output.cpp:160
+#: src/audio_output.cpp:200
 msgid "Cannot restart OpenAL source playback."
 msgstr ""
 
-#: src/audio_output.cpp:313
+#: src/audio_output.cpp:353
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr ""
 
-#: src/audio_output.cpp:340
+#: src/audio_output.cpp:369
+msgid "Cannot set OpenAL audio volume."
+msgstr ""
+
+#: src/audio_output.cpp:395
 msgid "Cannot buffer initial OpenAL data."
 msgstr ""
 
-#: src/audio_output.cpp:354
+#: src/audio_output.cpp:409
 msgid "Cannot buffer OpenAL data."
 msgstr ""
 
-#: src/audio_output.cpp:379
+#: src/audio_output.cpp:434
 msgid "Cannot start OpenAL source playback."
 msgstr ""
 
-#: src/audio_output.cpp:393
+#: src/audio_output.cpp:448
 msgid "Cannot pause OpenAL source playback."
 msgstr ""
 
-#: src/audio_output.cpp:402
+#: src/audio_output.cpp:457
 msgid "Cannot unpause OpenAL source playback."
 msgstr ""
 
-#: src/audio_output.cpp:411
+#: src/audio_output.cpp:466
 msgid "Cannot stop OpenAL source playback."
 msgstr ""
 
-#: src/audio_output.cpp:422
+#: src/audio_output.cpp:477
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr ""
 
-#: src/lib_versions.cpp:121 src/lib_versions.cpp:158 src/media_data.cpp:422
-#: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
-msgid "unknown"
+#: src/dispatch.cpp:156
+msgid "Cannot connect to X server."
 msgstr ""
 
-#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
-msgid "not used"
+#: src/dispatch.cpp:171
+msgid "No video to play."
 msgstr ""
 
-#: src/lirc.cpp:63
-msgid "Cannot initialize LIRC."
+#: src/dispatch.cpp:411 src/player_equalizer.cpp:84
+msgid "No video streams found."
 msgstr ""
 
-#: src/lirc.cpp:69
-msgid "Cannot set LIRC socket properties."
+#: src/dispatch.cpp:428
+msgid "Cannot set requested stereo layout: incompatible media."
 msgstr ""
 
-#: src/lirc.cpp:76
-msgid "Cannot read LIRC default configuration."
+#: src/dispatch.cpp:443
+#, c-format
+msgid "Video stream %d not found."
 msgstr ""
 
-#: src/lirc.cpp:91
+#: src/dispatch.cpp:449
 #, c-format
-msgid "Cannot read LIRC configuration file %s."
+msgid "Audio stream %d not found."
 msgstr ""
 
-#: src/lirc.cpp:140
-msgid "Cannot get LIRC event; disabling LIRC support."
+#: src/dispatch.cpp:457
+#, c-format
+msgid "Subtitle stream %d not found."
 msgstr ""
 
-#: src/lirc.cpp:154
-#, c-format
-msgid "Received invalid command '%s' from LIRC."
+#: src/dispatch.cpp:529 src/main.cpp:736
+msgid "This version of Bino was compiled without support for Equalizer."
 msgstr ""
 
-#: src/lirc.cpp:164
-msgid "Cannot get command for LIRC code."
+#: src/gui.cpp:101
+msgid "Video:"
 msgstr ""
 
-#: src/main.cpp:325
-#, c-format
-msgid "%s version %s"
+#: src/gui.cpp:102
+msgid "Select the video stream."
 msgstr ""
 
-#: src/main.cpp:326
-msgid "Copyright (C) 2011 the Bino developers."
+#: src/gui.cpp:108
+msgid "Audio:"
 msgstr ""
 
-#: src/main.cpp:327
-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."
+#: src/gui.cpp:109
+msgid "Select the audio stream."
 msgstr ""
 
-#: src/main.cpp:330 src/player_qt.cpp:2958
-msgid "Platform:"
+#: src/gui.cpp:115
+msgid "Subtitle:"
 msgstr ""
 
-#: src/main.cpp:332 src/player_qt.cpp:2959
-msgid "Libraries used:"
+#: src/gui.cpp:116
+msgid "Select the subtitle stream."
 msgstr ""
 
-#. TRANSLATORS: This is the --help text. Translate only the description,
-#. not the option names. Please keep a proper indentation with spaces, and
-#. keep the line length limited.
-#: src/main.cpp:344
-#, c-format
-msgid ""
-"Usage:\n"
-" %s [option...] [file...]\n"
-"\n"
-"Options:\n"
-" --help Print help.\n"
-" --version Print version.\n"
-" -n|--no-gui Do not use the GUI, just show a plain window.\n"
-" -L|--log-level=LEVEL Set log level (debug/info/warning/error/quiet).\n"
-" --device-type=TYPE Type of input device: default, firewire, x11.\n"
-" --device-frame-size=WxH Request frame size WxH from input device.\n"
-" --device-frame-rate=N/D Request frame rate N/D from input device.\n"
-" --lirc-config=FILE Use the given LIRC configuration file. This\n"
-" option can be used more than once.\n"
-" -v|--video=STREAM Select video stream (1-n, depending on input).\n"
-" -a|--audio=STREAM Select audio stream (1-n, depending on input).\n"
-" -s|--subtitle=STREAM Select subtitle stream (0-n, dep. on input).\n"
-" -i|--input=TYPE Select input type (default autodetect):\n"
-" mono Single view.\n"
-" separate-left-right Left/right separate streams, left first.\n"
-" separate-right-left Left/right separate streams, right first.\n"
-" top-bottom Left top, right bottom.\n"
-" top-bottom-half Left top, right bottom, half height.\n"
-" bottom-top Left bottom, right top.\n"
-" bottom-top-half Left bottom, right top, half height.\n"
-" left-right Left left, right right.\n"
-" left-right-half Left left, right right, half width.\n"
-" right-left Left right, right left.\n"
-" right-left-half Left right, right left, half width.\n"
-" even-odd-rows Left even rows, right odd rows.\n"
-" odd-even-rows Left odd rows, right even rows.\n"
-" -o|--output=TYPE Select output type:\n"
-" mono-left Only left.\n"
-" mono-right Only right.\n"
-" top-bottom Left top, right bottom.\n"
-" top-bottom-half Left top, right bottom, half height.\n"
-" left-right Left left, right right.\n"
-" left-right-half Left left, right right, half width.\n"
-" even-odd-rows Left even rows, right odd rows.\n"
-" even-odd-columns Left even columns, right odd columns.\n"
-" checkerboard Left and right in checkerboard pattern.\n"
-" hdmi-frame-pack HDMI frame packing mode.\n"
-" red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
-" red-cyan-half-color Red/cyan anaglyph, half color method.\n"
-" red-cyan-full-color Red/cyan anaglyph, full color method.\n"
-" red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
-" green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
-" green-magenta-half-color Green/magenta anaglyph, half color method.\n"
-" green-magenta-full-color Green/magenta anaglyph, full color method.\n"
-" green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
-" amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
-" amber-blue-half-color Amber/blue anaglyph, half color method.\n"
-" amber-blue-full-color Amber/blue anaglyph, full color method.\n"
-" amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
-" red-green-monochrome Red/green anaglyph, monochrome method.\n"
-" red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
-" stereo OpenGL quad-buffered stereo.\n"
-" equalizer Multi-display via Equalizer (2D setup).\n"
-" equalizer-3d Multi-display via Equalizer (3D setup).\n"
-" -S|--swap-eyes Swap left/right view.\n"
-" -f|--fullscreen Fullscreen.\n"
-" --fullscreen-screens= Use the listed screens in fullscreen mode.\n"
-" [S0[,S1[,...]]] Screen numbers start with 1. The default\n"
-" (empty list) is to use the primary screen.\n"
-" --fullscreen-flip-left Flip left view vertically when fullscreen.\n"
-" --fullscreen-flop-left Flop left view horizontally when fullscreen.\n"
-" --fullscreen-flip-right Flip right view vertically when fullscreen.\n"
-" --fullscreen-flop-right Flop right view horizontally when fullscreen.\n"
-" -c|--center Center window on screen.\n"
-" --subtitle-encoding=ENC Set subtitle encoding.\n"
-" --subtitle-font=FONT Set subtitle font name.\n"
-" --subtitle-size=N Set subtitle font size.\n"
-" --subtitle-scale=S Set subtitle scale factor.\n"
-" --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
-" --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
-" -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
-" -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-separated\n"
-" values for the R,G,B channels.\n"
-" -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
-" -b|--benchmark Benchmark mode (no audio, show fps).\n"
-" -l|--loop Loop the input media.\n"
-"\n"
-"Interactive control:\n"
-" ESC Leave fullscreen mode, or quit.\n"
-" q Quit.\n"
-" p or SPACE Pause / unpause.\n"
-" f Toggle fullscreen.\n"
-" c Center window.\n"
-" e Swap left/right eye.\n"
-" v Cycle through available video streams.\n"
-" a Cycle through available audio streams.\n"
-" s Cycle through available subtitle streams.\n"
-" 1, 2 Adjust contrast.\n"
-" 3, 4 Adjust brightness.\n"
-" 5, 6 Adjust hue.\n"
-" 7, 8 Adjust saturation.\n"
-" <, > Adjust parallax.\n"
-" (, ) Adjust ghostbusting.\n"
-" left, right Seek 10 seconds backward / forward.\n"
-" up, down Seek 1 minute backward / forward.\n"
-" page up, page down Seek 10 minutes backward / forward.\n"
-" Mouse click Seek according to horizontal click position."
-msgstr ""
-
-#: src/main.cpp:597
-msgid "Benchmark mode: audio and time synchronization disabled."
+#: src/gui.cpp:127 src/media_input.cpp:277
+msgid "Input:"
 msgstr ""
 
-#: src/main.cpp:614
-msgid "This version of Bino was compiled without support for LIRC."
+#: src/gui.cpp:128
+msgid "Set the 3D layout of the video stream."
 msgstr ""
 
-#: src/main.cpp:627
-msgid "This version of Bino was compiled without support for Equalizer."
+#: src/gui.cpp:132
+msgid "2D"
 msgstr ""
 
-#: src/main.cpp:634
-msgid "Cannot connect to X server."
+#: src/gui.cpp:133
+msgid "Separate streams, left first"
 msgstr ""
 
-#: src/main.cpp:650
-msgid "No video to play."
+#: src/gui.cpp:134
+msgid "Separate streams, right first"
 msgstr ""
 
-#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:293
-#, c-format
-msgid "%dx%d, %.3g:1"
+#: src/gui.cpp:135
+msgid "Alternating, left first"
 msgstr ""
 
-#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:421
-#, c-format
-msgid "%s, %d ch., %g kHz, %d bit"
+#: src/gui.cpp:136
+msgid "Alternating, right first"
 msgstr ""
 
-#: src/media_input.cpp:277 src/player_qt.cpp:187
-msgid "Input:"
+#: src/gui.cpp:137 src/gui.cpp:161
+msgid "Top/bottom"
 msgstr ""
 
-#: src/media_input.cpp:282
-#, c-format
-msgid "Video %s: %s"
+#: src/gui.cpp:138 src/gui.cpp:162
+msgid "Top/bottom, half height"
 msgstr ""
 
-#: src/media_input.cpp:287
-msgid "No video."
+#: src/gui.cpp:139
+msgid "Bottom/top"
 msgstr ""
 
-#: src/media_input.cpp:293
-#, c-format
-msgid "Audio %s: %s"
+#: src/gui.cpp:140
+msgid "Bottom/top, half height"
 msgstr ""
 
-#: src/media_input.cpp:298
-msgid "No audio."
+#: src/gui.cpp:141 src/gui.cpp:163
+msgid "Left/right"
 msgstr ""
 
-#: src/media_input.cpp:304
-#, c-format
-msgid "Subtitle %s: %s"
+#: src/gui.cpp:142 src/gui.cpp:164
+msgid "Left/right, half width"
 msgstr ""
 
-#: src/media_input.cpp:309
-msgid "No subtitle."
+#: src/gui.cpp:143
+msgid "Right/left"
 msgstr ""
 
-#: src/media_input.cpp:311
-#, c-format
-msgid "Duration: %g seconds"
+#: src/gui.cpp:144
+msgid "Right/left, half width"
 msgstr ""
 
-#: src/media_input.cpp:314
-#, c-format
-msgid "Stereo layout: %s"
+#: src/gui.cpp:145 src/gui.cpp:165
+msgid "Even/odd rows"
 msgstr ""
 
-#: src/media_object.cpp:371
-#, c-format
-msgid "%s video stream %d: Using frame size %dx%d instead of %dx%d."
+#: src/gui.cpp:146
+msgid "Odd/even rows"
 msgstr ""
 
-#: src/media_object.cpp:624
-#, c-format
-msgid "%s video stream %d: Unsupported stereo layout %s."
+#: src/gui.cpp:152
+msgid "Output:"
 msgstr ""
 
-#: src/media_object.cpp:662
-#, c-format
-msgid "%s audio stream %d: Cannot handle audio with %d channels."
+#: src/gui.cpp:153
+msgid "Set the 3D output type for your display."
 msgstr ""
 
-#: src/media_object.cpp:691
-#, c-format
-msgid "%s audio stream %d: Cannot handle audio with sample format %s."
+#: src/gui.cpp:157
+msgid "Left view"
 msgstr ""
 
-#: src/media_object.cpp:744
-#, c-format
-msgid "No support available for %s device."
+#: src/gui.cpp:158
+msgid "Right view"
 msgstr ""
 
-#: src/media_object.cpp:745 src/player_qt.cpp:1831
-msgid "Firewire"
+#: src/gui.cpp:159
+msgid "OpenGL stereo"
 msgstr ""
 
-#: src/media_object.cpp:746 src/player_qt.cpp:1832
-msgid "X11"
+#: src/gui.cpp:160
+msgid "Left/right view alternating"
 msgstr ""
 
-#: src/media_object.cpp:747
-msgid "default"
+#: src/gui.cpp:166
+msgid "Even/odd columns"
 msgstr ""
 
-#: src/media_object.cpp:765 src/media_object.cpp:1218 src/xgl.cpp:297
-#, c-format
-msgid "%s: %s"
+#: src/gui.cpp:167
+msgid "Checkerboard pattern"
 msgstr ""
 
-#: src/media_object.cpp:776
-#, c-format
-msgid "%s: Cannot read stream info: %s"
+#: src/gui.cpp:168
+msgid "HDMI frame packing mode"
 msgstr ""
 
-#: src/media_object.cpp:816
-#, c-format
-msgid "%s stream %d: Cannot open %s: %s"
+#: src/gui.cpp:169
+msgid "Red/cyan glasses, monochrome method"
 msgstr ""
 
-#: src/media_object.cpp:817
-msgid "video codec"
+#: src/gui.cpp:170
+msgid "Red/cyan glasses, half-color method"
 msgstr ""
 
-#: src/media_object.cpp:818
-msgid "audio codec"
+#: src/gui.cpp:171
+msgid "Red/cyan glasses, full-color method"
 msgstr ""
 
-#: src/media_object.cpp:819
-msgid "subtitle codec"
+#: src/gui.cpp:172
+msgid "Red/cyan glasses, high-quality Dubois method"
 msgstr ""
 
-#: src/media_object.cpp:820
-msgid "data"
+#: src/gui.cpp:173
+msgid "Green/magenta glasses, monochrome method"
 msgstr ""
 
-#: src/media_object.cpp:821
-msgid "codec not supported"
+#: src/gui.cpp:174
+msgid "Green/magenta glasses, half-color method"
 msgstr ""
 
-#: src/media_object.cpp:831
-#, c-format
-msgid "%s video stream %d: Invalid frame size."
+#: src/gui.cpp:175
+msgid "Green/magenta glasses, full-color method"
 msgstr ""
 
-#: src/media_object.cpp:867
-#, c-format
-msgid "%s video stream %d: Cannot initialize conversion context."
+#: src/gui.cpp:176
+msgid "Green/magenta glasses, high-quality Dubois method"
 msgstr ""
 
-#: src/media_object.cpp:930
-#, c-format
-msgid "Video stream %d: %s / %s, %g seconds"
+#: src/gui.cpp:177
+msgid "Amber/blue glasses, monochrome method"
 msgstr ""
 
-#: src/media_object.cpp:934
-#, c-format
-msgid "Using up to %d threads for decoding."
+#: src/gui.cpp:178
+msgid "Amber/blue glasses, half-color method"
 msgstr ""
 
-#: src/media_object.cpp:939
-#, c-format
-msgid "Audio stream %d: %s / %s, %g seconds"
+#: src/gui.cpp:179
+msgid "Amber/blue glasses, full-color method"
 msgstr ""
 
-#: src/media_object.cpp:946
-#, c-format
-msgid "Subtitle stream %d: %s / %s, %g seconds"
+#: src/gui.cpp:180
+msgid "Amber/blue glasses, high-quality Dubois method"
 msgstr ""
 
-#: src/media_object.cpp:953
-msgid "No usable streams."
+#: src/gui.cpp:181
+msgid "Red/green glasses, monochrome method"
 msgstr ""
 
-#: src/media_object.cpp:1234 src/media_object.cpp:1264
-#: src/media_object.cpp:1294
-#, c-format
-msgid "%s: Cannot duplicate packet."
+#: src/gui.cpp:182
+msgid "Red/blue glasses, monochrome method"
 msgstr ""
 
-#: src/media_object.cpp:1766
-#, c-format
-msgid "%s: Seeking failed."
+#: src/gui.cpp:186
+msgid "Swap left/right"
 msgstr ""
 
-#: src/player.cpp:212
-msgid "No video streams found."
+#: src/gui.cpp:187
+msgid ""
+"Swap the left and right view. Use this if the 3D effect seems wrong."
 msgstr ""
 
-#: src/player.cpp:218
-msgid "Cannot set requested stereo layout: incompatible media."
+#: src/gui.cpp:467
+msgid "Off"
 msgstr ""
 
-#: src/player.cpp:224
-#, c-format
-msgid "Video stream %d not found."
+#: src/gui.cpp:694
+msgid ""
+"This slider shows the progress during video playback, and can be used to "
+"seek in the video."
 msgstr ""
 
-#: src/player.cpp:229
-#, c-format
-msgid "Audio stream %d not found."
+#: src/gui.cpp:701
+msgid "Elapsed / total time."
 msgstr ""
 
-#: src/player.cpp:237
-#, c-format
-msgid "Subtitle stream %d not found."
+#: src/gui.cpp:708
+msgid "Toggle audio mute."
 msgstr ""
 
-#: src/player.cpp:644
-#, c-format
-msgid "Video: delay %g seconds; dropping next frame."
+#: src/gui.cpp:713
+msgid "Adjust audio volume."
 msgstr ""
 
-#: src/player.cpp:656
-#, c-format
-msgid "FPS: %.2f"
+#: src/gui.cpp:725
+msgid "Play."
 msgstr ""
 
-#: src/player_equalizer.cpp:138
-msgid "Reading input frame failed."
+#: src/gui.cpp:729
+msgid "Pause."
 msgstr ""
 
-#: src/player_equalizer.cpp:192 src/video_output_qt.cpp:345
-#: src/video_output_qt.cpp:352
-msgid "Waiting for subtitle renderer initialization..."
+#: src/gui.cpp:733
+msgid "Stop."
 msgstr ""
 
-#: src/player_equalizer.cpp:273
-msgid "Init data mapping failed."
+#: src/gui.cpp:738
+msgid "Toggle loop mode."
 msgstr ""
 
-#: src/player_equalizer.cpp:274
-msgid "Frame data mapping failed."
+#: src/gui.cpp:745
+msgid ""
+"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
+"f key."
 msgstr ""
 
-#: src/player_equalizer.cpp:275
-msgid "Video player initialization failed."
+#: src/gui.cpp:751
+msgid "Center the video area on your screen."
 msgstr ""
 
-#: src/player_equalizer.cpp:276
-msgid "Need at least OpenGL 2.1."
+#: src/gui.cpp:758
+msgid "Seek backward 10 minutes."
 msgstr ""
 
-#: src/player_equalizer.cpp:477
-msgid "No canvas in Equalizer configuration."
+#: src/gui.cpp:763
+msgid "Seek backward 1 minute."
 msgstr ""
 
-#: src/player_equalizer.cpp:511
-msgid "Equalizer canvas:"
+#: src/gui.cpp:769
+msgid "Seek backward 10 seconds."
 msgstr ""
 
-#: src/player_equalizer.cpp:512
-#, c-format
-msgid "%gx%g, aspect ratio %g:1"
+#: src/gui.cpp:775
+msgid "Seek forward 10 seconds."
 msgstr ""
 
-#: src/player_equalizer.cpp:513
-#, c-format
-msgid "Area for %g:1 video: [ %g %g %g %g @ %g ]"
+#: src/gui.cpp:780
+msgid "Seek forward 1 minute."
 msgstr ""
 
-#: src/player_equalizer.cpp:926 src/video_output_qt.cpp:318
-msgid ""
-"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
-"objects."
+#: src/gui.cpp:786
+msgid "Seek forward 10 minutes."
 msgstr ""
 
-#: src/player_equalizer.cpp:1096
-msgid "Equalizer initialization failed."
+#: src/gui.cpp:1047
+msgid "Fullscreen/Multiscreen Settings"
 msgstr ""
 
-#: src/player_equalizer.cpp:1104
-msgid "Cannot get equalizer configuration."
+#: src/gui.cpp:1049
+msgid "Configure fullscreen mode:"
 msgstr ""
 
-#: src/player_equalizer.cpp:1118
-msgid "Equalizer configuration initialization failed."
+#: src/gui.cpp:1050
+msgid "Select the screens to use in fullscreen mode."
 msgstr ""
 
-#: src/player_qt.cpp:161
-msgid "Video:"
+#: src/gui.cpp:1052
+msgid "Single screen:"
 msgstr ""
 
-#: src/player_qt.cpp:162
-msgid "Select the video stream."
+#: src/gui.cpp:1053
+msgid "Use a single screen for fullscreen mode."
 msgstr ""
 
-#: src/player_qt.cpp:168
-msgid "Audio:"
+#: src/gui.cpp:1056
+msgid "Primary screen"
 msgstr ""
 
-#: src/player_qt.cpp:169
-msgid "Select the audio stream."
+#: src/gui.cpp:1059 src/gui.cpp:1070 src/gui.cpp:1071
+#, c-format
+msgid "Screen %d"
 msgstr ""
 
-#: src/player_qt.cpp:175
-msgid "Subtitle:"
+#: src/gui.cpp:1062
+msgid "Dual screen:"
 msgstr ""
 
-#: src/player_qt.cpp:176
-msgid "Select the subtitle stream."
+#: src/gui.cpp:1063
+msgid "Use two screens for fullscreen mode."
 msgstr ""
 
-#: src/player_qt.cpp:188
-msgid "Set the 3D layout of the video stream."
+#: src/gui.cpp:1075
+msgid "Multi screen:"
 msgstr ""
 
-#: src/player_qt.cpp:192
-msgid "2D"
+#: src/gui.cpp:1076
+msgid "Use multiple screens for fullscreen mode."
 msgstr ""
 
-#: src/player_qt.cpp:193
-msgid "Separate streams, left first"
+#: src/gui.cpp:1078
+msgid "Comma-separated list of screens to use for fullscreen mode."
 msgstr ""
 
-#: src/player_qt.cpp:194
-msgid "Separate streams, right first"
+#: src/gui.cpp:1081
+msgid "When in fullscreen mode,"
 msgstr ""
 
-#: src/player_qt.cpp:195 src/player_qt.cpp:218
-msgid "Top/bottom"
+#: src/gui.cpp:1082
+msgid "Set special left/right view handling for fullscreen mode."
 msgstr ""
 
-#: src/player_qt.cpp:196 src/player_qt.cpp:219
-msgid "Top/bottom, half height"
+#: src/gui.cpp:1084
+msgid "flip left view vertically."
 msgstr ""
 
-#: src/player_qt.cpp:197
-msgid "Bottom/top"
+#: src/gui.cpp:1086
+msgid "flop left view horizontally."
 msgstr ""
 
-#: src/player_qt.cpp:198
-msgid "Bottom/top, half height"
+#: src/gui.cpp:1088
+msgid "flip right view vertically."
 msgstr ""
 
-#: src/player_qt.cpp:199 src/player_qt.cpp:220
-msgid "Left/right"
+#: src/gui.cpp:1090
+msgid "flop right view horizontally."
 msgstr ""
 
-#: src/player_qt.cpp:200 src/player_qt.cpp:221
-msgid "Left/right, half width"
+#: src/gui.cpp:1093
+msgid "inhibit the screensaver"
 msgstr ""
 
-#: src/player_qt.cpp:201
-msgid "Right/left"
+#: src/gui.cpp:1094
+msgid "Inhibit the screensaver during fullscreen playback."
 msgstr ""
 
-#: src/player_qt.cpp:202
-msgid "Right/left, half width"
+#: src/gui.cpp:1096 src/gui.cpp:1258 src/gui.cpp:1393 src/gui.cpp:1463
+#: src/gui.cpp:1541 src/gui.cpp:1652 src/gui.cpp:1928 src/gui.cpp:2108
+#: src/gui.cpp:2778 src/gui.cpp:2825 src/gui.cpp:3114
+msgid "OK"
 msgstr ""
 
-#: src/player_qt.cpp:203 src/player_qt.cpp:222
-msgid "Even/odd rows"
+#: src/gui.cpp:1211
+msgid "Display Color Adjustments"
 msgstr ""
 
-#: src/player_qt.cpp:204
-msgid "Odd/even rows"
+#: src/gui.cpp:1213
+msgid "Contrast:"
 msgstr ""
 
-#: src/player_qt.cpp:210
-msgid "Output:"
+#: src/gui.cpp:1224
+msgid "Brightness:"
 msgstr ""
 
-#: src/player_qt.cpp:211
-msgid "Set the 3D output type for your display."
+#: src/gui.cpp:1235
+msgid "Hue:"
 msgstr ""
 
-#: src/player_qt.cpp:215
-msgid "Left view"
+#: src/gui.cpp:1246
+msgid "Saturation:"
 msgstr ""
 
-#: src/player_qt.cpp:216
-msgid "Right view"
+#: src/gui.cpp:1364
+msgid "Display Crosstalk Calibration"
 msgstr ""
 
-#: src/player_qt.cpp:217
-msgid "OpenGL stereo"
+#. TRANSLATORS: Please keep the lines short using where necessary.
+#: src/gui.cpp:1367
+msgid ""
+"Please read the manual to find out how to measure the crosstalk "
+"levels of your display."
 msgstr ""
 
-#: src/player_qt.cpp:223
-msgid "Even/odd columns"
+#: src/gui.cpp:1371
+msgid "Red:"
 msgstr ""
 
-#: src/player_qt.cpp:224
-msgid "Checkerboard pattern"
+#: src/gui.cpp:1378
+msgid "Green:"
 msgstr ""
 
-#: src/player_qt.cpp:225
-msgid "HDMI frame packing mode"
+#: src/gui.cpp:1385
+msgid "Blue:"
 msgstr ""
 
-#: src/player_qt.cpp:226
-msgid "Red/cyan glasses, monochrome method"
+#: src/gui.cpp:1441
+msgid "Zoom for wide videos"
 msgstr ""
 
-#: src/player_qt.cpp:227
-msgid "Red/cyan glasses, half-color method"
+#: src/gui.cpp:1444
+msgid ""
+"Set zoom level for videos that are wider than the screen: 0: Show "
+"full video width. 1: Use full screen height.</p"
 msgstr ""
 
-#: src/player_qt.cpp:228
-msgid "Red/cyan glasses, full-color method"
+#: src/gui.cpp:1448
+msgid "Zoom:"
 msgstr ""
 
-#: src/player_qt.cpp:229
-msgid "Red/cyan glasses, high-quality Dubois method"
+#: src/gui.cpp:1449
+msgid "Set the zoom level for videos that are wider than the screen"
 msgstr ""
 
-#: src/player_qt.cpp:230
-msgid "Green/magenta glasses, monochrome method"
+#: src/gui.cpp:1507
+msgid "Audio Settings"
+msgstr ""
+
+#: src/gui.cpp:1509
+msgid "Audio device:"
+msgstr ""
+
+#: src/gui.cpp:1510
+msgid ""
+"Select the audio device. This will take effect for the next started "
+"video."
+msgstr ""
+
+#: src/gui.cpp:1514 src/gui.cpp:2063
+msgid "Default"
+msgstr ""
+
+#: src/gui.cpp:1531
+msgid "Audio delay (ms):"
+msgstr ""
+
+#: src/gui.cpp:1532
+msgid ""
+"Set an audio delay, in milliseconds. This is useful if audio and video "
+"are not in sync."
+msgstr ""
+
+#: src/gui.cpp:1589
+msgid "Subtitle Settings"
+msgstr ""
+
+#: src/gui.cpp:1591
+msgid "These settings apply to soft subtitles, but not to bitmaps."
+msgstr ""
+
+#: src/gui.cpp:1593
+msgid "Encoding:"
+msgstr ""
+
+#: src/gui.cpp:1594
+msgid "Set the subtitle character set encoding."
+msgstr ""
+
+#: src/gui.cpp:1609
+msgid "Override font:"
+msgstr ""
+
+#: src/gui.cpp:1610
+msgid "Override the subtitle font family."
+msgstr ""
+
+#: src/gui.cpp:1619
+msgid "Override font size:"
+msgstr ""
+
+#: src/gui.cpp:1620
+msgid "Override the subtitle font size."
+msgstr ""
+
+#: src/gui.cpp:1630
+msgid "Override scale factor:"
+msgstr ""
+
+#: src/gui.cpp:1631
+msgid "Override the subtitle scale factor."
+msgstr ""
+
+#: src/gui.cpp:1642
+msgid "Override color:"
+msgstr ""
+
+#: src/gui.cpp:1643
+msgid "Override the subtitle color."
+msgstr ""
+
+#: src/gui.cpp:1866
+msgid "Video Settings"
+msgstr ""
+
+#: src/gui.cpp:1868
+msgid "Crop to aspect ratio:"
+msgstr ""
+
+#: src/gui.cpp:1869
+msgid ""
+"Set the real aspect ratio of the video, so that borders can be cropped.</"
+"p>"
+msgstr ""
+
+#: src/gui.cpp:1872
+msgid "Do not crop"
+msgstr ""
+
+#: src/gui.cpp:1885
+msgid "Parallax:"
+msgstr ""
+
+#: src/gui.cpp:1886
+msgid ""
+"Adjust parallax, from -1 to +1. This changes the separation of left and "
+"right view, and thus the perceived distance of the scene."
+msgstr ""
+
+#: src/gui.cpp:1899
+msgid "Subtitle parallax:"
+msgstr ""
+
+#: src/gui.cpp:1900
+msgid ""
+"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
+"distance of the subtitles."
+msgstr ""
+
+#: src/gui.cpp:1913
+msgid "Ghostbusting:"
+msgstr ""
+
+#: src/gui.cpp:1914
+msgid ""
+"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
+"does not work with anaglyph glasses."
+msgstr ""
+
+#: src/gui.cpp:2059
+msgid "Open device"
+msgstr ""
+
+#: src/gui.cpp:2062
+msgid "Choose a device type."
+msgstr ""
+
+#: src/gui.cpp:2064 src/media_object.cpp:801
+msgid "Firewire"
+msgstr ""
+
+#: src/gui.cpp:2065 src/media_object.cpp:802
+msgid "X11"
+msgstr ""
+
+#: src/gui.cpp:2067 src/gui.cpp:2070
+msgid "Choose a device."
+msgstr ""
+
+#: src/gui.cpp:2073
+msgid "Set the X11 device string. Refer to the manual for details."
+msgstr ""
+
+#: src/gui.cpp:2082
+msgid "Request frame size"
+msgstr ""
+
+#: src/gui.cpp:2083
+msgid ""
+"Request a specific frame size from the device, e.g. 640x480. The device "
+"must support this frame size. Some devices require a frame size to be "
+"selected."
+msgstr ""
+
+#: src/gui.cpp:2094
+msgid "Request frame rate"
+msgstr ""
+
+#: src/gui.cpp:2095
+msgid ""
+"Request a specific frame rate from the device, e.g. 25/1. The device must "
+"support this frame rate. Some devices require a frame rate to be selected.</"
+"p>"
+msgstr ""
+
+#: src/gui.cpp:2106 src/gui.cpp:2824
+msgid "Cancel"
+msgstr ""
+
+#: src/gui.cpp:2377
+msgid "&File"
+msgstr ""
+
+#: src/gui.cpp:2378
+msgid "&Open file(s)..."
+msgstr ""
+
+#: src/gui.cpp:2383
+msgid "Open &URL(s)..."
+msgstr ""
+
+#: src/gui.cpp:2387
+msgid "Open &device..."
+msgstr ""
+
+#: src/gui.cpp:2402
+msgid "&Clear recent files"
+msgstr ""
+
+#: src/gui.cpp:2410
+msgid "&Quit..."
+msgstr ""
+
+#: src/gui.cpp:2416
+msgid "&Preferences"
+msgstr ""
+
+#: src/gui.cpp:2419
+msgid "&Fullscreen Settings..."
+msgstr ""
+
+#: src/gui.cpp:2422
+msgid "Display &Color Adjustments..."
+msgstr ""
+
+#: src/gui.cpp:2425
+msgid "Display Cross&talk Calibration..."
+msgstr ""
+
+#: src/gui.cpp:2429
+msgid "&Zoom for wide videos..."
+msgstr ""
+
+#: src/gui.cpp:2433
+msgid "&Audio Settings..."
+msgstr ""
+
+#: src/gui.cpp:2437
+msgid "&Subtitle Settings..."
+msgstr ""
+
+#: src/gui.cpp:2441
+msgid "Current &Video Settings..."
+msgstr ""
+
+#: src/gui.cpp:2444
+msgid "&Help"
+msgstr ""
+
+#: src/gui.cpp:2445
+msgid "&Manual..."
+msgstr ""
+
+#: src/gui.cpp:2450
+msgid "&Website..."
+msgstr ""
+
+#: src/gui.cpp:2454
+msgid "&Keyboard Shortcuts"
+msgstr ""
+
+#: src/gui.cpp:2458
+msgid "&About"
+msgstr ""
+
+#: src/gui.cpp:2771
+msgid "Tip"
+msgstr ""
+
+#: src/gui.cpp:2774
+msgid ""
+"You can select and open multiple files at once.This is useful for "
+"example if you have extra subtitle files, or if left and right view are "
+"stored in separate files."
+msgstr ""
+
+#: src/gui.cpp:2777
+msgid "Do not show this message again."
+msgstr ""
+
+#: src/gui.cpp:2794
+msgid "Open files"
+msgstr ""
+
+#: src/gui.cpp:2818
+msgid "Open URL(s)"
+msgstr ""
+
+#: src/gui.cpp:2819
+msgid "URL(s):"
+msgstr ""
+
+#: src/gui.cpp:2820
+msgid "Enter one or more space separated URLs."
+msgstr ""
+
+#: src/gui.cpp:3005 src/gui.cpp:3013 src/video_output_qt.cpp:234
+#: src/video_output_qt.cpp:643 src/video_output_qt.cpp:664
+msgid "Error"
+msgstr ""
+
+#: src/gui.cpp:3005
+msgid "Cannot open manual."
+msgstr ""
+
+#: src/gui.cpp:3013
+msgid "Cannot open website."
+msgstr ""
+
+#: src/gui.cpp:3021
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: src/gui.cpp:3024
+msgid "Keyboard control:"
+msgstr ""
+
+#: src/gui.cpp:3026
+msgid "Stop."
+msgstr ""
+
+#: src/gui.cpp:3027 src/main.cpp:495
+msgid "Pause / unpause."
+msgstr ""
+
+#: src/gui.cpp:3028 src/main.cpp:496
+msgid "Toggle fullscreen."
+msgstr ""
+
+#: src/gui.cpp:3029 src/main.cpp:497
+msgid "Center window."
+msgstr ""
+
+#: src/gui.cpp:3030 src/main.cpp:498
+msgid "Swap left/right eye."
+msgstr ""
+
+#: src/gui.cpp:3031 src/main.cpp:499
+msgid "Cycle through available video streams."
+msgstr ""
+
+#: src/gui.cpp:3032 src/main.cpp:500
+msgid "Cycle through available audio streams."
+msgstr ""
+
+#: src/gui.cpp:3033 src/main.cpp:501
+msgid "Cycle through available subtitle streams."
+msgstr ""
+
+#: src/gui.cpp:3034 src/main.cpp:502
+msgid "Adjust contrast."
+msgstr ""
+
+#: src/gui.cpp:3035 src/main.cpp:503
+msgid "Adjust brightness."
+msgstr ""
+
+#: src/gui.cpp:3036 src/main.cpp:504
+msgid "Adjust hue."
+msgstr ""
+
+#: src/gui.cpp:3037 src/main.cpp:505
+msgid "Adjust saturation."
+msgstr ""
+
+#: src/gui.cpp:3038 src/main.cpp:506
+msgid "Adjust parallax."
+msgstr ""
+
+#: src/gui.cpp:3039 src/main.cpp:507
+msgid "Adjust ghostbusting."
+msgstr ""
+
+#: src/gui.cpp:3040 src/main.cpp:508
+msgid "Adjust zoom for wide videos."
+msgstr ""
+
+#: src/gui.cpp:3041 src/main.cpp:509
+msgid "Adjust audio volume."
+msgstr ""
+
+#: src/gui.cpp:3042 src/main.cpp:510
+msgid "Toggle audio mute."
+msgstr ""
+
+#: src/gui.cpp:3043 src/main.cpp:511
+msgid "Step a single video frame forward."
+msgstr ""
+
+#: src/gui.cpp:3044 src/main.cpp:512
+msgid "Seek 10 seconds backward / forward."
+msgstr ""
+
+#: src/gui.cpp:3045 src/main.cpp:513
+msgid "Seek 1 minute backward / forward."
+msgstr ""
+
+#: src/gui.cpp:3046 src/main.cpp:514
+msgid "Seek 10 minutes backward / forward."
+msgstr ""
+
+#: src/gui.cpp:3047 src/main.cpp:516
+msgid "Media keys should work as expected."
+msgstr ""
+
+#: src/gui.cpp:3063
+#, c-format
+msgid "About %s"
+msgstr ""
+
+#: src/gui.cpp:3069
+#, c-format
+msgid "The %s 3D video player"
+msgstr ""
+
+#: src/gui.cpp:3074
+#, c-format
+msgid ""
+"%s version %s.Copyright (C) 2012 the Bino developers.This "
+"is free software. You may redistribute copies of it under the terms of the "
+"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
+"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
+"\"%s\">%s</a> for more information on this software."
+msgstr ""
+
+#: src/gui.cpp:3086 src/main.cpp:384
+msgid "Platform:"
+msgstr ""
+
+#: src/gui.cpp:3087 src/main.cpp:386
+msgid "Libraries used:"
+msgstr ""
+
+#: src/gui.cpp:3109
+msgid "About"
+msgstr ""
+
+#: src/gui.cpp:3110
+msgid "Libraries"
+msgstr ""
+
+#: src/gui.cpp:3111
+msgid "Team"
+msgstr ""
+
+#: src/gui.cpp:3112
+msgid "License"
+msgstr ""
+
+#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
+msgid "not used"
+msgstr ""
+
+#: src/lirc.cpp:61
+msgid "Cannot initialize LIRC."
+msgstr ""
+
+#: src/lirc.cpp:67
+msgid "Cannot set LIRC socket properties."
+msgstr ""
+
+#: src/lirc.cpp:74
+msgid "Cannot read LIRC default configuration."
+msgstr ""
+
+#: src/lirc.cpp:89
+#, c-format
+msgid "Cannot read LIRC configuration file %s."
+msgstr ""
+
+#: src/lirc.cpp:117
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr ""
+
+#: src/lirc.cpp:131
+#, c-format
+msgid "Received invalid command '%s' from LIRC."
+msgstr ""
+
+#: src/lirc.cpp:141
+msgid "Cannot get command for LIRC code."
+msgstr ""
+
+#: src/main.cpp:367 src/media_object.cpp:821 src/media_object.cpp:1286
+#: src/video_output.cpp:212
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: src/main.cpp:379
+#, c-format
+msgid "%s version %s"
+msgstr ""
+
+#: src/main.cpp:380
+msgid "Copyright (C) 2012 the Bino developers."
+msgstr ""
+
+#: src/main.cpp:381
+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 ""
+
+#. 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:399
+msgid "Usage:"
+msgstr ""
+
+#: src/main.cpp:401
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:402
+msgid "Print help."
+msgstr ""
+
+#: src/main.cpp:403
+msgid "Print version."
+msgstr ""
+
+#: src/main.cpp:404
+msgid "Do not use the GUI, just show a plain window."
+msgstr ""
+
+#: src/main.cpp:405
+msgid "Append all log messages to the given file."
+msgstr ""
+
+#: src/main.cpp:406
+msgid "Set log level (debug/info/warning/error/quiet)."
+msgstr ""
+
+#: src/main.cpp:407
+msgid "Print a list of known audio devices and exit."
+msgstr ""
+
+#: src/main.cpp:408
+msgid "Use audio device number N (N=0 is the default)."
+msgstr ""
+
+#: src/main.cpp:409
+msgid "Delay audio by D milliseconds. Default is 0."
+msgstr ""
+
+#: src/main.cpp:410
+msgid "Set audio volume (0 to 1). Default is 1."
+msgstr ""
+
+#: src/main.cpp:411
+msgid "Mute audio."
+msgstr ""
+
+#: src/main.cpp:412
+msgid "Type of input device: default, firewire, x11."
+msgstr ""
+
+#: src/main.cpp:413
+msgid "Request frame size WxH from input device."
+msgstr ""
+
+#: src/main.cpp:414
+msgid "Request frame rate N/D from input device."
+msgstr ""
+
+#: src/main.cpp:415
+msgid "Use the given LIRC configuration file."
+msgstr ""
+
+#: src/main.cpp:416
+msgid "This option can be used more than once."
+msgstr ""
+
+#: src/main.cpp:417
+msgid "Select video stream (1-n, depending on input)."
+msgstr ""
+
+#: src/main.cpp:418
+msgid "Select audio stream (1-n, depending on input)."
+msgstr ""
+
+#: src/main.cpp:419
+msgid "Select subtitle stream (0-n, dep. on input)."
+msgstr ""
+
+#: src/main.cpp:420
+msgid "Select input type (default autodetect):"
+msgstr ""
+
+#: src/main.cpp:421
+msgid "Single view."
+msgstr ""
+
+#: src/main.cpp:422
+msgid "Left/right separate streams, left first."
+msgstr ""
+
+#: src/main.cpp:423
+msgid "Left/right separate streams, right first."
+msgstr ""
+
+#: src/main.cpp:424
+msgid "Left/right alternating, left first."
 msgstr ""
 
-#: src/player_qt.cpp:231
-msgid "Green/magenta glasses, half-color method"
+#: src/main.cpp:425
+msgid "Left/right alternating, right first."
 msgstr ""
 
-#: src/player_qt.cpp:232
-msgid "Green/magenta glasses, full-color method"
+#: src/main.cpp:426 src/main.cpp:441
+msgid "Left top, right bottom."
 msgstr ""
 
-#: src/player_qt.cpp:233
-msgid "Green/magenta glasses, high-quality Dubois method"
+#: src/main.cpp:427 src/main.cpp:442
+msgid "Left top, right bottom, half height."
 msgstr ""
 
-#: src/player_qt.cpp:234
-msgid "Amber/blue glasses, monochrome method"
+#: src/main.cpp:428
+msgid "Left bottom, right top."
 msgstr ""
 
-#: src/player_qt.cpp:235
-msgid "Amber/blue glasses, half-color method"
+#: src/main.cpp:429
+msgid "Left bottom, right top, half height."
 msgstr ""
 
-#: src/player_qt.cpp:236
-msgid "Amber/blue glasses, full-color method"
+#: src/main.cpp:430 src/main.cpp:443
+msgid "Left left, right right."
 msgstr ""
 
-#: src/player_qt.cpp:237
-msgid "Amber/blue glasses, high-quality Dubois method"
+#: src/main.cpp:431 src/main.cpp:444
+msgid "Left left, right right, half width."
 msgstr ""
 
-#: src/player_qt.cpp:238
-msgid "Red/green glasses, monochrome method"
+#: src/main.cpp:432
+msgid "Left right, right left."
 msgstr ""
 
-#: src/player_qt.cpp:239
-msgid "Red/blue glasses, monochrome method"
+#: src/main.cpp:433
+msgid "Left right, right left, half width."
 msgstr ""
 
-#: src/player_qt.cpp:243
-msgid "Swap left/right"
+#: src/main.cpp:434 src/main.cpp:445
+msgid "Left even rows, right odd rows."
 msgstr ""
 
-#: src/player_qt.cpp:244
-msgid ""
-"Swap the left and right view. Use this if the 3D effect seems wrong."
+#: src/main.cpp:435
+msgid "Left odd rows, right even rows."
 msgstr ""
 
-#: src/player_qt.cpp:511
-msgid "Off"
+#: src/main.cpp:436
+msgid "Select output type:"
 msgstr ""
 
-#: src/player_qt.cpp:745
-msgid ""
-"This slider shows the progress during video playback, and can be used to "
-"seek in the video."
+#: src/main.cpp:437
+msgid "OpenGL quad-buffered stereo."
 msgstr ""
 
-#: src/player_qt.cpp:752
-msgid "Elapsed / total time."
+#: src/main.cpp:438
+msgid "Left and right view alternating."
 msgstr ""
 
-#: src/player_qt.cpp:762
-msgid "Play."
+#: src/main.cpp:439
+msgid "Only left."
 msgstr ""
 
-#: src/player_qt.cpp:766
-msgid "Pause."
+#: src/main.cpp:440
+msgid "Only right."
 msgstr ""
 
-#: src/player_qt.cpp:770
-msgid "Stop."
+#: src/main.cpp:446
+msgid "Left even columns, right odd columns."
 msgstr ""
 
-#: src/player_qt.cpp:775
-msgid "Toggle loop mode."
+#: src/main.cpp:447
+msgid "Left and right in checkerboard pattern."
 msgstr ""
 
-#: src/player_qt.cpp:782
-msgid ""
-"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
-"f key."
+#: src/main.cpp:448
+msgid "HDMI frame packing mode."
 msgstr ""
 
-#: src/player_qt.cpp:788
-msgid "Center the video area on your screen."
+#: src/main.cpp:449
+msgid "Red/cyan anaglyph, monochrome method."
 msgstr ""
 
-#: src/player_qt.cpp:795
-msgid "Seek backward 10 minutes."
+#: src/main.cpp:450
+msgid "Red/cyan anaglyph, half color method."
 msgstr ""
 
-#: src/player_qt.cpp:800
-msgid "Seek backward 1 minute."
+#: src/main.cpp:451
+msgid "Red/cyan anaglyph, full color method."
 msgstr ""
 
-#: src/player_qt.cpp:806
-msgid "Seek backward 10 seconds."
+#: src/main.cpp:452
+msgid "Red/cyan anaglyph, Dubois method."
 msgstr ""
 
-#: src/player_qt.cpp:812
-msgid "Seek forward 10 seconds."
+#: src/main.cpp:453
+msgid "Green/magenta anaglyph, monochrome method."
 msgstr ""
 
-#: src/player_qt.cpp:817
-msgid "Seek forward 1 minute."
+#: src/main.cpp:454
+msgid "Green/magenta anaglyph, half color method."
 msgstr ""
 
-#: src/player_qt.cpp:823
-msgid "Seek forward 10 minutes."
+#: src/main.cpp:455
+msgid "Green/magenta anaglyph, full color method."
 msgstr ""
 
-#: src/player_qt.cpp:1052
-msgid "Display Color Adjustments"
+#: src/main.cpp:456
+msgid "Green/magenta anaglyph, Dubois method."
 msgstr ""
 
-#: src/player_qt.cpp:1054
-msgid "Contrast:"
+#: src/main.cpp:457
+msgid "Amber/blue anaglyph, monochrome method."
 msgstr ""
 
-#: src/player_qt.cpp:1065
-msgid "Brightness:"
+#: src/main.cpp:458
+msgid "Amber/blue anaglyph, half color method."
 msgstr ""
 
-#: src/player_qt.cpp:1076
-msgid "Hue:"
+#: src/main.cpp:459
+msgid "Amber/blue anaglyph, full color method."
 msgstr ""
 
-#: src/player_qt.cpp:1087
-msgid "Saturation:"
+#: src/main.cpp:460
+msgid "Amber/blue anaglyph, Dubois method."
 msgstr ""
 
-#: src/player_qt.cpp:1099 src/player_qt.cpp:1290 src/player_qt.cpp:1406
-#: src/player_qt.cpp:1695 src/player_qt.cpp:1875 src/player_qt.cpp:2546
-#: src/player_qt.cpp:2742 src/player_qt.cpp:2988
-msgid "OK"
+#: src/main.cpp:461
+msgid "Red/green anaglyph, monochrome method."
 msgstr ""
 
-#: src/player_qt.cpp:1261
-msgid "Display Crosstalk Calibration"
+#: src/main.cpp:462
+msgid "Red/blue anaglyph, monochrome method."
 msgstr ""
 
-#. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/player_qt.cpp:1264
-msgid ""
-"Please read the manual to find out how to measure the crosstalk "
-"levels of your display."
+#: src/main.cpp:463
+msgid "Multi-display via Equalizer (2D setup)."
 msgstr ""
 
-#: src/player_qt.cpp:1268
-msgid "Red:"
+#: src/main.cpp:464
+msgid "Multi-display via Equalizer (3D setup)."
 msgstr ""
 
-#: src/player_qt.cpp:1275
-msgid "Green:"
+#: src/main.cpp:465
+msgid "Swap left/right view."
 msgstr ""
 
-#: src/player_qt.cpp:1282
-msgid "Blue:"
+#: src/main.cpp:466
+msgid "Fullscreen."
 msgstr ""
 
-#: src/player_qt.cpp:1348
-msgid "Subtitle Settings"
+#: src/main.cpp:467
+msgid "Use the listed screens in fullscreen mode."
 msgstr ""
 
-#: src/player_qt.cpp:1350
-msgid "These settings apply to soft subtitles, but not to bitmaps."
+#: src/main.cpp:468
+msgid "Screen numbers start with 1."
 msgstr ""
 
-#: src/player_qt.cpp:1352
-msgid "Encoding:"
+#: src/main.cpp:469
+msgid "An empty list defaults to the primary screen."
 msgstr ""
 
-#: src/player_qt.cpp:1353
-msgid "Set the subtitle character set encoding."
+#: src/main.cpp:470
+msgid "Flip left view vertically when fullscreen."
 msgstr ""
 
-#: src/player_qt.cpp:1367
-msgid "Override font:"
+#: src/main.cpp:471
+msgid "Flop left view horizontally when fullscreen."
 msgstr ""
 
-#: src/player_qt.cpp:1368
-msgid "Override the subtitle font family."
+#: src/main.cpp:472
+msgid "Flip right view vertically when fullscreen."
 msgstr ""
 
-#: src/player_qt.cpp:1376
-msgid "Override font size:"
+#: src/main.cpp:473
+msgid "Flop right view horizontally when fullscreen."
 msgstr ""
 
-#: src/player_qt.cpp:1377
-msgid "Override the subtitle font size."
+#: src/main.cpp:474
+msgid "Set zoom for wide videos (0=off to 1=full)."
 msgstr ""
 
-#: src/player_qt.cpp:1386
-msgid "Override scale factor:"
+#: src/main.cpp:475
+msgid "Crop video to given aspect ratio (0:0=off)."
 msgstr ""
 
-#: src/player_qt.cpp:1387
-msgid "Override the subtitle scale factor."
+#: src/main.cpp:476
+msgid "Center window on screen."
 msgstr ""
 
-#: src/player_qt.cpp:1397
-msgid "Override color:"
+#: src/main.cpp:477
+msgid "Set subtitle encoding."
 msgstr ""
 
-#: src/player_qt.cpp:1398
-msgid "Override the subtitle color."
+#: src/main.cpp:478
+msgid "Set subtitle font name."
 msgstr ""
 
-#: src/player_qt.cpp:1644
-msgid "Stereoscopic Video Settings"
+#: src/main.cpp:479
+msgid "Set subtitle font size."
 msgstr ""
 
-#: src/player_qt.cpp:1646
-msgid "Parallax:"
+#: src/main.cpp:480
+msgid "Set subtitle scale factor."
 msgstr ""
 
-#: src/player_qt.cpp:1647
-msgid ""
-"Adjust parallax, from -1 to +1. This changes the separation of left and "
-"right view, and thus the perceived distance of the scene."
+#: src/main.cpp:481
+msgid "Set subtitle color, in [AA]RRGGBB format."
 msgstr ""
 
-#: src/player_qt.cpp:1662
-msgid "Subtitle parallax:"
+#: src/main.cpp:482
+msgid "Subtitle parallax adjustment (-1 to +1)."
 msgstr ""
 
-#: src/player_qt.cpp:1663
-msgid ""
-"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
-"distance of the subtitles."
+#: src/main.cpp:483
+msgid "Parallax adjustment (-1 to +1)."
 msgstr ""
 
-#: src/player_qt.cpp:1678
-msgid "Ghostbusting:"
+#: src/main.cpp:484
+msgid "Crosstalk leak level (0 to 1)."
 msgstr ""
 
-#: src/player_qt.cpp:1679
-msgid ""
-"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
-"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
-"does not work with anaglyph glasses."
+#: src/main.cpp:485
+msgid "Comma-separated values for R,G,B."
 msgstr ""
 
-#: src/player_qt.cpp:1826
-msgid "Open device"
+#: src/main.cpp:486
+msgid "Amount of ghostbusting to apply (0 to 1)."
 msgstr ""
 
-#: src/player_qt.cpp:1829
-msgid "Choose a device type."
+#: src/main.cpp:487
+msgid "Benchmark mode (no audio, show fps)."
 msgstr ""
 
-#: src/player_qt.cpp:1830
-msgid "Default"
+#: src/main.cpp:488
+msgid "Frame rate divisor for display refresh rate."
 msgstr ""
 
-#: src/player_qt.cpp:1834 src/player_qt.cpp:1837
-msgid "Choose a device."
+#: src/main.cpp:489
+msgid "Default is 0 for benchmark mode, 1 otherwise."
 msgstr ""
 
-#: src/player_qt.cpp:1840
-msgid "Set the X11 device string. Refer to the manual for details."
+#: src/main.cpp:490
+msgid "Loop the input media."
 msgstr ""
 
-#: src/player_qt.cpp:1849
-msgid "Request frame size"
+#: src/main.cpp:492
+msgid "Interactive control:"
 msgstr ""
 
-#: src/player_qt.cpp:1850
-msgid ""
-"Request a specific frame size from the device, e.g. 640x480. The device "
-"must support this frame size. Some devices require a frame size to be "
-"selected."
+#: src/main.cpp:493
+msgid "Leave fullscreen mode, or quit."
 msgstr ""
 
-#: src/player_qt.cpp:1861
-msgid "Request frame rate"
+#: src/main.cpp:494
+msgid "Quit."
 msgstr ""
 
-#: src/player_qt.cpp:1862
-msgid ""
-"Request a specific frame rate from the device, e.g. 25/1. The device must "
-"support this frame rate. Some devices require a frame rate to be selected.</"
-"p>"
+#: src/main.cpp:515
+msgid "Seek according to horizontal click position."
 msgstr ""
 
-#: src/player_qt.cpp:1873 src/player_qt.cpp:2545 src/player_qt.cpp:2741
-msgid "Cancel"
+#: src/main.cpp:523
+msgid "No audio devices known."
 msgstr ""
 
-#: src/player_qt.cpp:2048
-msgid "&File"
+#: src/main.cpp:595
+msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr ""
 
-#: src/player_qt.cpp:2049
-msgid "&Open..."
+#: src/main.cpp:729
+msgid "This version of Bino was compiled without support for LIRC."
 msgstr ""
 
-#: src/player_qt.cpp:2054
-msgid "Open &URL..."
+#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
+#: src/media_data.cpp:935
+#, c-format
+msgid "%dx%d, %.3g:1"
 msgstr ""
 
-#: src/player_qt.cpp:2058
-msgid "Open &device..."
+#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
+#: src/media_data.cpp:1066
+#, c-format
+msgid "%s, %d ch., %g kHz, %d bit"
 msgstr ""
 
-#: src/player_qt.cpp:2063
-msgid "&Quit..."
+#: src/media_input.cpp:282
+#, c-format
+msgid "Video %s: %s"
 msgstr ""
 
-#: src/player_qt.cpp:2069
-msgid "&Preferences"
+#: src/media_input.cpp:287
+msgid "No video."
 msgstr ""
 
-#: src/player_qt.cpp:2072
-msgid "&Fullscreen Settings..."
+#: src/media_input.cpp:293
+#, c-format
+msgid "Audio %s: %s"
 msgstr ""
 
-#: src/player_qt.cpp:2075
-msgid "Display &Color Adjustments..."
+#: src/media_input.cpp:298
+msgid "No audio."
 msgstr ""
 
-#: src/player_qt.cpp:2078
-msgid "Display Cross&talk Calibration..."
+#: src/media_input.cpp:304
+#, c-format
+msgid "Subtitle %s: %s"
 msgstr ""
 
-#: src/player_qt.cpp:2082
-msgid "&Subtitle Settings..."
+#: src/media_input.cpp:309
+msgid "No subtitle."
 msgstr ""
 
-#: src/player_qt.cpp:2086
-msgid "Stereoscopic Video Settings..."
+#: src/media_input.cpp:311
+#, c-format
+msgid "Duration: %g seconds"
 msgstr ""
 
-#: src/player_qt.cpp:2089
-msgid "&Help"
+#: src/media_input.cpp:314
+#, c-format
+msgid "Stereo layout: %s"
 msgstr ""
 
-#: src/player_qt.cpp:2090
-msgid "&Manual..."
+#: src/media_object.cpp:677
+#, c-format
+msgid "%s video stream %d: Unsupported stereo layout %s."
 msgstr ""
 
-#: src/player_qt.cpp:2095
-msgid "&Website..."
+#: src/media_object.cpp:715
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with %d channels."
 msgstr ""
 
-#: src/player_qt.cpp:2099
-msgid "&Keyboard Shortcuts"
+#: src/media_object.cpp:744
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with sample format %s."
 msgstr ""
 
-#: src/player_qt.cpp:2103
-msgid "&About"
+#: src/media_object.cpp:800
+#, c-format
+msgid "No support available for %s device."
 msgstr ""
 
-#: src/player_qt.cpp:2169 src/player_qt.cpp:2891 src/player_qt.cpp:2899
-#: src/video_output_qt.cpp:92 src/video_output_qt.cpp:400
-#: src/video_output_qt.cpp:422
-msgid "Error"
+#: src/media_object.cpp:803
+msgid "default"
 msgstr ""
 
-#: src/player_qt.cpp:2528
-msgid "Open files"
+#: src/media_object.cpp:832
+#, c-format
+msgid "%s: Cannot read stream info: %s"
 msgstr ""
 
-#: src/player_qt.cpp:2541
-msgid "Open URL"
+#: src/media_object.cpp:876
+#, c-format
+msgid "%s stream %d: Cannot open %s: %s"
 msgstr ""
 
-#: src/player_qt.cpp:2542
-msgid "URL:"
+#: src/media_object.cpp:877
+msgid "video codec"
 msgstr ""
 
-#: src/player_qt.cpp:2689
-msgid "Fullscreen/Multiscreen Settings"
+#: src/media_object.cpp:878
+msgid "audio codec"
 msgstr ""
 
-#: src/player_qt.cpp:2691
-msgid "Configure fullscreen mode:"
+#: src/media_object.cpp:879
+msgid "subtitle codec"
 msgstr ""
 
-#: src/player_qt.cpp:2692
-msgid "Select the screens to use in fullscreen mode."
+#: src/media_object.cpp:880
+msgid "data"
 msgstr ""
 
-#: src/player_qt.cpp:2694
-msgid "Single screen:"
+#: src/media_object.cpp:881
+msgid "codec not supported"
 msgstr ""
 
-#: src/player_qt.cpp:2695
-msgid "Use a single screen for fullscreen mode."
+#: src/media_object.cpp:891
+#, c-format
+msgid "%s video stream %d: Invalid frame size."
 msgstr ""
 
-#: src/player_qt.cpp:2698
-msgid "Primary screen"
+#: src/media_object.cpp:935
+#, c-format
+msgid "%s video stream %d: Cannot initialize conversion context."
 msgstr ""
 
-#: src/player_qt.cpp:2703 src/player_qt.cpp:2717 src/player_qt.cpp:2718
+#: src/media_object.cpp:998
 #, c-format
-msgid "Screen %d"
+msgid "Video stream %d: %s / %s, %g seconds"
 msgstr ""
 
-#: src/player_qt.cpp:2707
-msgid "Dual screen:"
+#: src/media_object.cpp:1002
+#, c-format
+msgid "Using up to %d threads for decoding."
 msgstr ""
 
-#: src/player_qt.cpp:2708
-msgid "Use two screens for fullscreen mode."
+#: src/media_object.cpp:1007
+#, c-format
+msgid "Audio stream %d: %s / %s, %g seconds"
 msgstr ""
 
-#: src/player_qt.cpp:2722
-msgid "Multi screen:"
+#: src/media_object.cpp:1014
+#, c-format
+msgid "Subtitle stream %d: %s / %s, %g seconds"
 msgstr ""
 
-#: src/player_qt.cpp:2723
-msgid "Use multiple screens for fullscreen mode."
+#: src/media_object.cpp:1021
+msgid "No usable streams."
 msgstr ""
 
-#: src/player_qt.cpp:2725
-msgid "Comma-separated list of screens to use for fullscreen mode."
+#: src/media_object.cpp:1302 src/media_object.cpp:1332
+#: src/media_object.cpp:1362
+#, c-format
+msgid "%s: Cannot duplicate packet."
 msgstr ""
 
-#: src/player_qt.cpp:2729
-msgid "When in fullscreen mode,"
+#: src/media_object.cpp:1456
+#, c-format
+msgid "%s video stream %d: Dropping %dx%d frame"
 msgstr ""
 
-#: src/player_qt.cpp:2730
-msgid "Set special left/right view handling for fullscreen mode."
+#: src/media_object.cpp:1919
+#, c-format
+msgid "%s: Seeking failed."
 msgstr ""
 
-#: src/player_qt.cpp:2732
-msgid "flip left view vertically."
+#: src/player.cpp:434
+#, c-format
+msgid "Video: delay %g seconds/%g frames; dropping next frame."
 msgstr ""
 
-#: src/player_qt.cpp:2734
-msgid "flop left view horizontally."
+#: src/player.cpp:450
+#, c-format
+msgid "FPS: %.2f"
 msgstr ""
 
-#: src/player_qt.cpp:2736
-msgid "flip right view vertically."
+#: src/player_equalizer.cpp:116
+msgid "Reading input frame failed."
 msgstr ""
 
-#: src/player_qt.cpp:2738
-msgid "flop right view horizontally."
+#: src/player_equalizer.cpp:165 src/video_output_qt.cpp:590
+#: src/video_output_qt.cpp:597
+msgid "Waiting for subtitle renderer initialization..."
 msgstr ""
 
-#: src/player_qt.cpp:2891
-msgid "Cannot open manual."
+#: src/player_equalizer.cpp:250
+msgid "Init data mapping failed."
 msgstr ""
 
-#: src/player_qt.cpp:2899
-msgid "Cannot open website."
+#: src/player_equalizer.cpp:251
+msgid "Frame data mapping failed."
 msgstr ""
 
-#: src/player_qt.cpp:2905
-msgid "Keyboard Shortcuts"
+#: src/player_equalizer.cpp:252
+msgid "Video player initialization failed."
 msgstr ""
 
-#. TRANSLATORS: This is a HTML table, shown under Help->Keyboard Shortcuts.
-#. Please make sure that your translation formats properly.
-#: src/player_qt.cpp:2908
-msgid ""
-"Keyboard control: <table><tr><td>q or ESC</td><td>Stop</td></"
-"tr><tr><td>p or SPACE</td><td>Pause / unpause</td></tr><tr><td>f</"
-"td><td>Toggle fullscreen</td></tr><tr><td>c</td><td>Center window</td></"
-"tr><tr><td>e</td><td>Swap left/right eye</td></tr><tr><td>v</td><td>Cycle "
-"through available video streams</td></tr><tr><td>a</td><td>Cycle through "
-"available audio streams</td></tr><tr><td>s</td><td>Cycle through available "
-"subtitle streams</td></tr><tr><td>1, 2</td><td>Adjust contrast</td></"
-"tr><tr><td>3, 4</td><td>Adjust brightness</td></tr><tr><td>5, 6</"
-"td><td>Adjust hue</td></tr><tr><td>7, 8</td><td>Adjust saturation</td></"
-"tr><tr><td>&lt;, &gt;</td><td>Adjust parallax</td></tr><tr><td>(, )</"
-"td><td>Adjust ghostbusting</td></tr><tr><td>left, right</td><td>Seek 10 "
-"seconds backward / forward</td></tr><tr><td>up, down</td><td>Seek 1 minute "
-"backward / forward</td></tr><tr><td>page up, page down</td><td>Seek 10 "
-"minutes backward / forward</td></tr></table>"
-msgstr ""
-
-#: src/player_qt.cpp:2935
-#, c-format
-msgid "About %s"
+#: src/player_equalizer.cpp:253
+msgid "Need at least OpenGL 2.1."
 msgstr ""
 
-#: src/player_qt.cpp:2941
-#, c-format
-msgid "The %s 3D video player"
+#: src/player_equalizer.cpp:430
+msgid "No canvas in Equalizer configuration."
 msgstr ""
 
-#: src/player_qt.cpp:2946
+#: src/player_equalizer.cpp:437
 #, c-format
-msgid ""
-"%s version %s.Copyright (C) 2011 the Bino developers.This "
-"is free software. You may redistribute copies of it under the terms of the "
-"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
-"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
-"\"%s\">%s</a> for more information on this software."
+msgid "Equalizer canvas: %gx%g, aspect ratio %g:1"
 msgstr ""
 
-#: src/player_qt.cpp:2983
-msgid "About"
+#: src/player_equalizer.cpp:922 src/video_output_qt.cpp:560
+msgid ""
+"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
+"objects."
 msgstr ""
 
-#: src/player_qt.cpp:2984
-msgid "Libraries"
+#: src/player_equalizer.cpp:1105
+msgid "Equalizer initialization failed."
 msgstr ""
 
-#: src/player_qt.cpp:2985
-msgid "Team"
+#: src/player_equalizer.cpp:1113
+msgid "Cannot get equalizer configuration."
 msgstr ""
 
-#: src/player_qt.cpp:2986
-msgid "License"
+#: src/player_equalizer.cpp:1127
+msgid "Equalizer configuration initialization failed."
 msgstr ""
 
 #: src/subtitle_renderer.cpp:223
@@ -1311,77 +1734,72 @@
 msgid "Subtitle character set conversion failed: %s"
 msgstr ""
 
-#: src/video_output.cpp:363 src/video_output.cpp:473
-msgid "Cannot create a PBO buffer."
-msgstr ""
-
-#: src/video_output_qt.cpp:313
+#: src/video_output.cpp:145
 #, c-format
-msgid "Cannot initialize GLEW: %s"
+msgid "OpenGL error 0x%04X."
 msgstr ""
 
-#: src/video_output_qt.cpp:343
-msgid "Please wait"
+#: src/video_output.cpp:203
+#, c-format
+msgid "OpenGL %s '%s': compiler warning:"
 msgstr ""
 
-#: src/video_output_qt.cpp:400 src/video_output_qt.cpp:417
-msgid "Cannot set OpenGL context format."
+#: src/video_output.cpp:204 src/video_output.cpp:209
+msgid "vertex shader"
 msgstr ""
 
-#: src/video_output_qt.cpp:412
-msgid "The display does not support OpenGL stereo mode."
+#: src/video_output.cpp:204 src/video_output.cpp:209
+msgid "fragment shader"
 msgstr ""
 
-#: src/video_output_qt.cpp:505
-msgid "Cannot suspend screensaver."
+#: src/video_output.cpp:208
+#, c-format
+msgid "OpenGL %s '%s': compilation failed."
 msgstr ""
 
-#: src/video_output_qt.cpp:520
-msgid "Cannot resume screensaver."
+#: src/video_output.cpp:211 src/video_output.cpp:288
+msgid "unknown error"
 msgstr ""
 
-#: src/xgl.cpp:200
+#: src/video_output.cpp:284
 #, c-format
-msgid "OpenGL FBO error %s."
+msgid "OpenGL program '%s': linker warning:"
 msgstr ""
 
-#: src/xgl.cpp:217
+#: src/video_output.cpp:287
 #, c-format
-msgid "OpenGL error 0x%04X."
+msgid "OpenGL program '%s': linking failed."
 msgstr ""
 
-#: src/xgl.cpp:282
-#, c-format
-msgid "OpenGL %s '%s': compiler warning:"
+#: src/video_output.cpp:563 src/video_output.cpp:675
+msgid "Cannot create a PBO buffer."
 msgstr ""
 
-#: src/xgl.cpp:283 src/xgl.cpp:292
-msgid "vertex shader"
+#: src/video_output_qt.cpp:555
+#, c-format
+msgid "Cannot initialize GLEW: %s"
 msgstr ""
 
-#: src/xgl.cpp:284 src/xgl.cpp:293
-msgid "geometry shader"
+#: src/video_output_qt.cpp:588
+msgid "Please wait"
 msgstr ""
 
-#: src/xgl.cpp:285 src/xgl.cpp:294
-msgid "fragment shader"
+#: src/video_output_qt.cpp:643
+msgid "Cannot get valid OpenGL context."
 msgstr ""
 
-#: src/xgl.cpp:291
-#, c-format
-msgid "OpenGL %s '%s': compilation failed."
+#: src/video_output_qt.cpp:654
+msgid "The display does not support OpenGL stereo mode."
 msgstr ""
 
-#: src/xgl.cpp:296 src/xgl.cpp:363
-msgid "unknown error"
+#: src/video_output_qt.cpp:659
+msgid "Cannot set OpenGL context format."
 msgstr ""
 
-#: src/xgl.cpp:357
-#, c-format
-msgid "OpenGL program '%s': linker warning:"
+#: src/video_output_qt.cpp:752
+msgid "Cannot suspend screensaver."
 msgstr ""
 
-#: src/xgl.cpp:362
-#, c-format
-msgid "OpenGL program '%s': linking failed."
+#: src/video_output_qt.cpp:767
+msgid "Cannot resume screensaver."
 msgstr ""

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

bino-1.2.1.tar.bz2/po/cs.po -> bino-1.3.2.tar.xz/po/cs.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2011-10-10 21:25+0200\n"
+"POT-Creation-Date: 2012-03-16 19:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Joe <cuchac@email.cz>\n"
 "Language-Team: none\n"
@@ -18,1439 +18,1812 @@
 "X-Language: cs_CZ\n"
 "X-Source-Language: C\n"
 
-#: src/base/dbg.cpp:50
+#: 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:57
+#: 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:145
+#: src/base/dbg.cpp:221
 #, c-format
 msgid "Report bugs to <%s>."
 msgstr "Chyby hlaste na <%s>."
 
-#: src/base/exc.cpp:54 src/base/exc.cpp:72 src/base/exc.cpp:106
+#: 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:151
+#: src/base/opt.cpp:168
 #, c-format
 msgid "Invalid option %s."
 msgstr "Neplatná operace %s."
 
-#: src/base/opt.cpp:155
+#: 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:160
+#: src/base/opt.cpp:177
 #, c-format
 msgid "Invalid option -%c."
 msgstr "Neplatná volba -%c."
 
-#: src/base/opt.cpp:169
+#: src/base/opt.cpp:186
 #, c-format
 msgid "Option --%s requires an argument."
 msgstr "Volba --%s vyžaduje argument."
 
-#: src/base/opt.cpp:174
+#: src/base/opt.cpp:191
 #, c-format
 msgid "Option -%c requires an argument."
 msgstr "Volba -%c vyžaduje argument."
 
-#: src/base/opt.cpp:195
+#: src/base/opt.cpp:212
 #, c-format
 msgid "Invalid argument for -%c."
 msgstr "Neplatný argument pro -%c."
 
-#: src/base/opt.cpp:199
+#: src/base/opt.cpp:216
 #, c-format
 msgid "Invalid argument for --%s."
 msgstr "Neplatný argument pro --%s."
 
-#: src/base/opt.cpp:218
+#: src/base/opt.cpp:239
 #, c-format
 msgid "Option --%s (-%c) is mandatory."
 msgstr "Volba --%s (-%c) je povinná."
 
-#: src/base/opt.cpp:222
+#: src/base/opt.cpp:243
 #, c-format
 msgid "Option --%s is mandatory."
 msgstr "Volba --%s je povinná."
 
-#: src/base/opt.cpp:236
+#: src/base/opt.cpp:257
 msgid "Too few arguments."
 msgstr "Příliš málo parametrů."
 
-#: src/base/opt.cpp:241
+#: src/base/opt.cpp:262
 msgid "Too many arguments."
 msgstr "Příliš mnoho parametrů."
 
-#: src/base/str.cpp:226
+#: src/base/str.cpp:236
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Nelze převést text do %s."
 
-#: src/base/str.cpp:411 src/base/str.cpp:429 src/base/str.cpp:439
-#: src/base/str.cpp:450
+#: src/base/str.cpp:455 src/base/str.cpp:473 src/base/str.cpp:483
+#: src/base/str.cpp:494 src/base/str.cpp:499
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Nelze převést %s to %s."
 
-#: src/base/thread.cpp:40 src/base/thread.cpp:51
-#, c-format
-msgid "Cannot initialize mutex: %s"
-msgstr "Nelze inicializovat mutex: %s"
-
-#: src/base/thread.cpp:65
-#, c-format
-msgid "Cannot lock mutex: %s"
-msgstr "Nelze zavřít mutex: %s"
-
-#: src/base/thread.cpp:79
-#, c-format
-msgid "Cannot unlock mutex: %s"
-msgstr "Nelze otevřít mutex: %s"
-
-#: src/base/thread.cpp:145
-#, c-format
-msgid "Cannot create thread: %s"
-msgstr "Nelze vytvořit vlákno: %s"
-
-#: src/base/thread.cpp:160
-#, c-format
-msgid "Cannot join with thread: %s"
-msgstr "Nelze se spojit s vláknem: %s"
-
-#: src/base/thread.cpp:182
-#, c-format
-msgid "Cannot cancel thread: %s"
-msgstr "Nelze zrušit vlákno: %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
+msgid "System function failed: "
+msgstr ""
 
-#: src/base/timer.cpp:69 src/base/timer.cpp:81 src/base/timer.cpp:95
+#: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
 msgid "Cannot get time."
 msgstr "Nelze získat aktuální čas."
 
-#: src/audio_output.cpp:61
+#: src/audio_output.cpp:88
 msgid "No OpenAL device available."
 msgstr "Není k dispozici žádné OpenAL zařízení."
 
-#: src/audio_output.cpp:66
+#: src/audio_output.cpp:93 src/audio_output.cpp:99
+#, fuzzy, c-format
+msgid "OpenAL device '%s' is not available."
+msgstr "Není k dispozici žádné OpenAL zařízení."
+
+#: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
+#: src/media_data.cpp:1067 src/media_data.cpp:1090 src/media_data.cpp:1128
+#: src/media_data.cpp:1133
+msgid "unknown"
+msgstr "neznámá"
+
+#: src/audio_output.cpp:106
 msgid "No OpenAL context available."
 msgstr "Není k dispozici žádný OpenAL kontext."
 
-#: src/audio_output.cpp:77
+#: src/audio_output.cpp:117
 msgid "Cannot create OpenAL buffers."
 msgstr "Nelze vytvořit OpenAL buffer."
 
-#: src/audio_output.cpp:86
+#: src/audio_output.cpp:126
 msgid "Cannot create OpenAL source."
 msgstr "Nelze vytvořit OpenAL zdroj."
 
-#: src/audio_output.cpp:99
+#: src/audio_output.cpp:139
 msgid "Cannot set OpenAL source parameters."
 msgstr "Nelze nastavit parametry OpenAL."
 
-#: src/audio_output.cpp:153
+#: src/audio_output.cpp:193
 msgid "Cannot check OpenAL source state."
 msgstr "Nelze ověřit stav OpenAL zdroje."
 
-#: src/audio_output.cpp:160
+#: src/audio_output.cpp:200
 msgid "Cannot restart OpenAL source playback."
 msgstr "Nelze znovu spustit přehrávání OpeanAL zdroje."
 
-#: src/audio_output.cpp:313
+#: src/audio_output.cpp:353
 #, 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:340
+#: src/audio_output.cpp:369
+#, fuzzy
+msgid "Cannot set OpenAL audio volume."
+msgstr "Nelze vytvořit OpenAL zdroj."
+
+#: src/audio_output.cpp:395
 msgid "Cannot buffer initial OpenAL data."
 msgstr "Nelze načíst počáteční data OpenAL."
 
-#: src/audio_output.cpp:354
+#: src/audio_output.cpp:409
 msgid "Cannot buffer OpenAL data."
 msgstr "Nelze načíst OpenAL data."
 
-#: src/audio_output.cpp:379
+#: src/audio_output.cpp:434
 msgid "Cannot start OpenAL source playback."
 msgstr "Nelze začít přehrávat OpeanAL zdroj."
 
-#: src/audio_output.cpp:393
+#: src/audio_output.cpp:448
 msgid "Cannot pause OpenAL source playback."
 msgstr "Nelze přerušit přehrávání OpeanAL zdroje."
 
-#: src/audio_output.cpp:402
+#: src/audio_output.cpp:457
 msgid "Cannot unpause OpenAL source playback."
 msgstr "Nelze pokračovat v přehrávání OpeanAL zdroje."
 
-#: src/audio_output.cpp:411
+#: src/audio_output.cpp:466
 msgid "Cannot stop OpenAL source playback."
 msgstr "Nelze zastavit přehrávání OpeanAL zdroje."
 
-#: src/audio_output.cpp:422
+#: src/audio_output.cpp:477
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Nelze odpojit buffery OpeanAL zdroje."
 
-#: src/lib_versions.cpp:121 src/lib_versions.cpp:158 src/media_data.cpp:422
-#: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
-msgid "unknown"
-msgstr "neznámá"
-
-#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
-msgid "not used"
-msgstr "nevyužívá se"
+#: src/dispatch.cpp:156
+msgid "Cannot connect to X server."
+msgstr "Nelze se připojit k X serveru."
 
-#: src/lirc.cpp:63
-msgid "Cannot initialize LIRC."
-msgstr "Nemohu inicializovat LIRC."
+#: src/dispatch.cpp:171
+msgid "No video to play."
+msgstr "Nenalezeno žádné video."
 
-#: src/lirc.cpp:69
-msgid "Cannot set LIRC socket properties."
-msgstr "Nelze nastavit parametry LIRC socketu."
+#: src/dispatch.cpp:411 src/player_equalizer.cpp:84
+msgid "No video streams found."
+msgstr "Nebyly nalezeny žádné video stopy."
 
-#: src/lirc.cpp:76
-msgid "Cannot read LIRC default configuration."
-msgstr "Nelze získat výchozí nastavení LIRC."
+#: src/dispatch.cpp:428
+msgid "Cannot set requested stereo layout: incompatible media."
+msgstr "Nemohu nastavit požadovaný stereo formát: nekompatibilní vstup."
 
-#: src/lirc.cpp:91
+#: src/dispatch.cpp:443
 #, c-format
-msgid "Cannot read LIRC configuration file %s."
-msgstr "Nelze přečíst LIRC konfigurační soubor %s."
+msgid "Video stream %d not found."
+msgstr "Video stopa %d nebyla nalezena."
 
-#: src/lirc.cpp:140
-msgid "Cannot get LIRC event; disabling LIRC support."
-msgstr "Nelze získat událost z LIRC; vypínám podporu LIRC."
+#: src/dispatch.cpp:449
+#, c-format
+msgid "Audio stream %d not found."
+msgstr "Zvuková stopa %d nebyla nalezena."
 
-#: src/lirc.cpp:154
+#: src/dispatch.cpp:457
 #, c-format
-msgid "Received invalid command '%s' from LIRC."
-msgstr "Obdržen neplatný příkaz '%s' z LIRC."
+msgid "Subtitle stream %d not found."
+msgstr "Stopa titulků %d nebyla nalezena."
 
-#: src/lirc.cpp:164
-msgid "Cannot get command for LIRC code."
-msgstr "Nelze získat příkaz pro daný LIRC kód."
+#: src/dispatch.cpp:529 src/main.cpp:736
+msgid "This version of Bino was compiled without support for Equalizer."
+msgstr "Tato verze Bina byla zkompilována bez podpory knihovny Equalizer."
 
-#: src/main.cpp:325
-#, c-format
-msgid "%s version %s"
-msgstr "%s verze %s"
+#: src/gui.cpp:101
+msgid "Video:"
+msgstr "Video:"
 
-#: src/main.cpp:326
-msgid "Copyright (C) 2011 the Bino developers."
-msgstr "Copyright (C) 2011 Bino vývojáři."
+#: src/gui.cpp:102
+msgid "Select the video stream."
+msgstr "Vyber video stopu."
 
-#: src/main.cpp:327
-msgid ""
-"This is free software. You may redistribute copies of it under the terms of "
-"the GNU General Public License. There is NO WARRANTY, to the extent "
-"permitted by law."
-msgstr ""
-"Tento program je svobodný software. Můžete jej šířit a modifikovat podle "
-"ustanovení GNU General Public License.Tento program je rozšiřován v naději, "
-"že bude užitečný, avšak BEZ JAKÉKOLI ZÁRUKY; neposkytují se ani odvozené "
-"záruky PRODEJNOSTI anebo VHODNOSTI PRO URČITÝ ÚČEL."
+#: src/gui.cpp:108
+msgid "Audio:"
+msgstr "Zvuk:"
 
-#: src/main.cpp:330 src/player_qt.cpp:2958
-msgid "Platform:"
-msgstr "Platforma:"
+#: src/gui.cpp:109
+msgid "Select the audio stream."
+msgstr "Vyber zvukovou stopu."
 
-#: src/main.cpp:332 src/player_qt.cpp:2959
-msgid "Libraries used:"
-msgstr "Použité knihovny:"
+#: src/gui.cpp:115
+msgid "Subtitle:"
+msgstr "Titulky:"
 
-#. TRANSLATORS: This is the --help text. Translate only the description,
-#. not the option names. Please keep a proper indentation with spaces, and
-#. keep the line length limited.
-#: src/main.cpp:344
-#, c-format
-msgid ""
-"Usage:\n"
-" %s [option...] [file...]\n"
-"\n"
-"Options:\n"
-" --help Print help.\n"
-" --version Print version.\n"
-" -n|--no-gui Do not use the GUI, just show a plain window.\n"
-" -L|--log-level=LEVEL Set log level (debug/info/warning/error/quiet).\n"
-" --device-type=TYPE Type of input device: default, firewire, x11.\n"
-" --device-frame-size=WxH Request frame size WxH from input device.\n"
-" --device-frame-rate=N/D Request frame rate N/D from input device.\n"
-" --lirc-config=FILE Use the given LIRC configuration file. This\n"
-" option can be used more than once.\n"
-" -v|--video=STREAM Select video stream (1-n, depending on input).\n"
-" -a|--audio=STREAM Select audio stream (1-n, depending on input).\n"
-" -s|--subtitle=STREAM Select subtitle stream (0-n, dep. on input).\n"
-" -i|--input=TYPE Select input type (default autodetect):\n"
-" mono Single view.\n"
-" separate-left-right Left/right separate streams, left first.\n"
-" separate-right-left Left/right separate streams, right first.\n"
-" top-bottom Left top, right bottom.\n"
-" top-bottom-half Left top, right bottom, half height.\n"
-" bottom-top Left bottom, right top.\n"
-" bottom-top-half Left bottom, right top, half height.\n"
-" left-right Left left, right right.\n"
-" left-right-half Left left, right right, half width.\n"
-" right-left Left right, right left.\n"
-" right-left-half Left right, right left, half width.\n"
-" even-odd-rows Left even rows, right odd rows.\n"
-" odd-even-rows Left odd rows, right even rows.\n"
-" -o|--output=TYPE Select output type:\n"
-" mono-left Only left.\n"
-" mono-right Only right.\n"
-" top-bottom Left top, right bottom.\n"
-" top-bottom-half Left top, right bottom, half height.\n"
-" left-right Left left, right right.\n"
-" left-right-half Left left, right right, half width.\n"
-" even-odd-rows Left even rows, right odd rows.\n"
-" even-odd-columns Left even columns, right odd columns.\n"
-" checkerboard Left and right in checkerboard pattern.\n"
-" hdmi-frame-pack HDMI frame packing mode.\n"
-" red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
-" red-cyan-half-color Red/cyan anaglyph, half color method.\n"
-" red-cyan-full-color Red/cyan anaglyph, full color method.\n"
-" red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
-" green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
-" green-magenta-half-color Green/magenta anaglyph, half color method.\n"
-" green-magenta-full-color Green/magenta anaglyph, full color method.\n"
-" green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
-" amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
-" amber-blue-half-color Amber/blue anaglyph, half color method.\n"
-" amber-blue-full-color Amber/blue anaglyph, full color method.\n"
-" amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
-" red-green-monochrome Red/green anaglyph, monochrome method.\n"
-" red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
-" stereo OpenGL quad-buffered stereo.\n"
-" equalizer Multi-display via Equalizer (2D setup).\n"
-" equalizer-3d Multi-display via Equalizer (3D setup).\n"
-" -S|--swap-eyes Swap left/right view.\n"
-" -f|--fullscreen Fullscreen.\n"
-" --fullscreen-screens= Use the listed screens in fullscreen mode.\n"
-" [S0[,S1[,...]]] Screen numbers start with 1. The default\n"
-" (empty list) is to use the primary screen.\n"
-" --fullscreen-flip-left Flip left view vertically when fullscreen.\n"
-" --fullscreen-flop-left Flop left view horizontally when fullscreen.\n"
-" --fullscreen-flip-right Flip right view vertically when fullscreen.\n"
-" --fullscreen-flop-right Flop right view horizontally when fullscreen.\n"
-" -c|--center Center window on screen.\n"
-" --subtitle-encoding=ENC Set subtitle encoding.\n"
-" --subtitle-font=FONT Set subtitle font name.\n"
-" --subtitle-size=N Set subtitle font size.\n"
-" --subtitle-scale=S Set subtitle scale factor.\n"
-" --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
-" --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
-" -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
-" -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-separated\n"
-" values for the R,G,B channels.\n"
-" -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
-" -b|--benchmark Benchmark mode (no audio, show fps).\n"
-" -l|--loop Loop the input media.\n"
-"\n"
-"Interactive control:\n"
-" ESC Leave fullscreen mode, or quit.\n"
-" q Quit.\n"
-" p or SPACE Pause / unpause.\n"
-" f Toggle fullscreen.\n"
-" c Center window.\n"
-" e Swap left/right eye.\n"
-" v Cycle through available video streams.\n"
-" a Cycle through available audio streams.\n"
-" s Cycle through available subtitle streams.\n"
-" 1, 2 Adjust contrast.\n"
-" 3, 4 Adjust brightness.\n"
-" 5, 6 Adjust hue.\n"
-" 7, 8 Adjust saturation.\n"
-" <, > Adjust parallax.\n"
-" (, ) Adjust ghostbusting.\n"
-" left, right Seek 10 seconds backward / forward.\n"
-" up, down Seek 1 minute backward / forward.\n"
-" page up, page down Seek 10 minutes backward / forward.\n"
-" Mouse click Seek according to horizontal click position."
-msgstr ""
-"Použití:\n"
-" %s [volba...] [soubor...]\n"
-"\n"
-"Options:\n"
-" --help Vytiskni nápovědu.\n"
-" --version Vytiskni verzi.\n"
-" -n|--no-gui Nepoužívej grafické rozhraní, pouze zobraz holé "
-"okno.\n"
-" -L|--log-level=LEVEL Co se bude logovat (debug/info/warning/error/"
-"quiet).\n"
-" --device-type=TYPE Typ vstupního zařízení: default, firewire, x11.\n"
-" --device-frame-size=WxH Požadovaná velikost snímku SÍRKAxVÝSKA ze "
-"vstupního zařízení.\n"
-" --device-frame-rate=N/D Požadovaná obnovovací frekvence CITATEL/"
-"JMENOVATEL ze vstupního zařízení.\n"
-" --lirc-config=FILE Použij daný LIRC konfigurační soubor. Tato\n"
-" volba může být použita vícekrát.\n"
-" -v|--video=STREAM Vyber video stopu(1-n, záleží na vstupu).\n"
-" -a|--audio=STREAM Vyber zvukovou stopu (1-n, záleží na vstupu).\n"
-" -s|--subtitle=STREAM Vyber stopu titulků (0-n, záleží na vstupu).\n"
-" -i|--input=TYPE Vyber vstupní formát (výchozí je automatická "
-"detekce):\n"
-" mono Jeden obraz.\n"
-" separate-left-right Oddělená levá/pravá stopa, levá první.\n"
-" separate-right-left Oddělená levá/pravá stopa, pravá první.\n"
-" top-bottom Levá nahoře, pravá dole.\n"
-" top-bottom-half Levá nahoře, pravá dole, poloviční výška.\n"
-" bottom-top Left dole, pravá nahoře.\n"
-" bottom-top-half Left dole, pravá nahoře, poloviční výška.\n"
-" left-right Levá nalevo, pravá napravo.\n"
-" left-right-half Levá nalevo, pravá napravo, poloviční šířka.\n"
-" right-left Levá napravo, pravá nalevo.\n"
-" right-left-half Levá napravo, pravá nalevo, poloviční šířka.\n"
-" even-odd-rows Levá sudé řádky, pravá liché.\n"
-" odd-even-rows Levá liché řádky, pravá sudé.\n"
-" -o|--output=TYPE Vyber výstupní formát:\n"
-" mono-left Pouze levá.\n"
-" mono-right Pouze pravá.\n"
-" top-bottom Levá nahoře, pravá dole.\n"
-" top-bottom-half Levá nahoře, pravá dole, poloviční výška.\n"
-" left-right Levá nalevo, pravá napravo.\n"
-" left-right-half Levá nalevo, pravá napravo, poloviční šířka.\n"
-" even-odd-rows Levá sudé řádky, pravá liché.\n"
-" even-odd-columns Levá sudé sloupce, pravá liché.\n"
-" checkerboard Levý a pravý v šachovnici.\n"
-" hdmi-frame-pack HDMI režim.\n"
-" red-cyan-monochrome Červená/modrá anaglyf, stupně šedi.\n"
-" red-cyan-half-color Červená/modrá anaglyf, polotóny.\n"
-" red-cyan-full-color Červená/modrá anaglyf, plné tóny.\n"
-" red-cyan-dubois Červená/modrá anaglyf, Dubois.\n"
-" green-magenta-monochrome Zelená/fialová anaglyf, stupně šedi.\n"
-" green-magenta-half-color Zelená/fialová anaglyf, polotóny.\n"
-" green-magenta-full-color Zelená/fialová anaglyf, plné tóny.\n"
-" green-magenta-dubois Zelená/fialová anaglyf, Dubois.\n"
-" amber-blue-monochrome Žlutá/modrá anaglyf, stupně šedi.\n"
-" amber-blue-half-color Žlutá/modrá anaglyf, polotóny.\n"
-" amber-blue-full-color Žlutá/modrá anaglyf, plné tóny.\n"
-" amber-blue-dubois Žlutá/modrá anaglyf, Dubois.\n"
-" red-green-monochrome Červená/zelená anaglyf, stupně šedi.\n"
-" red-blue-monochrome Červená/modrá anaglyf, stupně šedi.\n"
-" stereo OpenGL quad-buffered stereo.\n"
-" equalizer Více monitorů použitím Equalizer (2D scéna).\n"
-" equalizer-3d Více monitorů použitím Equalizer (3D scéna).\n"
-" -S|--swap-eyes Prohoď levou/pravou.\n"
-" -f|--fullscreen Celá obrazovka.\n"
-" --fullscreen-screens= Použij vyjmenované obrazovky v celoobrazovkovém "
-"režimu.\n"
-" [S0[,S1[,...]]] Císla obrazovek začínají číslem 1. Výchozí\n"
-" (prázdný seznam) znamená použít primární "
-"obrazovku.\n"
-" --fullscreen-flip-left Překlop levý obraz vertikálně.\n"
-" --fullscreen-flop-left Překlop levý obraz horizontálně.\n"
-" --fullscreen-flip-right Překlop pravý obraz vertikálně.\n"
-" --fullscreen-flop-right Překlop pravýobraz horizontálně.\n"
-" -c|--center Vycentruj okno na středu monitoru.\n"
-" --subtitle-encoding=ENC Nastav kódování titulků.\n"
-" --subtitle-font=FONT Nastav písmo titulků.\n"
-" --subtitle-size=N Nastav velikost titulků.\n"
-" --subtitle-scale=S Nastav škálovací poměr titulků.\n"
-" --subtitle-color=COLOR Nastav barvu titulků, ve formátu [AA]RRGGBB.\n"
-" --subtitle-parallax=VAL Nastav parallax titulků (-1 až +1).\n"
-" -P|--parallax=VAL Nastv parallax (-1 až +1).\n"
-" -C|--crosstalk=VAL Crosstalk (0 až 1); oddělený středníky\n"
-" hodnoty pro kanály R,G,B.\n"
-" -G|--ghostbust=VAL Ghostbusting (0 to 1).\n"
-" -b|--benchmark Test výkonu (bez zvuk, zobrazuje fps).\n"
-" -l|--loop Přehrávej vstupní soubor ve smýčce.\n"
-"\n"
-"Interaktivní ovládání:\n"
-" ESC Opustit celoobrazovkový režim, nebo ukončit.\n"
-" q Ukončit.\n"
-" p nebo MEZERA Pozastav / pokračuj.\n"
-" f Přepni na celou obrazovku.\n"
-" c Vycentruj okno.\n"
-" e Prohoď levé/pravé oko.\n"
-" v Procházej dostupné video stopy.\n"
-" a Procházej dostupné zvukové stopy.\n"
-" s Procházej dostupné titulky.\n"
-" 1, 2 Uprav kontrast.\n"
-" 3, 4 Uprav jas.\n"
-" 5, 6 Uprav odstín.\n"
-" 7, 8 Uprav sytost.\n"
-" <, > Uprav parallax.\n"
-" (, ) Uprav ghostbusting.\n"
-" levá, pravá Přeskoč 10 sekund dopředu / zpět.\n"
-" nahoru, dolů Přeskoč 1 minutu dopředu / zpět.\n"
-" page up, page down Přeskoč 10 minut dopředu / zpět.\n"
-" Stisk myši Přeskoč vzhledem k horizontální pozici myši."
-
-#: src/main.cpp:597
-msgid "Benchmark mode: audio and time synchronization disabled."
-msgstr "Testovací režim, synchronizace zvuku a času je vypnuta."
+#: src/gui.cpp:116
+msgid "Select the subtitle stream."
+msgstr "Vyber stopu titulků."
 
-#: src/main.cpp:614
-msgid "This version of Bino was compiled without support for LIRC."
-msgstr "Tato verze Bina byla zkompilována bez podpory knihovny LIRC."
+#: src/gui.cpp:127 src/media_input.cpp:277
+msgid "Input:"
+msgstr "Vstup:"
 
-#: src/main.cpp:627
-msgid "This version of Bino was compiled without support for Equalizer."
-msgstr "Tato verze Bina byla zkompilována bez podpory knihovny Equalizer."
+#: src/gui.cpp:128
+msgid "Set the 3D layout of the video stream."
+msgstr "Nastav 3D formát videa."
 
-#: src/main.cpp:634
-msgid "Cannot connect to X server."
-msgstr "Nelze se připojit k X serveru."
+#: src/gui.cpp:132
+msgid "2D"
+msgstr "2D"
 
-#: src/main.cpp:650
-msgid "No video to play."
-msgstr "Nenalezeno žádné video."
+#: src/gui.cpp:133
+msgid "Separate streams, left first"
+msgstr "Oddělené stopy, levá první"
 
-#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:293
-#, c-format
-msgid "%dx%d, %.3g:1"
-msgstr "%dx%d, %.3g:1"
+#: src/gui.cpp:134
+msgid "Separate streams, right first"
+msgstr "Oddělené stopy, pravá první"
 
-#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:421
-#, c-format
-msgid "%s, %d ch., %g kHz, %d bit"
-msgstr "%s, %d ch., %g kHz, %d bit"
+#: src/gui.cpp:135
+#, fuzzy
+msgid "Alternating, left first"
+msgstr "Oddělené stopy, levá první"
 
-#: src/media_input.cpp:277 src/player_qt.cpp:187
-msgid "Input:"
-msgstr "Vstup:"
+#: src/gui.cpp:136
+#, fuzzy
+msgid "Alternating, right first"
+msgstr "Oddělené stopy, pravá první"
 
-#: src/media_input.cpp:282
-#, c-format
-msgid "Video %s: %s"
-msgstr "Video %s: %s"
+#: src/gui.cpp:137 src/gui.cpp:161
+msgid "Top/bottom"
+msgstr "Nahoře/Dole"
 
-#: src/media_input.cpp:287
-msgid "No video."
-msgstr "Žádná video stopa."
+#: src/gui.cpp:138 src/gui.cpp:162
+msgid "Top/bottom, half height"
+msgstr "Nahoře/Dole, poloviční výška"
 
-#: src/media_input.cpp:293
-#, c-format
-msgid "Audio %s: %s"
-msgstr "Zvuk %s: %s"
+#: src/gui.cpp:139
+msgid "Bottom/top"
+msgstr "Dole/Nahoře"
 
-#: src/media_input.cpp:298
-msgid "No audio."
-msgstr "Žádná zvuková stopa."
+#: src/gui.cpp:140
+msgid "Bottom/top, half height"
+msgstr "Dole/Nahoře, poloviční výška"
 
-#: src/media_input.cpp:304
-#, c-format
-msgid "Subtitle %s: %s"
-msgstr "Titulky %s: %s"
+#: src/gui.cpp:141 src/gui.cpp:163
+msgid "Left/right"
+msgstr "Levá/Pravá"
 
-#: src/media_input.cpp:309
-msgid "No subtitle."
-msgstr "Žádné titulky."
+#: src/gui.cpp:142 src/gui.cpp:164
+msgid "Left/right, half width"
+msgstr "Levá/Pravá, poloviční šířka"
 
-#: src/media_input.cpp:311
-#, c-format
-msgid "Duration: %g seconds"
-msgstr "Délka: %g sekund"
+#: src/gui.cpp:143
+msgid "Right/left"
+msgstr "Pravá/Levá"
 
-#: src/media_input.cpp:314
-#, c-format
-msgid "Stereo layout: %s"
-msgstr "Stereo režim: %s"
+#: src/gui.cpp:144
+msgid "Right/left, half width"
+msgstr "Pravá/Levá, poloviční šířka"
 
-#: src/media_object.cpp:371
-#, fuzzy, c-format
-msgid "%s video stream %d: Using frame size %dx%d instead of %dx%d."
-msgstr "%s video stopa %d: Špatná velikost obrazu."
+#: src/gui.cpp:145 src/gui.cpp:165
+msgid "Even/odd rows"
+msgstr "Sudé/Liché řádky"
 
-#: src/media_object.cpp:624
-#, c-format
-msgid "%s video stream %d: Unsupported stereo layout %s."
-msgstr "%s video stopa %d: Nepodporovaný stereo režim %s."
+#: src/gui.cpp:146
+msgid "Odd/even rows"
+msgstr "Liché/Sudé řádky"
 
-#: src/media_object.cpp:662
-#, c-format
-msgid "%s audio stream %d: Cannot handle audio with %d channels."
-msgstr "%s zvuková stopa %d: Nemohu přehrát zvukovou stopu s %d kanály."
+#: src/gui.cpp:152
+msgid "Output:"
+msgstr "Výstup:"
 
-#: src/media_object.cpp:691
-#, c-format
-msgid "%s audio stream %d: Cannot handle audio with sample format %s."
-msgstr "%s zvuková stopa %d: Nemohu přehrát zvukovou stopu ve formátu %s."
+#: src/gui.cpp:153
+msgid "Set the 3D output type for your display."
+msgstr "Nastav 3D formát výstupu vašeho monitoru."
 
-#: src/media_object.cpp:744
-#, c-format
-msgid "No support available for %s device."
-msgstr "Zařízení %s není podporováno."
+#: src/gui.cpp:157
+msgid "Left view"
+msgstr "Levý obraz"
 
-#: src/media_object.cpp:745 src/player_qt.cpp:1831
-msgid "Firewire"
-msgstr "Firewire"
+#: src/gui.cpp:158
+msgid "Right view"
+msgstr "Pravý obraz"
 
-#: src/media_object.cpp:746 src/player_qt.cpp:1832
-msgid "X11"
-msgstr "X11"
+#: src/gui.cpp:159
+msgid "OpenGL stereo"
+msgstr "OpenGL stereo"
 
-#: src/media_object.cpp:747
-msgid "default"
-msgstr "výchozí"
+#: src/gui.cpp:160
+msgid "Left/right view alternating"
+msgstr ""
 
-#: src/media_object.cpp:765 src/media_object.cpp:1218 src/xgl.cpp:297
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
+#: src/gui.cpp:166
+msgid "Even/odd columns"
+msgstr "Sudé/Liché sloupce"
 
-#: src/media_object.cpp:776
-#, c-format
-msgid "%s: Cannot read stream info: %s"
-msgstr "%s: Nemohu přečíst informace o stopě: %s"
+#: src/gui.cpp:167
+msgid "Checkerboard pattern"
+msgstr "Šachovnice"
 
-#: src/media_object.cpp:816
-#, c-format
-msgid "%s stream %d: Cannot open %s: %s"
-msgstr "%s stopa %d: Nemohu otevřít %s: %s"
+#: src/gui.cpp:168
+msgid "HDMI frame packing mode"
+msgstr "HDMI režim"
 
-#: src/media_object.cpp:817
-msgid "video codec"
-msgstr "video kodek"
+#: src/gui.cpp:169
+msgid "Red/cyan glasses, monochrome method"
+msgstr "Červené/modré brýle, stupně šedi"
 
-#: src/media_object.cpp:818
-msgid "audio codec"
-msgstr "zvukový kodek"
+#: src/gui.cpp:170
+msgid "Red/cyan glasses, half-color method"
+msgstr "Červené/modré brýle, polotóny"
 
-#: src/media_object.cpp:819
-msgid "subtitle codec"
-msgstr "kodek titulků"
+#: src/gui.cpp:171
+msgid "Red/cyan glasses, full-color method"
+msgstr "Červené/modré brýle, plné tóny"
 
-#: src/media_object.cpp:820
-msgid "data"
-msgstr "data"
+#: src/gui.cpp:172
+msgid "Red/cyan glasses, high-quality Dubois method"
+msgstr "Červené/modré brýle, kvalitní Dubois metoda"
 
-#: src/media_object.cpp:821
-msgid "codec not supported"
-msgstr "kodek není podporován"
+#: src/gui.cpp:173
+msgid "Green/magenta glasses, monochrome method"
+msgstr "Zelené/fialové brýle, stupně šedi"
 
-#: src/media_object.cpp:831
-#, c-format
-msgid "%s video stream %d: Invalid frame size."
-msgstr "%s video stopa %d: Špatná velikost obrazu."
+#: src/gui.cpp:174
+msgid "Green/magenta glasses, half-color method"
+msgstr "Zelené/fialové brýle, polotóny"
 
-#: src/media_object.cpp:867
-#, c-format
-msgid "%s video stream %d: Cannot initialize conversion context."
-msgstr "%s video stopa %d: Nemohu vytvořit conversion context."
+#: src/gui.cpp:175
+msgid "Green/magenta glasses, full-color method"
+msgstr "Zelené/fialové brýle, plné tóny"
 
-#: src/media_object.cpp:930
-#, c-format
-msgid "Video stream %d: %s / %s, %g seconds"
-msgstr "Video stopa %d: %s / %s, %g sekund"
+#: src/gui.cpp:176
+msgid "Green/magenta glasses, high-quality Dubois method"
+msgstr "Zelené/fialové brýle, kvalitní Dubois metoda"
 
-#: src/media_object.cpp:934
-#, c-format
-msgid "Using up to %d threads for decoding."
-msgstr "Využívám až %d vláken pro dekódování."
+#: src/gui.cpp:177
+msgid "Amber/blue glasses, monochrome method"
+msgstr "Žluté/modré brýle, stupně šedi"
 
-#: src/media_object.cpp:939
+#: src/gui.cpp:178
+msgid "Amber/blue glasses, half-color method"
+msgstr "Žluté/modré brýle, polotóny"
+
+#: src/gui.cpp:179
+msgid "Amber/blue glasses, full-color method"
+msgstr "Žluté/modré brýle, plné tóny"
+
+#: src/gui.cpp:180
+msgid "Amber/blue glasses, high-quality Dubois method"
+msgstr "Žluté/modré brýle, kvalitní Dubois metoda"
+
+#: src/gui.cpp:181
+msgid "Red/green glasses, monochrome method"
+msgstr "Červené/zelené brýle, stupně šedi"
+
+#: src/gui.cpp:182
+msgid "Red/blue glasses, monochrome method"
+msgstr "Červené/modré brýle, stupně šedi"
+
+#: src/gui.cpp:186
+msgid "Swap left/right"
+msgstr "Prohoď levou/pravou"
+
+#: src/gui.cpp:187
+msgid ""
+"Swap the left and right view. Use this if the 3D effect seems wrong."
+msgstr ""
+"Prohoď levou a pravou. Použijte, pokud je 3D efekt špatný (obrácený)"
+
+#: src/gui.cpp:467
+msgid "Off"
+msgstr "Žádné"
+
+#: src/gui.cpp:694
+msgid ""
+"This slider shows the progress during video playback, and can be used to "
+"seek in the video."
+msgstr ""
+"Tento posuvník zobrazuje pozici přehrávaného videa, můžete ho použít pro "
+"vyhledávání ve videu."
+
+#: src/gui.cpp:701
+msgid "Elapsed / total time."
+msgstr "Uplynulý / celkový čas."
+
+#: src/gui.cpp:708
+#, fuzzy
+msgid "Toggle audio mute."
+msgstr "Přepnout přehrávání ve smyčce."
+
+#: src/gui.cpp:713
+msgid "Adjust audio volume."
+msgstr ""
+
+#: src/gui.cpp:725
+msgid "Play."
+msgstr "Spustit."
+
+#: src/gui.cpp:729
+msgid "Pause."
+msgstr "Pozastav."
+
+#: src/gui.cpp:733
+msgid "Stop."
+msgstr "Zastav."
+
+#: src/gui.cpp:738
+msgid "Toggle loop mode."
+msgstr "Přepnout přehrávání ve smyčce."
+
+#: src/gui.cpp:745
+msgid ""
+"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
+"f key."
+msgstr ""
+"Přepni do režimu celé obrazovky. Tento režim můžete ukončit stiskem "
+"tlačítka f"
+
+#: src/gui.cpp:751
+msgid "Center the video area on your screen."
+msgstr "Vycentruj video na středu obrazovky."
+
+#: src/gui.cpp:758
+msgid "Seek backward 10 minutes."
+msgstr "Přeskoč 10 minut zpět."
+
+#: src/gui.cpp:763
+msgid "Seek backward 1 minute."
+msgstr "Přeskoč 1 minutu zpět."
+
+#: src/gui.cpp:769
+msgid "Seek backward 10 seconds."
+msgstr "Přeskoč 10 vteřin zpět."
+
+#: src/gui.cpp:775
+msgid "Seek forward 10 seconds."
+msgstr "Přeskoč 10 vteřin dopředu."
+
+#: src/gui.cpp:780
+msgid "Seek forward 1 minute."
+msgstr "Přeskoč 1 minutu dopředu."
+
+#: src/gui.cpp:786
+msgid "Seek forward 10 minutes."
+msgstr "Přeskoč 10 minut dopředu."
+
+#: src/gui.cpp:1047
+msgid "Fullscreen/Multiscreen Settings"
+msgstr "Nastavení Celoobrazového/Víceobrazového režimu"
+
+#: src/gui.cpp:1049
+msgid "Configure fullscreen mode:"
+msgstr "Nastavení celoobrazového režimu:"
+
+#: src/gui.cpp:1050
+msgid "Select the screens to use in fullscreen mode."
+msgstr "Vyber obrazovky, které budou použity v celoobrazovém režimu."
+
+#: src/gui.cpp:1052
+msgid "Single screen:"
+msgstr "Jedna obrazovka:"
+
+#: src/gui.cpp:1053
+msgid "Use a single screen for fullscreen mode."
+msgstr "Použij jednu obrazovku pro celoobrazový režim."
+
+#: src/gui.cpp:1056
+msgid "Primary screen"
+msgstr "Primární obrazovka"
+
+#: src/gui.cpp:1059 src/gui.cpp:1070 src/gui.cpp:1071
 #, c-format
-msgid "Audio stream %d: %s / %s, %g seconds"
-msgstr "Zvuková stopa %d: %s / %s, %g sekund"
+msgid "Screen %d"
+msgstr "Obrazovka %d"
+
+#: src/gui.cpp:1062
+msgid "Dual screen:"
+msgstr "Dvě obrazovky:"
+
+#: src/gui.cpp:1063
+msgid "Use two screens for fullscreen mode."
+msgstr "Použij dvě obrazovky pro celoobrazový režim."
+
+#: src/gui.cpp:1075
+msgid "Multi screen:"
+msgstr "Více obrazovek:"
+
+#: src/gui.cpp:1076
+msgid "Use multiple screens for fullscreen mode."
+msgstr "Použij více obrazovek pro celoobrazový režim."
+
+#: src/gui.cpp:1078
+msgid "Comma-separated list of screens to use for fullscreen mode."
+msgstr ""
+"Seznam obrazovek pro použití v celoobrazovém režimu, oddělený čárkou."
+
+#: src/gui.cpp:1081
+msgid "When in fullscreen mode,"
+msgstr "V celoobrazovém režimu,"
+
+#: src/gui.cpp:1082
+msgid "Set special left/right view handling for fullscreen mode."
+msgstr ""
+"Nastav zvláštní chování pravého/levého obrazu při celoobrazovém režimu.</"
+"p>"
+
+#: src/gui.cpp:1084
+msgid "flip left view vertically."
+msgstr "překlop levý obraz vertikálně."
+
+#: src/gui.cpp:1086
+msgid "flop left view horizontally."
+msgstr "překlop levý obraz horizontálně."
+
+#: src/gui.cpp:1088
+msgid "flip right view vertically."
+msgstr "překlop pravý obraz vertikálně."
+
+#: src/gui.cpp:1090
+msgid "flop right view horizontally."
+msgstr "překlop pravý obraz horizontálně."
+
+#: src/gui.cpp:1093
+#, fuzzy
+msgid "inhibit the screensaver"
+msgstr "Nelze povolit spořič obrazovky."
+
+#: src/gui.cpp:1094
+#, fuzzy
+msgid "Inhibit the screensaver during fullscreen playback."
+msgstr "Vyber obrazovky, které budou použity v celoobrazovém režimu."
+
+#: src/gui.cpp:1096 src/gui.cpp:1258 src/gui.cpp:1393 src/gui.cpp:1463
+#: src/gui.cpp:1541 src/gui.cpp:1652 src/gui.cpp:1928 src/gui.cpp:2108
+#: src/gui.cpp:2778 src/gui.cpp:2825 src/gui.cpp:3114
+msgid "OK"
+msgstr "OK"
+
+#: src/gui.cpp:1211
+msgid "Display Color Adjustments"
+msgstr "Zobraz nastavení barev"
+
+#: src/gui.cpp:1213
+msgid "Contrast:"
+msgstr "Kontrast:"
+
+#: src/gui.cpp:1224
+msgid "Brightness:"
+msgstr "Jas:"
+
+#: src/gui.cpp:1235
+msgid "Hue:"
+msgstr "Odstín:"
+
+#: src/gui.cpp:1246
+msgid "Saturation:"
+msgstr "Sytost:"
+
+#: src/gui.cpp:1364
+msgid "Display Crosstalk Calibration"
+msgstr "Zobra Crosstalk kalibraci"
+
+#. TRANSLATORS: Please keep the lines short using where necessary.
+#: src/gui.cpp:1367
+msgid ""
+"Please read the manual to find out how to measure the crosstalk "
+"levels of your display."
+msgstr ""
+"Přečtěte si prosím v manuálu jak změřit nastavení crosstalku pro "
+"váš monitor."
+
+#: src/gui.cpp:1371
+msgid "Red:"
+msgstr "Červená:"
+
+#: src/gui.cpp:1378
+msgid "Green:"
+msgstr "Zelená:"
+
+#: src/gui.cpp:1385
+msgid "Blue:"
+msgstr "Modrá:"
+
+#: src/gui.cpp:1441
+msgid "Zoom for wide videos"
+msgstr ""
+
+#: src/gui.cpp:1444
+msgid ""
+"Set zoom level for videos that are wider than the screen: 0: Show "
+"full video width. 1: Use full screen height.</p"
+msgstr ""
+
+#: src/gui.cpp:1448
+msgid "Zoom:"
+msgstr ""
+
+#: src/gui.cpp:1449
+msgid "Set the zoom level for videos that are wider than the screen"
+msgstr ""
+
+#: src/gui.cpp:1507
+#, fuzzy
+msgid "Audio Settings"
+msgstr "Nastavení titulků"
+
+#: src/gui.cpp:1509
+#, fuzzy
+msgid "Audio device:"
+msgstr "zvukový kodek"
+
+#: src/gui.cpp:1510
+msgid ""
+"Select the audio device. This will take effect for the next started "
+"video."
+msgstr ""
+
+#: src/gui.cpp:1514 src/gui.cpp:2063
+msgid "Default"
+msgstr "Výchozí"
+
+#: src/gui.cpp:1531
+msgid "Audio delay (ms):"
+msgstr ""
+
+#: src/gui.cpp:1532
+msgid ""
+"Set an audio delay, in milliseconds. This is useful if audio and video "
+"are not in sync."
+msgstr ""
+
+#: src/gui.cpp:1589
+msgid "Subtitle Settings"
+msgstr "Nastavení titulků"
+
+#: src/gui.cpp:1591
+msgid "These settings apply to soft subtitles, but not to bitmaps."
+msgstr ""
+"Toto nastavení se aplikuje titulky v textové podobě, ne na obrázkové."
+
+#: src/gui.cpp:1593
+msgid "Encoding:"
+msgstr "Kódování:"
+
+#: src/gui.cpp:1594
+msgid "Set the subtitle character set encoding."
+msgstr "Nastaví znakovou stránku titulků."
+
+#: src/gui.cpp:1609
+msgid "Override font:"
+msgstr "Vynutit font:"
+
+#: src/gui.cpp:1610
+msgid "Override the subtitle font family."
+msgstr "Vynutí font titulků."
+
+#: src/gui.cpp:1619
+msgid "Override font size:"
+msgstr "Vynutit velikost fontu:"
+
+#: src/gui.cpp:1620
+msgid "Override the subtitle font size."
+msgstr "Vynutí velikost titulků."
+
+#: src/gui.cpp:1630
+msgid "Override scale factor:"
+msgstr "Vynutit zvětšení:"
+
+#: src/gui.cpp:1631
+msgid "Override the subtitle scale factor."
+msgstr "Vynutí zvětšní titulků."
+
+#: src/gui.cpp:1642
+msgid "Override color:"
+msgstr "Vynutit barvu:"
+
+#: src/gui.cpp:1643
+msgid "Override the subtitle color."
+msgstr "Vynutí barvu titulků."
+
+#: src/gui.cpp:1866
+#, fuzzy
+msgid "Video Settings"
+msgstr "Nastavení titulků"
+
+#: src/gui.cpp:1868
+#, fuzzy
+msgid "Crop to aspect ratio:"
+msgstr "%gx%g, poměr stran %g:1"
+
+#: src/gui.cpp:1869
+#, fuzzy
+msgid ""
+"Set the real aspect ratio of the video, so that borders can be cropped.</"
+"p>"
+msgstr "Nastav 3D formát videa."
+
+#: src/gui.cpp:1872
+msgid "Do not crop"
+msgstr ""
+
+#: src/gui.cpp:1885
+msgid "Parallax:"
+msgstr "Parallax:"
+
+#: src/gui.cpp:1886
+msgid ""
+"Adjust parallax, from -1 to +1. This changes the separation of left and "
+"right view, and thus the perceived distance of the scene."
+msgstr ""
+"Upraví parallax, od -1 do +1. Změní vzdálenost levého a pravého obrazu a "
+"tím nastaví hloubku vnímání 3D scény."
+
+#: src/gui.cpp:1899
+msgid "Subtitle parallax:"
+msgstr "Parallax titulků:"
+
+#: src/gui.cpp:1900
+msgid ""
+"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
+"distance of the subtitles."
+msgstr ""
+"Upraví parallax titulků, od -1 do +1. Změní vnímanou vzdálenost titulků.</"
+"p>"
+
+#: src/gui.cpp:1913
+msgid "Ghostbusting:"
+msgstr "Ghostbusting:"
+
+#: src/gui.cpp:1914
+msgid ""
+"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
+"does not work with anaglyph glasses."
+msgstr ""
+"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
+"does not work with anaglyph glasses."
+
+#: src/gui.cpp:2059
+msgid "Open device"
+msgstr "Otevři zařízení"
+
+#: src/gui.cpp:2062
+msgid "Choose a device type."
+msgstr "Vyberte typ zařízení."
+
+#: src/gui.cpp:2064 src/media_object.cpp:801
+msgid "Firewire"
+msgstr "Firewire"
+
+#: src/gui.cpp:2065 src/media_object.cpp:802
+msgid "X11"
+msgstr "X11"
+
+#: src/gui.cpp:2067 src/gui.cpp:2070
+msgid "Choose a device."
+msgstr "Vyberte zařízení."
+
+#: src/gui.cpp:2073
+msgid "Set the X11 device string. Refer to the manual for details."
+msgstr "Zadejte X11 device string. Podrobnosti najdete v manuálu."
+
+#: src/gui.cpp:2082
+msgid "Request frame size"
+msgstr "Vynutit velikost obrazu"
+
+#: src/gui.cpp:2083
+msgid ""
+"Request a specific frame size from the device, e.g. 640x480. The device "
+"must support this frame size. Some devices require a frame size to be "
+"selected."
+msgstr ""
+"Požaduj danou velikost obrazu, například 640x480. Zařízení musí danou "
+"velikost podporovat. Některá zařízení vyžadují, aby byla velikost nastavena."
+""
+
+#: src/gui.cpp:2094
+msgid "Request frame rate"
+msgstr "Vynutit snímkovou frekvenci"
+
+#: src/gui.cpp:2095
+msgid ""
+"Request a specific frame rate from the device, e.g. 25/1. The device must "
+"support this frame rate. Some devices require a frame rate to be selected.</"
+"p>"
+msgstr ""
+"Požaduj danou snímkovou frekvenci, například 25/1. Zařízení musí danou "
+"frekvenci podporovat. Některá zařízení vyžadují, aby byla frekvence "
+"nastavena."
+
+#: src/gui.cpp:2106 src/gui.cpp:2824
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: src/gui.cpp:2377
+msgid "&File"
+msgstr "&Soubor"
+
+#: src/gui.cpp:2378
+#, fuzzy
+msgid "&Open file(s)..."
+msgstr "Otevři soubory"
+
+#: src/gui.cpp:2383
+#, fuzzy
+msgid "Open &URL(s)..."
+msgstr "Otevřít &URL..."
+
+#: src/gui.cpp:2387
+msgid "Open &device..."
+msgstr "Otevřít &zařízení..."
+
+#: src/gui.cpp:2402
+msgid "&Clear recent files"
+msgstr ""
+
+#: src/gui.cpp:2410
+msgid "&Quit..."
+msgstr "&Ukončit..."
+
+#: src/gui.cpp:2416
+msgid "&Preferences"
+msgstr "&Nastavení"
+
+#: src/gui.cpp:2419
+msgid "&Fullscreen Settings..."
+msgstr "Nastavení &celoobrazového režimu..."
+
+#: src/gui.cpp:2422
+msgid "Display &Color Adjustments..."
+msgstr "Nastavení &barev..."
+
+#: src/gui.cpp:2425
+msgid "Display Cross&talk Calibration..."
+msgstr "Nastavení &Crosstalku..."
+
+#: src/gui.cpp:2429
+msgid "&Zoom for wide videos..."
+msgstr ""
+
+#: src/gui.cpp:2433
+#, fuzzy
+msgid "&Audio Settings..."
+msgstr "Nastavení &Titulků..."
+
+#: src/gui.cpp:2437
+msgid "&Subtitle Settings..."
+msgstr "Nastavení &Titulků..."
+
+#: src/gui.cpp:2441
+#, fuzzy
+msgid "Current &Video Settings..."
+msgstr "Nastavení 3D videa..."
+
+#: src/gui.cpp:2444
+msgid "&Help"
+msgstr "&Nápověda"
+
+#: src/gui.cpp:2445
+msgid "&Manual..."
+msgstr "&Manuál..."
+
+#: src/gui.cpp:2450
+msgid "&Website..."
+msgstr "&Webová stránka..."
+
+#: src/gui.cpp:2454
+msgid "&Keyboard Shortcuts"
+msgstr "&Klávesové zkratky"
+
+#: src/gui.cpp:2458
+msgid "&About"
+msgstr "&O Binu"
+
+#: src/gui.cpp:2771
+msgid "Tip"
+msgstr ""
+
+#: src/gui.cpp:2774
+msgid ""
+"You can select and open multiple files at once.This is useful for "
+"example if you have extra subtitle files, or if left and right view are "
+"stored in separate files."
+msgstr ""
 
-#: src/media_object.cpp:946
-#, c-format
-msgid "Subtitle stream %d: %s / %s, %g seconds"
-msgstr "Titulky %d: %s / %s, %g sekund"
+#: src/gui.cpp:2777
+msgid "Do not show this message again."
+msgstr ""
 
-#: src/media_object.cpp:953
-msgid "No usable streams."
-msgstr "Žádná použitelná stopa."
+#: src/gui.cpp:2794
+msgid "Open files"
+msgstr "Otevři soubory"
+
+#: src/gui.cpp:2818
+#, fuzzy
+msgid "Open URL(s)"
+msgstr "Otevři URL"
+
+#: src/gui.cpp:2819
+msgid "URL(s):"
+msgstr ""
+
+#: src/gui.cpp:2820
+msgid "Enter one or more space separated URLs."
+msgstr ""
+
+#: src/gui.cpp:3005 src/gui.cpp:3013 src/video_output_qt.cpp:234
+#: src/video_output_qt.cpp:643 src/video_output_qt.cpp:664
+msgid "Error"
+msgstr "Chyba"
+
+#: src/gui.cpp:3005
+msgid "Cannot open manual."
+msgstr "Nemohu otevřít manál."
+
+#: src/gui.cpp:3013
+msgid "Cannot open website."
+msgstr "Nemohu otevřít webovou stránku."
+
+#: src/gui.cpp:3021
+msgid "Keyboard Shortcuts"
+msgstr "Klávesové zkratky"
+
+#: src/gui.cpp:3024
+#, fuzzy
+msgid "Keyboard control:"
+msgstr "Klávesové zkratky"
+
+#: src/gui.cpp:3026
+msgid "Stop."
+msgstr ""
+
+#: src/gui.cpp:3027 src/main.cpp:495
+msgid "Pause / unpause."
+msgstr ""
+
+#: src/gui.cpp:3028 src/main.cpp:496
+#, fuzzy
+msgid "Toggle fullscreen."
+msgstr "Nastavení celoobrazového režimu:"
+
+#: src/gui.cpp:3029 src/main.cpp:497
+msgid "Center window."
+msgstr ""
+
+#: src/gui.cpp:3030 src/main.cpp:498
+#, fuzzy
+msgid "Swap left/right eye."
+msgstr "Prohoď levou/pravou"
+
+#: src/gui.cpp:3031 src/main.cpp:499
+msgid "Cycle through available video streams."
+msgstr ""
+
+#: src/gui.cpp:3032 src/main.cpp:500
+msgid "Cycle through available audio streams."
+msgstr ""
+
+#: src/gui.cpp:3033 src/main.cpp:501
+#, fuzzy
+msgid "Cycle through available subtitle streams."
+msgstr "Vyber stopu titulků."
+
+#: src/gui.cpp:3034 src/main.cpp:502
+msgid "Adjust contrast."
+msgstr ""
+
+#: src/gui.cpp:3035 src/main.cpp:503
+#, fuzzy
+msgid "Adjust brightness."
+msgstr "Jas:"
+
+#: src/gui.cpp:3036 src/main.cpp:504
+msgid "Adjust hue."
+msgstr ""
+
+#: src/gui.cpp:3037 src/main.cpp:505
+#, fuzzy
+msgid "Adjust saturation."
+msgstr "Sytost:"
+
+#: src/gui.cpp:3038 src/main.cpp:506
+#, fuzzy
+msgid "Adjust parallax."
+msgstr "Parallax titulků:"
+
+#: src/gui.cpp:3039 src/main.cpp:507
+#, fuzzy
+msgid "Adjust ghostbusting."
+msgstr "Ghostbusting:"
+
+#: src/gui.cpp:3040 src/main.cpp:508
+msgid "Adjust zoom for wide videos."
+msgstr ""
+
+#: src/gui.cpp:3041 src/main.cpp:509
+msgid "Adjust audio volume."
+msgstr ""
+
+#: src/gui.cpp:3042 src/main.cpp:510
+msgid "Toggle audio mute."
+msgstr ""
 
-#: src/media_object.cpp:1234 src/media_object.cpp:1264
-#: src/media_object.cpp:1294
+#: src/gui.cpp:3043 src/main.cpp:511
+msgid "Step a single video frame forward."
+msgstr ""
+
+#: src/gui.cpp:3044 src/main.cpp:512
+msgid "Seek 10 seconds backward / forward."
+msgstr ""
+
+#: src/gui.cpp:3045 src/main.cpp:513
+msgid "Seek 1 minute backward / forward."
+msgstr ""
+
+#: src/gui.cpp:3046 src/main.cpp:514
+msgid "Seek 10 minutes backward / forward."
+msgstr ""
+
+#: src/gui.cpp:3047 src/main.cpp:516
+msgid "Media keys should work as expected."
+msgstr ""
+
+#: src/gui.cpp:3063
 #, c-format
-msgid "%s: Cannot duplicate packet."
-msgstr "%s: Nemohu duplikovat paket."
+msgid "About %s"
+msgstr "O pragramu %s"
 
-#: src/media_object.cpp:1766
+#: src/gui.cpp:3069
 #, c-format
-msgid "%s: Seeking failed."
-msgstr "%s: Vyhledávání selhalo."
+msgid "The %s 3D video player"
+msgstr "%s 3D video přehrávač"
 
-#: src/player.cpp:212
-msgid "No video streams found."
-msgstr "Nebyly nalezeny žádné video stopy."
+#: src/gui.cpp:3074
+#, fuzzy, c-format
+msgid ""
+"%s version %s.Copyright (C) 2012 the Bino developers.This "
+"is free software. You may redistribute copies of it under the terms of the "
+"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
+"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
+"\"%s\">%s</a> for more information on this software."
+msgstr ""
+"%s verze %s.Copyright (C) 2011 Bino vývojáři.Tento program "
+"je svobodný software. Můžete jej šířit a modifikovat podle ustanovení <a "
+"href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</a>."
+"Tento program je rozšiřován v naději, že bude užitečný, avšak BEZ JAKÉKOLI "
+"ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI anebo VHODNOSTI PRO "
+"URČITÝ ÚČEL.Navštivte <a href=\"%s\">%s</a> pro více informací o "
+"tomto software."
 
-#: src/player.cpp:218
-msgid "Cannot set requested stereo layout: incompatible media."
-msgstr "Nemohu nastavit požadovaný stereo formát: nekompatibilní vstup."
+#: src/gui.cpp:3086 src/main.cpp:384
+msgid "Platform:"
+msgstr "Platforma:"
 
-#: src/player.cpp:224
-#, c-format
-msgid "Video stream %d not found."
-msgstr "Video stopa %d nebyla nalezena."
+#: src/gui.cpp:3087 src/main.cpp:386
+msgid "Libraries used:"
+msgstr "Použité knihovny:"
+
+#: src/gui.cpp:3109
+msgid "About"
+msgstr "O programu"
+
+#: src/gui.cpp:3110
+msgid "Libraries"
+msgstr "Knihovny"
+
+#: src/gui.cpp:3111
+msgid "Team"
+msgstr "Tým"
+
+#: src/gui.cpp:3112
+msgid "License"
+msgstr "Licence"
+
+#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
+msgid "not used"
+msgstr "nevyužívá se"
+
+#: src/lirc.cpp:61
+msgid "Cannot initialize LIRC."
+msgstr "Nemohu inicializovat LIRC."
+
+#: src/lirc.cpp:67
+msgid "Cannot set LIRC socket properties."
+msgstr "Nelze nastavit parametry LIRC socketu."
+
+#: src/lirc.cpp:74
+msgid "Cannot read LIRC default configuration."
+msgstr "Nelze získat výchozí nastavení LIRC."
 
-#: src/player.cpp:229
+#: src/lirc.cpp:89
 #, c-format
-msgid "Audio stream %d not found."
-msgstr "Zvuková stopa %d nebyla nalezena."
+msgid "Cannot read LIRC configuration file %s."
+msgstr "Nelze přečíst LIRC konfigurační soubor %s."
 
-#: src/player.cpp:237
+#: src/lirc.cpp:117
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr "Nelze získat událost z LIRC; vypínám podporu LIRC."
+
+#: src/lirc.cpp:131
 #, c-format
-msgid "Subtitle stream %d not found."
-msgstr "Stopa titulků %d nebyla nalezena."
+msgid "Received invalid command '%s' from LIRC."
+msgstr "Obdržen neplatný příkaz '%s' z LIRC."
+
+#: src/lirc.cpp:141
+msgid "Cannot get command for LIRC code."
+msgstr "Nelze získat příkaz pro daný LIRC kód."
 
-#: src/player.cpp:644
+#: src/main.cpp:367 src/media_object.cpp:821 src/media_object.cpp:1286
+#: src/video_output.cpp:212
 #, c-format
-msgid "Video: delay %g seconds; dropping next frame."
-msgstr "Video: zpoždění %g sekund; zahazuji následující snímek."
+msgid "%s: %s"
+msgstr "%s: %s"
 
-#: src/player.cpp:656
+#: src/main.cpp:379
 #, c-format
-msgid "FPS: %.2f"
-msgstr "FPS: %.2f"
+msgid "%s version %s"
+msgstr "%s verze %s"
 
-#: src/player_equalizer.cpp:138
-msgid "Reading input frame failed."
-msgstr "Selhalo čtení snímku."
+#: src/main.cpp:380
+#, fuzzy
+msgid "Copyright (C) 2012 the Bino developers."
+msgstr "Copyright (C) 2011 Bino vývojáři."
 
-#: src/player_equalizer.cpp:192 src/video_output_qt.cpp:345
-#: src/video_output_qt.cpp:352
-msgid "Waiting for subtitle renderer initialization..."
-msgstr "Čekám na inicializaci vykreslování titulků..."
+#: src/main.cpp:381
+msgid ""
+"This is free software. You may redistribute copies of it under the terms of "
+"the GNU General Public License. There is NO WARRANTY, to the extent "
+"permitted by law."
+msgstr ""
+"Tento program je svobodný software. Můžete jej šířit a modifikovat podle "
+"ustanovení GNU General Public License.Tento program je rozšiřován v naději, "
+"že bude užitečný, avšak BEZ JAKÉKOLI ZÁRUKY; neposkytují se ani odvozené "
+"záruky PRODEJNOSTI anebo VHODNOSTI PRO URČITÝ ÚČEL."
 
-#: src/player_equalizer.cpp:273
-msgid "Init data mapping failed."
-msgstr "Počáteční mapování dat selhalo."
+#. 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:399
+msgid "Usage:"
+msgstr ""
 
-#: src/player_equalizer.cpp:274
-msgid "Frame data mapping failed."
-msgstr "Mapování dat snímku selhalo."
+#: src/main.cpp:401
+msgid "Options:"
+msgstr ""
 
-#: src/player_equalizer.cpp:275
-msgid "Video player initialization failed."
-msgstr "Nepodařilo se inicializovat přehrávač videa."
+#: src/main.cpp:402
+msgid "Print help."
+msgstr ""
 
-#: src/player_equalizer.cpp:276
-msgid "Need at least OpenGL 2.1."
-msgstr "Je vyžadováno alespon OpenGL 2.1."
+#: src/main.cpp:403
+msgid "Print version."
+msgstr ""
 
-#: src/player_equalizer.cpp:477
-msgid "No canvas in Equalizer configuration."
-msgstr "V konfiguraci Equalizeru není nastaveno plátno."
+#: src/main.cpp:404
+msgid "Do not use the GUI, just show a plain window."
+msgstr ""
 
-#: src/player_equalizer.cpp:511
-msgid "Equalizer canvas:"
-msgstr "Plátno Equalizeru:"
+#: src/main.cpp:405
+msgid "Append all log messages to the given file."
+msgstr ""
 
-#: src/player_equalizer.cpp:512
-#, c-format
-msgid "%gx%g, aspect ratio %g:1"
-msgstr "%gx%g, poměr stran %g:1"
+#: src/main.cpp:406
+msgid "Set log level (debug/info/warning/error/quiet)."
+msgstr ""
 
-#: src/player_equalizer.cpp:513
-#, c-format
-msgid "Area for %g:1 video: [ %g %g %g %g @ %g ]"
-msgstr "Oblast pro %g:1 video: [ %g %g %g %g @ %g ]"
+#: src/main.cpp:407
+msgid "Print a list of known audio devices and exit."
+msgstr ""
 
-#: src/player_equalizer.cpp:926 src/video_output_qt.cpp:318
-msgid ""
-"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
-"objects."
-msgstr "OpenGL nepodporuje verzi 2.1 a framebuffer objekty."
+#: src/main.cpp:408
+msgid "Use audio device number N (N=0 is the default)."
+msgstr ""
 
-#: src/player_equalizer.cpp:1096
-msgid "Equalizer initialization failed."
-msgstr "Chyba inicializace Equalizeru."
+#: src/main.cpp:409
+msgid "Delay audio by D milliseconds. Default is 0."
+msgstr ""
 
-#: src/player_equalizer.cpp:1104
-msgid "Cannot get equalizer configuration."
-msgstr "Nelze získat nastavení Equalizeru."
+#: src/main.cpp:410
+msgid "Set audio volume (0 to 1). Default is 1."
+msgstr ""
 
-#: src/player_equalizer.cpp:1118
-msgid "Equalizer configuration initialization failed."
-msgstr "Nelze získat nastavení Equalizeru."
+#: src/main.cpp:411
+#, fuzzy
+msgid "Mute audio."
+msgstr "Žádná zvuková stopa."
 
-#: src/player_qt.cpp:161
-msgid "Video:"
-msgstr "Video:"
+#: src/main.cpp:412
+msgid "Type of input device: default, firewire, x11."
+msgstr ""
 
-#: src/player_qt.cpp:162
-msgid "Select the video stream."
-msgstr "Vyber video stopu."
+#: src/main.cpp:413
+#, fuzzy
+msgid "Request frame size WxH from input device."
+msgstr "Vynutit velikost obrazu"
 
-#: src/player_qt.cpp:168
-msgid "Audio:"
-msgstr "Zvuk:"
+#: src/main.cpp:414
+#, fuzzy
+msgid "Request frame rate N/D from input device."
+msgstr "Vynutit snímkovou frekvenci"
 
-#: src/player_qt.cpp:169
-msgid "Select the audio stream."
-msgstr "Vyber zvukovou stopu."
+#: src/main.cpp:415
+#, fuzzy
+msgid "Use the given LIRC configuration file."
+msgstr "Nelze přečíst LIRC konfigurační soubor %s."
 
-#: src/player_qt.cpp:175
-msgid "Subtitle:"
-msgstr "Titulky:"
+#: src/main.cpp:416
+msgid "This option can be used more than once."
+msgstr ""
 
-#: src/player_qt.cpp:176
-msgid "Select the subtitle stream."
+#: src/main.cpp:417
+msgid "Select video stream (1-n, depending on input)."
+msgstr ""
+
+#: src/main.cpp:418
+msgid "Select audio stream (1-n, depending on input)."
+msgstr ""
+
+#: src/main.cpp:419
+#, fuzzy
+msgid "Select subtitle stream (0-n, dep. on input)."
 msgstr "Vyber stopu titulků."
 
-#: src/player_qt.cpp:188
-msgid "Set the 3D layout of the video stream."
-msgstr "Nastav 3D formát videa."
+#: src/main.cpp:420
+msgid "Select input type (default autodetect):"
+msgstr ""
 
-#: src/player_qt.cpp:192
-msgid "2D"
-msgstr "2D"
+#: src/main.cpp:421
+#, fuzzy
+msgid "Single view."
+msgstr "Pravý obraz"
 
-#: src/player_qt.cpp:193
-msgid "Separate streams, left first"
+#: src/main.cpp:422
+#, fuzzy
+msgid "Left/right separate streams, left first."
 msgstr "Oddělené stopy, levá první"
 
-#: src/player_qt.cpp:194
-msgid "Separate streams, right first"
+#: src/main.cpp:423
+#, fuzzy
+msgid "Left/right separate streams, right first."
 msgstr "Oddělené stopy, pravá první"
 
-#: src/player_qt.cpp:195 src/player_qt.cpp:218
-msgid "Top/bottom"
-msgstr "Nahoře/Dole"
-
-#: src/player_qt.cpp:196 src/player_qt.cpp:219
-msgid "Top/bottom, half height"
-msgstr "Nahoře/Dole, poloviční výška"
+#: src/main.cpp:424
+#, fuzzy
+msgid "Left/right alternating, left first."
+msgstr "Oddělené stopy, levá první"
 
-#: src/player_qt.cpp:197
-msgid "Bottom/top"
-msgstr "Dole/Nahoře"
+#: src/main.cpp:425
+#, fuzzy
+msgid "Left/right alternating, right first."
+msgstr "Oddělené stopy, pravá první"
 
-#: src/player_qt.cpp:198
-msgid "Bottom/top, half height"
-msgstr "Dole/Nahoře, poloviční výška"
+#: src/main.cpp:426 src/main.cpp:441
+msgid "Left top, right bottom."
+msgstr ""
 
-#: src/player_qt.cpp:199 src/player_qt.cpp:220
-msgid "Left/right"
-msgstr "Levá/Pravá"
+#: src/main.cpp:427 src/main.cpp:442
+#, fuzzy
+msgid "Left top, right bottom, half height."
+msgstr "Nahoře/Dole, poloviční výška"
 
-#: src/player_qt.cpp:200 src/player_qt.cpp:221
-msgid "Left/right, half width"
-msgstr "Levá/Pravá, poloviční šířka"
+#: src/main.cpp:428
+msgid "Left bottom, right top."
+msgstr ""
 
-#: src/player_qt.cpp:201
-msgid "Right/left"
-msgstr "Pravá/Levá"
+#: src/main.cpp:429
+#, fuzzy
+msgid "Left bottom, right top, half height."
+msgstr "Dole/Nahoře, poloviční výška"
 
-#: src/player_qt.cpp:202
-msgid "Right/left, half width"
-msgstr "Pravá/Levá, poloviční šířka"
+#: src/main.cpp:430 src/main.cpp:443
+msgid "Left left, right right."
+msgstr ""
 
-#: src/player_qt.cpp:203 src/player_qt.cpp:222
-msgid "Even/odd rows"
-msgstr "Sudé/Liché řádky"
+#: src/main.cpp:431 src/main.cpp:444
+#, fuzzy
+msgid "Left left, right right, half width."
+msgstr "Levá/Pravá, poloviční šířka"
 
-#: src/player_qt.cpp:204
-msgid "Odd/even rows"
-msgstr "Liché/Sudé řádky"
+#: src/main.cpp:432
+#, fuzzy
+msgid "Left right, right left."
+msgstr "Levá/Pravá, poloviční šířka"
 
-#: src/player_qt.cpp:210
-msgid "Output:"
-msgstr "Výstup:"
+#: src/main.cpp:433
+#, fuzzy
+msgid "Left right, right left, half width."
+msgstr "Levá/Pravá, poloviční šířka"
 
-#: src/player_qt.cpp:211
-msgid "Set the 3D output type for your display."
-msgstr "Nastav 3D formát výstupu vašeho monitoru."
+#: src/main.cpp:434 src/main.cpp:445
+msgid "Left even rows, right odd rows."
+msgstr ""
 
-#: src/player_qt.cpp:215
-msgid "Left view"
-msgstr "Levý obraz"
+#: src/main.cpp:435
+msgid "Left odd rows, right even rows."
+msgstr ""
 
-#: src/player_qt.cpp:216
-msgid "Right view"
-msgstr "Pravý obraz"
+#: src/main.cpp:436
+msgid "Select output type:"
+msgstr ""
 
-#: src/player_qt.cpp:217
-msgid "OpenGL stereo"
+#: src/main.cpp:437
+#, fuzzy
+msgid "OpenGL quad-buffered stereo."
 msgstr "OpenGL stereo"
 
-#: src/player_qt.cpp:223
-msgid "Even/odd columns"
-msgstr "Sudé/Liché sloupce"
+#: src/main.cpp:438
+#, fuzzy
+msgid "Left and right view alternating."
+msgstr "překlop pravý obraz vertikálně."
 
-#: src/player_qt.cpp:224
-msgid "Checkerboard pattern"
+#: src/main.cpp:439
+msgid "Only left."
+msgstr ""
+
+#: src/main.cpp:440
+msgid "Only right."
+msgstr ""
+
+#: src/main.cpp:446
+msgid "Left even columns, right odd columns."
+msgstr ""
+
+#: src/main.cpp:447
+#, fuzzy
+msgid "Left and right in checkerboard pattern."
 msgstr "Šachovnice"
 
-#: src/player_qt.cpp:225
-msgid "HDMI frame packing mode"
+#: src/main.cpp:448
+#, fuzzy
+msgid "HDMI frame packing mode."
 msgstr "HDMI režim"
 
-#: src/player_qt.cpp:226
-msgid "Red/cyan glasses, monochrome method"
+#: src/main.cpp:449
+#, fuzzy
+msgid "Red/cyan anaglyph, monochrome method."
 msgstr "Červené/modré brýle, stupně šedi"
 
-#: src/player_qt.cpp:227
-msgid "Red/cyan glasses, half-color method"
+#: src/main.cpp:450
+#, fuzzy
+msgid "Red/cyan anaglyph, half color method."
 msgstr "Červené/modré brýle, polotóny"
 
-#: src/player_qt.cpp:228
-msgid "Red/cyan glasses, full-color method"
+#: src/main.cpp:451
+#, fuzzy
+msgid "Red/cyan anaglyph, full color method."
 msgstr "Červené/modré brýle, plné tóny"
 
-#: src/player_qt.cpp:229
-msgid "Red/cyan glasses, high-quality Dubois method"
+#: src/main.cpp:452
+#, fuzzy
+msgid "Red/cyan anaglyph, Dubois method."
 msgstr "Červené/modré brýle, kvalitní Dubois metoda"
 
-#: src/player_qt.cpp:230
-msgid "Green/magenta glasses, monochrome method"
+#: src/main.cpp:453
+#, fuzzy
+msgid "Green/magenta anaglyph, monochrome method."
 msgstr "Zelené/fialové brýle, stupně šedi"
 
-#: src/player_qt.cpp:231
-msgid "Green/magenta glasses, half-color method"
+#: src/main.cpp:454
+#, fuzzy
+msgid "Green/magenta anaglyph, half color method."
 msgstr "Zelené/fialové brýle, polotóny"
 
-#: src/player_qt.cpp:232
-msgid "Green/magenta glasses, full-color method"
+#: src/main.cpp:455
+#, fuzzy
+msgid "Green/magenta anaglyph, full color method."
 msgstr "Zelené/fialové brýle, plné tóny"
 
-#: src/player_qt.cpp:233
-msgid "Green/magenta glasses, high-quality Dubois method"
+#: src/main.cpp:456
+#, fuzzy
+msgid "Green/magenta anaglyph, Dubois method."
 msgstr "Zelené/fialové brýle, kvalitní Dubois metoda"
 
-#: src/player_qt.cpp:234
-msgid "Amber/blue glasses, monochrome method"
+#: src/main.cpp:457
+#, fuzzy
+msgid "Amber/blue anaglyph, monochrome method."
 msgstr "Žluté/modré brýle, stupně šedi"
 
-#: src/player_qt.cpp:235
-msgid "Amber/blue glasses, half-color method"
+#: src/main.cpp:458
+#, fuzzy
+msgid "Amber/blue anaglyph, half color method."
 msgstr "Žluté/modré brýle, polotóny"
 
-#: src/player_qt.cpp:236
-msgid "Amber/blue glasses, full-color method"
+#: src/main.cpp:459
+#, fuzzy
+msgid "Amber/blue anaglyph, full color method."
 msgstr "Žluté/modré brýle, plné tóny"
 
-#: src/player_qt.cpp:237
-msgid "Amber/blue glasses, high-quality Dubois method"
+#: src/main.cpp:460
+#, fuzzy
+msgid "Amber/blue anaglyph, Dubois method."
 msgstr "Žluté/modré brýle, kvalitní Dubois metoda"
 
-#: src/player_qt.cpp:238
-msgid "Red/green glasses, monochrome method"
+#: src/main.cpp:461
+#, fuzzy
+msgid "Red/green anaglyph, monochrome method."
 msgstr "Červené/zelené brýle, stupně šedi"
 
-#: src/player_qt.cpp:239
-msgid "Red/blue glasses, monochrome method"
+#: src/main.cpp:462
+#, fuzzy
+msgid "Red/blue anaglyph, monochrome method."
 msgstr "Červené/modré brýle, stupně šedi"
 
-#: src/player_qt.cpp:243
-msgid "Swap left/right"
-msgstr "Prohoď levou/pravou"
-
-#: src/player_qt.cpp:244
-msgid ""
-"Swap the left and right view. Use this if the 3D effect seems wrong."
+#: src/main.cpp:463
+msgid "Multi-display via Equalizer (2D setup)."
 msgstr ""
-"Prohoď levou a pravou. Použijte, pokud je 3D efekt špatný (obrácený)"
 
-#: src/player_qt.cpp:511
-msgid "Off"
-msgstr "Žádné"
-
-#: src/player_qt.cpp:745
-msgid ""
-"This slider shows the progress during video playback, and can be used to "
-"seek in the video."
+#: src/main.cpp:464
+msgid "Multi-display via Equalizer (3D setup)."
 msgstr ""
-"Tento posuvník zobrazuje pozici přehrávaného videa, můžete ho použít pro "
-"vyhledávání ve videu."
 
-#: src/player_qt.cpp:752
-msgid "Elapsed / total time."
-msgstr "Uplynulý / celkový čas."
-
-#: src/player_qt.cpp:762
-msgid "Play."
-msgstr "Spustit."
-
-#: src/player_qt.cpp:766
-msgid "Pause."
-msgstr "Pozastav."
+#: src/main.cpp:465
+#, fuzzy
+msgid "Swap left/right view."
+msgstr "Prohoď levou/pravou"
 
-#: src/player_qt.cpp:770
-msgid "Stop."
-msgstr "Zastav."
+#: src/main.cpp:466
+#, fuzzy
+msgid "Fullscreen."
+msgstr "Dvě obrazovky:"
 
-#: src/player_qt.cpp:775
-msgid "Toggle loop mode."
-msgstr "Přepnout přehrávání ve smyčce."
+#: src/main.cpp:467
+#, fuzzy
+msgid "Use the listed screens in fullscreen mode."
+msgstr "Použij více obrazovek pro celoobrazový režim."
 
-#: src/player_qt.cpp:782
-msgid ""
-"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
-"f key."
+#: src/main.cpp:468
+msgid "Screen numbers start with 1."
 msgstr ""
-"Přepni do režimu celé obrazovky. Tento režim můžete ukončit stiskem "
-"tlačítka f"
-
-#: src/player_qt.cpp:788
-msgid "Center the video area on your screen."
-msgstr "Vycentruj video na středu obrazovky."
-
-#: src/player_qt.cpp:795
-msgid "Seek backward 10 minutes."
-msgstr "Přeskoč 10 minut zpět."
-
-#: src/player_qt.cpp:800
-msgid "Seek backward 1 minute."
-msgstr "Přeskoč 1 minutu zpět."
-
-#: src/player_qt.cpp:806
-msgid "Seek backward 10 seconds."
-msgstr "Přeskoč 10 vteřin zpět."
-
-#: src/player_qt.cpp:812
-msgid "Seek forward 10 seconds."
-msgstr "Přeskoč 10 vteřin dopředu."
-
-#: src/player_qt.cpp:817
-msgid "Seek forward 1 minute."
-msgstr "Přeskoč 1 minutu dopředu."
-
-#: src/player_qt.cpp:823
-msgid "Seek forward 10 minutes."
-msgstr "Přeskoč 10 minut dopředu."
-
-#: src/player_qt.cpp:1052
-msgid "Display Color Adjustments"
-msgstr "Zobraz nastavení barev"
-
-#: src/player_qt.cpp:1054
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#: src/player_qt.cpp:1065
-msgid "Brightness:"
-msgstr "Jas:"
-
-#: src/player_qt.cpp:1076
-msgid "Hue:"
-msgstr "Odstín:"
-
-#: src/player_qt.cpp:1087
-msgid "Saturation:"
-msgstr "Sytost:"
 
-#: src/player_qt.cpp:1099 src/player_qt.cpp:1290 src/player_qt.cpp:1406
-#: src/player_qt.cpp:1695 src/player_qt.cpp:1875 src/player_qt.cpp:2546
-#: src/player_qt.cpp:2742 src/player_qt.cpp:2988
-msgid "OK"
-msgstr "OK"
-
-#: src/player_qt.cpp:1261
-msgid "Display Crosstalk Calibration"
-msgstr "Zobra Crosstalk kalibraci"
-
-#. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/player_qt.cpp:1264
-msgid ""
-"Please read the manual to find out how to measure the crosstalk "
-"levels of your display."
+#: src/main.cpp:469
+msgid "An empty list defaults to the primary screen."
 msgstr ""
-"Přečtěte si prosím v manuálu jak změřit nastavení crosstalku pro "
-"váš monitor."
 
-#: src/player_qt.cpp:1268
-msgid "Red:"
-msgstr "Červená:"
+#: src/main.cpp:470
+#, fuzzy
+msgid "Flip left view vertically when fullscreen."
+msgstr "překlop levý obraz vertikálně."
 
-#: src/player_qt.cpp:1275
-msgid "Green:"
-msgstr "Zelená:"
+#: src/main.cpp:471
+#, fuzzy
+msgid "Flop left view horizontally when fullscreen."
+msgstr "překlop levý obraz horizontálně."
 
-#: src/player_qt.cpp:1282
-msgid "Blue:"
-msgstr "Modrá:"
+#: src/main.cpp:472
+#, fuzzy
+msgid "Flip right view vertically when fullscreen."
+msgstr "překlop pravý obraz vertikálně."
 
-#: src/player_qt.cpp:1348
-msgid "Subtitle Settings"
-msgstr "Nastavení titulků"
+#: src/main.cpp:473
+#, fuzzy
+msgid "Flop right view horizontally when fullscreen."
+msgstr "překlop pravý obraz horizontálně."
 
-#: src/player_qt.cpp:1350
-msgid "These settings apply to soft subtitles, but not to bitmaps."
+#: src/main.cpp:474
+msgid "Set zoom for wide videos (0=off to 1=full)."
 msgstr ""
-"Toto nastavení se aplikuje titulky v textové podobě, ne na obrázkové."
 
-#: src/player_qt.cpp:1352
-msgid "Encoding:"
-msgstr "Kódování:"
+#: src/main.cpp:475
+msgid "Crop video to given aspect ratio (0:0=off)."
+msgstr ""
 
-#: src/player_qt.cpp:1353
-msgid "Set the subtitle character set encoding."
-msgstr "Nastaví znakovou stránku titulků."
+#: src/main.cpp:476
+#, fuzzy
+msgid "Center window on screen."
+msgstr "Vycentruj video na středu obrazovky."
 
-#: src/player_qt.cpp:1367
-msgid "Override font:"
-msgstr "Vynutit font:"
+#: src/main.cpp:477
+#, fuzzy
+msgid "Set subtitle encoding."
+msgstr "kodek titulků"
 
-#: src/player_qt.cpp:1368
-msgid "Override the subtitle font family."
+#: src/main.cpp:478
+#, fuzzy
+msgid "Set subtitle font name."
 msgstr "Vynutí font titulků."
 
-#: src/player_qt.cpp:1376
-msgid "Override font size:"
-msgstr "Vynutit velikost fontu:"
-
-#: src/player_qt.cpp:1377
-msgid "Override the subtitle font size."
+#: src/main.cpp:479
+#, fuzzy
+msgid "Set subtitle font size."
 msgstr "Vynutí velikost titulků."
 
-#: src/player_qt.cpp:1386
-msgid "Override scale factor:"
-msgstr "Vynutit zvětšení:"
-
-#: src/player_qt.cpp:1387
-msgid "Override the subtitle scale factor."
+#: src/main.cpp:480
+#, fuzzy
+msgid "Set subtitle scale factor."
 msgstr "Vynutí zvětšní titulků."
 
-#: src/player_qt.cpp:1397
-msgid "Override color:"
-msgstr "Vynutit barvu:"
-
-#: src/player_qt.cpp:1398
-msgid "Override the subtitle color."
-msgstr "Vynutí barvu titulků."
-
-#: src/player_qt.cpp:1644
-msgid "Stereoscopic Video Settings"
-msgstr "Nastavení 3D obrazu"
+#: src/main.cpp:481
+msgid "Set subtitle color, in [AA]RRGGBB format."
+msgstr ""
 
-#: src/player_qt.cpp:1646
-msgid "Parallax:"
-msgstr "Parallax:"
+#: src/main.cpp:482
+msgid "Subtitle parallax adjustment (-1 to +1)."
+msgstr ""
 
-#: src/player_qt.cpp:1647
-msgid ""
-"Adjust parallax, from -1 to +1. This changes the separation of left and "
-"right view, and thus the perceived distance of the scene."
+#: src/main.cpp:483
+msgid "Parallax adjustment (-1 to +1)."
 msgstr ""
-"Upraví parallax, od -1 do +1. Změní vzdálenost levého a pravého obrazu a "
-"tím nastaví hloubku vnímání 3D scény."
 
-#: src/player_qt.cpp:1662
-msgid "Subtitle parallax:"
-msgstr "Parallax titulků:"
+#: src/main.cpp:484
+msgid "Crosstalk leak level (0 to 1)."
+msgstr ""
 
-#: src/player_qt.cpp:1663
-msgid ""
-"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
-"distance of the subtitles."
+#: src/main.cpp:485
+msgid "Comma-separated values for R,G,B."
 msgstr ""
-"Upraví parallax titulků, od -1 do +1. Změní vnímanou vzdálenost titulků.</"
-"p>"
 
-#: src/player_qt.cpp:1678
-msgid "Ghostbusting:"
-msgstr "Ghostbusting:"
+#: src/main.cpp:486
+msgid "Amount of ghostbusting to apply (0 to 1)."
+msgstr ""
 
-#: src/player_qt.cpp:1679
-msgid ""
-"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
-"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
-"does not work with anaglyph glasses."
+#: src/main.cpp:487
+msgid "Benchmark mode (no audio, show fps)."
 msgstr ""
-"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
-"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
-"does not work with anaglyph glasses."
 
-#: src/player_qt.cpp:1826
-msgid "Open device"
-msgstr "Otevři zařízení"
+#: src/main.cpp:488
+msgid "Frame rate divisor for display refresh rate."
+msgstr ""
 
-#: src/player_qt.cpp:1829
-msgid "Choose a device type."
-msgstr "Vyberte typ zařízení."
+#: src/main.cpp:489
+msgid "Default is 0 for benchmark mode, 1 otherwise."
+msgstr ""
 
-#: src/player_qt.cpp:1830
-msgid "Default"
-msgstr "Výchozí"
+#: src/main.cpp:490
+msgid "Loop the input media."
+msgstr ""
 
-#: src/player_qt.cpp:1834 src/player_qt.cpp:1837
-msgid "Choose a device."
-msgstr "Vyberte zařízení."
+#: src/main.cpp:492
+msgid "Interactive control:"
+msgstr ""
 
-#: src/player_qt.cpp:1840
-msgid "Set the X11 device string. Refer to the manual for details."
-msgstr "Zadejte X11 device string. Podrobnosti najdete v manuálu."
+#: src/main.cpp:493
+#, fuzzy
+msgid "Leave fullscreen mode, or quit."
+msgstr "V celoobrazovém režimu,"
 
-#: src/player_qt.cpp:1849
-msgid "Request frame size"
-msgstr "Vynutit velikost obrazu"
+#: src/main.cpp:494
+#, fuzzy
+msgid "Quit."
+msgstr "&Ukončit..."
 
-#: src/player_qt.cpp:1850
-msgid ""
-"Request a specific frame size from the device, e.g. 640x480. The device "
-"must support this frame size. Some devices require a frame size to be "
-"selected."
+#: src/main.cpp:515
+msgid "Seek according to horizontal click position."
 msgstr ""
-"Požaduj danou velikost obrazu, například 640x480. Zařízení musí danou "
-"velikost podporovat. Některá zařízení vyžadují, aby byla velikost nastavena."
-""
-
-#: src/player_qt.cpp:1861
-msgid "Request frame rate"
-msgstr "Vynutit snímkovou frekvenci"
 
-#: src/player_qt.cpp:1862
-msgid ""
-"Request a specific frame rate from the device, e.g. 25/1. The device must "
-"support this frame rate. Some devices require a frame rate to be selected.</"
-"p>"
+#: src/main.cpp:523
+msgid "No audio devices known."
 msgstr ""
-"Požaduj danou snímkovou frekvenci, například 25/1. Zařízení musí danou "
-"frekvenci podporovat. Některá zařízení vyžadují, aby byla frekvence "
-"nastavena."
 
-#: src/player_qt.cpp:1873 src/player_qt.cpp:2545 src/player_qt.cpp:2741
-msgid "Cancel"
-msgstr "Zrušit"
+#: src/main.cpp:595
+msgid "Benchmark mode: audio and time synchronization disabled."
+msgstr "Testovací režim, synchronizace zvuku a času je vypnuta."
 
-#: src/player_qt.cpp:2048
-msgid "&File"
-msgstr "&Soubor"
+#: src/main.cpp:729
+msgid "This version of Bino was compiled without support for LIRC."
+msgstr "Tato verze Bina byla zkompilována bez podpory knihovny LIRC."
 
-#: src/player_qt.cpp:2049
-msgid "&Open..."
-msgstr "&Otevřít..."
+#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
+#: src/media_data.cpp:935
+#, c-format
+msgid "%dx%d, %.3g:1"
+msgstr "%dx%d, %.3g:1"
 
-#: src/player_qt.cpp:2054
-msgid "Open &URL..."
-msgstr "Otevřít &URL..."
+#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
+#: src/media_data.cpp:1066
+#, c-format
+msgid "%s, %d ch., %g kHz, %d bit"
+msgstr "%s, %d ch., %g kHz, %d bit"
 
-#: src/player_qt.cpp:2058
-msgid "Open &device..."
-msgstr "Otevřít &zařízení..."
+#: src/media_input.cpp:282
+#, c-format
+msgid "Video %s: %s"
+msgstr "Video %s: %s"
 
-#: src/player_qt.cpp:2063
-msgid "&Quit..."
-msgstr "&Ukončit..."
+#: src/media_input.cpp:287
+msgid "No video."
+msgstr "Žádná video stopa."
 
-#: src/player_qt.cpp:2069
-msgid "&Preferences"
-msgstr "&Nastavení"
+#: src/media_input.cpp:293
+#, c-format
+msgid "Audio %s: %s"
+msgstr "Zvuk %s: %s"
 
-#: src/player_qt.cpp:2072
-msgid "&Fullscreen Settings..."
-msgstr "Nastavení &celoobrazového režimu..."
+#: src/media_input.cpp:298
+msgid "No audio."
+msgstr "Žádná zvuková stopa."
 
-#: src/player_qt.cpp:2075
-msgid "Display &Color Adjustments..."
-msgstr "Nastavení &barev..."
+#: src/media_input.cpp:304
+#, c-format
+msgid "Subtitle %s: %s"
+msgstr "Titulky %s: %s"
 
-#: src/player_qt.cpp:2078
-msgid "Display Cross&talk Calibration..."
-msgstr "Nastavení &Crosstalku..."
+#: src/media_input.cpp:309
+msgid "No subtitle."
+msgstr "Žádné titulky."
 
-#: src/player_qt.cpp:2082
-msgid "&Subtitle Settings..."
-msgstr "Nastavení &Titulků..."
+#: src/media_input.cpp:311
+#, c-format
+msgid "Duration: %g seconds"
+msgstr "Délka: %g sekund"
 
-#: src/player_qt.cpp:2086
-msgid "Stereoscopic Video Settings..."
-msgstr "Nastavení 3D videa..."
+#: src/media_input.cpp:314
+#, c-format
+msgid "Stereo layout: %s"
+msgstr "Stereo režim: %s"
 
-#: src/player_qt.cpp:2089
-msgid "&Help"
-msgstr "&Nápověda"
+#: src/media_object.cpp:677
+#, c-format
+msgid "%s video stream %d: Unsupported stereo layout %s."
+msgstr "%s video stopa %d: Nepodporovaný stereo režim %s."
 
-#: src/player_qt.cpp:2090
-msgid "&Manual..."
-msgstr "&Manuál..."
+#: src/media_object.cpp:715
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with %d channels."
+msgstr "%s zvuková stopa %d: Nemohu přehrát zvukovou stopu s %d kanály."
 
-#: src/player_qt.cpp:2095
-msgid "&Website..."
-msgstr "&Webová stránka..."
+#: src/media_object.cpp:744
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with sample format %s."
+msgstr "%s zvuková stopa %d: Nemohu přehrát zvukovou stopu ve formátu %s."
 
-#: src/player_qt.cpp:2099
-msgid "&Keyboard Shortcuts"
-msgstr "&Klávesové zkratky"
+#: src/media_object.cpp:800
+#, c-format
+msgid "No support available for %s device."
+msgstr "Zařízení %s není podporováno."
 
-#: src/player_qt.cpp:2103
-msgid "&About"
-msgstr "&O Binu"
+#: src/media_object.cpp:803
+msgid "default"
+msgstr "výchozí"
 
-#: src/player_qt.cpp:2169 src/player_qt.cpp:2891 src/player_qt.cpp:2899
-#: src/video_output_qt.cpp:92 src/video_output_qt.cpp:400
-#: src/video_output_qt.cpp:422
-msgid "Error"
-msgstr "Chyba"
+#: src/media_object.cpp:832
+#, c-format
+msgid "%s: Cannot read stream info: %s"
+msgstr "%s: Nemohu přečíst informace o stopě: %s"
 
-#: src/player_qt.cpp:2528
-msgid "Open files"
-msgstr "Otevři soubory"
+#: src/media_object.cpp:876
+#, c-format
+msgid "%s stream %d: Cannot open %s: %s"
+msgstr "%s stopa %d: Nemohu otevřít %s: %s"
 
-#: src/player_qt.cpp:2541
-msgid "Open URL"
-msgstr "Otevři URL"
+#: src/media_object.cpp:877
+msgid "video codec"
+msgstr "video kodek"
 
-#: src/player_qt.cpp:2542
-msgid "URL:"
-msgstr "URL:"
+#: src/media_object.cpp:878
+msgid "audio codec"
+msgstr "zvukový kodek"
 
-#: src/player_qt.cpp:2689
-msgid "Fullscreen/Multiscreen Settings"
-msgstr "Nastavení Celoobrazového/Víceobrazového režimu"
+#: src/media_object.cpp:879
+msgid "subtitle codec"
+msgstr "kodek titulků"
 
-#: src/player_qt.cpp:2691
-msgid "Configure fullscreen mode:"
-msgstr "Nastavení celoobrazového režimu:"
+#: src/media_object.cpp:880
+msgid "data"
+msgstr "data"
 
-#: src/player_qt.cpp:2692
-msgid "Select the screens to use in fullscreen mode."
-msgstr "Vyber obrazovky, které budou použity v celoobrazovém režimu."
+#: src/media_object.cpp:881
+msgid "codec not supported"
+msgstr "kodek není podporován"
 
-#: src/player_qt.cpp:2694
-msgid "Single screen:"
-msgstr "Jedna obrazovka:"
+#: src/media_object.cpp:891
+#, c-format
+msgid "%s video stream %d: Invalid frame size."
+msgstr "%s video stopa %d: Špatná velikost obrazu."
 
-#: src/player_qt.cpp:2695
-msgid "Use a single screen for fullscreen mode."
-msgstr "Použij jednu obrazovku pro celoobrazový režim."
+#: src/media_object.cpp:935
+#, c-format
+msgid "%s video stream %d: Cannot initialize conversion context."
+msgstr "%s video stopa %d: Nemohu vytvořit conversion context."
 
-#: src/player_qt.cpp:2698
-msgid "Primary screen"
-msgstr "Primární obrazovka"
+#: src/media_object.cpp:998
+#, c-format
+msgid "Video stream %d: %s / %s, %g seconds"
+msgstr "Video stopa %d: %s / %s, %g sekund"
 
-#: src/player_qt.cpp:2703 src/player_qt.cpp:2717 src/player_qt.cpp:2718
+#: src/media_object.cpp:1002
 #, c-format
-msgid "Screen %d"
-msgstr "Obrazovka %d"
+msgid "Using up to %d threads for decoding."
+msgstr "Využívám až %d vláken pro dekódování."
 
-#: src/player_qt.cpp:2707
-msgid "Dual screen:"
-msgstr "Dvě obrazovky:"
+#: src/media_object.cpp:1007
+#, c-format
+msgid "Audio stream %d: %s / %s, %g seconds"
+msgstr "Zvuková stopa %d: %s / %s, %g sekund"
 
-#: src/player_qt.cpp:2708
-msgid "Use two screens for fullscreen mode."
-msgstr "Použij dvě obrazovky pro celoobrazový režim."
+#: src/media_object.cpp:1014
+#, c-format
+msgid "Subtitle stream %d: %s / %s, %g seconds"
+msgstr "Titulky %d: %s / %s, %g sekund"
 
-#: src/player_qt.cpp:2722
-msgid "Multi screen:"
-msgstr "Více obrazovek:"
+#: src/media_object.cpp:1021
+msgid "No usable streams."
+msgstr "Žádná použitelná stopa."
 
-#: src/player_qt.cpp:2723
-msgid "Use multiple screens for fullscreen mode."
-msgstr "Použij více obrazovek pro celoobrazový režim."
+#: src/media_object.cpp:1302 src/media_object.cpp:1332
+#: src/media_object.cpp:1362
+#, c-format
+msgid "%s: Cannot duplicate packet."
+msgstr "%s: Nemohu duplikovat paket."
 
-#: src/player_qt.cpp:2725
-msgid "Comma-separated list of screens to use for fullscreen mode."
-msgstr ""
-"Seznam obrazovek pro použití v celoobrazovém režimu, oddělený čárkou."
+#: src/media_object.cpp:1456
+#, fuzzy, c-format
+msgid "%s video stream %d: Dropping %dx%d frame"
+msgstr "%s video stopa %d: Špatná velikost obrazu."
 
-#: src/player_qt.cpp:2729
-msgid "When in fullscreen mode,"
-msgstr "V celoobrazovém režimu,"
+#: src/media_object.cpp:1919
+#, c-format
+msgid "%s: Seeking failed."
+msgstr "%s: Vyhledávání selhalo."
 
-#: src/player_qt.cpp:2730
-msgid "Set special left/right view handling for fullscreen mode."
-msgstr ""
-"Nastav zvláštní chování pravého/levého obrazu při celoobrazovém režimu.</"
-"p>"
+#: src/player.cpp:434
+#, fuzzy, c-format
+msgid "Video: delay %g seconds/%g frames; dropping next frame."
+msgstr "Video: zpoždění %g sekund; zahazuji následující snímek."
 
-#: src/player_qt.cpp:2732
-msgid "flip left view vertically."
-msgstr "překlop levý obraz vertikálně."
+#: src/player.cpp:450
+#, c-format
+msgid "FPS: %.2f"
+msgstr "FPS: %.2f"
 
-#: src/player_qt.cpp:2734
-msgid "flop left view horizontally."
-msgstr "překlop levý obraz horizontálně."
+#: src/player_equalizer.cpp:116
+msgid "Reading input frame failed."
+msgstr "Selhalo čtení snímku."
 
-#: src/player_qt.cpp:2736
-msgid "flip right view vertically."
-msgstr "překlop pravý obraz vertikálně."
+#: src/player_equalizer.cpp:165 src/video_output_qt.cpp:590
+#: src/video_output_qt.cpp:597
+msgid "Waiting for subtitle renderer initialization..."
+msgstr "Čekám na inicializaci vykreslování titulků..."
 
-#: src/player_qt.cpp:2738
-msgid "flop right view horizontally."
-msgstr "překlop pravý obraz horizontálně."
+#: src/player_equalizer.cpp:250
+msgid "Init data mapping failed."
+msgstr "Počáteční mapování dat selhalo."
 
-#: src/player_qt.cpp:2891
-msgid "Cannot open manual."
-msgstr "Nemohu otevřít manál."
+#: src/player_equalizer.cpp:251
+msgid "Frame data mapping failed."
+msgstr "Mapování dat snímku selhalo."
 
-#: src/player_qt.cpp:2899
-msgid "Cannot open website."
-msgstr "Nemohu otevřít webovou stránku."
+#: src/player_equalizer.cpp:252
+msgid "Video player initialization failed."
+msgstr "Nepodařilo se inicializovat přehrávač videa."
 
-#: src/player_qt.cpp:2905
-msgid "Keyboard Shortcuts"
-msgstr "Klávesové zkratky"
+#: src/player_equalizer.cpp:253
+msgid "Need at least OpenGL 2.1."
+msgstr "Je vyžadováno alespon OpenGL 2.1."
 
-#. TRANSLATORS: This is a HTML table, shown under Help->Keyboard Shortcuts.
-#. Please make sure that your translation formats properly.
-#: src/player_qt.cpp:2908
-msgid ""
-"Keyboard control: <table><tr><td>q or ESC</td><td>Stop</td></"
-"tr><tr><td>p or SPACE</td><td>Pause / unpause</td></tr><tr><td>f</"
-"td><td>Toggle fullscreen</td></tr><tr><td>c</td><td>Center window</td></"
-"tr><tr><td>e</td><td>Swap left/right eye</td></tr><tr><td>v</td><td>Cycle "
-"through available video streams</td></tr><tr><td>a</td><td>Cycle through "
-"available audio streams</td></tr><tr><td>s</td><td>Cycle through available "
-"subtitle streams</td></tr><tr><td>1, 2</td><td>Adjust contrast</td></"
-"tr><tr><td>3, 4</td><td>Adjust brightness</td></tr><tr><td>5, 6</"
-"td><td>Adjust hue</td></tr><tr><td>7, 8</td><td>Adjust saturation</td></"
-"tr><tr><td>&lt;, &gt;</td><td>Adjust parallax</td></tr><tr><td>(, )</"
-"td><td>Adjust ghostbusting</td></tr><tr><td>left, right</td><td>Seek 10 "
-"seconds backward / forward</td></tr><tr><td>up, down</td><td>Seek 1 minute "
-"backward / forward</td></tr><tr><td>page up, page down</td><td>Seek 10 "
-"minutes backward / forward</td></tr></table>"
-msgstr ""
-"Ovládání klávesnicí: <table><tr><td>q nebo ESC</td><td>Ukončit</td></"
-"tr><tr><td>p nebo MEZERA</td><td>Pozastav / pokračuj</td></tr><tr><td>f</"
-"td><td>Přepni na celou obrazovku</td></tr><tr><td>c</td><td>Vycentruj okno</"
-"td></tr><tr><td>e</td><td>Prohoď levé/pravé oko</td></tr><tr><td>v</"
-"td><td>Procházej dostupné video stopy</td></tr><tr><td>a</td><td>Procházej "
-"dostupné zvukové stopy</td></tr><tr><td>s</td><td>Procházej dostupné "
-"titulky</td></tr><tr><td>1, 2</td><td>Uprav kontrast</td></tr><tr><td>3, 4</"
-"td><td>Uprav jas</td></tr><tr><td>5, 6</td><td>Uprav odstín</td></"
-"tr><tr><td>7, 8</td><td>Uprav sytost</td></tr><tr><td>&lt;, &gt;</"
-"td><td>Uprav parallax</td></tr><tr><td>(, )</td><td>Uprav ghostbusting</td></"
-"tr><tr><td>left, right</td><td>Přeskoč 10 sekund dopředu / zpět</td></"
-"tr><tr><td>up, down</td><td>Přeskoč 1 minutu dopředu / zpět</td></"
-"tr><tr><td>page up, page down</td><td>Přeskoč 10 minut dopředu / zpět</td></"
-"tr></table>"
-
-#: src/player_qt.cpp:2935
-#, c-format
-msgid "About %s"
-msgstr "O pragramu %s"
+#: src/player_equalizer.cpp:430
+msgid "No canvas in Equalizer configuration."
+msgstr "V konfiguraci Equalizeru není nastaveno plátno."
 
-#: src/player_qt.cpp:2941
-#, c-format
-msgid "The %s 3D video player"
-msgstr "%s 3D video přehrávač"
+#: src/player_equalizer.cpp:437
+#, fuzzy, c-format
+msgid "Equalizer canvas: %gx%g, aspect ratio %g:1"
+msgstr "%gx%g, poměr stran %g:1"
 
-#: src/player_qt.cpp:2946
-#, c-format
+#: src/player_equalizer.cpp:922 src/video_output_qt.cpp:560
 msgid ""
-"%s version %s.Copyright (C) 2011 the Bino developers.This "
-"is free software. You may redistribute copies of it under the terms of the "
-"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
-"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
-"\"%s\">%s</a> for more information on this software."
-msgstr ""
-"%s verze %s.Copyright (C) 2011 Bino vývojáři.Tento program "
-"je svobodný software. Můžete jej šířit a modifikovat podle ustanovení <a "
-"href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</a>."
-"Tento program je rozšiřován v naději, že bude užitečný, avšak BEZ JAKÉKOLI "
-"ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI anebo VHODNOSTI PRO "
-"URČITÝ ÚČEL.Navštivte <a href=\"%s\">%s</a> pro více informací o "
-"tomto software."
-
-#: src/player_qt.cpp:2983
-msgid "About"
-msgstr "O programu"
+"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
+"objects."
+msgstr "OpenGL nepodporuje verzi 2.1 a framebuffer objekty."
 
-#: src/player_qt.cpp:2984
-msgid "Libraries"
-msgstr "Knihovny"
+#: src/player_equalizer.cpp:1105
+msgid "Equalizer initialization failed."
+msgstr "Chyba inicializace Equalizeru."
 
-#: src/player_qt.cpp:2985
-msgid "Team"
-msgstr "Tým"
+#: src/player_equalizer.cpp:1113
+msgid "Cannot get equalizer configuration."
+msgstr "Nelze získat nastavení Equalizeru."
 
-#: src/player_qt.cpp:2986
-msgid "License"
-msgstr "Licence"
+#: src/player_equalizer.cpp:1127
+msgid "Equalizer configuration initialization failed."
+msgstr "Nelze získat nastavení Equalizeru."
 
 #: src/subtitle_renderer.cpp:223
 msgid "Cannot initialize LibASS."
@@ -1469,81 +1842,369 @@
 msgid "Subtitle character set conversion failed: %s"
 msgstr "Konverze kódování titulků selhala: %s"
 
-#: src/video_output.cpp:363 src/video_output.cpp:473
-msgid "Cannot create a PBO buffer."
-msgstr "Nemohu vytvořit PBO buffer."
-
-#: src/video_output_qt.cpp:313
-#, c-format
-msgid "Cannot initialize GLEW: %s"
-msgstr "Nemohu inicializovat GLEW: %s"
-
-#: src/video_output_qt.cpp:343
-msgid "Please wait"
-msgstr "Prosím čekejte"
-
-#: src/video_output_qt.cpp:400 src/video_output_qt.cpp:417
-msgid "Cannot set OpenGL context format."
-msgstr "Nemohu nastavit OpenGL formát."
-
-#: src/video_output_qt.cpp:412
-msgid "The display does not support OpenGL stereo mode."
-msgstr "Stereo OpenGL režim není podporován."
-
-#: src/video_output_qt.cpp:505
-msgid "Cannot suspend screensaver."
-msgstr "Nelze zakázat spořič obrazovky."
-
-#: src/video_output_qt.cpp:520
-msgid "Cannot resume screensaver."
-msgstr "Nelze povolit spořič obrazovky."
-
-#: src/xgl.cpp:200
-#, c-format
-msgid "OpenGL FBO error %s."
-msgstr "Chyba FBO %s."
-
-#: src/xgl.cpp:217
+#: src/video_output.cpp:145
 #, c-format
 msgid "OpenGL error 0x%04X."
 msgstr "OpenGL chyba 0x%04X."
 
-#: src/xgl.cpp:282
+#: src/video_output.cpp:203
 #, c-format
 msgid "OpenGL %s '%s': compiler warning:"
 msgstr "OpenGL %s '%s': varování při kompilaci:"
 
-#: src/xgl.cpp:283 src/xgl.cpp:292
+#: src/video_output.cpp:204 src/video_output.cpp:209
 msgid "vertex shader"
 msgstr "vertex shader"
 
-#: src/xgl.cpp:284 src/xgl.cpp:293
-msgid "geometry shader"
-msgstr "geometry shader"
-
-#: src/xgl.cpp:285 src/xgl.cpp:294
+#: src/video_output.cpp:204 src/video_output.cpp:209
 msgid "fragment shader"
 msgstr "fragment shader"
 
-#: src/xgl.cpp:291
+#: src/video_output.cpp:208
 #, c-format
 msgid "OpenGL %s '%s': compilation failed."
 msgstr "OpenGL %s '%s': selhala kompilace."
 
-#: src/xgl.cpp:296 src/xgl.cpp:363
+#: src/video_output.cpp:211 src/video_output.cpp:288
 msgid "unknown error"
 msgstr "neznámá chyba"
 
-#: src/xgl.cpp:357
+#: src/video_output.cpp:284
 #, c-format
 msgid "OpenGL program '%s': linker warning:"
 msgstr "OpenGL program '%s': varování linkeru:"
 
-#: src/xgl.cpp:362
+#: src/video_output.cpp:287
 #, c-format
 msgid "OpenGL program '%s': linking failed."
 msgstr "OpenGL program '%s': selhalo linkování."
 
+#: src/video_output.cpp:563 src/video_output.cpp:675
+msgid "Cannot create a PBO buffer."
+msgstr "Nemohu vytvořit PBO buffer."
+
+#: src/video_output_qt.cpp:555
+#, c-format
+msgid "Cannot initialize GLEW: %s"
+msgstr "Nemohu inicializovat GLEW: %s"
+
+#: src/video_output_qt.cpp:588
+msgid "Please wait"
+msgstr "Prosím čekejte"
+
+#: src/video_output_qt.cpp:643
+#, fuzzy
+msgid "Cannot get valid OpenGL context."
+msgstr "Nemohu nastavit OpenGL formát."
+
+#: src/video_output_qt.cpp:654
+msgid "The display does not support OpenGL stereo mode."
+msgstr "Stereo OpenGL režim není podporován."
+
+#: src/video_output_qt.cpp:659
+msgid "Cannot set OpenGL context format."
+msgstr "Nemohu nastavit OpenGL formát."
+
+#: src/video_output_qt.cpp:752
+msgid "Cannot suspend screensaver."
+msgstr "Nelze zakázat spořič obrazovky."
+
+#: src/video_output_qt.cpp:767
+msgid "Cannot resume screensaver."
+msgstr "Nelze povolit spořič obrazovky."
+
+#~ msgid "Cannot initialize mutex: %s"
+#~ msgstr "Nelze inicializovat mutex: %s"
+
+#~ msgid "Cannot lock mutex: %s"
+#~ msgstr "Nelze zavřít mutex: %s"
+
+#~ msgid "Cannot unlock mutex: %s"
+#~ msgstr "Nelze otevřít mutex: %s"
+
+#~ msgid "Cannot create thread: %s"
+#~ msgstr "Nelze vytvořit vlákno: %s"
+
+#~ msgid "Cannot join with thread: %s"
+#~ msgstr "Nelze se spojit s vláknem: %s"
+
+#~ msgid "Cannot cancel thread: %s"
+#~ msgstr "Nelze zrušit vlákno: %s"
+
+#~ msgid ""
+#~ "Usage:\n"
+#~ " %s [option...] [file...]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --help Print help.\n"
+#~ " --version Print version.\n"
+#~ " -n|--no-gui Do not use the GUI, just show a plain window.\n"
+#~ " -L|--log-level=LEVEL Set log level (debug/info/warning/error/"
+#~ "quiet).\n"
+#~ " --device-type=TYPE Type of input device: default, firewire, x11.\n"
+#~ " --device-frame-size=WxH Request frame size WxH from input device.\n"
+#~ " --device-frame-rate=N/D Request frame rate N/D from input device.\n"
+#~ " --lirc-config=FILE Use the given LIRC configuration file. This\n"
+#~ " option can be used more than once.\n"
+#~ " -v|--video=STREAM Select video stream (1-n, depending on "
+#~ "input).\n"
+#~ " -a|--audio=STREAM Select audio stream (1-n, depending on "
+#~ "input).\n"
+#~ " -s|--subtitle=STREAM Select subtitle stream (0-n, dep. on input).\n"
+#~ " -i|--input=TYPE Select input type (default autodetect):\n"
+#~ " mono Single view.\n"
+#~ " separate-left-right Left/right separate streams, left first.\n"
+#~ " separate-right-left Left/right separate streams, right first.\n"
+#~ " top-bottom Left top, right bottom.\n"
+#~ " top-bottom-half Left top, right bottom, half height.\n"
+#~ " bottom-top Left bottom, right top.\n"
+#~ " bottom-top-half Left bottom, right top, half height.\n"
+#~ " left-right Left left, right right.\n"
+#~ " left-right-half Left left, right right, half width.\n"
+#~ " right-left Left right, right left.\n"
+#~ " right-left-half Left right, right left, half width.\n"
+#~ " even-odd-rows Left even rows, right odd rows.\n"
+#~ " odd-even-rows Left odd rows, right even rows.\n"
+#~ " -o|--output=TYPE Select output type:\n"
+#~ " mono-left Only left.\n"
+#~ " mono-right Only right.\n"
+#~ " top-bottom Left top, right bottom.\n"
+#~ " top-bottom-half Left top, right bottom, half height.\n"
+#~ " left-right Left left, right right.\n"
+#~ " left-right-half Left left, right right, half width.\n"
+#~ " even-odd-rows Left even rows, right odd rows.\n"
+#~ " even-odd-columns Left even columns, right odd columns.\n"
+#~ " checkerboard Left and right in checkerboard pattern.\n"
+#~ " hdmi-frame-pack HDMI frame packing mode.\n"
+#~ " red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
+#~ " red-cyan-half-color Red/cyan anaglyph, half color method.\n"
+#~ " red-cyan-full-color Red/cyan anaglyph, full color method.\n"
+#~ " red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
+#~ " green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
+#~ " green-magenta-half-color Green/magenta anaglyph, half color method.\n"
+#~ " green-magenta-full-color Green/magenta anaglyph, full color method.\n"
+#~ " green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
+#~ " amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
+#~ " amber-blue-half-color Amber/blue anaglyph, half color method.\n"
+#~ " amber-blue-full-color Amber/blue anaglyph, full color method.\n"
+#~ " amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
+#~ " red-green-monochrome Red/green anaglyph, monochrome method.\n"
+#~ " red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
+#~ " stereo OpenGL quad-buffered stereo.\n"
+#~ " equalizer Multi-display via Equalizer (2D setup).\n"
+#~ " equalizer-3d Multi-display via Equalizer (3D setup).\n"
+#~ " -S|--swap-eyes Swap left/right view.\n"
+#~ " -f|--fullscreen Fullscreen.\n"
+#~ " --fullscreen-screens= Use the listed screens in fullscreen mode.\n"
+#~ " [S0[,S1[,...]]] Screen numbers start with 1. The default\n"
+#~ " (empty list) is to use the primary screen.\n"
+#~ " --fullscreen-flip-left Flip left view vertically when fullscreen.\n"
+#~ " --fullscreen-flop-left Flop left view horizontally when fullscreen.\n"
+#~ " --fullscreen-flip-right Flip right view vertically when fullscreen.\n"
+#~ " --fullscreen-flop-right Flop right view horizontally when fullscreen.\n"
+#~ " -c|--center Center window on screen.\n"
+#~ " --subtitle-encoding=ENC Set subtitle encoding.\n"
+#~ " --subtitle-font=FONT Set subtitle font name.\n"
+#~ " --subtitle-size=N Set subtitle font size.\n"
+#~ " --subtitle-scale=S Set subtitle scale factor.\n"
+#~ " --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
+#~ " --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
+#~ " -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
+#~ " -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-"
+#~ "separated\n"
+#~ " values for the R,G,B channels.\n"
+#~ " -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
+#~ " -b|--benchmark Benchmark mode (no audio, show fps).\n"
+#~ " -l|--loop Loop the input media.\n"
+#~ "\n"
+#~ "Interactive control:\n"
+#~ " ESC Leave fullscreen mode, or quit.\n"
+#~ " q Quit.\n"
+#~ " p or SPACE Pause / unpause.\n"
+#~ " f Toggle fullscreen.\n"
+#~ " c Center window.\n"
+#~ " e Swap left/right eye.\n"
+#~ " v Cycle through available video streams.\n"
+#~ " a Cycle through available audio streams.\n"
+#~ " s Cycle through available subtitle streams.\n"
+#~ " 1, 2 Adjust contrast.\n"
+#~ " 3, 4 Adjust brightness.\n"
+#~ " 5, 6 Adjust hue.\n"
+#~ " 7, 8 Adjust saturation.\n"
+#~ " <, > Adjust parallax.\n"
+#~ " (, ) Adjust ghostbusting.\n"
+#~ " left, right Seek 10 seconds backward / forward.\n"
+#~ " up, down Seek 1 minute backward / forward.\n"
+#~ " page up, page down Seek 10 minutes backward / forward.\n"
+#~ " Mouse click Seek according to horizontal click position."
+#~ msgstr ""
+#~ "Použití:\n"
+#~ " %s [volba...] [soubor...]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --help Vytiskni nápovědu.\n"
+#~ " --version Vytiskni verzi.\n"
+#~ " -n|--no-gui Nepoužívej grafické rozhraní, pouze zobraz "
+#~ "holé okno.\n"
+#~ " -L|--log-level=LEVEL Co se bude logovat (debug/info/warning/error/"
+#~ "quiet).\n"
+#~ " --device-type=TYPE Typ vstupního zařízení: default, firewire, "
+#~ "x11.\n"
+#~ " --device-frame-size=WxH Požadovaná velikost snímku SÍRKAxVÝSKA ze "
+#~ "vstupního zařízení.\n"
+#~ " --device-frame-rate=N/D Požadovaná obnovovací frekvence CITATEL/"
+#~ "JMENOVATEL ze vstupního zařízení.\n"
+#~ " --lirc-config=FILE Použij daný LIRC konfigurační soubor. Tato\n"
+#~ " volba může být použita vícekrát.\n"
+#~ " -v|--video=STREAM Vyber video stopu(1-n, záleží na vstupu).\n"
+#~ " -a|--audio=STREAM Vyber zvukovou stopu (1-n, záleží na vstupu).\n"
+#~ " -s|--subtitle=STREAM Vyber stopu titulků (0-n, záleží na vstupu).\n"
+#~ " -i|--input=TYPE Vyber vstupní formát (výchozí je automatická "
+#~ "detekce):\n"
+#~ " mono Jeden obraz.\n"
+#~ " separate-left-right Oddělená levá/pravá stopa, levá první.\n"
+#~ " separate-right-left Oddělená levá/pravá stopa, pravá první.\n"
+#~ " top-bottom Levá nahoře, pravá dole.\n"
+#~ " top-bottom-half Levá nahoře, pravá dole, poloviční výška.\n"
+#~ " bottom-top Left dole, pravá nahoře.\n"
+#~ " bottom-top-half Left dole, pravá nahoře, poloviční výška.\n"
+#~ " left-right Levá nalevo, pravá napravo.\n"
+#~ " left-right-half Levá nalevo, pravá napravo, poloviční "
+#~ "šířka.\n"
+#~ " right-left Levá napravo, pravá nalevo.\n"
+#~ " right-left-half Levá napravo, pravá nalevo, poloviční "
+#~ "šířka.\n"
+#~ " even-odd-rows Levá sudé řádky, pravá liché.\n"
+#~ " odd-even-rows Levá liché řádky, pravá sudé.\n"
+#~ " -o|--output=TYPE Vyber výstupní formát:\n"
+#~ " mono-left Pouze levá.\n"
+#~ " mono-right Pouze pravá.\n"
+#~ " top-bottom Levá nahoře, pravá dole.\n"
+#~ " top-bottom-half Levá nahoře, pravá dole, poloviční výška.\n"
+#~ " left-right Levá nalevo, pravá napravo.\n"
+#~ " left-right-half Levá nalevo, pravá napravo, poloviční "
+#~ "šířka.\n"
+#~ " even-odd-rows Levá sudé řádky, pravá liché.\n"
+#~ " even-odd-columns Levá sudé sloupce, pravá liché.\n"
+#~ " checkerboard Levý a pravý v šachovnici.\n"
+#~ " hdmi-frame-pack HDMI režim.\n"
+#~ " red-cyan-monochrome Červená/modrá anaglyf, stupně šedi.\n"
+#~ " red-cyan-half-color Červená/modrá anaglyf, polotóny.\n"
+#~ " red-cyan-full-color Červená/modrá anaglyf, plné tóny.\n"
+#~ " red-cyan-dubois Červená/modrá anaglyf, Dubois.\n"
+#~ " green-magenta-monochrome Zelená/fialová anaglyf, stupně šedi.\n"
+#~ " green-magenta-half-color Zelená/fialová anaglyf, polotóny.\n"
+#~ " green-magenta-full-color Zelená/fialová anaglyf, plné tóny.\n"
+#~ " green-magenta-dubois Zelená/fialová anaglyf, Dubois.\n"
+#~ " amber-blue-monochrome Žlutá/modrá anaglyf, stupně šedi.\n"
+#~ " amber-blue-half-color Žlutá/modrá anaglyf, polotóny.\n"
+#~ " amber-blue-full-color Žlutá/modrá anaglyf, plné tóny.\n"
+#~ " amber-blue-dubois Žlutá/modrá anaglyf, Dubois.\n"
+#~ " red-green-monochrome Červená/zelená anaglyf, stupně šedi.\n"
+#~ " red-blue-monochrome Červená/modrá anaglyf, stupně šedi.\n"
+#~ " stereo OpenGL quad-buffered stereo.\n"
+#~ " equalizer Více monitorů použitím Equalizer (2D "
+#~ "scéna).\n"
+#~ " equalizer-3d Více monitorů použitím Equalizer (3D "
+#~ "scéna).\n"
+#~ " -S|--swap-eyes Prohoď levou/pravou.\n"
+#~ " -f|--fullscreen Celá obrazovka.\n"
+#~ " --fullscreen-screens= Použij vyjmenované obrazovky v "
+#~ "celoobrazovkovém režimu.\n"
+#~ " [S0[,S1[,...]]] Císla obrazovek začínají číslem 1. Výchozí\n"
+#~ " (prázdný seznam) znamená použít primární "
+#~ "obrazovku.\n"
+#~ " --fullscreen-flip-left Překlop levý obraz vertikálně.\n"
+#~ " --fullscreen-flop-left Překlop levý obraz horizontálně.\n"
+#~ " --fullscreen-flip-right Překlop pravý obraz vertikálně.\n"
+#~ " --fullscreen-flop-right Překlop pravýobraz horizontálně.\n"
+#~ " -c|--center Vycentruj okno na středu monitoru.\n"
+#~ " --subtitle-encoding=ENC Nastav kódování titulků.\n"
+#~ " --subtitle-font=FONT Nastav písmo titulků.\n"
+#~ " --subtitle-size=N Nastav velikost titulků.\n"
+#~ " --subtitle-scale=S Nastav škálovací poměr titulků.\n"
+#~ " --subtitle-color=COLOR Nastav barvu titulků, ve formátu [AA]RRGGBB.\n"
+#~ " --subtitle-parallax=VAL Nastav parallax titulků (-1 až +1).\n"
+#~ " -P|--parallax=VAL Nastv parallax (-1 až +1).\n"
+#~ " -C|--crosstalk=VAL Crosstalk (0 až 1); oddělený středníky\n"
+#~ " hodnoty pro kanály R,G,B.\n"
+#~ " -G|--ghostbust=VAL Ghostbusting (0 to 1).\n"
+#~ " -b|--benchmark Test výkonu (bez zvuk, zobrazuje fps).\n"
+#~ " -l|--loop Přehrávej vstupní soubor ve smýčce.\n"
+#~ "\n"
+#~ "Interaktivní ovládání:\n"
+#~ " ESC Opustit celoobrazovkový režim, nebo ukončit.\n"
+#~ " q Ukončit.\n"
+#~ " p nebo MEZERA Pozastav / pokračuj.\n"
+#~ " f Přepni na celou obrazovku.\n"
+#~ " c Vycentruj okno.\n"
+#~ " e Prohoď levé/pravé oko.\n"
+#~ " v Procházej dostupné video stopy.\n"
+#~ " a Procházej dostupné zvukové stopy.\n"
+#~ " s Procházej dostupné titulky.\n"
+#~ " 1, 2 Uprav kontrast.\n"
+#~ " 3, 4 Uprav jas.\n"
+#~ " 5, 6 Uprav odstín.\n"
+#~ " 7, 8 Uprav sytost.\n"
+#~ " <, > Uprav parallax.\n"
+#~ " (, ) Uprav ghostbusting.\n"
+#~ " levá, pravá Přeskoč 10 sekund dopředu / zpět.\n"
+#~ " nahoru, dolů Přeskoč 1 minutu dopředu / zpět.\n"
+#~ " page up, page down Přeskoč 10 minut dopředu / zpět.\n"
+#~ " Stisk myši Přeskoč vzhledem k horizontální pozici myši."
+
+#~ msgid "Equalizer canvas:"
+#~ msgstr "Plátno Equalizeru:"
+
+#~ msgid "Area for %g:1 video: [ %g %g %g %g @ %g ]"
+#~ msgstr "Oblast pro %g:1 video: [ %g %g %g %g @ %g ]"
+
+#~ msgid "Stereoscopic Video Settings"
+#~ msgstr "Nastavení 3D obrazu"
+
+#~ msgid "&Open..."
+#~ msgstr "&Otevřít..."
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid ""
+#~ "Keyboard control: <table><tr><td>q or ESC</td><td>Stop</td></"
+#~ "tr><tr><td>p or SPACE</td><td>Pause / unpause</td></tr><tr><td>f</"
+#~ "td><td>Toggle fullscreen</td></tr><tr><td>c</td><td>Center window</td></"
+#~ "tr><tr><td>e</td><td>Swap left/right eye</td></tr><tr><td>v</td><td>Cycle "
+#~ "through available video streams</td></tr><tr><td>a</td><td>Cycle through "
+#~ "available audio streams</td></tr><tr><td>s</td><td>Cycle through "
+#~ "available subtitle streams</td></tr><tr><td>1, 2</td><td>Adjust contrast</"
+#~ "td></tr><tr><td>3, 4</td><td>Adjust brightness</td></tr><tr><td>5, 6</"
+#~ "td><td>Adjust hue</td></tr><tr><td>7, 8</td><td>Adjust saturation</td></"
+#~ "tr><tr><td>&lt;, &gt;</td><td>Adjust parallax</td></tr><tr><td>(, )</"
+#~ "td><td>Adjust ghostbusting</td></tr><tr><td>left, right</td><td>Seek 10 "
+#~ "seconds backward / forward</td></tr><tr><td>up, down</td><td>Seek 1 "
+#~ "minute backward / forward</td></tr><tr><td>page up, page down</"
+#~ "td><td>Seek 10 minutes backward / forward</td></tr></table>"
+#~ msgstr ""
+#~ "Ovládání klávesnicí: <table><tr><td>q nebo ESC</td><td>Ukončit</"
+#~ "td></tr><tr><td>p nebo MEZERA</td><td>Pozastav / pokračuj</td></"
+#~ "tr><tr><td>f</td><td>Přepni na celou obrazovku</td></tr><tr><td>c</"
+#~ "td><td>Vycentruj okno</td></tr><tr><td>e</td><td>Prohoď levé/pravé oko</"
+#~ "td></tr><tr><td>v</td><td>Procházej dostupné video stopy</td></"
+#~ "tr><tr><td>a</td><td>Procházej dostupné zvukové stopy</td></tr><tr><td>s</"
+#~ "td><td>Procházej dostupné titulky</td></tr><tr><td>1, 2</td><td>Uprav "
+#~ "kontrast</td></tr><tr><td>3, 4</td><td>Uprav jas</td></tr><tr><td>5, 6</"
+#~ "td><td>Uprav odstín</td></tr><tr><td>7, 8</td><td>Uprav sytost</td></"
+#~ "tr><tr><td>&lt;, &gt;</td><td>Uprav parallax</td></tr><tr><td>(, )</"
+#~ "td><td>Uprav ghostbusting</td></tr><tr><td>left, right</td><td>Přeskoč 10 "
+#~ "sekund dopředu / zpět</td></tr><tr><td>up, down</td><td>Přeskoč 1 minutu "
+#~ "dopředu / zpět</td></tr><tr><td>page up, page down</td><td>Přeskoč 10 "
+#~ "minut dopředu / zpět</td></tr></table>"
+
+#~ msgid "OpenGL FBO error %s."
+#~ msgstr "Chyba FBO %s."
+
+#~ msgid "geometry shader"
+#~ msgstr "geometry shader"
+
 #~ msgid "Unknown exception."
 #~ msgstr "Neznámá výjimka."

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

bino-1.2.1.tar.bz2/po/de.po -> bino-1.3.2.tar.xz/po/de.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: bino 1.1.1\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2011-10-10 21:25+0200\n"
+"POT-Creation-Date: 2012-03-16 19:49+0100\n"
 "PO-Revision-Date: 2011-04-10 17:23+0200\n"
 "Last-Translator: Martin Lambers <marlam@marlam.de>\n"
 "Language-Team: none\n"
@@ -15,932 +15,417 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/base/dbg.cpp:50
+#: src/base/dbg.cpp:49
 #, c-format
 msgid "Caught signal %d (%s). Aborting."
 msgstr "Signal %d (%s) erhalten. Breche ab."
 
-#: src/base/dbg.cpp:57
+#: src/base/dbg.cpp:56
 msgid "Unexpected exception."
 msgstr "Unerwartete Ausnahme."
 
 #. TRANSLATORS: %s will be a mail address.
-#: src/base/dbg.cpp:145
+#: src/base/dbg.cpp:221
 #, c-format
 msgid "Report bugs to <%s>."
 msgstr "Melde Fehler an <%s>."
 
-#: src/base/exc.cpp:54 src/base/exc.cpp:72 src/base/exc.cpp:106
+#: src/base/exc.cpp:52 src/base/exc.cpp:70 src/base/exc.cpp:104
 #, c-format
 msgid "Exception: %s"
 msgstr "Ausnahme: %s"
 
-#: src/base/opt.cpp:151
+#: src/base/opt.cpp:168
 #, c-format
 msgid "Invalid option %s."
 msgstr "Ungültige Option %s."
 
-#: src/base/opt.cpp:155
+#: src/base/opt.cpp:172
 #, c-format
 msgid "Option --%s does not take an argument."
 msgstr "Option --%s akzeptiert kein Argument."
 
-#: src/base/opt.cpp:160
+#: src/base/opt.cpp:177
 #, c-format
 msgid "Invalid option -%c."
 msgstr "Ungültige Option -%c."
 
-#: src/base/opt.cpp:169
+#: src/base/opt.cpp:186
 #, c-format
 msgid "Option --%s requires an argument."
 msgstr "Option --%s benötigt ein Argument."
 
-#: src/base/opt.cpp:174
+#: src/base/opt.cpp:191
 #, c-format
 msgid "Option -%c requires an argument."
 msgstr "Option -%c benötigt ein Argument."
 
-#: src/base/opt.cpp:195
+#: src/base/opt.cpp:212
 #, c-format
 msgid "Invalid argument for -%c."
 msgstr "Ungültiges Argument für -%c."
 
-#: src/base/opt.cpp:199
+#: src/base/opt.cpp:216
 #, c-format
 msgid "Invalid argument for --%s."
 msgstr "Ungültiges Argument für --%s."
 
-#: src/base/opt.cpp:218
+#: src/base/opt.cpp:239
 #, c-format
 msgid "Option --%s (-%c) is mandatory."
 msgstr "Option --%s (-%c) wird benötigt."
 
-#: src/base/opt.cpp:222
+#: src/base/opt.cpp:243
 #, c-format
 msgid "Option --%s is mandatory."
 msgstr "Option --%s wird benötigt."
 
-#: src/base/opt.cpp:236
+#: src/base/opt.cpp:257
 msgid "Too few arguments."
 msgstr "Zu wenige Argumente."
 
-#: src/base/opt.cpp:241
+#: src/base/opt.cpp:262
 msgid "Too many arguments."
 msgstr "Zu viele Argumente."
 
-#: src/base/str.cpp:226
+#: src/base/str.cpp:236
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Kann Zeichenkette nicht zu %s konvertieren."
 
-#: src/base/str.cpp:411 src/base/str.cpp:429 src/base/str.cpp:439
-#: src/base/str.cpp:450
+#: src/base/str.cpp:455 src/base/str.cpp:473 src/base/str.cpp:483
+#: src/base/str.cpp:494 src/base/str.cpp:499
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Kann %s nicht zu %s konvertieren."
 
-#: src/base/thread.cpp:40 src/base/thread.cpp:51
-#, c-format
-msgid "Cannot initialize mutex: %s"
-msgstr "Kann Mutex nicht initialisieren: %s"
-
-#: src/base/thread.cpp:65
-#, c-format
-msgid "Cannot lock mutex: %s"
-msgstr "Kann Mutex nicht sichern: %s"
-
-#: src/base/thread.cpp:79
-#, c-format
-msgid "Cannot unlock mutex: %s"
-msgstr "Kann Mutex nicht entsichern: %s"
-
-#: src/base/thread.cpp:145
-#, c-format
-msgid "Cannot create thread: %s"
-msgstr "Kann Thread nicht erzeugen: %s"
-
-#: src/base/thread.cpp:160
-#, c-format
-msgid "Cannot join with thread: %s"
-msgstr "Kann nicht auf Thread warten: %s"
-
-#: src/base/thread.cpp:182
-#, c-format
-msgid "Cannot cancel thread: %s"
-msgstr "Kann Thread nicht abbrechen: %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
+msgid "System function failed: "
+msgstr ""
 
-#: src/base/timer.cpp:69 src/base/timer.cpp:81 src/base/timer.cpp:95
+#: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
 msgid "Cannot get time."
 msgstr "Kann Zeit nicht abfragen."
 
-#: src/audio_output.cpp:61
+#: src/audio_output.cpp:88
 msgid "No OpenAL device available."
 msgstr "Kein OpenAL Gerät verfügbar."
 
-#: src/audio_output.cpp:66
+#: src/audio_output.cpp:93 src/audio_output.cpp:99
+#, fuzzy, c-format
+msgid "OpenAL device '%s' is not available."
+msgstr "Kein OpenAL Gerät verfügbar."
+
+#: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
+#: src/media_data.cpp:1067 src/media_data.cpp:1090 src/media_data.cpp:1128
+#: src/media_data.cpp:1133
+msgid "unknown"
+msgstr "unbekannt"
+
+#: src/audio_output.cpp:106
 msgid "No OpenAL context available."
 msgstr "Kein OpenAL Kontext verfügbar."
 
-#: src/audio_output.cpp:77
+#: src/audio_output.cpp:117
 msgid "Cannot create OpenAL buffers."
 msgstr "Kann OpenAL Puffer nicht erzeugen."
 
-#: src/audio_output.cpp:86
+#: src/audio_output.cpp:126
 msgid "Cannot create OpenAL source."
 msgstr "Kann OpenAL Quelle nicht erzeugen."
 
-#: src/audio_output.cpp:99
+#: src/audio_output.cpp:139
 msgid "Cannot set OpenAL source parameters."
 msgstr "Kann OpenAL Quellenparameter nicht setzen."
 
-#: src/audio_output.cpp:153
+#: src/audio_output.cpp:193
 msgid "Cannot check OpenAL source state."
 msgstr "Kann OpenAL Quellenzustand nicht abfragen."
 
-#: src/audio_output.cpp:160
+#: src/audio_output.cpp:200
 msgid "Cannot restart OpenAL source playback."
 msgstr "Kann das Abspielen der OpenAL Quelle nicht neu starten."
 
-#: src/audio_output.cpp:313
+#: src/audio_output.cpp:353
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr "Kein OpenAL Format vorhanden für das Audioformat %s."
 
-#: src/audio_output.cpp:340
+#: src/audio_output.cpp:369
+#, fuzzy
+msgid "Cannot set OpenAL audio volume."
+msgstr "Kann OpenAL Quelle nicht erzeugen."
+
+#: src/audio_output.cpp:395
 msgid "Cannot buffer initial OpenAL data."
 msgstr "Kann initiale OpenAL Daten nicht puffern."
 
-#: src/audio_output.cpp:354
+#: src/audio_output.cpp:409
 msgid "Cannot buffer OpenAL data."
 msgstr "Kann OpenAL Daten nicht puffern."
 
-#: src/audio_output.cpp:379
+#: src/audio_output.cpp:434
 msgid "Cannot start OpenAL source playback."
 msgstr "Kann das Abspielen der OpenAL Quelle nicht starten."
 
-#: src/audio_output.cpp:393
+#: src/audio_output.cpp:448
 msgid "Cannot pause OpenAL source playback."
 msgstr "Kann das Abspielen der OpenAL Quelle nicht unterbrechen."
 
-#: src/audio_output.cpp:402
+#: src/audio_output.cpp:457
 msgid "Cannot unpause OpenAL source playback."
 msgstr "Kann das Abspielen der OpenAL Quelle nicht fortsetzen."
 
-#: src/audio_output.cpp:411
+#: src/audio_output.cpp:466
 msgid "Cannot stop OpenAL source playback."
 msgstr "Kann das Abspielen der OpenAL Quelle nicht stoppen."
 
-#: src/audio_output.cpp:422
+#: src/audio_output.cpp:477
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Kann OpenAL Quellenpuffer nicht aus Warteschlange entfernen."
 
-#: src/lib_versions.cpp:121 src/lib_versions.cpp:158 src/media_data.cpp:422
-#: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
-msgid "unknown"
-msgstr "unbekannt"
-
-#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
-msgid "not used"
-msgstr "nicht benutzt"
-
-#: src/lirc.cpp:63
-msgid "Cannot initialize LIRC."
-msgstr "Kann LIRC nicht initialisieren."
-
-#
-#: src/lirc.cpp:69
-msgid "Cannot set LIRC socket properties."
-msgstr "Kann LIRC Parameter nicht setzen."
+#: src/dispatch.cpp:156
+msgid "Cannot connect to X server."
+msgstr "Kann keine Verbindung zum X Server aufbauen."
 
-#: src/lirc.cpp:76
-msgid "Cannot read LIRC default configuration."
-msgstr "Kann LIRC Standardkonfiguration nicht lesen."
+#: src/dispatch.cpp:171
+msgid "No video to play."
+msgstr "Kein Video abzuspielen."
 
-#: src/lirc.cpp:91
-#, c-format
-msgid "Cannot read LIRC configuration file %s."
-msgstr "Kann LIRC Konfigurationsdatei %s nicht lesen."
+#: src/dispatch.cpp:411 src/player_equalizer.cpp:84
+msgid "No video streams found."
+msgstr "Keine Videokanäle gefunden."
 
-#: src/lirc.cpp:140
-msgid "Cannot get LIRC event; disabling LIRC support."
-msgstr "Kann LIRC Ereignis nicht lesen; schalte LIRC ab."
+#: src/dispatch.cpp:428
+msgid "Cannot set requested stereo layout: incompatible media."
+msgstr "Kann Stereolayout nicht setzen: inkompatible Daten."
 
-#: src/lirc.cpp:154
+#: src/dispatch.cpp:443
 #, c-format
-msgid "Received invalid command '%s' from LIRC."
-msgstr "Ungültiges Kommando '%s' von LIRC erhalten."
-
-#: src/lirc.cpp:164
-msgid "Cannot get command for LIRC code."
-msgstr "Kann kein Kommando für LIRC Code bekommen."
+msgid "Video stream %d not found."
+msgstr "Videokanal %d nicht gefunden."
 
-#: src/main.cpp:325
+#: src/dispatch.cpp:449
 #, c-format
-msgid "%s version %s"
-msgstr "%s Version %s"
-
-#: src/main.cpp:326
-msgid "Copyright (C) 2011 the Bino developers."
-msgstr "Copyright (C) 2011 Bino Entwickler."
-
-#: src/main.cpp:327
-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 ""
-"Dies ist freie Software. Du kannst Kopien davon verteilen unter den "
-"Bedingungen der GNU General Public License. Es gibt keine Garantie."
-
-#: src/main.cpp:330 src/player_qt.cpp:2958
-msgid "Platform:"
-msgstr "Plattform:"
-
-#: src/main.cpp:332 src/player_qt.cpp:2959
-msgid "Libraries used:"
-msgstr "Benutzte Bibliotheken:"
+msgid "Audio stream %d not found."
+msgstr "Audiokanal %d nicht gefunden."
 
-#. TRANSLATORS: This is the --help text. Translate only the description,
-#. not the option names. Please keep a proper indentation with spaces, and
-#. keep the line length limited.
-#: src/main.cpp:344
+#: src/dispatch.cpp:457
 #, c-format
-msgid ""
-"Usage:\n"
-" %s [option...] [file...]\n"
-"\n"
-"Options:\n"
-" --help Print help.\n"
-" --version Print version.\n"
-" -n|--no-gui Do not use the GUI, just show a plain window.\n"
-" -L|--log-level=LEVEL Set log level (debug/info/warning/error/quiet).\n"
-" --device-type=TYPE Type of input device: default, firewire, x11.\n"
-" --device-frame-size=WxH Request frame size WxH from input device.\n"
-" --device-frame-rate=N/D Request frame rate N/D from input device.\n"
-" --lirc-config=FILE Use the given LIRC configuration file. This\n"
-" option can be used more than once.\n"
-" -v|--video=STREAM Select video stream (1-n, depending on input).\n"
-" -a|--audio=STREAM Select audio stream (1-n, depending on input).\n"
-" -s|--subtitle=STREAM Select subtitle stream (0-n, dep. on input).\n"
-" -i|--input=TYPE Select input type (default autodetect):\n"
-" mono Single view.\n"
-" separate-left-right Left/right separate streams, left first.\n"
-" separate-right-left Left/right separate streams, right first.\n"
-" top-bottom Left top, right bottom.\n"
-" top-bottom-half Left top, right bottom, half height.\n"
-" bottom-top Left bottom, right top.\n"
-" bottom-top-half Left bottom, right top, half height.\n"
-" left-right Left left, right right.\n"
-" left-right-half Left left, right right, half width.\n"
-" right-left Left right, right left.\n"
-" right-left-half Left right, right left, half width.\n"
-" even-odd-rows Left even rows, right odd rows.\n"
-" odd-even-rows Left odd rows, right even rows.\n"
-" -o|--output=TYPE Select output type:\n"
-" mono-left Only left.\n"
-" mono-right Only right.\n"
-" top-bottom Left top, right bottom.\n"
-" top-bottom-half Left top, right bottom, half height.\n"
-" left-right Left left, right right.\n"
-" left-right-half Left left, right right, half width.\n"
-" even-odd-rows Left even rows, right odd rows.\n"
-" even-odd-columns Left even columns, right odd columns.\n"
-" checkerboard Left and right in checkerboard pattern.\n"
-" hdmi-frame-pack HDMI frame packing mode.\n"
-" red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
-" red-cyan-half-color Red/cyan anaglyph, half color method.\n"
-" red-cyan-full-color Red/cyan anaglyph, full color method.\n"
-" red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
-" green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
-" green-magenta-half-color Green/magenta anaglyph, half color method.\n"
-" green-magenta-full-color Green/magenta anaglyph, full color method.\n"
-" green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
-" amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
-" amber-blue-half-color Amber/blue anaglyph, half color method.\n"
-" amber-blue-full-color Amber/blue anaglyph, full color method.\n"
-" amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
-" red-green-monochrome Red/green anaglyph, monochrome method.\n"
-" red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
-" stereo OpenGL quad-buffered stereo.\n"
-" equalizer Multi-display via Equalizer (2D setup).\n"
-" equalizer-3d Multi-display via Equalizer (3D setup).\n"
-" -S|--swap-eyes Swap left/right view.\n"
-" -f|--fullscreen Fullscreen.\n"
-" --fullscreen-screens= Use the listed screens in fullscreen mode.\n"
-" [S0[,S1[,...]]] Screen numbers start with 1. The default\n"
-" (empty list) is to use the primary screen.\n"
-" --fullscreen-flip-left Flip left view vertically when fullscreen.\n"
-" --fullscreen-flop-left Flop left view horizontally when fullscreen.\n"
-" --fullscreen-flip-right Flip right view vertically when fullscreen.\n"
-" --fullscreen-flop-right Flop right view horizontally when fullscreen.\n"
-" -c|--center Center window on screen.\n"
-" --subtitle-encoding=ENC Set subtitle encoding.\n"
-" --subtitle-font=FONT Set subtitle font name.\n"
-" --subtitle-size=N Set subtitle font size.\n"
-" --subtitle-scale=S Set subtitle scale factor.\n"
-" --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
-" --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
-" -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
-" -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-separated\n"
-" values for the R,G,B channels.\n"
-" -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
-" -b|--benchmark Benchmark mode (no audio, show fps).\n"
-" -l|--loop Loop the input media.\n"
-"\n"
-"Interactive control:\n"
-" ESC Leave fullscreen mode, or quit.\n"
-" q Quit.\n"
-" p or SPACE Pause / unpause.\n"
-" f Toggle fullscreen.\n"
-" c Center window.\n"
-" e Swap left/right eye.\n"
-" v Cycle through available video streams.\n"
-" a Cycle through available audio streams.\n"
-" s Cycle through available subtitle streams.\n"
-" 1, 2 Adjust contrast.\n"
-" 3, 4 Adjust brightness.\n"
-" 5, 6 Adjust hue.\n"
-" 7, 8 Adjust saturation.\n"
-" <, > Adjust parallax.\n"
-" (, ) Adjust ghostbusting.\n"
-" left, right Seek 10 seconds backward / forward.\n"
-" up, down Seek 1 minute backward / forward.\n"
-" page up, page down Seek 10 minutes backward / forward.\n"
-" Mouse click Seek according to horizontal click position."
-msgstr ""
-"Benutzung:\n"
-" %s [Option...] [Datei...]\n"
-"\n"
-"Optionen:\n"
-" --help Zeige Hilfe.\n"
-" --version Zeige Version.\n"
-" -n|--no-gui Starte ohne GUI, zeige nur ein Video Fenster.\n"
-" -L|--log-level=LEVEL Setze Loglevel (debug/info/warning/error/quiet).\n"
-" --device-type=TYPE Kameratyp: default, firewire, x11.\n"
-" --device-frame-size=BxH Fordere Kameraauflösung BxH an.\n"
-" --device-frame-rate=N/D Fordere Kamerabildrate N/D an.\n"
-" --lirc-config=FILE Setze LIRC Konfigurationsdatei. Diese Option\n"
-" kann mehrfach verwendet werden.\n"
-" -v|--video=STREAM Wähle Videokanal (1-n, je nach Eingabe).\n"
-" -a|--audio=STREAM Wähle Audiokanal (1-n, je nach Eingabe).\n"
-" -s|--subtitle=STREAM Wähle Untertitelkanal (0-n, je nach Eingabe).\n"
-" -i|--input=TYPE Wähle Eingabetyp (sonst automatisch detektiert):\n"
-" mono Einzelne Sicht.\n"
-" separate-left-right Links/rechts getrennte Kanäle, links zuerst.\n"
-" separate-right-left Links/rechts getrennte Kanäle, rechts zuerst.\n"
-" top-bottom Links oben, rechts unten.\n"
-" top-bottom-half Links oben, rechts unten, halbe Höhe.\n"
-" bottom-top Links unten, rechts oben.\n"
-" bottom-top-half Links unten, rechts oben, halbe Höhe.\n"
-" left-right Links links, rechts rechts.\n"
-" left-right-half Links links, rechts rechts, halbe Breite.\n"
-" right-left Links rechts, rechts links.\n"
-" right-left-half Links rechts, rechts links, halbe Breite.\n"
-" even-odd-rows Links gerade Zeilen, rechts ungerade Zeilen.\n"
-" odd-even-rows Links ungerade Zeilen, rechts gerade Zeilen.\n"
-" -o|--output=TYPE Wähle Ausgabemodus:\n"
-" mono-left Nur links.\n"
-" mono-right Nur rechts.\n"
-" top-bottom Links oben, rechts unten.\n"
-" top-bottom-half Links oben, rechts unten, halbe Höhe.\n"
-" left-right Links links, rechts rechts.\n"
-" left-right-half Links links, rechts rechts, halbe Breite.\n"
-" even-odd-rows Links gerade Zeilen, rechts ungerade Zeilen.\n"
-" even-odd-columns Links gerade Spalten, rechts ungerade Spalten.\n"
-" checkerboard Links und rechts im Schachbrettmuster.\n"
-" hdmi-frame-pack HDMI Framepacking modus.\n"
-" red-cyan-monochrome Rot/cyan Anaglyphe, monochrome Methode.\n"
-" red-cyan-half-color Rot/cyan Anaglyphe, Halbfarbenmethode.\n"
-" red-cyan-full-color Rot/cyan Anaglyphe, Vollfarbenmethode.\n"
-" red-cyan-dubois Rot/cyan Anaglyphe, Dubois-Methode.\n"
-" green-magenta-monochrome Grün/magenta Anaglyphe, monochrome Methode.\n"
-" green-magenta-half-color Grün/magenta Anaglyphe, Halbfarbenmethode.\n"
-" green-magenta-full-color Grün/magenta Anaglyphe, Vollfarbenmethode.\n"
-" green-magenta-dubois Grün/magenta Anaglyphe, Dubois-Methode.\n"
-" amber-blue-monochrome Orange/blau Anaglyphe, monochrome Methode.\n"
-" amber-blue-half-color Orange/blau Anaglyphe, Halbfarbenmethode.\n"
-" amber-blue-full-color Orange/blau Anaglyphe, Vollfarbenmethode.\n"
-" amber-blue-dubois Orange/blau Anaglyphe, Dubois-Methode.\n"
-" red-green-monochrome Rot/grün Anaglyphe, monochrome Methode.\n"
-" red-blue-monochrome Rot/blau Anaglyphe, monochrome Methode.\n"
-" stereo OpenGL Vierfachpuffer Stereo.\n"
-" equalizer Multidisplay via Equalizer (2D Konfiguration).\n"
-" equalizer-3d Multidisplay via Equalizer (3D Konfiguration).\n"
-" -S|--swap-eyes Tausche linke/rechte Ansicht.\n"
-" -f|--fullscreen Vollbild.\n"
-" --fullscreen-screens= Setze Bildschirme für den Vollbildmodus.\n"
-" [S0[,S1[,...]]] Bildschirmnummern starten mit 1. Standard\n"
-" (leere Liste) ist der Hauptbildschirm.\n"
-" --fullscreen-flip-left Spiegele linke Sicht vertikal für Vollbild.\n"
-" --fullscreen-flop-left Spiegele linke Sicht horiztonal für Vollbild.\n"
-" --fullscreen-flip-right Spiegele rechte Sicht vertikal für Vollbild.\n"
-" --fullscreen-flop-right Spiegele rechte Sicht horiztonal für Vollbild.\n"
-" -c|--center Zentriere Fenster auf Bildschirm.\n"
-" --subtitle-encoding=ENC Setze Zeichensatz für Untertitel.\n"
-" --subtitle-font=FONT Setze Schriftart für Untertitel.\n"
-" --subtitle-size=N Setze Schriftgröße für Untertitel.\n"
-" --subtitle-scale=S Setze Skalierungsfaktor für Untertitel.\n"
-" --subtitle-color=COLOR Setze Farbe für Untertitel ([AA]RRGGBB).\n"
-" --subtitle-parallax=VAL Untertitel-Parallaxenjustierung (-1 bis +1).\n"
-" -P|--parallax=VAL Parallaxenjustierung (-1 bis +1).\n"
-" -C|--crosstalk=VAL Crosstalk-Level (0 bis 1); kamma-getrennte\n"
-" Werte für die R,G,B Kanäle.\n"
-" -G|--ghostbust=VAL Crosstalk-Verringerungsfaktor (0 bis 1).\n"
-" -b|--benchmark Benchmarkmodus (kein Audio, zeige FPS).\n"
-" -l|--loop Wiederhole das Video.\n"
-"\n"
-"Interaktion:\n"
-" ESC Verlasse Vollbildmodus, oder beende.\n"
-" q Beenden.\n"
-" p oder Leertaste Pause / weiter.\n"
-" f Schalte Vollbildmodus um.\n"
-" c Zentriere Fenster.\n"
-" e Tausche links/rechts.\n"
-" v Schalte zum nächsten Videokanal.\n"
-" a Schalte zum nächsten Audiokanal.\n"
-" s Schalte zum nächsten Untertitelkanal.\n"
-" 1, 2 Justiere Kontrast.\n"
-" 3, 4 Justiere Helligkeit.\n"
-" 5, 6 Justiere Farbton.\n"
-" 7, 8 Justiere Farbsättigung.\n"
-" <, > Justiere Parallaxe.\n"
-" (, ) Justiere Crosstalk-Verringerungsfaktor.\n"
-" links, rechts Spule 10 Sekunden zurück / vor.\n"
-" hoch, runter Spule 1 Minute zurück / vor.\n"
-" Seite rauf, Seite runter Spule 10 Minuten zurück / vor.\n"
-" Mausklick Spule zur Stelle der horizontalen Klickposition."
-
-#: src/main.cpp:597
-msgid "Benchmark mode: audio and time synchronization disabled."
-msgstr "Benchmark Modus: Audio und Videosynchronisation deaktiviert."
-
-#: src/main.cpp:614
-msgid "This version of Bino was compiled without support for LIRC."
-msgstr "Diese Version von Bino wurde ohne Unterstützung für LIRC erstellt."
+msgid "Subtitle stream %d not found."
+msgstr "Untertitelkanal %d nicht gefunden."
 
-#: src/main.cpp:627
+#: src/dispatch.cpp:529 src/main.cpp:736
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr ""
 "Diese Version von Bino wurde ohne Unterstützung für Equalizer erstellt."
 
-#: src/main.cpp:634
-msgid "Cannot connect to X server."
-msgstr "Kann keine Verbindung zum X Server aufbauen."
+#: src/gui.cpp:101
+msgid "Video:"
+msgstr "Video:"
 
-#: src/main.cpp:650
-msgid "No video to play."
-msgstr "Kein Video abzuspielen."
+#: src/gui.cpp:102
+msgid "Select the video stream."
+msgstr "Auswahl des Videokanals."
 
-#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:293
-#, c-format
-msgid "%dx%d, %.3g:1"
-msgstr "%dx%d, %.3g:1"
+#: src/gui.cpp:108
+msgid "Audio:"
+msgstr "Audio:"
 
-#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:421
-#, c-format
-msgid "%s, %d ch., %g kHz, %d bit"
-msgstr "%s, %d Kan., %g kHz, %d bit"
+#: src/gui.cpp:109
+msgid "Select the audio stream."
+msgstr "Auswahl des Videokanals."
+
+#: src/gui.cpp:115
+msgid "Subtitle:"
+msgstr "Untertitel:"
+
+#: src/gui.cpp:116
+msgid "Select the subtitle stream."
+msgstr "Auswahl des Untertitelkanals."
 
-#: src/media_input.cpp:277 src/player_qt.cpp:187
+#: src/gui.cpp:127 src/media_input.cpp:277
 msgid "Input:"
 msgstr "Eingabe:"
 
-#: src/media_input.cpp:282
-#, c-format
-msgid "Video %s: %s"
-msgstr "Video %s: %s"
+#: src/gui.cpp:128
+msgid "Set the 3D layout of the video stream."
+msgstr "Auswahl des Stereolayouts des Videokanals."
 
-#: src/media_input.cpp:287
-msgid "No video."
-msgstr "Kein Video."
+#: src/gui.cpp:132
+msgid "2D"
+msgstr "2D"
 
-#: src/media_input.cpp:293
-#, c-format
-msgid "Audio %s: %s"
-msgstr "Audio %s: %s"
+#: src/gui.cpp:133
+msgid "Separate streams, left first"
+msgstr "Getrennte Kanäle, links zuerst"
 
-#: src/media_input.cpp:298
-msgid "No audio."
-msgstr "Kein Audio."
+#: src/gui.cpp:134
+msgid "Separate streams, right first"
+msgstr "Getrennte Kanäle, rechts zuerst"
 
-#: src/media_input.cpp:304
-#, c-format
-msgid "Subtitle %s: %s"
-msgstr "Untertitel %s: %s"
+#: src/gui.cpp:135
+#, fuzzy
+msgid "Alternating, left first"
+msgstr "Getrennte Kanäle, links zuerst"
 
-#: src/media_input.cpp:309
-msgid "No subtitle."
-msgstr "Kein Untertitel."
+#: src/gui.cpp:136
+#, fuzzy
+msgid "Alternating, right first"
+msgstr "Getrennte Kanäle, rechts zuerst"
 
-#: src/media_input.cpp:311
-#, c-format
-msgid "Duration: %g seconds"
-msgstr "Dauer: %g Sekunden"
+#: src/gui.cpp:137 src/gui.cpp:161
+msgid "Top/bottom"
+msgstr "Oben/unten"
 
-#: src/media_input.cpp:314
-#, c-format
-msgid "Stereo layout: %s"
-msgstr "Stereolayout: %s"
+#: src/gui.cpp:138 src/gui.cpp:162
+msgid "Top/bottom, half height"
+msgstr "Oben/unten, halbe Höhe"
 
-#: src/media_object.cpp:371
-#, fuzzy, c-format
-msgid "%s video stream %d: Using frame size %dx%d instead of %dx%d."
-msgstr "%s Videokanal %d: Ungültige Bildgröße."
+#: src/gui.cpp:139
+msgid "Bottom/top"
+msgstr "Unten/oben"
 
-#: src/media_object.cpp:624
-#, c-format
-msgid "%s video stream %d: Unsupported stereo layout %s."
-msgstr "%s Videokanal %d: Stereolayout %s wird nicht unterstützt."
+#: src/gui.cpp:140
+msgid "Bottom/top, half height"
+msgstr "Unten/oben, halbe Höhe"
 
-#: src/media_object.cpp:662
-#, c-format
-msgid "%s audio stream %d: Cannot handle audio with %d channels."
-msgstr "%s Audiokanal %d: Kann Audiodaten mit %d Kanälen nicht benutzen."
+#: src/gui.cpp:141 src/gui.cpp:163
+msgid "Left/right"
+msgstr "Links/rechts"
 
-#: src/media_object.cpp:691
-#, c-format
-msgid "%s audio stream %d: Cannot handle audio with sample format %s."
-msgstr "%s Audiokanal %d: Kann Audiodaten mit Sampleformat %s nicht benutzen."
+#: src/gui.cpp:142 src/gui.cpp:164
+msgid "Left/right, half width"
+msgstr "Links/rechts, halbe Breite"
 
-#: src/media_object.cpp:744
-#, c-format
-msgid "No support available for %s device."
-msgstr "Unterstüztung für %s Geräte nicht verfügbar."
+#: src/gui.cpp:143
+msgid "Right/left"
+msgstr "Rechts/links"
 
-#: src/media_object.cpp:745 src/player_qt.cpp:1831
-msgid "Firewire"
-msgstr "Firewire"
+#: src/gui.cpp:144
+msgid "Right/left, half width"
+msgstr "Rechts/links, halbe Breite"
 
-#: src/media_object.cpp:746 src/player_qt.cpp:1832
-msgid "X11"
-msgstr "X11"
+#: src/gui.cpp:145 src/gui.cpp:165
+msgid "Even/odd rows"
+msgstr "Gerade/ungerade Zeilen"
 
-#: src/media_object.cpp:747
-msgid "default"
-msgstr "Standard"
+#: src/gui.cpp:146
+msgid "Odd/even rows"
+msgstr "Ungerade/gerade Zeilen"
 
-#: src/media_object.cpp:765 src/media_object.cpp:1218 src/xgl.cpp:297
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
+#: src/gui.cpp:152
+msgid "Output:"
+msgstr "Ausgabe:"
 
-#: src/media_object.cpp:776
-#, c-format
-msgid "%s: Cannot read stream info: %s"
-msgstr "%s: Kann Informationen über Kanal nicht lesen: %s"
+#: src/gui.cpp:153
+msgid "Set the 3D output type for your display."
+msgstr "Auswahl des 3D Ausgabetyps für das Ausgabegerät."
 
-#: src/media_object.cpp:816
-#, c-format
-msgid "%s stream %d: Cannot open %s: %s"
-msgstr "%s Kanal %d: Kann %s nicht öffnen: %s"
+#: src/gui.cpp:157
+msgid "Left view"
+msgstr "Linke Sicht"
 
-#: src/media_object.cpp:817
-msgid "video codec"
-msgstr "Videocodec"
+#: src/gui.cpp:158
+msgid "Right view"
+msgstr "Rechte Sicht"
 
-#: src/media_object.cpp:818
-msgid "audio codec"
-msgstr "Audiocodec"
+#: src/gui.cpp:159
+msgid "OpenGL stereo"
+msgstr "OpenGL Stereo"
 
-#: src/media_object.cpp:819
-msgid "subtitle codec"
-msgstr "Untertitelcodec"
+#: src/gui.cpp:160
+msgid "Left/right view alternating"
+msgstr ""
 
-#: src/media_object.cpp:820
-msgid "data"
-msgstr "Daten"
+#: src/gui.cpp:166
+msgid "Even/odd columns"
+msgstr "Gerade/ungerade Spalten"
 
-#: src/media_object.cpp:821
-msgid "codec not supported"
-msgstr "Codec nicht unterstützt"
+#: src/gui.cpp:167
+msgid "Checkerboard pattern"
+msgstr "Schachbrettmuster"
 
-#: src/media_object.cpp:831
-#, c-format
-msgid "%s video stream %d: Invalid frame size."
-msgstr "%s Videokanal %d: Ungültige Bildgröße."
+#: src/gui.cpp:168
+msgid "HDMI frame packing mode"
+msgstr "HDMI Framepacking Modus"
 
-#: src/media_object.cpp:867
-#, c-format
-msgid "%s video stream %d: Cannot initialize conversion context."
-msgstr "%s Videokanal %d: Kann Konvertierungskontext nicht initialisieren."
+#: src/gui.cpp:169
+msgid "Red/cyan glasses, monochrome method"
+msgstr "Rot/cyan Brillen, monochrome Methode"
 
-#: src/media_object.cpp:930
-#, c-format
-msgid "Video stream %d: %s / %s, %g seconds"
-msgstr "Videokanal %d: %s / %s, %g Sekunden"
+#: src/gui.cpp:170
+msgid "Red/cyan glasses, half-color method"
+msgstr "Rot/cyan Brillen, Halbfarbenmethode"
 
-#: src/media_object.cpp:934
-#, c-format
-msgid "Using up to %d threads for decoding."
-msgstr "Benutze bis zu %d Threads zum dekodieren."
+#: src/gui.cpp:171
+msgid "Red/cyan glasses, full-color method"
+msgstr "Rot/cyan Brillen, Vollfarbenmethode"
 
-#: src/media_object.cpp:939
-#, c-format
-msgid "Audio stream %d: %s / %s, %g seconds"
-msgstr "Audiokanal %d: %s / %s, %g Sekunden"
+#: src/gui.cpp:172
+msgid "Red/cyan glasses, high-quality Dubois method"
+msgstr "Rot/cyan Brillen, hochwertige Dubois-Methode"
 
-#: src/media_object.cpp:946
-#, c-format
-msgid "Subtitle stream %d: %s / %s, %g seconds"
-msgstr "Untertitelkanal %d: %s / %s, %g Sekunden"
+#: src/gui.cpp:173
+msgid "Green/magenta glasses, monochrome method"
+msgstr "Grün/magenta Brillen, monochrome Methode"
 
-#: src/media_object.cpp:953
-msgid "No usable streams."
-msgstr "Keine nutzbaren Kanäle."
+#: src/gui.cpp:174
+msgid "Green/magenta glasses, half-color method"
+msgstr "Grün/magenta Brillen, Halbfarbenmethode"
 
-#: src/media_object.cpp:1234 src/media_object.cpp:1264
-#: src/media_object.cpp:1294
-#, c-format
-msgid "%s: Cannot duplicate packet."
-msgstr "%s: Kann Paket nicht duplizieren."
-
-#: src/media_object.cpp:1766
-#, c-format
-msgid "%s: Seeking failed."
-msgstr "%s: Positionsänderung fehlgeschlagen."
-
-#: src/player.cpp:212
-msgid "No video streams found."
-msgstr "Keine Videokanäle gefunden."
-
-#: src/player.cpp:218
-msgid "Cannot set requested stereo layout: incompatible media."
-msgstr "Kann Stereolayout nicht setzen: inkompatible Daten."
-
-#: src/player.cpp:224
-#, c-format
-msgid "Video stream %d not found."
-msgstr "Videokanal %d nicht gefunden."
-
-#: src/player.cpp:229
-#, c-format
-msgid "Audio stream %d not found."
-msgstr "Audiokanal %d nicht gefunden."
-
-#: src/player.cpp:237
-#, c-format
-msgid "Subtitle stream %d not found."
-msgstr "Untertitelkanal %d nicht gefunden."
-
-#: src/player.cpp:644
-#, c-format
-msgid "Video: delay %g seconds; dropping next frame."
-msgstr "Video: %g Sekunden zu spät; überspringe nächstes Bild."
-
-#: src/player.cpp:656
-#, c-format
-msgid "FPS: %.2f"
-msgstr "FPS: %.2f"
-
-#: src/player_equalizer.cpp:138
-msgid "Reading input frame failed."
-msgstr "Lesen des Eingabebildes fehlgeschlagen."
-
-#: src/player_equalizer.cpp:192 src/video_output_qt.cpp:345
-#: src/video_output_qt.cpp:352
-msgid "Waiting for subtitle renderer initialization..."
-msgstr "Warte auf die Initialisierung der Untertitelanzeige..."
-
-#: src/player_equalizer.cpp:273
-msgid "Init data mapping failed."
-msgstr "Zuordnung von InitData fehlgeschlagen."
-
-#: src/player_equalizer.cpp:274
-msgid "Frame data mapping failed."
-msgstr "Zuordnung von FrameData fehlgeschlagen."
-
-#: src/player_equalizer.cpp:275
-msgid "Video player initialization failed."
-msgstr "Videoplayer-Initialisierung fehlgeschlagen."
-
-#: src/player_equalizer.cpp:276
-msgid "Need at least OpenGL 2.1."
-msgstr "Benötige mindestens OpenGL 2.1."
-
-#: src/player_equalizer.cpp:477
-msgid "No canvas in Equalizer configuration."
-msgstr "Kein canvas in Equalizer Konfiguration."
-
-#: src/player_equalizer.cpp:511
-msgid "Equalizer canvas:"
-msgstr "Equalizer canvas:"
-
-#: src/player_equalizer.cpp:512
-#, c-format
-msgid "%gx%g, aspect ratio %g:1"
-msgstr "%gx%g, Seitenverhältnis %g:1"
-
-#: src/player_equalizer.cpp:513
-#, c-format
-msgid "Area for %g:1 video: [ %g %g %g %g @ %g ]"
-msgstr "Bereich für %g:1 Video: [ %g %g %g %g @ %g ]"
-
-#: src/player_equalizer.cpp:926 src/video_output_qt.cpp:318
-msgid ""
-"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
-"objects."
-msgstr ""
-"Diese OpenGL Implementierung unterstützt nicht OpenGL 2.1 und "
-"Framebufferobjekte."
-
-#: src/player_equalizer.cpp:1096
-msgid "Equalizer initialization failed."
-msgstr "Equalizer-Initialisierung fehlgeschlagen."
-
-#: src/player_equalizer.cpp:1104
-msgid "Cannot get equalizer configuration."
-msgstr "Kann Equalizer Konfiguration nicht bekommen."
-
-#: src/player_equalizer.cpp:1118
-msgid "Equalizer configuration initialization failed."
-msgstr "Kann Equalizer Konfiguration nicht initialisieren."
-
-#: src/player_qt.cpp:161
-msgid "Video:"
-msgstr "Video:"
-
-#: src/player_qt.cpp:162
-msgid "Select the video stream."
-msgstr "Auswahl des Videokanals."
-
-#: src/player_qt.cpp:168
-msgid "Audio:"
-msgstr "Audio:"
-
-#: src/player_qt.cpp:169
-msgid "Select the audio stream."
-msgstr "Auswahl des Videokanals."
-
-#: src/player_qt.cpp:175
-msgid "Subtitle:"
-msgstr "Untertitel:"
-
-#: src/player_qt.cpp:176
-msgid "Select the subtitle stream."
-msgstr "Auswahl des Untertitelkanals."
-
-#: src/player_qt.cpp:188
-msgid "Set the 3D layout of the video stream."
-msgstr "Auswahl des Stereolayouts des Videokanals."
-
-#: src/player_qt.cpp:192
-msgid "2D"
-msgstr "2D"
-
-#: src/player_qt.cpp:193
-msgid "Separate streams, left first"
-msgstr "Getrennte Kanäle, links zuerst"
-
-#: src/player_qt.cpp:194
-msgid "Separate streams, right first"
-msgstr "Getrennte Kanäle, rechts zuerst"
-
-#: src/player_qt.cpp:195 src/player_qt.cpp:218
-msgid "Top/bottom"
-msgstr "Oben/unten"
-
-#: src/player_qt.cpp:196 src/player_qt.cpp:219
-msgid "Top/bottom, half height"
-msgstr "Oben/unten, halbe Höhe"
-
-#: src/player_qt.cpp:197
-msgid "Bottom/top"
-msgstr "Unten/oben"
-
-#: src/player_qt.cpp:198
-msgid "Bottom/top, half height"
-msgstr "Unten/oben, halbe Höhe"
-
-#: src/player_qt.cpp:199 src/player_qt.cpp:220
-msgid "Left/right"
-msgstr "Links/rechts"
-
-#: src/player_qt.cpp:200 src/player_qt.cpp:221
-msgid "Left/right, half width"
-msgstr "Links/rechts, halbe Breite"
-
-#: src/player_qt.cpp:201
-msgid "Right/left"
-msgstr "Rechst/links"
-
-#: src/player_qt.cpp:202
-msgid "Right/left, half width"
-msgstr "Rechts/links, halbe Breite"
-
-#: src/player_qt.cpp:203 src/player_qt.cpp:222
-msgid "Even/odd rows"
-msgstr "Gerade/ungerade Zeilen"
-
-#: src/player_qt.cpp:204
-msgid "Odd/even rows"
-msgstr "Ungerade/gerade Zeilen"
-
-#: src/player_qt.cpp:210
-msgid "Output:"
-msgstr "Ausgabe:"
-
-#: src/player_qt.cpp:211
-msgid "Set the 3D output type for your display."
-msgstr "Auswahl des 3D Ausgabetyps für das Ausgabegerät."
-
-#: src/player_qt.cpp:215
-msgid "Left view"
-msgstr "Linke Sicht"
-
-#: src/player_qt.cpp:216
-msgid "Right view"
-msgstr "Rechte Sicht"
-
-#: src/player_qt.cpp:217
-msgid "OpenGL stereo"
-msgstr "OpenGL Stereo"
-
-#: src/player_qt.cpp:223
-msgid "Even/odd columns"
-msgstr "Gerade/ungerade Spalten"
-
-#: src/player_qt.cpp:224
-msgid "Checkerboard pattern"
-msgstr "Schachbrettmuster"
-
-#: src/player_qt.cpp:225
-msgid "HDMI frame packing mode"
-msgstr "HDMI Framepacking Modus"
-
-#: src/player_qt.cpp:226
-msgid "Red/cyan glasses, monochrome method"
-msgstr "Rot/cyan Brillen, monochrome Methode"
-
-#: src/player_qt.cpp:227
-msgid "Red/cyan glasses, half-color method"
-msgstr "Rot/cyan Brillen, Halbfarbenmethode"
-
-#: src/player_qt.cpp:228
-msgid "Red/cyan glasses, full-color method"
-msgstr "Rot/cyan Brillen, Vollfarbenmethode"
-
-#: src/player_qt.cpp:229
-msgid "Red/cyan glasses, high-quality Dubois method"
-msgstr "Rot/cyan Brillen, hochwertige Dubois-Methode"
-
-#: src/player_qt.cpp:230
-msgid "Green/magenta glasses, monochrome method"
-msgstr "Grün/magenta Brillen, monochrome Methode"
-
-#: src/player_qt.cpp:231
-msgid "Green/magenta glasses, half-color method"
-msgstr "Grün/magenta Brillen, Halbfarbenmethode"
-
-#: src/player_qt.cpp:232
+#: src/gui.cpp:175
 msgid "Green/magenta glasses, full-color method"
 msgstr "Grün/magenta Brillen, Vollfarbenmethode"
 
-#: src/player_qt.cpp:233
+#: src/gui.cpp:176
 msgid "Green/magenta glasses, high-quality Dubois method"
 msgstr "Grün/magenta Brillen, hochwertige Dubois-Methode"
 
-#: src/player_qt.cpp:234
+#: src/gui.cpp:177
 msgid "Amber/blue glasses, monochrome method"
 msgstr "Orange/blau Brillen, monochrome Methode"
 
-#: src/player_qt.cpp:235
+#: src/gui.cpp:178
 msgid "Amber/blue glasses, half-color method"
 msgstr "Orange/blau Brillen, Halbfarbenmethode"
 
-#: src/player_qt.cpp:236
+#: src/gui.cpp:179
 msgid "Amber/blue glasses, full-color method"
 msgstr "Orange/blau Brillen, Vollfarbenmethode"
 
-#: src/player_qt.cpp:237
+#: src/gui.cpp:180
 msgid "Amber/blue glasses, high-quality Dubois method"
 msgstr "Orange/blau Brillen, hochwertige Dubois-Methode"
 
-#: src/player_qt.cpp:238
+#: src/gui.cpp:181
 msgid "Red/green glasses, monochrome method"
 msgstr "Rot/grün Brillen, monochrome Methode"
 
-#: src/player_qt.cpp:239
+#: src/gui.cpp:182
 msgid "Red/blue glasses, monochrome method"
 msgstr "Rot/blau Brillen, monochrome Methode"
 
-#: src/player_qt.cpp:243
+#: src/gui.cpp:186
 msgid "Swap left/right"
 msgstr "Tausche links/rechts"
 
-#: src/player_qt.cpp:244
+#: src/gui.cpp:187
 msgid ""
 "Swap the left and right view. Use this if the 3D effect seems wrong."
 msgstr ""
 "Vertauschung von linker und rechter Sicht (falls der 3D Effekt falsch "
 "wirkt)."
 
-#: src/player_qt.cpp:511
+#: src/gui.cpp:467
 msgid "Off"
 msgstr "Aus"
 
-#: src/player_qt.cpp:745
+#: src/gui.cpp:694
 msgid ""
 "This slider shows the progress during video playback, and can be used to "
 "seek in the video."
@@ -948,27 +433,36 @@
 "Dieser Gleiter zeigt der Fortschritt beim Abspielen an, und kann zum Vor- "
 "und Zurückspulen benutzt werden."
 
-#: src/player_qt.cpp:752
+#: src/gui.cpp:701
 msgid "Elapsed / total time."
 msgstr "Zeit / Gesamtdauer."
 
-#: src/player_qt.cpp:762
+#: src/gui.cpp:708
+#, fuzzy
+msgid "Toggle audio mute."
+msgstr "Schalte Wiederholmodus um."
+
+#: src/gui.cpp:713
+msgid "Adjust audio volume."
+msgstr ""
+
+#: src/gui.cpp:725
 msgid "Play."
 msgstr "Abspielen."
 
-#: src/player_qt.cpp:766
+#: src/gui.cpp:729
 msgid "Pause."
 msgstr "Pause."
 
-#: src/player_qt.cpp:770
+#: src/gui.cpp:733
 msgid "Stop."
 msgstr "Stopp."
 
-#: src/player_qt.cpp:775
+#: src/gui.cpp:738
 msgid "Toggle loop mode."
 msgstr "Schalte Wiederholmodus um."
 
-#: src/player_qt.cpp:782
+#: src/gui.cpp:745
 msgid ""
 "Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
 "f key."
@@ -976,66 +470,152 @@
 "Zum Vollbildmodus schalten. Der Vollbildmodus kann mit der Taste f "
 "verlassen werden."
 
-#: src/player_qt.cpp:788
+#: src/gui.cpp:751
 msgid "Center the video area on your screen."
 msgstr "Zentrierung des Videos in der Mitte des Bildschirms."
 
-#: src/player_qt.cpp:795
+#: src/gui.cpp:758
 msgid "Seek backward 10 minutes."
 msgstr "10 Minuten zurückspulen."
 
-#: src/player_qt.cpp:800
+#: src/gui.cpp:763
 msgid "Seek backward 1 minute."
 msgstr "1 Minute zurückspulen."
 
-#: src/player_qt.cpp:806
+#: src/gui.cpp:769
 msgid "Seek backward 10 seconds."
 msgstr "10 Sekunden zurückspulen."
 
-#: src/player_qt.cpp:812
+#: src/gui.cpp:775
 msgid "Seek forward 10 seconds."
 msgstr "10 Sekunden vorspulen."
 
-#: src/player_qt.cpp:817
+#: src/gui.cpp:780
 msgid "Seek forward 1 minute."
 msgstr "1 Minute vorspulen."
 
-#: src/player_qt.cpp:823
+#: src/gui.cpp:786
 msgid "Seek forward 10 minutes."
 msgstr "10 Minuten vorspulen."
 
-#: src/player_qt.cpp:1052
+#: src/gui.cpp:1047
+msgid "Fullscreen/Multiscreen Settings"
+msgstr "Vollbild-/Multibildeinstellungen"
+
+#: src/gui.cpp:1049
+msgid "Configure fullscreen mode:"
+msgstr "Konfiguriere Vollbildmodus:"
+
+#: src/gui.cpp:1050
+msgid "Select the screens to use in fullscreen mode."
+msgstr "Auswahl der Bildschirme für den Vollbildmodus."
+
+#: src/gui.cpp:1052
+msgid "Single screen:"
+msgstr "Einzelner Bildschirm:"
+
+#: src/gui.cpp:1053
+msgid "Use a single screen for fullscreen mode."
+msgstr "Benutze einen einzelnen Bildschirm im Vollbildmodus."
+
+#: src/gui.cpp:1056
+msgid "Primary screen"
+msgstr "Hauptbildschirm"
+
+#: src/gui.cpp:1059 src/gui.cpp:1070 src/gui.cpp:1071
+#, c-format
+msgid "Screen %d"
+msgstr "Bildschirm %d"
+
+#: src/gui.cpp:1062
+msgid "Dual screen:"
+msgstr "Doppelbildschirm:"
+
+#: src/gui.cpp:1063
+msgid "Use two screens for fullscreen mode."
+msgstr "Benutze zwei Bildschirme im Vollbildmodus."
+
+#: src/gui.cpp:1075
+msgid "Multi screen:"
+msgstr "Multibildschirm:"
+
+#: src/gui.cpp:1076
+msgid "Use multiple screens for fullscreen mode."
+msgstr "Benutze mehrere Bildschirme im Vollbildmodus."
+
+#: src/gui.cpp:1078
+msgid "Comma-separated list of screens to use for fullscreen mode."
+msgstr ""
+"Liste von Bildschirmen für den Vollbildmodus, durch Kommata getrennt."
+
+#: src/gui.cpp:1081
+msgid "When in fullscreen mode,"
+msgstr "Im Vollbildmodus:"
+
+#: src/gui.cpp:1082
+msgid "Set special left/right view handling for fullscreen mode."
+msgstr ""
+"Wähle spezielle Einstellungen für linke und rechte Ansicht im "
+"Vollbildmodus."
+
+#: src/gui.cpp:1084
+msgid "flip left view vertically."
+msgstr "Spiegele linke Ansicht vertikal."
+
+#: src/gui.cpp:1086
+msgid "flop left view horizontally."
+msgstr "Spiegele linke Ansicht horizontal."
+
+#: src/gui.cpp:1088
+msgid "flip right view vertically."
+msgstr "Spiegele rechte Ansicht vertikal."
+
+#: src/gui.cpp:1090
+msgid "flop right view horizontally."
+msgstr "Spiegele rechte Ansicht horizontal."
+
+#: src/gui.cpp:1093
+#, fuzzy
+msgid "inhibit the screensaver"
+msgstr "Kann Bildschirmschoner nicht reaktivieren."
+
+#: src/gui.cpp:1094
+#, fuzzy
+msgid "Inhibit the screensaver during fullscreen playback."
+msgstr "Auswahl der Bildschirme für den Vollbildmodus."
+
+#: src/gui.cpp:1096 src/gui.cpp:1258 src/gui.cpp:1393 src/gui.cpp:1463
+#: src/gui.cpp:1541 src/gui.cpp:1652 src/gui.cpp:1928 src/gui.cpp:2108
+#: src/gui.cpp:2778 src/gui.cpp:2825 src/gui.cpp:3114
+msgid "OK"
+msgstr "OK"
+
+#: src/gui.cpp:1211
 msgid "Display Color Adjustments"
 msgstr "Bildschirmfarbenjustierung"
 
-#: src/player_qt.cpp:1054
+#: src/gui.cpp:1213
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/player_qt.cpp:1065
+#: src/gui.cpp:1224
 msgid "Brightness:"
 msgstr "Helligkeit:"
 
-#: src/player_qt.cpp:1076
+#: src/gui.cpp:1235
 msgid "Hue:"
 msgstr "Farbton:"
 
-#: src/player_qt.cpp:1087
+#: src/gui.cpp:1246
 msgid "Saturation:"
 msgstr "Farbsättigung:"
 
-#: src/player_qt.cpp:1099 src/player_qt.cpp:1290 src/player_qt.cpp:1406
-#: src/player_qt.cpp:1695 src/player_qt.cpp:1875 src/player_qt.cpp:2546
-#: src/player_qt.cpp:2742 src/player_qt.cpp:2988
-msgid "OK"
-msgstr "OK"
-
-#: src/player_qt.cpp:1261
+#: src/gui.cpp:1364
 msgid "Display Crosstalk Calibration"
 msgstr "Bildschirm-Crosstalk Kalibrierung"
 
 #. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/player_qt.cpp:1264
+#: src/gui.cpp:1367
 msgid ""
 "Please read the manual to find out how to measure the crosstalk "
 "levels of your display."
@@ -1043,77 +623,142 @@
 "Bitte lese das Handbuch um herauszufinden wie Crosstalk-Level für "
 "Deinen Bildschirm gemessen werden."
 
-#: src/player_qt.cpp:1268
+#: src/gui.cpp:1371
 msgid "Red:"
 msgstr "Rot:"
 
-#: src/player_qt.cpp:1275
+#: src/gui.cpp:1378
 msgid "Green:"
 msgstr "Grün:"
 
-#: src/player_qt.cpp:1282
+#: src/gui.cpp:1385
 msgid "Blue:"
 msgstr "Blau:"
 
-#: src/player_qt.cpp:1348
-msgid "Subtitle Settings"
-msgstr "Einstellungen für Untertitel"
+#: src/gui.cpp:1441
+msgid "Zoom for wide videos"
+msgstr ""
 
-#: src/player_qt.cpp:1350
-msgid "These settings apply to soft subtitles, but not to bitmaps."
+#: src/gui.cpp:1444
+msgid ""
+"Set zoom level for videos that are wider than the screen: 0: Show "
+"full video width. 1: Use full screen height.</p"
 msgstr ""
-"Diese Einstellungen gelten für Text-Untertitel, nicht für Bild-Untertitel."
-""
 
-#: src/player_qt.cpp:1352
+#: src/gui.cpp:1448
+msgid "Zoom:"
+msgstr ""
+
+#: src/gui.cpp:1449
+msgid "Set the zoom level for videos that are wider than the screen"
+msgstr ""
+
+#: src/gui.cpp:1507
+#, fuzzy
+msgid "Audio Settings"
+msgstr "Einstellungen für Untertitel"
+
+#: src/gui.cpp:1509
+#, fuzzy
+msgid "Audio device:"
+msgstr "Audiocodec"
+
+#: src/gui.cpp:1510
+msgid ""
+"Select the audio device. This will take effect for the next started "
+"video."
+msgstr ""
+
+#: src/gui.cpp:1514 src/gui.cpp:2063
+msgid "Default"
+msgstr "Standard"
+
+#: src/gui.cpp:1531
+msgid "Audio delay (ms):"
+msgstr ""
+
+#: src/gui.cpp:1532
+msgid ""
+"Set an audio delay, in milliseconds. This is useful if audio and video "
+"are not in sync."
+msgstr ""
+
+#: src/gui.cpp:1589
+msgid "Subtitle Settings"
+msgstr "Einstellungen für Untertitel"
+
+#: src/gui.cpp:1591
+msgid "These settings apply to soft subtitles, but not to bitmaps."
+msgstr ""
+"Diese Einstellungen gelten für Text-Untertitel, nicht für Bild-Untertitel."
+""
+
+#: src/gui.cpp:1593
 msgid "Encoding:"
 msgstr "Zeichensatz:"
 
-#: src/player_qt.cpp:1353
+#: src/gui.cpp:1594
 msgid "Set the subtitle character set encoding."
 msgstr "Auswahl des Untertitelzeichensatzes."
 
-#: src/player_qt.cpp:1367
+#: src/gui.cpp:1609
 msgid "Override font:"
 msgstr "Setze Schriftart:"
 
-#: src/player_qt.cpp:1368
+#: src/gui.cpp:1610
 msgid "Override the subtitle font family."
 msgstr "Auswahl der Schriftart des Untertitels."
 
-#: src/player_qt.cpp:1376
+#: src/gui.cpp:1619
 msgid "Override font size:"
 msgstr "Setze Schriftgröße:"
 
-#: src/player_qt.cpp:1377
+#: src/gui.cpp:1620
 msgid "Override the subtitle font size."
 msgstr "Auswahl der Schriftgröße des Untertitels."
 
-#: src/player_qt.cpp:1386
+#: src/gui.cpp:1630
 msgid "Override scale factor:"
 msgstr "Setze Skalierungsfaktor:"
 
-#: src/player_qt.cpp:1387
+#: src/gui.cpp:1631
 msgid "Override the subtitle scale factor."
 msgstr "Auswahl des Skalierungsfaktors des Untertitels."
 
-#: src/player_qt.cpp:1397
+#: src/gui.cpp:1642
 msgid "Override color:"
 msgstr "Setze Farbe:"
 
-#: src/player_qt.cpp:1398
+#: src/gui.cpp:1643
 msgid "Override the subtitle color."
 msgstr "Auswahl der Farbe des Untertitels."
 
-#: src/player_qt.cpp:1644
-msgid "Stereoscopic Video Settings"
-msgstr "Einstellungen für stereoskopische Videos"
+#: src/gui.cpp:1866
+#, fuzzy
+msgid "Video Settings"
+msgstr "Einstellungen für Untertitel"
+
+#: src/gui.cpp:1868
+#, fuzzy
+msgid "Crop to aspect ratio:"
+msgstr "%gx%g, Seitenverhältnis %g:1"
+
+#: src/gui.cpp:1869
+#, fuzzy
+msgid ""
+"Set the real aspect ratio of the video, so that borders can be cropped.</"
+"p>"
+msgstr "Auswahl des Stereolayouts des Videokanals."
+
+#: src/gui.cpp:1872
+msgid "Do not crop"
+msgstr ""
 
-#: src/player_qt.cpp:1646
+#: src/gui.cpp:1885
 msgid "Parallax:"
 msgstr "Parallaxe:"
 
-#: src/player_qt.cpp:1647
+#: src/gui.cpp:1886
 msgid ""
 "Adjust parallax, from -1 to +1. This changes the separation of left and "
 "right view, and thus the perceived distance of the scene."
@@ -1121,11 +766,11 @@
 "Justierung der Parallaxe, von -1 bis +1. Dies ändert die Separierung von "
 "linker und rechter Sicht und damit den wahrgenommenen Abstand der Szene."
 
-#: src/player_qt.cpp:1662
+#: src/gui.cpp:1899
 msgid "Subtitle parallax:"
 msgstr "Untertitelparallaxe:"
 
-#: src/player_qt.cpp:1663
+#: src/gui.cpp:1900
 msgid ""
 "Adjust subtitle parallax, from -1 to +1. This changes the perceived "
 "distance of the subtitles."
@@ -1133,11 +778,11 @@
 "Justierung der Untertitelparallaxe, von -1 bis +1. Dies ändert den "
 "wahrgenommenen Abstand der Untertitel."
 
-#: src/player_qt.cpp:1678
+#: src/gui.cpp:1913
 msgid "Ghostbusting:"
 msgstr "Crosstalk-Verringerungsfaktor:"
 
-#: src/player_qt.cpp:1679
+#: src/gui.cpp:1914
 msgid ""
 "Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
 "the crosstalk levels of your display first. Note that crosstalk ghostbusting "
@@ -1147,31 +792,35 @@
 "müssen die Crosstalk-Level des Bildschirms gesetzt werden. Crosstalk-"
 "Verringerung funktioniert nicht mit Anaglyphenbrillen."
 
-#: src/player_qt.cpp:1826
+#: src/gui.cpp:2059
 msgid "Open device"
 msgstr "Kamera öffnen"
 
-#: src/player_qt.cpp:1829
+#: src/gui.cpp:2062
 msgid "Choose a device type."
 msgstr "Auswahl des Kameratyps."
 
-#: src/player_qt.cpp:1830
-msgid "Default"
-msgstr "Standard"
+#: src/gui.cpp:2064 src/media_object.cpp:801
+msgid "Firewire"
+msgstr "Firewire"
 
-#: src/player_qt.cpp:1834 src/player_qt.cpp:1837
+#: src/gui.cpp:2065 src/media_object.cpp:802
+msgid "X11"
+msgstr "X11"
+
+#: src/gui.cpp:2067 src/gui.cpp:2070
 msgid "Choose a device."
 msgstr "Auswahl der Kamera."
 
-#: src/player_qt.cpp:1840
+#: src/gui.cpp:2073
 msgid "Set the X11 device string. Refer to the manual for details."
 msgstr "Setze das X11 Gerät. Siehe Benutzerhandbuch."
 
-#: src/player_qt.cpp:1849
+#: src/gui.cpp:2082
 msgid "Request frame size"
 msgstr "Fordere Bildgröße an"
 
-#: src/player_qt.cpp:1850
+#: src/gui.cpp:2083
 msgid ""
 "Request a specific frame size from the device, e.g. 640x480. The device "
 "must support this frame size. Some devices require a frame size to be "
@@ -1181,11 +830,11 @@
 "Die Kamera muss diese Auflösung unterstützen. Einige Kameras verlangen, dass "
 "eine Auflösung ausgewählt wird."
 
-#: src/player_qt.cpp:1861
+#: src/gui.cpp:2094
 msgid "Request frame rate"
 msgstr "Fordere Bildrate an"
 
-#: src/player_qt.cpp:1862
+#: src/gui.cpp:2095
 msgid ""
 "Request a specific frame rate from the device, e.g. 25/1. The device must "
 "support this frame rate. Some devices require a frame rate to be selected.</"
@@ -1195,229 +844,253 @@
 "muss diese Bildrate unterstützen. Einige Kameras verlangen, dass eine "
 "Bildrate ausgewählt wird."
 
-#: src/player_qt.cpp:1873 src/player_qt.cpp:2545 src/player_qt.cpp:2741
+#: src/gui.cpp:2106 src/gui.cpp:2824
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/player_qt.cpp:2048
+#: src/gui.cpp:2377
 msgid "&File"
 msgstr "&Datei"
 
-#: src/player_qt.cpp:2049
-msgid "&Open..."
-msgstr "&Öffnen..."
+#: src/gui.cpp:2378
+#, fuzzy
+msgid "&Open file(s)..."
+msgstr "Dateien öffnen"
 
-#: src/player_qt.cpp:2054
-msgid "Open &URL..."
+#: src/gui.cpp:2383
+#, fuzzy
+msgid "Open &URL(s)..."
 msgstr "Öffne &URL..."
 
-#: src/player_qt.cpp:2058
+#: src/gui.cpp:2387
 msgid "Open &device..."
 msgstr "Öffne &Kamera..."
 
-#: src/player_qt.cpp:2063
+#: src/gui.cpp:2402
+msgid "&Clear recent files"
+msgstr ""
+
+#: src/gui.cpp:2410
 msgid "&Quit..."
 msgstr "&Beenden..."
 
-#: src/player_qt.cpp:2069
+#: src/gui.cpp:2416
 msgid "&Preferences"
 msgstr "&Einstellungen"
 
-#: src/player_qt.cpp:2072
+#: src/gui.cpp:2419
 msgid "&Fullscreen Settings..."
 msgstr "&Vollbildeinstellungen..."
 
-#: src/player_qt.cpp:2075
+#: src/gui.cpp:2422
 msgid "Display &Color Adjustments..."
 msgstr "Bildschirm&farben..."
 
-#: src/player_qt.cpp:2078
+#: src/gui.cpp:2425
 msgid "Display Cross&talk Calibration..."
 msgstr "Bildschirm-Crosstalk..."
 
-#: src/player_qt.cpp:2082
+#: src/gui.cpp:2429
+msgid "&Zoom for wide videos..."
+msgstr ""
+
+#: src/gui.cpp:2433
+#, fuzzy
+msgid "&Audio Settings..."
+msgstr "&Untertitel..."
+
+#: src/gui.cpp:2437
 msgid "&Subtitle Settings..."
 msgstr "&Untertitel..."
 
-#: src/player_qt.cpp:2086
-msgid "Stereoscopic Video Settings..."
+#: src/gui.cpp:2441
+#, fuzzy
+msgid "Current &Video Settings..."
 msgstr "&Stereoskopische Videos..."
 
-#: src/player_qt.cpp:2089
+#: src/gui.cpp:2444
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: src/player_qt.cpp:2090
+#: src/gui.cpp:2445
 msgid "&Manual..."
 msgstr "&Handbuch..."
 
-#: src/player_qt.cpp:2095
+#: src/gui.cpp:2450
 msgid "&Website..."
 msgstr "&Webseite..."
 
-#: src/player_qt.cpp:2099
+#: src/gui.cpp:2454
 msgid "&Keyboard Shortcuts"
 msgstr "&Tastaturkürzel"
 
-#: src/player_qt.cpp:2103
+#: src/gui.cpp:2458
 msgid "&About"
 msgstr "&Über"
 
-#: src/player_qt.cpp:2169 src/player_qt.cpp:2891 src/player_qt.cpp:2899
-#: src/video_output_qt.cpp:92 src/video_output_qt.cpp:400
-#: src/video_output_qt.cpp:422
-msgid "Error"
-msgstr "Fehler"
+#: src/gui.cpp:2771
+msgid "Tip"
+msgstr ""
+
+#: src/gui.cpp:2774
+msgid ""
+"You can select and open multiple files at once.This is useful for "
+"example if you have extra subtitle files, or if left and right view are "
+"stored in separate files."
+msgstr ""
 
-#: src/player_qt.cpp:2528
+#: src/gui.cpp:2777
+msgid "Do not show this message again."
+msgstr ""
+
+#: src/gui.cpp:2794
 msgid "Open files"
 msgstr "Dateien öffnen"
 
-#: src/player_qt.cpp:2541
-msgid "Open URL"
+#: src/gui.cpp:2818
+#, fuzzy
+msgid "Open URL(s)"
 msgstr "Öffne URL"
 
-#: src/player_qt.cpp:2542
-msgid "URL:"
-msgstr "URL:"
+#: src/gui.cpp:2819
+msgid "URL(s):"
+msgstr ""
 
-#: src/player_qt.cpp:2689
-msgid "Fullscreen/Multiscreen Settings"
-msgstr "Vollbild-/Multibildeinstellungen"
+#: src/gui.cpp:2820
+msgid "Enter one or more space separated URLs."
+msgstr ""
 
-#: src/player_qt.cpp:2691
-msgid "Configure fullscreen mode:"
-msgstr "Konfiguriere Vollbildmodus:"
+#: src/gui.cpp:3005 src/gui.cpp:3013 src/video_output_qt.cpp:234
+#: src/video_output_qt.cpp:643 src/video_output_qt.cpp:664
+msgid "Error"
+msgstr "Fehler"
 
-#: src/player_qt.cpp:2692
-msgid "Select the screens to use in fullscreen mode."
-msgstr "Auswahl der Bildschirme für den Vollbildmodus."
+#: src/gui.cpp:3005
+msgid "Cannot open manual."
+msgstr "Kann Handbuch nicht öffnen."
 
-#: src/player_qt.cpp:2694
-msgid "Single screen:"
-msgstr "Einzelner Bildschirm:"
+#: src/gui.cpp:3013
+msgid "Cannot open website."
+msgstr "Kann Webseite nicht öffnen."
 
-#: src/player_qt.cpp:2695
-msgid "Use a single screen for fullscreen mode."
-msgstr "Benutze einen einzelnen Bildschirm im Vollbildmodus."
+#: src/gui.cpp:3021
+msgid "Keyboard Shortcuts"
+msgstr "Tastaturkürzel"
 
-#: src/player_qt.cpp:2698
-msgid "Primary screen"
-msgstr "Hauptbildschirm"
+#: src/gui.cpp:3024
+#, fuzzy
+msgid "Keyboard control:"
+msgstr "Tastaturkürzel"
 
-#: src/player_qt.cpp:2703 src/player_qt.cpp:2717 src/player_qt.cpp:2718
-#, c-format
-msgid "Screen %d"
-msgstr "Bildschirm %d"
+#: src/gui.cpp:3026
+msgid "Stop."
+msgstr ""
 
-#: src/player_qt.cpp:2707
-msgid "Dual screen:"
-msgstr "Doppelbildschirm:"
+#: src/gui.cpp:3027 src/main.cpp:495
+msgid "Pause / unpause."
+msgstr ""
 
-#: src/player_qt.cpp:2708
-msgid "Use two screens for fullscreen mode."
-msgstr "Benutze zwei Bildschirme im Vollbildmodus."
+#: src/gui.cpp:3028 src/main.cpp:496
+#, fuzzy
+msgid "Toggle fullscreen."
+msgstr "Konfiguriere Vollbildmodus:"
 
-#: src/player_qt.cpp:2722
-msgid "Multi screen:"
-msgstr "Multibildschirm:"
+#: src/gui.cpp:3029 src/main.cpp:497
+msgid "Center window."
+msgstr ""
 
-#: src/player_qt.cpp:2723
-msgid "Use multiple screens for fullscreen mode."
-msgstr "Benutze mehrere Bildschirme im Vollbildmodus."
+#: src/gui.cpp:3030 src/main.cpp:498
+#, fuzzy
+msgid "Swap left/right eye."
+msgstr "Tausche links/rechts"
 
-#: src/player_qt.cpp:2725
-msgid "Comma-separated list of screens to use for fullscreen mode."
+#: src/gui.cpp:3031 src/main.cpp:499
+msgid "Cycle through available video streams."
 msgstr ""
-"Liste von Bildschirmen für den Vollbildmodus, durch Kommata getrennt."
 
-#: src/player_qt.cpp:2729
-msgid "When in fullscreen mode,"
-msgstr "Im Vollbildmodus:"
+#: src/gui.cpp:3032 src/main.cpp:500
+msgid "Cycle through available audio streams."
+msgstr ""
 
-#: src/player_qt.cpp:2730
-msgid "Set special left/right view handling for fullscreen mode."
+#: src/gui.cpp:3033 src/main.cpp:501
+#, fuzzy
+msgid "Cycle through available subtitle streams."
+msgstr "Auswahl des Untertitelkanals."
+
+#: src/gui.cpp:3034 src/main.cpp:502
+msgid "Adjust contrast."
 msgstr ""
-"Wähle spezielle Einstellungen für linke und rechte Ansicht im "
-"Vollbildmodus."
 
-#: src/player_qt.cpp:2732
-msgid "flip left view vertically."
-msgstr "Spiegele linke Ansicht vertikal."
+#: src/gui.cpp:3035 src/main.cpp:503
+#, fuzzy
+msgid "Adjust brightness."
+msgstr "Helligkeit:"
 
-#: src/player_qt.cpp:2734
-msgid "flop left view horizontally."
-msgstr "Spiegele linke Ansicht horizontal."
+#: src/gui.cpp:3036 src/main.cpp:504
+msgid "Adjust hue."
+msgstr ""
 
-#: src/player_qt.cpp:2736
-msgid "flip right view vertically."
-msgstr "Spiegele rechte Ansicht vertikal."
+#: src/gui.cpp:3037 src/main.cpp:505
+#, fuzzy
+msgid "Adjust saturation."
+msgstr "Farbsättigung:"
 
-#: src/player_qt.cpp:2738
-msgid "flop right view horizontally."
-msgstr "Spiegele rechte Ansicht horizontal."
+#: src/gui.cpp:3038 src/main.cpp:506
+#, fuzzy
+msgid "Adjust parallax."
+msgstr "Untertitelparallaxe:"
 
-#: src/player_qt.cpp:2891
-msgid "Cannot open manual."
-msgstr "Kann Handbuch nicht öffnen."
+#: src/gui.cpp:3039 src/main.cpp:507
+#, fuzzy
+msgid "Adjust ghostbusting."
+msgstr "Crosstalk-Verringerungsfaktor:"
 
-#: src/player_qt.cpp:2899
-msgid "Cannot open website."
-msgstr "Kann Webseite nicht öffnen."
+#: src/gui.cpp:3040 src/main.cpp:508
+msgid "Adjust zoom for wide videos."
+msgstr ""
 
-#: src/player_qt.cpp:2905
-msgid "Keyboard Shortcuts"
-msgstr "Tastaturkürzel"
+#: src/gui.cpp:3041 src/main.cpp:509
+msgid "Adjust audio volume."
+msgstr ""
 
-#. TRANSLATORS: This is a HTML table, shown under Help->Keyboard Shortcuts.
-#. Please make sure that your translation formats properly.
-#: src/player_qt.cpp:2908
-msgid ""
-"Keyboard control: <table><tr><td>q or ESC</td><td>Stop</td></"
-"tr><tr><td>p or SPACE</td><td>Pause / unpause</td></tr><tr><td>f</"
-"td><td>Toggle fullscreen</td></tr><tr><td>c</td><td>Center window</td></"
-"tr><tr><td>e</td><td>Swap left/right eye</td></tr><tr><td>v</td><td>Cycle "
-"through available video streams</td></tr><tr><td>a</td><td>Cycle through "
-"available audio streams</td></tr><tr><td>s</td><td>Cycle through available "
-"subtitle streams</td></tr><tr><td>1, 2</td><td>Adjust contrast</td></"
-"tr><tr><td>3, 4</td><td>Adjust brightness</td></tr><tr><td>5, 6</"
-"td><td>Adjust hue</td></tr><tr><td>7, 8</td><td>Adjust saturation</td></"
-"tr><tr><td>&lt;, &gt;</td><td>Adjust parallax</td></tr><tr><td>(, )</"
-"td><td>Adjust ghostbusting</td></tr><tr><td>left, right</td><td>Seek 10 "
-"seconds backward / forward</td></tr><tr><td>up, down</td><td>Seek 1 minute "
-"backward / forward</td></tr><tr><td>page up, page down</td><td>Seek 10 "
-"minutes backward / forward</td></tr></table>"
-msgstr ""
-"Tastatursteuerung: <table><tr><td>q oder ESC</td><td>Stopp</td></"
-"tr><tr><td>p oder Leertaste</td><td>Pause / weiter</td></tr><tr><td>f</"
-"td><td>Schalte Vollbildmodus um</td></tr><tr><td>c</td><td>Zentriere "
-"Fenster</td></tr><tr><td>e</td><td>Tausche links/rechts</td></tr><tr><td>v</"
-"td><td>Schalte zum nächsten Videokanal</td></tr><tr><td>a</td><td>Schalte "
-"zum nächsten Audiokanal</td></tr><tr><td>s</td><td>Schalte zum nächsten "
-"Untertitelkanal</td></tr><tr><td>1, 2</td><td>Justiere Kontrast</td></"
-"tr><tr><td>3, 4</td><td>Justiere Helligkeit</td></tr><tr><td>5, 6</"
-"td><td>Justiere Farbton</td></tr><tr><td>7, 8</td><td>Justiere "
-"Farbsättigung</td></tr><tr><td>&lt;, &gt;</td><td>Justiere Parallaxe</td></"
-"tr><tr><td>(, )</td><td>Justiere Crosstalk-Verringerung</td></"
-"tr><tr><td>links, rechts</td><td>Spule 10 Sekunden zurück / vor</td></"
-"tr><tr><td>hoch, runter</td><td>Spule 1 Minute zurück / vor</td></"
-"tr><tr><td>Seite rauf, Seite runter</td><td>Spule 10 Minuten zurück / vor</"
-"td></tr></table>"
-
-#: src/player_qt.cpp:2935
+#: src/gui.cpp:3042 src/main.cpp:510
+msgid "Toggle audio mute."
+msgstr ""
+
+#: src/gui.cpp:3043 src/main.cpp:511
+msgid "Step a single video frame forward."
+msgstr ""
+
+#: src/gui.cpp:3044 src/main.cpp:512
+msgid "Seek 10 seconds backward / forward."
+msgstr ""
+
+#: src/gui.cpp:3045 src/main.cpp:513
+msgid "Seek 1 minute backward / forward."
+msgstr ""
+
+#: src/gui.cpp:3046 src/main.cpp:514
+msgid "Seek 10 minutes backward / forward."
+msgstr ""
+
+#: src/gui.cpp:3047 src/main.cpp:516
+msgid "Media keys should work as expected."
+msgstr ""
+
+#: src/gui.cpp:3063
 #, c-format
 msgid "About %s"
 msgstr "Über %s"
 
-#: src/player_qt.cpp:2941
+#: src/gui.cpp:3069
 #, c-format
 msgid "The %s 3D video player"
 msgstr "%s - 3D Videospieler"
 
-#: src/player_qt.cpp:2946
-#, c-format
+#: src/gui.cpp:3074
+#, fuzzy, c-format
 msgid ""
-"%s version %s.Copyright (C) 2011 the Bino developers.This "
+"%s version %s.Copyright (C) 2012 the Bino developers.This "
 "is free software. You may redistribute copies of it under the terms of the "
 "<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
 "a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
@@ -1429,110 +1102,1104 @@
 "License</a>. Es gibt keine Garantie.Siehe <a href=\"%s\">%s</a> für "
 "mehr Informationen über diese Software."
 
-#: src/player_qt.cpp:2983
+#: src/gui.cpp:3086 src/main.cpp:384
+msgid "Platform:"
+msgstr "Plattform:"
+
+#: src/gui.cpp:3087 src/main.cpp:386
+msgid "Libraries used:"
+msgstr "Benutzte Bibliotheken:"
+
+#: src/gui.cpp:3109
 msgid "About"
 msgstr "Über"
 
-#: src/player_qt.cpp:2984
+#: src/gui.cpp:3110
 msgid "Libraries"
 msgstr "Bibliotheken"
 
-#: src/player_qt.cpp:2985
+#: src/gui.cpp:3111
 msgid "Team"
 msgstr "Team"
 
-#: src/player_qt.cpp:2986
+#: src/gui.cpp:3112
 msgid "License"
 msgstr "Lizenz"
 
-#: src/subtitle_renderer.cpp:223
-msgid "Cannot initialize LibASS."
-msgstr "Kann LibASS nicht initialisieren."
+#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
+msgid "not used"
+msgstr "nicht benutzt"
 
-#: src/subtitle_renderer.cpp:232
-msgid "Cannot initialize LibASS renderer."
-msgstr "Kann LibASS-Renderer nicht initialisieren."
+#: src/lirc.cpp:61
+msgid "Cannot initialize LIRC."
+msgstr "Kann LIRC nicht initialisieren."
 
-#: src/subtitle_renderer.cpp:398
-msgid "Cannot initialize LibASS track."
-msgstr "Kann LibASS-Spur nicht initialisieren."
+#
+#: src/lirc.cpp:67
+msgid "Cannot set LIRC socket properties."
+msgstr "Kann LIRC Parameter nicht setzen."
 
-#: src/subtitle_renderer.cpp:409
+#: src/lirc.cpp:74
+msgid "Cannot read LIRC default configuration."
+msgstr "Kann LIRC Standardkonfiguration nicht lesen."
+
+#: src/lirc.cpp:89
 #, c-format
-msgid "Subtitle character set conversion failed: %s"
-msgstr "Untertitel-Zeichensatzkonvertierung fehlgeschlagen: %s"
+msgid "Cannot read LIRC configuration file %s."
+msgstr "Kann LIRC Konfigurationsdatei %s nicht lesen."
 
-#: src/video_output.cpp:363 src/video_output.cpp:473
-msgid "Cannot create a PBO buffer."
-msgstr "Kann keinen PBO Puffer erzeugen."
+#: src/lirc.cpp:117
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr "Kann LIRC Ereignis nicht lesen; schalte LIRC ab."
 
-#: src/video_output_qt.cpp:313
+#: src/lirc.cpp:131
 #, c-format
-msgid "Cannot initialize GLEW: %s"
-msgstr "Kann GLEW nicht initialisieren: %s"
+msgid "Received invalid command '%s' from LIRC."
+msgstr "Ungültiges Kommando '%s' von LIRC erhalten."
 
-#: src/video_output_qt.cpp:343
-msgid "Please wait"
-msgstr "Bitte warten"
+#: src/lirc.cpp:141
+msgid "Cannot get command for LIRC code."
+msgstr "Kann kein Kommando für LIRC Code bekommen."
 
-#: src/video_output_qt.cpp:400 src/video_output_qt.cpp:417
-msgid "Cannot set OpenGL context format."
-msgstr "Kann OpenGL Kontextformat nicht setzen."
+#: src/main.cpp:367 src/media_object.cpp:821 src/media_object.cpp:1286
+#: src/video_output.cpp:212
+#, c-format
+msgid "%s: %s"
+msgstr "%s: %s"
 
-#: src/video_output_qt.cpp:412
-msgid "The display does not support OpenGL stereo mode."
-msgstr "Dieses Gerät unterstützt kein OpenGL Stereo."
+#: src/main.cpp:379
+#, c-format
+msgid "%s version %s"
+msgstr "%s Version %s"
 
-#: src/video_output_qt.cpp:505
-msgid "Cannot suspend screensaver."
-msgstr "Kann Bildschirmschoner nicht deaktivieren."
+#: src/main.cpp:380
+#, fuzzy
+msgid "Copyright (C) 2012 the Bino developers."
+msgstr "Copyright (C) 2011 Bino Entwickler."
 
-#: src/video_output_qt.cpp:520
-msgid "Cannot resume screensaver."
-msgstr "Kann Bildschirmschoner nicht reaktivieren."
+#: src/main.cpp:381
+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 ""
+"Dies ist freie Software. Du kannst Kopien davon verteilen unter den "
+"Bedingungen der GNU General Public License. Es gibt keine Garantie."
 
-#: src/xgl.cpp:200
-#, c-format
-msgid "OpenGL FBO error %s."
-msgstr "OpenGL FBO Fehler: %s"
+#. 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:399
+msgid "Usage:"
+msgstr ""
 
-#: src/xgl.cpp:217
-#, c-format
-msgid "OpenGL error 0x%04X."
-msgstr "OpenGL Fehler 0x%04X."
+#: src/main.cpp:401
+msgid "Options:"
+msgstr ""
 
-#: src/xgl.cpp:282
-#, c-format
-msgid "OpenGL %s '%s': compiler warning:"
-msgstr "OpenGL %s '%s': Compilerwarnung:"
+#: src/main.cpp:402
+msgid "Print help."
+msgstr ""
 
-#: src/xgl.cpp:283 src/xgl.cpp:292
-msgid "vertex shader"
-msgstr "Vertexshader"
+#: src/main.cpp:403
+msgid "Print version."
+msgstr ""
 
-#: src/xgl.cpp:284 src/xgl.cpp:293
-msgid "geometry shader"
-msgstr "Geometryshader"
+#: src/main.cpp:404
+msgid "Do not use the GUI, just show a plain window."
+msgstr ""
 
-#: src/xgl.cpp:285 src/xgl.cpp:294
-msgid "fragment shader"
-msgstr "Fragmentshader"
+#: src/main.cpp:405
+msgid "Append all log messages to the given file."
+msgstr ""
 
-#: src/xgl.cpp:291
-#, c-format
-msgid "OpenGL %s '%s': compilation failed."
-msgstr "OpenGL %s '%s': Compilieren fehlgeschlagen."
+#: src/main.cpp:406
+msgid "Set log level (debug/info/warning/error/quiet)."
+msgstr ""
 
-#: src/xgl.cpp:296 src/xgl.cpp:363
-msgid "unknown error"
-msgstr "unbekannter Fehler"
+#: src/main.cpp:407
+msgid "Print a list of known audio devices and exit."
+msgstr ""
 
-#: src/xgl.cpp:357
-#, c-format
-msgid "OpenGL program '%s': linker warning:"
-msgstr "OpenGL Programm '%s': Linkerwarnung:"
+#: src/main.cpp:408
+msgid "Use audio device number N (N=0 is the default)."
+msgstr ""
 
-#: src/xgl.cpp:362
-#, c-format
-msgid "OpenGL program '%s': linking failed."
-msgstr "OpenGL Programm '%s': Linken fehlgeschlagen."
+#: src/main.cpp:409
+msgid "Delay audio by D milliseconds. Default is 0."
+msgstr ""
+
+#: src/main.cpp:410
+msgid "Set audio volume (0 to 1). Default is 1."
+msgstr ""
+
+#: src/main.cpp:411
+#, fuzzy
+msgid "Mute audio."
+msgstr "Kein Audio."
+
+#: src/main.cpp:412
+msgid "Type of input device: default, firewire, x11."
+msgstr ""
+
+#: src/main.cpp:413
+#, fuzzy
+msgid "Request frame size WxH from input device."
+msgstr "Fordere Bildgröße an"
+
+#: src/main.cpp:414
+#, fuzzy
+msgid "Request frame rate N/D from input device."
+msgstr "Fordere Bildrate an"
+
+#: src/main.cpp:415
+#, fuzzy
+msgid "Use the given LIRC configuration file."
+msgstr "Kann LIRC Konfigurationsdatei %s nicht lesen."
+
+#: src/main.cpp:416
+msgid "This option can be used more than once."
+msgstr ""
+
+#: src/main.cpp:417
+msgid "Select video stream (1-n, depending on input)."
+msgstr ""
+
+#: src/main.cpp:418
+msgid "Select audio stream (1-n, depending on input)."
+msgstr ""
+
+#: src/main.cpp:419
+#, fuzzy
+msgid "Select subtitle stream (0-n, dep. on input)."
+msgstr "Auswahl des Untertitelkanals."
+
+#: src/main.cpp:420
+msgid "Select input type (default autodetect):"
+msgstr ""
+
+#: src/main.cpp:421
+#, fuzzy
+msgid "Single view."
+msgstr "Rechte Sicht"
+
+#: src/main.cpp:422
+#, fuzzy
+msgid "Left/right separate streams, left first."
+msgstr "Getrennte Kanäle, links zuerst"
+
+#: src/main.cpp:423
+#, fuzzy
+msgid "Left/right separate streams, right first."
+msgstr "Getrennte Kanäle, rechts zuerst"
+
+#: src/main.cpp:424
+#, fuzzy
+msgid "Left/right alternating, left first."
+msgstr "Getrennte Kanäle, links zuerst"
+
+#: src/main.cpp:425
+#, fuzzy
+msgid "Left/right alternating, right first."
+msgstr "Getrennte Kanäle, rechts zuerst"
+
+#: src/main.cpp:426 src/main.cpp:441
+msgid "Left top, right bottom."
+msgstr ""
+
+#: src/main.cpp:427 src/main.cpp:442
+#, fuzzy
+msgid "Left top, right bottom, half height."
+msgstr "Oben/unten, halbe Höhe"
+
+#: src/main.cpp:428
+msgid "Left bottom, right top."
+msgstr ""
+
+#: src/main.cpp:429
+#, fuzzy
+msgid "Left bottom, right top, half height."
+msgstr "Unten/oben, halbe Höhe"
+
+#: src/main.cpp:430 src/main.cpp:443
+msgid "Left left, right right."
+msgstr ""
+
+#: src/main.cpp:431 src/main.cpp:444
+#, fuzzy
+msgid "Left left, right right, half width."
+msgstr "Links/rechts, halbe Breite"
+
+#: src/main.cpp:432
+#, fuzzy
+msgid "Left right, right left."
+msgstr "Links/rechts, halbe Breite"
+
+#: src/main.cpp:433
+#, fuzzy
+msgid "Left right, right left, half width."
+msgstr "Links/rechts, halbe Breite"
+
+#: src/main.cpp:434 src/main.cpp:445
+msgid "Left even rows, right odd rows."
+msgstr ""
+
+#: src/main.cpp:435
+msgid "Left odd rows, right even rows."
+msgstr ""
+
+#: src/main.cpp:436
+msgid "Select output type:"
+msgstr ""
+
+#: src/main.cpp:437
+#, fuzzy
+msgid "OpenGL quad-buffered stereo."
+msgstr "OpenGL Stereo"
+
+#: src/main.cpp:438
+#, fuzzy
+msgid "Left and right view alternating."
+msgstr "Spiegele rechte Ansicht vertikal."
+
+#: src/main.cpp:439
+msgid "Only left."
+msgstr ""
+
+#: src/main.cpp:440
+msgid "Only right."
+msgstr ""
+
+#: src/main.cpp:446
+msgid "Left even columns, right odd columns."
+msgstr ""
+
+#: src/main.cpp:447
+#, fuzzy
+msgid "Left and right in checkerboard pattern."
+msgstr "Schachbrettmuster"
+
+#: src/main.cpp:448
+#, fuzzy
+msgid "HDMI frame packing mode."
+msgstr "HDMI Framepacking Modus"
+
+#: src/main.cpp:449
+#, fuzzy
+msgid "Red/cyan anaglyph, monochrome method."
+msgstr "Rot/cyan Brillen, monochrome Methode"
+
+#: src/main.cpp:450
+#, fuzzy
+msgid "Red/cyan anaglyph, half color method."
+msgstr "Rot/cyan Brillen, Halbfarbenmethode"
+
+#: src/main.cpp:451
+#, fuzzy
+msgid "Red/cyan anaglyph, full color method."
+msgstr "Rot/cyan Brillen, Vollfarbenmethode"
+
+#: src/main.cpp:452
+#, fuzzy
+msgid "Red/cyan anaglyph, Dubois method."
+msgstr "Rot/cyan Brillen, hochwertige Dubois-Methode"
+
+#: src/main.cpp:453
+#, fuzzy
+msgid "Green/magenta anaglyph, monochrome method."
+msgstr "Grün/magenta Brillen, monochrome Methode"
+
+#: src/main.cpp:454
+#, fuzzy
+msgid "Green/magenta anaglyph, half color method."
+msgstr "Grün/magenta Brillen, Halbfarbenmethode"
+
+#: src/main.cpp:455
+#, fuzzy
+msgid "Green/magenta anaglyph, full color method."
+msgstr "Grün/magenta Brillen, Vollfarbenmethode"
+
+#: src/main.cpp:456
+#, fuzzy
+msgid "Green/magenta anaglyph, Dubois method."
+msgstr "Grün/magenta Brillen, hochwertige Dubois-Methode"
+
+#: src/main.cpp:457
+#, fuzzy
+msgid "Amber/blue anaglyph, monochrome method."
+msgstr "Orange/blau Brillen, monochrome Methode"
+
+#: src/main.cpp:458
+#, fuzzy
+msgid "Amber/blue anaglyph, half color method."
+msgstr "Orange/blau Brillen, Halbfarbenmethode"
+
+#: src/main.cpp:459
+#, fuzzy
+msgid "Amber/blue anaglyph, full color method."
+msgstr "Orange/blau Brillen, Vollfarbenmethode"
+
+#: src/main.cpp:460
+#, fuzzy
+msgid "Amber/blue anaglyph, Dubois method."
+msgstr "Orange/blau Brillen, hochwertige Dubois-Methode"
+
+#: src/main.cpp:461
+#, fuzzy
+msgid "Red/green anaglyph, monochrome method."
+msgstr "Rot/grün Brillen, monochrome Methode"
+
+#: src/main.cpp:462
+#, fuzzy
+msgid "Red/blue anaglyph, monochrome method."
+msgstr "Rot/blau Brillen, monochrome Methode"
+
+#: src/main.cpp:463
+msgid "Multi-display via Equalizer (2D setup)."
+msgstr ""
+
+#: src/main.cpp:464
+msgid "Multi-display via Equalizer (3D setup)."
+msgstr ""
+
+#: src/main.cpp:465
+#, fuzzy
+msgid "Swap left/right view."
+msgstr "Tausche links/rechts"
+
+#: src/main.cpp:466
+#, fuzzy
+msgid "Fullscreen."
+msgstr "Doppelbildschirm:"
+
+#: src/main.cpp:467
+#, fuzzy
+msgid "Use the listed screens in fullscreen mode."
+msgstr "Benutze mehrere Bildschirme im Vollbildmodus."
+
+#: src/main.cpp:468
+msgid "Screen numbers start with 1."
+msgstr ""
+
+#: src/main.cpp:469
+msgid "An empty list defaults to the primary screen."
+msgstr ""
+
+#: src/main.cpp:470
+#, fuzzy
+msgid "Flip left view vertically when fullscreen."
+msgstr "Spiegele linke Ansicht vertikal."
+
+#: src/main.cpp:471
+#, fuzzy
+msgid "Flop left view horizontally when fullscreen."
+msgstr "Spiegele linke Ansicht horizontal."
+
+#: src/main.cpp:472
+#, fuzzy
+msgid "Flip right view vertically when fullscreen."
+msgstr "Spiegele rechte Ansicht vertikal."
+
+#: src/main.cpp:473
+#, fuzzy
+msgid "Flop right view horizontally when fullscreen."
+msgstr "Spiegele rechte Ansicht horizontal."
+
+#: src/main.cpp:474
+msgid "Set zoom for wide videos (0=off to 1=full)."
+msgstr ""
+
+#: src/main.cpp:475
+msgid "Crop video to given aspect ratio (0:0=off)."
+msgstr ""
+
+#: src/main.cpp:476
+#, fuzzy
+msgid "Center window on screen."
+msgstr "Zentrierung des Videos in der Mitte des Bildschirms."
+
+#: src/main.cpp:477
+#, fuzzy
+msgid "Set subtitle encoding."
+msgstr "Untertitelcodec"
+
+#: src/main.cpp:478
+#, fuzzy
+msgid "Set subtitle font name."
+msgstr "Auswahl der Schriftart des Untertitels."
+
+#: src/main.cpp:479
+#, fuzzy
+msgid "Set subtitle font size."
+msgstr "Auswahl der Schriftgröße des Untertitels."
+
+#: src/main.cpp:480
+#, fuzzy
+msgid "Set subtitle scale factor."
+msgstr "Auswahl des Skalierungsfaktors des Untertitels."
+
+#: src/main.cpp:481
+msgid "Set subtitle color, in [AA]RRGGBB format."
+msgstr ""
+
+#: src/main.cpp:482
+msgid "Subtitle parallax adjustment (-1 to +1)."
+msgstr ""
+
+#: src/main.cpp:483
+msgid "Parallax adjustment (-1 to +1)."
+msgstr ""
+
+#: src/main.cpp:484
+msgid "Crosstalk leak level (0 to 1)."
+msgstr ""
+
+#: src/main.cpp:485
+msgid "Comma-separated values for R,G,B."
+msgstr ""
+
+#: src/main.cpp:486
+msgid "Amount of ghostbusting to apply (0 to 1)."
+msgstr ""
+
+#: src/main.cpp:487
+msgid "Benchmark mode (no audio, show fps)."
+msgstr ""
+
+#: src/main.cpp:488
+msgid "Frame rate divisor for display refresh rate."
+msgstr ""
+
+#: src/main.cpp:489
+msgid "Default is 0 for benchmark mode, 1 otherwise."
+msgstr ""
+
+#: src/main.cpp:490
+msgid "Loop the input media."
+msgstr ""
+
+#: src/main.cpp:492
+msgid "Interactive control:"
+msgstr ""
+
+#: src/main.cpp:493
+#, fuzzy
+msgid "Leave fullscreen mode, or quit."
+msgstr "Im Vollbildmodus:"
+
+#: src/main.cpp:494
+#, fuzzy
+msgid "Quit."
+msgstr "&Beenden..."
+
+#: src/main.cpp:515
+msgid "Seek according to horizontal click position."
+msgstr ""
+
+#: src/main.cpp:523
+msgid "No audio devices known."
+msgstr ""
+
+#: src/main.cpp:595
+msgid "Benchmark mode: audio and time synchronization disabled."
+msgstr "Benchmark Modus: Audio und Videosynchronisation deaktiviert."
+
+#: src/main.cpp:729
+msgid "This version of Bino was compiled without support for LIRC."
+msgstr "Diese Version von Bino wurde ohne Unterstützung für LIRC erstellt."
+
+#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
+#: src/media_data.cpp:935
+#, c-format
+msgid "%dx%d, %.3g:1"
+msgstr "%dx%d, %.3g:1"
+
+#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
+#: src/media_data.cpp:1066
+#, c-format
+msgid "%s, %d ch., %g kHz, %d bit"
+msgstr "%s, %d Kan., %g kHz, %d bit"
+
+#: src/media_input.cpp:282
+#, c-format
+msgid "Video %s: %s"
+msgstr "Video %s: %s"
+
+#: src/media_input.cpp:287
+msgid "No video."
+msgstr "Kein Video."
+
+#: src/media_input.cpp:293
+#, c-format
+msgid "Audio %s: %s"
+msgstr "Audio %s: %s"
+
+#: src/media_input.cpp:298
+msgid "No audio."
+msgstr "Kein Audio."
+
+#: src/media_input.cpp:304
+#, c-format
+msgid "Subtitle %s: %s"
+msgstr "Untertitel %s: %s"
+
+#: src/media_input.cpp:309
+msgid "No subtitle."
+msgstr "Kein Untertitel."
+
+#: src/media_input.cpp:311
+#, c-format
+msgid "Duration: %g seconds"
+msgstr "Dauer: %g Sekunden"
+
+#: src/media_input.cpp:314
+#, c-format
+msgid "Stereo layout: %s"
+msgstr "Stereolayout: %s"
+
+#: src/media_object.cpp:677
+#, c-format
+msgid "%s video stream %d: Unsupported stereo layout %s."
+msgstr "%s Videokanal %d: Stereolayout %s wird nicht unterstützt."
+
+#: src/media_object.cpp:715
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with %d channels."
+msgstr "%s Audiokanal %d: Kann Audiodaten mit %d Kanälen nicht benutzen."
+
+#: src/media_object.cpp:744
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with sample format %s."
+msgstr "%s Audiokanal %d: Kann Audiodaten mit Sampleformat %s nicht benutzen."
+
+#: src/media_object.cpp:800
+#, c-format
+msgid "No support available for %s device."
+msgstr "Unterstüztung für %s Geräte nicht verfügbar."
+
+#: src/media_object.cpp:803
+msgid "default"
+msgstr "Standard"
+
+#: src/media_object.cpp:832
+#, c-format
+msgid "%s: Cannot read stream info: %s"
+msgstr "%s: Kann Informationen über Kanal nicht lesen: %s"
+
+#: src/media_object.cpp:876
+#, c-format
+msgid "%s stream %d: Cannot open %s: %s"
+msgstr "%s Kanal %d: Kann %s nicht öffnen: %s"
+
+#: src/media_object.cpp:877
+msgid "video codec"
+msgstr "Videocodec"
+
+#: src/media_object.cpp:878
+msgid "audio codec"
+msgstr "Audiocodec"
+
+#: src/media_object.cpp:879
+msgid "subtitle codec"
+msgstr "Untertitelcodec"
+
+#: src/media_object.cpp:880
+msgid "data"
+msgstr "Daten"
+
+#: src/media_object.cpp:881
+msgid "codec not supported"
+msgstr "Codec nicht unterstützt"
+
+#: src/media_object.cpp:891
+#, c-format
+msgid "%s video stream %d: Invalid frame size."
+msgstr "%s Videokanal %d: Ungültige Bildgröße."
+
+#: src/media_object.cpp:935
+#, c-format
+msgid "%s video stream %d: Cannot initialize conversion context."
+msgstr "%s Videokanal %d: Kann Konvertierungskontext nicht initialisieren."
+
+#: src/media_object.cpp:998
+#, c-format
+msgid "Video stream %d: %s / %s, %g seconds"
+msgstr "Videokanal %d: %s / %s, %g Sekunden"
+
+#: src/media_object.cpp:1002
+#, c-format
+msgid "Using up to %d threads for decoding."
+msgstr "Benutze bis zu %d Threads zum dekodieren."
+
+#: src/media_object.cpp:1007
+#, c-format
+msgid "Audio stream %d: %s / %s, %g seconds"
+msgstr "Audiokanal %d: %s / %s, %g Sekunden"
+
+#: src/media_object.cpp:1014
+#, c-format
+msgid "Subtitle stream %d: %s / %s, %g seconds"
+msgstr "Untertitelkanal %d: %s / %s, %g Sekunden"
+
+#: src/media_object.cpp:1021
+msgid "No usable streams."
+msgstr "Keine nutzbaren Kanäle."
+
+#: src/media_object.cpp:1302 src/media_object.cpp:1332
+#: src/media_object.cpp:1362
+#, c-format
+msgid "%s: Cannot duplicate packet."
+msgstr "%s: Kann Paket nicht duplizieren."
+
+#: src/media_object.cpp:1456
+#, fuzzy, c-format
+msgid "%s video stream %d: Dropping %dx%d frame"
+msgstr "%s Videokanal %d: Ungültige Bildgröße."
+
+#: src/media_object.cpp:1919
+#, c-format
+msgid "%s: Seeking failed."
+msgstr "%s: Positionsänderung fehlgeschlagen."
+
+#: src/player.cpp:434
+#, fuzzy, c-format
+msgid "Video: delay %g seconds/%g frames; dropping next frame."
+msgstr "Video: %g Sekunden zu spät; überspringe nächstes Bild."
+
+#: src/player.cpp:450
+#, c-format
+msgid "FPS: %.2f"
+msgstr "FPS: %.2f"
+
+#: src/player_equalizer.cpp:116
+msgid "Reading input frame failed."
+msgstr "Lesen des Eingabebildes fehlgeschlagen."
+
+#: src/player_equalizer.cpp:165 src/video_output_qt.cpp:590
+#: src/video_output_qt.cpp:597
+msgid "Waiting for subtitle renderer initialization..."
+msgstr "Warte auf die Initialisierung der Untertitelanzeige..."
+
+#: src/player_equalizer.cpp:250
+msgid "Init data mapping failed."
+msgstr "Zuordnung von InitData fehlgeschlagen."
+
+#: src/player_equalizer.cpp:251
+msgid "Frame data mapping failed."
+msgstr "Zuordnung von FrameData fehlgeschlagen."
+
+#: src/player_equalizer.cpp:252
+msgid "Video player initialization failed."
+msgstr "Videoplayer-Initialisierung fehlgeschlagen."
+
+#: src/player_equalizer.cpp:253
+msgid "Need at least OpenGL 2.1."
+msgstr "Benötige mindestens OpenGL 2.1."
+
+#: src/player_equalizer.cpp:430
+msgid "No canvas in Equalizer configuration."
+msgstr "Kein canvas in Equalizer Konfiguration."
+
+#: src/player_equalizer.cpp:437
+#, fuzzy, c-format
+msgid "Equalizer canvas: %gx%g, aspect ratio %g:1"
+msgstr "%gx%g, Seitenverhältnis %g:1"
+
+#: src/player_equalizer.cpp:922 src/video_output_qt.cpp:560
+msgid ""
+"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
+"objects."
+msgstr ""
+"Diese OpenGL Implementierung unterstützt nicht OpenGL 2.1 und "
+"Framebufferobjekte."
+
+#: src/player_equalizer.cpp:1105
+msgid "Equalizer initialization failed."
+msgstr "Equalizer-Initialisierung fehlgeschlagen."
+
+#: src/player_equalizer.cpp:1113
+msgid "Cannot get equalizer configuration."
+msgstr "Kann Equalizer Konfiguration nicht bekommen."
+
+#: src/player_equalizer.cpp:1127
+msgid "Equalizer configuration initialization failed."
+msgstr "Kann Equalizer Konfiguration nicht initialisieren."
+
+#: src/subtitle_renderer.cpp:223
+msgid "Cannot initialize LibASS."
+msgstr "Kann LibASS nicht initialisieren."
+
+#: src/subtitle_renderer.cpp:232
+msgid "Cannot initialize LibASS renderer."
+msgstr "Kann LibASS-Renderer nicht initialisieren."
+
+#: src/subtitle_renderer.cpp:398
+msgid "Cannot initialize LibASS track."
+msgstr "Kann LibASS-Spur nicht initialisieren."
+
+#: src/subtitle_renderer.cpp:409
+#, c-format
+msgid "Subtitle character set conversion failed: %s"
+msgstr "Untertitel-Zeichensatzkonvertierung fehlgeschlagen: %s"
+
+#: src/video_output.cpp:145
+#, c-format
+msgid "OpenGL error 0x%04X."
+msgstr "OpenGL Fehler 0x%04X."
+
+#: src/video_output.cpp:203
+#, c-format
+msgid "OpenGL %s '%s': compiler warning:"
+msgstr "OpenGL %s '%s': Compilerwarnung:"
+
+#: src/video_output.cpp:204 src/video_output.cpp:209
+msgid "vertex shader"
+msgstr "Vertexshader"
+
+#: src/video_output.cpp:204 src/video_output.cpp:209
+msgid "fragment shader"
+msgstr "Fragmentshader"
+
+#: src/video_output.cpp:208
+#, c-format
+msgid "OpenGL %s '%s': compilation failed."
+msgstr "OpenGL %s '%s': Compilieren fehlgeschlagen."
+
+#: src/video_output.cpp:211 src/video_output.cpp:288
+msgid "unknown error"
+msgstr "unbekannter Fehler"
+
+#: src/video_output.cpp:284
+#, c-format
+msgid "OpenGL program '%s': linker warning:"
+msgstr "OpenGL Programm '%s': Linkerwarnung:"
+
+#: src/video_output.cpp:287
+#, c-format
+msgid "OpenGL program '%s': linking failed."
+msgstr "OpenGL Programm '%s': Linken fehlgeschlagen."
+
+#: src/video_output.cpp:563 src/video_output.cpp:675
+msgid "Cannot create a PBO buffer."
+msgstr "Kann keinen PBO Puffer erzeugen."
+
+#: src/video_output_qt.cpp:555
+#, c-format
+msgid "Cannot initialize GLEW: %s"
+msgstr "Kann GLEW nicht initialisieren: %s"
+
+#: src/video_output_qt.cpp:588
+msgid "Please wait"
+msgstr "Bitte warten"
+
+#: src/video_output_qt.cpp:643
+#, fuzzy
+msgid "Cannot get valid OpenGL context."
+msgstr "Kann OpenGL Kontextformat nicht setzen."
+
+#: src/video_output_qt.cpp:654
+msgid "The display does not support OpenGL stereo mode."
+msgstr "Dieses Gerät unterstützt kein OpenGL Stereo."
+
+#: src/video_output_qt.cpp:659
+msgid "Cannot set OpenGL context format."
+msgstr "Kann OpenGL Kontextformat nicht setzen."
+
+#: src/video_output_qt.cpp:752
+msgid "Cannot suspend screensaver."
+msgstr "Kann Bildschirmschoner nicht deaktivieren."
+
+#: src/video_output_qt.cpp:767
+msgid "Cannot resume screensaver."
+msgstr "Kann Bildschirmschoner nicht reaktivieren."
+
+#~ msgid "Cannot initialize mutex: %s"
+#~ msgstr "Kann Mutex nicht initialisieren: %s"
+
+#~ msgid "Cannot lock mutex: %s"
+#~ msgstr "Kann Mutex nicht sichern: %s"
+
+#~ msgid "Cannot unlock mutex: %s"
+#~ msgstr "Kann Mutex nicht entsichern: %s"
+
+#~ msgid "Cannot create thread: %s"
+#~ msgstr "Kann Thread nicht erzeugen: %s"
+
+#~ msgid "Cannot join with thread: %s"
+#~ msgstr "Kann nicht auf Thread warten: %s"
+
+#~ msgid "Cannot cancel thread: %s"
+#~ msgstr "Kann Thread nicht abbrechen: %s"
+
+#~ msgid ""
+#~ "Usage:\n"
+#~ " %s [option...] [file...]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --help Print help.\n"
+#~ " --version Print version.\n"
+#~ " -n|--no-gui Do not use the GUI, just show a plain window.\n"
+#~ " -L|--log-level=LEVEL Set log level (debug/info/warning/error/"
+#~ "quiet).\n"
+#~ " --device-type=TYPE Type of input device: default, firewire, x11.\n"
+#~ " --device-frame-size=WxH Request frame size WxH from input device.\n"
+#~ " --device-frame-rate=N/D Request frame rate N/D from input device.\n"
+#~ " --lirc-config=FILE Use the given LIRC configuration file. This\n"
+#~ " option can be used more than once.\n"
+#~ " -v|--video=STREAM Select video stream (1-n, depending on "
+#~ "input).\n"
+#~ " -a|--audio=STREAM Select audio stream (1-n, depending on "
+#~ "input).\n"
+#~ " -s|--subtitle=STREAM Select subtitle stream (0-n, dep. on input).\n"
+#~ " -i|--input=TYPE Select input type (default autodetect):\n"
+#~ " mono Single view.\n"
+#~ " separate-left-right Left/right separate streams, left first.\n"
+#~ " separate-right-left Left/right separate streams, right first.\n"
+#~ " top-bottom Left top, right bottom.\n"
+#~ " top-bottom-half Left top, right bottom, half height.\n"
+#~ " bottom-top Left bottom, right top.\n"
+#~ " bottom-top-half Left bottom, right top, half height.\n"
+#~ " left-right Left left, right right.\n"
+#~ " left-right-half Left left, right right, half width.\n"
+#~ " right-left Left right, right left.\n"
+#~ " right-left-half Left right, right left, half width.\n"
+#~ " even-odd-rows Left even rows, right odd rows.\n"
+#~ " odd-even-rows Left odd rows, right even rows.\n"
+#~ " -o|--output=TYPE Select output type:\n"
+#~ " mono-left Only left.\n"
+#~ " mono-right Only right.\n"
+#~ " top-bottom Left top, right bottom.\n"
+#~ " top-bottom-half Left top, right bottom, half height.\n"
+#~ " left-right Left left, right right.\n"
+#~ " left-right-half Left left, right right, half width.\n"
+#~ " even-odd-rows Left even rows, right odd rows.\n"
+#~ " even-odd-columns Left even columns, right odd columns.\n"
+#~ " checkerboard Left and right in checkerboard pattern.\n"
+#~ " hdmi-frame-pack HDMI frame packing mode.\n"
+#~ " red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
+#~ " red-cyan-half-color Red/cyan anaglyph, half color method.\n"
+#~ " red-cyan-full-color Red/cyan anaglyph, full color method.\n"
+#~ " red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
+#~ " green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
+#~ " green-magenta-half-color Green/magenta anaglyph, half color method.\n"
+#~ " green-magenta-full-color Green/magenta anaglyph, full color method.\n"
+#~ " green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
+#~ " amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
+#~ " amber-blue-half-color Amber/blue anaglyph, half color method.\n"
+#~ " amber-blue-full-color Amber/blue anaglyph, full color method.\n"
+#~ " amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
+#~ " red-green-monochrome Red/green anaglyph, monochrome method.\n"
+#~ " red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
+#~ " stereo OpenGL quad-buffered stereo.\n"
+#~ " equalizer Multi-display via Equalizer (2D setup).\n"
+#~ " equalizer-3d Multi-display via Equalizer (3D setup).\n"
+#~ " -S|--swap-eyes Swap left/right view.\n"
+#~ " -f|--fullscreen Fullscreen.\n"
+#~ " --fullscreen-screens= Use the listed screens in fullscreen mode.\n"
+#~ " [S0[,S1[,...]]] Screen numbers start with 1. The default\n"
+#~ " (empty list) is to use the primary screen.\n"
+#~ " --fullscreen-flip-left Flip left view vertically when fullscreen.\n"
+#~ " --fullscreen-flop-left Flop left view horizontally when fullscreen.\n"
+#~ " --fullscreen-flip-right Flip right view vertically when fullscreen.\n"
+#~ " --fullscreen-flop-right Flop right view horizontally when fullscreen.\n"
+#~ " -c|--center Center window on screen.\n"
+#~ " --subtitle-encoding=ENC Set subtitle encoding.\n"
+#~ " --subtitle-font=FONT Set subtitle font name.\n"
+#~ " --subtitle-size=N Set subtitle font size.\n"
+#~ " --subtitle-scale=S Set subtitle scale factor.\n"
+#~ " --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
+#~ " --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
+#~ " -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
+#~ " -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-"
+#~ "separated\n"
+#~ " values for the R,G,B channels.\n"
+#~ " -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
+#~ " -b|--benchmark Benchmark mode (no audio, show fps).\n"
+#~ " -l|--loop Loop the input media.\n"
+#~ "\n"
+#~ "Interactive control:\n"
+#~ " ESC Leave fullscreen mode, or quit.\n"
+#~ " q Quit.\n"
+#~ " p or SPACE Pause / unpause.\n"
+#~ " f Toggle fullscreen.\n"
+#~ " c Center window.\n"
+#~ " e Swap left/right eye.\n"
+#~ " v Cycle through available video streams.\n"
+#~ " a Cycle through available audio streams.\n"
+#~ " s Cycle through available subtitle streams.\n"
+#~ " 1, 2 Adjust contrast.\n"
+#~ " 3, 4 Adjust brightness.\n"
+#~ " 5, 6 Adjust hue.\n"
+#~ " 7, 8 Adjust saturation.\n"
+#~ " <, > Adjust parallax.\n"
+#~ " (, ) Adjust ghostbusting.\n"
+#~ " left, right Seek 10 seconds backward / forward.\n"
+#~ " up, down Seek 1 minute backward / forward.\n"
+#~ " page up, page down Seek 10 minutes backward / forward.\n"
+#~ " Mouse click Seek according to horizontal click position."
+#~ msgstr ""
+#~ "Benutzung:\n"
+#~ " %s [Option...] [Datei...]\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ " --help Zeige Hilfe.\n"
+#~ " --version Zeige Version.\n"
+#~ " -n|--no-gui Starte ohne GUI, zeige nur ein Video Fenster.\n"
+#~ " -L|--log-level=LEVEL Setze Loglevel (debug/info/warning/error/"
+#~ "quiet).\n"
+#~ " --device-type=TYPE Kameratyp: default, firewire, x11.\n"
+#~ " --device-frame-size=BxH Fordere Kameraauflösung BxH an.\n"
+#~ " --device-frame-rate=N/D Fordere Kamerabildrate N/D an.\n"
+#~ " --lirc-config=FILE Setze LIRC Konfigurationsdatei. Diese Option\n"
+#~ " kann mehrfach verwendet werden.\n"
+#~ " -v|--video=STREAM Wähle Videokanal (1-n, je nach Eingabe).\n"
+#~ " -a|--audio=STREAM Wähle Audiokanal (1-n, je nach Eingabe).\n"
+#~ " -s|--subtitle=STREAM Wähle Untertitelkanal (0-n, je nach Eingabe).\n"
+#~ " -i|--input=TYPE Wähle Eingabetyp (sonst automatisch "
+#~ "detektiert):\n"
+#~ " mono Einzelne Sicht.\n"
+#~ " separate-left-right Links/rechts getrennte Kanäle, links "
+#~ "zuerst.\n"
+#~ " separate-right-left Links/rechts getrennte Kanäle, rechts "
+#~ "zuerst.\n"
+#~ " top-bottom Links oben, rechts unten.\n"
+#~ " top-bottom-half Links oben, rechts unten, halbe Höhe.\n"
+#~ " bottom-top Links unten, rechts oben.\n"
+#~ " bottom-top-half Links unten, rechts oben, halbe Höhe.\n"
+#~ " left-right Links links, rechts rechts.\n"
+#~ " left-right-half Links links, rechts rechts, halbe Breite.\n"
+#~ " right-left Links rechts, rechts links.\n"
+#~ " right-left-half Links rechts, rechts links, halbe Breite.\n"
+#~ " even-odd-rows Links gerade Zeilen, rechts ungerade "
+#~ "Zeilen.\n"
+#~ " odd-even-rows Links ungerade Zeilen, rechts gerade "
+#~ "Zeilen.\n"
+#~ " -o|--output=TYPE Wähle Ausgabemodus:\n"
+#~ " mono-left Nur links.\n"
+#~ " mono-right Nur rechts.\n"
+#~ " top-bottom Links oben, rechts unten.\n"
+#~ " top-bottom-half Links oben, rechts unten, halbe Höhe.\n"
+#~ " left-right Links links, rechts rechts.\n"
+#~ " left-right-half Links links, rechts rechts, halbe Breite.\n"
+#~ " even-odd-rows Links gerade Zeilen, rechts ungerade "
+#~ "Zeilen.\n"
+#~ " even-odd-columns Links gerade Spalten, rechts ungerade "
+#~ "Spalten.\n"
+#~ " checkerboard Links und rechts im Schachbrettmuster.\n"
+#~ " hdmi-frame-pack HDMI Framepacking modus.\n"
+#~ " red-cyan-monochrome Rot/cyan Anaglyphe, monochrome Methode.\n"
+#~ " red-cyan-half-color Rot/cyan Anaglyphe, Halbfarbenmethode.\n"
+#~ " red-cyan-full-color Rot/cyan Anaglyphe, Vollfarbenmethode.\n"
+#~ " red-cyan-dubois Rot/cyan Anaglyphe, Dubois-Methode.\n"
+#~ " green-magenta-monochrome Grün/magenta Anaglyphe, monochrome Methode.\n"
+#~ " green-magenta-half-color Grün/magenta Anaglyphe, Halbfarbenmethode.\n"
+#~ " green-magenta-full-color Grün/magenta Anaglyphe, Vollfarbenmethode.\n"
+#~ " green-magenta-dubois Grün/magenta Anaglyphe, Dubois-Methode.\n"
+#~ " amber-blue-monochrome Orange/blau Anaglyphe, monochrome Methode.\n"
+#~ " amber-blue-half-color Orange/blau Anaglyphe, Halbfarbenmethode.\n"
+#~ " amber-blue-full-color Orange/blau Anaglyphe, Vollfarbenmethode.\n"
+#~ " amber-blue-dubois Orange/blau Anaglyphe, Dubois-Methode.\n"
+#~ " red-green-monochrome Rot/grün Anaglyphe, monochrome Methode.\n"
+#~ " red-blue-monochrome Rot/blau Anaglyphe, monochrome Methode.\n"
+#~ " stereo OpenGL Vierfachpuffer Stereo.\n"
+#~ " equalizer Multidisplay via Equalizer (2D "
+#~ "Konfiguration).\n"
+#~ " equalizer-3d Multidisplay via Equalizer (3D "
+#~ "Konfiguration).\n"
+#~ " -S|--swap-eyes Tausche linke/rechte Ansicht.\n"
+#~ " -f|--fullscreen Vollbild.\n"
+#~ " --fullscreen-screens= Setze Bildschirme für den Vollbildmodus.\n"
+#~ " [S0[,S1[,...]]] Bildschirmnummern starten mit 1. Standard\n"
+#~ " (leere Liste) ist der Hauptbildschirm.\n"
+#~ " --fullscreen-flip-left Spiegele linke Sicht vertikal für Vollbild.\n"
+#~ " --fullscreen-flop-left Spiegele linke Sicht horiztonal für Vollbild.\n"
+#~ " --fullscreen-flip-right Spiegele rechte Sicht vertikal für Vollbild.\n"
+#~ " --fullscreen-flop-right Spiegele rechte Sicht horiztonal für "
+#~ "Vollbild.\n"
+#~ " -c|--center Zentriere Fenster auf Bildschirm.\n"
+#~ " --subtitle-encoding=ENC Setze Zeichensatz für Untertitel.\n"
+#~ " --subtitle-font=FONT Setze Schriftart für Untertitel.\n"
+#~ " --subtitle-size=N Setze Schriftgröße für Untertitel.\n"
+#~ " --subtitle-scale=S Setze Skalierungsfaktor für Untertitel.\n"
+#~ " --subtitle-color=COLOR Setze Farbe für Untertitel ([AA]RRGGBB).\n"
+#~ " --subtitle-parallax=VAL Untertitel-Parallaxenjustierung (-1 bis +1).\n"
+#~ " -P|--parallax=VAL Parallaxenjustierung (-1 bis +1).\n"
+#~ " -C|--crosstalk=VAL Crosstalk-Level (0 bis 1); kamma-getrennte\n"
+#~ " Werte für die R,G,B Kanäle.\n"
+#~ " -G|--ghostbust=VAL Crosstalk-Verringerungsfaktor (0 bis 1).\n"
+#~ " -b|--benchmark Benchmarkmodus (kein Audio, zeige FPS).\n"
+#~ " -l|--loop Wiederhole das Video.\n"
+#~ "\n"
+#~ "Interaktion:\n"
+#~ " ESC Verlasse Vollbildmodus, oder beende.\n"
+#~ " q Beenden.\n"
+#~ " p oder Leertaste Pause / weiter.\n"
+#~ " f Schalte Vollbildmodus um.\n"
+#~ " c Zentriere Fenster.\n"
+#~ " e Tausche links/rechts.\n"
+#~ " v Schalte zum nächsten Videokanal.\n"
+#~ " a Schalte zum nächsten Audiokanal.\n"
+#~ " s Schalte zum nächsten Untertitelkanal.\n"
+#~ " 1, 2 Justiere Kontrast.\n"
+#~ " 3, 4 Justiere Helligkeit.\n"
+#~ " 5, 6 Justiere Farbton.\n"
+#~ " 7, 8 Justiere Farbsättigung.\n"
+#~ " <, > Justiere Parallaxe.\n"
+#~ " (, ) Justiere Crosstalk-Verringerungsfaktor.\n"
+#~ " links, rechts Spule 10 Sekunden zurück / vor.\n"
+#~ " hoch, runter Spule 1 Minute zurück / vor.\n"
+#~ " Seite rauf, Seite runter Spule 10 Minuten zurück / vor.\n"
+#~ " Mausklick Spule zur Stelle der horizontalen "
+#~ "Klickposition."
+
+#~ msgid "Equalizer canvas:"
+#~ msgstr "Equalizer canvas:"
+
+#~ msgid "Area for %g:1 video: [ %g %g %g %g @ %g ]"
+#~ msgstr "Bereich für %g:1 Video: [ %g %g %g %g @ %g ]"
+
+#~ msgid "Stereoscopic Video Settings"
+#~ msgstr "Einstellungen für stereoskopische Videos"
+
+#~ msgid "&Open..."
+#~ msgstr "&Öffnen..."
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid ""
+#~ "Keyboard control: <table><tr><td>q or ESC</td><td>Stop</td></"
+#~ "tr><tr><td>p or SPACE</td><td>Pause / unpause</td></tr><tr><td>f</"
+#~ "td><td>Toggle fullscreen</td></tr><tr><td>c</td><td>Center window</td></"
+#~ "tr><tr><td>e</td><td>Swap left/right eye</td></tr><tr><td>v</td><td>Cycle "
+#~ "through available video streams</td></tr><tr><td>a</td><td>Cycle through "
+#~ "available audio streams</td></tr><tr><td>s</td><td>Cycle through "
+#~ "available subtitle streams</td></tr><tr><td>1, 2</td><td>Adjust contrast</"
+#~ "td></tr><tr><td>3, 4</td><td>Adjust brightness</td></tr><tr><td>5, 6</"
+#~ "td><td>Adjust hue</td></tr><tr><td>7, 8</td><td>Adjust saturation</td></"
+#~ "tr><tr><td>&lt;, &gt;</td><td>Adjust parallax</td></tr><tr><td>(, )</"
+#~ "td><td>Adjust ghostbusting</td></tr><tr><td>left, right</td><td>Seek 10 "
+#~ "seconds backward / forward</td></tr><tr><td>up, down</td><td>Seek 1 "
+#~ "minute backward / forward</td></tr><tr><td>page up, page down</"
+#~ "td><td>Seek 10 minutes backward / forward</td></tr></table>"
+#~ msgstr ""
+#~ "Tastatursteuerung: <table><tr><td>q oder ESC</td><td>Stopp</td></"
+#~ "tr><tr><td>p oder Leertaste</td><td>Pause / weiter</td></tr><tr><td>f</"
+#~ "td><td>Schalte Vollbildmodus um</td></tr><tr><td>c</td><td>Zentriere "
+#~ "Fenster</td></tr><tr><td>e</td><td>Tausche links/rechts</td></"
+#~ "tr><tr><td>v</td><td>Schalte zum nächsten Videokanal</td></tr><tr><td>a</"
+#~ "td><td>Schalte zum nächsten Audiokanal</td></tr><tr><td>s</td><td>Schalte "
+#~ "zum nächsten Untertitelkanal</td></tr><tr><td>1, 2</td><td>Justiere "
+#~ "Kontrast</td></tr><tr><td>3, 4</td><td>Justiere Helligkeit</td></"
+#~ "tr><tr><td>5, 6</td><td>Justiere Farbton</td></tr><tr><td>7, 8</"
+#~ "td><td>Justiere Farbsättigung</td></tr><tr><td>&lt;, &gt;</"
+#~ "td><td>Justiere Parallaxe</td></tr><tr><td>(, )</td><td>Justiere "
+#~ "Crosstalk-Verringerung</td></tr><tr><td>links, rechts</td><td>Spule 10 "
+#~ "Sekunden zurück / vor</td></tr><tr><td>hoch, runter</td><td>Spule 1 "
+#~ "Minute zurück / vor</td></tr><tr><td>Seite rauf, Seite runter</"
+#~ "td><td>Spule 10 Minuten zurück / vor</td></tr></table>"
+
+#~ msgid "OpenGL FBO error %s."
+#~ msgstr "OpenGL FBO Fehler: %s"
+
+#~ msgid "geometry shader"
+#~ msgstr "Geometryshader"

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

bino-1.2.1.tar.bz2/po/fr.po -> bino-1.3.2.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: 2011-10-10 21:25+0200\n"
+"POT-Creation-Date: 2012-03-16 19:49+0100\n"
 "PO-Revision-Date: 2011-08-28 17:34+0200\n"
 "Last-Translator: Frédéric Devernay <>\n"
 "Language-Team: French\n"
@@ -18,1459 +18,1815 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/base/dbg.cpp:50
+#: src/base/dbg.cpp:49
 #, c-format
 msgid "Caught signal %d (%s). Aborting."
 msgstr "Signal %d (%s) reçu. Abandon."
 
-#: src/base/dbg.cpp:57
+#: src/base/dbg.cpp:56
 msgid "Unexpected exception."
 msgstr "Exception inattendue"
 
 #. TRANSLATORS: %s will be a mail address.
-#: src/base/dbg.cpp:145
+#: src/base/dbg.cpp:221
 #, c-format
 msgid "Report bugs to <%s>."
 msgstr "Signalez les bugs à <%s>."
 
-#: src/base/exc.cpp:54 src/base/exc.cpp:72 src/base/exc.cpp:106
+#: src/base/exc.cpp:52 src/base/exc.cpp:70 src/base/exc.cpp:104
 #, c-format
 msgid "Exception: %s"
 msgstr "Exception: %s"
 
-#: src/base/opt.cpp:151
+#: src/base/opt.cpp:168
 #, c-format
 msgid "Invalid option %s."
 msgstr "Option %s invalide."
 
-#: src/base/opt.cpp:155
+#: src/base/opt.cpp:172
 #, c-format
 msgid "Option --%s does not take an argument."
 msgstr "L'option --%s ne prend pas d'argument."
 
-#: src/base/opt.cpp:160
+#: src/base/opt.cpp:177
 #, c-format
 msgid "Invalid option -%c."
 msgstr "Option -%c invalide."
 
-#: src/base/opt.cpp:169
+#: src/base/opt.cpp:186
 #, c-format
 msgid "Option --%s requires an argument."
 msgstr "L'option --%s nécessite un argument."
 
-#: src/base/opt.cpp:174
+#: src/base/opt.cpp:191
 #, c-format
 msgid "Option -%c requires an argument."
 msgstr "L'option -%c nécessite un argument."
 
-#: src/base/opt.cpp:195
+#: src/base/opt.cpp:212
 #, c-format
 msgid "Invalid argument for -%c."
 msgstr "Argument invalide pour -%c."
 
-#: src/base/opt.cpp:199
+#: src/base/opt.cpp:216
 #, c-format
 msgid "Invalid argument for --%s."
 msgstr "Argument invalide pour --%s."
 
-#: src/base/opt.cpp:218
+#: src/base/opt.cpp:239
 #, c-format
 msgid "Option --%s (-%c) is mandatory."
 msgstr "L'option --%s (-%c) est obligatoire."
 
-#: src/base/opt.cpp:222
+#: src/base/opt.cpp:243
 #, c-format
 msgid "Option --%s is mandatory."
 msgstr "L'option --%s est obligatoire."
 
-#: src/base/opt.cpp:236
+#: src/base/opt.cpp:257
 msgid "Too few arguments."
 msgstr "Pas assez d'arguments."
 
-#: src/base/opt.cpp:241
+#: src/base/opt.cpp:262
 msgid "Too many arguments."
 msgstr "Trop d'arguments."
 
-#: src/base/str.cpp:226
+#: src/base/str.cpp:236
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Impossible de convertir la chaîne de caractères en %s."
 
-#: src/base/str.cpp:411 src/base/str.cpp:429 src/base/str.cpp:439
-#: src/base/str.cpp:450
+#: src/base/str.cpp:455 src/base/str.cpp:473 src/base/str.cpp:483
+#: src/base/str.cpp:494 src/base/str.cpp:499
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Impossible de convertir %s en %s."
 
-#: src/base/thread.cpp:40 src/base/thread.cpp:51
-#, c-format
-msgid "Cannot initialize mutex: %s"
-msgstr "Impossible d'initialiser le mutex: %s"
-
-#: src/base/thread.cpp:65
-#, c-format
-msgid "Cannot lock mutex: %s"
-msgstr "Impossible de verrouiller le mutex: %s"
-
-#: src/base/thread.cpp:79
-#, c-format
-msgid "Cannot unlock mutex: %s"
-msgstr "Impossible de déverrouiller le mutex: %s"
-
-#: src/base/thread.cpp:145
-#, c-format
-msgid "Cannot create thread: %s"
-msgstr "Impossible de créer le thread: %s"
-
-#: src/base/thread.cpp:160
-#, c-format
-msgid "Cannot join with thread: %s"
-msgstr "Impossible de rejoindre le thread: %s"
-
-#: src/base/thread.cpp:182
-#, c-format
-msgid "Cannot cancel thread: %s"
-msgstr "Impossible d'annuler le thread: %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
+msgid "System function failed: "
+msgstr ""
 
-#: src/base/timer.cpp:69 src/base/timer.cpp:81 src/base/timer.cpp:95
+#: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
 msgid "Cannot get time."
 msgstr "Impossible d'obtenir l'heure."
 
-#: src/audio_output.cpp:61
+#: src/audio_output.cpp:88
 msgid "No OpenAL device available."
 msgstr "Aucun périphérique OpenAL disponible."
 
-#: src/audio_output.cpp:66
+#: src/audio_output.cpp:93 src/audio_output.cpp:99
+#, fuzzy, c-format
+msgid "OpenAL device '%s' is not available."
+msgstr "Aucun périphérique OpenAL disponible."
+
+#: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
+#: src/media_data.cpp:1067 src/media_data.cpp:1090 src/media_data.cpp:1128
+#: src/media_data.cpp:1133
+msgid "unknown"
+msgstr "inconnu"
+
+#: src/audio_output.cpp:106
 msgid "No OpenAL context available."
 msgstr "Aucun contexte OpenAL disponible."
 
-#: src/audio_output.cpp:77
+#: src/audio_output.cpp:117
 msgid "Cannot create OpenAL buffers."
 msgstr "Impossible de tcréer les tampons OpenAL."
 
-#: src/audio_output.cpp:86
+#: src/audio_output.cpp:126
 msgid "Cannot create OpenAL source."
 msgstr "Impossible de créer la source OpenAL."
 
-#: src/audio_output.cpp:99
+#: src/audio_output.cpp:139
 msgid "Cannot set OpenAL source parameters."
 msgstr "Impossible de régler les paramètres de la source OpenAL."
 
-#: src/audio_output.cpp:153
+#: src/audio_output.cpp:193
 msgid "Cannot check OpenAL source state."
 msgstr "Impossible de vérifier l'état de la source OpenAL."
 
-#: src/audio_output.cpp:160
+#: src/audio_output.cpp:200
 msgid "Cannot restart OpenAL source playback."
 msgstr "Impossible de redémarrer la lecture de la source OpenAL."
 
-#: src/audio_output.cpp:313
+#: src/audio_output.cpp:353
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr "Aucun format OpenAL disponible pour le format de données audio %s."
 
-#: src/audio_output.cpp:340
+#: src/audio_output.cpp:369
+#, fuzzy
+msgid "Cannot set OpenAL audio volume."
+msgstr "Impossible de créer la source OpenAL."
+
+#: src/audio_output.cpp:395
 msgid "Cannot buffer initial OpenAL data."
 msgstr "Impossible de mettre les données initiales OpenAL en mémoire tampon."
 
-#: src/audio_output.cpp:354
+#: src/audio_output.cpp:409
 msgid "Cannot buffer OpenAL data."
 msgstr "Impossible de mettre les données OpenAL en mémoire tampon."
 
-#: src/audio_output.cpp:379
+#: src/audio_output.cpp:434
 msgid "Cannot start OpenAL source playback."
 msgstr "Impossible de démarrer la lecture de la source OpenAL."
 
-#: src/audio_output.cpp:393
+#: src/audio_output.cpp:448
 msgid "Cannot pause OpenAL source playback."
 msgstr "Impossible de mettre en pause la source OpenAL."
 
-#: src/audio_output.cpp:402
+#: src/audio_output.cpp:457
 msgid "Cannot unpause OpenAL source playback."
 msgstr "Impossible de quitter la pause de la source OpenAL."
 
-#: src/audio_output.cpp:411
+#: src/audio_output.cpp:466
 msgid "Cannot stop OpenAL source playback."
 msgstr "Impossible d'arrêter la lecture de la source OpenAL."
 
-#: src/audio_output.cpp:422
+#: src/audio_output.cpp:477
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Impossible de vider la queue de tampons de la source OpenAL."
 
-#: src/lib_versions.cpp:121 src/lib_versions.cpp:158 src/media_data.cpp:422
-#: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
-msgid "unknown"
-msgstr "inconnu"
-
-#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
-msgid "not used"
-msgstr "inutilisé"
+#: src/dispatch.cpp:156
+msgid "Cannot connect to X server."
+msgstr "Impossible de se connecter au serveur X."
 
-#: src/lirc.cpp:63
-msgid "Cannot initialize LIRC."
-msgstr "Impossible d'initialiser LIRC."
+#: src/dispatch.cpp:171
+msgid "No video to play."
+msgstr "Aucune vidéo à jouer."
 
-#: src/lirc.cpp:69
-msgid "Cannot set LIRC socket properties."
-msgstr "Impossible de régler les paramètres de socket LIRC."
+#: src/dispatch.cpp:411 src/player_equalizer.cpp:84
+msgid "No video streams found."
+msgstr "Aucun flux vidéo trouvé."
 
-#: src/lirc.cpp:76
-msgid "Cannot read LIRC default configuration."
-msgstr "Impossible de lire la configuration par défaut de LIRC."
+#: src/dispatch.cpp:428
+msgid "Cannot set requested stereo layout: incompatible media."
+msgstr "Impossible de choisir le mode stéréo sélectionné : média incompatible."
 
-#: src/lirc.cpp:91
+#: src/dispatch.cpp:443
 #, c-format
-msgid "Cannot read LIRC configuration file %s."
-msgstr "Impossible de lire le fichier de configuration LIRC %s."
+msgid "Video stream %d not found."
+msgstr "Flux vidéo %d non trouvé."
 
-#: src/lirc.cpp:140
-msgid "Cannot get LIRC event; disabling LIRC support."
-msgstr "Impossible de lire l'événement LIRC ; désactivation du support LIRC."
+#: src/dispatch.cpp:449
+#, c-format
+msgid "Audio stream %d not found."
+msgstr "Flux audio %d non trouvé."
 
-#: src/lirc.cpp:154
+#: src/dispatch.cpp:457
 #, c-format
-msgid "Received invalid command '%s' from LIRC."
-msgstr "Commande LIRC '%s' invalide."
+msgid "Subtitle stream %d not found."
+msgstr "Flux de sous-titres %d non trouvé."
 
-#: src/lirc.cpp:164
-msgid "Cannot get command for LIRC code."
-msgstr "Commande non disponible pour le code LIRC."
+#: src/dispatch.cpp:529 src/main.cpp:736
+msgid "This version of Bino was compiled without support for Equalizer."
+msgstr "Cette version de Bino a été compilée sans le support Equalizer."
 
-#: src/main.cpp:325
-#, c-format
-msgid "%s version %s"
-msgstr "%s version %s"
+#: src/gui.cpp:101
+msgid "Video:"
+msgstr "Vidéo :"
 
-#: src/main.cpp:326
-msgid "Copyright (C) 2011 the Bino developers."
-msgstr "Copyright (C) 2011 les développeurs Bino."
+#: src/gui.cpp:102
+msgid "Select the video stream."
+msgstr "Choisir le flux vidéo."
 
-#: src/main.cpp:327
-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/gui.cpp:108
+msgid "Audio:"
+msgstr "Audio :"
 
-#: src/main.cpp:330 src/player_qt.cpp:2958
-msgid "Platform:"
-msgstr "Plateforme :"
+#: src/gui.cpp:109
+msgid "Select the audio stream."
+msgstr "Choisir le flux audio."
 
-#: src/main.cpp:332 src/player_qt.cpp:2959
-msgid "Libraries used:"
-msgstr "Bibliothèques utilisées :"
+#: src/gui.cpp:115
+msgid "Subtitle:"
+msgstr "Sous-titres :"
 
-#. TRANSLATORS: This is the --help text. Translate only the description,
-#. not the option names. Please keep a proper indentation with spaces, and
-#. keep the line length limited.
-#: src/main.cpp:344
-#, c-format
-msgid ""
-"Usage:\n"
-" %s [option...] [file...]\n"
-"\n"
-"Options:\n"
-" --help Print help.\n"
-" --version Print version.\n"
-" -n|--no-gui Do not use the GUI, just show a plain window.\n"
-" -L|--log-level=LEVEL Set log level (debug/info/warning/error/quiet).\n"
-" --device-type=TYPE Type of input device: default, firewire, x11.\n"
-" --device-frame-size=WxH Request frame size WxH from input device.\n"
-" --device-frame-rate=N/D Request frame rate N/D from input device.\n"
-" --lirc-config=FILE Use the given LIRC configuration file. This\n"
-" option can be used more than once.\n"
-" -v|--video=STREAM Select video stream (1-n, depending on input).\n"
-" -a|--audio=STREAM Select audio stream (1-n, depending on input).\n"
-" -s|--subtitle=STREAM Select subtitle stream (0-n, dep. on input).\n"
-" -i|--input=TYPE Select input type (default autodetect):\n"
-" mono Single view.\n"
-" separate-left-right Left/right separate streams, left first.\n"
-" separate-right-left Left/right separate streams, right first.\n"
-" top-bottom Left top, right bottom.\n"
-" top-bottom-half Left top, right bottom, half height.\n"
-" bottom-top Left bottom, right top.\n"
-" bottom-top-half Left bottom, right top, half height.\n"
-" left-right Left left, right right.\n"
-" left-right-half Left left, right right, half width.\n"
-" right-left Left right, right left.\n"
-" right-left-half Left right, right left, half width.\n"
-" even-odd-rows Left even rows, right odd rows.\n"
-" odd-even-rows Left odd rows, right even rows.\n"
-" -o|--output=TYPE Select output type:\n"
-" mono-left Only left.\n"
-" mono-right Only right.\n"
-" top-bottom Left top, right bottom.\n"
-" top-bottom-half Left top, right bottom, half height.\n"
-" left-right Left left, right right.\n"
-" left-right-half Left left, right right, half width.\n"
-" even-odd-rows Left even rows, right odd rows.\n"
-" even-odd-columns Left even columns, right odd columns.\n"
-" checkerboard Left and right in checkerboard pattern.\n"
-" hdmi-frame-pack HDMI frame packing mode.\n"
-" red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
-" red-cyan-half-color Red/cyan anaglyph, half color method.\n"
-" red-cyan-full-color Red/cyan anaglyph, full color method.\n"
-" red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
-" green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
-" green-magenta-half-color Green/magenta anaglyph, half color method.\n"
-" green-magenta-full-color Green/magenta anaglyph, full color method.\n"
-" green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
-" amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
-" amber-blue-half-color Amber/blue anaglyph, half color method.\n"
-" amber-blue-full-color Amber/blue anaglyph, full color method.\n"
-" amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
-" red-green-monochrome Red/green anaglyph, monochrome method.\n"
-" red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
-" stereo OpenGL quad-buffered stereo.\n"
-" equalizer Multi-display via Equalizer (2D setup).\n"
-" equalizer-3d Multi-display via Equalizer (3D setup).\n"
-" -S|--swap-eyes Swap left/right view.\n"
-" -f|--fullscreen Fullscreen.\n"
-" --fullscreen-screens= Use the listed screens in fullscreen mode.\n"
-" [S0[,S1[,...]]] Screen numbers start with 1. The default\n"
-" (empty list) is to use the primary screen.\n"
-" --fullscreen-flip-left Flip left view vertically when fullscreen.\n"
-" --fullscreen-flop-left Flop left view horizontally when fullscreen.\n"
-" --fullscreen-flip-right Flip right view vertically when fullscreen.\n"
-" --fullscreen-flop-right Flop right view horizontally when fullscreen.\n"
-" -c|--center Center window on screen.\n"
-" --subtitle-encoding=ENC Set subtitle encoding.\n"
-" --subtitle-font=FONT Set subtitle font name.\n"
-" --subtitle-size=N Set subtitle font size.\n"
-" --subtitle-scale=S Set subtitle scale factor.\n"
-" --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
-" --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
-" -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
-" -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-separated\n"
-" values for the R,G,B channels.\n"
-" -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
-" -b|--benchmark Benchmark mode (no audio, show fps).\n"
-" -l|--loop Loop the input media.\n"
-"\n"
-"Interactive control:\n"
-" ESC Leave fullscreen mode, or quit.\n"
-" q Quit.\n"
-" p or SPACE Pause / unpause.\n"
-" f Toggle fullscreen.\n"
-" c Center window.\n"
-" e Swap left/right eye.\n"
-" v Cycle through available video streams.\n"
-" a Cycle through available audio streams.\n"
-" s Cycle through available subtitle streams.\n"
-" 1, 2 Adjust contrast.\n"
-" 3, 4 Adjust brightness.\n"
-" 5, 6 Adjust hue.\n"
-" 7, 8 Adjust saturation.\n"
-" <, > Adjust parallax.\n"
-" (, ) Adjust ghostbusting.\n"
-" left, right Seek 10 seconds backward / forward.\n"
-" up, down Seek 1 minute backward / forward.\n"
-" page up, page down Seek 10 minutes backward / forward.\n"
-" Mouse click Seek according to horizontal click position."
-msgstr ""
-"Utilisation :\n"
-" %s [option...] [fichier...]\n"
-"\n"
-"Options:\n"
-" --help Afficher l'aide.\n"
-" --version Afficher la version.\n"
-" -n|--no-gui Ne pas utiliser l'IHM, afficher une fenêtre "
-"simple.\n"
-" -L|--log-level=LEVEL Niveau de détail du journal (debug/info/warning/"
-"error/quiet).\n"
-" --device-type=TYPE Type de périphérique d'entrée: default, firewire, "
-"x11.\\n\"\n"
-" --device-frame-size=WxH Demande la résolution WxH au périphérique "
-"d'entrée.\\n\"\n"
-" --device-frame-rate=N/D Demande le taux de rafraichissement N/D au "
-"périphérique d'entrée.\\n\"\n"
-" --lirc-config=FILE Utilise le fichier de configuration LIRC donné. "
-"Cette\\n\"\n"
-" option peut être utilisée plusieurs fois.\\n\"\n"
-" -v|--video=STREAM Sélectionner le flux vidéo (1-n, selon "
-"l'entrée).\n"
-" -a|--audio=STREAM Sélectionner le flux audio (1-n, selon "
-"l'entrée).\n"
-" -s|--subtitle=STREAM Sélectionner le flux de sous-titres (0-n, selon "
-"l'entrée).\n"
-" -i|--input=TYPE Sélectionner le type d'entrée (auto-détection par "
-"défaut):\n"
-" mono Une seule vue.\n"
-" separate-left-right Flux gauche/droit séparés, gauche d'abord.\n"
-" separate-right-left Flux gauche/droit séparés, droit d'abord.\n"
-" top-bottom Gauche en haut, droit en bas.\n"
-" top-bottom-half Gauche en haut, droit en bas, demi-hauteur.\n"
-" bottom-top Gauche en bas, droit en haut.\n"
-" bottom-top-half Gauche en bas, droit en haut, demi-hauteur.\n"
-" left-right Gauche à gauche, droit à droite.\n"
-" left-right-half Gauche à gauche, droit à droite, demi-largeur.\n"
-" right-left Gauche à droite, droit à gauche.\n"
-" right-left-half Gauche à droite, droit à gauche, demi-largeur.\n"
-" even-odd-rows Gauche sur les lignes paires, droit sur les "
-"lignes impaires.\n"
-" odd-even-rows Gauche sur les lignes impaires, droit sur les "
-"lignes paires.\n"
-" -o|--output=TYPE Sélectionner le type de sortie :\n"
-" mono-left Gauche seulement.\n"
-" mono-right Droit seulement.\n"
-" top-bottom Gauche en haut, droit en bas.\n"
-" top-bottom-half Gauche en haut, droit en bas, demi-hauteur.\n"
-" left-right Gauche à gauche, droit à droite.\n"
-" left-right-half Gauche à gauche, droit à droite, demi-largeur.\n"
-" even-odd-rows Gauche sur les lignes paires, droit sur les "
-"lignes impaires.\n"
-" even-odd-columns Gauche sur les colonnes paires, droit sur les "
-"colonnes impaires.\n"
-" checkerboard Gauche et droit en damier.\n"
-" hdmi-frame-pack Mode HDMI frame packing.\n"
-" red-cyan-monochrome Anaglyphe rouge/cyan, méthode monochrome.\n"
-" red-cyan-half-color Anaglyphe rouge/cyan, méthode demi-couleur.\n"
-" red-cyan-full-color Anaglyphe rouge/cyan, méthode pleine couleur.\n"
-" red-cyan-dubois Anaglyphe rouge/cyan, méthode Dubois.\n"
-" green-magenta-monochrome Anaglyphe vert/magenta, méthode monochrome.\n"
-" green-magenta-half-color Anaglyphe vert/magenta, méthode demi-couleur.\n"
-" green-magenta-full-color Anaglyphe vert/magenta, méthode pleine "
-"couleur.\n"
-" green-magenta-dubois Anaglyphe vert/magenta, méthode Dubois.\n"
-" amber-blue-monochrome Anaglyphe ambre/bleu, méthode monochrome.\n"
-" amber-blue-half-color Anaglyphe ambre/bleu, méthode demi-couleur.\n"
-" amber-blue-full-color Anaglyphe ambre/bleu, méthode pleine couleur.\n"
-" amber-blue-dubois Anaglyphe ambre/bleu, méthode Dubois.\n"
-" red-green-monochrome Anaglyphe rouge/vert, méthode monochrome.\n"
-" red-blue-monochrome Anaglyphe rouge/bleu, méthode monochrome.\n"
-" stereo Stéréo OpenGL quadruple buffer.\n"
-" equalizer Multi-affichage par Equalizer (configuration "
-"2D).\n"
-" equalizer-3d Multi-affichage par Equalizer (configuration "
-"3D).\n"
-" -S|--swap-eyes Echanger les vues gauche et droite.\n"
-" -f|--fullscreen Plein écran.\n"
-" --fullscreen-screens= Utiliser les écrans désignés pour le plein "
-"écran.\n"
-" [S0[,S1[,...]]] La numérotation commence à 1. Utilisation\n"
-" de l'écran primaire par défaut.\n"
-" --fullscreen-flip-left Flip vertical de la vue gauche en plein écran.\n"
-" --fullscreen-flop-left Flop horizontal de la vue gauche en plein écran.\n"
-" --fullscreen-flip-right Flip vertical de la vue droite en plein écran.\n"
-" --fullscreen-flop-right Flop horizontal de la vue droite en plein écran.\n"
-" -c|--center Centrer la fenêtre sur l'écran.\n"
-" --subtitle-encoding=ENC Régler l'encodage des sous-titres.\n"
-" --subtitle-font=FONT Régler le nom de la fonte des sous-titres.\n"
-" --subtitle-size=N Régler la taille de la fonte des sous-titres.\n"
-" --subtitle-scale=S Régler le facteur d'échelle des sous-titres.\n"
-" --subtitle-color=COLOR Régler la couleur des sous-titres, au format [AA]"
-"RRVVBB.\n"
-" --subtitle-parallax=VAL Ajustement de la parallaxe des sous-titres (-1 à "
-"+1).\n"
-" -P|--parallax=VAL Ajustement de la parallaxe (-1 à +1).\n"
-" -C|--crosstalk=VAL Niveau de fuite du crosstalk (0 à 1); valeurs "
-"séparées\n"
-" par des virgules pour les canaux R,V,B.\n"
-" -G|--ghostbust=VAL Niveau d'élimination du crosstalk à appliquer (0 "
-"à 1).\n"
-" -b|--benchmark Mode banc d'essai (pas d'audio, afficher les "
-"fps).\n"
-" -l|--loop Lecture en bloucle.\n"
-"\n"
-"Contrôle interactif :\n"
-" q ou ESC Quitter.\n"
-" p ou ESPACE Pause / continuer.\n"
-" f Basculer le mode plein écran.\n"
-" c Centrer la fenêtre.\n"
-" e Echanger les yeux droit et gauche.\n"
-" v Parcourir les flux vidéo disponibles.\n"
-" a Parcourir les flux audio disponibles.\n"
-" s Parcourir les flux de sous-titres disponibles.\n"
-" 1, 2 Ajuster le contraste.\n"
-" 3, 4 Ajuster la luminosité.\n"
-" 5, 6 Ajuster la teinte.\n"
-" 7, 8 Ajuster la saturation.\n"
-" <, > Ajuster la parallaxe.\n"
-" (, ) Ajuster le ghostbusting.\n"
-" gauche, droite Avancer/reculer de 10 secondes.\n"
-" haut, bas Avancer/reculer de 1 minute.\n"
-" page prec., page suiv. Avancer/reculer de 10 minutes.\n"
-" Clic souris Aller à la position définie par l'abscisse du "
-"clic."
-
-#: src/main.cpp:597
-msgid "Benchmark mode: audio and time synchronization disabled."
-msgstr "Mode banc d'essai: audio et synchronisation temporelle désactivés."
+#: src/gui.cpp:116
+msgid "Select the subtitle stream."
+msgstr "Choisir le flux de sous-titres."
 
-#: src/main.cpp:614
-msgid "This version of Bino was compiled without support for LIRC."
-msgstr "Cette version de Bino a été compilée sans le support LIRC."
+#: src/gui.cpp:127 src/media_input.cpp:277
+msgid "Input:"
+msgstr "Entrée :"
 
-#: src/main.cpp:627
-msgid "This version of Bino was compiled without support for Equalizer."
-msgstr "Cette version de Bino a été compilée sans le support Equalizer."
+#: src/gui.cpp:128
+msgid "Set the 3D layout of the video stream."
+msgstr "Choisir la disposition 3D du flux vidéo"
 
-#: src/main.cpp:634
-msgid "Cannot connect to X server."
-msgstr "Impossible de se connecter au serveur X."
+#: src/gui.cpp:132
+msgid "2D"
+msgstr "2D"
 
-#: src/main.cpp:650
-msgid "No video to play."
-msgstr "Aucune vidéo à jouer."
+#: src/gui.cpp:133
+msgid "Separate streams, left first"
+msgstr "Flux séparés, gauche d'abord"
 
-#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:293
-#, c-format
-msgid "%dx%d, %.3g:1"
-msgstr "%dx%d, %.3g:1"
+#: src/gui.cpp:134
+msgid "Separate streams, right first"
+msgstr "Flux séparés, droit d'abord"
 
-#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:421
-#, c-format
-msgid "%s, %d ch., %g kHz, %d bit"
-msgstr "%s, %d ch., %g kHz, %d bit"
+#: src/gui.cpp:135
+#, fuzzy
+msgid "Alternating, left first"
+msgstr "Flux séparés, gauche d'abord"
 
-#: src/media_input.cpp:277 src/player_qt.cpp:187
-msgid "Input:"
-msgstr "Entrée :"
+#: src/gui.cpp:136
+#, fuzzy
+msgid "Alternating, right first"
+msgstr "Flux séparés, droit d'abord"
 
-#: src/media_input.cpp:282
-#, c-format
-msgid "Video %s: %s"
-msgstr "Vidéo %s : %s"
+#: src/gui.cpp:137 src/gui.cpp:161
+msgid "Top/bottom"
+msgstr "Haut/bas"
 
-#: src/media_input.cpp:287
-msgid "No video."
-msgstr "Aucune vidéo."
+#: src/gui.cpp:138 src/gui.cpp:162
+msgid "Top/bottom, half height"
+msgstr "Haut/bas, demi-hauteur"
 
-#: src/media_input.cpp:293
-#, c-format
-msgid "Audio %s: %s"
-msgstr "Audio %s : %s"
+#: src/gui.cpp:139
+msgid "Bottom/top"
+msgstr "Bas/haut"
 
-#: src/media_input.cpp:298
-msgid "No audio."
-msgstr "Pas d'audio."
+#: src/gui.cpp:140
+msgid "Bottom/top, half height"
+msgstr "Bas/haut, demi-hauteur"
 
-#: src/media_input.cpp:304
-#, c-format
-msgid "Subtitle %s: %s"
-msgstr "Sous-titres %s : %s"
+#: src/gui.cpp:141 src/gui.cpp:163
+msgid "Left/right"
+msgstr "gauche/droite"
 
-#: src/media_input.cpp:309
-msgid "No subtitle."
-msgstr "Aucun sous-titre."
+#: src/gui.cpp:142 src/gui.cpp:164
+msgid "Left/right, half width"
+msgstr "Gauche/droite, demi-largeur"
 
-#: src/media_input.cpp:311
-#, c-format
-msgid "Duration: %g seconds"
-msgstr "Durée : %g secondes"
+#: src/gui.cpp:143
+msgid "Right/left"
+msgstr "Droite/gauche"
 
-#: src/media_input.cpp:314
-#, c-format
-msgid "Stereo layout: %s"
-msgstr "Mode stéréo : %s"
+#: src/gui.cpp:144
+msgid "Right/left, half width"
+msgstr "Droite/gauche, demi-largeur"
 
-#: src/media_object.cpp:371
-#, fuzzy, c-format
-msgid "%s video stream %d: Using frame size %dx%d instead of %dx%d."
-msgstr "%s flux vidéo %d : Taille de l'image invalide."
+#: src/gui.cpp:145 src/gui.cpp:165
+msgid "Even/odd rows"
+msgstr "Lignes paires/impaires"
 
-#: src/media_object.cpp:624
-#, c-format
-msgid "%s video stream %d: Unsupported stereo layout %s."
-msgstr "%s flux vidéo %d : Arrangement stéréo %s non supporté."
+#: src/gui.cpp:146
+msgid "Odd/even rows"
+msgstr "Lignes impaires/paires"
 
-#: src/media_object.cpp:662
-#, c-format
-msgid "%s audio stream %d: Cannot handle audio with %d channels."
-msgstr "%s flux audio %d : Impossible de gérer de l'audio à %d canaux."
+#: src/gui.cpp:152
+msgid "Output:"
+msgstr "Sortie :"
 
-#: src/media_object.cpp:691
-#, c-format
-msgid "%s audio stream %d: Cannot handle audio with sample format %s."
-msgstr ""
-"%s flux audio %d : Impossible de gérer de l'audio au format d'échantillon %s."
+#: src/gui.cpp:153
+msgid "Set the 3D output type for your display."
+msgstr "Choisir le type de sortie 3D pour votre affichage."
 
-#: src/media_object.cpp:744
-#, c-format
-msgid "No support available for %s device."
-msgstr "Périphérique %s non supporté."
+#: src/gui.cpp:157
+msgid "Left view"
+msgstr "Vue gauche"
 
-#: src/media_object.cpp:745 src/player_qt.cpp:1831
-msgid "Firewire"
-msgstr "Firewire"
+#: src/gui.cpp:158
+msgid "Right view"
+msgstr "Vue droite"
 
-#: src/media_object.cpp:746 src/player_qt.cpp:1832
-msgid "X11"
-msgstr "X11"
+#: src/gui.cpp:159
+msgid "OpenGL stereo"
+msgstr "Stéréo OpenGL"
 
-#: src/media_object.cpp:747
-msgid "default"
-msgstr "par défaut"
+#: src/gui.cpp:160
+msgid "Left/right view alternating"
+msgstr ""
 
-#: src/media_object.cpp:765 src/media_object.cpp:1218 src/xgl.cpp:297
-#, c-format
-msgid "%s: %s"
-msgstr "%s : %s"
+#: src/gui.cpp:166
+msgid "Even/odd columns"
+msgstr "Colonnes paires/impaires"
 
-#: src/media_object.cpp:776
-#, c-format
-msgid "%s: Cannot read stream info: %s"
-msgstr "%s : Impossible de lire l'information du flux : %s"
+#: src/gui.cpp:167
+msgid "Checkerboard pattern"
+msgstr "Damier"
 
-#: src/media_object.cpp:816
-#, c-format
-msgid "%s stream %d: Cannot open %s: %s"
-msgstr "%s flux vidéo %d : Impossible d'ouvrir %s : %s"
+#: src/gui.cpp:168
+msgid "HDMI frame packing mode"
+msgstr "Mode HDMI frame packing"
 
-#: src/media_object.cpp:817
-msgid "video codec"
-msgstr "codec vidéo"
+#: src/gui.cpp:169
+msgid "Red/cyan glasses, monochrome method"
+msgstr "Lunettes rouge/cyan, monochrome"
 
-#: src/media_object.cpp:818
-msgid "audio codec"
-msgstr "codec audio"
+#: src/gui.cpp:170
+msgid "Red/cyan glasses, half-color method"
+msgstr "Lunettes rouge/cyan, demi-couleur"
 
-#: src/media_object.cpp:819
-msgid "subtitle codec"
-msgstr "codec de sous-titres"
+#: src/gui.cpp:171
+msgid "Red/cyan glasses, full-color method"
+msgstr "Lunettes rouge/cyan, pleine couleur"
 
-#: src/media_object.cpp:820
-msgid "data"
-msgstr "données"
+#: src/gui.cpp:172
+msgid "Red/cyan glasses, high-quality Dubois method"
+msgstr "Lunettes rouge/cyan, méthode Dubois"
 
-#: src/media_object.cpp:821
-msgid "codec not supported"
-msgstr "codec non supporté"
+#: src/gui.cpp:173
+msgid "Green/magenta glasses, monochrome method"
+msgstr "Lunettes vert/magenta, monochrome"
 
-#: src/media_object.cpp:831
-#, c-format
-msgid "%s video stream %d: Invalid frame size."
-msgstr "%s flux vidéo %d : Taille de l'image invalide."
+#: src/gui.cpp:174
+msgid "Green/magenta glasses, half-color method"
+msgstr "Lunettes vert/magenta, demi-couleur"
 
-#: src/media_object.cpp:867
-#, c-format
-msgid "%s video stream %d: Cannot initialize conversion context."
-msgstr "%s flux vidéo %d : Impossible d'initialiser le contexte de conversion."
+#: src/gui.cpp:175
+msgid "Green/magenta glasses, full-color method"
+msgstr "Lunettes vert/magenta, pleine couleur"
 
-#: src/media_object.cpp:930
-#, c-format
-msgid "Video stream %d: %s / %s, %g seconds"
-msgstr "Flux vidéo %d : %s / %s, %g secondes"
+#: src/gui.cpp:176
+msgid "Green/magenta glasses, high-quality Dubois method"
+msgstr "Lunettes vert/magenta, méthode Dubois"
 
-#: src/media_object.cpp:934
-#, c-format
-msgid "Using up to %d threads for decoding."
-msgstr "Utilisation de maximum %d threads pour le décodage."
+#: src/gui.cpp:177
+msgid "Amber/blue glasses, monochrome method"
+msgstr "Lunettes Ambre/bleu, monochrome"
 
-#: src/media_object.cpp:939
+#: src/gui.cpp:178
+msgid "Amber/blue glasses, half-color method"
+msgstr "Lunettes Ambre/bleu, demi-couleur"
+
+#: src/gui.cpp:179
+msgid "Amber/blue glasses, full-color method"
+msgstr "Lunettes Ambre/bleu, pleine couleur"
+
+#: src/gui.cpp:180
+msgid "Amber/blue glasses, high-quality Dubois method"
+msgstr "Lunettes Ambre/bleu, méthode Dubois"
+
+#: src/gui.cpp:181
+msgid "Red/green glasses, monochrome method"
+msgstr "Lunettes rouge/vert, monochrome"
+
+#: src/gui.cpp:182
+msgid "Red/blue glasses, monochrome method"
+msgstr "Lunettes rouge/bleu, monochrome"
+
+#: src/gui.cpp:186
+msgid "Swap left/right"
+msgstr "Echanger gauche/droite"
+
+#: src/gui.cpp:187
+msgid ""
+"Swap the left and right view. Use this if the 3D effect seems wrong."
+msgstr ""
+"Echanger les vues droite et gauche. À utiliser si l'effet 3D parait "
+"étrange."
+
+#: src/gui.cpp:467
+msgid "Off"
+msgstr "Eteint"
+
+#: src/gui.cpp:694
+msgid ""
+"This slider shows the progress during video playback, and can be used to "
+"seek in the video."
+msgstr ""
+"Ce curseur montre la progression de la lecture vidéo, et peut être "
+"utiliser pour naviguer dans la vidéo"
+
+#: src/gui.cpp:701
+msgid "Elapsed / total time."
+msgstr "Temps écoulé/total."
+
+#: src/gui.cpp:708
+#, fuzzy
+msgid "Toggle audio mute."
+msgstr "Basculer le mode lecture en boucle."
+
+#: src/gui.cpp:713
+msgid "Adjust audio volume."
+msgstr ""
+
+#: src/gui.cpp:725
+msgid "Play."
+msgstr "Lecture."
+
+#: src/gui.cpp:729
+msgid "Pause."
+msgstr "Pause."
+
+#: src/gui.cpp:733
+msgid "Stop."
+msgstr "Stop."
+
+#: src/gui.cpp:738
+msgid "Toggle loop mode."
+msgstr "Basculer le mode lecture en boucle."
+
+#: src/gui.cpp:745
+msgid ""
+"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
+"f key."
+msgstr ""
+"Passer en mode plein écran. Vous pouvez quitter le mode plein écran avec "
+"la touche f ou ESC."
+
+#: src/gui.cpp:751
+msgid "Center the video area on your screen."
+msgstr "Centrer la vidéo sur l'écran."
+
+#: src/gui.cpp:758
+msgid "Seek backward 10 minutes."
+msgstr "Aller 10 minutes en arrière."
+
+#: src/gui.cpp:763
+msgid "Seek backward 1 minute."
+msgstr "Aller 1 minute en arrière."
+
+#: src/gui.cpp:769
+msgid "Seek backward 10 seconds."
+msgstr "Aller 10 secondes en arrière."
+
+#: src/gui.cpp:775
+msgid "Seek forward 10 seconds."
+msgstr "Aller 10 secondes en avant."
+
+#: src/gui.cpp:780
+msgid "Seek forward 1 minute."
+msgstr "Aller 1 minute en avant."
+
+#: src/gui.cpp:786
+msgid "Seek forward 10 minutes."
+msgstr "Aller 10 minutes en avant."
+
+#: src/gui.cpp:1047
+msgid "Fullscreen/Multiscreen Settings"
+msgstr "Réglages plein écran/multi-écrans"
+
+#: src/gui.cpp:1049
+msgid "Configure fullscreen mode:"
+msgstr "Configuration du mode plein écran :"
+
+#: src/gui.cpp:1050
+msgid "Select the screens to use in fullscreen mode."
+msgstr "Choisir les écrans à utiliser pour le mode plein écran."
+
+#: src/gui.cpp:1052
+msgid "Single screen:"
+msgstr "Écran unique :"
+
+#: src/gui.cpp:1053
+msgid "Use a single screen for fullscreen mode."
+msgstr "Utiliser un seul écran pour le mode plein écran."
+
+#: src/gui.cpp:1056
+msgid "Primary screen"
+msgstr "Écran primaire"
+
+#: src/gui.cpp:1059 src/gui.cpp:1070 src/gui.cpp:1071
 #, c-format
-msgid "Audio stream %d: %s / %s, %g seconds"
-msgstr "Flux audio %d : %s / %s, %g secondes"
+msgid "Screen %d"
+msgstr "Écran %d"
+
+#: src/gui.cpp:1062
+msgid "Dual screen:"
+msgstr "Double écran :"
+
+#: src/gui.cpp:1063
+msgid "Use two screens for fullscreen mode."
+msgstr "Utiliser deux écrans pour le mode plein écran."
+
+#: src/gui.cpp:1075
+msgid "Multi screen:"
+msgstr "Plein écran :"
+
+#: src/gui.cpp:1076
+msgid "Use multiple screens for fullscreen mode."
+msgstr "Utiliser plusieurs écrans pour le mode plein écran"
+
+#: src/gui.cpp:1078
+msgid "Comma-separated list of screens to use for fullscreen mode."
+msgstr ""
+"Liste d'écrans à utiliser pour le mode plein écran, séparés par des "
+"virgules."
+
+#: src/gui.cpp:1081
+msgid "When in fullscreen mode,"
+msgstr "En mode plein écran,"
+
+#: src/gui.cpp:1082
+msgid "Set special left/right view handling for fullscreen mode."
+msgstr ""
+"Réglages spéciaux pour les vues droite et gauche en plein écran."
+
+#: src/gui.cpp:1084
+msgid "flip left view vertically."
+msgstr "flip vertical de la vue gauche"
+
+#: src/gui.cpp:1086
+msgid "flop left view horizontally."
+msgstr "flip horizontal de la vue gauche"
+
+#: src/gui.cpp:1088
+msgid "flip right view vertically."
+msgstr "flip vertical de la vue droite"
+
+#: src/gui.cpp:1090
+msgid "flop right view horizontally."
+msgstr "flop horizontal de la vue droite"
+
+#: src/gui.cpp:1093
+#, fuzzy
+msgid "inhibit the screensaver"
+msgstr "Impossible de rétablir l'économiseur d'écran."
+
+#: src/gui.cpp:1094
+#, fuzzy
+msgid "Inhibit the screensaver during fullscreen playback."
+msgstr "Choisir les écrans à utiliser pour le mode plein écran."
+
+#: src/gui.cpp:1096 src/gui.cpp:1258 src/gui.cpp:1393 src/gui.cpp:1463
+#: src/gui.cpp:1541 src/gui.cpp:1652 src/gui.cpp:1928 src/gui.cpp:2108
+#: src/gui.cpp:2778 src/gui.cpp:2825 src/gui.cpp:3114
+msgid "OK"
+msgstr "OK"
+
+#: src/gui.cpp:1211
+msgid "Display Color Adjustments"
+msgstr "Réglages des couleurs d'affichage"
+
+#: src/gui.cpp:1213
+msgid "Contrast:"
+msgstr "Contraste :"
+
+#: src/gui.cpp:1224
+msgid "Brightness:"
+msgstr "Luminosité :"
+
+#: src/gui.cpp:1235
+msgid "Hue:"
+msgstr "Teinte :"
+
+#: src/gui.cpp:1246
+msgid "Saturation:"
+msgstr "Saturation :"
+
+#: src/gui.cpp:1364
+msgid "Display Crosstalk Calibration"
+msgstr "Calibrage du crosstalk d'affichage"
+
+#. TRANSLATORS: Please keep the lines short using where necessary.
+#: src/gui.cpp:1367
+msgid ""
+"Please read the manual to find out how to measure the crosstalk "
+"levels of your display."
+msgstr ""
+"Le manuel explique comment mesurer le niveau de crosstalk de votre "
+"affichage."
+
+#: src/gui.cpp:1371
+msgid "Red:"
+msgstr "Rouge :"
+
+#: src/gui.cpp:1378
+msgid "Green:"
+msgstr "Vert :"
+
+#: src/gui.cpp:1385
+msgid "Blue:"
+msgstr "Bleu :"
+
+#: src/gui.cpp:1441
+msgid "Zoom for wide videos"
+msgstr ""
+
+#: src/gui.cpp:1444
+msgid ""
+"Set zoom level for videos that are wider than the screen: 0: Show "
+"full video width. 1: Use full screen height.</p"
+msgstr ""
+
+#: src/gui.cpp:1448
+msgid "Zoom:"
+msgstr ""
+
+#: src/gui.cpp:1449
+msgid "Set the zoom level for videos that are wider than the screen"
+msgstr ""
+
+#: src/gui.cpp:1507
+#, fuzzy
+msgid "Audio Settings"
+msgstr "Réglages des sous-titres"
+
+#: src/gui.cpp:1509
+#, fuzzy
+msgid "Audio device:"
+msgstr "codec audio"
+
+#: src/gui.cpp:1510
+msgid ""
+"Select the audio device. This will take effect for the next started "
+"video."
+msgstr ""
+
+#: src/gui.cpp:1514 src/gui.cpp:2063
+msgid "Default"
+msgstr "Par défaut"
+
+#: src/gui.cpp:1531
+msgid "Audio delay (ms):"
+msgstr ""
+
+#: src/gui.cpp:1532
+msgid ""
+"Set an audio delay, in milliseconds. This is useful if audio and video "
+"are not in sync."
+msgstr ""
+
+#: src/gui.cpp:1589
+msgid "Subtitle Settings"
+msgstr "Réglages des sous-titres"
+
+#: src/gui.cpp:1591
+msgid "These settings apply to soft subtitles, but not to bitmaps."
+msgstr ""
+"Ces réglages s'appliquent aux sous-titres textuels, pas aux bitmaps."
+
+#: src/gui.cpp:1593
+msgid "Encoding:"
+msgstr "Encodage :"
+
+#: src/gui.cpp:1594
+msgid "Set the subtitle character set encoding."
+msgstr "Choisir l'encodage du jeux de caractères des sous-titres."
+
+#: src/gui.cpp:1609
+msgid "Override font:"
+msgstr "Police de caractères :"
+
+#: src/gui.cpp:1610
+msgid "Override the subtitle font family."
+msgstr "Force la police de caractères utilisée pour les sous-titres."
+
+#: src/gui.cpp:1619
+msgid "Override font size:"
+msgstr "Taille de police :"
+
+#: src/gui.cpp:1620
+msgid "Override the subtitle font size."
+msgstr "Force la taille de la police des sous-titres."
+
+#: src/gui.cpp:1630
+msgid "Override scale factor:"
+msgstr "Facteur d'échelle :"
+
+#: src/gui.cpp:1631
+msgid "Override the subtitle scale factor."
+msgstr "Force le facteur d'échelle des sous-titres."
+
+#: src/gui.cpp:1642
+msgid "Override color:"
+msgstr "Couleur :"
+
+#: src/gui.cpp:1643
+msgid "Override the subtitle color."
+msgstr "Force la couleur des sous-titres."
+
+#: src/gui.cpp:1866
+#, fuzzy
+msgid "Video Settings"
+msgstr "Réglages des sous-titres"
+
+#: src/gui.cpp:1868
+#, fuzzy
+msgid "Crop to aspect ratio:"
+msgstr "%gx%g, facteur d'aspect %g:1"
+
+#: src/gui.cpp:1869
+#, fuzzy
+msgid ""
+"Set the real aspect ratio of the video, so that borders can be cropped.</"
+"p>"
+msgstr "Choisir la disposition 3D du flux vidéo"
+
+#: src/gui.cpp:1872
+msgid "Do not crop"
+msgstr ""
+
+#: src/gui.cpp:1885
+msgid "Parallax:"
+msgstr "Parallaxe :"
+
+#: src/gui.cpp:1886
+msgid ""
+"Adjust parallax, from -1 to +1. This changes the separation of left and "
+"right view, and thus the perceived distance of the scene."
+msgstr ""
+"Ajuster la parallaxe, de -1 à 1. Ceci change la séparation des vues "
+"gauche et droite, et donc la distance perçue de la scène."
+
+#: src/gui.cpp:1899
+msgid "Subtitle parallax:"
+msgstr "Parallaxe des sous-titres :"
+
+#: src/gui.cpp:1900
+msgid ""
+"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
+"distance of the subtitles."
+msgstr ""
+"Ajuster la parallaxe des sous-titres, de -1 à 1. Ceci change la distance "
+"perçue des sous-titres."
+
+#: src/gui.cpp:1913
+msgid "Ghostbusting:"
+msgstr "Ghostbusting :"
+
+#: src/gui.cpp:1914
+msgid ""
+"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
+"does not work with anaglyph glasses."
+msgstr ""
+"Choisir le niveau de ghostbusting (élimination du crosstalk), de 0 à 1. "
+"Vous devez régler le niveau de crosstalk de votre affichage d'abord. Le "
+"ghostbusting ne fonctionne pas avec les lunettes anaglyphes."
+
+#: src/gui.cpp:2059
+msgid "Open device"
+msgstr "Ouvrir le périphérique"
+
+#: src/gui.cpp:2062
+msgid "Choose a device type."
+msgstr "Sélectionner un type de périphérique."
+
+#: src/gui.cpp:2064 src/media_object.cpp:801
+msgid "Firewire"
+msgstr "Firewire"
+
+#: src/gui.cpp:2065 src/media_object.cpp:802
+msgid "X11"
+msgstr "X11"
+
+#: src/gui.cpp:2067 src/gui.cpp:2070
+msgid "Choose a device."
+msgstr "Sélectionner un périphérique"
+
+#: src/gui.cpp:2073
+msgid "Set the X11 device string. Refer to the manual for details."
+msgstr ""
+"Identifiant du périphérique X11. Voir le manuel pour les détails."
+
+#: src/gui.cpp:2082
+msgid "Request frame size"
+msgstr "Résolution demandée"
+
+#: src/gui.cpp:2083
+msgid ""
+"Request a specific frame size from the device, e.g. 640x480. The device "
+"must support this frame size. Some devices require a frame size to be "
+"selected."
+msgstr ""
+"Demande une résolution spécifique au périphérique, par ex. 640x480. Le "
+"périphérique doit supporter cette résolution. Certains périphériques exigent "
+"de sélectionner une résolution."
+
+#: src/gui.cpp:2094
+msgid "Request frame rate"
+msgstr "Taux de rafraichissement demandé"
+
+#: src/gui.cpp:2095
+msgid ""
+"Request a specific frame rate from the device, e.g. 25/1. The device must "
+"support this frame rate. Some devices require a frame rate to be selected.</"
+"p>"
+msgstr ""
+"Demander un taux de rafraichissement au périphérique, par ex. 25/1. Le "
+"périphérique doit supporter ce taux de rafraichissement. Certains "
+"périphériques exigent de sélectionner un taux de rafraichissement."
+
+#: src/gui.cpp:2106 src/gui.cpp:2824
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/gui.cpp:2377
+msgid "&File"
+msgstr "&Fichier"
+
+#: src/gui.cpp:2378
+#, fuzzy
+msgid "&Open file(s)..."
+msgstr "Ouvrir des fichiers"
+
+#: src/gui.cpp:2383
+#, fuzzy
+msgid "Open &URL(s)..."
+msgstr "Ouvrir l'&URL..."
+
+#: src/gui.cpp:2387
+msgid "Open &device..."
+msgstr "Ouvrir le périphérique..."
+
+#: src/gui.cpp:2402
+msgid "&Clear recent files"
+msgstr ""
+
+#: src/gui.cpp:2410
+msgid "&Quit..."
+msgstr "&Quitter..."
+
+#: src/gui.cpp:2416
+msgid "&Preferences"
+msgstr "&Préférences"
+
+#: src/gui.cpp:2419
+msgid "&Fullscreen Settings..."
+msgstr "Réglages du mode &plein écran..."
+
+#: src/gui.cpp:2422
+msgid "Display &Color Adjustments..."
+msgstr "Réglage des &couleurs de l'affichage..."
+
+#: src/gui.cpp:2425
+msgid "Display Cross&talk Calibration..."
+msgstr "Calibrage du cross&talk de l'affichage..."
+
+#: src/gui.cpp:2429
+msgid "&Zoom for wide videos..."
+msgstr ""
+
+#: src/gui.cpp:2433
+#, fuzzy
+msgid "&Audio Settings..."
+msgstr "Réglage des &sous-titres..."
+
+#: src/gui.cpp:2437
+msgid "&Subtitle Settings..."
+msgstr "Réglage des &sous-titres..."
+
+#: src/gui.cpp:2441
+#, fuzzy
+msgid "Current &Video Settings..."
+msgstr "Réglages de la vidéo stéréoscopique..."
+
+#: src/gui.cpp:2444
+msgid "&Help"
+msgstr "Aide"
+
+#: src/gui.cpp:2445
+msgid "&Manual..."
+msgstr "&Manuel..."
+
+#: src/gui.cpp:2450
+msgid "&Website..."
+msgstr "Site &web..."
+
+#: src/gui.cpp:2454
+msgid "&Keyboard Shortcuts"
+msgstr "Raccourcis clavier"
+
+#: src/gui.cpp:2458
+msgid "&About"
+msgstr "&À propos"
+
+#: src/gui.cpp:2771
+msgid "Tip"
+msgstr ""
+
+#: src/gui.cpp:2774
+msgid ""
+"You can select and open multiple files at once.This is useful for "
+"example if you have extra subtitle files, or if left and right view are "
+"stored in separate files."
+msgstr ""
 
-#: src/media_object.cpp:946
-#, c-format
-msgid "Subtitle stream %d: %s / %s, %g seconds"
-msgstr "Flux de sous-titres %d : %s / %s, %g secondes"
+#: src/gui.cpp:2777
+msgid "Do not show this message again."
+msgstr ""
 
-#: src/media_object.cpp:953
-msgid "No usable streams."
-msgstr "Aucun flux utilisable"
+#: src/gui.cpp:2794
+msgid "Open files"
+msgstr "Ouvrir des fichiers"
+
+#: src/gui.cpp:2818
+#, fuzzy
+msgid "Open URL(s)"
+msgstr "Ouvrir un URL"
+
+#: src/gui.cpp:2819
+msgid "URL(s):"
+msgstr ""
+
+#: src/gui.cpp:2820
+msgid "Enter one or more space separated URLs."
+msgstr ""
+
+#: src/gui.cpp:3005 src/gui.cpp:3013 src/video_output_qt.cpp:234
+#: src/video_output_qt.cpp:643 src/video_output_qt.cpp:664
+msgid "Error"
+msgstr "Erreur"
+
+#: src/gui.cpp:3005
+msgid "Cannot open manual."
+msgstr "Impossible d'ouvrir le manuel."
+
+#: src/gui.cpp:3013
+msgid "Cannot open website."
+msgstr "Impossible d'ouvrir le site web."
+
+#: src/gui.cpp:3021
+msgid "Keyboard Shortcuts"
+msgstr "Raccourcis clavier"
+
+#: src/gui.cpp:3024
+#, fuzzy
+msgid "Keyboard control:"
+msgstr "Raccourcis clavier"
+
+#: src/gui.cpp:3026
+msgid "Stop."
+msgstr ""
+
+#: src/gui.cpp:3027 src/main.cpp:495
+msgid "Pause / unpause."
+msgstr ""
+
+#: src/gui.cpp:3028 src/main.cpp:496
+#, fuzzy
+msgid "Toggle fullscreen."
+msgstr "Configuration du mode plein écran :"
+
+#: src/gui.cpp:3029 src/main.cpp:497
+msgid "Center window."
+msgstr ""
+
+#: src/gui.cpp:3030 src/main.cpp:498
+#, fuzzy
+msgid "Swap left/right eye."
+msgstr "Echanger gauche/droite"
+
+#: src/gui.cpp:3031 src/main.cpp:499
+msgid "Cycle through available video streams."
+msgstr ""
+
+#: src/gui.cpp:3032 src/main.cpp:500
+msgid "Cycle through available audio streams."
+msgstr ""
+
+#: src/gui.cpp:3033 src/main.cpp:501
+#, fuzzy
+msgid "Cycle through available subtitle streams."
+msgstr "Choisir le flux de sous-titres."
+
+#: src/gui.cpp:3034 src/main.cpp:502
+msgid "Adjust contrast."
+msgstr ""
+
+#: src/gui.cpp:3035 src/main.cpp:503
+#, fuzzy
+msgid "Adjust brightness."
+msgstr "Luminosité :"
+
+#: src/gui.cpp:3036 src/main.cpp:504
+msgid "Adjust hue."
+msgstr ""
+
+#: src/gui.cpp:3037 src/main.cpp:505
+#, fuzzy
+msgid "Adjust saturation."
+msgstr "Saturation :"
+
+#: src/gui.cpp:3038 src/main.cpp:506
+#, fuzzy
+msgid "Adjust parallax."
+msgstr "Parallaxe des sous-titres :"
+
+#: src/gui.cpp:3039 src/main.cpp:507
+#, fuzzy
+msgid "Adjust ghostbusting."
+msgstr "Ghostbusting :"
+
+#: src/gui.cpp:3040 src/main.cpp:508
+msgid "Adjust zoom for wide videos."
+msgstr ""
+
+#: src/gui.cpp:3041 src/main.cpp:509
+msgid "Adjust audio volume."
+msgstr ""
+
+#: src/gui.cpp:3042 src/main.cpp:510
+msgid "Toggle audio mute."
+msgstr ""
 
-#: src/media_object.cpp:1234 src/media_object.cpp:1264
-#: src/media_object.cpp:1294
+#: src/gui.cpp:3043 src/main.cpp:511
+msgid "Step a single video frame forward."
+msgstr ""
+
+#: src/gui.cpp:3044 src/main.cpp:512
+msgid "Seek 10 seconds backward / forward."
+msgstr ""
+
+#: src/gui.cpp:3045 src/main.cpp:513
+msgid "Seek 1 minute backward / forward."
+msgstr ""
+
+#: src/gui.cpp:3046 src/main.cpp:514
+msgid "Seek 10 minutes backward / forward."
+msgstr ""
+
+#: src/gui.cpp:3047 src/main.cpp:516
+msgid "Media keys should work as expected."
+msgstr ""
+
+#: src/gui.cpp:3063
 #, c-format
-msgid "%s: Cannot duplicate packet."
-msgstr "%s : Impossible de dupliquer le paquet."
+msgid "About %s"
+msgstr "À propos de %s"
 
-#: src/media_object.cpp:1766
+#: src/gui.cpp:3069
 #, c-format
-msgid "%s: Seeking failed."
-msgstr "%s : Échec de la recherche."
+msgid "The %s 3D video player"
+msgstr "Le lecteur vidéo 3D %s"
 
-#: src/player.cpp:212
-msgid "No video streams found."
-msgstr "Aucun flux vidéo trouvé."
+#: src/gui.cpp:3074
+#, fuzzy, c-format
+msgid ""
+"%s version %s.Copyright (C) 2012 the Bino developers.This "
+"is free software. You may redistribute copies of it under the terms of the "
+"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
+"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
+"\"%s\">%s</a> for more information on this software."
+msgstr ""
+"%s version %s.Copyright (C) 2011 les développeurs Bino.Ceci "
+"est un logiciel libre. Vous pouvez en distribuer des copies sous les termes "
+"de la <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public "
+"License</a>. Il n'y a AUCUNE GARANTIE, dans les limites autorisées par la "
+"loi.Voir <a href=\"%s\">%s</a> pour plus d'informations sur ce "
+"logiciel."
 
-#: src/player.cpp:218
-msgid "Cannot set requested stereo layout: incompatible media."
-msgstr "Impossible de choisir le mode stéréo sélectionné : média incompatible."
+#: src/gui.cpp:3086 src/main.cpp:384
+msgid "Platform:"
+msgstr "Plateforme :"
 
-#: src/player.cpp:224
-#, c-format
-msgid "Video stream %d not found."
-msgstr "Flux vidéo %d non trouvé."
+#: src/gui.cpp:3087 src/main.cpp:386
+msgid "Libraries used:"
+msgstr "Bibliothèques utilisées :"
+
+#: src/gui.cpp:3109
+msgid "About"
+msgstr "À propos"
+
+#: src/gui.cpp:3110
+msgid "Libraries"
+msgstr "Bibliothèques"
+
+#: src/gui.cpp:3111
+msgid "Team"
+msgstr "Équipe"
+
+#: src/gui.cpp:3112
+msgid "License"
+msgstr "Licence"
+
+#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
+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/player.cpp:229
+#: src/lirc.cpp:74
+msgid "Cannot read LIRC default configuration."
+msgstr "Impossible de lire la configuration par défaut de LIRC."
+
+#: src/lirc.cpp:89
 #, c-format
-msgid "Audio stream %d not found."
-msgstr "Flux audio %d non trouvé."
+msgid "Cannot read LIRC configuration file %s."
+msgstr "Impossible de lire le fichier de configuration LIRC %s."
+
+#: src/lirc.cpp:117
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr "Impossible de lire l'événement LIRC ; désactivation du support LIRC."
 
-#: src/player.cpp:237
+#: src/lirc.cpp:131
 #, c-format
-msgid "Subtitle stream %d not found."
-msgstr "Flux de sous-titres %d non trouvé."
+msgid "Received invalid command '%s' from LIRC."
+msgstr "Commande LIRC '%s' invalide."
+
+#: src/lirc.cpp:141
+msgid "Cannot get command for LIRC code."
+msgstr "Commande non disponible pour le code LIRC."
 
-#: src/player.cpp:644
+#: src/main.cpp:367 src/media_object.cpp:821 src/media_object.cpp:1286
+#: src/video_output.cpp:212
 #, c-format
-msgid "Video: delay %g seconds; dropping next frame."
-msgstr "Vidéo : retard de %g secondes; image suivante sautée."
+msgid "%s: %s"
+msgstr "%s : %s"
 
-#: src/player.cpp:656
+#: src/main.cpp:379
 #, c-format
-msgid "FPS: %.2f"
-msgstr "FPS : %.2f"
+msgid "%s version %s"
+msgstr "%s version %s"
 
-#: src/player_equalizer.cpp:138
-msgid "Reading input frame failed."
-msgstr "Echec de la lecture de l'image d'entrée."
+#: src/main.cpp:380
+#, fuzzy
+msgid "Copyright (C) 2012 the Bino developers."
+msgstr "Copyright (C) 2011 les développeurs Bino."
 
-#: src/player_equalizer.cpp:192 src/video_output_qt.cpp:345
-#: src/video_output_qt.cpp:352
-msgid "Waiting for subtitle renderer initialization..."
-msgstr "Attente de l'initialisation du rendu des sous-titres..."
+#: src/main.cpp:381
+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/player_equalizer.cpp:273
-msgid "Init data mapping failed."
-msgstr "Echec du routage des données initiales."
+#. 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:399
+msgid "Usage:"
+msgstr ""
 
-#: src/player_equalizer.cpp:274
-msgid "Frame data mapping failed."
-msgstr "Echec du routage des images."
+#: src/main.cpp:401
+msgid "Options:"
+msgstr ""
 
-#: src/player_equalizer.cpp:275
-msgid "Video player initialization failed."
-msgstr "Echec de l'initialisation du lecteur vidéo."
+#: src/main.cpp:402
+msgid "Print help."
+msgstr ""
 
-#: src/player_equalizer.cpp:276
-msgid "Need at least OpenGL 2.1."
-msgstr "OpenGL 2.1 minimum requis."
+#: src/main.cpp:403
+msgid "Print version."
+msgstr ""
 
-#: src/player_equalizer.cpp:477
-msgid "No canvas in Equalizer configuration."
-msgstr "Pas de canevas dans la configuration Equalizer."
+#: src/main.cpp:404
+msgid "Do not use the GUI, just show a plain window."
+msgstr ""
 
-#: src/player_equalizer.cpp:511
-msgid "Equalizer canvas:"
-msgstr "Canevas Equalizer :"
+#: src/main.cpp:405
+msgid "Append all log messages to the given file."
+msgstr ""
 
-#: src/player_equalizer.cpp:512
-#, c-format
-msgid "%gx%g, aspect ratio %g:1"
-msgstr "%gx%g, facteur d'aspect %g:1"
+#: src/main.cpp:406
+msgid "Set log level (debug/info/warning/error/quiet)."
+msgstr ""
 
-#: src/player_equalizer.cpp:513
-#, c-format
-msgid "Area for %g:1 video: [ %g %g %g %g @ %g ]"
-msgstr "Région pour vidéo %g:1 : [ %g %g %g %g @ %g ]"
+#: src/main.cpp:407
+msgid "Print a list of known audio devices and exit."
+msgstr ""
 
-#: src/player_equalizer.cpp:926 src/video_output_qt.cpp:318
-msgid ""
-"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
-"objects."
+#: src/main.cpp:408
+msgid "Use audio device number N (N=0 is the default)."
 msgstr ""
-"Cette implémentation OpenGL se supporte pas OpenGL 2.1 et les framebuffer "
-"objects."
 
-#: src/player_equalizer.cpp:1096
-msgid "Equalizer initialization failed."
-msgstr "Echec de l'initialisation d'Equalizer."
+#: src/main.cpp:409
+msgid "Delay audio by D milliseconds. Default is 0."
+msgstr ""
 
-#: src/player_equalizer.cpp:1104
-msgid "Cannot get equalizer configuration."
-msgstr "Impossible de lire la configuration d'Equalizer."
+#: src/main.cpp:410
+msgid "Set audio volume (0 to 1). Default is 1."
+msgstr ""
 
-#: src/player_equalizer.cpp:1118
-msgid "Equalizer configuration initialization failed."
-msgstr "Echec de l'initialisation de la configuration d'Equalizer."
+#: src/main.cpp:411
+#, fuzzy
+msgid "Mute audio."
+msgstr "Pas d'audio."
 
-#: src/player_qt.cpp:161
-msgid "Video:"
-msgstr "Vidéo :"
+#: src/main.cpp:412
+msgid "Type of input device: default, firewire, x11."
+msgstr ""
 
-#: src/player_qt.cpp:162
-msgid "Select the video stream."
-msgstr "Choisir le flux vidéo."
+#: src/main.cpp:413
+#, fuzzy
+msgid "Request frame size WxH from input device."
+msgstr "Résolution demandée"
 
-#: src/player_qt.cpp:168
-msgid "Audio:"
-msgstr "Audio :"
+#: src/main.cpp:414
+#, fuzzy
+msgid "Request frame rate N/D from input device."
+msgstr "Taux de rafraichissement demandé"
 
-#: src/player_qt.cpp:169
-msgid "Select the audio stream."
-msgstr "Choisir le flux audio."
+#: src/main.cpp:415
+#, fuzzy
+msgid "Use the given LIRC configuration file."
+msgstr "Impossible de lire le fichier de configuration LIRC %s."
 
-#: src/player_qt.cpp:175
-msgid "Subtitle:"
-msgstr "Sous-titres :"
+#: src/main.cpp:416
+msgid "This option can be used more than once."
+msgstr ""
 
-#: src/player_qt.cpp:176
-msgid "Select the subtitle stream."
+#: src/main.cpp:417
+msgid "Select video stream (1-n, depending on input)."
+msgstr ""
+
+#: src/main.cpp:418
+msgid "Select audio stream (1-n, depending on input)."
+msgstr ""
+
+#: src/main.cpp:419
+#, fuzzy
+msgid "Select subtitle stream (0-n, dep. on input)."
 msgstr "Choisir le flux de sous-titres."
 
-#: src/player_qt.cpp:188
-msgid "Set the 3D layout of the video stream."
-msgstr "Choisir la disposition 3D du flux vidéo"
+#: src/main.cpp:420
+msgid "Select input type (default autodetect):"
+msgstr ""
 
-#: src/player_qt.cpp:192
-msgid "2D"
-msgstr "2D"
+#: src/main.cpp:421
+#, fuzzy
+msgid "Single view."
+msgstr "Vue droite"
 
-#: src/player_qt.cpp:193
-msgid "Separate streams, left first"
+#: src/main.cpp:422
+#, fuzzy
+msgid "Left/right separate streams, left first."
 msgstr "Flux séparés, gauche d'abord"
 
-#: src/player_qt.cpp:194
-msgid "Separate streams, right first"
+#: src/main.cpp:423
+#, fuzzy
+msgid "Left/right separate streams, right first."
 msgstr "Flux séparés, droit d'abord"
 
-#: src/player_qt.cpp:195 src/player_qt.cpp:218
-msgid "Top/bottom"
-msgstr "Haut/bas"
+#: src/main.cpp:424
+#, fuzzy
+msgid "Left/right alternating, left first."
+msgstr "Flux séparés, gauche d'abord"
 
-#: src/player_qt.cpp:196 src/player_qt.cpp:219
-msgid "Top/bottom, half height"
+#: src/main.cpp:425
+#, fuzzy
+msgid "Left/right alternating, right first."
+msgstr "Flux séparés, droit d'abord"
+
+#: src/main.cpp:426 src/main.cpp:441
+msgid "Left top, right bottom."
+msgstr ""
+
+#: src/main.cpp:427 src/main.cpp:442
+#, fuzzy
+msgid "Left top, right bottom, half height."
 msgstr "Haut/bas, demi-hauteur"
 
-#: src/player_qt.cpp:197
-msgid "Bottom/top"
-msgstr "Bas/haut"
+#: src/main.cpp:428
+msgid "Left bottom, right top."
+msgstr ""
 
-#: src/player_qt.cpp:198
-msgid "Bottom/top, half height"
+#: src/main.cpp:429
+#, fuzzy
+msgid "Left bottom, right top, half height."
 msgstr "Bas/haut, demi-hauteur"
 
-#: src/player_qt.cpp:199 src/player_qt.cpp:220
-msgid "Left/right"
-msgstr "gauche/droite"
+#: src/main.cpp:430 src/main.cpp:443
+msgid "Left left, right right."
+msgstr ""
 
-#: src/player_qt.cpp:200 src/player_qt.cpp:221
-msgid "Left/right, half width"
+#: src/main.cpp:431 src/main.cpp:444
+#, fuzzy
+msgid "Left left, right right, half width."
 msgstr "Gauche/droite, demi-largeur"
 
-#: src/player_qt.cpp:201
-msgid "Right/left"
-msgstr "Droite/gauche"
-
-#: src/player_qt.cpp:202
-msgid "Right/left, half width"
-msgstr "Droite/gauche, demi-largeur"
-
-#: src/player_qt.cpp:203 src/player_qt.cpp:222
-msgid "Even/odd rows"
-msgstr "Lignes paires/impaires"
-
-#: src/player_qt.cpp:204
-msgid "Odd/even rows"
-msgstr "Lignes impaires/paires"
+#: src/main.cpp:432
+#, fuzzy
+msgid "Left right, right left."
+msgstr "Gauche/droite, demi-largeur"
 
-#: src/player_qt.cpp:210
-msgid "Output:"
-msgstr "Sortie :"
+#: src/main.cpp:433
+#, fuzzy
+msgid "Left right, right left, half width."
+msgstr "Gauche/droite, demi-largeur"
 
-#: src/player_qt.cpp:211
-msgid "Set the 3D output type for your display."
-msgstr "Choisir le type de sortie 3D pour votre affichage."
+#: src/main.cpp:434 src/main.cpp:445
+msgid "Left even rows, right odd rows."
+msgstr ""
 
-#: src/player_qt.cpp:215
-msgid "Left view"
-msgstr "Vue gauche"
+#: src/main.cpp:435
+msgid "Left odd rows, right even rows."
+msgstr ""
 
-#: src/player_qt.cpp:216
-msgid "Right view"
-msgstr "Vue droite"
+#: src/main.cpp:436
+msgid "Select output type:"
+msgstr ""
 
-#: src/player_qt.cpp:217
-msgid "OpenGL stereo"
+#: src/main.cpp:437
+#, fuzzy
+msgid "OpenGL quad-buffered stereo."
 msgstr "Stéréo OpenGL"
 
-#: src/player_qt.cpp:223
-msgid "Even/odd columns"
-msgstr "Colonnes paires/impaires"
+#: src/main.cpp:438
+#, fuzzy
+msgid "Left and right view alternating."
+msgstr "flip vertical de la vue droite"
 
-#: src/player_qt.cpp:224
-msgid "Checkerboard pattern"
+#: src/main.cpp:439
+msgid "Only left."
+msgstr ""
+
+#: src/main.cpp:440
+msgid "Only right."
+msgstr ""
+
+#: src/main.cpp:446
+msgid "Left even columns, right odd columns."
+msgstr ""
+
+#: src/main.cpp:447
+#, fuzzy
+msgid "Left and right in checkerboard pattern."
 msgstr "Damier"
 
-#: src/player_qt.cpp:225
-msgid "HDMI frame packing mode"
+#: src/main.cpp:448
+#, fuzzy
+msgid "HDMI frame packing mode."
 msgstr "Mode HDMI frame packing"
 
-#: src/player_qt.cpp:226
-msgid "Red/cyan glasses, monochrome method"
+#: src/main.cpp:449
+#, fuzzy
+msgid "Red/cyan anaglyph, monochrome method."
 msgstr "Lunettes rouge/cyan, monochrome"
 
-#: src/player_qt.cpp:227
-msgid "Red/cyan glasses, half-color method"
+#: src/main.cpp:450
+#, fuzzy
+msgid "Red/cyan anaglyph, half color method."
 msgstr "Lunettes rouge/cyan, demi-couleur"
 
-#: src/player_qt.cpp:228
-msgid "Red/cyan glasses, full-color method"
+#: src/main.cpp:451
+#, fuzzy
+msgid "Red/cyan anaglyph, full color method."
 msgstr "Lunettes rouge/cyan, pleine couleur"
 
-#: src/player_qt.cpp:229
-msgid "Red/cyan glasses, high-quality Dubois method"
+#: src/main.cpp:452
+#, fuzzy
+msgid "Red/cyan anaglyph, Dubois method."
 msgstr "Lunettes rouge/cyan, méthode Dubois"
 
-#: src/player_qt.cpp:230
-msgid "Green/magenta glasses, monochrome method"
+#: src/main.cpp:453
+#, fuzzy
+msgid "Green/magenta anaglyph, monochrome method."
 msgstr "Lunettes vert/magenta, monochrome"
 
-#: src/player_qt.cpp:231
-msgid "Green/magenta glasses, half-color method"
+#: src/main.cpp:454
+#, fuzzy
+msgid "Green/magenta anaglyph, half color method."
 msgstr "Lunettes vert/magenta, demi-couleur"
 
-#: src/player_qt.cpp:232
-msgid "Green/magenta glasses, full-color method"
+#: src/main.cpp:455
+#, fuzzy
+msgid "Green/magenta anaglyph, full color method."
 msgstr "Lunettes vert/magenta, pleine couleur"
 
-#: src/player_qt.cpp:233
-msgid "Green/magenta glasses, high-quality Dubois method"
+#: src/main.cpp:456
+#, fuzzy
+msgid "Green/magenta anaglyph, Dubois method."
 msgstr "Lunettes vert/magenta, méthode Dubois"
 
-#: src/player_qt.cpp:234
-msgid "Amber/blue glasses, monochrome method"
+#: src/main.cpp:457
+#, fuzzy
+msgid "Amber/blue anaglyph, monochrome method."
 msgstr "Lunettes Ambre/bleu, monochrome"
 
-#: src/player_qt.cpp:235
-msgid "Amber/blue glasses, half-color method"
+#: src/main.cpp:458
+#, fuzzy
+msgid "Amber/blue anaglyph, half color method."
 msgstr "Lunettes Ambre/bleu, demi-couleur"
 
-#: src/player_qt.cpp:236
-msgid "Amber/blue glasses, full-color method"
+#: src/main.cpp:459
+#, fuzzy
+msgid "Amber/blue anaglyph, full color method."
 msgstr "Lunettes Ambre/bleu, pleine couleur"
 
-#: src/player_qt.cpp:237
-msgid "Amber/blue glasses, high-quality Dubois method"
+#: src/main.cpp:460
+#, fuzzy
+msgid "Amber/blue anaglyph, Dubois method."
 msgstr "Lunettes Ambre/bleu, méthode Dubois"
 
-#: src/player_qt.cpp:238
-msgid "Red/green glasses, monochrome method"
+#: src/main.cpp:461
+#, fuzzy
+msgid "Red/green anaglyph, monochrome method."
 msgstr "Lunettes rouge/vert, monochrome"
 
-#: src/player_qt.cpp:239
-msgid "Red/blue glasses, monochrome method"
+#: src/main.cpp:462
+#, fuzzy
+msgid "Red/blue anaglyph, monochrome method."
 msgstr "Lunettes rouge/bleu, monochrome"
 
-#: src/player_qt.cpp:243
-msgid "Swap left/right"
-msgstr "Echanger gauche/droite"
-
-#: src/player_qt.cpp:244
-msgid ""
-"Swap the left and right view. Use this if the 3D effect seems wrong."
+#: src/main.cpp:463
+msgid "Multi-display via Equalizer (2D setup)."
 msgstr ""
-"Echanger les vues droite et gauche. À utiliser si l'effet 3D parait "
-"étrange."
-
-#: src/player_qt.cpp:511
-msgid "Off"
-msgstr "Eteint"
 
-#: src/player_qt.cpp:745
-msgid ""
-"This slider shows the progress during video playback, and can be used to "
-"seek in the video."
+#: src/main.cpp:464
+msgid "Multi-display via Equalizer (3D setup)."
 msgstr ""
-"Ce curseur montre la progression de la lecture vidéo, et peut être "
-"utiliser pour naviguer dans la vidéo"
-
-#: src/player_qt.cpp:752
-msgid "Elapsed / total time."
-msgstr "Temps écoulé/total."
 
-#: src/player_qt.cpp:762
-msgid "Play."
-msgstr "Lecture."
-
-#: src/player_qt.cpp:766
-msgid "Pause."
-msgstr "Pause."
+#: src/main.cpp:465
+#, fuzzy
+msgid "Swap left/right view."
+msgstr "Echanger gauche/droite"
 
-#: src/player_qt.cpp:770
-msgid "Stop."
-msgstr "Stop."
+#: src/main.cpp:466
+#, fuzzy
+msgid "Fullscreen."
+msgstr "Double écran :"
 
-#: src/player_qt.cpp:775
-msgid "Toggle loop mode."
-msgstr "Basculer le mode lecture en boucle."
+#: src/main.cpp:467
+#, fuzzy
+msgid "Use the listed screens in fullscreen mode."
+msgstr "Utiliser plusieurs écrans pour le mode plein écran"
 
-#: src/player_qt.cpp:782
-msgid ""
-"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
-"f key."
+#: src/main.cpp:468
+msgid "Screen numbers start with 1."
 msgstr ""
-"Passer en mode plein écran. Vous pouvez quitter le mode plein écran avec "
-"la touche f ou ESC."
-
-#: src/player_qt.cpp:788
-msgid "Center the video area on your screen."
-msgstr "Centrer la vidéo sur l'écran."
-
-#: src/player_qt.cpp:795
-msgid "Seek backward 10 minutes."
-msgstr "Aller 10 minutes en arrière."
-
-#: src/player_qt.cpp:800
-msgid "Seek backward 1 minute."
-msgstr "Aller 1 minute en arrière."
-
-#: src/player_qt.cpp:806
-msgid "Seek backward 10 seconds."
-msgstr "Aller 10 secondes en arrière."
-
-#: src/player_qt.cpp:812
-msgid "Seek forward 10 seconds."
-msgstr "Aller 10 secondes en avant."
-
-#: src/player_qt.cpp:817
-msgid "Seek forward 1 minute."
-msgstr "Aller 1 minute en avant."
-
-#: src/player_qt.cpp:823
-msgid "Seek forward 10 minutes."
-msgstr "Aller 10 minutes en avant."
-
-#: src/player_qt.cpp:1052
-msgid "Display Color Adjustments"
-msgstr "Réglages des couleurs d'affichage"
-
-#: src/player_qt.cpp:1054
-msgid "Contrast:"
-msgstr "Contraste :"
-
-#: src/player_qt.cpp:1065
-msgid "Brightness:"
-msgstr "Luminosité :"
-
-#: src/player_qt.cpp:1076
-msgid "Hue:"
-msgstr "Teinte :"
-
-#: src/player_qt.cpp:1087
-msgid "Saturation:"
-msgstr "Saturation :"
-
-#: src/player_qt.cpp:1099 src/player_qt.cpp:1290 src/player_qt.cpp:1406
-#: src/player_qt.cpp:1695 src/player_qt.cpp:1875 src/player_qt.cpp:2546
-#: src/player_qt.cpp:2742 src/player_qt.cpp:2988
-msgid "OK"
-msgstr "OK"
 
-#: src/player_qt.cpp:1261
-msgid "Display Crosstalk Calibration"
-msgstr "Calibrage du crosstalk d'affichage"
-
-#. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/player_qt.cpp:1264
-msgid ""
-"Please read the manual to find out how to measure the crosstalk "
-"levels of your display."
+#: src/main.cpp:469
+msgid "An empty list defaults to the primary screen."
 msgstr ""
-"Le manuel explique comment mesurer le niveau de crosstalk de votre "
-"affichage."
 
-#: src/player_qt.cpp:1268
-msgid "Red:"
-msgstr "Rouge :"
+#: src/main.cpp:470
+#, fuzzy
+msgid "Flip left view vertically when fullscreen."
+msgstr "flip vertical de la vue gauche"
 
-#: src/player_qt.cpp:1275
-msgid "Green:"
-msgstr "Vert :"
+#: src/main.cpp:471
+#, fuzzy
+msgid "Flop left view horizontally when fullscreen."
+msgstr "flip horizontal de la vue gauche"
 
-#: src/player_qt.cpp:1282
-msgid "Blue:"
-msgstr "Bleu :"
+#: src/main.cpp:472
+#, fuzzy
+msgid "Flip right view vertically when fullscreen."
+msgstr "flip vertical de la vue droite"
 
-#: src/player_qt.cpp:1348
-msgid "Subtitle Settings"
-msgstr "Réglages des sous-titres"
+#: src/main.cpp:473
+#, fuzzy
+msgid "Flop right view horizontally when fullscreen."
+msgstr "flop horizontal de la vue droite"
 
-#: src/player_qt.cpp:1350
-msgid "These settings apply to soft subtitles, but not to bitmaps."
+#: src/main.cpp:474
+msgid "Set zoom for wide videos (0=off to 1=full)."
 msgstr ""
-"Ces réglages s'appliquent aux sous-titres textuels, pas aux bitmaps."
 
-#: src/player_qt.cpp:1352
-msgid "Encoding:"
-msgstr "Encodage :"
+#: src/main.cpp:475
+msgid "Crop video to given aspect ratio (0:0=off)."
+msgstr ""
 
-#: src/player_qt.cpp:1353
-msgid "Set the subtitle character set encoding."
-msgstr "Choisir l'encodage du jeux de caractères des sous-titres."
+#: src/main.cpp:476
+#, fuzzy
+msgid "Center window on screen."
+msgstr "Centrer la vidéo sur l'écran."
 
-#: src/player_qt.cpp:1367
-msgid "Override font:"
-msgstr "Police de caractères :"
+#: src/main.cpp:477
+#, fuzzy
+msgid "Set subtitle encoding."
+msgstr "codec de sous-titres"
 
-#: src/player_qt.cpp:1368
-msgid "Override the subtitle font family."
+#: src/main.cpp:478
+#, fuzzy
+msgid "Set subtitle font name."
 msgstr "Force la police de caractères utilisée pour les sous-titres."
 
-#: src/player_qt.cpp:1376
-msgid "Override font size:"
-msgstr "Taille de police :"
-
-#: src/player_qt.cpp:1377
-msgid "Override the subtitle font size."
+#: src/main.cpp:479
+#, fuzzy
+msgid "Set subtitle font size."
 msgstr "Force la taille de la police des sous-titres."
 
-#: src/player_qt.cpp:1386
-msgid "Override scale factor:"
-msgstr "Facteur d'échelle :"
-
-#: src/player_qt.cpp:1387
-msgid "Override the subtitle scale factor."
+#: src/main.cpp:480
+#, fuzzy
+msgid "Set subtitle scale factor."
 msgstr "Force le facteur d'échelle des sous-titres."
 
-#: src/player_qt.cpp:1397
-msgid "Override color:"
-msgstr "Couleur :"
-
-#: src/player_qt.cpp:1398
-msgid "Override the subtitle color."
-msgstr "Force la couleur des sous-titres."
-
-#: src/player_qt.cpp:1644
-msgid "Stereoscopic Video Settings"
-msgstr "Réglages de la vidéo stéréoscopique"
-
-#: src/player_qt.cpp:1646
-msgid "Parallax:"
-msgstr "Parallaxe :"
+#: src/main.cpp:481
+msgid "Set subtitle color, in [AA]RRGGBB format."
+msgstr ""
 
-#: src/player_qt.cpp:1647
-msgid ""
-"Adjust parallax, from -1 to +1. This changes the separation of left and "
-"right view, and thus the perceived distance of the scene."
+#: src/main.cpp:482
+msgid "Subtitle parallax adjustment (-1 to +1)."
 msgstr ""
-"Ajuster la parallaxe, de -1 à 1. Ceci change la séparation des vues "
-"gauche et droite, et donc la distance perçue de la scène."
 
-#: src/player_qt.cpp:1662
-msgid "Subtitle parallax:"
-msgstr "Parallaxe des sous-titres :"
+#: src/main.cpp:483
+msgid "Parallax adjustment (-1 to +1)."
+msgstr ""
 
-#: src/player_qt.cpp:1663
-msgid ""
-"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
-"distance of the subtitles."
+#: src/main.cpp:484
+msgid "Crosstalk leak level (0 to 1)."
 msgstr ""
-"Ajuster la parallaxe des sous-titres, de -1 à 1. Ceci change la distance "
-"perçue des sous-titres."
 
-#: src/player_qt.cpp:1678
-msgid "Ghostbusting:"
-msgstr "Ghostbusting :"
+#: src/main.cpp:485
+msgid "Comma-separated values for R,G,B."
+msgstr ""
 
-#: src/player_qt.cpp:1679
-msgid ""
-"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
-"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
-"does not work with anaglyph glasses."
+#: src/main.cpp:486
+msgid "Amount of ghostbusting to apply (0 to 1)."
 msgstr ""
-"Choisir le niveau de ghostbusting (élimination du crosstalk), de 0 à 1. "
-"Vous devez régler le niveau de crosstalk de votre affichage d'abord. Le "
-"ghostbusting ne fonctionne pas avec les lunettes anaglyphes."
 
-#: src/player_qt.cpp:1826
-msgid "Open device"
-msgstr "Ouvrir le périphérique"
+#: src/main.cpp:487
+msgid "Benchmark mode (no audio, show fps)."
+msgstr ""
 
-#: src/player_qt.cpp:1829
-msgid "Choose a device type."
-msgstr "Sélectionner un type de périphérique."
+#: src/main.cpp:488
+msgid "Frame rate divisor for display refresh rate."
+msgstr ""
 
-#: src/player_qt.cpp:1830
-msgid "Default"
-msgstr "Par défaut"
+#: src/main.cpp:489
+msgid "Default is 0 for benchmark mode, 1 otherwise."
+msgstr ""
 
-#: src/player_qt.cpp:1834 src/player_qt.cpp:1837
-msgid "Choose a device."
-msgstr "Sélectionner un périphérique"
+#: src/main.cpp:490
+msgid "Loop the input media."
+msgstr ""
 
-#: src/player_qt.cpp:1840
-msgid "Set the X11 device string. Refer to the manual for details."
+#: src/main.cpp:492
+msgid "Interactive control:"
 msgstr ""
-"Identifiant du périphérique X11. Voir le manuel pour les détails."
 
-#: src/player_qt.cpp:1849
-msgid "Request frame size"
-msgstr "Résolution demandée"
+#: src/main.cpp:493
+#, fuzzy
+msgid "Leave fullscreen mode, or quit."
+msgstr "En mode plein écran,"
 
-#: src/player_qt.cpp:1850
-msgid ""
-"Request a specific frame size from the device, e.g. 640x480. The device "
-"must support this frame size. Some devices require a frame size to be "
-"selected."
-msgstr ""
-"Demande une résolution spécifique au périphérique, par ex. 640x480. Le "
-"périphérique doit supporter cette résolution. Certains périphériques exigent "
-"de sélectionner une résolution."
+#: src/main.cpp:494
+#, fuzzy
+msgid "Quit."
+msgstr "&Quitter..."
 
-#: src/player_qt.cpp:1861
-msgid "Request frame rate"
-msgstr "Taux de rafraichissement demandé"
+#: src/main.cpp:515
+msgid "Seek according to horizontal click position."
+msgstr ""
 
-#: src/player_qt.cpp:1862
-msgid ""
-"Request a specific frame rate from the device, e.g. 25/1. The device must "
-"support this frame rate. Some devices require a frame rate to be selected.</"
-"p>"
+#: src/main.cpp:523
+msgid "No audio devices known."
 msgstr ""
-"Demander un taux de rafraichissement au périphérique, par ex. 25/1. Le "
-"périphérique doit supporter ce taux de rafraichissement. Certains "
-"périphériques exigent de sélectionner un taux de rafraichissement."
 
-#: src/player_qt.cpp:1873 src/player_qt.cpp:2545 src/player_qt.cpp:2741
-msgid "Cancel"
-msgstr "Annuler"
+#: src/main.cpp:595
+msgid "Benchmark mode: audio and time synchronization disabled."
+msgstr "Mode banc d'essai: audio et synchronisation temporelle désactivés."
 
-#: src/player_qt.cpp:2048
-msgid "&File"
-msgstr "&Fichier"
+#: src/main.cpp:729
+msgid "This version of Bino was compiled without support for LIRC."
+msgstr "Cette version de Bino a été compilée sans le support LIRC."
 
-#: src/player_qt.cpp:2049
-msgid "&Open..."
-msgstr "&Ouvrir..."
+#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
+#: src/media_data.cpp:935
+#, c-format
+msgid "%dx%d, %.3g:1"
+msgstr "%dx%d, %.3g:1"
 
-#: src/player_qt.cpp:2054
-msgid "Open &URL..."
-msgstr "Ouvrir l'&URL..."
+#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
+#: src/media_data.cpp:1066
+#, c-format
+msgid "%s, %d ch., %g kHz, %d bit"
+msgstr "%s, %d ch., %g kHz, %d bit"
 
-#: src/player_qt.cpp:2058
-msgid "Open &device..."
-msgstr "Ouvrir le périphérique..."
+#: src/media_input.cpp:282
+#, c-format
+msgid "Video %s: %s"
+msgstr "Vidéo %s : %s"
 
-#: src/player_qt.cpp:2063
-msgid "&Quit..."
-msgstr "&Quitter..."
+#: src/media_input.cpp:287
+msgid "No video."
+msgstr "Aucune vidéo."
 
-#: src/player_qt.cpp:2069
-msgid "&Preferences"
-msgstr "&Préférences"
+#: src/media_input.cpp:293
+#, c-format
+msgid "Audio %s: %s"
+msgstr "Audio %s : %s"
 
-#: src/player_qt.cpp:2072
-msgid "&Fullscreen Settings..."
-msgstr "Réglages du mode &plein écran..."
+#: src/media_input.cpp:298
+msgid "No audio."
+msgstr "Pas d'audio."
 
-#: src/player_qt.cpp:2075
-msgid "Display &Color Adjustments..."
-msgstr "Réglage des &couleurs de l'affichage..."
+#: src/media_input.cpp:304
+#, c-format
+msgid "Subtitle %s: %s"
+msgstr "Sous-titres %s : %s"
 
-#: src/player_qt.cpp:2078
-msgid "Display Cross&talk Calibration..."
-msgstr "Calibrage du cross&talk de l'affichage..."
+#: src/media_input.cpp:309
+msgid "No subtitle."
+msgstr "Aucun sous-titre."
 
-#: src/player_qt.cpp:2082
-msgid "&Subtitle Settings..."
-msgstr "Réglage des &sous-titres..."
+#: src/media_input.cpp:311
+#, c-format
+msgid "Duration: %g seconds"
+msgstr "Durée : %g secondes"
 
-#: src/player_qt.cpp:2086
-msgid "Stereoscopic Video Settings..."
-msgstr "Réglages de la vidéo stéréoscopique..."
+#: src/media_input.cpp:314
+#, c-format
+msgid "Stereo layout: %s"
+msgstr "Mode stéréo : %s"
 
-#: src/player_qt.cpp:2089
-msgid "&Help"
-msgstr "Aide"
+#: src/media_object.cpp:677
+#, c-format
+msgid "%s video stream %d: Unsupported stereo layout %s."
+msgstr "%s flux vidéo %d : Arrangement stéréo %s non supporté."
 
-#: src/player_qt.cpp:2090
-msgid "&Manual..."
-msgstr "&Manuel..."
+#: src/media_object.cpp:715
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with %d channels."
+msgstr "%s flux audio %d : Impossible de gérer de l'audio à %d canaux."
 
-#: src/player_qt.cpp:2095
-msgid "&Website..."
-msgstr "Site &web..."
+#: src/media_object.cpp:744
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with sample format %s."
+msgstr ""
+"%s flux audio %d : Impossible de gérer de l'audio au format d'échantillon %s."
 
-#: src/player_qt.cpp:2099
-msgid "&Keyboard Shortcuts"
-msgstr "Raccourcis clavier"
+#: src/media_object.cpp:800
+#, c-format
+msgid "No support available for %s device."
+msgstr "Périphérique %s non supporté."
 
-#: src/player_qt.cpp:2103
-msgid "&About"
-msgstr "&À propos"
+#: src/media_object.cpp:803
+msgid "default"
+msgstr "par défaut"
 
-#: src/player_qt.cpp:2169 src/player_qt.cpp:2891 src/player_qt.cpp:2899
-#: src/video_output_qt.cpp:92 src/video_output_qt.cpp:400
-#: src/video_output_qt.cpp:422
-msgid "Error"
-msgstr "Erreur"
+#: src/media_object.cpp:832
+#, c-format
+msgid "%s: Cannot read stream info: %s"
+msgstr "%s : Impossible de lire l'information du flux : %s"
 
-#: src/player_qt.cpp:2528
-msgid "Open files"
-msgstr "Ouvrir des fichiers"
+#: src/media_object.cpp:876
+#, c-format
+msgid "%s stream %d: Cannot open %s: %s"
+msgstr "%s flux vidéo %d : Impossible d'ouvrir %s : %s"
 
-#: src/player_qt.cpp:2541
-msgid "Open URL"
-msgstr "Ouvrir un URL"
+#: src/media_object.cpp:877
+msgid "video codec"
+msgstr "codec vidéo"
 
-#: src/player_qt.cpp:2542
-msgid "URL:"
-msgstr "URL :"
+#: src/media_object.cpp:878
+msgid "audio codec"
+msgstr "codec audio"
 
-#: src/player_qt.cpp:2689
-msgid "Fullscreen/Multiscreen Settings"
-msgstr "Réglages plein écran/multi-écrans"
+#: src/media_object.cpp:879
+msgid "subtitle codec"
+msgstr "codec de sous-titres"
 
-#: src/player_qt.cpp:2691
-msgid "Configure fullscreen mode:"
-msgstr "Configuration du mode plein écran :"
+#: src/media_object.cpp:880
+msgid "data"
+msgstr "données"
 
-#: src/player_qt.cpp:2692
-msgid "Select the screens to use in fullscreen mode."
-msgstr "Choisir les écrans à utiliser pour le mode plein écran."
+#: src/media_object.cpp:881
+msgid "codec not supported"
+msgstr "codec non supporté"
 
-#: src/player_qt.cpp:2694
-msgid "Single screen:"
-msgstr "Écran unique :"
+#: src/media_object.cpp:891
+#, c-format
+msgid "%s video stream %d: Invalid frame size."
+msgstr "%s flux vidéo %d : Taille de l'image invalide."
 
-#: src/player_qt.cpp:2695
-msgid "Use a single screen for fullscreen mode."
-msgstr "Utiliser un seul écran pour le mode plein écran."
+#: src/media_object.cpp:935
+#, c-format
+msgid "%s video stream %d: Cannot initialize conversion context."
+msgstr "%s flux vidéo %d : Impossible d'initialiser le contexte de conversion."
 
-#: src/player_qt.cpp:2698
-msgid "Primary screen"
-msgstr "Écran primaire"
+#: src/media_object.cpp:998
+#, c-format
+msgid "Video stream %d: %s / %s, %g seconds"
+msgstr "Flux vidéo %d : %s / %s, %g secondes"
 
-#: src/player_qt.cpp:2703 src/player_qt.cpp:2717 src/player_qt.cpp:2718
+#: src/media_object.cpp:1002
 #, c-format
-msgid "Screen %d"
-msgstr "Écran %d"
+msgid "Using up to %d threads for decoding."
+msgstr "Utilisation de maximum %d threads pour le décodage."
 
-#: src/player_qt.cpp:2707
-msgid "Dual screen:"
-msgstr "Double écran :"
+#: src/media_object.cpp:1007
+#, c-format
+msgid "Audio stream %d: %s / %s, %g seconds"
+msgstr "Flux audio %d : %s / %s, %g secondes"
 
-#: src/player_qt.cpp:2708
-msgid "Use two screens for fullscreen mode."
-msgstr "Utiliser deux écrans pour le mode plein écran."
+#: src/media_object.cpp:1014
+#, c-format
+msgid "Subtitle stream %d: %s / %s, %g seconds"
+msgstr "Flux de sous-titres %d : %s / %s, %g secondes"
 
-#: src/player_qt.cpp:2722
-msgid "Multi screen:"
-msgstr "Plein écran :"
+#: src/media_object.cpp:1021
+msgid "No usable streams."
+msgstr "Aucun flux utilisable"
 
-#: src/player_qt.cpp:2723
-msgid "Use multiple screens for fullscreen mode."
-msgstr "Utiliser plusieurs écrans pour le mode plein écran"
+#: src/media_object.cpp:1302 src/media_object.cpp:1332
+#: src/media_object.cpp:1362
+#, c-format
+msgid "%s: Cannot duplicate packet."
+msgstr "%s : Impossible de dupliquer le paquet."
 
-#: src/player_qt.cpp:2725
-msgid "Comma-separated list of screens to use for fullscreen mode."
-msgstr ""
-"Liste d'écrans à utiliser pour le mode plein écran, séparés par des "
-"virgules."
+#: src/media_object.cpp:1456
+#, fuzzy, c-format
+msgid "%s video stream %d: Dropping %dx%d frame"
+msgstr "%s flux vidéo %d : Taille de l'image invalide."
 
-#: src/player_qt.cpp:2729
-msgid "When in fullscreen mode,"
-msgstr "En mode plein écran,"
+#: src/media_object.cpp:1919
+#, c-format
+msgid "%s: Seeking failed."
+msgstr "%s : Échec de la recherche."
 
-#: src/player_qt.cpp:2730
-msgid "Set special left/right view handling for fullscreen mode."
-msgstr ""
-"Réglages spéciaux pour les vues droite et gauche en plein écran."
+#: src/player.cpp:434
+#, fuzzy, c-format
+msgid "Video: delay %g seconds/%g frames; dropping next frame."
+msgstr "Vidéo : retard de %g secondes; image suivante sautée."
 
-#: src/player_qt.cpp:2732
-msgid "flip left view vertically."
-msgstr "flip vertical de la vue gauche"
+#: src/player.cpp:450
+#, c-format
+msgid "FPS: %.2f"
+msgstr "FPS : %.2f"
 
-#: src/player_qt.cpp:2734
-msgid "flop left view horizontally."
-msgstr "flip horizontal de la vue gauche"
+#: src/player_equalizer.cpp:116
+msgid "Reading input frame failed."
+msgstr "Echec de la lecture de l'image d'entrée."
 
-#: src/player_qt.cpp:2736
-msgid "flip right view vertically."
-msgstr "flip vertical de la vue droite"
+#: src/player_equalizer.cpp:165 src/video_output_qt.cpp:590
+#: src/video_output_qt.cpp:597
+msgid "Waiting for subtitle renderer initialization..."
+msgstr "Attente de l'initialisation du rendu des sous-titres..."
 
-#: src/player_qt.cpp:2738
-msgid "flop right view horizontally."
-msgstr "flop horizontal de la vue droite"
+#: src/player_equalizer.cpp:250
+msgid "Init data mapping failed."
+msgstr "Echec du routage des données initiales."
 
-#: src/player_qt.cpp:2891
-msgid "Cannot open manual."
-msgstr "Impossible d'ouvrir le manuel."
+#: src/player_equalizer.cpp:251
+msgid "Frame data mapping failed."
+msgstr "Echec du routage des images."
 
-#: src/player_qt.cpp:2899
-msgid "Cannot open website."
-msgstr "Impossible d'ouvrir le site web."
+#: src/player_equalizer.cpp:252
+msgid "Video player initialization failed."
+msgstr "Echec de l'initialisation du lecteur vidéo."
 
-#: src/player_qt.cpp:2905
-msgid "Keyboard Shortcuts"
-msgstr "Raccourcis clavier"
+#: src/player_equalizer.cpp:253
+msgid "Need at least OpenGL 2.1."
+msgstr "OpenGL 2.1 minimum requis."
 
-#. TRANSLATORS: This is a HTML table, shown under Help->Keyboard Shortcuts.
-#. Please make sure that your translation formats properly.
-#: src/player_qt.cpp:2908
-msgid ""
-"Keyboard control: <table><tr><td>q or ESC</td><td>Stop</td></"
-"tr><tr><td>p or SPACE</td><td>Pause / unpause</td></tr><tr><td>f</"
-"td><td>Toggle fullscreen</td></tr><tr><td>c</td><td>Center window</td></"
-"tr><tr><td>e</td><td>Swap left/right eye</td></tr><tr><td>v</td><td>Cycle "
-"through available video streams</td></tr><tr><td>a</td><td>Cycle through "
-"available audio streams</td></tr><tr><td>s</td><td>Cycle through available "
-"subtitle streams</td></tr><tr><td>1, 2</td><td>Adjust contrast</td></"
-"tr><tr><td>3, 4</td><td>Adjust brightness</td></tr><tr><td>5, 6</"
-"td><td>Adjust hue</td></tr><tr><td>7, 8</td><td>Adjust saturation</td></"
-"tr><tr><td>&lt;, &gt;</td><td>Adjust parallax</td></tr><tr><td>(, )</"
-"td><td>Adjust ghostbusting</td></tr><tr><td>left, right</td><td>Seek 10 "
-"seconds backward / forward</td></tr><tr><td>up, down</td><td>Seek 1 minute "
-"backward / forward</td></tr><tr><td>page up, page down</td><td>Seek 10 "
-"minutes backward / forward</td></tr></table>"
-msgstr ""
-"Contrôle par le clavier: <table><tr><td>q ou ESC</td><td>Stop</td></"
-"tr><tr><td>p ou ESPACE</td><td>Pause / continuer</td></tr><tr><td>f</"
-"td><td>Basculer en plein écran</td></tr><tr><td>c</td><td>Centrer la "
-"fenêtre</td></tr><tr><td>e</td><td>Echanger les yeux gauche/droit</td></"
-"tr><tr><td>v</td><td>Parcourir les flux vidéo disponibles</td></"
-"tr><tr><td>a</td><td>Parcourir les flux audio disponibles</td></"
-"tr><tr><td>s</td><td>Parcourir les flux de sous-titres disponibles</td></"
-"tr><tr><td>1, 2</td><td>Ajuster le contraste</td></tr><tr><td>3, 4</"
-"td><td>Ajuster la luminosité</td></tr><tr><td>5, 6</td><td>Ajuster la "
-"teinte</td></tr><tr><td>7, 8</td><td>Ajuster la saturation</td></"
-"tr><tr><td>&lt;, &gt;</td><td>Ajuster la parallaxe</td></tr><tr><td>(, )</"
-"td><td>Adjuster le ghostbusting</td></tr><tr><td>gauche, droite</"
-"td><td>Avancer / reculer de 10 secondes</td></tr><tr><td>haut, bas</"
-"td><td>Avancer / reculer d'1 minute</td></tr><tr><td>page prec., page suiv.</"
-"td><td>Avancer / reculer de 10 minutes</td></tr></table>"
-
-#: src/player_qt.cpp:2935
-#, c-format
-msgid "About %s"
-msgstr "À propos de %s"
+#: src/player_equalizer.cpp:430
+msgid "No canvas in Equalizer configuration."
+msgstr "Pas de canevas dans la configuration Equalizer."
 
-#: src/player_qt.cpp:2941
-#, c-format
-msgid "The %s 3D video player"
-msgstr "Le lecteur vidéo 3D %s"
+#: src/player_equalizer.cpp:437
+#, fuzzy, c-format
+msgid "Equalizer canvas: %gx%g, aspect ratio %g:1"
+msgstr "%gx%g, facteur d'aspect %g:1"
 
-#: src/player_qt.cpp:2946
-#, c-format
+#: src/player_equalizer.cpp:922 src/video_output_qt.cpp:560
 msgid ""
-"%s version %s.Copyright (C) 2011 the Bino developers.This "
-"is free software. You may redistribute copies of it under the terms of the "
-"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
-"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
-"\"%s\">%s</a> for more information on this software."
+"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
+"objects."
 msgstr ""
-"%s version %s.Copyright (C) 2011 les développeurs Bino.Ceci "
-"est un logiciel libre. Vous pouvez en distribuer des copies sous les termes "
-"de la <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public "
-"License</a>. Il n'y a AUCUNE GARANTIE, dans les limites autorisées par la "
-"loi.Voir <a href=\"%s\">%s</a> pour plus d'informations sur ce "
-"logiciel."
-
-#: src/player_qt.cpp:2983
-msgid "About"
-msgstr "À propos"
+"Cette implémentation OpenGL se supporte pas OpenGL 2.1 et les framebuffer "
+"objects."
 
-#: src/player_qt.cpp:2984
-msgid "Libraries"
-msgstr "Bibliothèques"
+#: src/player_equalizer.cpp:1105
+msgid "Equalizer initialization failed."
+msgstr "Echec de l'initialisation d'Equalizer."
 
-#: src/player_qt.cpp:2985
-msgid "Team"
-msgstr "Équipe"
+#: src/player_equalizer.cpp:1113
+msgid "Cannot get equalizer configuration."
+msgstr "Impossible de lire la configuration d'Equalizer."
 
-#: src/player_qt.cpp:2986
-msgid "License"
-msgstr "Licence"
+#: src/player_equalizer.cpp:1127
+msgid "Equalizer configuration initialization failed."
+msgstr "Echec de l'initialisation de la configuration d'Equalizer."
 
 #: src/subtitle_renderer.cpp:223
 msgid "Cannot initialize LibASS."
@@ -1489,81 +1845,392 @@
 msgid "Subtitle character set conversion failed: %s"
 msgstr "La conversion de jeu de caractère de sous-titres a échoué : %s"
 
-#: src/video_output.cpp:363 src/video_output.cpp:473
-msgid "Cannot create a PBO buffer."
-msgstr "Impossuble de créer un buffer PBO."
-
-#: src/video_output_qt.cpp:313
-#, c-format
-msgid "Cannot initialize GLEW: %s"
-msgstr "Impossible d'initialiser GLEW : %s"
-
-#: src/video_output_qt.cpp:343
-msgid "Please wait"
-msgstr "Veuillez patienter"
-
-#: src/video_output_qt.cpp:400 src/video_output_qt.cpp:417
-msgid "Cannot set OpenGL context format."
-msgstr "Impossible de choisir le format du contexte OpenGL"
-
-#: src/video_output_qt.cpp:412
-msgid "The display does not support OpenGL stereo mode."
-msgstr "L'affichage ne supporte pas le mode OpenGL stéréo"
-
-#: src/video_output_qt.cpp:505
-msgid "Cannot suspend screensaver."
-msgstr "Impossible de suspendre l'économiseur d'écran."
-
-#: src/video_output_qt.cpp:520
-msgid "Cannot resume screensaver."
-msgstr "Impossible de rétablir l'économiseur d'écran."
-
-#: src/xgl.cpp:200
-#, c-format
-msgid "OpenGL FBO error %s."
-msgstr "Erreur OpenGL FBO %s."
-
-#: src/xgl.cpp:217
+#: src/video_output.cpp:145
 #, c-format
 msgid "OpenGL error 0x%04X."
 msgstr "Erreur OpenGL 0x%04X."
 
-#: src/xgl.cpp:282
+#: src/video_output.cpp:203
 #, c-format
 msgid "OpenGL %s '%s': compiler warning:"
 msgstr "OpenGL %s '%s' : avertissement du compilateur :"
 
-#: src/xgl.cpp:283 src/xgl.cpp:292
+#: src/video_output.cpp:204 src/video_output.cpp:209
 msgid "vertex shader"
 msgstr "vertex shader"
 
-#: src/xgl.cpp:284 src/xgl.cpp:293
-msgid "geometry shader"
-msgstr "geometry shader"
-
-#: src/xgl.cpp:285 src/xgl.cpp:294
+#: src/video_output.cpp:204 src/video_output.cpp:209
 msgid "fragment shader"
 msgstr "fragment shader"
 
-#: src/xgl.cpp:291
+#: src/video_output.cpp:208
 #, c-format
 msgid "OpenGL %s '%s': compilation failed."
 msgstr "OpenGL %s '%s' : Échec de la compilation."
 
-#: src/xgl.cpp:296 src/xgl.cpp:363
+#: src/video_output.cpp:211 src/video_output.cpp:288
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: src/xgl.cpp:357
+#: src/video_output.cpp:284
 #, c-format
 msgid "OpenGL program '%s': linker warning:"
 msgstr "Programme OpenGL '%s' : avertissement de l'éditeur de liens."
 
-#: src/xgl.cpp:362
+#: src/video_output.cpp:287
 #, c-format
 msgid "OpenGL program '%s': linking failed."
 msgstr "Programme OpenGL '%s' : erreur de l'éditeur de liens."
 
+#: src/video_output.cpp:563 src/video_output.cpp:675
+msgid "Cannot create a PBO buffer."
+msgstr "Impossuble de créer un buffer PBO."
+
+#: src/video_output_qt.cpp:555
+#, c-format
+msgid "Cannot initialize GLEW: %s"
+msgstr "Impossible d'initialiser GLEW : %s"
+
+#: src/video_output_qt.cpp:588
+msgid "Please wait"
+msgstr "Veuillez patienter"
+
+#: src/video_output_qt.cpp:643
+#, fuzzy
+msgid "Cannot get valid OpenGL context."
+msgstr "Impossible de choisir le format du contexte OpenGL"
+
+#: src/video_output_qt.cpp:654
+msgid "The display does not support OpenGL stereo mode."
+msgstr "L'affichage ne supporte pas le mode OpenGL stéréo"
+
+#: src/video_output_qt.cpp:659
+msgid "Cannot set OpenGL context format."
+msgstr "Impossible de choisir le format du contexte OpenGL"
+
+#: src/video_output_qt.cpp:752
+msgid "Cannot suspend screensaver."
+msgstr "Impossible de suspendre l'économiseur d'écran."
+
+#: src/video_output_qt.cpp:767
+msgid "Cannot resume screensaver."
+msgstr "Impossible de rétablir l'économiseur d'écran."
+
+#~ msgid "Cannot initialize mutex: %s"
+#~ msgstr "Impossible d'initialiser le mutex: %s"
+
+#~ msgid "Cannot lock mutex: %s"
+#~ msgstr "Impossible de verrouiller le mutex: %s"
+
+#~ msgid "Cannot unlock mutex: %s"
+#~ msgstr "Impossible de déverrouiller le mutex: %s"
+
+#~ msgid "Cannot create thread: %s"
+#~ msgstr "Impossible de créer le thread: %s"
+
+#~ msgid "Cannot join with thread: %s"
+#~ msgstr "Impossible de rejoindre le thread: %s"
+
+#~ msgid "Cannot cancel thread: %s"
+#~ msgstr "Impossible d'annuler le thread: %s"
+
+#~ msgid ""
+#~ "Usage:\n"
+#~ " %s [option...] [file...]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --help Print help.\n"
+#~ " --version Print version.\n"
+#~ " -n|--no-gui Do not use the GUI, just show a plain window.\n"
+#~ " -L|--log-level=LEVEL Set log level (debug/info/warning/error/"
+#~ "quiet).\n"
+#~ " --device-type=TYPE Type of input device: default, firewire, x11.\n"
+#~ " --device-frame-size=WxH Request frame size WxH from input device.\n"
+#~ " --device-frame-rate=N/D Request frame rate N/D from input device.\n"
+#~ " --lirc-config=FILE Use the given LIRC configuration file. This\n"
+#~ " option can be used more than once.\n"
+#~ " -v|--video=STREAM Select video stream (1-n, depending on "
+#~ "input).\n"
+#~ " -a|--audio=STREAM Select audio stream (1-n, depending on "
+#~ "input).\n"
+#~ " -s|--subtitle=STREAM Select subtitle stream (0-n, dep. on input).\n"
+#~ " -i|--input=TYPE Select input type (default autodetect):\n"
+#~ " mono Single view.\n"
+#~ " separate-left-right Left/right separate streams, left first.\n"
+#~ " separate-right-left Left/right separate streams, right first.\n"
+#~ " top-bottom Left top, right bottom.\n"
+#~ " top-bottom-half Left top, right bottom, half height.\n"
+#~ " bottom-top Left bottom, right top.\n"
+#~ " bottom-top-half Left bottom, right top, half height.\n"
+#~ " left-right Left left, right right.\n"
+#~ " left-right-half Left left, right right, half width.\n"
+#~ " right-left Left right, right left.\n"
+#~ " right-left-half Left right, right left, half width.\n"
+#~ " even-odd-rows Left even rows, right odd rows.\n"
+#~ " odd-even-rows Left odd rows, right even rows.\n"
+#~ " -o|--output=TYPE Select output type:\n"
+#~ " mono-left Only left.\n"
+#~ " mono-right Only right.\n"
+#~ " top-bottom Left top, right bottom.\n"
+#~ " top-bottom-half Left top, right bottom, half height.\n"
+#~ " left-right Left left, right right.\n"
+#~ " left-right-half Left left, right right, half width.\n"
+#~ " even-odd-rows Left even rows, right odd rows.\n"
+#~ " even-odd-columns Left even columns, right odd columns.\n"
+#~ " checkerboard Left and right in checkerboard pattern.\n"
+#~ " hdmi-frame-pack HDMI frame packing mode.\n"
+#~ " red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
+#~ " red-cyan-half-color Red/cyan anaglyph, half color method.\n"
+#~ " red-cyan-full-color Red/cyan anaglyph, full color method.\n"
+#~ " red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
+#~ " green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
+#~ " green-magenta-half-color Green/magenta anaglyph, half color method.\n"
+#~ " green-magenta-full-color Green/magenta anaglyph, full color method.\n"
+#~ " green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
+#~ " amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
+#~ " amber-blue-half-color Amber/blue anaglyph, half color method.\n"
+#~ " amber-blue-full-color Amber/blue anaglyph, full color method.\n"
+#~ " amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
+#~ " red-green-monochrome Red/green anaglyph, monochrome method.\n"
+#~ " red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
+#~ " stereo OpenGL quad-buffered stereo.\n"
+#~ " equalizer Multi-display via Equalizer (2D setup).\n"
+#~ " equalizer-3d Multi-display via Equalizer (3D setup).\n"
+#~ " -S|--swap-eyes Swap left/right view.\n"
+#~ " -f|--fullscreen Fullscreen.\n"
+#~ " --fullscreen-screens= Use the listed screens in fullscreen mode.\n"
+#~ " [S0[,S1[,...]]] Screen numbers start with 1. The default\n"
+#~ " (empty list) is to use the primary screen.\n"
+#~ " --fullscreen-flip-left Flip left view vertically when fullscreen.\n"
+#~ " --fullscreen-flop-left Flop left view horizontally when fullscreen.\n"
+#~ " --fullscreen-flip-right Flip right view vertically when fullscreen.\n"
+#~ " --fullscreen-flop-right Flop right view horizontally when fullscreen.\n"
+#~ " -c|--center Center window on screen.\n"
+#~ " --subtitle-encoding=ENC Set subtitle encoding.\n"
+#~ " --subtitle-font=FONT Set subtitle font name.\n"
+#~ " --subtitle-size=N Set subtitle font size.\n"
+#~ " --subtitle-scale=S Set subtitle scale factor.\n"
+#~ " --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
+#~ " --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
+#~ " -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
+#~ " -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-"
+#~ "separated\n"
+#~ " values for the R,G,B channels.\n"
+#~ " -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
+#~ " -b|--benchmark Benchmark mode (no audio, show fps).\n"
+#~ " -l|--loop Loop the input media.\n"
+#~ "\n"
+#~ "Interactive control:\n"
+#~ " ESC Leave fullscreen mode, or quit.\n"
+#~ " q Quit.\n"
+#~ " p or SPACE Pause / unpause.\n"
+#~ " f Toggle fullscreen.\n"
+#~ " c Center window.\n"
+#~ " e Swap left/right eye.\n"
+#~ " v Cycle through available video streams.\n"
+#~ " a Cycle through available audio streams.\n"
+#~ " s Cycle through available subtitle streams.\n"
+#~ " 1, 2 Adjust contrast.\n"
+#~ " 3, 4 Adjust brightness.\n"
+#~ " 5, 6 Adjust hue.\n"
+#~ " 7, 8 Adjust saturation.\n"
+#~ " <, > Adjust parallax.\n"
+#~ " (, ) Adjust ghostbusting.\n"
+#~ " left, right Seek 10 seconds backward / forward.\n"
+#~ " up, down Seek 1 minute backward / forward.\n"
+#~ " page up, page down Seek 10 minutes backward / forward.\n"
+#~ " Mouse click Seek according to horizontal click position."
+#~ msgstr ""
+#~ "Utilisation :\n"
+#~ " %s [option...] [fichier...]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --help Afficher l'aide.\n"
+#~ " --version Afficher la version.\n"
+#~ " -n|--no-gui Ne pas utiliser l'IHM, afficher une fenêtre "
+#~ "simple.\n"
+#~ " -L|--log-level=LEVEL Niveau de détail du journal (debug/info/"
+#~ "warning/error/quiet).\n"
+#~ " --device-type=TYPE Type de périphérique d'entrée: default, "
+#~ "firewire, x11.\\n\"\n"
+#~ " --device-frame-size=WxH Demande la résolution WxH au périphérique "
+#~ "d'entrée.\\n\"\n"
+#~ " --device-frame-rate=N/D Demande le taux de rafraichissement N/D au "
+#~ "périphérique d'entrée.\\n\"\n"
+#~ " --lirc-config=FILE Utilise le fichier de configuration LIRC "
+#~ "donné. Cette\\n\"\n"
+#~ " option peut être utilisée plusieurs fois.\\n"
+#~ "\"\n"
+#~ " -v|--video=STREAM Sélectionner le flux vidéo (1-n, selon "
+#~ "l'entrée).\n"
+#~ " -a|--audio=STREAM Sélectionner le flux audio (1-n, selon "
+#~ "l'entrée).\n"
+#~ " -s|--subtitle=STREAM Sélectionner le flux de sous-titres (0-n, "
+#~ "selon l'entrée).\n"
+#~ " -i|--input=TYPE Sélectionner le type d'entrée (auto-détection "
+#~ "par défaut):\n"
+#~ " mono Une seule vue.\n"
+#~ " separate-left-right Flux gauche/droit séparés, gauche d'abord.\n"
+#~ " separate-right-left Flux gauche/droit séparés, droit d'abord.\n"
+#~ " top-bottom Gauche en haut, droit en bas.\n"
+#~ " top-bottom-half Gauche en haut, droit en bas, demi-hauteur.\n"
+#~ " bottom-top Gauche en bas, droit en haut.\n"
+#~ " bottom-top-half Gauche en bas, droit en haut, demi-hauteur.\n"
+#~ " left-right Gauche à gauche, droit à droite.\n"
+#~ " left-right-half Gauche à gauche, droit à droite, demi-"
+#~ "largeur.\n"
+#~ " right-left Gauche à droite, droit à gauche.\n"
+#~ " right-left-half Gauche à droite, droit à gauche, demi-"
+#~ "largeur.\n"
+#~ " even-odd-rows Gauche sur les lignes paires, droit sur les "
+#~ "lignes impaires.\n"
+#~ " odd-even-rows Gauche sur les lignes impaires, droit sur "
+#~ "les lignes paires.\n"
+#~ " -o|--output=TYPE Sélectionner le type de sortie :\n"
+#~ " mono-left Gauche seulement.\n"
+#~ " mono-right Droit seulement.\n"
+#~ " top-bottom Gauche en haut, droit en bas.\n"
+#~ " top-bottom-half Gauche en haut, droit en bas, demi-hauteur.\n"
+#~ " left-right Gauche à gauche, droit à droite.\n"
+#~ " left-right-half Gauche à gauche, droit à droite, demi-"
+#~ "largeur.\n"
+#~ " even-odd-rows Gauche sur les lignes paires, droit sur les "
+#~ "lignes impaires.\n"
+#~ " even-odd-columns Gauche sur les colonnes paires, droit sur "
+#~ "les colonnes impaires.\n"
+#~ " checkerboard Gauche et droit en damier.\n"
+#~ " hdmi-frame-pack Mode HDMI frame packing.\n"
+#~ " red-cyan-monochrome Anaglyphe rouge/cyan, méthode monochrome.\n"
+#~ " red-cyan-half-color Anaglyphe rouge/cyan, méthode demi-couleur.\n"
+#~ " red-cyan-full-color Anaglyphe rouge/cyan, méthode pleine "
+#~ "couleur.\n"
+#~ " red-cyan-dubois Anaglyphe rouge/cyan, méthode Dubois.\n"
+#~ " green-magenta-monochrome Anaglyphe vert/magenta, méthode monochrome.\n"
+#~ " green-magenta-half-color Anaglyphe vert/magenta, méthode demi-"
+#~ "couleur.\n"
+#~ " green-magenta-full-color Anaglyphe vert/magenta, méthode pleine "
+#~ "couleur.\n"
+#~ " green-magenta-dubois Anaglyphe vert/magenta, méthode Dubois.\n"
+#~ " amber-blue-monochrome Anaglyphe ambre/bleu, méthode monochrome.\n"
+#~ " amber-blue-half-color Anaglyphe ambre/bleu, méthode demi-couleur.\n"
+#~ " amber-blue-full-color Anaglyphe ambre/bleu, méthode pleine "
+#~ "couleur.\n"
+#~ " amber-blue-dubois Anaglyphe ambre/bleu, méthode Dubois.\n"
+#~ " red-green-monochrome Anaglyphe rouge/vert, méthode monochrome.\n"
+#~ " red-blue-monochrome Anaglyphe rouge/bleu, méthode monochrome.\n"
+#~ " stereo Stéréo OpenGL quadruple buffer.\n"
+#~ " equalizer Multi-affichage par Equalizer (configuration "
+#~ "2D).\n"
+#~ " equalizer-3d Multi-affichage par Equalizer (configuration "
+#~ "3D).\n"
+#~ " -S|--swap-eyes Echanger les vues gauche et droite.\n"
+#~ " -f|--fullscreen Plein écran.\n"
+#~ " --fullscreen-screens= Utiliser les écrans désignés pour le plein "
+#~ "écran.\n"
+#~ " [S0[,S1[,...]]] La numérotation commence à 1. Utilisation\n"
+#~ " de l'écran primaire par défaut.\n"
+#~ " --fullscreen-flip-left Flip vertical de la vue gauche en plein "
+#~ "écran.\n"
+#~ " --fullscreen-flop-left Flop horizontal de la vue gauche en plein "
+#~ "écran.\n"
+#~ " --fullscreen-flip-right Flip vertical de la vue droite en plein "
+#~ "écran.\n"
+#~ " --fullscreen-flop-right Flop horizontal de la vue droite en plein "
+#~ "écran.\n"
+#~ " -c|--center Centrer la fenêtre sur l'écran.\n"
+#~ " --subtitle-encoding=ENC Régler l'encodage des sous-titres.\n"
+#~ " --subtitle-font=FONT Régler le nom de la fonte des sous-titres.\n"
+#~ " --subtitle-size=N Régler la taille de la fonte des sous-titres.\n"
+#~ " --subtitle-scale=S Régler le facteur d'échelle des sous-titres.\n"
+#~ " --subtitle-color=COLOR Régler la couleur des sous-titres, au format "
+#~ "[AA]RRVVBB.\n"
+#~ " --subtitle-parallax=VAL Ajustement de la parallaxe des sous-titres (-1 "
+#~ "à +1).\n"
+#~ " -P|--parallax=VAL Ajustement de la parallaxe (-1 à +1).\n"
+#~ " -C|--crosstalk=VAL Niveau de fuite du crosstalk (0 à 1); valeurs "
+#~ "séparées\n"
+#~ " par des virgules pour les canaux R,V,B.\n"
+#~ " -G|--ghostbust=VAL Niveau d'élimination du crosstalk à appliquer "
+#~ "(0 à 1).\n"
+#~ " -b|--benchmark Mode banc d'essai (pas d'audio, afficher les "
+#~ "fps).\n"
+#~ " -l|--loop Lecture en bloucle.\n"
+#~ "\n"
+#~ "Contrôle interactif :\n"
+#~ " q ou ESC Quitter.\n"
+#~ " p ou ESPACE Pause / continuer.\n"
+#~ " f Basculer le mode plein écran.\n"
+#~ " c Centrer la fenêtre.\n"
+#~ " e Echanger les yeux droit et gauche.\n"
+#~ " v Parcourir les flux vidéo disponibles.\n"
+#~ " a Parcourir les flux audio disponibles.\n"
+#~ " s Parcourir les flux de sous-titres "
+#~ "disponibles.\n"
+#~ " 1, 2 Ajuster le contraste.\n"
+#~ " 3, 4 Ajuster la luminosité.\n"
+#~ " 5, 6 Ajuster la teinte.\n"
+#~ " 7, 8 Ajuster la saturation.\n"
+#~ " <, > Ajuster la parallaxe.\n"
+#~ " (, ) Ajuster le ghostbusting.\n"
+#~ " gauche, droite Avancer/reculer de 10 secondes.\n"
+#~ " haut, bas Avancer/reculer de 1 minute.\n"
+#~ " page prec., page suiv. Avancer/reculer de 10 minutes.\n"
+#~ " Clic souris Aller à la position définie par l'abscisse du "
+#~ "clic."
+
+#~ msgid "Equalizer canvas:"
+#~ msgstr "Canevas Equalizer :"
+
+#~ msgid "Area for %g:1 video: [ %g %g %g %g @ %g ]"
+#~ msgstr "Région pour vidéo %g:1 : [ %g %g %g %g @ %g ]"
+
+#~ msgid "Stereoscopic Video Settings"
+#~ msgstr "Réglages de la vidéo stéréoscopique"
+
+#~ msgid "&Open..."
+#~ msgstr "&Ouvrir..."
+
+#~ msgid "URL:"
+#~ msgstr "URL :"
+
+#~ msgid ""
+#~ "Keyboard control: <table><tr><td>q or ESC</td><td>Stop</td></"
+#~ "tr><tr><td>p or SPACE</td><td>Pause / unpause</td></tr><tr><td>f</"
+#~ "td><td>Toggle fullscreen</td></tr><tr><td>c</td><td>Center window</td></"
+#~ "tr><tr><td>e</td><td>Swap left/right eye</td></tr><tr><td>v</td><td>Cycle "
+#~ "through available video streams</td></tr><tr><td>a</td><td>Cycle through "
+#~ "available audio streams</td></tr><tr><td>s</td><td>Cycle through "
+#~ "available subtitle streams</td></tr><tr><td>1, 2</td><td>Adjust contrast</"
+#~ "td></tr><tr><td>3, 4</td><td>Adjust brightness</td></tr><tr><td>5, 6</"
+#~ "td><td>Adjust hue</td></tr><tr><td>7, 8</td><td>Adjust saturation</td></"
+#~ "tr><tr><td>&lt;, &gt;</td><td>Adjust parallax</td></tr><tr><td>(, )</"
+#~ "td><td>Adjust ghostbusting</td></tr><tr><td>left, right</td><td>Seek 10 "
+#~ "seconds backward / forward</td></tr><tr><td>up, down</td><td>Seek 1 "
+#~ "minute backward / forward</td></tr><tr><td>page up, page down</"
+#~ "td><td>Seek 10 minutes backward / forward</td></tr></table>"
+#~ msgstr ""
+#~ "Contrôle par le clavier: <table><tr><td>q ou ESC</td><td>Stop</td></"
+#~ "tr><tr><td>p ou ESPACE</td><td>Pause / continuer</td></tr><tr><td>f</"
+#~ "td><td>Basculer en plein écran</td></tr><tr><td>c</td><td>Centrer la "
+#~ "fenêtre</td></tr><tr><td>e</td><td>Echanger les yeux gauche/droit</td></"
+#~ "tr><tr><td>v</td><td>Parcourir les flux vidéo disponibles</td></"
+#~ "tr><tr><td>a</td><td>Parcourir les flux audio disponibles</td></"
+#~ "tr><tr><td>s</td><td>Parcourir les flux de sous-titres disponibles</td></"
+#~ "tr><tr><td>1, 2</td><td>Ajuster le contraste</td></tr><tr><td>3, 4</"
+#~ "td><td>Ajuster la luminosité</td></tr><tr><td>5, 6</td><td>Ajuster la "
+#~ "teinte</td></tr><tr><td>7, 8</td><td>Ajuster la saturation</td></"
+#~ "tr><tr><td>&lt;, &gt;</td><td>Ajuster la parallaxe</td></tr><tr><td>(, )</"
+#~ "td><td>Adjuster le ghostbusting</td></tr><tr><td>gauche, droite</"
+#~ "td><td>Avancer / reculer de 10 secondes</td></tr><tr><td>haut, bas</"
+#~ "td><td>Avancer / reculer d'1 minute</td></tr><tr><td>page prec., page "
+#~ "suiv.</td><td>Avancer / reculer de 10 minutes</td></tr></table>"
+
+#~ msgid "OpenGL FBO error %s."
+#~ msgstr "Erreur OpenGL FBO %s."
+
+#~ msgid "geometry shader"
+#~ msgstr "geometry shader"
+
 #~ msgid "Unknown exception."
 #~ msgstr "Exception inconnue."

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

bino-1.2.1.tar.bz2/po/pl.po -> bino-1.3.2.tar.xz/po/pl.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.3\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2011-10-10 21:25+0200\n"
+"POT-Creation-Date: 2012-03-16 19:49+0100\n"
 "PO-Revision-Date: 2011-08-31 10:48+0100\n"
 "Last-Translator: Robert Pliszko <plesken@systems-design.eu>\n"
 "Language-Team: Bino Developers <bino-list@nongnu.org>\n"
@@ -21,1444 +21,1807 @@
 "X-Poedit-Country: POLAND\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/base/dbg.cpp:50
+#: src/base/dbg.cpp:49
 #, c-format
 msgid "Caught signal %d (%s). Aborting."
 msgstr "Niedozwolony sygnał %d (%s). Zatrzymywanie."
 
-#: src/base/dbg.cpp:57
+#: src/base/dbg.cpp:56
 msgid "Unexpected exception."
 msgstr "Niespodziewany wyjątek."
 
 #. TRANSLATORS: %s will be a mail address.
-#: src/base/dbg.cpp:145
+#: src/base/dbg.cpp:221
 #, c-format
 msgid "Report bugs to <%s>."
 msgstr "Raportuj błędy do <%s>."
 
-#: src/base/exc.cpp:54 src/base/exc.cpp:72 src/base/exc.cpp:106
+#: src/base/exc.cpp:52 src/base/exc.cpp:70 src/base/exc.cpp:104
 #, c-format
 msgid "Exception: %s"
 msgstr "Wyjątek: %s"
 
-#: src/base/opt.cpp:151
+#: src/base/opt.cpp:168
 #, c-format
 msgid "Invalid option %s."
 msgstr "Nieznana opcja %s."
 
-#: src/base/opt.cpp:155
+#: src/base/opt.cpp:172
 #, c-format
 msgid "Option --%s does not take an argument."
 msgstr "Opcja --%s nie przyjmuje żadnego argumentu."
 
-#: src/base/opt.cpp:160
+#: src/base/opt.cpp:177
 #, c-format
 msgid "Invalid option -%c."
 msgstr "Nieznana opcja -%c."
 
-#: src/base/opt.cpp:169
+#: src/base/opt.cpp:186
 #, c-format
 msgid "Option --%s requires an argument."
 msgstr "Opcja --%s wymaga argumentu."
 
-#: src/base/opt.cpp:174
+#: src/base/opt.cpp:191
 #, c-format
 msgid "Option -%c requires an argument."
 msgstr "Opcja -%c wymaga argumentu."
 
-#: src/base/opt.cpp:195
+#: src/base/opt.cpp:212
 #, c-format
 msgid "Invalid argument for -%c."
 msgstr "Nieznany argument dla -%c."
 
-#: src/base/opt.cpp:199
+#: src/base/opt.cpp:216
 #, c-format
 msgid "Invalid argument for --%s."
 msgstr "Nieznany argument dla --%s."
 
-#: src/base/opt.cpp:218
+#: src/base/opt.cpp:239
 #, c-format
 msgid "Option --%s (-%c) is mandatory."
 msgstr "Opcja --%s (-%c) jest wymagana."
 
-#: src/base/opt.cpp:222
+#: src/base/opt.cpp:243
 #, c-format
 msgid "Option --%s is mandatory."
 msgstr "Opcja --%s jest wymagana."
 
-#: src/base/opt.cpp:236
+#: src/base/opt.cpp:257
 msgid "Too few arguments."
 msgstr "Za mało parametrów."
 
-#: src/base/opt.cpp:241
+#: src/base/opt.cpp:262
 msgid "Too many arguments."
 msgstr "Za dużo parametrów."
 
-#: src/base/str.cpp:226
+#: src/base/str.cpp:236
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Nie można skonwertować tekstu do %s."
 
-#: src/base/str.cpp:411 src/base/str.cpp:429 src/base/str.cpp:439
-#: src/base/str.cpp:450
+#: src/base/str.cpp:455 src/base/str.cpp:473 src/base/str.cpp:483
+#: src/base/str.cpp:494 src/base/str.cpp:499
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Nie można skonwertować %s do %s."
 
-#: src/base/thread.cpp:40 src/base/thread.cpp:51
-#, c-format
-msgid "Cannot initialize mutex: %s"
-msgstr "Nie można zainicjować mutex: %s"
-
-#: src/base/thread.cpp:65
-#, c-format
-msgid "Cannot lock mutex: %s"
-msgstr "Nie można zablokować mutex: %s"
-
-#: src/base/thread.cpp:79
-#, c-format
-msgid "Cannot unlock mutex: %s"
-msgstr "Nie można odblokować mutex: %s"
-
-#: src/base/thread.cpp:145
-#, c-format
-msgid "Cannot create thread: %s"
-msgstr "Nie można utworzyć wątku: %s"
-
-#: src/base/thread.cpp:160
-#, c-format
-msgid "Cannot join with thread: %s"
-msgstr "Nie można podłączyć się do wątku: %s"
-
-#: src/base/thread.cpp:182
-#, c-format
-msgid "Cannot cancel thread: %s"
-msgstr "Nie można anulować wyjątku: %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
+msgid "System function failed: "
+msgstr ""
 
-#: src/base/timer.cpp:69 src/base/timer.cpp:81 src/base/timer.cpp:95
+#: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
 msgid "Cannot get time."
 msgstr "Nie można pobrać czasu."
 
-#: src/audio_output.cpp:61
+#: src/audio_output.cpp:88
 msgid "No OpenAL device available."
 msgstr "Urządzenie OpenAL jest niedostępne."
 
-#: src/audio_output.cpp:66
+#: src/audio_output.cpp:93 src/audio_output.cpp:99
+#, fuzzy, c-format
+msgid "OpenAL device '%s' is not available."
+msgstr "Urządzenie OpenAL jest niedostępne."
+
+#: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
+#: src/media_data.cpp:1067 src/media_data.cpp:1090 src/media_data.cpp:1128
+#: src/media_data.cpp:1133
+msgid "unknown"
+msgstr "nieznany"
+
+#: src/audio_output.cpp:106
 msgid "No OpenAL context available."
 msgstr "Brak kontekstu OpenAL."
 
-#: src/audio_output.cpp:77
+#: src/audio_output.cpp:117
 msgid "Cannot create OpenAL buffers."
 msgstr "Nie można stworzyć buforów dla OpenAL."
 
-#: src/audio_output.cpp:86
+#: src/audio_output.cpp:126
 msgid "Cannot create OpenAL source."
 msgstr "Nie można utworzyć źródła dla OpenAL."
 
-#: src/audio_output.cpp:99
+#: src/audio_output.cpp:139
 msgid "Cannot set OpenAL source parameters."
 msgstr "Nie można ustawić parametrów dla OpenAL."
 
-#: src/audio_output.cpp:153
+#: src/audio_output.cpp:193
 msgid "Cannot check OpenAL source state."
 msgstr "Nie można określić stanu OpenAL."
 
-#: src/audio_output.cpp:160
+#: src/audio_output.cpp:200
 msgid "Cannot restart OpenAL source playback."
 msgstr "Nie można zrestartować źródła odtwarzania OpenAL."
 
-#: src/audio_output.cpp:313
+#: src/audio_output.cpp:353
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr "Nie ma dostępnego formatu OpenAL dla danych audio %s."
 
-#: src/audio_output.cpp:340
+#: src/audio_output.cpp:369
+#, fuzzy
+msgid "Cannot set OpenAL audio volume."
+msgstr "Nie można utworzyć źródła dla OpenAL."
+
+#: src/audio_output.cpp:395
 msgid "Cannot buffer initial OpenAL data."
 msgstr "Nie można zainicjować buforów dla danych OpenAL."
 
-#: src/audio_output.cpp:354
+#: src/audio_output.cpp:409
 msgid "Cannot buffer OpenAL data."
 msgstr "Nie można buforować danych OpenAL."
 
-#: src/audio_output.cpp:379
+#: src/audio_output.cpp:434
 msgid "Cannot start OpenAL source playback."
 msgstr "Nie można uruchomić odtwarzania źródła OpenAL."
 
-#: src/audio_output.cpp:393
+#: src/audio_output.cpp:448
 msgid "Cannot pause OpenAL source playback."
 msgstr "Nie można wstrzymać odtwarzania źródła OpenAL."
 
-#: src/audio_output.cpp:402
+#: src/audio_output.cpp:457
 msgid "Cannot unpause OpenAL source playback."
 msgstr "Nie można ponownie uruchomić odtwarzania źródła OpenAL."
 
-#: src/audio_output.cpp:411
+#: src/audio_output.cpp:466
 msgid "Cannot stop OpenAL source playback."
 msgstr "Nie można zatrzymać odtwarzania źródła OpenAL."
 
-#: src/audio_output.cpp:422
+#: src/audio_output.cpp:477
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Nie można odkolejkować źródła buforów OpenAL."
 
-#: src/lib_versions.cpp:121 src/lib_versions.cpp:158 src/media_data.cpp:422
-#: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
-msgid "unknown"
-msgstr "nieznany"
-
-#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
-msgid "not used"
-msgstr "nie używany"
+#: src/dispatch.cpp:156
+msgid "Cannot connect to X server."
+msgstr "Nie można połączyć się z X serwerem."
 
-#: src/lirc.cpp:63
-msgid "Cannot initialize LIRC."
-msgstr "Nie można zainicjować LIRC."
+#: src/dispatch.cpp:171
+msgid "No video to play."
+msgstr "Brak video do odtwarzania."
 
-#: src/lirc.cpp:69
-msgid "Cannot set LIRC socket properties."
-msgstr "Nie można ustawić właściwości gniazda LIRC."
+#: src/dispatch.cpp:411 src/player_equalizer.cpp:84
+msgid "No video streams found."
+msgstr "Brak strumieni video."
 
-#: src/lirc.cpp:76
-msgid "Cannot read LIRC default configuration."
-msgstr "Nie można odczytać konfiguracji domyślnej LIRC."
+#: src/dispatch.cpp:428
+msgid "Cannot set requested stereo layout: incompatible media."
+msgstr "Nie można ustawić narzuconego planu stereo: niekompatybilne media."
 
-#: src/lirc.cpp:91
+#: src/dispatch.cpp:443
 #, c-format
-msgid "Cannot read LIRC configuration file %s."
-msgstr "Nie można odczytać pliku konfiguracyjnego LIRC %s."
+msgid "Video stream %d not found."
+msgstr "Strumień video %d nie znaleziony."
 
-#: src/lirc.cpp:140
-msgid "Cannot get LIRC event; disabling LIRC support."
-msgstr "Nie można pobrać zdarzenia; wyłączenie obsługi LIRC."
+#: src/dispatch.cpp:449
+#, c-format
+msgid "Audio stream %d not found."
+msgstr "Strumień audio %d nie znaleziony."
 
-#: src/lirc.cpp:154
+#: src/dispatch.cpp:457
 #, c-format
-msgid "Received invalid command '%s' from LIRC."
-msgstr "Błędna odebrana komenda LIRC '%s'."
+msgid "Subtitle stream %d not found."
+msgstr "Strumień napisów %d nie znaleziony."
 
-#: src/lirc.cpp:164
-msgid "Cannot get command for LIRC code."
-msgstr "Nie można pobrać komendy z LIRC."
+#: src/dispatch.cpp:529 src/main.cpp:736
+msgid "This version of Bino was compiled without support for Equalizer."
+msgstr "Ta wersja bino została skompilowana bez obsługi korektora."
 
-#: src/main.cpp:325
-#, c-format
-msgid "%s version %s"
-msgstr "%s wersja %s"
+#: src/gui.cpp:101
+msgid "Video:"
+msgstr "Video:"
 
-#: src/main.cpp:326
-msgid "Copyright (C) 2011 the Bino developers."
-msgstr "Copyright (C) 2011 deweloperzy Bino."
+#: src/gui.cpp:102
+msgid "Select the video stream."
+msgstr "Wybierz strumień video."
 
-#: src/main.cpp:327
-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 ""
-"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."
+#: src/gui.cpp:108
+msgid "Audio:"
+msgstr "Dźwięk :"
 
-#: src/main.cpp:330 src/player_qt.cpp:2958
-msgid "Platform:"
-msgstr "Platforma:"
+#: src/gui.cpp:109
+msgid "Select the audio stream."
+msgstr "Wybierz strumień audio."
 
-#: src/main.cpp:332 src/player_qt.cpp:2959
-msgid "Libraries used:"
-msgstr "Użyte biblioteki:"
+#: src/gui.cpp:115
+msgid "Subtitle:"
+msgstr "Napisy:"
 
-#. TRANSLATORS: This is the --help text. Translate only the description,
-#. not the option names. Please keep a proper indentation with spaces, and
-#. keep the line length limited.
-#: src/main.cpp:344
-#, c-format
-msgid ""
-"Usage:\n"
-" %s [option...] [file...]\n"
-"\n"
-"Options:\n"
-" --help Print help.\n"
-" --version Print version.\n"
-" -n|--no-gui Do not use the GUI, just show a plain window.\n"
-" -L|--log-level=LEVEL Set log level (debug/info/warning/error/quiet).\n"
-" --device-type=TYPE Type of input device: default, firewire, x11.\n"
-" --device-frame-size=WxH Request frame size WxH from input device.\n"
-" --device-frame-rate=N/D Request frame rate N/D from input device.\n"
-" --lirc-config=FILE Use the given LIRC configuration file. This\n"
-" option can be used more than once.\n"
-" -v|--video=STREAM Select video stream (1-n, depending on input).\n"
-" -a|--audio=STREAM Select audio stream (1-n, depending on input).\n"
-" -s|--subtitle=STREAM Select subtitle stream (0-n, dep. on input).\n"
-" -i|--input=TYPE Select input type (default autodetect):\n"
-" mono Single view.\n"
-" separate-left-right Left/right separate streams, left first.\n"
-" separate-right-left Left/right separate streams, right first.\n"
-" top-bottom Left top, right bottom.\n"
-" top-bottom-half Left top, right bottom, half height.\n"
-" bottom-top Left bottom, right top.\n"
-" bottom-top-half Left bottom, right top, half height.\n"
-" left-right Left left, right right.\n"
-" left-right-half Left left, right right, half width.\n"
-" right-left Left right, right left.\n"
-" right-left-half Left right, right left, half width.\n"
-" even-odd-rows Left even rows, right odd rows.\n"
-" odd-even-rows Left odd rows, right even rows.\n"
-" -o|--output=TYPE Select output type:\n"
-" mono-left Only left.\n"
-" mono-right Only right.\n"
-" top-bottom Left top, right bottom.\n"
-" top-bottom-half Left top, right bottom, half height.\n"
-" left-right Left left, right right.\n"
-" left-right-half Left left, right right, half width.\n"
-" even-odd-rows Left even rows, right odd rows.\n"
-" even-odd-columns Left even columns, right odd columns.\n"
-" checkerboard Left and right in checkerboard pattern.\n"
-" hdmi-frame-pack HDMI frame packing mode.\n"
-" red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
-" red-cyan-half-color Red/cyan anaglyph, half color method.\n"
-" red-cyan-full-color Red/cyan anaglyph, full color method.\n"
-" red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
-" green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
-" green-magenta-half-color Green/magenta anaglyph, half color method.\n"
-" green-magenta-full-color Green/magenta anaglyph, full color method.\n"
-" green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
-" amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
-" amber-blue-half-color Amber/blue anaglyph, half color method.\n"
-" amber-blue-full-color Amber/blue anaglyph, full color method.\n"
-" amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
-" red-green-monochrome Red/green anaglyph, monochrome method.\n"
-" red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
-" stereo OpenGL quad-buffered stereo.\n"
-" equalizer Multi-display via Equalizer (2D setup).\n"
-" equalizer-3d Multi-display via Equalizer (3D setup).\n"
-" -S|--swap-eyes Swap left/right view.\n"
-" -f|--fullscreen Fullscreen.\n"
-" --fullscreen-screens= Use the listed screens in fullscreen mode.\n"
-" [S0[,S1[,...]]] Screen numbers start with 1. The default\n"
-" (empty list) is to use the primary screen.\n"
-" --fullscreen-flip-left Flip left view vertically when fullscreen.\n"
-" --fullscreen-flop-left Flop left view horizontally when fullscreen.\n"
-" --fullscreen-flip-right Flip right view vertically when fullscreen.\n"
-" --fullscreen-flop-right Flop right view horizontally when fullscreen.\n"
-" -c|--center Center window on screen.\n"
-" --subtitle-encoding=ENC Set subtitle encoding.\n"
-" --subtitle-font=FONT Set subtitle font name.\n"
-" --subtitle-size=N Set subtitle font size.\n"
-" --subtitle-scale=S Set subtitle scale factor.\n"
-" --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
-" --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
-" -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
-" -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-separated\n"
-" values for the R,G,B channels.\n"
-" -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
-" -b|--benchmark Benchmark mode (no audio, show fps).\n"
-" -l|--loop Loop the input media.\n"
-"\n"
-"Interactive control:\n"
-" ESC Leave fullscreen mode, or quit.\n"
-" q Quit.\n"
-" p or SPACE Pause / unpause.\n"
-" f Toggle fullscreen.\n"
-" c Center window.\n"
-" e Swap left/right eye.\n"
-" v Cycle through available video streams.\n"
-" a Cycle through available audio streams.\n"
-" s Cycle through available subtitle streams.\n"
-" 1, 2 Adjust contrast.\n"
-" 3, 4 Adjust brightness.\n"
-" 5, 6 Adjust hue.\n"
-" 7, 8 Adjust saturation.\n"
-" <, > Adjust parallax.\n"
-" (, ) Adjust ghostbusting.\n"
-" left, right Seek 10 seconds backward / forward.\n"
-" up, down Seek 1 minute backward / forward.\n"
-" page up, page down Seek 10 minutes backward / forward.\n"
-" Mouse click Seek according to horizontal click position."
-msgstr ""
-"Użycie:\n"
-" %s [opcje...] [plik...]\n"
-"\n"
-"Opcje:\n"
-" --help Wyświetla pomoc.\n"
-" --version Wyświetla wersję.\n"
-" -n|--no-gui Nie używaj GUI, tylko pokazuje okno.\n"
-" -L|--log-level=LEVEL Ustaw poziom logów (debug/info/warning/error/"
-"quiet).\n"
-" --device-type=TYPE Typ wejściowego urządzenia: default, firewire, "
-"x11.\n"
-" --device-frame-size=WxH Wymagany rozmiar ramki WxH z urządzenia "
-"wejściowego.\n"
-" --device-frame-rate=N/D Wymagana wartość odświeżania ramki N/D z "
-"urządzenia wejściowego.\n"
-" --lirc-config=FILE Użyj podanego pliku konfiguracyjnego. Ta\n"
-" opcja może być użyta więcej niż jeden raz.\n"
-" -v|--video=STREAM Wybierz strumień video (1-n, zależnie od "
-"wejścia).\n"
-" -a|--audio=STREAM Wybierz strumień audio (1-n, zależnie od "
-"wejścia).\n"
-" -s|--subtitle=STREAM Select subtitle stream (0-n, zależnie od "
-"wejście).\n"
-" -i|--input=TYPE Wybór typu wejścia (domyślnie: autodetekcja):\n"
-" mono Pojedyńczy strumien.\n"
-" separate-left-right Lewy/prawy oddzielne strumienie, lewy "
-"pierwszy.\n"
-" separate-right-left Lewy/prawy oddzielne strumienie, prawy "
-"pierwszy.\n"
-" top-bottom Lewy góra, prawy dół.\n"
-" top-bottom-half Lewy góra, prawy dół, połowa wysokości.\n"
-" bottom-top Lewy dół, prawy góra.\n"
-" bottom-top-half Lewy dół, prawy góra, połowa wysokości.\n"
-" left-right Lewy lewy, prawy prawy.\n"
-" left-right-half Lewy lewy, prawy prawy, połowa szerokości.\n"
-" right-left Lewy prawy, prawy lewy.\n"
-" right-left-half Lewy prawy, prawy lewy, połowa szerokości.\n"
-" even-odd-rows Lewy parzysty rząd, prawy nieparzysty rząd.\n"
-" odd-even-rows Lewy nieparzysty rząd, prawy parzysty rząd.\n"
-" -o|--output=TYPE Wybór typu wyjścia:\n"
-" mono-left Tylko lewy.\n"
-" mono-right Tylko prawy.\n"
-" top-bottom Lewy góra, prawy dół.\n"
-" top-bottom-half Lewy góra, prawy dół, połowa wysokości.\n"
-" left-right Lewy lewy, prawy prawy.\n"
-" left-right-half Lewy lewy, prawy prawy, połowa szerokości.\n"
-" even-odd-rows Lewy parzysty rząd, prawy nieparzysty rząd.\n"
-" even-odd-columns Lewy parzyste kolumny, prawy nieparzyste "
-"kolumny.\n"
-" checkerboard Lewy i prawy jako wzór szachownicy.\n"
-" hdmi-frame-pack Tryb opakowanej ramki HDMI.\n"
-" red-cyan-monochrome Czerwony/cyjan - anaglif, czarnobiały.\n"
-" red-cyan-half-color Czerwony/cyjan - anaglif, połowa koloru.\n"
-" red-cyan-full-color Czerwony/cyjan - anaglif, pełny kolor.\n"
-" red-cyan-dubois Czerwony/cyjan - anaglif, Dubois.\n"
-" green-magenta-monochrome Zielony/karmazynowy - anaglif, czarnobiały.\n"
-" green-magenta-half-color Zielony/karmazynowy - anaglif, połowa koloru.\n"
-" green-magenta-full-color Zielony/karmazynowy - anaglif, pełny kolor.\n"
-" green-magenta-dubois Zielony/karmazynowy - anaglif, Dubois.\n"
-" amber-blue-monochrome Bursztyn/niebieski - anaglif, monochrome "
-"method.\n"
-" amber-blue-half-color Bursztyn/niebieski - anaglif, połowa koloru.\n"
-" amber-blue-full-color Bursztyn/niebieski - anaglif, pełny kolor.\n"
-" amber-blue-dubois Bursztyn/niebieski - anaglif, Dubois.\n"
-" red-green-monochrome Czerwony/zielony - anaglif, czarnobiały.\n"
-" red-blue-monochrome Czerwony/niebieski - anaglif, czarnobiały.\n"
-" stereo OpenGL quad-buffered stereo.\n"
-" equalizer Multi-display przez Equalizer (ustawianie 2D).\n"
-" equalizer-3d Multi-display via Equalizer (ustawianie 3D).\n"
-" -S|--swap-eyes Zamiana widoku lewy/prawy.\n"
-" -f|--fullscreen Pełny ekran.\n"
-" --fullscreen-screens= Użycie podanych ekranów w opcji pełnego ekranu.\n"
-" [S0[,S1[,...]]] Numery ekranów zaczynając od 1. Domyślnie\n"
-" (pusta lista) używany jest pierwszy ekran.\n"
-" --fullscreen-flip-left Widok \"flip\" z lewej w pionie w trybie "
-"\"pełnego ekranu\".\n"
-" --fullscreen-flop-left Widok \"flop\" z lewej w poziomie w trybie "
-"\"pełnego ekranu\".\n"
-" --fullscreen-flip-right Widok \"flip\" z prawej w pionie w trybie "
-"\"pełnego ekranu\".\n"
-" --fullscreen-flop-right Widok \"flop\" z prawej w poziomie w trybie "
-"\"pełnego ekranu\".\n"
-" -c|--center Wycentrowanie.\n"
-" --subtitle-encoding=ENC Ustaw kodowanie napisów.\n"
-" --subtitle-font=FONT Ustaw nazwę fontów.\n"
-" --subtitle-size=N Ustaw rozmiar napisów.\n"
-" --subtitle-scale=S Ustaw skalę napisów.\n"
-" --subtitle-color=COLOR Ustaw kolor napisów, jako format [AA]RRGGBB.\n"
-" --subtitle-parallax=VAL Regulacja paralaksy napisów (-1 do +1).\n"
-" -P|--parallax=VAL Regulacja paralaksy (-1 do +1).\n"
-" -C|--crosstalk=VAL Poziom nieszczelności \"crosstalk\" (0 to 1); "
-"oddzielne\n"
-" wartości dla kanałów the R,G,B.\n"
-" -G|--ghostbust=VAL Suma zwróconych \"duchów\" (0 do 1).\n"
-" -b|--benchmark Tryb Benchmark (bez audio, pokazuje fps).\n"
-" -l|--loop Pętla mediów wejściowych.\n"
-"\n"
-"Kontrola interaktywna:\n"
-" ESC \tOpuszczenie trybu pełnego ekranu, lub wyjście.\n"
-" q\t\t\tWyjście.\n"
-" p lub SPACE Pauza / wyłączenie pauzy.\n"
-" f Przełącznik do trybu pełnego ekranu.\n"
-" c Wypośrodkowanie.\n"
-" e Zamiana lewe/prawe oko.\n"
-" v Przełączanie dostępnych strumieni video.\n"
-" a Przełączanie dostępnych strumieni audio.\n"
-" s Przełączanie dostępnych strumieni napisów.\n"
-" 1, 2 Regulacja poziomu kontrastu.\n"
-" 3, 4 Regulacja poziomu jasności.\n"
-" 5, 6 Regulacja poziomu kolorów.\n"
-" 7, 8 Regulacja poziomu nasycenia.\n"
-" <, > Regulacja paralaksy.\n"
-" (, ) Regulacja \"duchów\".\n"
-" left, right Przesuń 10 sekund do tyłu / do przodu.\n"
-" up, down Przesuń 1 minutę do tyłu / do przodu.\n"
-" page up, page down Przesuń 10 minut do tyłu / do przodu.\n"
-" Mouse click Przesuń zgodnie z pozycją myszki na suwaku czasu.."
-
-#: src/main.cpp:597
-msgid "Benchmark mode: audio and time synchronization disabled."
-msgstr "Opcja testowa: audio i synchronizacja czasu wyłączona."
+#: src/gui.cpp:116
+msgid "Select the subtitle stream."
+msgstr "Wybierz strumień napisów."
 
-#: src/main.cpp:614
-msgid "This version of Bino was compiled without support for LIRC."
-msgstr "Ta wersja bino została skompilowana bez obsługi LIRC."
+#: src/gui.cpp:127 src/media_input.cpp:277
+msgid "Input:"
+msgstr "Wejście:"
 
-#: src/main.cpp:627
-msgid "This version of Bino was compiled without support for Equalizer."
-msgstr "Ta wersja bino została skompilowana bez obsługi korektora."
+#: src/gui.cpp:128
+msgid "Set the 3D layout of the video stream."
+msgstr "Ustaw format strumienia 3D."
 
-#: src/main.cpp:634
-msgid "Cannot connect to X server."
-msgstr "Nie można połączyć się z X serwerem."
+#: src/gui.cpp:132
+msgid "2D"
+msgstr "2D"
 
-#: src/main.cpp:650
-msgid "No video to play."
-msgstr "Brak video do odtwarzania."
+#: src/gui.cpp:133
+msgid "Separate streams, left first"
+msgstr "Oddzielne strumienie, lewy pierwszy"
 
-#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:293
-#, c-format
-msgid "%dx%d, %.3g:1"
-msgstr "%dx%d, %.3g:1"
+#: src/gui.cpp:134
+msgid "Separate streams, right first"
+msgstr "Oddzielne strumienie, prawy pierwszy"
 
-#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:421
-#, c-format
-msgid "%s, %d ch., %g kHz, %d bit"
-msgstr "%s, %d ch., %g kHz, %d bit"
+#: src/gui.cpp:135
+#, fuzzy
+msgid "Alternating, left first"
+msgstr "Oddzielne strumienie, lewy pierwszy"
 
-#: src/media_input.cpp:277 src/player_qt.cpp:187
-msgid "Input:"
-msgstr "Wejście:"
+#: src/gui.cpp:136
+#, fuzzy
+msgid "Alternating, right first"
+msgstr "Oddzielne strumienie, prawy pierwszy"
 
-#: src/media_input.cpp:282
-#, c-format
-msgid "Video %s: %s"
-msgstr "Video %s : %s"
+#: src/gui.cpp:137 src/gui.cpp:161
+msgid "Top/bottom"
+msgstr "Góra/Dół"
 
-#: src/media_input.cpp:287
-msgid "No video."
-msgstr "Brak video."
+#: src/gui.cpp:138 src/gui.cpp:162
+msgid "Top/bottom, half height"
+msgstr "Góra/Dół, połowa wysokości"
 
-#: src/media_input.cpp:293
-#, c-format
-msgid "Audio %s: %s"
-msgstr "Audio %s : %s"
+#: src/gui.cpp:139
+msgid "Bottom/top"
+msgstr "Dół/Góra"
 
-#: src/media_input.cpp:298
-msgid "No audio."
-msgstr "Brak audio."
+#: src/gui.cpp:140
+msgid "Bottom/top, half height"
+msgstr "Dół/Góra, połowa wysokości"
 
-#: src/media_input.cpp:304
-#, c-format
-msgid "Subtitle %s: %s"
-msgstr "Napisy %s : %s"
+#: src/gui.cpp:141 src/gui.cpp:163
+msgid "Left/right"
+msgstr "Lewy/Prawy"
 
-#: src/media_input.cpp:309
-msgid "No subtitle."
-msgstr "Brak napisów."
+#: src/gui.cpp:142 src/gui.cpp:164
+msgid "Left/right, half width"
+msgstr "Lewy/Prawy, połowa szerokości"
 
-#: src/media_input.cpp:311
-#, c-format
-msgid "Duration: %g seconds"
-msgstr "Czas trwania: %g sekund"
+#: src/gui.cpp:143
+msgid "Right/left"
+msgstr "Prawy/Lewy"
 
-#: src/media_input.cpp:314
-#, c-format
-msgid "Stereo layout: %s"
-msgstr "Układ stereo: %s"
+#: src/gui.cpp:144
+msgid "Right/left, half width"
+msgstr "Prawy/Lewy połowa szerokości"
 
-#: src/media_object.cpp:371
-#, fuzzy, c-format
-msgid "%s video stream %d: Using frame size %dx%d instead of %dx%d."
-msgstr "%s strumień video %d: Zły rozmiar ramki."
+#: src/gui.cpp:145 src/gui.cpp:165
+msgid "Even/odd rows"
+msgstr "Parzyste/nieparzyste rzędy"
 
-#: src/media_object.cpp:624
-#, c-format
-msgid "%s video stream %d: Unsupported stereo layout %s."
-msgstr "%s strumień video %d : Nie wspierany układ stereo %s."
+#: src/gui.cpp:146
+msgid "Odd/even rows"
+msgstr "Nieparzyste/parzyste rzędy"
 
-#: src/media_object.cpp:662
-#, c-format
-msgid "%s audio stream %d: Cannot handle audio with %d channels."
-msgstr "%s strumień audio %d: Nie można obsłużyć audio z %d kanałem/ami."
+#: src/gui.cpp:152
+msgid "Output:"
+msgstr "Wyjście:"
 
-#: src/media_object.cpp:691
-#, c-format
-msgid "%s audio stream %d: Cannot handle audio with sample format %s."
-msgstr "%s strumień audio %d: Nie można obsłużyć próbki formatu audio %s."
+#: src/gui.cpp:153
+msgid "Set the 3D output type for your display."
+msgstr "Ustaw typ wyjście 3D dla swojego monitora."
 
-#: src/media_object.cpp:744
-#, c-format
-msgid "No support available for %s device."
-msgstr "Brak dostępnego wsparcia dla urządzenia %s."
+#: src/gui.cpp:157
+msgid "Left view"
+msgstr "Lewy obraz"
 
-#: src/media_object.cpp:745 src/player_qt.cpp:1831
-msgid "Firewire"
-msgstr "Firewire"
+#: src/gui.cpp:158
+msgid "Right view"
+msgstr "Prawy obraz"
 
-#: src/media_object.cpp:746 src/player_qt.cpp:1832
-msgid "X11"
-msgstr "X11"
+#: src/gui.cpp:159
+msgid "OpenGL stereo"
+msgstr "OpenGL stereo"
 
-#: src/media_object.cpp:747
-msgid "default"
-msgstr "domyślne"
+#: src/gui.cpp:160
+msgid "Left/right view alternating"
+msgstr ""
 
-#: src/media_object.cpp:765 src/media_object.cpp:1218 src/xgl.cpp:297
-#, c-format
-msgid "%s: %s"
-msgstr "%s : %s"
+#: src/gui.cpp:166
+msgid "Even/odd columns"
+msgstr "Parzyste/nieparzyste kolumny"
 
-#: src/media_object.cpp:776
-#, c-format
-msgid "%s: Cannot read stream info: %s"
-msgstr "%s: Nie można odczytać strumienia info: %s"
+#: src/gui.cpp:167
+msgid "Checkerboard pattern"
+msgstr "Wzór szachownicy"
 
-#: src/media_object.cpp:816
-#, c-format
-msgid "%s stream %d: Cannot open %s: %s"
-msgstr "%s strumień %d : Nie można otworzyć %s : %s"
+#: src/gui.cpp:168
+msgid "HDMI frame packing mode"
+msgstr "Tryb HDMI"
 
-#: src/media_object.cpp:817
-msgid "video codec"
-msgstr "kodek video"
+#: src/gui.cpp:169
+msgid "Red/cyan glasses, monochrome method"
+msgstr "Czerwony/cyjan, czarnobiały"
 
-#: src/media_object.cpp:818
-msgid "audio codec"
-msgstr "kodek audio"
+#: src/gui.cpp:170
+msgid "Red/cyan glasses, half-color method"
+msgstr "Czerwony/cyjan, połowa koloru"
 
-#: src/media_object.cpp:819
-msgid "subtitle codec"
-msgstr "kodek napisów"
+#: src/gui.cpp:171
+msgid "Red/cyan glasses, full-color method"
+msgstr "Czerwony/cyjan, kolorowy"
 
-#: src/media_object.cpp:820
-msgid "data"
-msgstr "dane"
+#: src/gui.cpp:172
+msgid "Red/cyan glasses, high-quality Dubois method"
+msgstr "Czerwony/cyjan, Dubois"
 
-#: src/media_object.cpp:821
-msgid "codec not supported"
-msgstr "nie wspierany kodek"
+#: src/gui.cpp:173
+msgid "Green/magenta glasses, monochrome method"
+msgstr "Zielony/karmazynowy, czarnobiały"
 
-#: src/media_object.cpp:831
-#, c-format
-msgid "%s video stream %d: Invalid frame size."
-msgstr "%s strumień video %d: Zły rozmiar ramki."
+#: src/gui.cpp:174
+msgid "Green/magenta glasses, half-color method"
+msgstr "Zielony/karmazynowy, połowa koloru"
 
-#: src/media_object.cpp:867
-#, c-format
-msgid "%s video stream %d: Cannot initialize conversion context."
-msgstr ""
-"%s strumień video %d: Nie można zainicjować konwersji zależnej od kontekstu."
+#: src/gui.cpp:175
+msgid "Green/magenta glasses, full-color method"
+msgstr "Zielony/karmazynowy, kolorowy"
 
-#: src/media_object.cpp:930
-#, c-format
-msgid "Video stream %d: %s / %s, %g seconds"
-msgstr "Strumień video %d: %s / %s, %g sekund"
+#: src/gui.cpp:176
+msgid "Green/magenta glasses, high-quality Dubois method"
+msgstr "Zielony/karmazynowy, Dubois"
 
-#: src/media_object.cpp:934
-#, c-format
-msgid "Using up to %d threads for decoding."
-msgstr "Użyj do %d wątków do dekodowania."
+#: src/gui.cpp:177
+msgid "Amber/blue glasses, monochrome method"
+msgstr "Bursztynowy/niebieski, czarnobiały"
 
-#: src/media_object.cpp:939
+#: src/gui.cpp:178
+msgid "Amber/blue glasses, half-color method"
+msgstr "Bursztynowy/niebieski, połowa koloru"
+
+#: src/gui.cpp:179
+msgid "Amber/blue glasses, full-color method"
+msgstr "Bursztynowy/niebieski, kolorowy"
+
+#: src/gui.cpp:180
+msgid "Amber/blue glasses, high-quality Dubois method"
+msgstr "Bursztynowy/niebieski, Dubois"
+
+#: src/gui.cpp:181
+msgid "Red/green glasses, monochrome method"
+msgstr "Czerwony/zielony, czarnobiały"
+
+#: src/gui.cpp:182
+msgid "Red/blue glasses, monochrome method"
+msgstr "Czerwony/zielony, czarnobiały"
+
+#: src/gui.cpp:186
+msgid "Swap left/right"
+msgstr "Zamień lewy/prawy"
+
+#: src/gui.cpp:187
+msgid ""
+"Swap the left and right view. Use this if the 3D effect seems wrong."
+msgstr "p>Zamiana obrazu lewego i prawego. Użyj gdy efekt 3D będzie zły."
+
+#: src/gui.cpp:467
+msgid "Off"
+msgstr "Wyłącz"
+
+#: src/gui.cpp:694
+msgid ""
+"This slider shows the progress during video playback, and can be used to "
+"seek in the video."
+msgstr ""
+"Suwak pokazuje postęp podczas odtwarzania video i może być używany do "
+"odtwarzania od zaznaczonego punktu czasu w video"
+
+#: src/gui.cpp:701
+msgid "Elapsed / total time."
+msgstr "Upłynięty/całkowity czas"
+
+#: src/gui.cpp:708
+#, fuzzy
+msgid "Toggle audio mute."
+msgstr "Przełączanie opcji pętli"
+
+#: src/gui.cpp:713
+msgid "Adjust audio volume."
+msgstr ""
+
+#: src/gui.cpp:725
+msgid "Play."
+msgstr "Odtwarzaj."
+
+#: src/gui.cpp:729
+msgid "Pause."
+msgstr "Pauza."
+
+#: src/gui.cpp:733
+msgid "Stop."
+msgstr "Stop."
+
+#: src/gui.cpp:738
+msgid "Toggle loop mode."
+msgstr "Przełączanie opcji pętli"
+
+#: src/gui.cpp:745
+msgid ""
+"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
+"f key."
+msgstr ""
+"Przełącz na tryb pełnoekranowy. Klikając klawisz \"f\" możesz wyjść z "
+"tego trybu."
+
+#: src/gui.cpp:751
+msgid "Center the video area on your screen."
+msgstr "Wypośrodkuj obszar video na monitorze."
+
+#: src/gui.cpp:758
+msgid "Seek backward 10 minutes."
+msgstr "Cofnij 10 minut do tyłu."
+
+#: src/gui.cpp:763
+msgid "Seek backward 1 minute."
+msgstr "Cofnij 1 minutę do tyłu."
+
+#: src/gui.cpp:769
+msgid "Seek backward 10 seconds."
+msgstr "Cofnij 10 sekund do tyłu."
+
+#: src/gui.cpp:775
+msgid "Seek forward 10 seconds."
+msgstr "Przeskocz 10 sekund do przodu."
+
+#: src/gui.cpp:780
+msgid "Seek forward 1 minute."
+msgstr "Przeskocz 1 minutę do przodu."
+
+#: src/gui.cpp:786
+msgid "Seek forward 10 minutes."
+msgstr "Przeskocz 10 minut do przodu."
+
+#: src/gui.cpp:1047
+msgid "Fullscreen/Multiscreen Settings"
+msgstr "Ustawienia pełny ekran/wiele ekranów"
+
+#: src/gui.cpp:1049
+msgid "Configure fullscreen mode:"
+msgstr "Konfiguracja trybu pełnego ekranu:"
+
+#: src/gui.cpp:1050
+msgid "Select the screens to use in fullscreen mode."
+msgstr "Wybierz ekran do trybu \"pełnego ekranu\"."
+
+#: src/gui.cpp:1052
+msgid "Single screen:"
+msgstr "Pojedynczy ekran:"
+
+#: src/gui.cpp:1053
+msgid "Use a single screen for fullscreen mode."
+msgstr "Użyj pojedynczy ekran jako tryb \"pełnego ekranu\"."
+
+#: src/gui.cpp:1056
+msgid "Primary screen"
+msgstr "Pierwszy ekran"
+
+#: src/gui.cpp:1059 src/gui.cpp:1070 src/gui.cpp:1071
 #, c-format
-msgid "Audio stream %d: %s / %s, %g seconds"
-msgstr "Strumień audio %d: %s / %s, %g sekund"
+msgid "Screen %d"
+msgstr "Ekran %d"
+
+#: src/gui.cpp:1062
+msgid "Dual screen:"
+msgstr "Podwójny ekran:"
+
+#: src/gui.cpp:1063
+msgid "Use two screens for fullscreen mode."
+msgstr "Użyj dwóch ekranów jako trybu \"pełnego ekranu\"."
+
+#: src/gui.cpp:1075
+msgid "Multi screen:"
+msgstr "Wiele ekranów:"
+
+#: src/gui.cpp:1076
+msgid "Use multiple screens for fullscreen mode."
+msgstr "Użyj wiele ekranów jako trybu \"pełnego ekranu\""
+
+#: src/gui.cpp:1078
+msgid "Comma-separated list of screens to use for fullscreen mode."
+msgstr "Lista dostępnych ekranów do użycia w trybie \"pełnego ekranu\"."
+
+#: src/gui.cpp:1081
+msgid "When in fullscreen mode,"
+msgstr "Kiedy w trybie \"pełnego ekranu\","
+
+#: src/gui.cpp:1082
+msgid "Set special left/right view handling for fullscreen mode."
+msgstr ""
+"Réglages spéciaux pour les vues droite et gauche en plein écran."
+
+#: src/gui.cpp:1084
+msgid "flip left view vertically."
+msgstr "widok \"flip\" z lewej w pionie."
+
+#: src/gui.cpp:1086
+msgid "flop left view horizontally."
+msgstr "widok \"flop\" z lewej w poziomie."
+
+#: src/gui.cpp:1088
+msgid "flip right view vertically."
+msgstr "widok \"flip\" z prawej w pionie."
+
+#: src/gui.cpp:1090
+msgid "flop right view horizontally."
+msgstr "widok \"flop\" z prawej w poziomie."
+
+#: src/gui.cpp:1093
+#, fuzzy
+msgid "inhibit the screensaver"
+msgstr "Nie można wznowić działania \"screensaver'a\""
+
+#: src/gui.cpp:1094
+#, fuzzy
+msgid "Inhibit the screensaver during fullscreen playback."
+msgstr "Wybierz ekran do trybu \"pełnego ekranu\"."
+
+#: src/gui.cpp:1096 src/gui.cpp:1258 src/gui.cpp:1393 src/gui.cpp:1463
+#: src/gui.cpp:1541 src/gui.cpp:1652 src/gui.cpp:1928 src/gui.cpp:2108
+#: src/gui.cpp:2778 src/gui.cpp:2825 src/gui.cpp:3114
+msgid "OK"
+msgstr "OK"
+
+#: src/gui.cpp:1211
+msgid "Display Color Adjustments"
+msgstr "Wyświetl regulację kolorów"
+
+#: src/gui.cpp:1213
+msgid "Contrast:"
+msgstr "Kontrast:"
+
+#: src/gui.cpp:1224
+msgid "Brightness:"
+msgstr "Jasność:"
+
+#: src/gui.cpp:1235
+msgid "Hue:"
+msgstr "Kolor:"
+
+#: src/gui.cpp:1246
+msgid "Saturation:"
+msgstr "Nasycenie:"
+
+#: src/gui.cpp:1364
+msgid "Display Crosstalk Calibration"
+msgstr "Wyświetl kalibrację \"crosstalk\""
+
+#. TRANSLATORS: Please keep the lines short using where necessary.
+#: src/gui.cpp:1367
+msgid ""
+"Please read the manual to find out how to measure the crosstalk "
+"levels of your display."
+msgstr ""
+"Proszę przeczytać instrukcję aby dowiedzieć się jak zmierzyć poziom "
+"\"crosstalk\" twojego monitora."
+
+#: src/gui.cpp:1371
+msgid "Red:"
+msgstr "Czerwony:"
+
+#: src/gui.cpp:1378
+msgid "Green:"
+msgstr "Zielony:"
+
+#: src/gui.cpp:1385
+msgid "Blue:"
+msgstr "Niebieski:"
+
+#: src/gui.cpp:1441
+msgid "Zoom for wide videos"
+msgstr ""
+
+#: src/gui.cpp:1444
+msgid ""
+"Set zoom level for videos that are wider than the screen: 0: Show "
+"full video width. 1: Use full screen height.</p"
+msgstr ""
+
+#: src/gui.cpp:1448
+msgid "Zoom:"
+msgstr ""
+
+#: src/gui.cpp:1449
+msgid "Set the zoom level for videos that are wider than the screen"
+msgstr ""
+
+#: src/gui.cpp:1507
+#, fuzzy
+msgid "Audio Settings"
+msgstr "Ustawienia napisów"
+
+#: src/gui.cpp:1509
+#, fuzzy
+msgid "Audio device:"
+msgstr "kodek audio"
+
+#: src/gui.cpp:1510
+msgid ""
+"Select the audio device. This will take effect for the next started "
+"video."
+msgstr ""
+
+#: src/gui.cpp:1514 src/gui.cpp:2063
+msgid "Default"
+msgstr "Domyślne"
+
+#: src/gui.cpp:1531
+msgid "Audio delay (ms):"
+msgstr ""
+
+#: src/gui.cpp:1532
+msgid ""
+"Set an audio delay, in milliseconds. This is useful if audio and video "
+"are not in sync."
+msgstr ""
+
+#: src/gui.cpp:1589
+msgid "Subtitle Settings"
+msgstr "Ustawienia napisów"
+
+#: src/gui.cpp:1591
+msgid "These settings apply to soft subtitles, but not to bitmaps."
+msgstr "Te ustawienia dotyczą zwykłych napisów, a nie w bitmapach."
+
+#: src/gui.cpp:1593
+msgid "Encoding:"
+msgstr "Kodowanie:"
+
+#: src/gui.cpp:1594
+msgid "Set the subtitle character set encoding."
+msgstr "Ustaw kodowanie napisów."
+
+#: src/gui.cpp:1609
+msgid "Override font:"
+msgstr "Zastąp czcionkę:"
+
+#: src/gui.cpp:1610
+msgid "Override the subtitle font family."
+msgstr "Zastąp czcionkę napisu."
+
+#: src/gui.cpp:1619
+msgid "Override font size:"
+msgstr "Zastąp rozmiar czcionki:"
+
+#: src/gui.cpp:1620
+msgid "Override the subtitle font size."
+msgstr "Zastąp rozmiar czcioni napisu."
+
+#: src/gui.cpp:1630
+msgid "Override scale factor:"
+msgstr "Zastąp współczynnik skali:"
+
+#: src/gui.cpp:1631
+msgid "Override the subtitle scale factor."
+msgstr "Zastąp współczynnik skali napisu."
+
+#: src/gui.cpp:1642
+msgid "Override color:"
+msgstr "Zastąp kolor:"
+
+#: src/gui.cpp:1643
+msgid "Override the subtitle color."
+msgstr "Zastąp kolor napisu."
+
+#: src/gui.cpp:1866
+#, fuzzy
+msgid "Video Settings"
+msgstr "Ustawienia napisów"
+
+#: src/gui.cpp:1868
+#, fuzzy
+msgid "Crop to aspect ratio:"
+msgstr "%gx%g, proporcja obrazu %g:1"
+
+#: src/gui.cpp:1869
+#, fuzzy
+msgid ""
+"Set the real aspect ratio of the video, so that borders can be cropped.</"
+"p>"
+msgstr "Ustaw format strumienia 3D."
+
+#: src/gui.cpp:1872
+msgid "Do not crop"
+msgstr ""
+
+#: src/gui.cpp:1885
+msgid "Parallax:"
+msgstr "Paralaksa:"
+
+#: src/gui.cpp:1886
+msgid ""
+"Adjust parallax, from -1 to +1. This changes the separation of left and "
+"right view, and thus the perceived distance of the scene."
+msgstr ""
+"Regulacja paralaksy od -1 do +1. Zmiany oddzielają lewy i prawy obraz i "
+"wpływają na spostrzeganie dystansu w scenie."
+
+#: src/gui.cpp:1899
+msgid "Subtitle parallax:"
+msgstr "Paralaksa napisów:"
+
+#: src/gui.cpp:1900
+msgid ""
+"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
+"distance of the subtitles."
+msgstr ""
+"Regulacja paralaksy od -1 do +1. Zmiany wpływają na spostrzeganiu "
+"dystansu napisów względem danej sceny."
+
+#: src/gui.cpp:1913
+msgid "Ghostbusting:"
+msgstr "Ghostbusting :"
+
+#: src/gui.cpp:1914
+msgid ""
+"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
+"does not work with anaglyph glasses."
+msgstr ""
+"Ustawienie ilości \"crosstalk ghostbusting\", od 0 do 1. Na początku "
+"powinieneś ustawić poziom \"crosstalk\" dla monitora. UWAGA. Ustawienie to "
+"nie działa przy okularach anaglifowych."
+
+#: src/gui.cpp:2059
+msgid "Open device"
+msgstr "Otwórz urządzenie"
+
+#: src/gui.cpp:2062
+msgid "Choose a device type."
+msgstr "Wybierz typ urządzenia."
+
+#: src/gui.cpp:2064 src/media_object.cpp:801
+msgid "Firewire"
+msgstr "Firewire"
+
+#: src/gui.cpp:2065 src/media_object.cpp:802
+msgid "X11"
+msgstr "X11"
+
+#: src/gui.cpp:2067 src/gui.cpp:2070
+msgid "Choose a device."
+msgstr "Wybierz urządzenie"
+
+#: src/gui.cpp:2073
+msgid "Set the X11 device string. Refer to the manual for details."
+msgstr ""
+"Ustaw wartość urządzenia dla serwera X11. Szczegóły w dokumentacji."
+
+#: src/gui.cpp:2082
+msgid "Request frame size"
+msgstr "Wymagany rozmiar ramki"
+
+#: src/gui.cpp:2083
+msgid ""
+"Request a specific frame size from the device, e.g. 640x480. The device "
+"must support this frame size. Some devices require a frame size to be "
+"selected."
+msgstr ""
+"Wymagany rozmiar ramki urządzenia (np: 640x480). Urządzenie musi "
+"obsługiwać tą wielkość ramki. Niektóre urządzenia wymagają wyboru rozmiaru "
+"ramki."
+
+#: src/gui.cpp:2094
+msgid "Request frame rate"
+msgstr "Wymagany współczynnik \"fps\""
+
+#: src/gui.cpp:2095
+msgid ""
+"Request a specific frame rate from the device, e.g. 25/1. The device must "
+"support this frame rate. Some devices require a frame rate to be selected.</"
+"p>"
+msgstr ""
+"Wymagany współczynnik \"fps\" urządzenia (np: 25/1). Urządzenie musi "
+"obsługiwać taki współczynnik. Niektóre urządzenia wymagają wyboru "
+"wspołczynnika \"fps\"."
+
+#: src/gui.cpp:2106 src/gui.cpp:2824
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: src/gui.cpp:2377
+msgid "&File"
+msgstr "&Plik"
+
+#: src/gui.cpp:2378
+#, fuzzy
+msgid "&Open file(s)..."
+msgstr "Otwórz pliki"
+
+#: src/gui.cpp:2383
+#, fuzzy
+msgid "Open &URL(s)..."
+msgstr "Otwórz &URL..."
+
+#: src/gui.cpp:2387
+msgid "Open &device..."
+msgstr "Otwórz urządzenie..."
+
+#: src/gui.cpp:2402
+msgid "&Clear recent files"
+msgstr ""
+
+#: src/gui.cpp:2410
+msgid "&Quit..."
+msgstr "&Zakończ..."
+
+#: src/gui.cpp:2416
+msgid "&Preferences"
+msgstr "&Preferencje"
+
+#: src/gui.cpp:2419
+msgid "&Fullscreen Settings..."
+msgstr "&Ustawienia dla pełnego ekranu..."
+
+#: src/gui.cpp:2422
+msgid "Display &Color Adjustments..."
+msgstr "Regulacja &koloru..."
+
+#: src/gui.cpp:2425
+msgid "Display Cross&talk Calibration..."
+msgstr "Kalibracja &Crosstalku..."
+
+#: src/gui.cpp:2429
+msgid "&Zoom for wide videos..."
+msgstr ""
+
+#: src/gui.cpp:2433
+#, fuzzy
+msgid "&Audio Settings..."
+msgstr "Ustawienia &Napisów..."
+
+#: src/gui.cpp:2437
+msgid "&Subtitle Settings..."
+msgstr "Ustawienia &Napisów..."
+
+#: src/gui.cpp:2441
+#, fuzzy
+msgid "Current &Video Settings..."
+msgstr "Ustawienia video 3D..."
+
+#: src/gui.cpp:2444
+msgid "&Help"
+msgstr "&Pomoc"
+
+#: src/gui.cpp:2445
+msgid "&Manual..."
+msgstr "&Instrukcja..."
+
+#: src/gui.cpp:2450
+msgid "&Website..."
+msgstr "&Strona..."
+
+#: src/gui.cpp:2454
+msgid "&Keyboard Shortcuts"
+msgstr "&Skróty klawiszy"
+
+#: src/gui.cpp:2458
+msgid "&About"
+msgstr "&O Bino"
 
-#: src/media_object.cpp:946
-#, c-format
-msgid "Subtitle stream %d: %s / %s, %g seconds"
-msgstr "Napisy %d: %s / %s, %g sekund"
+#: src/gui.cpp:2771
+msgid "Tip"
+msgstr ""
 
-#: src/media_object.cpp:953
-msgid "No usable streams."
-msgstr "Brak użytecznych strumieni."
+#: src/gui.cpp:2774
+msgid ""
+"You can select and open multiple files at once.This is useful for "
+"example if you have extra subtitle files, or if left and right view are "
+"stored in separate files."
+msgstr ""
+
+#: src/gui.cpp:2777
+msgid "Do not show this message again."
+msgstr ""
+
+#: src/gui.cpp:2794
+msgid "Open files"
+msgstr "Otwórz pliki"
+
+#: src/gui.cpp:2818
+#, fuzzy
+msgid "Open URL(s)"
+msgstr "Otwórz URL"
+
+#: src/gui.cpp:2819
+msgid "URL(s):"
+msgstr ""
+
+#: src/gui.cpp:2820
+msgid "Enter one or more space separated URLs."
+msgstr ""
+
+#: src/gui.cpp:3005 src/gui.cpp:3013 src/video_output_qt.cpp:234
+#: src/video_output_qt.cpp:643 src/video_output_qt.cpp:664
+msgid "Error"
+msgstr "Błąd"
+
+#: src/gui.cpp:3005
+msgid "Cannot open manual."
+msgstr "Nie można otworzyć instrukcji."
+
+#: src/gui.cpp:3013
+msgid "Cannot open website."
+msgstr "Nie można otworzyć przeglądarki."
+
+#: src/gui.cpp:3021
+msgid "Keyboard Shortcuts"
+msgstr "Skróty klawiszy"
+
+#: src/gui.cpp:3024
+#, fuzzy
+msgid "Keyboard control:"
+msgstr "Skróty klawiszy"
+
+#: src/gui.cpp:3026
+msgid "Stop."
+msgstr ""
+
+#: src/gui.cpp:3027 src/main.cpp:495
+msgid "Pause / unpause."
+msgstr ""
+
+#: src/gui.cpp:3028 src/main.cpp:496
+#, fuzzy
+msgid "Toggle fullscreen."
+msgstr "Konfiguracja trybu pełnego ekranu:"
+
+#: src/gui.cpp:3029 src/main.cpp:497
+msgid "Center window."
+msgstr ""
+
+#: src/gui.cpp:3030 src/main.cpp:498
+#, fuzzy
+msgid "Swap left/right eye."
+msgstr "Zamień lewy/prawy"
+
+#: src/gui.cpp:3031 src/main.cpp:499
+msgid "Cycle through available video streams."
+msgstr ""
+
+#: src/gui.cpp:3032 src/main.cpp:500
+msgid "Cycle through available audio streams."
+msgstr ""
+
+#: src/gui.cpp:3033 src/main.cpp:501
+#, fuzzy
+msgid "Cycle through available subtitle streams."
+msgstr "Wybierz strumień napisów."
+
+#: src/gui.cpp:3034 src/main.cpp:502
+msgid "Adjust contrast."
+msgstr ""
+
+#: src/gui.cpp:3035 src/main.cpp:503
+#, fuzzy
+msgid "Adjust brightness."
+msgstr "Jasność:"
+
+#: src/gui.cpp:3036 src/main.cpp:504
+msgid "Adjust hue."
+msgstr ""
+
+#: src/gui.cpp:3037 src/main.cpp:505
+#, fuzzy
+msgid "Adjust saturation."
+msgstr "Nasycenie:"
+
+#: src/gui.cpp:3038 src/main.cpp:506
+#, fuzzy
+msgid "Adjust parallax."
+msgstr "Paralaksa napisów:"
+
+#: src/gui.cpp:3039 src/main.cpp:507
+#, fuzzy
+msgid "Adjust ghostbusting."
+msgstr "Ghostbusting :"
+
+#: src/gui.cpp:3040 src/main.cpp:508
+msgid "Adjust zoom for wide videos."
+msgstr ""
 
-#: src/media_object.cpp:1234 src/media_object.cpp:1264
-#: src/media_object.cpp:1294
+#: src/gui.cpp:3041 src/main.cpp:509
+msgid "Adjust audio volume."
+msgstr ""
+
+#: src/gui.cpp:3042 src/main.cpp:510
+msgid "Toggle audio mute."
+msgstr ""
+
+#: src/gui.cpp:3043 src/main.cpp:511
+msgid "Step a single video frame forward."
+msgstr ""
+
+#: src/gui.cpp:3044 src/main.cpp:512
+msgid "Seek 10 seconds backward / forward."
+msgstr ""
+
+#: src/gui.cpp:3045 src/main.cpp:513
+msgid "Seek 1 minute backward / forward."
+msgstr ""
+
+#: src/gui.cpp:3046 src/main.cpp:514
+msgid "Seek 10 minutes backward / forward."
+msgstr ""
+
+#: src/gui.cpp:3047 src/main.cpp:516
+msgid "Media keys should work as expected."
+msgstr ""
+
+#: src/gui.cpp:3063
 #, c-format
-msgid "%s: Cannot duplicate packet."
-msgstr "%s: Nie mogę skopiować pakietu."
+msgid "About %s"
+msgstr "O programie %s"
 
-#: src/media_object.cpp:1766
+#: src/gui.cpp:3069
 #, c-format
-msgid "%s: Seeking failed."
-msgstr "%s: Przesuwanie zakończone niepowodzeniem ."
+msgid "The %s 3D video player"
+msgstr "%s odtwarzacz 3D"
 
-#: src/player.cpp:212
-msgid "No video streams found."
-msgstr "Brak strumieni video."
+#: src/gui.cpp:3074
+#, fuzzy, c-format
+msgid ""
+"%s version %s.Copyright (C) 2012 the Bino developers.This "
+"is free software. You may redistribute copies of it under the terms of the "
+"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
+"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
+"\"%s\">%s</a> for more information on this software."
+msgstr ""
+"%s version %s.Copyright (C) 2011 the Bino developers.This "
+"is free software. You may redistribute copies of it under the terms of the "
+"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
+"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
+"\"%s\">%s</a> for more information on this software."
 
-#: src/player.cpp:218
-msgid "Cannot set requested stereo layout: incompatible media."
-msgstr "Nie można ustawić narzuconego planu stereo: niekompatybilne media."
+#: src/gui.cpp:3086 src/main.cpp:384
+msgid "Platform:"
+msgstr "Platforma:"
 
-#: src/player.cpp:224
-#, c-format
-msgid "Video stream %d not found."
-msgstr "Strumień video %d nie znaleziony."
+#: src/gui.cpp:3087 src/main.cpp:386
+msgid "Libraries used:"
+msgstr "Użyte biblioteki:"
+
+#: src/gui.cpp:3109
+msgid "About"
+msgstr "O programie"
+
+#: src/gui.cpp:3110
+msgid "Libraries"
+msgstr "Biblioteki"
+
+#: src/gui.cpp:3111
+msgid "Team"
+msgstr "Zespół"
+
+#: src/gui.cpp:3112
+msgid "License"
+msgstr "Licencja"
+
+#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
+msgid "not used"
+msgstr "nie używany"
+
+#: src/lirc.cpp:61
+msgid "Cannot initialize LIRC."
+msgstr "Nie można zainicjować LIRC."
 
-#: src/player.cpp:229
+#: src/lirc.cpp:67
+msgid "Cannot set LIRC socket properties."
+msgstr "Nie można ustawić właściwości gniazda LIRC."
+
+#: src/lirc.cpp:74
+msgid "Cannot read LIRC default configuration."
+msgstr "Nie można odczytać konfiguracji domyślnej LIRC."
+
+#: src/lirc.cpp:89
 #, c-format
-msgid "Audio stream %d not found."
-msgstr "Strumień audio %d nie znaleziony."
+msgid "Cannot read LIRC configuration file %s."
+msgstr "Nie można odczytać pliku konfiguracyjnego LIRC %s."
+
+#: src/lirc.cpp:117
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr "Nie można pobrać zdarzenia; wyłączenie obsługi LIRC."
 
-#: src/player.cpp:237
+#: src/lirc.cpp:131
 #, c-format
-msgid "Subtitle stream %d not found."
-msgstr "Strumień napisów %d nie znaleziony."
+msgid "Received invalid command '%s' from LIRC."
+msgstr "Błędna odebrana komenda LIRC '%s'."
+
+#: src/lirc.cpp:141
+msgid "Cannot get command for LIRC code."
+msgstr "Nie można pobrać komendy z LIRC."
 
-#: src/player.cpp:644
+#: src/main.cpp:367 src/media_object.cpp:821 src/media_object.cpp:1286
+#: src/video_output.cpp:212
 #, c-format
-msgid "Video: delay %g seconds; dropping next frame."
-msgstr "Video: późnienie %g sekund; odrzucanie następnej ramki."
+msgid "%s: %s"
+msgstr "%s : %s"
 
-#: src/player.cpp:656
+#: src/main.cpp:379
 #, c-format
-msgid "FPS: %.2f"
-msgstr "FPS : %.2f"
+msgid "%s version %s"
+msgstr "%s wersja %s"
 
-#: src/player_equalizer.cpp:138
-msgid "Reading input frame failed."
-msgstr "Odczytywanie wejściowej ramki zakończony niepowodzeniem."
+#: src/main.cpp:380
+#, fuzzy
+msgid "Copyright (C) 2012 the Bino developers."
+msgstr "Copyright (C) 2011 deweloperzy Bino."
 
-#: src/player_equalizer.cpp:192 src/video_output_qt.cpp:345
-#: src/video_output_qt.cpp:352
-msgid "Waiting for subtitle renderer initialization..."
-msgstr "Oczekiwanie na inicjację renderowania napisów..."
+#: src/main.cpp:381
+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 ""
+"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."
 
-#: src/player_equalizer.cpp:273
-msgid "Init data mapping failed."
-msgstr "Inicjowanie mapowanych danych nie powiodło się."
+#. 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:399
+msgid "Usage:"
+msgstr ""
 
-#: src/player_equalizer.cpp:274
-msgid "Frame data mapping failed."
-msgstr "Mapowanie danych ramki nie powiodło się."
+#: src/main.cpp:401
+msgid "Options:"
+msgstr ""
 
-#: src/player_equalizer.cpp:275
-msgid "Video player initialization failed."
-msgstr "Inicjacja odtwarzacza nie powiodła się."
+#: src/main.cpp:402
+msgid "Print help."
+msgstr ""
 
-#: src/player_equalizer.cpp:276
-msgid "Need at least OpenGL 2.1."
-msgstr "Minimalna wymagana wersja OpenGL to 2.1."
+#: src/main.cpp:403
+msgid "Print version."
+msgstr ""
 
-#: src/player_equalizer.cpp:477
-msgid "No canvas in Equalizer configuration."
-msgstr "Brak obrazu w konfiguracji korektora."
+#: src/main.cpp:404
+msgid "Do not use the GUI, just show a plain window."
+msgstr ""
 
-#: src/player_equalizer.cpp:511
-msgid "Equalizer canvas:"
-msgstr "Obraz korektora:"
+#: src/main.cpp:405
+msgid "Append all log messages to the given file."
+msgstr ""
 
-#: src/player_equalizer.cpp:512
-#, c-format
-msgid "%gx%g, aspect ratio %g:1"
-msgstr "%gx%g, proporcja obrazu %g:1"
+#: src/main.cpp:406
+msgid "Set log level (debug/info/warning/error/quiet)."
+msgstr ""
 
-#: src/player_equalizer.cpp:513
-#, c-format
-msgid "Area for %g:1 video: [ %g %g %g %g @ %g ]"
-msgstr "Obszar dla %g:1 video: [ %g %g %g %g @ %g ]"
+#: src/main.cpp:407
+msgid "Print a list of known audio devices and exit."
+msgstr ""
 
-#: src/player_equalizer.cpp:926 src/video_output_qt.cpp:318
-msgid ""
-"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
-"objects."
-msgstr "Ta implementacja OpenGL 2.1 nie obsługuje obiektów \"framebuffer\"."
+#: src/main.cpp:408
+msgid "Use audio device number N (N=0 is the default)."
+msgstr ""
 
-#: src/player_equalizer.cpp:1096
-msgid "Equalizer initialization failed."
-msgstr "Inicjacja korektora nie powiodła się."
+#: src/main.cpp:409
+msgid "Delay audio by D milliseconds. Default is 0."
+msgstr ""
 
-#: src/player_equalizer.cpp:1104
-msgid "Cannot get equalizer configuration."
-msgstr "Nie można pobrać konfiguracji korektora."
+#: src/main.cpp:410
+msgid "Set audio volume (0 to 1). Default is 1."
+msgstr ""
 
-#: src/player_equalizer.cpp:1118
-msgid "Equalizer configuration initialization failed."
-msgstr "Inicjacja konfiguracji korektora zakończona niepowodzeniem."
+#: src/main.cpp:411
+#, fuzzy
+msgid "Mute audio."
+msgstr "Brak audio."
 
-#: src/player_qt.cpp:161
-msgid "Video:"
-msgstr "Video:"
+#: src/main.cpp:412
+msgid "Type of input device: default, firewire, x11."
+msgstr ""
 
-#: src/player_qt.cpp:162
-msgid "Select the video stream."
-msgstr "Wybierz strumień video."
+#: src/main.cpp:413
+#, fuzzy
+msgid "Request frame size WxH from input device."
+msgstr "Wymagany rozmiar ramki"
 
-#: src/player_qt.cpp:168
-msgid "Audio:"
-msgstr "Dźwięk :"
+#: src/main.cpp:414
+#, fuzzy
+msgid "Request frame rate N/D from input device."
+msgstr "Wymagany współczynnik \"fps\""
 
-#: src/player_qt.cpp:169
-msgid "Select the audio stream."
-msgstr "Wybierz strumień audio."
+#: src/main.cpp:415
+#, fuzzy
+msgid "Use the given LIRC configuration file."
+msgstr "Nie można odczytać pliku konfiguracyjnego LIRC %s."
 
-#: src/player_qt.cpp:175
-msgid "Subtitle:"
-msgstr "Napisy:"
+#: src/main.cpp:416
+msgid "This option can be used more than once."
+msgstr ""
 
-#: src/player_qt.cpp:176
-msgid "Select the subtitle stream."
+#: src/main.cpp:417
+msgid "Select video stream (1-n, depending on input)."
+msgstr ""
+
+#: src/main.cpp:418
+msgid "Select audio stream (1-n, depending on input)."
+msgstr ""
+
+#: src/main.cpp:419
+#, fuzzy
+msgid "Select subtitle stream (0-n, dep. on input)."
 msgstr "Wybierz strumień napisów."
 
-#: src/player_qt.cpp:188
-msgid "Set the 3D layout of the video stream."
-msgstr "Ustaw format strumienia 3D."
+#: src/main.cpp:420
+msgid "Select input type (default autodetect):"
+msgstr ""
 
-#: src/player_qt.cpp:192
-msgid "2D"
-msgstr "2D"
+#: src/main.cpp:421
+#, fuzzy
+msgid "Single view."
+msgstr "Prawy obraz"
 
-#: src/player_qt.cpp:193
-msgid "Separate streams, left first"
+#: src/main.cpp:422
+#, fuzzy
+msgid "Left/right separate streams, left first."
 msgstr "Oddzielne strumienie, lewy pierwszy"
 
-#: src/player_qt.cpp:194
-msgid "Separate streams, right first"
+#: src/main.cpp:423
+#, fuzzy
+msgid "Left/right separate streams, right first."
 msgstr "Oddzielne strumienie, prawy pierwszy"
 
-#: src/player_qt.cpp:195 src/player_qt.cpp:218
-msgid "Top/bottom"
-msgstr "Góra/Dół"
+#: src/main.cpp:424
+#, fuzzy
+msgid "Left/right alternating, left first."
+msgstr "Oddzielne strumienie, lewy pierwszy"
 
-#: src/player_qt.cpp:196 src/player_qt.cpp:219
-msgid "Top/bottom, half height"
+#: src/main.cpp:425
+#, fuzzy
+msgid "Left/right alternating, right first."
+msgstr "Oddzielne strumienie, prawy pierwszy"
+
+#: src/main.cpp:426 src/main.cpp:441
+msgid "Left top, right bottom."
+msgstr ""
+
+#: src/main.cpp:427 src/main.cpp:442
+#, fuzzy
+msgid "Left top, right bottom, half height."
 msgstr "Góra/Dół, połowa wysokości"
 
-#: src/player_qt.cpp:197
-msgid "Bottom/top"
-msgstr "Dół/Góra"
+#: src/main.cpp:428
+msgid "Left bottom, right top."
+msgstr ""
 
-#: src/player_qt.cpp:198
-msgid "Bottom/top, half height"
+#: src/main.cpp:429
+#, fuzzy
+msgid "Left bottom, right top, half height."
 msgstr "Dół/Góra, połowa wysokości"
 
-#: src/player_qt.cpp:199 src/player_qt.cpp:220
-msgid "Left/right"
-msgstr "Lewy/Prawy"
+#: src/main.cpp:430 src/main.cpp:443
+msgid "Left left, right right."
+msgstr ""
 
-#: src/player_qt.cpp:200 src/player_qt.cpp:221
-msgid "Left/right, half width"
+#: src/main.cpp:431 src/main.cpp:444
+#, fuzzy
+msgid "Left left, right right, half width."
 msgstr "Lewy/Prawy, połowa szerokości"
 
-#: src/player_qt.cpp:201
-msgid "Right/left"
-msgstr "Prawy/Lewy"
-
-#: src/player_qt.cpp:202
-msgid "Right/left, half width"
-msgstr "Prawy/Lewy połowa szerokości"
-
-#: src/player_qt.cpp:203 src/player_qt.cpp:222
-msgid "Even/odd rows"
-msgstr "Parzyste/nieparzyste rzędy"
-
-#: src/player_qt.cpp:204
-msgid "Odd/even rows"
-msgstr "Nieparzyste/parzyste rzędy"
+#: src/main.cpp:432
+#, fuzzy
+msgid "Left right, right left."
+msgstr "Lewy/Prawy, połowa szerokości"
 
-#: src/player_qt.cpp:210
-msgid "Output:"
-msgstr "Wyjście:"
+#: src/main.cpp:433
+#, fuzzy
+msgid "Left right, right left, half width."
+msgstr "Lewy/Prawy, połowa szerokości"
 
-#: src/player_qt.cpp:211
-msgid "Set the 3D output type for your display."
-msgstr "Ustaw typ wyjście 3D dla swojego monitora."
+#: src/main.cpp:434 src/main.cpp:445
+msgid "Left even rows, right odd rows."
+msgstr ""
 
-#: src/player_qt.cpp:215
-msgid "Left view"
-msgstr "Lewy obraz"
+#: src/main.cpp:435
+msgid "Left odd rows, right even rows."
+msgstr ""
 
-#: src/player_qt.cpp:216
-msgid "Right view"
-msgstr "Prawy obraz"
+#: src/main.cpp:436
+msgid "Select output type:"
+msgstr ""
 
-#: src/player_qt.cpp:217
-msgid "OpenGL stereo"
+#: src/main.cpp:437
+#, fuzzy
+msgid "OpenGL quad-buffered stereo."
 msgstr "OpenGL stereo"
 
-#: src/player_qt.cpp:223
-msgid "Even/odd columns"
-msgstr "Parzyste/nieparzyste kolumny"
+#: src/main.cpp:438
+#, fuzzy
+msgid "Left and right view alternating."
+msgstr "widok \"flip\" z prawej w pionie."
 
-#: src/player_qt.cpp:224
-msgid "Checkerboard pattern"
+#: src/main.cpp:439
+msgid "Only left."
+msgstr ""
+
+#: src/main.cpp:440
+msgid "Only right."
+msgstr ""
+
+#: src/main.cpp:446
+msgid "Left even columns, right odd columns."
+msgstr ""
+
+#: src/main.cpp:447
+#, fuzzy
+msgid "Left and right in checkerboard pattern."
 msgstr "Wzór szachownicy"
 
-#: src/player_qt.cpp:225
-msgid "HDMI frame packing mode"
+#: src/main.cpp:448
+#, fuzzy
+msgid "HDMI frame packing mode."
 msgstr "Tryb HDMI"
 
-#: src/player_qt.cpp:226
-msgid "Red/cyan glasses, monochrome method"
+#: src/main.cpp:449
+#, fuzzy
+msgid "Red/cyan anaglyph, monochrome method."
 msgstr "Czerwony/cyjan, czarnobiały"
 
-#: src/player_qt.cpp:227
-msgid "Red/cyan glasses, half-color method"
+#: src/main.cpp:450
+#, fuzzy
+msgid "Red/cyan anaglyph, half color method."
 msgstr "Czerwony/cyjan, połowa koloru"
 
-#: src/player_qt.cpp:228
-msgid "Red/cyan glasses, full-color method"
+#: src/main.cpp:451
+#, fuzzy
+msgid "Red/cyan anaglyph, full color method."
 msgstr "Czerwony/cyjan, kolorowy"
 
-#: src/player_qt.cpp:229
-msgid "Red/cyan glasses, high-quality Dubois method"
+#: src/main.cpp:452
+#, fuzzy
+msgid "Red/cyan anaglyph, Dubois method."
 msgstr "Czerwony/cyjan, Dubois"
 
-#: src/player_qt.cpp:230
-msgid "Green/magenta glasses, monochrome method"
+#: src/main.cpp:453
+#, fuzzy
+msgid "Green/magenta anaglyph, monochrome method."
 msgstr "Zielony/karmazynowy, czarnobiały"
 
-#: src/player_qt.cpp:231
-msgid "Green/magenta glasses, half-color method"
+#: src/main.cpp:454
+#, fuzzy
+msgid "Green/magenta anaglyph, half color method."
 msgstr "Zielony/karmazynowy, połowa koloru"
 
-#: src/player_qt.cpp:232
-msgid "Green/magenta glasses, full-color method"
+#: src/main.cpp:455
+#, fuzzy
+msgid "Green/magenta anaglyph, full color method."
 msgstr "Zielony/karmazynowy, kolorowy"
 
-#: src/player_qt.cpp:233
-msgid "Green/magenta glasses, high-quality Dubois method"
+#: src/main.cpp:456
+#, fuzzy
+msgid "Green/magenta anaglyph, Dubois method."
 msgstr "Zielony/karmazynowy, Dubois"
 
-#: src/player_qt.cpp:234
-msgid "Amber/blue glasses, monochrome method"
+#: src/main.cpp:457
+#, fuzzy
+msgid "Amber/blue anaglyph, monochrome method."
 msgstr "Bursztynowy/niebieski, czarnobiały"
 
-#: src/player_qt.cpp:235
-msgid "Amber/blue glasses, half-color method"
+#: src/main.cpp:458
+#, fuzzy
+msgid "Amber/blue anaglyph, half color method."
 msgstr "Bursztynowy/niebieski, połowa koloru"
 
-#: src/player_qt.cpp:236
-msgid "Amber/blue glasses, full-color method"
+#: src/main.cpp:459
+#, fuzzy
+msgid "Amber/blue anaglyph, full color method."
 msgstr "Bursztynowy/niebieski, kolorowy"
 
-#: src/player_qt.cpp:237
-msgid "Amber/blue glasses, high-quality Dubois method"
+#: src/main.cpp:460
+#, fuzzy
+msgid "Amber/blue anaglyph, Dubois method."
 msgstr "Bursztynowy/niebieski, Dubois"
 
-#: src/player_qt.cpp:238
-msgid "Red/green glasses, monochrome method"
+#: src/main.cpp:461
+#, fuzzy
+msgid "Red/green anaglyph, monochrome method."
 msgstr "Czerwony/zielony, czarnobiały"
 
-#: src/player_qt.cpp:239
-msgid "Red/blue glasses, monochrome method"
+#: src/main.cpp:462
+#, fuzzy
+msgid "Red/blue anaglyph, monochrome method."
 msgstr "Czerwony/zielony, czarnobiały"
 
-#: src/player_qt.cpp:243
-msgid "Swap left/right"
-msgstr "Zamień lewy/prawy"
-
-#: src/player_qt.cpp:244
-msgid ""
-"Swap the left and right view. Use this if the 3D effect seems wrong."
-msgstr "p>Zamiana obrazu lewego i prawego. Użyj gdy efekt 3D będzie zły."
-
-#: src/player_qt.cpp:511
-msgid "Off"
-msgstr "Wyłącz"
-
-#: src/player_qt.cpp:745
-msgid ""
-"This slider shows the progress during video playback, and can be used to "
-"seek in the video."
+#: src/main.cpp:463
+msgid "Multi-display via Equalizer (2D setup)."
 msgstr ""
-"Suwak pokazuje postęp podczas odtwarzania video i może być używany do "
-"odtwarzania od zaznaczonego punktu czasu w video"
-
-#: src/player_qt.cpp:752
-msgid "Elapsed / total time."
-msgstr "Upłynięty/całkowity czas"
-
-#: src/player_qt.cpp:762
-msgid "Play."
-msgstr "Odtwarzaj."
-
-#: src/player_qt.cpp:766
-msgid "Pause."
-msgstr "Pauza."
-
-#: src/player_qt.cpp:770
-msgid "Stop."
-msgstr "Stop."
 
-#: src/player_qt.cpp:775
-msgid "Toggle loop mode."
-msgstr "Przełączanie opcji pętli"
-
-#: src/player_qt.cpp:782
-msgid ""
-"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
-"f key."
+#: src/main.cpp:464
+msgid "Multi-display via Equalizer (3D setup)."
 msgstr ""
-"Przełącz na tryb pełnoekranowy. Klikając klawisz \"f\" możesz wyjść z "
-"tego trybu."
-
-#: src/player_qt.cpp:788
-msgid "Center the video area on your screen."
-msgstr "Wypośrodkuj obszar video na monitorze."
-
-#: src/player_qt.cpp:795
-msgid "Seek backward 10 minutes."
-msgstr "Cofnij 10 minut do tyłu."
-
-#: src/player_qt.cpp:800
-msgid "Seek backward 1 minute."
-msgstr "Cofnij 1 minutę do tyłu."
-
-#: src/player_qt.cpp:806
-msgid "Seek backward 10 seconds."
-msgstr "Cofnij 10 sekund do tyłu."
-
-#: src/player_qt.cpp:812
-msgid "Seek forward 10 seconds."
-msgstr "Przeskocz 10 sekund do przodu."
-
-#: src/player_qt.cpp:817
-msgid "Seek forward 1 minute."
-msgstr "Przeskocz 1 minutę do przodu."
-
-#: src/player_qt.cpp:823
-msgid "Seek forward 10 minutes."
-msgstr "Przeskocz 10 minut do przodu."
-
-#: src/player_qt.cpp:1052
-msgid "Display Color Adjustments"
-msgstr "Wyświetl regulację kolorów"
-
-#: src/player_qt.cpp:1054
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#: src/player_qt.cpp:1065
-msgid "Brightness:"
-msgstr "Jasność:"
 
-#: src/player_qt.cpp:1076
-msgid "Hue:"
-msgstr "Kolor:"
+#: src/main.cpp:465
+#, fuzzy
+msgid "Swap left/right view."
+msgstr "Zamień lewy/prawy"
 
-#: src/player_qt.cpp:1087
-msgid "Saturation:"
-msgstr "Nasycenie:"
+#: src/main.cpp:466
+#, fuzzy
+msgid "Fullscreen."
+msgstr "Podwójny ekran:"
 
-#: src/player_qt.cpp:1099 src/player_qt.cpp:1290 src/player_qt.cpp:1406
-#: src/player_qt.cpp:1695 src/player_qt.cpp:1875 src/player_qt.cpp:2546
-#: src/player_qt.cpp:2742 src/player_qt.cpp:2988
-msgid "OK"
-msgstr "OK"
+#: src/main.cpp:467
+#, fuzzy
+msgid "Use the listed screens in fullscreen mode."
+msgstr "Użyj wiele ekranów jako trybu \"pełnego ekranu\""
 
-#: src/player_qt.cpp:1261
-msgid "Display Crosstalk Calibration"
-msgstr "Wyświetl kalibrację \"crosstalk\""
+#: src/main.cpp:468
+msgid "Screen numbers start with 1."
+msgstr ""
 
-#. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/player_qt.cpp:1264
-msgid ""
-"Please read the manual to find out how to measure the crosstalk "
-"levels of your display."
+#: src/main.cpp:469
+msgid "An empty list defaults to the primary screen."
 msgstr ""
-"Proszę przeczytać instrukcję aby dowiedzieć się jak zmierzyć poziom "
-"\"crosstalk\" twojego monitora."
 
-#: src/player_qt.cpp:1268
-msgid "Red:"
-msgstr "Czerwony:"
+#: src/main.cpp:470
+#, fuzzy
+msgid "Flip left view vertically when fullscreen."
+msgstr "widok \"flip\" z lewej w pionie."
 
-#: src/player_qt.cpp:1275
-msgid "Green:"
-msgstr "Zielony:"
+#: src/main.cpp:471
+#, fuzzy
+msgid "Flop left view horizontally when fullscreen."
+msgstr "widok \"flop\" z lewej w poziomie."
 
-#: src/player_qt.cpp:1282
-msgid "Blue:"
-msgstr "Niebieski:"
+#: src/main.cpp:472
+#, fuzzy
+msgid "Flip right view vertically when fullscreen."
+msgstr "widok \"flip\" z prawej w pionie."
 
-#: src/player_qt.cpp:1348
-msgid "Subtitle Settings"
-msgstr "Ustawienia napisów"
+#: src/main.cpp:473
+#, fuzzy
+msgid "Flop right view horizontally when fullscreen."
+msgstr "widok \"flop\" z prawej w poziomie."
 
-#: src/player_qt.cpp:1350
-msgid "These settings apply to soft subtitles, but not to bitmaps."
-msgstr "Te ustawienia dotyczą zwykłych napisów, a nie w bitmapach."
+#: src/main.cpp:474
+msgid "Set zoom for wide videos (0=off to 1=full)."
+msgstr ""
 
-#: src/player_qt.cpp:1352
-msgid "Encoding:"
-msgstr "Kodowanie:"
+#: src/main.cpp:475
+msgid "Crop video to given aspect ratio (0:0=off)."
+msgstr ""
 
-#: src/player_qt.cpp:1353
-msgid "Set the subtitle character set encoding."
-msgstr "Ustaw kodowanie napisów."
+#: src/main.cpp:476
+#, fuzzy
+msgid "Center window on screen."
+msgstr "Wypośrodkuj obszar video na monitorze."
 
-#: src/player_qt.cpp:1367
-msgid "Override font:"
-msgstr "Zastąp czcionkę:"
+#: src/main.cpp:477
+#, fuzzy
+msgid "Set subtitle encoding."
+msgstr "kodek napisów"
 
-#: src/player_qt.cpp:1368
-msgid "Override the subtitle font family."
+#: src/main.cpp:478
+#, fuzzy
+msgid "Set subtitle font name."
 msgstr "Zastąp czcionkę napisu."
 
-#: src/player_qt.cpp:1376
-msgid "Override font size:"
-msgstr "Zastąp rozmiar czcionki:"
-
-#: src/player_qt.cpp:1377
-msgid "Override the subtitle font size."
+#: src/main.cpp:479
+#, fuzzy
+msgid "Set subtitle font size."
 msgstr "Zastąp rozmiar czcioni napisu."
 
-#: src/player_qt.cpp:1386
-msgid "Override scale factor:"
-msgstr "Zastąp współczynnik skali:"
-
-#: src/player_qt.cpp:1387
-msgid "Override the subtitle scale factor."
+#: src/main.cpp:480
+#, fuzzy
+msgid "Set subtitle scale factor."
 msgstr "Zastąp współczynnik skali napisu."
 
-#: src/player_qt.cpp:1397
-msgid "Override color:"
-msgstr "Zastąp kolor:"
-
-#: src/player_qt.cpp:1398
-msgid "Override the subtitle color."
-msgstr "Zastąp kolor napisu."
-
-#: src/player_qt.cpp:1644
-msgid "Stereoscopic Video Settings"
-msgstr "Ustawienia obrazu 3D"
-
-#: src/player_qt.cpp:1646
-msgid "Parallax:"
-msgstr "Paralaksa:"
+#: src/main.cpp:481
+msgid "Set subtitle color, in [AA]RRGGBB format."
+msgstr ""
 
-#: src/player_qt.cpp:1647
-msgid ""
-"Adjust parallax, from -1 to +1. This changes the separation of left and "
-"right view, and thus the perceived distance of the scene."
+#: src/main.cpp:482
+msgid "Subtitle parallax adjustment (-1 to +1)."
 msgstr ""
-"Regulacja paralaksy od -1 do +1. Zmiany oddzielają lewy i prawy obraz i "
-"wpływają na spostrzeganie dystansu w scenie."
 
-#: src/player_qt.cpp:1662
-msgid "Subtitle parallax:"
-msgstr "Paralaksa napisów:"
+#: src/main.cpp:483
+msgid "Parallax adjustment (-1 to +1)."
+msgstr ""
 
-#: src/player_qt.cpp:1663
-msgid ""
-"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
-"distance of the subtitles."
+#: src/main.cpp:484
+msgid "Crosstalk leak level (0 to 1)."
 msgstr ""
-"Regulacja paralaksy od -1 do +1. Zmiany wpływają na spostrzeganiu "
-"dystansu napisów względem danej sceny."
 
-#: src/player_qt.cpp:1678
-msgid "Ghostbusting:"
-msgstr "Ghostbusting :"
+#: src/main.cpp:485
+msgid "Comma-separated values for R,G,B."
+msgstr ""
 
-#: src/player_qt.cpp:1679
-msgid ""
-"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
-"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
-"does not work with anaglyph glasses."
+#: src/main.cpp:486
+msgid "Amount of ghostbusting to apply (0 to 1)."
 msgstr ""
-"Ustawienie ilości \"crosstalk ghostbusting\", od 0 do 1. Na początku "
-"powinieneś ustawić poziom \"crosstalk\" dla monitora. UWAGA. Ustawienie to "
-"nie działa przy okularach anaglifowych."
 
-#: src/player_qt.cpp:1826
-msgid "Open device"
-msgstr "Otwórz urządzenie"
+#: src/main.cpp:487
+msgid "Benchmark mode (no audio, show fps)."
+msgstr ""
 
-#: src/player_qt.cpp:1829
-msgid "Choose a device type."
-msgstr "Wybierz typ urządzenia."
+#: src/main.cpp:488
+msgid "Frame rate divisor for display refresh rate."
+msgstr ""
 
-#: src/player_qt.cpp:1830
-msgid "Default"
-msgstr "Domyślne"
+#: src/main.cpp:489
+msgid "Default is 0 for benchmark mode, 1 otherwise."
+msgstr ""
 
-#: src/player_qt.cpp:1834 src/player_qt.cpp:1837
-msgid "Choose a device."
-msgstr "Wybierz urządzenie"
+#: src/main.cpp:490
+msgid "Loop the input media."
+msgstr ""
 
-#: src/player_qt.cpp:1840
-msgid "Set the X11 device string. Refer to the manual for details."
+#: src/main.cpp:492
+msgid "Interactive control:"
 msgstr ""
-"Ustaw wartość urządzenia dla serwera X11. Szczegóły w dokumentacji."
 
-#: src/player_qt.cpp:1849
-msgid "Request frame size"
-msgstr "Wymagany rozmiar ramki"
+#: src/main.cpp:493
+#, fuzzy
+msgid "Leave fullscreen mode, or quit."
+msgstr "Kiedy w trybie \"pełnego ekranu\","
 
-#: src/player_qt.cpp:1850
-msgid ""
-"Request a specific frame size from the device, e.g. 640x480. The device "
-"must support this frame size. Some devices require a frame size to be "
-"selected."
-msgstr ""
-"Wymagany rozmiar ramki urządzenia (np: 640x480). Urządzenie musi "
-"obsługiwać tą wielkość ramki. Niektóre urządzenia wymagają wyboru rozmiaru "
-"ramki."
+#: src/main.cpp:494
+#, fuzzy
+msgid "Quit."
+msgstr "&Zakończ..."
 
-#: src/player_qt.cpp:1861
-msgid "Request frame rate"
-msgstr "Wymagany współczynnik \"fps\""
+#: src/main.cpp:515
+msgid "Seek according to horizontal click position."
+msgstr ""
 
-#: src/player_qt.cpp:1862
-msgid ""
-"Request a specific frame rate from the device, e.g. 25/1. The device must "
-"support this frame rate. Some devices require a frame rate to be selected.</"
-"p>"
+#: src/main.cpp:523
+msgid "No audio devices known."
 msgstr ""
-"Wymagany współczynnik \"fps\" urządzenia (np: 25/1). Urządzenie musi "
-"obsługiwać taki współczynnik. Niektóre urządzenia wymagają wyboru "
-"wspołczynnika \"fps\"."
 
-#: src/player_qt.cpp:1873 src/player_qt.cpp:2545 src/player_qt.cpp:2741
-msgid "Cancel"
-msgstr "Anuluj"
+#: src/main.cpp:595
+msgid "Benchmark mode: audio and time synchronization disabled."
+msgstr "Opcja testowa: audio i synchronizacja czasu wyłączona."
 
-#: src/player_qt.cpp:2048
-msgid "&File"
-msgstr "&Plik"
+#: src/main.cpp:729
+msgid "This version of Bino was compiled without support for LIRC."
+msgstr "Ta wersja bino została skompilowana bez obsługi LIRC."
 
-#: src/player_qt.cpp:2049
-msgid "&Open..."
-msgstr "&Otwórz..."
+#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
+#: src/media_data.cpp:935
+#, c-format
+msgid "%dx%d, %.3g:1"
+msgstr "%dx%d, %.3g:1"
 
-#: src/player_qt.cpp:2054
-msgid "Open &URL..."
-msgstr "Otwórz &URL..."
+#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
+#: src/media_data.cpp:1066
+#, c-format
+msgid "%s, %d ch., %g kHz, %d bit"
+msgstr "%s, %d ch., %g kHz, %d bit"
 
-#: src/player_qt.cpp:2058
-msgid "Open &device..."
-msgstr "Otwórz urządzenie..."
+#: src/media_input.cpp:282
+#, c-format
+msgid "Video %s: %s"
+msgstr "Video %s : %s"
 
-#: src/player_qt.cpp:2063
-msgid "&Quit..."
-msgstr "&Zakończ..."
+#: src/media_input.cpp:287
+msgid "No video."
+msgstr "Brak video."
 
-#: src/player_qt.cpp:2069
-msgid "&Preferences"
-msgstr "&Preferencje"
+#: src/media_input.cpp:293
+#, c-format
+msgid "Audio %s: %s"
+msgstr "Audio %s : %s"
 
-#: src/player_qt.cpp:2072
-msgid "&Fullscreen Settings..."
-msgstr "&Ustawienia dla pełnego ekranu..."
+#: src/media_input.cpp:298
+msgid "No audio."
+msgstr "Brak audio."
 
-#: src/player_qt.cpp:2075
-msgid "Display &Color Adjustments..."
-msgstr "Regulacja &koloru..."
+#: src/media_input.cpp:304
+#, c-format
+msgid "Subtitle %s: %s"
+msgstr "Napisy %s : %s"
 
-#: src/player_qt.cpp:2078
-msgid "Display Cross&talk Calibration..."
-msgstr "Kalibracja &Crosstalku..."
+#: src/media_input.cpp:309
+msgid "No subtitle."
+msgstr "Brak napisów."
 
-#: src/player_qt.cpp:2082
-msgid "&Subtitle Settings..."
-msgstr "Ustawienia &Napisów..."
+#: src/media_input.cpp:311
+#, c-format
+msgid "Duration: %g seconds"
+msgstr "Czas trwania: %g sekund"
 
-#: src/player_qt.cpp:2086
-msgid "Stereoscopic Video Settings..."
-msgstr "Ustawienia video 3D..."
+#: src/media_input.cpp:314
+#, c-format
+msgid "Stereo layout: %s"
+msgstr "Układ stereo: %s"
 
-#: src/player_qt.cpp:2089
-msgid "&Help"
-msgstr "&Pomoc"
+#: src/media_object.cpp:677
+#, c-format
+msgid "%s video stream %d: Unsupported stereo layout %s."
+msgstr "%s strumień video %d : Nie wspierany układ stereo %s."
 
-#: src/player_qt.cpp:2090
-msgid "&Manual..."
-msgstr "&Instrukcja..."
+#: src/media_object.cpp:715
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with %d channels."
+msgstr "%s strumień audio %d: Nie można obsłużyć audio z %d kanałem/ami."
 
-#: src/player_qt.cpp:2095
-msgid "&Website..."
-msgstr "&Strona..."
+#: src/media_object.cpp:744
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with sample format %s."
+msgstr "%s strumień audio %d: Nie można obsłużyć próbki formatu audio %s."
 
-#: src/player_qt.cpp:2099
-msgid "&Keyboard Shortcuts"
-msgstr "&Skróty klawiszy"
+#: src/media_object.cpp:800
+#, c-format
+msgid "No support available for %s device."
+msgstr "Brak dostępnego wsparcia dla urządzenia %s."
 
-#: src/player_qt.cpp:2103
-msgid "&About"
-msgstr "&O Bino"
+#: src/media_object.cpp:803
+msgid "default"
+msgstr "domyślne"
 
-#: src/player_qt.cpp:2169 src/player_qt.cpp:2891 src/player_qt.cpp:2899
-#: src/video_output_qt.cpp:92 src/video_output_qt.cpp:400
-#: src/video_output_qt.cpp:422
-msgid "Error"
-msgstr "Błąd"
+#: src/media_object.cpp:832
+#, c-format
+msgid "%s: Cannot read stream info: %s"
+msgstr "%s: Nie można odczytać strumienia info: %s"
 
-#: src/player_qt.cpp:2528
-msgid "Open files"
-msgstr "Otwórz pliki"
+#: src/media_object.cpp:876
+#, c-format
+msgid "%s stream %d: Cannot open %s: %s"
+msgstr "%s strumień %d : Nie można otworzyć %s : %s"
 
-#: src/player_qt.cpp:2541
-msgid "Open URL"
-msgstr "Otwórz URL"
+#: src/media_object.cpp:877
+msgid "video codec"
+msgstr "kodek video"
 
-#: src/player_qt.cpp:2542
-msgid "URL:"
-msgstr "URL :"
+#: src/media_object.cpp:878
+msgid "audio codec"
+msgstr "kodek audio"
 
-#: src/player_qt.cpp:2689
-msgid "Fullscreen/Multiscreen Settings"
-msgstr "Ustawienia pełny ekran/wiele ekranów"
+#: src/media_object.cpp:879
+msgid "subtitle codec"
+msgstr "kodek napisów"
 
-#: src/player_qt.cpp:2691
-msgid "Configure fullscreen mode:"
-msgstr "Konfiguracja trybu pełnego ekranu:"
+#: src/media_object.cpp:880
+msgid "data"
+msgstr "dane"
 
-#: src/player_qt.cpp:2692
-msgid "Select the screens to use in fullscreen mode."
-msgstr "Wybierz ekran do trybu \"pełnego ekranu\"."
+#: src/media_object.cpp:881
+msgid "codec not supported"
+msgstr "nie wspierany kodek"
 
-#: src/player_qt.cpp:2694
-msgid "Single screen:"
-msgstr "Pojedynczy ekran:"
+#: src/media_object.cpp:891
+#, c-format
+msgid "%s video stream %d: Invalid frame size."
+msgstr "%s strumień video %d: Zły rozmiar ramki."
 
-#: src/player_qt.cpp:2695
-msgid "Use a single screen for fullscreen mode."
-msgstr "Użyj pojedynczy ekran jako tryb \"pełnego ekranu\"."
+#: src/media_object.cpp:935
+#, c-format
+msgid "%s video stream %d: Cannot initialize conversion context."
+msgstr ""
+"%s strumień video %d: Nie można zainicjować konwersji zależnej od kontekstu."
 
-#: src/player_qt.cpp:2698
-msgid "Primary screen"
-msgstr "Pierwszy ekran"
+#: src/media_object.cpp:998
+#, c-format
+msgid "Video stream %d: %s / %s, %g seconds"
+msgstr "Strumień video %d: %s / %s, %g sekund"
 
-#: src/player_qt.cpp:2703 src/player_qt.cpp:2717 src/player_qt.cpp:2718
+#: src/media_object.cpp:1002
 #, c-format
-msgid "Screen %d"
-msgstr "Ekran %d"
+msgid "Using up to %d threads for decoding."
+msgstr "Użyj do %d wątków do dekodowania."
 
-#: src/player_qt.cpp:2707
-msgid "Dual screen:"
-msgstr "Podwójny ekran:"
+#: src/media_object.cpp:1007
+#, c-format
+msgid "Audio stream %d: %s / %s, %g seconds"
+msgstr "Strumień audio %d: %s / %s, %g sekund"
 
-#: src/player_qt.cpp:2708
-msgid "Use two screens for fullscreen mode."
-msgstr "Użyj dwóch ekranów jako trybu \"pełnego ekranu\"."
+#: src/media_object.cpp:1014
+#, c-format
+msgid "Subtitle stream %d: %s / %s, %g seconds"
+msgstr "Napisy %d: %s / %s, %g sekund"
 
-#: src/player_qt.cpp:2722
-msgid "Multi screen:"
-msgstr "Wiele ekranów:"
+#: src/media_object.cpp:1021
+msgid "No usable streams."
+msgstr "Brak użytecznych strumieni."
 
-#: src/player_qt.cpp:2723
-msgid "Use multiple screens for fullscreen mode."
-msgstr "Użyj wiele ekranów jako trybu \"pełnego ekranu\""
+#: src/media_object.cpp:1302 src/media_object.cpp:1332
+#: src/media_object.cpp:1362
+#, c-format
+msgid "%s: Cannot duplicate packet."
+msgstr "%s: Nie mogę skopiować pakietu."
 
-#: src/player_qt.cpp:2725
-msgid "Comma-separated list of screens to use for fullscreen mode."
-msgstr "Lista dostępnych ekranów do użycia w trybie \"pełnego ekranu\"."
+#: src/media_object.cpp:1456
+#, fuzzy, c-format
+msgid "%s video stream %d: Dropping %dx%d frame"
+msgstr "%s strumień video %d: Zły rozmiar ramki."
 
-#: src/player_qt.cpp:2729
-msgid "When in fullscreen mode,"
-msgstr "Kiedy w trybie \"pełnego ekranu\","
+#: src/media_object.cpp:1919
+#, c-format
+msgid "%s: Seeking failed."
+msgstr "%s: Przesuwanie zakończone niepowodzeniem ."
 
-#: src/player_qt.cpp:2730
-msgid "Set special left/right view handling for fullscreen mode."
-msgstr ""
-"Réglages spéciaux pour les vues droite et gauche en plein écran."
+#: src/player.cpp:434
+#, fuzzy, c-format
+msgid "Video: delay %g seconds/%g frames; dropping next frame."
+msgstr "Video: późnienie %g sekund; odrzucanie następnej ramki."
 
-#: src/player_qt.cpp:2732
-msgid "flip left view vertically."
-msgstr "widok \"flip\" z lewej w pionie."
+#: src/player.cpp:450
+#, c-format
+msgid "FPS: %.2f"
+msgstr "FPS : %.2f"
 
-#: src/player_qt.cpp:2734
-msgid "flop left view horizontally."
-msgstr "widok \"flop\" z lewej w poziomie."
+#: src/player_equalizer.cpp:116
+msgid "Reading input frame failed."
+msgstr "Odczytywanie wejściowej ramki zakończony niepowodzeniem."
 
-#: src/player_qt.cpp:2736
-msgid "flip right view vertically."
-msgstr "widok \"flip\" z prawej w pionie."
+#: src/player_equalizer.cpp:165 src/video_output_qt.cpp:590
+#: src/video_output_qt.cpp:597
+msgid "Waiting for subtitle renderer initialization..."
+msgstr "Oczekiwanie na inicjację renderowania napisów..."
 
-#: src/player_qt.cpp:2738
-msgid "flop right view horizontally."
-msgstr "widok \"flop\" z prawej w poziomie."
+#: src/player_equalizer.cpp:250
+msgid "Init data mapping failed."
+msgstr "Inicjowanie mapowanych danych nie powiodło się."
 
-#: src/player_qt.cpp:2891
-msgid "Cannot open manual."
-msgstr "Nie można otworzyć instrukcji."
+#: src/player_equalizer.cpp:251
+msgid "Frame data mapping failed."
+msgstr "Mapowanie danych ramki nie powiodło się."
 
-#: src/player_qt.cpp:2899
-msgid "Cannot open website."
-msgstr "Nie można otworzyć przeglądarki."
+#: src/player_equalizer.cpp:252
+msgid "Video player initialization failed."
+msgstr "Inicjacja odtwarzacza nie powiodła się."
 
-#: src/player_qt.cpp:2905
-msgid "Keyboard Shortcuts"
-msgstr "Skróty klawiszy"
+#: src/player_equalizer.cpp:253
+msgid "Need at least OpenGL 2.1."
+msgstr "Minimalna wymagana wersja OpenGL to 2.1."
 
-#. TRANSLATORS: This is a HTML table, shown under Help->Keyboard Shortcuts.
-#. Please make sure that your translation formats properly.
-#: src/player_qt.cpp:2908
-msgid ""
-"Keyboard control: <table><tr><td>q or ESC</td><td>Stop</td></"
-"tr><tr><td>p or SPACE</td><td>Pause / unpause</td></tr><tr><td>f</"
-"td><td>Toggle fullscreen</td></tr><tr><td>c</td><td>Center window</td></"
-"tr><tr><td>e</td><td>Swap left/right eye</td></tr><tr><td>v</td><td>Cycle "
-"through available video streams</td></tr><tr><td>a</td><td>Cycle through "
-"available audio streams</td></tr><tr><td>s</td><td>Cycle through available "
-"subtitle streams</td></tr><tr><td>1, 2</td><td>Adjust contrast</td></"
-"tr><tr><td>3, 4</td><td>Adjust brightness</td></tr><tr><td>5, 6</"
-"td><td>Adjust hue</td></tr><tr><td>7, 8</td><td>Adjust saturation</td></"
-"tr><tr><td>&lt;, &gt;</td><td>Adjust parallax</td></tr><tr><td>(, )</"
-"td><td>Adjust ghostbusting</td></tr><tr><td>left, right</td><td>Seek 10 "
-"seconds backward / forward</td></tr><tr><td>up, down</td><td>Seek 1 minute "
-"backward / forward</td></tr><tr><td>page up, page down</td><td>Seek 10 "
-"minutes backward / forward</td></tr></table>"
-msgstr ""
-"Kontrola klawiatury: <table><tr><td>q lub ESC</td><td>Wyjście</td></"
-"tr><tr><td>p lub SPACJA</td><td>Puauza / odtwarzaj</td></tr><tr><td>f</"
-"td><td>Przełączenie na cały ekran</td></tr><tr><td>c</td><td>Wypośrodkuj</"
-"td></tr><tr><td>e</td><td>Przełączanie lewe/prawe oko</td></tr><tr><td>v</"
-"td><td>Przełączanie pomiędzy strumieniami video</td></tr><tr><td>a</"
-"td><td>Przełączanie pomiędzy strumieniami audio</td></tr><tr><td>s</"
-"td><td>Przełączanie pomiędzy strumieniami napisów</td></tr><tr><td>1, 2</"
-"td><td>Regulacja kontrastu</td></tr><tr><td>3, 4</td><td>Regulacja jasności</"
-"td></tr><tr><td>5, 6</td><td>Regulacja kolorów</td></tr><tr><td>7, 8</"
-"td><td>Regulacja nasycenia</td></tr><tr><td>&lt;, &gt;</td><td>Regulacja "
-"paralaksy</td></tr><tr><td>(, )</td><td>Regulacja \"ghostbusting\"</td></"
-"tr><tr><td>lewy, prawy</td><td>Przewiń 10 sekund do przodu / do tyłu</td></"
-"tr><tr><td>góra, dół</td><td>Przewiń 1 minutę do przodu / do tyłu</td></"
-"tr><tr><td>w górę, w dół</td><td>Przewiń 10 minut do przodu / do tyłu</td></"
-"tr></table>"
-
-#: src/player_qt.cpp:2935
-#, c-format
-msgid "About %s"
-msgstr "O programie %s"
+#: src/player_equalizer.cpp:430
+msgid "No canvas in Equalizer configuration."
+msgstr "Brak obrazu w konfiguracji korektora."
 
-#: src/player_qt.cpp:2941
-#, c-format
-msgid "The %s 3D video player"
-msgstr "%s odtwarzacz 3D"
+#: src/player_equalizer.cpp:437
+#, fuzzy, c-format
+msgid "Equalizer canvas: %gx%g, aspect ratio %g:1"
+msgstr "%gx%g, proporcja obrazu %g:1"
 
-#: src/player_qt.cpp:2946
-#, c-format
+#: src/player_equalizer.cpp:922 src/video_output_qt.cpp:560
 msgid ""
-"%s version %s.Copyright (C) 2011 the Bino developers.This "
-"is free software. You may redistribute copies of it under the terms of the "
-"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
-"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
-"\"%s\">%s</a> for more information on this software."
-msgstr ""
-"%s version %s.Copyright (C) 2011 the Bino developers.This "
-"is free software. You may redistribute copies of it under the terms of the "
-"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
-"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
-"\"%s\">%s</a> for more information on this software."
-
-#: src/player_qt.cpp:2983
-msgid "About"
-msgstr "O programie"
+"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
+"objects."
+msgstr "Ta implementacja OpenGL 2.1 nie obsługuje obiektów \"framebuffer\"."
 
-#: src/player_qt.cpp:2984
-msgid "Libraries"
-msgstr "Biblioteki"
+#: src/player_equalizer.cpp:1105
+msgid "Equalizer initialization failed."
+msgstr "Inicjacja korektora nie powiodła się."
 
-#: src/player_qt.cpp:2985
-msgid "Team"
-msgstr "Zespół"
+#: src/player_equalizer.cpp:1113
+msgid "Cannot get equalizer configuration."
+msgstr "Nie można pobrać konfiguracji korektora."
 
-#: src/player_qt.cpp:2986
-msgid "License"
-msgstr "Licencja"
+#: src/player_equalizer.cpp:1127
+msgid "Equalizer configuration initialization failed."
+msgstr "Inicjacja konfiguracji korektora zakończona niepowodzeniem."
 
 #: src/subtitle_renderer.cpp:223
 msgid "Cannot initialize LibASS."
@@ -1477,81 +1840,381 @@
 msgid "Subtitle character set conversion failed: %s"
 msgstr "Ustawienie kodowania konwersji napisów zakończone niepowodzeniem: %s"
 
-#: src/video_output.cpp:363 src/video_output.cpp:473
-msgid "Cannot create a PBO buffer."
-msgstr "Nie można utworzyć buforu PBO."
-
-#: src/video_output_qt.cpp:313
-#, c-format
-msgid "Cannot initialize GLEW: %s"
-msgstr "Nie można zainicjować biblioteki GLEW: %s"
-
-#: src/video_output_qt.cpp:343
-msgid "Please wait"
-msgstr "Proszę czekać"
-
-#: src/video_output_qt.cpp:400 src/video_output_qt.cpp:417
-msgid "Cannot set OpenGL context format."
-msgstr "Nie można ustawić formatu OpenGL."
-
-#: src/video_output_qt.cpp:412
-msgid "The display does not support OpenGL stereo mode."
-msgstr "Nie obsługiwany tryb stereo OpenGL."
-
-#: src/video_output_qt.cpp:505
-msgid "Cannot suspend screensaver."
-msgstr "Nie można wstrzymać działania \"screensaver'a\"."
-
-#: src/video_output_qt.cpp:520
-msgid "Cannot resume screensaver."
-msgstr "Nie można wznowić działania \"screensaver'a\""
-
-#: src/xgl.cpp:200
-#, c-format
-msgid "OpenGL FBO error %s."
-msgstr "Błąd OpenGL FBO %s."
-
-#: src/xgl.cpp:217
+#: src/video_output.cpp:145
 #, c-format
 msgid "OpenGL error 0x%04X."
 msgstr "OpenGL błąd 0x%04X."
 
-#: src/xgl.cpp:282
+#: src/video_output.cpp:203
 #, c-format
 msgid "OpenGL %s '%s': compiler warning:"
 msgstr "OpenGL %s '%s': ostrzeżenie kompilatora:"
 
-#: src/xgl.cpp:283 src/xgl.cpp:292
+#: src/video_output.cpp:204 src/video_output.cpp:209
 msgid "vertex shader"
 msgstr "vertex shader"
 
-#: src/xgl.cpp:284 src/xgl.cpp:293
-msgid "geometry shader"
-msgstr "geometry shader"
-
-#: src/xgl.cpp:285 src/xgl.cpp:294
+#: src/video_output.cpp:204 src/video_output.cpp:209
 msgid "fragment shader"
 msgstr "fragment shader"
 
-#: src/xgl.cpp:291
+#: src/video_output.cpp:208
 #, c-format
 msgid "OpenGL %s '%s': compilation failed."
 msgstr "OpenGL %s '%s': kompilacja zakończona niepowodzeniem."
 
-#: src/xgl.cpp:296 src/xgl.cpp:363
+#: src/video_output.cpp:211 src/video_output.cpp:288
 msgid "unknown error"
 msgstr "nieznany błąd"
 
-#: src/xgl.cpp:357
+#: src/video_output.cpp:284
 #, c-format
 msgid "OpenGL program '%s': linker warning:"
 msgstr "OpenGL program '%s': ostrzeżenie linkowania:"
 
-#: src/xgl.cpp:362
+#: src/video_output.cpp:287
 #, c-format
 msgid "OpenGL program '%s': linking failed."
 msgstr "OpenGL program '%s': linkowanie zakończone niepowodzeniem."
 
+#: src/video_output.cpp:563 src/video_output.cpp:675
+msgid "Cannot create a PBO buffer."
+msgstr "Nie można utworzyć buforu PBO."
+
+#: src/video_output_qt.cpp:555
+#, c-format
+msgid "Cannot initialize GLEW: %s"
+msgstr "Nie można zainicjować biblioteki GLEW: %s"
+
+#: src/video_output_qt.cpp:588
+msgid "Please wait"
+msgstr "Proszę czekać"
+
+#: src/video_output_qt.cpp:643
+#, fuzzy
+msgid "Cannot get valid OpenGL context."
+msgstr "Nie można ustawić formatu OpenGL."
+
+#: src/video_output_qt.cpp:654
+msgid "The display does not support OpenGL stereo mode."
+msgstr "Nie obsługiwany tryb stereo OpenGL."
+
+#: src/video_output_qt.cpp:659
+msgid "Cannot set OpenGL context format."
+msgstr "Nie można ustawić formatu OpenGL."
+
+#: src/video_output_qt.cpp:752
+msgid "Cannot suspend screensaver."
+msgstr "Nie można wstrzymać działania \"screensaver'a\"."
+
+#: src/video_output_qt.cpp:767
+msgid "Cannot resume screensaver."
+msgstr "Nie można wznowić działania \"screensaver'a\""
+
+#~ msgid "Cannot initialize mutex: %s"
+#~ msgstr "Nie można zainicjować mutex: %s"
+
+#~ msgid "Cannot lock mutex: %s"
+#~ msgstr "Nie można zablokować mutex: %s"
+
+#~ msgid "Cannot unlock mutex: %s"
+#~ msgstr "Nie można odblokować mutex: %s"
+
+#~ msgid "Cannot create thread: %s"
+#~ msgstr "Nie można utworzyć wątku: %s"
+
+#~ msgid "Cannot join with thread: %s"
+#~ msgstr "Nie można podłączyć się do wątku: %s"
+
+#~ msgid "Cannot cancel thread: %s"
+#~ msgstr "Nie można anulować wyjątku: %s"
+
+#~ msgid ""
+#~ "Usage:\n"
+#~ " %s [option...] [file...]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --help Print help.\n"
+#~ " --version Print version.\n"
+#~ " -n|--no-gui Do not use the GUI, just show a plain window.\n"
+#~ " -L|--log-level=LEVEL Set log level (debug/info/warning/error/"
+#~ "quiet).\n"
+#~ " --device-type=TYPE Type of input device: default, firewire, x11.\n"
+#~ " --device-frame-size=WxH Request frame size WxH from input device.\n"
+#~ " --device-frame-rate=N/D Request frame rate N/D from input device.\n"
+#~ " --lirc-config=FILE Use the given LIRC configuration file. This\n"
+#~ " option can be used more than once.\n"
+#~ " -v|--video=STREAM Select video stream (1-n, depending on "
+#~ "input).\n"
+#~ " -a|--audio=STREAM Select audio stream (1-n, depending on "
+#~ "input).\n"
+#~ " -s|--subtitle=STREAM Select subtitle stream (0-n, dep. on input).\n"
+#~ " -i|--input=TYPE Select input type (default autodetect):\n"
+#~ " mono Single view.\n"
+#~ " separate-left-right Left/right separate streams, left first.\n"
+#~ " separate-right-left Left/right separate streams, right first.\n"
+#~ " top-bottom Left top, right bottom.\n"
+#~ " top-bottom-half Left top, right bottom, half height.\n"
+#~ " bottom-top Left bottom, right top.\n"
+#~ " bottom-top-half Left bottom, right top, half height.\n"
+#~ " left-right Left left, right right.\n"
+#~ " left-right-half Left left, right right, half width.\n"
+#~ " right-left Left right, right left.\n"
+#~ " right-left-half Left right, right left, half width.\n"
+#~ " even-odd-rows Left even rows, right odd rows.\n"
+#~ " odd-even-rows Left odd rows, right even rows.\n"
+#~ " -o|--output=TYPE Select output type:\n"
+#~ " mono-left Only left.\n"
+#~ " mono-right Only right.\n"
+#~ " top-bottom Left top, right bottom.\n"
+#~ " top-bottom-half Left top, right bottom, half height.\n"
+#~ " left-right Left left, right right.\n"
+#~ " left-right-half Left left, right right, half width.\n"
+#~ " even-odd-rows Left even rows, right odd rows.\n"
+#~ " even-odd-columns Left even columns, right odd columns.\n"
+#~ " checkerboard Left and right in checkerboard pattern.\n"
+#~ " hdmi-frame-pack HDMI frame packing mode.\n"
+#~ " red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
+#~ " red-cyan-half-color Red/cyan anaglyph, half color method.\n"
+#~ " red-cyan-full-color Red/cyan anaglyph, full color method.\n"
+#~ " red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
+#~ " green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
+#~ " green-magenta-half-color Green/magenta anaglyph, half color method.\n"
+#~ " green-magenta-full-color Green/magenta anaglyph, full color method.\n"
+#~ " green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
+#~ " amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
+#~ " amber-blue-half-color Amber/blue anaglyph, half color method.\n"
+#~ " amber-blue-full-color Amber/blue anaglyph, full color method.\n"
+#~ " amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
+#~ " red-green-monochrome Red/green anaglyph, monochrome method.\n"
+#~ " red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
+#~ " stereo OpenGL quad-buffered stereo.\n"
+#~ " equalizer Multi-display via Equalizer (2D setup).\n"
+#~ " equalizer-3d Multi-display via Equalizer (3D setup).\n"
+#~ " -S|--swap-eyes Swap left/right view.\n"
+#~ " -f|--fullscreen Fullscreen.\n"
+#~ " --fullscreen-screens= Use the listed screens in fullscreen mode.\n"
+#~ " [S0[,S1[,...]]] Screen numbers start with 1. The default\n"
+#~ " (empty list) is to use the primary screen.\n"
+#~ " --fullscreen-flip-left Flip left view vertically when fullscreen.\n"
+#~ " --fullscreen-flop-left Flop left view horizontally when fullscreen.\n"
+#~ " --fullscreen-flip-right Flip right view vertically when fullscreen.\n"
+#~ " --fullscreen-flop-right Flop right view horizontally when fullscreen.\n"
+#~ " -c|--center Center window on screen.\n"
+#~ " --subtitle-encoding=ENC Set subtitle encoding.\n"
+#~ " --subtitle-font=FONT Set subtitle font name.\n"
+#~ " --subtitle-size=N Set subtitle font size.\n"
+#~ " --subtitle-scale=S Set subtitle scale factor.\n"
+#~ " --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
+#~ " --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
+#~ " -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
+#~ " -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-"
+#~ "separated\n"
+#~ " values for the R,G,B channels.\n"
+#~ " -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
+#~ " -b|--benchmark Benchmark mode (no audio, show fps).\n"
+#~ " -l|--loop Loop the input media.\n"
+#~ "\n"
+#~ "Interactive control:\n"
+#~ " ESC Leave fullscreen mode, or quit.\n"
+#~ " q Quit.\n"
+#~ " p or SPACE Pause / unpause.\n"
+#~ " f Toggle fullscreen.\n"
+#~ " c Center window.\n"
+#~ " e Swap left/right eye.\n"
+#~ " v Cycle through available video streams.\n"
+#~ " a Cycle through available audio streams.\n"
+#~ " s Cycle through available subtitle streams.\n"
+#~ " 1, 2 Adjust contrast.\n"
+#~ " 3, 4 Adjust brightness.\n"
+#~ " 5, 6 Adjust hue.\n"
+#~ " 7, 8 Adjust saturation.\n"
+#~ " <, > Adjust parallax.\n"
+#~ " (, ) Adjust ghostbusting.\n"
+#~ " left, right Seek 10 seconds backward / forward.\n"
+#~ " up, down Seek 1 minute backward / forward.\n"
+#~ " page up, page down Seek 10 minutes backward / forward.\n"
+#~ " Mouse click Seek according to horizontal click position."
+#~ msgstr ""
+#~ "Użycie:\n"
+#~ " %s [opcje...] [plik...]\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ " --help Wyświetla pomoc.\n"
+#~ " --version Wyświetla wersję.\n"
+#~ " -n|--no-gui Nie używaj GUI, tylko pokazuje okno.\n"
+#~ " -L|--log-level=LEVEL Ustaw poziom logów (debug/info/warning/error/"
+#~ "quiet).\n"
+#~ " --device-type=TYPE Typ wejściowego urządzenia: default, firewire, "
+#~ "x11.\n"
+#~ " --device-frame-size=WxH Wymagany rozmiar ramki WxH z urządzenia "
+#~ "wejściowego.\n"
+#~ " --device-frame-rate=N/D Wymagana wartość odświeżania ramki N/D z "
+#~ "urządzenia wejściowego.\n"
+#~ " --lirc-config=FILE Użyj podanego pliku konfiguracyjnego. Ta\n"
+#~ " opcja może być użyta więcej niż jeden raz.\n"
+#~ " -v|--video=STREAM Wybierz strumień video (1-n, zależnie od "
+#~ "wejścia).\n"
+#~ " -a|--audio=STREAM Wybierz strumień audio (1-n, zależnie od "
+#~ "wejścia).\n"
+#~ " -s|--subtitle=STREAM Select subtitle stream (0-n, zależnie od "
+#~ "wejście).\n"
+#~ " -i|--input=TYPE Wybór typu wejścia (domyślnie: autodetekcja):\n"
+#~ " mono Pojedyńczy strumien.\n"
+#~ " separate-left-right Lewy/prawy oddzielne strumienie, lewy "
+#~ "pierwszy.\n"
+#~ " separate-right-left Lewy/prawy oddzielne strumienie, prawy "
+#~ "pierwszy.\n"
+#~ " top-bottom Lewy góra, prawy dół.\n"
+#~ " top-bottom-half Lewy góra, prawy dół, połowa wysokości.\n"
+#~ " bottom-top Lewy dół, prawy góra.\n"
+#~ " bottom-top-half Lewy dół, prawy góra, połowa wysokości.\n"
+#~ " left-right Lewy lewy, prawy prawy.\n"
+#~ " left-right-half Lewy lewy, prawy prawy, połowa szerokości.\n"
+#~ " right-left Lewy prawy, prawy lewy.\n"
+#~ " right-left-half Lewy prawy, prawy lewy, połowa szerokości.\n"
+#~ " even-odd-rows Lewy parzysty rząd, prawy nieparzysty rząd.\n"
+#~ " odd-even-rows Lewy nieparzysty rząd, prawy parzysty rząd.\n"
+#~ " -o|--output=TYPE Wybór typu wyjścia:\n"
+#~ " mono-left Tylko lewy.\n"
+#~ " mono-right Tylko prawy.\n"
+#~ " top-bottom Lewy góra, prawy dół.\n"
+#~ " top-bottom-half Lewy góra, prawy dół, połowa wysokości.\n"
+#~ " left-right Lewy lewy, prawy prawy.\n"
+#~ " left-right-half Lewy lewy, prawy prawy, połowa szerokości.\n"
+#~ " even-odd-rows Lewy parzysty rząd, prawy nieparzysty rząd.\n"
+#~ " even-odd-columns Lewy parzyste kolumny, prawy nieparzyste "
+#~ "kolumny.\n"
+#~ " checkerboard Lewy i prawy jako wzór szachownicy.\n"
+#~ " hdmi-frame-pack Tryb opakowanej ramki HDMI.\n"
+#~ " red-cyan-monochrome Czerwony/cyjan - anaglif, czarnobiały.\n"
+#~ " red-cyan-half-color Czerwony/cyjan - anaglif, połowa koloru.\n"
+#~ " red-cyan-full-color Czerwony/cyjan - anaglif, pełny kolor.\n"
+#~ " red-cyan-dubois Czerwony/cyjan - anaglif, Dubois.\n"
+#~ " green-magenta-monochrome Zielony/karmazynowy - anaglif, "
+#~ "czarnobiały.\n"
+#~ " green-magenta-half-color Zielony/karmazynowy - anaglif, połowa "
+#~ "koloru.\n"
+#~ " green-magenta-full-color Zielony/karmazynowy - anaglif, pełny "
+#~ "kolor.\n"
+#~ " green-magenta-dubois Zielony/karmazynowy - anaglif, Dubois.\n"
+#~ " amber-blue-monochrome Bursztyn/niebieski - anaglif, monochrome "
+#~ "method.\n"
+#~ " amber-blue-half-color Bursztyn/niebieski - anaglif, połowa "
+#~ "koloru.\n"
+#~ " amber-blue-full-color Bursztyn/niebieski - anaglif, pełny kolor.\n"
+#~ " amber-blue-dubois Bursztyn/niebieski - anaglif, Dubois.\n"
+#~ " red-green-monochrome Czerwony/zielony - anaglif, czarnobiały.\n"
+#~ " red-blue-monochrome Czerwony/niebieski - anaglif, czarnobiały.\n"
+#~ " stereo OpenGL quad-buffered stereo.\n"
+#~ " equalizer Multi-display przez Equalizer (ustawianie "
+#~ "2D).\n"
+#~ " equalizer-3d Multi-display via Equalizer (ustawianie "
+#~ "3D).\n"
+#~ " -S|--swap-eyes Zamiana widoku lewy/prawy.\n"
+#~ " -f|--fullscreen Pełny ekran.\n"
+#~ " --fullscreen-screens= Użycie podanych ekranów w opcji pełnego "
+#~ "ekranu.\n"
+#~ " [S0[,S1[,...]]] Numery ekranów zaczynając od 1. Domyślnie\n"
+#~ " (pusta lista) używany jest pierwszy ekran.\n"
+#~ " --fullscreen-flip-left Widok \"flip\" z lewej w pionie w trybie "
+#~ "\"pełnego ekranu\".\n"
+#~ " --fullscreen-flop-left Widok \"flop\" z lewej w poziomie w trybie "
+#~ "\"pełnego ekranu\".\n"
+#~ " --fullscreen-flip-right Widok \"flip\" z prawej w pionie w trybie "
+#~ "\"pełnego ekranu\".\n"
+#~ " --fullscreen-flop-right Widok \"flop\" z prawej w poziomie w trybie "
+#~ "\"pełnego ekranu\".\n"
+#~ " -c|--center Wycentrowanie.\n"
+#~ " --subtitle-encoding=ENC Ustaw kodowanie napisów.\n"
+#~ " --subtitle-font=FONT Ustaw nazwę fontów.\n"
+#~ " --subtitle-size=N Ustaw rozmiar napisów.\n"
+#~ " --subtitle-scale=S Ustaw skalę napisów.\n"
+#~ " --subtitle-color=COLOR Ustaw kolor napisów, jako format [AA]RRGGBB.\n"
+#~ " --subtitle-parallax=VAL Regulacja paralaksy napisów (-1 do +1).\n"
+#~ " -P|--parallax=VAL Regulacja paralaksy (-1 do +1).\n"
+#~ " -C|--crosstalk=VAL Poziom nieszczelności \"crosstalk\" (0 to 1); "
+#~ "oddzielne\n"
+#~ " wartości dla kanałów the R,G,B.\n"
+#~ " -G|--ghostbust=VAL Suma zwróconych \"duchów\" (0 do 1).\n"
+#~ " -b|--benchmark Tryb Benchmark (bez audio, pokazuje fps).\n"
+#~ " -l|--loop Pętla mediów wejściowych.\n"
+#~ "\n"
+#~ "Kontrola interaktywna:\n"
+#~ " ESC \tOpuszczenie trybu pełnego ekranu, lub wyjście.\n"
+#~ " q\t\t\tWyjście.\n"
+#~ " p lub SPACE Pauza / wyłączenie pauzy.\n"
+#~ " f Przełącznik do trybu pełnego ekranu.\n"
+#~ " c Wypośrodkowanie.\n"
+#~ " e Zamiana lewe/prawe oko.\n"
+#~ " v Przełączanie dostępnych strumieni video.\n"
+#~ " a Przełączanie dostępnych strumieni audio.\n"
+#~ " s Przełączanie dostępnych strumieni napisów.\n"
+#~ " 1, 2 Regulacja poziomu kontrastu.\n"
+#~ " 3, 4 Regulacja poziomu jasności.\n"
+#~ " 5, 6 Regulacja poziomu kolorów.\n"
+#~ " 7, 8 Regulacja poziomu nasycenia.\n"
+#~ " <, > Regulacja paralaksy.\n"
+#~ " (, ) Regulacja \"duchów\".\n"
+#~ " left, right Przesuń 10 sekund do tyłu / do przodu.\n"
+#~ " up, down Przesuń 1 minutę do tyłu / do przodu.\n"
+#~ " page up, page down Przesuń 10 minut do tyłu / do przodu.\n"
+#~ " Mouse click Przesuń zgodnie z pozycją myszki na suwaku "
+#~ "czasu.."
+
+#~ msgid "Equalizer canvas:"
+#~ msgstr "Obraz korektora:"
+
+#~ msgid "Area for %g:1 video: [ %g %g %g %g @ %g ]"
+#~ msgstr "Obszar dla %g:1 video: [ %g %g %g %g @ %g ]"
+
+#~ msgid "Stereoscopic Video Settings"
+#~ msgstr "Ustawienia obrazu 3D"
+
+#~ msgid "&Open..."
+#~ msgstr "&Otwórz..."
+
+#~ msgid "URL:"
+#~ msgstr "URL :"
+
+#~ msgid ""
+#~ "Keyboard control: <table><tr><td>q or ESC</td><td>Stop</td></"
+#~ "tr><tr><td>p or SPACE</td><td>Pause / unpause</td></tr><tr><td>f</"
+#~ "td><td>Toggle fullscreen</td></tr><tr><td>c</td><td>Center window</td></"
+#~ "tr><tr><td>e</td><td>Swap left/right eye</td></tr><tr><td>v</td><td>Cycle "
+#~ "through available video streams</td></tr><tr><td>a</td><td>Cycle through "
+#~ "available audio streams</td></tr><tr><td>s</td><td>Cycle through "
+#~ "available subtitle streams</td></tr><tr><td>1, 2</td><td>Adjust contrast</"
+#~ "td></tr><tr><td>3, 4</td><td>Adjust brightness</td></tr><tr><td>5, 6</"
+#~ "td><td>Adjust hue</td></tr><tr><td>7, 8</td><td>Adjust saturation</td></"
+#~ "tr><tr><td>&lt;, &gt;</td><td>Adjust parallax</td></tr><tr><td>(, )</"
+#~ "td><td>Adjust ghostbusting</td></tr><tr><td>left, right</td><td>Seek 10 "
+#~ "seconds backward / forward</td></tr><tr><td>up, down</td><td>Seek 1 "
+#~ "minute backward / forward</td></tr><tr><td>page up, page down</"
+#~ "td><td>Seek 10 minutes backward / forward</td></tr></table>"
+#~ msgstr ""
+#~ "Kontrola klawiatury: <table><tr><td>q lub ESC</td><td>Wyjście</td></"
+#~ "tr><tr><td>p lub SPACJA</td><td>Puauza / odtwarzaj</td></tr><tr><td>f</"
+#~ "td><td>Przełączenie na cały ekran</td></tr><tr><td>c</td><td>Wypośrodkuj</"
+#~ "td></tr><tr><td>e</td><td>Przełączanie lewe/prawe oko</td></tr><tr><td>v</"
+#~ "td><td>Przełączanie pomiędzy strumieniami video</td></tr><tr><td>a</"
+#~ "td><td>Przełączanie pomiędzy strumieniami audio</td></tr><tr><td>s</"
+#~ "td><td>Przełączanie pomiędzy strumieniami napisów</td></tr><tr><td>1, 2</"
+#~ "td><td>Regulacja kontrastu</td></tr><tr><td>3, 4</td><td>Regulacja "
+#~ "jasności</td></tr><tr><td>5, 6</td><td>Regulacja kolorów</td></"
+#~ "tr><tr><td>7, 8</td><td>Regulacja nasycenia</td></tr><tr><td>&lt;, &gt;</"
+#~ "td><td>Regulacja paralaksy</td></tr><tr><td>(, )</td><td>Regulacja "
+#~ "\"ghostbusting\"</td></tr><tr><td>lewy, prawy</td><td>Przewiń 10 sekund "
+#~ "do przodu / do tyłu</td></tr><tr><td>góra, dół</td><td>Przewiń 1 minutę "
+#~ "do przodu / do tyłu</td></tr><tr><td>w górę, w dół</td><td>Przewiń 10 "
+#~ "minut do przodu / do tyłu</td></tr></table>"
+
+#~ msgid "OpenGL FBO error %s."
+#~ msgstr "Błąd OpenGL FBO %s."
+
+#~ msgid "geometry shader"
+#~ msgstr "geometry shader"
+
 #~ msgid "Unknown exception."
 #~ msgstr "Nieznany wyjątek."

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

bino-1.2.1.tar.bz2/po/ru.po -> bino-1.3.2.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: 2011-10-10 21:25+0200\n"
+"POT-Creation-Date: 2012-03-16 19:49+0100\n"
 "PO-Revision-Date: 2011-08-28 01:00+0600\n"
 "Last-Translator: Alexey Osipov <simba@lerlan.ru>\n"
 "Language-Team: \n"
@@ -15,934 +15,417 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/base/dbg.cpp:50
+#: src/base/dbg.cpp:49
 #, c-format
 msgid "Caught signal %d (%s). Aborting."
 msgstr "Остановка по сигналу %d (%s)."
 
-#: src/base/dbg.cpp:57
+#: src/base/dbg.cpp:56
 msgid "Unexpected exception."
 msgstr "Непредвиденное исключение."
 
 #. TRANSLATORS: %s will be a mail address.
-#: src/base/dbg.cpp:145
+#: src/base/dbg.cpp:221
 #, c-format
 msgid "Report bugs to <%s>."
 msgstr "Сообщения об ошибках принимаются по адресу <%s>."
 
-#: src/base/exc.cpp:54 src/base/exc.cpp:72 src/base/exc.cpp:106
+#: src/base/exc.cpp:52 src/base/exc.cpp:70 src/base/exc.cpp:104
 #, c-format
 msgid "Exception: %s"
 msgstr "Исключение: %s"
 
-#: src/base/opt.cpp:151
+#: src/base/opt.cpp:168
 #, c-format
 msgid "Invalid option %s."
 msgstr "Неверная опция %s."
 
-#: src/base/opt.cpp:155
+#: src/base/opt.cpp:172
 #, c-format
 msgid "Option --%s does not take an argument."
 msgstr "Опция --%s используется без аргументов."
 
-#: src/base/opt.cpp:160
+#: src/base/opt.cpp:177
 #, c-format
 msgid "Invalid option -%c."
 msgstr "Неверная опция -%c."
 
-#: src/base/opt.cpp:169
+#: src/base/opt.cpp:186
 #, c-format
 msgid "Option --%s requires an argument."
 msgstr "Опция --%s требует наличия аргумента."
 
-#: src/base/opt.cpp:174
+#: src/base/opt.cpp:191
 #, c-format
 msgid "Option -%c requires an argument."
 msgstr "Опция -%c требует наличия аргумента."
 
-#: src/base/opt.cpp:195
+#: src/base/opt.cpp:212
 #, c-format
 msgid "Invalid argument for -%c."
 msgstr "Неверный аргумент для %c."
 
-#: src/base/opt.cpp:199
+#: src/base/opt.cpp:216
 #, c-format
 msgid "Invalid argument for --%s."
 msgstr "Неверный аргумент для --%s."
 
-#: src/base/opt.cpp:218
+#: src/base/opt.cpp:239
 #, c-format
 msgid "Option --%s (-%c) is mandatory."
 msgstr "Опция --%s (-%c) обязательна."
 
-#: src/base/opt.cpp:222
+#: src/base/opt.cpp:243
 #, c-format
 msgid "Option --%s is mandatory."
 msgstr "Опция --%s обязательна."
 
-#: src/base/opt.cpp:236
+#: src/base/opt.cpp:257
 msgid "Too few arguments."
 msgstr "Слишком мало параметров."
 
-#: src/base/opt.cpp:241
+#: src/base/opt.cpp:262
 msgid "Too many arguments."
 msgstr "Слишком много параметров."
 
-#: src/base/str.cpp:226
+#: src/base/str.cpp:236
 #, c-format
 msgid "Cannot convert string to %s."
 msgstr "Невозможно преобразовать строку в %s."
 
-#: src/base/str.cpp:411 src/base/str.cpp:429 src/base/str.cpp:439
-#: src/base/str.cpp:450
+#: src/base/str.cpp:455 src/base/str.cpp:473 src/base/str.cpp:483
+#: src/base/str.cpp:494 src/base/str.cpp:499
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Невозможно преобразовать %s в %s."
 
-#: src/base/thread.cpp:40 src/base/thread.cpp:51
-#, c-format
-msgid "Cannot initialize mutex: %s"
-msgstr "Невозможно инициализировать mutex: %s"
-
-#: src/base/thread.cpp:65
-#, c-format
-msgid "Cannot lock mutex: %s"
-msgstr "Невозможно заблокировать mutex: %s"
-
-#: src/base/thread.cpp:79
-#, c-format
-msgid "Cannot unlock mutex: %s"
-msgstr "Невозможно разблокировать mutex: %s"
-
-#: src/base/thread.cpp:145
-#, c-format
-msgid "Cannot create thread: %s"
-msgstr "Невозможно создать поток: %s"
-
-#: src/base/thread.cpp:160
-#, c-format
-msgid "Cannot join with thread: %s"
-msgstr "Невозможно присоединиться к потоку: %s"
-
-#: src/base/thread.cpp:182
-#, c-format
-msgid "Cannot cancel thread: %s"
-msgstr "Невозможно отменить поток: %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
+msgid "System function failed: "
+msgstr ""
 
-#: src/base/timer.cpp:69 src/base/timer.cpp:81 src/base/timer.cpp:95
+#: src/base/timer.cpp:63 src/base/timer.cpp:72 src/base/timer.cpp:81
 msgid "Cannot get time."
 msgstr "Невозможно получить время."
 
-#: src/audio_output.cpp:61
+#: src/audio_output.cpp:88
 msgid "No OpenAL device available."
 msgstr "Устройства OpenAL не доступны."
 
-#: src/audio_output.cpp:66
+#: src/audio_output.cpp:93 src/audio_output.cpp:99
+#, fuzzy, c-format
+msgid "OpenAL device '%s' is not available."
+msgstr "Устройства OpenAL не доступны."
+
+#: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
+#: src/media_data.cpp:1067 src/media_data.cpp:1090 src/media_data.cpp:1128
+#: src/media_data.cpp:1133
+msgid "unknown"
+msgstr "неизвестно"
+
+#: src/audio_output.cpp:106
 msgid "No OpenAL context available."
 msgstr "Контекст OpenAL не доступен."
 
-#: src/audio_output.cpp:77
+#: src/audio_output.cpp:117
 msgid "Cannot create OpenAL buffers."
 msgstr "Невозможно создать буферы OpenAL."
 
-#: src/audio_output.cpp:86
+#: src/audio_output.cpp:126
 msgid "Cannot create OpenAL source."
 msgstr "Невозможно создать источник OpenAL."
 
-#: src/audio_output.cpp:99
+#: src/audio_output.cpp:139
 msgid "Cannot set OpenAL source parameters."
 msgstr "Невозможно установить параметры источника OpenAL."
 
-#: src/audio_output.cpp:153
+#: src/audio_output.cpp:193
 msgid "Cannot check OpenAL source state."
 msgstr "Невозможно проверить состояние источника OpenAL."
 
-#: src/audio_output.cpp:160
+#: src/audio_output.cpp:200
 msgid "Cannot restart OpenAL source playback."
 msgstr "Невозможно возобновить воспроизведение источника OpenAL."
 
-#: src/audio_output.cpp:313
+#: src/audio_output.cpp:353
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr "Для формата аудио %s не найдено подходящих форматов OpenAL."
 
-#: src/audio_output.cpp:340
+#: src/audio_output.cpp:369
+#, fuzzy
+msgid "Cannot set OpenAL audio volume."
+msgstr "Невозможно создать источник OpenAL."
+
+#: src/audio_output.cpp:395
 msgid "Cannot buffer initial OpenAL data."
 msgstr "Невозможно буферизировать начальные данные OpenAL."
 
-#: src/audio_output.cpp:354
+#: src/audio_output.cpp:409
 msgid "Cannot buffer OpenAL data."
 msgstr "Невозможно буферизировать данные OpenAL."
 
-#: src/audio_output.cpp:379
+#: src/audio_output.cpp:434
 msgid "Cannot start OpenAL source playback."
 msgstr "Невозможно начать воспроизведение источника OpenAL."
 
-#: src/audio_output.cpp:393
+#: src/audio_output.cpp:448
 msgid "Cannot pause OpenAL source playback."
 msgstr "Невозможно приостановить воспроизведение источника OpenAL."
 
-#: src/audio_output.cpp:402
+#: src/audio_output.cpp:457
 msgid "Cannot unpause OpenAL source playback."
 msgstr "Невозможно возобновить воспроизведение источника OpenAL."
 
-#: src/audio_output.cpp:411
+#: src/audio_output.cpp:466
 msgid "Cannot stop OpenAL source playback."
 msgstr "Невозможно остановить воспроизведение источника OpenAL."
 
-#: src/audio_output.cpp:422
+#: src/audio_output.cpp:477
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Невозможно получить из очереди буферы источника OpenAL."
 
-#: src/lib_versions.cpp:121 src/lib_versions.cpp:158 src/media_data.cpp:422
-#: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
-msgid "unknown"
-msgstr "неизвестно"
-
-#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
-msgid "not used"
-msgstr "не используется"
-
-#: src/lirc.cpp:63
-msgid "Cannot initialize LIRC."
-msgstr "Невозможно инициализировать LIRC."
-
-#: src/lirc.cpp:69
-msgid "Cannot set LIRC socket properties."
-msgstr "Невозможно установить параметры LIRC сокета."
+#: src/dispatch.cpp:156
+msgid "Cannot connect to X server."
+msgstr "Невозможно присоединиться к X серверу."
 
-#: src/lirc.cpp:76
-msgid "Cannot read LIRC default configuration."
-msgstr "Невозможно прочитать конфигурацию LIRC по умолчанию."
+#: src/dispatch.cpp:171
+msgid "No video to play."
+msgstr "Нет видео для воспроизведения."
 
-#: src/lirc.cpp:91
-#, c-format
-msgid "Cannot read LIRC configuration file %s."
-msgstr "Невозможно прочитать конфигурацию LIRC из файла %s."
+#: src/dispatch.cpp:411 src/player_equalizer.cpp:84
+msgid "No video streams found."
+msgstr "Видео дорожек не найдено."
 
-#: src/lirc.cpp:140
-msgid "Cannot get LIRC event; disabling LIRC support."
-msgstr "Невозможно получить событие LIRC; отключаю поддержку LIRC."
+#: src/dispatch.cpp:428
+msgid "Cannot set requested stereo layout: incompatible media."
+msgstr ""
+"Невозможно установить требуемую стерео раскладку: неподходящий носитель."
 
-#: src/lirc.cpp:154
+#: src/dispatch.cpp:443
 #, c-format
-msgid "Received invalid command '%s' from LIRC."
-msgstr "От LIRC получена некорректная команда '%s'."
-
-#: src/lirc.cpp:164
-msgid "Cannot get command for LIRC code."
-msgstr "Невозможно получить команду для LIRC кода."
+msgid "Video stream %d not found."
+msgstr "Видео дорожка %d не найдена."
 
-#: src/main.cpp:325
+#: src/dispatch.cpp:449
 #, c-format
-msgid "%s version %s"
-msgstr "%s версия %s"
-
-#: src/main.cpp:326
-msgid "Copyright (C) 2011 the Bino developers."
-msgstr "Copyright (C) 2011 Разработчики Bino."
-
-#: src/main.cpp:327
-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:330 src/player_qt.cpp:2958
-msgid "Platform:"
-msgstr "Платформа:"
-
-#: src/main.cpp:332 src/player_qt.cpp:2959
-msgid "Libraries used:"
-msgstr "Используемые библиотеки:"
+msgid "Audio stream %d not found."
+msgstr "Аудио дорожка %d не найдена."
 
-#. TRANSLATORS: This is the --help text. Translate only the description,
-#. not the option names. Please keep a proper indentation with spaces, and
-#. keep the line length limited.
-#: src/main.cpp:344
+#: src/dispatch.cpp:457
 #, c-format
-msgid ""
-"Usage:\n"
-" %s [option...] [file...]\n"
-"\n"
-"Options:\n"
-" --help Print help.\n"
-" --version Print version.\n"
-" -n|--no-gui Do not use the GUI, just show a plain window.\n"
-" -L|--log-level=LEVEL Set log level (debug/info/warning/error/quiet).\n"
-" --device-type=TYPE Type of input device: default, firewire, x11.\n"
-" --device-frame-size=WxH Request frame size WxH from input device.\n"
-" --device-frame-rate=N/D Request frame rate N/D from input device.\n"
-" --lirc-config=FILE Use the given LIRC configuration file. This\n"
-" option can be used more than once.\n"
-" -v|--video=STREAM Select video stream (1-n, depending on input).\n"
-" -a|--audio=STREAM Select audio stream (1-n, depending on input).\n"
-" -s|--subtitle=STREAM Select subtitle stream (0-n, dep. on input).\n"
-" -i|--input=TYPE Select input type (default autodetect):\n"
-" mono Single view.\n"
-" separate-left-right Left/right separate streams, left first.\n"
-" separate-right-left Left/right separate streams, right first.\n"
-" top-bottom Left top, right bottom.\n"
-" top-bottom-half Left top, right bottom, half height.\n"
-" bottom-top Left bottom, right top.\n"
-" bottom-top-half Left bottom, right top, half height.\n"
-" left-right Left left, right right.\n"
-" left-right-half Left left, right right, half width.\n"
-" right-left Left right, right left.\n"
-" right-left-half Left right, right left, half width.\n"
-" even-odd-rows Left even rows, right odd rows.\n"
-" odd-even-rows Left odd rows, right even rows.\n"
-" -o|--output=TYPE Select output type:\n"
-" mono-left Only left.\n"
-" mono-right Only right.\n"
-" top-bottom Left top, right bottom.\n"
-" top-bottom-half Left top, right bottom, half height.\n"
-" left-right Left left, right right.\n"
-" left-right-half Left left, right right, half width.\n"
-" even-odd-rows Left even rows, right odd rows.\n"
-" even-odd-columns Left even columns, right odd columns.\n"
-" checkerboard Left and right in checkerboard pattern.\n"
-" hdmi-frame-pack HDMI frame packing mode.\n"
-" red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
-" red-cyan-half-color Red/cyan anaglyph, half color method.\n"
-" red-cyan-full-color Red/cyan anaglyph, full color method.\n"
-" red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
-" green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
-" green-magenta-half-color Green/magenta anaglyph, half color method.\n"
-" green-magenta-full-color Green/magenta anaglyph, full color method.\n"
-" green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
-" amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
-" amber-blue-half-color Amber/blue anaglyph, half color method.\n"
-" amber-blue-full-color Amber/blue anaglyph, full color method.\n"
-" amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
-" red-green-monochrome Red/green anaglyph, monochrome method.\n"
-" red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
-" stereo OpenGL quad-buffered stereo.\n"
-" equalizer Multi-display via Equalizer (2D setup).\n"
-" equalizer-3d Multi-display via Equalizer (3D setup).\n"
-" -S|--swap-eyes Swap left/right view.\n"
-" -f|--fullscreen Fullscreen.\n"
-" --fullscreen-screens= Use the listed screens in fullscreen mode.\n"
-" [S0[,S1[,...]]] Screen numbers start with 1. The default\n"
-" (empty list) is to use the primary screen.\n"
-" --fullscreen-flip-left Flip left view vertically when fullscreen.\n"
-" --fullscreen-flop-left Flop left view horizontally when fullscreen.\n"
-" --fullscreen-flip-right Flip right view vertically when fullscreen.\n"
-" --fullscreen-flop-right Flop right view horizontally when fullscreen.\n"
-" -c|--center Center window on screen.\n"
-" --subtitle-encoding=ENC Set subtitle encoding.\n"
-" --subtitle-font=FONT Set subtitle font name.\n"
-" --subtitle-size=N Set subtitle font size.\n"
-" --subtitle-scale=S Set subtitle scale factor.\n"
-" --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
-" --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
-" -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
-" -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-separated\n"
-" values for the R,G,B channels.\n"
-" -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
-" -b|--benchmark Benchmark mode (no audio, show fps).\n"
-" -l|--loop Loop the input media.\n"
-"\n"
-"Interactive control:\n"
-" ESC Leave fullscreen mode, or quit.\n"
-" q Quit.\n"
-" p or SPACE Pause / unpause.\n"
-" f Toggle fullscreen.\n"
-" c Center window.\n"
-" e Swap left/right eye.\n"
-" v Cycle through available video streams.\n"
-" a Cycle through available audio streams.\n"
-" s Cycle through available subtitle streams.\n"
-" 1, 2 Adjust contrast.\n"
-" 3, 4 Adjust brightness.\n"
-" 5, 6 Adjust hue.\n"
-" 7, 8 Adjust saturation.\n"
-" <, > Adjust parallax.\n"
-" (, ) Adjust ghostbusting.\n"
-" left, right Seek 10 seconds backward / forward.\n"
-" up, down Seek 1 minute backward / forward.\n"
-" page up, page down Seek 10 minutes backward / forward.\n"
-" Mouse click Seek according to horizontal click position."
-msgstr ""
-"Использование:\n"
-" %s [опция...] [файл...]\n"
-"\n"
-"Опции:\n"
-" --help Показать помощь.\n"
-" --version Показать версию.\n"
-" -n|--no-gui Не использовать GUI, использовать обычное окно.\n"
-" -L|--log-level=LEVEL Уровень логов (debug/info/warning/error/quiet).\n"
-" --device-type=TYPE Тип устройства ввода: default, firewire, x11.\n"
-" --device-frame-size=WxH Потребовать от устройства размер кадра WxH.\n"
-" --device-frame-rate=N/D Потребовать от устройства частоту кадров N/D.\n"
-" --lirc-config=FILE Использовать указанный файл конфигурации LIRC.\n"
-" Эта опция может использоваться много раз.\n"
-" -v|--video=STREAM Видео дорожка (1-n, по наличию в файлах).\n"
-" -a|--audio=STREAM Аудио дорожка (1-n, по наличию в файлах).\n"
-" -s|--subtitle=STREAM Дорожка субтитров (0-n, по наличию в файлах).\n"
-" -i|--input=TYPE Источник (по умолчанию - автоматически):\n"
-" mono Один видеоряд (2D).\n"
-" separate-left-right Отдельные левый и правый видеофайлы.\n"
-" separate-right-left Отдельные правый и левый видеофайлы.\n"
-" top-bottom Левый сверху, правый снизу.\n"
-" top-bottom-half Левый сверху, правый снизу, половина высоты.\n"
-" bottom-top Левый снизу, правый сверху.\n"
-" bottom-top-half Левый снизу, правый сверху, половина высоты.\n"
-" left-right Левый слева, правый справа.\n"
-" left-right-half Левый слева, правый справа, половина ширины.\n"
-" right-left Левый справа, правый слева.\n"
-" right-left-half Левый справа, правый слева, половина ширины.\n"
-" even-odd-rows Левый в четных рядах, правый - в нечетных.\n"
-" odd-even-rows Левый в нечетных рядах, правый - в четных.\n"
-" -o|--output=TYPE Режим вывода:\n"
-" mono-left Только левый видеоряд.\n"
-" mono-right Только правый видеоряд.\n"
-" top-bottom Левый сверху, правый снизу.\n"
-" top-bottom-half Левый сверху, правый снизу, половина высоты.\n"
-" left-right Левый слева, правый справа.\n"
-" left-right-half Левый слева, правый справа, половина ширины.\n"
-" even-odd-rows Левый в четных рядах, правый - в нечетных.\n"
-" even-odd-columns Левый в четных столбцах, правый - в нечетных.\n"
-" checkerboard Левый и правый видеоряды в шахматном порядке.\n"
-" hdmi-frame-pack Режим упаковки кадров HDMI.\n"
-" red-cyan-monochrome Красно-голубой анаглиф, черно-белый режим.\n"
-" red-cyan-half-color Красно-голубой анаглиф, полу-цветной режим.\n"
-" red-cyan-full-color Красно-голубой анаглиф, полноцветный режим.\n"
-" red-cyan-dubois Красно-голубой анаглиф, метод Дюбуа.\n"
-" green-magenta-monochrome Зелёно-пурпурный анаглиф, черно-белый режим.\n"
-" green-magenta-half-color Зелёно-пурпурный анаглиф, полу-цветной режим.\n"
-" green-magenta-full-color Зелёно-пурпурный анаглиф, полноцветный режим.\n"
-" green-magenta-dubois Зелёно-пурпурный анаглиф, метод Дюбуа.\n"
-" amber-blue-monochrome Янтарно-синий анаглиф, черно-белый режим.\n"
-" amber-blue-half-color Янтарно-синий анаглиф, полу-цветной режим.\n"
-" amber-blue-full-color Янтарно-синий анаглиф, полноцветный режим.\n"
-" amber-blue-dubois Янтарно-синий анаглиф, метод Дюбуа.\n"
-" red-green-monochrome Красно-зелёный анаглиф, черно-белый режим.\n"
-" red-blue-monochrome Красно-синий анаглиф, черно-белый режим.\n"
-" stereo OpenGL стерео (quad-buffered).\n"
-" equalizer Много-дисплейный 2D режим через Equalizer.\n"
-" equalizer-3d Много-дисплейный 3D режим через Equalizer.\n"
-" -S|--swap-eyes Поменять левый и правый видеоряды.\n"
-" -f|--fullscreen Полноэкранный режим.\n"
-" --fullscreen-screens= Экраны для полноэкранного режима.\n"
-" [S0[,S1[,...]]] Номера экранов начинаются с 1. По умолчанию\n"
-" (если список пуст) используется главный экран.\n"
-" В полноэкранном режиме:\n"
-" --fullscreen-flip-left Отразить левый вид по вертикали.\n"
-" --fullscreen-flop-left Отразить левый вид по горизонтали.\n"
-" --fullscreen-flip-right Отразить правый вид по вертикали.\n"
-" --fullscreen-flop-right Отразить правый вид по горизонтали.\n"
-" -c|--center Расположить окно по центру экрана.\n"
-" --subtitle-encoding=ENC Кодировка субтитров.\n"
-" --subtitle-font=FONT Шрифт субтитров.\n"
-" --subtitle-size=N Размер шрифта субтитров.\n"
-" --subtitle-scale=S Коэффициент масштаба субтитров.\n"
-" --subtitle-color=COLOR Цвет субтитров, в формате [AA]RRGGBB.\n"
-" --subtitle-parallax=VAL Корректировка параллакса субтитров (-1 -- +1).\n"
-" -P|--parallax=VAL Корректировка параллакса (-1 -- +1).\n"
-" -C|--crosstalk=VAL Уровень перекрестных помех (от 0 до 1); знач.\n"
-" для каналов R, G, B, разделенные запятыми.\n"
-" -G|--ghostbust=VAL Сила подавления перекрестных помех (0 -- 1).\n"
-" -b|--benchmark Измерение производительности (FPS, без аудио).\n"
-" -l|--loop Зациклить воспроизведение.\n"
-"\n"
-"Интерактивное управление:\n"
-" ESC Покинуть полноэкранный режим или выйти.\n"
-" q Выход.\n"
-" p или SPACE Пауза / возобновление.\n"
-" f Переключить полноэкранный режим.\n"
-" c Разместить окно по центру экрана.\n"
-" e Поменять левый и правый видеоряды.\n"
-" v Переключить видео дорожку.\n"
-" a Переключить аудио дорожку.\n"
-" s Переключить дорожку субтитров.\n"
-" 1, 2 Изменить контрастность.\n"
-" 3, 4 Изменить яркость.\n"
-" 5, 6 Изменить оттенок.\n"
-" 7, 8 Изменить цветовую насыщенность.\n"
-" <, > Откорректировать параллакс.\n"
-" (, ) Откорректировать силу подавления перекрестных помех.\n"
-" влево, вправо Перемотать на 10 секунд назад / вперед.\n"
-" вверх, вниз Перемотать на 1 минуту назад / вперед.\n"
-" page up, page down Перемотать на 10 минут назад / вперед.\n"
-" Щелчок мышью Перемотать по горизонтальному положению курсора."
-
-#: src/main.cpp:597
-msgid "Benchmark mode: audio and time synchronization disabled."
-msgstr ""
-"Режим оценки производительности: воспроизведение аудио отключено, "
-"воспроизведение видео с максимально-возможной скоростью."
-
-#: src/main.cpp:614
-msgid "This version of Bino was compiled without support for LIRC."
-msgstr "Эта версия Bino была собрана без поддержки LIRC."
+msgid "Subtitle stream %d not found."
+msgstr "Дорожка субтитров %d не найдена."
 
-#: src/main.cpp:627
+#: src/dispatch.cpp:529 src/main.cpp:736
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Эта версия Bino была собрана без поддержки Equalizer."
 
-#: src/main.cpp:634
-msgid "Cannot connect to X server."
-msgstr "Невозможно присоединиться к X серверу."
+#: src/gui.cpp:101
+msgid "Video:"
+msgstr "Видео:"
 
-#: src/main.cpp:650
-msgid "No video to play."
-msgstr "Нет видео для воспроизведения."
+#: src/gui.cpp:102
+msgid "Select the video stream."
+msgstr "Выберите видео дорожку."
 
-#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
-#: src/media_data.cpp:293
-#, c-format
-msgid "%dx%d, %.3g:1"
-msgstr "%dx%d, %.3g:1"
+#: src/gui.cpp:108
+msgid "Audio:"
+msgstr "Аудио:"
 
-#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
-#: src/media_data.cpp:421
-#, c-format
-msgid "%s, %d ch., %g kHz, %d bit"
-msgstr "%s, %d к., %g кГц, %d бит"
+#: src/gui.cpp:109
+msgid "Select the audio stream."
+msgstr "Выберите аудио дорожку."
+
+#: src/gui.cpp:115
+msgid "Subtitle:"
+msgstr "Субтитры:"
+
+#: src/gui.cpp:116
+msgid "Select the subtitle stream."
+msgstr "Выберите дорожку субтитров."
 
-#: src/media_input.cpp:277 src/player_qt.cpp:187
+#: src/gui.cpp:127 src/media_input.cpp:277
 msgid "Input:"
 msgstr "Источник:"
 
-#: src/media_input.cpp:282
-#, c-format
-msgid "Video %s: %s"
-msgstr "Видео %s: %s"
+#: src/gui.cpp:128
+msgid "Set the 3D layout of the video stream."
+msgstr "Укажите 3D раскладку исходного видеофайла."
 
-#: src/media_input.cpp:287
-msgid "No video."
-msgstr "Нет видео."
+#: src/gui.cpp:132
+msgid "2D"
+msgstr "2D"
 
-#: src/media_input.cpp:293
-#, c-format
-msgid "Audio %s: %s"
-msgstr "Аудио %s: %s"
+#: src/gui.cpp:133
+msgid "Separate streams, left first"
+msgstr "Отдельные видеофайлы, сначала левый"
 
-#: src/media_input.cpp:298
-msgid "No audio."
-msgstr "Нет аудио."
+#: src/gui.cpp:134
+msgid "Separate streams, right first"
+msgstr "Отдельные видеофайлы, сначала правый"
 
-#: src/media_input.cpp:304
-#, c-format
-msgid "Subtitle %s: %s"
-msgstr "Субтитры %s: %s"
+#: src/gui.cpp:135
+#, fuzzy
+msgid "Alternating, left first"
+msgstr "Отдельные видеофайлы, сначала левый"
 
-#: src/media_input.cpp:309
-msgid "No subtitle."
-msgstr "Нет субтитров."
+#: src/gui.cpp:136
+#, fuzzy
+msgid "Alternating, right first"
+msgstr "Отдельные видеофайлы, сначала правый"
 
-#: src/media_input.cpp:311
-#, c-format
-msgid "Duration: %g seconds"
-msgstr "Продолжительность: %g секунд"
+#: src/gui.cpp:137 src/gui.cpp:161
+msgid "Top/bottom"
+msgstr "Сверху/снизу"
 
-#: src/media_input.cpp:314
-#, c-format
-msgid "Stereo layout: %s"
-msgstr "Стерео раскладка: %s"
+#: src/gui.cpp:138 src/gui.cpp:162
+msgid "Top/bottom, half height"
+msgstr "Сверху/снизу, в половину высоты"
 
-#: src/media_object.cpp:371
-#, fuzzy, c-format
-msgid "%s video stream %d: Using frame size %dx%d instead of %dx%d."
-msgstr "%s видео дорожка %d: Неверный размер кадра."
+#: src/gui.cpp:139
+msgid "Bottom/top"
+msgstr "Снизу/сверху"
 
-#: src/media_object.cpp:624
-#, c-format
-msgid "%s video stream %d: Unsupported stereo layout %s."
-msgstr "%s видео дорожка %d: Неподдерживаемая стерео раскладка %s."
+#: src/gui.cpp:140
+msgid "Bottom/top, half height"
+msgstr "Снизу/сверху, в половину высоты"
 
-#: src/media_object.cpp:662
-#, c-format
-msgid "%s audio stream %d: Cannot handle audio with %d channels."
-msgstr "%s аудио дорожка %d: Невозможно обработать аудио с %d каналами."
+#: src/gui.cpp:141 src/gui.cpp:163
+msgid "Left/right"
+msgstr "Слева/справа"
 
-#: src/media_object.cpp:691
-#, c-format
-msgid "%s audio stream %d: Cannot handle audio with sample format %s."
-msgstr "%s аудио дорожка %d: Невозможно обработать аудио в формате %s."
+#: src/gui.cpp:142 src/gui.cpp:164
+msgid "Left/right, half width"
+msgstr "Слева/справа, в половину ширины"
 
-#: src/media_object.cpp:744
-#, c-format
-msgid "No support available for %s device."
-msgstr "Устройство %s не поддерживается."
+#: src/gui.cpp:143
+msgid "Right/left"
+msgstr "Справа/слева"
 
-#: src/media_object.cpp:745 src/player_qt.cpp:1831
-msgid "Firewire"
-msgstr "Firewire"
+#: src/gui.cpp:144
+msgid "Right/left, half width"
+msgstr "Справа/слева, в половину ширины"
 
-#: src/media_object.cpp:746 src/player_qt.cpp:1832
-msgid "X11"
-msgstr "X11"
+#: src/gui.cpp:145 src/gui.cpp:165
+msgid "Even/odd rows"
+msgstr "Четные/нечетные ряды"
 
-#: src/media_object.cpp:747
-msgid "default"
-msgstr "default"
+#: src/gui.cpp:146
+msgid "Odd/even rows"
+msgstr "Нечетные/четные ряды"
 
-#: src/media_object.cpp:765 src/media_object.cpp:1218 src/xgl.cpp:297
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
+#: src/gui.cpp:152
+msgid "Output:"
+msgstr "Режим:"
 
-#: src/media_object.cpp:776
-#, c-format
-msgid "%s: Cannot read stream info: %s"
-msgstr "%s: Невозможно прочитать информацию о дорожке: %s"
+#: src/gui.cpp:153
+msgid "Set the 3D output type for your display."
+msgstr "Укажите 3D режим для вашего дисплея."
 
-#: src/media_object.cpp:816
-#, c-format
-msgid "%s stream %d: Cannot open %s: %s"
-msgstr "%s дорожка %d: Невозможно открыть %s: %s"
+#: src/gui.cpp:157
+msgid "Left view"
+msgstr "Левый видеоряд"
 
-#: src/media_object.cpp:817
-msgid "video codec"
-msgstr "видео кодек"
+#: src/gui.cpp:158
+msgid "Right view"
+msgstr "Правый видеоряд"
 
-#: src/media_object.cpp:818
-msgid "audio codec"
-msgstr "аудио кодек"
+#: src/gui.cpp:159
+msgid "OpenGL stereo"
+msgstr "Стерео OpenGL"
 
-#: src/media_object.cpp:819
-msgid "subtitle codec"
-msgstr "кодек субтитров"
+#: src/gui.cpp:160
+msgid "Left/right view alternating"
+msgstr ""
 
-#: src/media_object.cpp:820
-msgid "data"
-msgstr "данные"
+#: src/gui.cpp:166
+msgid "Even/odd columns"
+msgstr "Четные/нечетные столбцы"
 
-#: src/media_object.cpp:821
-msgid "codec not supported"
-msgstr "кодек не поддерживается"
+#: src/gui.cpp:167
+msgid "Checkerboard pattern"
+msgstr "В шахматном порядке"
 
-#: src/media_object.cpp:831
-#, c-format
-msgid "%s video stream %d: Invalid frame size."
-msgstr "%s видео дорожка %d: Неверный размер кадра."
+#: src/gui.cpp:168
+msgid "HDMI frame packing mode"
+msgstr "Режим упаковки кадров HDMI"
 
-#: src/media_object.cpp:867
-#, c-format
-msgid "%s video stream %d: Cannot initialize conversion context."
-msgstr "%s видео дорожка %d: Невозможно инициализировать кодек."
+#: src/gui.cpp:169
+msgid "Red/cyan glasses, monochrome method"
+msgstr "Красно-голубые очки, черно-белый режим"
 
-#: src/media_object.cpp:930
-#, c-format
-msgid "Video stream %d: %s / %s, %g seconds"
-msgstr "Видео дорожка %d: %s / %s, %g секунд"
+#: src/gui.cpp:170
+msgid "Red/cyan glasses, half-color method"
+msgstr "Красно-голубые очки, режим половины цветности"
 
-#: src/media_object.cpp:934
-#, c-format
-msgid "Using up to %d threads for decoding."
-msgstr "Используем максимум %d потоков для декодирования."
+#: src/gui.cpp:171
+msgid "Red/cyan glasses, full-color method"
+msgstr "Красно-голубые очки, полноцветный режим"
 
-#: src/media_object.cpp:939
-#, c-format
-msgid "Audio stream %d: %s / %s, %g seconds"
-msgstr "Аудио дорожка %d: %s / %s, %g секунд"
+#: src/gui.cpp:172
+msgid "Red/cyan glasses, high-quality Dubois method"
+msgstr "Красно-голубые очки, высококачественный метод Дюбуа"
 
-#: src/media_object.cpp:946
-#, c-format
-msgid "Subtitle stream %d: %s / %s, %g seconds"
-msgstr "Дорожка субтитров %d: %s / %s, %g секунд"
+#: src/gui.cpp:173
+msgid "Green/magenta glasses, monochrome method"
+msgstr "Зелёно-пурпурные очки, черно-белый режим"
 
-#: src/media_object.cpp:953
-msgid "No usable streams."
-msgstr "Нет подходящих дорожек."
-
-#: src/media_object.cpp:1234 src/media_object.cpp:1264
-#: src/media_object.cpp:1294
-#, c-format
-msgid "%s: Cannot duplicate packet."
-msgstr "%s: Невозможно создать копию пакета."
-
-#: src/media_object.cpp:1766
-#, c-format
-msgid "%s: Seeking failed."
-msgstr "%s: Перемотка не удалась."
-
-#: src/player.cpp:212
-msgid "No video streams found."
-msgstr "Видео дорожек не найдено."
-
-#: src/player.cpp:218
-msgid "Cannot set requested stereo layout: incompatible media."
-msgstr ""
-"Невозможно установить требуемую стерео раскладку: неподходящий носитель."
-
-#: src/player.cpp:224
-#, c-format
-msgid "Video stream %d not found."
-msgstr "Видео дорожка %d не найдена."
-
-#: src/player.cpp:229
-#, c-format
-msgid "Audio stream %d not found."
-msgstr "Аудио дорожка %d не найдена."
-
-#: src/player.cpp:237
-#, c-format
-msgid "Subtitle stream %d not found."
-msgstr "Дорожка субтитров %d не найдена."
-
-#: src/player.cpp:644
-#, c-format
-msgid "Video: delay %g seconds; dropping next frame."
-msgstr "Видео: задержка %g секунд; пропускаем следующий кадр."
-
-#: src/player.cpp:656
-#, c-format
-msgid "FPS: %.2f"
-msgstr "FPS: %.2f"
-
-#: src/player_equalizer.cpp:138
-msgid "Reading input frame failed."
-msgstr "Чтение исходного кадра не удалось."
-
-#: src/player_equalizer.cpp:192 src/video_output_qt.cpp:345
-#: src/video_output_qt.cpp:352
-msgid "Waiting for subtitle renderer initialization..."
-msgstr "Инициализация визуализатора субтитров..."
-
-#: src/player_equalizer.cpp:273
-msgid "Init data mapping failed."
-msgstr "Подготовка разметки данных не удалась."
-
-#: src/player_equalizer.cpp:274
-msgid "Frame data mapping failed."
-msgstr "Разметка данных кадра не удалась."
-
-#: src/player_equalizer.cpp:275
-msgid "Video player initialization failed."
-msgstr "Ошибка инициализации видео плеера."
-
-#: src/player_equalizer.cpp:276
-msgid "Need at least OpenGL 2.1."
-msgstr "Необходим как минимум OpenGL 2.1."
-
-#: src/player_equalizer.cpp:477
-msgid "No canvas in Equalizer configuration."
-msgstr "В конфигурации Equalizer отсутствует полотно."
-
-#: src/player_equalizer.cpp:511
-msgid "Equalizer canvas:"
-msgstr "Полотно Equalizer:"
-
-#: src/player_equalizer.cpp:512
-#, c-format
-msgid "%gx%g, aspect ratio %g:1"
-msgstr "%gx%g, соотношение сторон %g:1"
-
-#: src/player_equalizer.cpp:513
-#, c-format
-msgid "Area for %g:1 video: [ %g %g %g %g @ %g ]"
-msgstr "Область для %g:1 видео: [ %g %g %g %g @ %g ]"
-
-#: src/player_equalizer.cpp:926 src/video_output_qt.cpp:318
-msgid ""
-"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
-"objects."
-msgstr ""
-"Данная реализация OpenGL не поддерживает OpenGL 2.1 и объекты во фреймбуфере."
-
-#: src/player_equalizer.cpp:1096
-msgid "Equalizer initialization failed."
-msgstr "Ошибка инициализации Equalizer."
-
-#: src/player_equalizer.cpp:1104
-msgid "Cannot get equalizer configuration."
-msgstr "Невозможно получить конфигурацию Equalizer."
-
-#: src/player_equalizer.cpp:1118
-msgid "Equalizer configuration initialization failed."
-msgstr "Ошибка инициализации конфигурации Equalizer."
-
-#: src/player_qt.cpp:161
-msgid "Video:"
-msgstr "Видео:"
-
-#: src/player_qt.cpp:162
-msgid "Select the video stream."
-msgstr "Выберите видео дорожку."
-
-#: src/player_qt.cpp:168
-msgid "Audio:"
-msgstr "Аудио:"
-
-#: src/player_qt.cpp:169
-msgid "Select the audio stream."
-msgstr "Выберите аудио дорожку."
-
-#: src/player_qt.cpp:175
-msgid "Subtitle:"
-msgstr "Субтитры:"
-
-#: src/player_qt.cpp:176
-msgid "Select the subtitle stream."
-msgstr "Выберите дорожку субтитров."
-
-#: src/player_qt.cpp:188
-msgid "Set the 3D layout of the video stream."
-msgstr "Укажите 3D раскладку исходного видеофайла."
-
-#: src/player_qt.cpp:192
-msgid "2D"
-msgstr "2D"
-
-#: src/player_qt.cpp:193
-msgid "Separate streams, left first"
-msgstr "Отдельные видеофайлы, сначала левый"
-
-#: src/player_qt.cpp:194
-msgid "Separate streams, right first"
-msgstr "Отдельные видеофайлы, сначала правый"
-
-#: src/player_qt.cpp:195 src/player_qt.cpp:218
-msgid "Top/bottom"
-msgstr "Сверху/снизу"
-
-#: src/player_qt.cpp:196 src/player_qt.cpp:219
-msgid "Top/bottom, half height"
-msgstr "Сверху/снизу, в половину высоты"
-
-#: src/player_qt.cpp:197
-msgid "Bottom/top"
-msgstr "Снизу/сверху"
-
-#: src/player_qt.cpp:198
-msgid "Bottom/top, half height"
-msgstr "Снизу/сверху, в половину высоты"
-
-#: src/player_qt.cpp:199 src/player_qt.cpp:220
-msgid "Left/right"
-msgstr "Слева/справа"
-
-#: src/player_qt.cpp:200 src/player_qt.cpp:221
-msgid "Left/right, half width"
-msgstr "Слева/справа, в половину ширины"
-
-#: src/player_qt.cpp:201
-msgid "Right/left"
-msgstr "Справа/слева"
-
-#: src/player_qt.cpp:202
-msgid "Right/left, half width"
-msgstr "Справа/слева, в половину ширины"
-
-#: src/player_qt.cpp:203 src/player_qt.cpp:222
-msgid "Even/odd rows"
-msgstr "Четные/нечетные ряды"
-
-#: src/player_qt.cpp:204
-msgid "Odd/even rows"
-msgstr "Нечетные/четные ряды"
-
-#: src/player_qt.cpp:210
-msgid "Output:"
-msgstr "Режим:"
-
-#: src/player_qt.cpp:211
-msgid "Set the 3D output type for your display."
-msgstr "Укажите 3D режим для вашего дисплея."
-
-#: src/player_qt.cpp:215
-msgid "Left view"
-msgstr "Левый видеоряд"
-
-#: src/player_qt.cpp:216
-msgid "Right view"
-msgstr "Правый видеоряд"
-
-#: src/player_qt.cpp:217
-msgid "OpenGL stereo"
-msgstr "Стерео OpenGL"
-
-#: src/player_qt.cpp:223
-msgid "Even/odd columns"
-msgstr "Четные/нечетные столбцы"
-
-#: src/player_qt.cpp:224
-msgid "Checkerboard pattern"
-msgstr "В шахматном порядке"
-
-#: src/player_qt.cpp:225
-msgid "HDMI frame packing mode"
-msgstr "Режим упаковки кадров HDMI"
-
-#: src/player_qt.cpp:226
-msgid "Red/cyan glasses, monochrome method"
-msgstr "Красно-голубые очки, черно-белый режим"
-
-#: src/player_qt.cpp:227
-msgid "Red/cyan glasses, half-color method"
-msgstr "Красно-голубые очки, режим половины цветности"
-
-#: src/player_qt.cpp:228
-msgid "Red/cyan glasses, full-color method"
-msgstr "Красно-голубые очки, полноцветный режим"
-
-#: src/player_qt.cpp:229
-msgid "Red/cyan glasses, high-quality Dubois method"
-msgstr "Красно-голубые очки, высококачественный метод Дюбуа"
-
-#: src/player_qt.cpp:230
-msgid "Green/magenta glasses, monochrome method"
-msgstr "Зелёно-пурпурные очки, черно-белый режим"
-
-#: src/player_qt.cpp:231
+#: src/gui.cpp:174
 msgid "Green/magenta glasses, half-color method"
 msgstr "Зелёно-пурпурные очки, режим половины цветности"
 
-#: src/player_qt.cpp:232
+#: src/gui.cpp:175
 msgid "Green/magenta glasses, full-color method"
 msgstr "Зелёно-пурпурные очки, полноцветный режим"
 
-#: src/player_qt.cpp:233
+#: src/gui.cpp:176
 msgid "Green/magenta glasses, high-quality Dubois method"
 msgstr "Зелёно-пурпурные очки, высококачественный метод Дюбуа"
 
-#: src/player_qt.cpp:234
+#: src/gui.cpp:177
 msgid "Amber/blue glasses, monochrome method"
 msgstr "Янтарно-синие очки, черно-белый режим"
 
-#: src/player_qt.cpp:235
+#: src/gui.cpp:178
 msgid "Amber/blue glasses, half-color method"
 msgstr "Янтарно-синие очки, режим половины цветности"
 
-#: src/player_qt.cpp:236
+#: src/gui.cpp:179
 msgid "Amber/blue glasses, full-color method"
 msgstr "Янтарно-синие очки, полноцветный режим"
 
-#: src/player_qt.cpp:237
+#: src/gui.cpp:180
 msgid "Amber/blue glasses, high-quality Dubois method"
 msgstr "Янтарно-синие очки, высококачественный метод Дюбуа"
 
-#: src/player_qt.cpp:238
+#: src/gui.cpp:181
 msgid "Red/green glasses, monochrome method"
 msgstr "Красно-зелёные очки, черно-белый режим"
 
-#: src/player_qt.cpp:239
+#: src/gui.cpp:182
 msgid "Red/blue glasses, monochrome method"
 msgstr "Красно-синие очки, черно-белый режим"
 
-#: src/player_qt.cpp:243
+#: src/gui.cpp:186
 msgid "Swap left/right"
 msgstr "Наоборот"
 
-#: src/player_qt.cpp:244
+#: src/gui.cpp:187
 msgid ""
 "Swap the left and right view. Use this if the 3D effect seems wrong."
 msgstr ""
 "Поменять местами левый и правый видеоряды. Включите, если 3D эффект "
 "кажется неправильным."
 
-#: src/player_qt.cpp:511
+#: src/gui.cpp:467
 msgid "Off"
 msgstr "Выключено"
 
-#: src/player_qt.cpp:745
+#: src/gui.cpp:694
 msgid ""
 "This slider shows the progress during video playback, and can be used to "
 "seek in the video."
@@ -950,27 +433,36 @@
 "Этот ползунок показывает позицию воспроизведения и может быть использован "
 "для перемотки."
 
-#: src/player_qt.cpp:752
+#: src/gui.cpp:701
 msgid "Elapsed / total time."
 msgstr "Прошло / всего времени."
 
-#: src/player_qt.cpp:762
+#: src/gui.cpp:708
+#, fuzzy
+msgid "Toggle audio mute."
+msgstr "Включить/выключить режим повтора."
+
+#: src/gui.cpp:713
+msgid "Adjust audio volume."
+msgstr ""
+
+#: src/gui.cpp:725
 msgid "Play."
 msgstr "Воспроизведение."
 
-#: src/player_qt.cpp:766
+#: src/gui.cpp:729
 msgid "Pause."
 msgstr "Пауза."
 
-#: src/player_qt.cpp:770
+#: src/gui.cpp:733
 msgid "Stop."
 msgstr "Стоп."
 
-#: src/player_qt.cpp:775
+#: src/gui.cpp:738
 msgid "Toggle loop mode."
 msgstr "Включить/выключить режим повтора."
 
-#: src/player_qt.cpp:782
+#: src/gui.cpp:745
 msgid ""
 "Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
 "f key."
@@ -978,66 +470,151 @@
 "Перейти в полноэкранный режим. Вы можете покинуть полноэкранный режим "
 "путем нажатия клавиши f."
 
-#: src/player_qt.cpp:788
+#: src/gui.cpp:751
 msgid "Center the video area on your screen."
 msgstr "Расположить видео по центру экрана."
 
-#: src/player_qt.cpp:795
+#: src/gui.cpp:758
 msgid "Seek backward 10 minutes."
 msgstr "Перемотать на 10 минут назад."
 
-#: src/player_qt.cpp:800
+#: src/gui.cpp:763
 msgid "Seek backward 1 minute."
 msgstr "Перемотать на 1 минуту назад."
 
-#: src/player_qt.cpp:806
+#: src/gui.cpp:769
 msgid "Seek backward 10 seconds."
 msgstr "Перемотать на 10 секунд назад."
 
-#: src/player_qt.cpp:812
+#: src/gui.cpp:775
 msgid "Seek forward 10 seconds."
 msgstr "Перемотать на 10 секунд вперед."
 
-#: src/player_qt.cpp:817
+#: src/gui.cpp:780
 msgid "Seek forward 1 minute."
 msgstr "Перемотать на 1 минуту вперед."
 
-#: src/player_qt.cpp:823
+#: src/gui.cpp:786
 msgid "Seek forward 10 minutes."
 msgstr "Перемотать на 10 минут вперед."
 
-#: src/player_qt.cpp:1052
+#: src/gui.cpp:1047
+msgid "Fullscreen/Multiscreen Settings"
+msgstr "Полноэкранный и многоэкранный режим"
+
+#: src/gui.cpp:1049
+msgid "Configure fullscreen mode:"
+msgstr "Настройки полноэкранного режима:"
+
+#: src/gui.cpp:1050
+msgid "Select the screens to use in fullscreen mode."
+msgstr "Выберите экраны для полноэкранного режима."
+
+#: src/gui.cpp:1052
+msgid "Single screen:"
+msgstr "Один экран:"
+
+#: src/gui.cpp:1053
+msgid "Use a single screen for fullscreen mode."
+msgstr "Использовать один экран для полноэкранного режима."
+
+#: src/gui.cpp:1056
+msgid "Primary screen"
+msgstr "Главный экран"
+
+#: src/gui.cpp:1059 src/gui.cpp:1070 src/gui.cpp:1071
+#, c-format
+msgid "Screen %d"
+msgstr "Экран %d"
+
+#: src/gui.cpp:1062
+msgid "Dual screen:"
+msgstr "Два экрана:"
+
+#: src/gui.cpp:1063
+msgid "Use two screens for fullscreen mode."
+msgstr "Использовать два экрана для полноэкранного режима."
+
+#: src/gui.cpp:1075
+msgid "Multi screen:"
+msgstr "Много экранов:"
+
+#: src/gui.cpp:1076
+msgid "Use multiple screens for fullscreen mode."
+msgstr "Использовать много экранов для полноэкранного режима"
+
+#: src/gui.cpp:1078
+msgid "Comma-separated list of screens to use for fullscreen mode."
+msgstr "Список экранов для полноэкранного режима, разделенных запятыми."
+
+#: src/gui.cpp:1081
+msgid "When in fullscreen mode,"
+msgstr "Когда в полноэкранном режиме,"
+
+#: src/gui.cpp:1082
+msgid "Set special left/right view handling for fullscreen mode."
+msgstr ""
+"Включить специальную обработку левого и правого видеорядов в "
+"полноэкранном режиме."
+
+#: src/gui.cpp:1084
+msgid "flip left view vertically."
+msgstr "отразить левый видеоряд вертикально."
+
+#: src/gui.cpp:1086
+msgid "flop left view horizontally."
+msgstr "отразить левый видеоряд горизонтально."
+
+#: src/gui.cpp:1088
+msgid "flip right view vertically."
+msgstr "отразить правый видеоряд вертикально."
+
+#: src/gui.cpp:1090
+msgid "flop right view horizontally."
+msgstr "отразить правый видеоряд горизонтально."
+
+#: src/gui.cpp:1093
+#, fuzzy
+msgid "inhibit the screensaver"
+msgstr "Невозможно включить хранитель экрана."
+
+#: src/gui.cpp:1094
+#, fuzzy
+msgid "Inhibit the screensaver during fullscreen playback."
+msgstr "Выберите экраны для полноэкранного режима."
+
+#: src/gui.cpp:1096 src/gui.cpp:1258 src/gui.cpp:1393 src/gui.cpp:1463
+#: src/gui.cpp:1541 src/gui.cpp:1652 src/gui.cpp:1928 src/gui.cpp:2108
+#: src/gui.cpp:2778 src/gui.cpp:2825 src/gui.cpp:3114
+msgid "OK"
+msgstr "OK"
+
+#: src/gui.cpp:1211
 msgid "Display Color Adjustments"
 msgstr "Настройки цветности"
 
-#: src/player_qt.cpp:1054
+#: src/gui.cpp:1213
 msgid "Contrast:"
 msgstr "Контрастность:"
 
-#: src/player_qt.cpp:1065
+#: src/gui.cpp:1224
 msgid "Brightness:"
 msgstr "Яркость:"
 
-#: src/player_qt.cpp:1076
+#: src/gui.cpp:1235
 msgid "Hue:"
 msgstr "Оттенок:"
 
-#: src/player_qt.cpp:1087
+#: src/gui.cpp:1246
 msgid "Saturation:"
 msgstr "Насыщенность:"
 
-#: src/player_qt.cpp:1099 src/player_qt.cpp:1290 src/player_qt.cpp:1406
-#: src/player_qt.cpp:1695 src/player_qt.cpp:1875 src/player_qt.cpp:2546
-#: src/player_qt.cpp:2742 src/player_qt.cpp:2988
-msgid "OK"
-msgstr "OK"
-
-#: src/player_qt.cpp:1261
+#: src/gui.cpp:1364
 msgid "Display Crosstalk Calibration"
 msgstr "Уровни перекрестных помех"
 
 #. TRANSLATORS: Please keep the lines short using where necessary.
-#: src/player_qt.cpp:1264
+#: src/gui.cpp:1367
 msgid ""
 "Please read the manual to find out how to measure the crosstalk "
 "levels of your display."
@@ -1045,79 +622,144 @@
 "Пожалуйста прочтите инструкцию, чтобы узнать, как измерить "
 "уровень перекрестных помех."
 
-#: src/player_qt.cpp:1268
+#: src/gui.cpp:1371
 msgid "Red:"
 msgstr "Красный:"
 
-#: src/player_qt.cpp:1275
+#: src/gui.cpp:1378
 msgid "Green:"
 msgstr "Зеленый:"
 
-#: src/player_qt.cpp:1282
+#: src/gui.cpp:1385
 msgid "Blue:"
 msgstr "Синий:"
 
-#: src/player_qt.cpp:1348
-msgid "Subtitle Settings"
-msgstr "Настройки субтитров"
+#: src/gui.cpp:1441
+msgid "Zoom for wide videos"
+msgstr ""
 
-#: src/player_qt.cpp:1350
-msgid "These settings apply to soft subtitles, but not to bitmaps."
-msgstr "Данные настройки применяются только для текстовых субтитров."
+#: src/gui.cpp:1444
+msgid ""
+"Set zoom level for videos that are wider than the screen: 0: Show "
+"full video width. 1: Use full screen height.</p"
+msgstr ""
 
-#: src/player_qt.cpp:1352
+#: src/gui.cpp:1448
+msgid "Zoom:"
+msgstr ""
+
+#: src/gui.cpp:1449
+msgid "Set the zoom level for videos that are wider than the screen"
+msgstr ""
+
+#: src/gui.cpp:1507
+#, fuzzy
+msgid "Audio Settings"
+msgstr "Настройки субтитров"
+
+#: src/gui.cpp:1509
+#, fuzzy
+msgid "Audio device:"
+msgstr "аудио кодек"
+
+#: src/gui.cpp:1510
+msgid ""
+"Select the audio device. This will take effect for the next started "
+"video."
+msgstr ""
+
+#: src/gui.cpp:1514 src/gui.cpp:2063
+msgid "Default"
+msgstr "По умолчанию"
+
+#: src/gui.cpp:1531
+msgid "Audio delay (ms):"
+msgstr ""
+
+#: src/gui.cpp:1532
+msgid ""
+"Set an audio delay, in milliseconds. This is useful if audio and video "
+"are not in sync."
+msgstr ""
+
+#: src/gui.cpp:1589
+msgid "Subtitle Settings"
+msgstr "Настройки субтитров"
+
+#: src/gui.cpp:1591
+msgid "These settings apply to soft subtitles, but not to bitmaps."
+msgstr "Данные настройки применяются только для текстовых субтитров."
+
+#: src/gui.cpp:1593
 msgid "Encoding:"
 msgstr "Кодировка:"
 
-#: src/player_qt.cpp:1353
+#: src/gui.cpp:1594
 msgid "Set the subtitle character set encoding."
 msgstr "Выберите кодировку символов в субтитрах."
 
-#: src/player_qt.cpp:1367
+#: src/gui.cpp:1609
 msgid "Override font:"
 msgstr "Переопределить шрифт:"
 
-#: src/player_qt.cpp:1368
+#: src/gui.cpp:1610
 msgid "Override the subtitle font family."
 msgstr "Переопределение шрифта субтитров, указанного в файле субтитров."
 
-#: src/player_qt.cpp:1376
+#: src/gui.cpp:1619
 msgid "Override font size:"
 msgstr "Переопределить размер шрифта:"
 
-#: src/player_qt.cpp:1377
+#: src/gui.cpp:1620
 msgid "Override the subtitle font size."
 msgstr ""
 "Переопределение размера шрифта субтитров, указанного в файле субтитров.</"
 "p>"
 
-#: src/player_qt.cpp:1386
+#: src/gui.cpp:1630
 msgid "Override scale factor:"
 msgstr "Переопределить коэффициент масштаба:"
 
-#: src/player_qt.cpp:1387
+#: src/gui.cpp:1631
 msgid "Override the subtitle scale factor."
 msgstr ""
 "Переопределение коэффициента масштаба субтитров, указанного в файле "
 "субтитров."
 
-#: src/player_qt.cpp:1397
+#: src/gui.cpp:1642
 msgid "Override color:"
 msgstr "Переопределить цвет:"
 
-#: src/player_qt.cpp:1398
+#: src/gui.cpp:1643
 msgid "Override the subtitle color."
 msgstr "Переопределение цвета субтитров, указанного в файле субтитров."
 
-#: src/player_qt.cpp:1644
-msgid "Stereoscopic Video Settings"
-msgstr "Настройки стерео"
+#: src/gui.cpp:1866
+#, fuzzy
+msgid "Video Settings"
+msgstr "Настройки субтитров"
+
+#: src/gui.cpp:1868
+#, fuzzy
+msgid "Crop to aspect ratio:"
+msgstr "%gx%g, соотношение сторон %g:1"
+
+#: src/gui.cpp:1869
+#, fuzzy
+msgid ""
+"Set the real aspect ratio of the video, so that borders can be cropped.</"
+"p>"
+msgstr "Укажите 3D раскладку исходного видеофайла."
+
+#: src/gui.cpp:1872
+msgid "Do not crop"
+msgstr ""
 
-#: src/player_qt.cpp:1646
+#: src/gui.cpp:1885
 msgid "Parallax:"
 msgstr "Параллакс:"
 
-#: src/player_qt.cpp:1647
+#: src/gui.cpp:1886
 msgid ""
 "Adjust parallax, from -1 to +1. This changes the separation of left and "
 "right view, and thus the perceived distance of the scene."
@@ -1126,11 +768,11 @@
 "между левым и правым видеорядами и, таким образом, ощущаемую удаленность "
 "сцены."
 
-#: src/player_qt.cpp:1662
+#: src/gui.cpp:1899
 msgid "Subtitle parallax:"
 msgstr "Параллакс субтитров:"
 
-#: src/player_qt.cpp:1663
+#: src/gui.cpp:1900
 msgid ""
 "Adjust subtitle parallax, from -1 to +1. This changes the perceived "
 "distance of the subtitles."
@@ -1138,11 +780,11 @@
 "Корректировка параллакса субтитров, от -1 до +1. Позволяет изменить "
 "ощущаемую удаленность субтитров."
 
-#: src/player_qt.cpp:1678
+#: src/gui.cpp:1913
 msgid "Ghostbusting:"
 msgstr "Подавление перекрестных помех:"
 
-#: src/player_qt.cpp:1679
+#: src/gui.cpp:1914
 msgid ""
 "Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
 "the crosstalk levels of your display first. Note that crosstalk ghostbusting "
@@ -1153,33 +795,37 @@
 "Имейте ввиду, что подавление перекрестных помех не работает с анаглифными "
 "очками."
 
-#: src/player_qt.cpp:1826
+#: src/gui.cpp:2059
 msgid "Open device"
 msgstr "Открыть устройство"
 
-#: src/player_qt.cpp:1829
+#: src/gui.cpp:2062
 msgid "Choose a device type."
 msgstr "Выберите тип устройства."
 
-#: src/player_qt.cpp:1830
-msgid "Default"
-msgstr "По умолчанию"
+#: src/gui.cpp:2064 src/media_object.cpp:801
+msgid "Firewire"
+msgstr "Firewire"
+
+#: src/gui.cpp:2065 src/media_object.cpp:802
+msgid "X11"
+msgstr "X11"
 
-#: src/player_qt.cpp:1834 src/player_qt.cpp:1837
+#: src/gui.cpp:2067 src/gui.cpp:2070
 msgid "Choose a device."
 msgstr "Выберите устройство."
 
-#: src/player_qt.cpp:1840
+#: src/gui.cpp:2073
 msgid "Set the X11 device string. Refer to the manual for details."
 msgstr ""
 "Введите строку устройства X11. За подробностями обратитесь к документации."
 ""
 
-#: src/player_qt.cpp:1849
+#: src/gui.cpp:2082
 msgid "Request frame size"
 msgstr "Размер кадра"
 
-#: src/player_qt.cpp:1850
+#: src/gui.cpp:2083
 msgid ""
 "Request a specific frame size from the device, e.g. 640x480. The device "
 "must support this frame size. Some devices require a frame size to be "
@@ -1189,11 +835,11 @@
 "Устройство должно поддерживать этот размер кадра. Некоторые устройства "
 "требуют явного указания размера кадра."
 
-#: src/player_qt.cpp:1861
+#: src/gui.cpp:2094
 msgid "Request frame rate"
 msgstr "Частота кадров"
 
-#: src/player_qt.cpp:1862
+#: src/gui.cpp:2095
 msgid ""
 "Request a specific frame rate from the device, e.g. 25/1. The device must "
 "support this frame rate. Some devices require a frame rate to be selected.</"
@@ -1203,228 +849,253 @@
 "Устройство должно поддерживать эту частоту кадров. Некоторые устройства "
 "требуют явного указания частоты кадров."
 
-#: src/player_qt.cpp:1873 src/player_qt.cpp:2545 src/player_qt.cpp:2741
+#: src/gui.cpp:2106 src/gui.cpp:2824
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/player_qt.cpp:2048
+#: src/gui.cpp:2377
 msgid "&File"
 msgstr "&Файл"
 
-#: src/player_qt.cpp:2049
-msgid "&Open..."
-msgstr "&Открыть..."
+#: src/gui.cpp:2378
+#, fuzzy
+msgid "&Open file(s)..."
+msgstr "Открыть файлы"
 
-#: src/player_qt.cpp:2054
-msgid "Open &URL..."
+#: src/gui.cpp:2383
+#, fuzzy
+msgid "Open &URL(s)..."
 msgstr "Открыть &URL..."
 
-#: src/player_qt.cpp:2058
+#: src/gui.cpp:2387
 msgid "Open &device..."
 msgstr "Открыть &устройство..."
 
-#: src/player_qt.cpp:2063
+#: src/gui.cpp:2402
+msgid "&Clear recent files"
+msgstr ""
+
+#: src/gui.cpp:2410
 msgid "&Quit..."
 msgstr "&Выход..."
 
-#: src/player_qt.cpp:2069
+#: src/gui.cpp:2416
 msgid "&Preferences"
 msgstr "&Настройки"
 
-#: src/player_qt.cpp:2072
+#: src/gui.cpp:2419
 msgid "&Fullscreen Settings..."
 msgstr "Настройки &полноэкранного режима..."
 
-#: src/player_qt.cpp:2075
+#: src/gui.cpp:2422
 msgid "Display &Color Adjustments..."
 msgstr "Настройки &цветности..."
 
-#: src/player_qt.cpp:2078
+#: src/gui.cpp:2425
 msgid "Display Cross&talk Calibration..."
 msgstr "&Уровни перекрестных помех..."
 
-#: src/player_qt.cpp:2082
+#: src/gui.cpp:2429
+msgid "&Zoom for wide videos..."
+msgstr ""
+
+#: src/gui.cpp:2433
+#, fuzzy
+msgid "&Audio Settings..."
+msgstr "Настройки &субтитров..."
+
+#: src/gui.cpp:2437
 msgid "&Subtitle Settings..."
 msgstr "Настройки &субтитров..."
 
-#: src/player_qt.cpp:2086
-msgid "Stereoscopic Video Settings..."
+#: src/gui.cpp:2441
+#, fuzzy
+msgid "Current &Video Settings..."
 msgstr "Настройки стерео..."
 
-#: src/player_qt.cpp:2089
+#: src/gui.cpp:2444
 msgid "&Help"
 msgstr "&Помощь"
 
-#: src/player_qt.cpp:2090
+#: src/gui.cpp:2445
 msgid "&Manual..."
 msgstr "Сп&равка..."
 
-#: src/player_qt.cpp:2095
+#: src/gui.cpp:2450
 msgid "&Website..."
 msgstr "Ве&б-сайт..."
 
-#: src/player_qt.cpp:2099
+#: src/gui.cpp:2454
 msgid "&Keyboard Shortcuts"
 msgstr "&Горячие клавиши"
 
-#: src/player_qt.cpp:2103
+#: src/gui.cpp:2458
 msgid "&About"
 msgstr "О програ&мме"
 
-#: src/player_qt.cpp:2169 src/player_qt.cpp:2891 src/player_qt.cpp:2899
-#: src/video_output_qt.cpp:92 src/video_output_qt.cpp:400
-#: src/video_output_qt.cpp:422
-msgid "Error"
-msgstr "Ошибка"
+#: src/gui.cpp:2771
+msgid "Tip"
+msgstr ""
+
+#: src/gui.cpp:2774
+msgid ""
+"You can select and open multiple files at once.This is useful for "
+"example if you have extra subtitle files, or if left and right view are "
+"stored in separate files."
+msgstr ""
+
+#: src/gui.cpp:2777
+msgid "Do not show this message again."
+msgstr ""
 
-#: src/player_qt.cpp:2528
+#: src/gui.cpp:2794
 msgid "Open files"
 msgstr "Открыть файлы"
 
-#: src/player_qt.cpp:2541
-msgid "Open URL"
+#: src/gui.cpp:2818
+#, fuzzy
+msgid "Open URL(s)"
 msgstr "Открыть URL"
 
-#: src/player_qt.cpp:2542
-msgid "URL:"
-msgstr "URL:"
+#: src/gui.cpp:2819
+msgid "URL(s):"
+msgstr ""
 
-#: src/player_qt.cpp:2689
-msgid "Fullscreen/Multiscreen Settings"
-msgstr "Полноэкранный и многоэкранный режим"
+#: src/gui.cpp:2820
+msgid "Enter one or more space separated URLs."
+msgstr ""
 
-#: src/player_qt.cpp:2691
-msgid "Configure fullscreen mode:"
+#: src/gui.cpp:3005 src/gui.cpp:3013 src/video_output_qt.cpp:234
+#: src/video_output_qt.cpp:643 src/video_output_qt.cpp:664
+msgid "Error"
+msgstr "Ошибка"
+
+#: src/gui.cpp:3005
+msgid "Cannot open manual."
+msgstr "Невозможно открыть справку."
+
+#: src/gui.cpp:3013
+msgid "Cannot open website."
+msgstr "Невозможно открыть веб-сайт."
+
+#: src/gui.cpp:3021
+msgid "Keyboard Shortcuts"
+msgstr "Горячие клавиши"
+
+#: src/gui.cpp:3024
+#, fuzzy
+msgid "Keyboard control:"
+msgstr "Горячие клавиши"
+
+#: src/gui.cpp:3026
+msgid "Stop."
+msgstr ""
+
+#: src/gui.cpp:3027 src/main.cpp:495
+msgid "Pause / unpause."
+msgstr ""
+
+#: src/gui.cpp:3028 src/main.cpp:496
+#, fuzzy
+msgid "Toggle fullscreen."
 msgstr "Настройки полноэкранного режима:"
 
-#: src/player_qt.cpp:2692
-msgid "Select the screens to use in fullscreen mode."
-msgstr "Выберите экраны для полноэкранного режима."
+#: src/gui.cpp:3029 src/main.cpp:497
+msgid "Center window."
+msgstr ""
 
-#: src/player_qt.cpp:2694
-msgid "Single screen:"
-msgstr "Один экран:"
+#: src/gui.cpp:3030 src/main.cpp:498
+#, fuzzy
+msgid "Swap left/right eye."
+msgstr "Наоборот"
 
-#: src/player_qt.cpp:2695
-msgid "Use a single screen for fullscreen mode."
-msgstr "Использовать один экран для полноэкранного режима."
+#: src/gui.cpp:3031 src/main.cpp:499
+msgid "Cycle through available video streams."
+msgstr ""
 
-#: src/player_qt.cpp:2698
-msgid "Primary screen"
-msgstr "Главный экран"
+#: src/gui.cpp:3032 src/main.cpp:500
+msgid "Cycle through available audio streams."
+msgstr ""
 
-#: src/player_qt.cpp:2703 src/player_qt.cpp:2717 src/player_qt.cpp:2718
-#, c-format
-msgid "Screen %d"
-msgstr "Экран %d"
+#: src/gui.cpp:3033 src/main.cpp:501
+#, fuzzy
+msgid "Cycle through available subtitle streams."
+msgstr "Выберите дорожку субтитров."
 
-#: src/player_qt.cpp:2707
-msgid "Dual screen:"
-msgstr "Два экрана:"
+#: src/gui.cpp:3034 src/main.cpp:502
+msgid "Adjust contrast."
+msgstr ""
 
-#: src/player_qt.cpp:2708
-msgid "Use two screens for fullscreen mode."
-msgstr "Использовать два экрана для полноэкранного режима."
+#: src/gui.cpp:3035 src/main.cpp:503
+#, fuzzy
+msgid "Adjust brightness."
+msgstr "Яркость:"
 
-#: src/player_qt.cpp:2722
-msgid "Multi screen:"
-msgstr "Много экранов:"
+#: src/gui.cpp:3036 src/main.cpp:504
+msgid "Adjust hue."
+msgstr ""
 
-#: src/player_qt.cpp:2723
-msgid "Use multiple screens for fullscreen mode."
-msgstr "Использовать много экранов для полноэкранного режима"
+#: src/gui.cpp:3037 src/main.cpp:505
+#, fuzzy
+msgid "Adjust saturation."
+msgstr "Насыщенность:"
 
-#: src/player_qt.cpp:2725
-msgid "Comma-separated list of screens to use for fullscreen mode."
-msgstr "Список экранов для полноэкранного режима, разделенных запятыми."
+#: src/gui.cpp:3038 src/main.cpp:506
+#, fuzzy
+msgid "Adjust parallax."
+msgstr "Параллакс субтитров:"
 
-#: src/player_qt.cpp:2729
-msgid "When in fullscreen mode,"
-msgstr "Когда в полноэкранном режиме,"
+#: src/gui.cpp:3039 src/main.cpp:507
+#, fuzzy
+msgid "Adjust ghostbusting."
+msgstr "Подавление перекрестных помех:"
 
-#: src/player_qt.cpp:2730
-msgid "Set special left/right view handling for fullscreen mode."
+#: src/gui.cpp:3040 src/main.cpp:508
+msgid "Adjust zoom for wide videos."
 msgstr ""
-"Включить специальную обработку левого и правого видеорядов в "
-"полноэкранном режиме."
 
-#: src/player_qt.cpp:2732
-msgid "flip left view vertically."
-msgstr "отразить левый видеоряд вертикально."
+#: src/gui.cpp:3041 src/main.cpp:509
+msgid "Adjust audio volume."
+msgstr ""
 
-#: src/player_qt.cpp:2734
-msgid "flop left view horizontally."
-msgstr "отразить левый видеоряд горизонтально."
+#: src/gui.cpp:3042 src/main.cpp:510
+msgid "Toggle audio mute."
+msgstr ""
 
-#: src/player_qt.cpp:2736
-msgid "flip right view vertically."
-msgstr "отразить правый видеоряд вертикально."
+#: src/gui.cpp:3043 src/main.cpp:511
+msgid "Step a single video frame forward."
+msgstr ""
 
-#: src/player_qt.cpp:2738
-msgid "flop right view horizontally."
-msgstr "отразить правый видеоряд горизонтально."
+#: src/gui.cpp:3044 src/main.cpp:512
+msgid "Seek 10 seconds backward / forward."
+msgstr ""
 
-#: src/player_qt.cpp:2891
-msgid "Cannot open manual."
-msgstr "Невозможно открыть справку."
+#: src/gui.cpp:3045 src/main.cpp:513
+msgid "Seek 1 minute backward / forward."
+msgstr ""
 
-#: src/player_qt.cpp:2899
-msgid "Cannot open website."
-msgstr "Невозможно открыть веб-сайт."
+#: src/gui.cpp:3046 src/main.cpp:514
+msgid "Seek 10 minutes backward / forward."
+msgstr ""
 
-#: src/player_qt.cpp:2905
-msgid "Keyboard Shortcuts"
-msgstr "Горячие клавиши"
+#: src/gui.cpp:3047 src/main.cpp:516
+msgid "Media keys should work as expected."
+msgstr ""
 
-#. TRANSLATORS: This is a HTML table, shown under Help->Keyboard Shortcuts.
-#. Please make sure that your translation formats properly.
-#: src/player_qt.cpp:2908
-msgid ""
-"Keyboard control: <table><tr><td>q or ESC</td><td>Stop</td></"
-"tr><tr><td>p or SPACE</td><td>Pause / unpause</td></tr><tr><td>f</"
-"td><td>Toggle fullscreen</td></tr><tr><td>c</td><td>Center window</td></"
-"tr><tr><td>e</td><td>Swap left/right eye</td></tr><tr><td>v</td><td>Cycle "
-"through available video streams</td></tr><tr><td>a</td><td>Cycle through "
-"available audio streams</td></tr><tr><td>s</td><td>Cycle through available "
-"subtitle streams</td></tr><tr><td>1, 2</td><td>Adjust contrast</td></"
-"tr><tr><td>3, 4</td><td>Adjust brightness</td></tr><tr><td>5, 6</"
-"td><td>Adjust hue</td></tr><tr><td>7, 8</td><td>Adjust saturation</td></"
-"tr><tr><td>&lt;, &gt;</td><td>Adjust parallax</td></tr><tr><td>(, )</"
-"td><td>Adjust ghostbusting</td></tr><tr><td>left, right</td><td>Seek 10 "
-"seconds backward / forward</td></tr><tr><td>up, down</td><td>Seek 1 minute "
-"backward / forward</td></tr><tr><td>page up, page down</td><td>Seek 10 "
-"minutes backward / forward</td></tr></table>"
-msgstr ""
-"Управление с клавиатуры: <table><tr><td>q или ESC</td><td>Стоп</td></"
-"tr><tr><td>p или ПРОБЕЛ</td><td>Пауза</td></tr><tr><td>f</"
-"td><td>Полноэкранный режим</td></tr><tr><td>c</td><td>Расположить окно по "
-"центру</td></tr><tr><td>e</td><td>Поменять местами левый и правый видеоряды</"
-"td></tr><tr><td>v</td><td>Переключение видео дорожки</td></tr><tr><td>a</"
-"td><td>Переключение аудио дорожки</td></tr><tr><td>s</td><td>Переключение "
-"дорожки субтитров</td></tr><tr><td>1, 2</td><td>Регулировка контраста</td></"
-"tr><tr><td>3, 4</td><td>Регулировка яркости</td></tr><tr><td>5, 6</"
-"td><td>Регулировка оттенка</td></tr><tr><td>7, 8</td><td>Регулировка "
-"насыщенности</td></tr><tr><td>&lt;, &gt;</td><td>Регулировка параллакса</"
-"td></tr><tr><td>(, )</td><td>Регулировка подавления перекрестных помех</td></"
-"tr><tr><td>ВЛЕВО, ВПРАВО</td><td>Перемотать 10 секунд назад / вперед</td></"
-"tr><tr><td>ВВЕРХ, ВНИЗ</td><td>Перемотать 1 минуту назад / вперед</td></"
-"tr><tr><td>PGUP, PGDOWN</td><td>Перемотать 10 минут назад / вперед</td></"
-"tr></table>"
-
-#: src/player_qt.cpp:2935
+#: src/gui.cpp:3063
 #, c-format
 msgid "About %s"
 msgstr "О %s"
 
-#: src/player_qt.cpp:2941
+#: src/gui.cpp:3069
 #, c-format
 msgid "The %s 3D video player"
 msgstr "3D видео плеер %s"
 
-#: src/player_qt.cpp:2946
-#, c-format
+#: src/gui.cpp:3074
+#, fuzzy, c-format
 msgid ""
-"%s version %s.Copyright (C) 2011 the Bino developers.This "
+"%s version %s.Copyright (C) 2012 the Bino developers.This "
 "is free software. You may redistribute copies of it under the terms of the "
 "<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
 "a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
@@ -1437,113 +1108,1120 @@
 "ЛИБО ГАРАНТИЙ, за исключением предусмотренных законом.Для получения "
 "подробной информации об этом ПО посетите <a href=\"%s\">%s</a>."
 
-#: src/player_qt.cpp:2983
+#: src/gui.cpp:3086 src/main.cpp:384
+msgid "Platform:"
+msgstr "Платформа:"
+
+#: src/gui.cpp:3087 src/main.cpp:386
+msgid "Libraries used:"
+msgstr "Используемые библиотеки:"
+
+#: src/gui.cpp:3109
 msgid "About"
 msgstr "О программе"
 
-#: src/player_qt.cpp:2984
+#: src/gui.cpp:3110
 msgid "Libraries"
 msgstr "Библиотеки"
 
-#: src/player_qt.cpp:2985
+#: src/gui.cpp:3111
 msgid "Team"
 msgstr "Команда"
 
-#: src/player_qt.cpp:2986
+#: src/gui.cpp:3112
 msgid "License"
 msgstr "Лицензия"
 
-#: src/subtitle_renderer.cpp:223
-msgid "Cannot initialize LibASS."
-msgstr "Невозможно инициализировать LibASS."
+#: src/lib_versions.cpp:182 src/lib_versions.cpp:194
+msgid "not used"
+msgstr "не используется"
 
-#: src/subtitle_renderer.cpp:232
-msgid "Cannot initialize LibASS renderer."
-msgstr "Невозможно инициализировать отрисовщик LibASS."
+#: src/lirc.cpp:61
+msgid "Cannot initialize LIRC."
+msgstr "Невозможно инициализировать LIRC."
 
-#: src/subtitle_renderer.cpp:398
-msgid "Cannot initialize LibASS track."
-msgstr "Невозможно инициализировать дорожку LibASS."
+#: src/lirc.cpp:67
+msgid "Cannot set LIRC socket properties."
+msgstr "Невозможно установить параметры LIRC сокета."
 
-#: src/subtitle_renderer.cpp:409
+#: src/lirc.cpp:74
+msgid "Cannot read LIRC default configuration."
+msgstr "Невозможно прочитать конфигурацию LIRC по умолчанию."
+
+#: src/lirc.cpp:89
 #, c-format
-msgid "Subtitle character set conversion failed: %s"
-msgstr "Ошибка преобразования кодировки субтитров: %s"
+msgid "Cannot read LIRC configuration file %s."
+msgstr "Невозможно прочитать конфигурацию LIRC из файла %s."
 
-#: src/video_output.cpp:363 src/video_output.cpp:473
-msgid "Cannot create a PBO buffer."
-msgstr "Невозможно создать буфер PBO."
+#: src/lirc.cpp:117
+msgid "Cannot get LIRC event; disabling LIRC support."
+msgstr "Невозможно получить событие LIRC; отключаю поддержку LIRC."
 
-#: src/video_output_qt.cpp:313
+#: src/lirc.cpp:131
 #, c-format
-msgid "Cannot initialize GLEW: %s"
-msgstr "Невозможно инициализировать GLEW: %s"
+msgid "Received invalid command '%s' from LIRC."
+msgstr "От LIRC получена некорректная команда '%s'."
 
-#: src/video_output_qt.cpp:343
-msgid "Please wait"
-msgstr "Пожалуйста, подождите"
+#: src/lirc.cpp:141
+msgid "Cannot get command for LIRC code."
+msgstr "Невозможно получить команду для LIRC кода."
 
-#: src/video_output_qt.cpp:400 src/video_output_qt.cpp:417
-msgid "Cannot set OpenGL context format."
-msgstr "Невозможно установить формат OpenGL."
+#: src/main.cpp:367 src/media_object.cpp:821 src/media_object.cpp:1286
+#: src/video_output.cpp:212
+#, c-format
+msgid "%s: %s"
+msgstr "%s: %s"
 
-#: src/video_output_qt.cpp:412
-msgid "The display does not support OpenGL stereo mode."
-msgstr "Дисплей не поддерживает режим OpenGL стерео."
+#: src/main.cpp:379
+#, c-format
+msgid "%s version %s"
+msgstr "%s версия %s"
 
-#: src/video_output_qt.cpp:505
-msgid "Cannot suspend screensaver."
-msgstr "Невозможно отключить хранитель экрана."
+#: src/main.cpp:380
+#, fuzzy
+msgid "Copyright (C) 2012 the Bino developers."
+msgstr "Copyright (C) 2011 Разработчики Bino."
 
-#: src/video_output_qt.cpp:520
-msgid "Cannot resume screensaver."
-msgstr "Невозможно включить хранитель экрана."
+#: src/main.cpp:381
+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/xgl.cpp:200
-#, c-format
-msgid "OpenGL FBO error %s."
-msgstr "Ошибка OpenGL FBO %s."
+#. 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:399
+msgid "Usage:"
+msgstr ""
 
-#: src/xgl.cpp:217
-#, c-format
-msgid "OpenGL error 0x%04X."
-msgstr "Ошибка OpenGL 0x%04X."
+#: src/main.cpp:401
+msgid "Options:"
+msgstr ""
 
-#: src/xgl.cpp:282
-#, c-format
-msgid "OpenGL %s '%s': compiler warning:"
-msgstr "OpenGL %s '%s': предупреждение компилятора:"
+#: src/main.cpp:402
+msgid "Print help."
+msgstr ""
 
-#: src/xgl.cpp:283 src/xgl.cpp:292
-msgid "vertex shader"
-msgstr "вершинный шейдер"
+#: src/main.cpp:403
+msgid "Print version."
+msgstr ""
 
-#: src/xgl.cpp:284 src/xgl.cpp:293
-msgid "geometry shader"
-msgstr "геометрический шейдер"
+#: src/main.cpp:404
+msgid "Do not use the GUI, just show a plain window."
+msgstr ""
 
-#: src/xgl.cpp:285 src/xgl.cpp:294
-msgid "fragment shader"
-msgstr "фрагментный шейдер"
+#: src/main.cpp:405
+msgid "Append all log messages to the given file."
+msgstr ""
 
-#: src/xgl.cpp:291
-#, c-format
-msgid "OpenGL %s '%s': compilation failed."
-msgstr "OpenGL %s '%s': ошибка компиляции."
+#: src/main.cpp:406
+msgid "Set log level (debug/info/warning/error/quiet)."
+msgstr ""
 
-#: src/xgl.cpp:296 src/xgl.cpp:363
-msgid "unknown error"
-msgstr "неизвестная ошибка"
+#: src/main.cpp:407
+msgid "Print a list of known audio devices and exit."
+msgstr ""
 
-#: src/xgl.cpp:357
-#, c-format
-msgid "OpenGL program '%s': linker warning:"
-msgstr "OpenGL программа '%s': предупреждение компоновщика:"
+#: src/main.cpp:408
+msgid "Use audio device number N (N=0 is the default)."
+msgstr ""
 
-#: src/xgl.cpp:362
-#, c-format
-msgid "OpenGL program '%s': linking failed."
-msgstr "OpenGL программа '%s': ошибка компоновки."
+#: src/main.cpp:409
+msgid "Delay audio by D milliseconds. Default is 0."
+msgstr ""
+
+#: src/main.cpp:410
+msgid "Set audio volume (0 to 1). Default is 1."
+msgstr ""
+
+#: src/main.cpp:411
+#, fuzzy
+msgid "Mute audio."
+msgstr "Нет аудио."
+
+#: src/main.cpp:412
+msgid "Type of input device: default, firewire, x11."
+msgstr ""
+
+#: src/main.cpp:413
+#, fuzzy
+msgid "Request frame size WxH from input device."
+msgstr "Размер кадра"
+
+#: src/main.cpp:414
+#, fuzzy
+msgid "Request frame rate N/D from input device."
+msgstr "Частота кадров"
+
+#: src/main.cpp:415
+#, fuzzy
+msgid "Use the given LIRC configuration file."
+msgstr "Невозможно прочитать конфигурацию LIRC из файла %s."
+
+#: src/main.cpp:416
+msgid "This option can be used more than once."
+msgstr ""
+
+#: src/main.cpp:417
+msgid "Select video stream (1-n, depending on input)."
+msgstr ""
+
+#: src/main.cpp:418
+msgid "Select audio stream (1-n, depending on input)."
+msgstr ""
+
+#: src/main.cpp:419
+#, fuzzy
+msgid "Select subtitle stream (0-n, dep. on input)."
+msgstr "Выберите дорожку субтитров."
+
+#: src/main.cpp:420
+msgid "Select input type (default autodetect):"
+msgstr ""
+
+#: src/main.cpp:421
+#, fuzzy
+msgid "Single view."
+msgstr "Правый видеоряд"
+
+#: src/main.cpp:422
+#, fuzzy
+msgid "Left/right separate streams, left first."
+msgstr "Отдельные видеофайлы, сначала левый"
+
+#: src/main.cpp:423
+#, fuzzy
+msgid "Left/right separate streams, right first."
+msgstr "Отдельные видеофайлы, сначала правый"
+
+#: src/main.cpp:424
+#, fuzzy
+msgid "Left/right alternating, left first."
+msgstr "Отдельные видеофайлы, сначала левый"
+
+#: src/main.cpp:425
+#, fuzzy
+msgid "Left/right alternating, right first."
+msgstr "Отдельные видеофайлы, сначала правый"
+
+#: src/main.cpp:426 src/main.cpp:441
+msgid "Left top, right bottom."
+msgstr ""
+
+#: src/main.cpp:427 src/main.cpp:442
+#, fuzzy
+msgid "Left top, right bottom, half height."
+msgstr "Сверху/снизу, в половину высоты"
+
+#: src/main.cpp:428
+msgid "Left bottom, right top."
+msgstr ""
+
+#: src/main.cpp:429
+#, fuzzy
+msgid "Left bottom, right top, half height."
+msgstr "Снизу/сверху, в половину высоты"
+
+#: src/main.cpp:430 src/main.cpp:443
+msgid "Left left, right right."
+msgstr ""
+
+#: src/main.cpp:431 src/main.cpp:444
+#, fuzzy
+msgid "Left left, right right, half width."
+msgstr "Слева/справа, в половину ширины"
+
+#: src/main.cpp:432
+#, fuzzy
+msgid "Left right, right left."
+msgstr "Слева/справа, в половину ширины"
+
+#: src/main.cpp:433
+#, fuzzy
+msgid "Left right, right left, half width."
+msgstr "Слева/справа, в половину ширины"
+
+#: src/main.cpp:434 src/main.cpp:445
+msgid "Left even rows, right odd rows."
+msgstr ""
+
+#: src/main.cpp:435
+msgid "Left odd rows, right even rows."
+msgstr ""
+
+#: src/main.cpp:436
+msgid "Select output type:"
+msgstr ""
+
+#: src/main.cpp:437
+#, fuzzy
+msgid "OpenGL quad-buffered stereo."
+msgstr "Стерео OpenGL"
+
+#: src/main.cpp:438
+#, fuzzy
+msgid "Left and right view alternating."
+msgstr "отразить правый видеоряд вертикально."
+
+#: src/main.cpp:439
+msgid "Only left."
+msgstr ""
+
+#: src/main.cpp:440
+msgid "Only right."
+msgstr ""
+
+#: src/main.cpp:446
+msgid "Left even columns, right odd columns."
+msgstr ""
+
+#: src/main.cpp:447
+#, fuzzy
+msgid "Left and right in checkerboard pattern."
+msgstr "В шахматном порядке"
+
+#: src/main.cpp:448
+#, fuzzy
+msgid "HDMI frame packing mode."
+msgstr "Режим упаковки кадров HDMI"
+
+#: src/main.cpp:449
+#, fuzzy
+msgid "Red/cyan anaglyph, monochrome method."
+msgstr "Красно-голубые очки, черно-белый режим"
+
+#: src/main.cpp:450
+#, fuzzy
+msgid "Red/cyan anaglyph, half color method."
+msgstr "Красно-голубые очки, режим половины цветности"
+
+#: src/main.cpp:451
+#, fuzzy
+msgid "Red/cyan anaglyph, full color method."
+msgstr "Красно-голубые очки, полноцветный режим"
+
+#: src/main.cpp:452
+#, fuzzy
+msgid "Red/cyan anaglyph, Dubois method."
+msgstr "Красно-голубые очки, высококачественный метод Дюбуа"
+
+#: src/main.cpp:453
+#, fuzzy
+msgid "Green/magenta anaglyph, monochrome method."
+msgstr "Зелёно-пурпурные очки, черно-белый режим"
+
+#: src/main.cpp:454
+#, fuzzy
+msgid "Green/magenta anaglyph, half color method."
+msgstr "Зелёно-пурпурные очки, режим половины цветности"
+
+#: src/main.cpp:455
+#, fuzzy
+msgid "Green/magenta anaglyph, full color method."
+msgstr "Зелёно-пурпурные очки, полноцветный режим"
+
+#: src/main.cpp:456
+#, fuzzy
+msgid "Green/magenta anaglyph, Dubois method."
+msgstr "Зелёно-пурпурные очки, высококачественный метод Дюбуа"
+
+#: src/main.cpp:457
+#, fuzzy
+msgid "Amber/blue anaglyph, monochrome method."
+msgstr "Янтарно-синие очки, черно-белый режим"
+
+#: src/main.cpp:458
+#, fuzzy
+msgid "Amber/blue anaglyph, half color method."
+msgstr "Янтарно-синие очки, режим половины цветности"
+
+#: src/main.cpp:459
+#, fuzzy
+msgid "Amber/blue anaglyph, full color method."
+msgstr "Янтарно-синие очки, полноцветный режим"
+
+#: src/main.cpp:460
+#, fuzzy
+msgid "Amber/blue anaglyph, Dubois method."
+msgstr "Янтарно-синие очки, высококачественный метод Дюбуа"
+
+#: src/main.cpp:461
+#, fuzzy
+msgid "Red/green anaglyph, monochrome method."
+msgstr "Красно-зелёные очки, черно-белый режим"
+
+#: src/main.cpp:462
+#, fuzzy
+msgid "Red/blue anaglyph, monochrome method."
+msgstr "Красно-синие очки, черно-белый режим"
+
+#: src/main.cpp:463
+msgid "Multi-display via Equalizer (2D setup)."
+msgstr ""
+
+#: src/main.cpp:464
+msgid "Multi-display via Equalizer (3D setup)."
+msgstr ""
+
+#: src/main.cpp:465
+#, fuzzy
+msgid "Swap left/right view."
+msgstr "Наоборот"
+
+#: src/main.cpp:466
+#, fuzzy
+msgid "Fullscreen."
+msgstr "Два экрана:"
+
+#: src/main.cpp:467
+#, fuzzy
+msgid "Use the listed screens in fullscreen mode."
+msgstr "Использовать много экранов для полноэкранного режима"
+
+#: src/main.cpp:468
+msgid "Screen numbers start with 1."
+msgstr ""
+
+#: src/main.cpp:469
+msgid "An empty list defaults to the primary screen."
+msgstr ""
+
+#: src/main.cpp:470
+#, fuzzy
+msgid "Flip left view vertically when fullscreen."
+msgstr "отразить левый видеоряд вертикально."
+
+#: src/main.cpp:471
+#, fuzzy
+msgid "Flop left view horizontally when fullscreen."
+msgstr "отразить левый видеоряд горизонтально."
+
+#: src/main.cpp:472
+#, fuzzy
+msgid "Flip right view vertically when fullscreen."
+msgstr "отразить правый видеоряд вертикально."
+
+#: src/main.cpp:473
+#, fuzzy
+msgid "Flop right view horizontally when fullscreen."
+msgstr "отразить правый видеоряд горизонтально."
+
+#: src/main.cpp:474
+msgid "Set zoom for wide videos (0=off to 1=full)."
+msgstr ""
+
+#: src/main.cpp:475
+msgid "Crop video to given aspect ratio (0:0=off)."
+msgstr ""
+
+#: src/main.cpp:476
+#, fuzzy
+msgid "Center window on screen."
+msgstr "Расположить видео по центру экрана."
+
+#: src/main.cpp:477
+#, fuzzy
+msgid "Set subtitle encoding."
+msgstr "кодек субтитров"
+
+#: src/main.cpp:478
+#, fuzzy
+msgid "Set subtitle font name."
+msgstr "Переопределение шрифта субтитров, указанного в файле субтитров."
+
+#: src/main.cpp:479
+#, fuzzy
+msgid "Set subtitle font size."
+msgstr ""
+"Переопределение размера шрифта субтитров, указанного в файле субтитров.</"
+"p>"
+
+#: src/main.cpp:480
+#, fuzzy
+msgid "Set subtitle scale factor."
+msgstr ""
+"Переопределение коэффициента масштаба субтитров, указанного в файле "
+"субтитров."
+
+#: src/main.cpp:481
+msgid "Set subtitle color, in [AA]RRGGBB format."
+msgstr ""
+
+#: src/main.cpp:482
+msgid "Subtitle parallax adjustment (-1 to +1)."
+msgstr ""
+
+#: src/main.cpp:483
+msgid "Parallax adjustment (-1 to +1)."
+msgstr ""
+
+#: src/main.cpp:484
+msgid "Crosstalk leak level (0 to 1)."
+msgstr ""
+
+#: src/main.cpp:485
+msgid "Comma-separated values for R,G,B."
+msgstr ""
+
+#: src/main.cpp:486
+msgid "Amount of ghostbusting to apply (0 to 1)."
+msgstr ""
+
+#: src/main.cpp:487
+msgid "Benchmark mode (no audio, show fps)."
+msgstr ""
+
+#: src/main.cpp:488
+msgid "Frame rate divisor for display refresh rate."
+msgstr ""
+
+#: src/main.cpp:489
+msgid "Default is 0 for benchmark mode, 1 otherwise."
+msgstr ""
+
+#: src/main.cpp:490
+msgid "Loop the input media."
+msgstr ""
+
+#: src/main.cpp:492
+msgid "Interactive control:"
+msgstr ""
+
+#: src/main.cpp:493
+#, fuzzy
+msgid "Leave fullscreen mode, or quit."
+msgstr "Когда в полноэкранном режиме,"
+
+#: src/main.cpp:494
+#, fuzzy
+msgid "Quit."
+msgstr "&Выход..."
+
+#: src/main.cpp:515
+msgid "Seek according to horizontal click position."
+msgstr ""
+
+#: src/main.cpp:523
+msgid "No audio devices known."
+msgstr ""
+
+#: src/main.cpp:595
+msgid "Benchmark mode: audio and time synchronization disabled."
+msgstr ""
+"Режим оценки производительности: воспроизведение аудио отключено, "
+"воспроизведение видео с максимально-возможной скоростью."
+
+#: src/main.cpp:729
+msgid "This version of Bino was compiled without support for LIRC."
+msgstr "Эта версия Bino была собрана без поддержки LIRC."
+
+#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
+#: src/media_data.cpp:935
+#, c-format
+msgid "%dx%d, %.3g:1"
+msgstr "%dx%d, %.3g:1"
+
+#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
+#: src/media_data.cpp:1066
+#, c-format
+msgid "%s, %d ch., %g kHz, %d bit"
+msgstr "%s, %d к., %g кГц, %d бит"
+
+#: src/media_input.cpp:282
+#, c-format
+msgid "Video %s: %s"
+msgstr "Видео %s: %s"
+
+#: src/media_input.cpp:287
+msgid "No video."
+msgstr "Нет видео."
+
+#: src/media_input.cpp:293
+#, c-format
+msgid "Audio %s: %s"
+msgstr "Аудио %s: %s"
+
+#: src/media_input.cpp:298
+msgid "No audio."
+msgstr "Нет аудио."
+
+#: src/media_input.cpp:304
+#, c-format
+msgid "Subtitle %s: %s"
+msgstr "Субтитры %s: %s"
+
+#: src/media_input.cpp:309
+msgid "No subtitle."
+msgstr "Нет субтитров."
+
+#: src/media_input.cpp:311
+#, c-format
+msgid "Duration: %g seconds"
+msgstr "Продолжительность: %g секунд"
+
+#: src/media_input.cpp:314
+#, c-format
+msgid "Stereo layout: %s"
+msgstr "Стерео раскладка: %s"
+
+#: src/media_object.cpp:677
+#, c-format
+msgid "%s video stream %d: Unsupported stereo layout %s."
+msgstr "%s видео дорожка %d: Неподдерживаемая стерео раскладка %s."
+
+#: src/media_object.cpp:715
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with %d channels."
+msgstr "%s аудио дорожка %d: Невозможно обработать аудио с %d каналами."
+
+#: src/media_object.cpp:744
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with sample format %s."
+msgstr "%s аудио дорожка %d: Невозможно обработать аудио в формате %s."
+
+#: src/media_object.cpp:800
+#, c-format
+msgid "No support available for %s device."
+msgstr "Устройство %s не поддерживается."
+
+#: src/media_object.cpp:803
+msgid "default"
+msgstr "default"
+
+#: src/media_object.cpp:832
+#, c-format
+msgid "%s: Cannot read stream info: %s"
+msgstr "%s: Невозможно прочитать информацию о дорожке: %s"
+
+#: src/media_object.cpp:876
+#, c-format
+msgid "%s stream %d: Cannot open %s: %s"
+msgstr "%s дорожка %d: Невозможно открыть %s: %s"
+
+#: src/media_object.cpp:877
+msgid "video codec"
+msgstr "видео кодек"
+
+#: src/media_object.cpp:878
+msgid "audio codec"
+msgstr "аудио кодек"
+
+#: src/media_object.cpp:879
+msgid "subtitle codec"
+msgstr "кодек субтитров"
+
+#: src/media_object.cpp:880
+msgid "data"
+msgstr "данные"
+
+#: src/media_object.cpp:881
+msgid "codec not supported"
+msgstr "кодек не поддерживается"
+
+#: src/media_object.cpp:891
+#, c-format
+msgid "%s video stream %d: Invalid frame size."
+msgstr "%s видео дорожка %d: Неверный размер кадра."
+
+#: src/media_object.cpp:935
+#, c-format
+msgid "%s video stream %d: Cannot initialize conversion context."
+msgstr "%s видео дорожка %d: Невозможно инициализировать кодек."
+
+#: src/media_object.cpp:998
+#, c-format
+msgid "Video stream %d: %s / %s, %g seconds"
+msgstr "Видео дорожка %d: %s / %s, %g секунд"
+
+#: src/media_object.cpp:1002
+#, c-format
+msgid "Using up to %d threads for decoding."
+msgstr "Используем максимум %d потоков для декодирования."
+
+#: src/media_object.cpp:1007
+#, c-format
+msgid "Audio stream %d: %s / %s, %g seconds"
+msgstr "Аудио дорожка %d: %s / %s, %g секунд"
+
+#: src/media_object.cpp:1014
+#, c-format
+msgid "Subtitle stream %d: %s / %s, %g seconds"
+msgstr "Дорожка субтитров %d: %s / %s, %g секунд"
+
+#: src/media_object.cpp:1021
+msgid "No usable streams."
+msgstr "Нет подходящих дорожек."
+
+#: src/media_object.cpp:1302 src/media_object.cpp:1332
+#: src/media_object.cpp:1362
+#, c-format
+msgid "%s: Cannot duplicate packet."
+msgstr "%s: Невозможно создать копию пакета."
+
+#: src/media_object.cpp:1456
+#, fuzzy, c-format
+msgid "%s video stream %d: Dropping %dx%d frame"
+msgstr "%s видео дорожка %d: Неверный размер кадра."
+
+#: src/media_object.cpp:1919
+#, c-format
+msgid "%s: Seeking failed."
+msgstr "%s: Перемотка не удалась."
+
+#: src/player.cpp:434
+#, fuzzy, c-format
+msgid "Video: delay %g seconds/%g frames; dropping next frame."
+msgstr "Видео: задержка %g секунд; пропускаем следующий кадр."
+
+#: src/player.cpp:450
+#, c-format
+msgid "FPS: %.2f"
+msgstr "FPS: %.2f"
+
+#: src/player_equalizer.cpp:116
+msgid "Reading input frame failed."
+msgstr "Чтение исходного кадра не удалось."
+
+#: src/player_equalizer.cpp:165 src/video_output_qt.cpp:590
+#: src/video_output_qt.cpp:597
+msgid "Waiting for subtitle renderer initialization..."
+msgstr "Инициализация визуализатора субтитров..."
+
+#: src/player_equalizer.cpp:250
+msgid "Init data mapping failed."
+msgstr "Подготовка разметки данных не удалась."
+
+#: src/player_equalizer.cpp:251
+msgid "Frame data mapping failed."
+msgstr "Разметка данных кадра не удалась."
+
+#: src/player_equalizer.cpp:252
+msgid "Video player initialization failed."
+msgstr "Ошибка инициализации видео плеера."
+
+#: src/player_equalizer.cpp:253
+msgid "Need at least OpenGL 2.1."
+msgstr "Необходим как минимум OpenGL 2.1."
+
+#: src/player_equalizer.cpp:430
+msgid "No canvas in Equalizer configuration."
+msgstr "В конфигурации Equalizer отсутствует полотно."
+
+#: src/player_equalizer.cpp:437
+#, fuzzy, c-format
+msgid "Equalizer canvas: %gx%g, aspect ratio %g:1"
+msgstr "%gx%g, соотношение сторон %g:1"
+
+#: src/player_equalizer.cpp:922 src/video_output_qt.cpp:560
+msgid ""
+"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
+"objects."
+msgstr ""
+"Данная реализация OpenGL не поддерживает OpenGL 2.1 и объекты во фреймбуфере."
+
+#: src/player_equalizer.cpp:1105
+msgid "Equalizer initialization failed."
+msgstr "Ошибка инициализации Equalizer."
+
+#: src/player_equalizer.cpp:1113
+msgid "Cannot get equalizer configuration."
+msgstr "Невозможно получить конфигурацию Equalizer."
+
+#: src/player_equalizer.cpp:1127
+msgid "Equalizer configuration initialization failed."
+msgstr "Ошибка инициализации конфигурации Equalizer."
+
+#: src/subtitle_renderer.cpp:223
+msgid "Cannot initialize LibASS."
+msgstr "Невозможно инициализировать LibASS."
+
+#: src/subtitle_renderer.cpp:232
+msgid "Cannot initialize LibASS renderer."
+msgstr "Невозможно инициализировать отрисовщик LibASS."
+
+#: src/subtitle_renderer.cpp:398
+msgid "Cannot initialize LibASS track."
+msgstr "Невозможно инициализировать дорожку LibASS."
+
+#: src/subtitle_renderer.cpp:409
+#, c-format
+msgid "Subtitle character set conversion failed: %s"
+msgstr "Ошибка преобразования кодировки субтитров: %s"
+
+#: src/video_output.cpp:145
+#, c-format
+msgid "OpenGL error 0x%04X."
+msgstr "Ошибка OpenGL 0x%04X."
+
+#: src/video_output.cpp:203
+#, c-format
+msgid "OpenGL %s '%s': compiler warning:"
+msgstr "OpenGL %s '%s': предупреждение компилятора:"
+
+#: src/video_output.cpp:204 src/video_output.cpp:209
+msgid "vertex shader"
+msgstr "вершинный шейдер"
+
+#: src/video_output.cpp:204 src/video_output.cpp:209
+msgid "fragment shader"
+msgstr "фрагментный шейдер"
+
+#: src/video_output.cpp:208
+#, c-format
+msgid "OpenGL %s '%s': compilation failed."
+msgstr "OpenGL %s '%s': ошибка компиляции."
+
+#: src/video_output.cpp:211 src/video_output.cpp:288
+msgid "unknown error"
+msgstr "неизвестная ошибка"
+
+#: src/video_output.cpp:284
+#, c-format
+msgid "OpenGL program '%s': linker warning:"
+msgstr "OpenGL программа '%s': предупреждение компоновщика:"
+
+#: src/video_output.cpp:287
+#, c-format
+msgid "OpenGL program '%s': linking failed."
+msgstr "OpenGL программа '%s': ошибка компоновки."
+
+#: src/video_output.cpp:563 src/video_output.cpp:675
+msgid "Cannot create a PBO buffer."
+msgstr "Невозможно создать буфер PBO."
+
+#: src/video_output_qt.cpp:555
+#, c-format
+msgid "Cannot initialize GLEW: %s"
+msgstr "Невозможно инициализировать GLEW: %s"
+
+#: src/video_output_qt.cpp:588
+msgid "Please wait"
+msgstr "Пожалуйста, подождите"
+
+#: src/video_output_qt.cpp:643
+#, fuzzy
+msgid "Cannot get valid OpenGL context."
+msgstr "Невозможно установить формат OpenGL."
+
+#: src/video_output_qt.cpp:654
+msgid "The display does not support OpenGL stereo mode."
+msgstr "Дисплей не поддерживает режим OpenGL стерео."
+
+#: src/video_output_qt.cpp:659
+msgid "Cannot set OpenGL context format."
+msgstr "Невозможно установить формат OpenGL."
+
+#: src/video_output_qt.cpp:752
+msgid "Cannot suspend screensaver."
+msgstr "Невозможно отключить хранитель экрана."
+
+#: src/video_output_qt.cpp:767
+msgid "Cannot resume screensaver."
+msgstr "Невозможно включить хранитель экрана."
+
+#~ msgid "Cannot initialize mutex: %s"
+#~ msgstr "Невозможно инициализировать mutex: %s"
+
+#~ msgid "Cannot lock mutex: %s"
+#~ msgstr "Невозможно заблокировать mutex: %s"
+
+#~ msgid "Cannot unlock mutex: %s"
+#~ msgstr "Невозможно разблокировать mutex: %s"
+
+#~ msgid "Cannot create thread: %s"
+#~ msgstr "Невозможно создать поток: %s"
+
+#~ msgid "Cannot join with thread: %s"
+#~ msgstr "Невозможно присоединиться к потоку: %s"
+
+#~ msgid "Cannot cancel thread: %s"
+#~ msgstr "Невозможно отменить поток: %s"
+
+#~ msgid ""
+#~ "Usage:\n"
+#~ " %s [option...] [file...]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --help Print help.\n"
+#~ " --version Print version.\n"
+#~ " -n|--no-gui Do not use the GUI, just show a plain window.\n"
+#~ " -L|--log-level=LEVEL Set log level (debug/info/warning/error/"
+#~ "quiet).\n"
+#~ " --device-type=TYPE Type of input device: default, firewire, x11.\n"
+#~ " --device-frame-size=WxH Request frame size WxH from input device.\n"
+#~ " --device-frame-rate=N/D Request frame rate N/D from input device.\n"
+#~ " --lirc-config=FILE Use the given LIRC configuration file. This\n"
+#~ " option can be used more than once.\n"
+#~ " -v|--video=STREAM Select video stream (1-n, depending on "
+#~ "input).\n"
+#~ " -a|--audio=STREAM Select audio stream (1-n, depending on "
+#~ "input).\n"
+#~ " -s|--subtitle=STREAM Select subtitle stream (0-n, dep. on input).\n"
+#~ " -i|--input=TYPE Select input type (default autodetect):\n"
+#~ " mono Single view.\n"
+#~ " separate-left-right Left/right separate streams, left first.\n"
+#~ " separate-right-left Left/right separate streams, right first.\n"
+#~ " top-bottom Left top, right bottom.\n"
+#~ " top-bottom-half Left top, right bottom, half height.\n"
+#~ " bottom-top Left bottom, right top.\n"
+#~ " bottom-top-half Left bottom, right top, half height.\n"
+#~ " left-right Left left, right right.\n"
+#~ " left-right-half Left left, right right, half width.\n"
+#~ " right-left Left right, right left.\n"
+#~ " right-left-half Left right, right left, half width.\n"
+#~ " even-odd-rows Left even rows, right odd rows.\n"
+#~ " odd-even-rows Left odd rows, right even rows.\n"
+#~ " -o|--output=TYPE Select output type:\n"
+#~ " mono-left Only left.\n"
+#~ " mono-right Only right.\n"
+#~ " top-bottom Left top, right bottom.\n"
+#~ " top-bottom-half Left top, right bottom, half height.\n"
+#~ " left-right Left left, right right.\n"
+#~ " left-right-half Left left, right right, half width.\n"
+#~ " even-odd-rows Left even rows, right odd rows.\n"
+#~ " even-odd-columns Left even columns, right odd columns.\n"
+#~ " checkerboard Left and right in checkerboard pattern.\n"
+#~ " hdmi-frame-pack HDMI frame packing mode.\n"
+#~ " red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
+#~ " red-cyan-half-color Red/cyan anaglyph, half color method.\n"
+#~ " red-cyan-full-color Red/cyan anaglyph, full color method.\n"
+#~ " red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
+#~ " green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
+#~ " green-magenta-half-color Green/magenta anaglyph, half color method.\n"
+#~ " green-magenta-full-color Green/magenta anaglyph, full color method.\n"
+#~ " green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
+#~ " amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
+#~ " amber-blue-half-color Amber/blue anaglyph, half color method.\n"
+#~ " amber-blue-full-color Amber/blue anaglyph, full color method.\n"
+#~ " amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
+#~ " red-green-monochrome Red/green anaglyph, monochrome method.\n"
+#~ " red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
+#~ " stereo OpenGL quad-buffered stereo.\n"
+#~ " equalizer Multi-display via Equalizer (2D setup).\n"
+#~ " equalizer-3d Multi-display via Equalizer (3D setup).\n"
+#~ " -S|--swap-eyes Swap left/right view.\n"
+#~ " -f|--fullscreen Fullscreen.\n"
+#~ " --fullscreen-screens= Use the listed screens in fullscreen mode.\n"
+#~ " [S0[,S1[,...]]] Screen numbers start with 1. The default\n"
+#~ " (empty list) is to use the primary screen.\n"
+#~ " --fullscreen-flip-left Flip left view vertically when fullscreen.\n"
+#~ " --fullscreen-flop-left Flop left view horizontally when fullscreen.\n"
+#~ " --fullscreen-flip-right Flip right view vertically when fullscreen.\n"
+#~ " --fullscreen-flop-right Flop right view horizontally when fullscreen.\n"
+#~ " -c|--center Center window on screen.\n"
+#~ " --subtitle-encoding=ENC Set subtitle encoding.\n"
+#~ " --subtitle-font=FONT Set subtitle font name.\n"
+#~ " --subtitle-size=N Set subtitle font size.\n"
+#~ " --subtitle-scale=S Set subtitle scale factor.\n"
+#~ " --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
+#~ " --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
+#~ " -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
+#~ " -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-"
+#~ "separated\n"
+#~ " values for the R,G,B channels.\n"
+#~ " -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
+#~ " -b|--benchmark Benchmark mode (no audio, show fps).\n"
+#~ " -l|--loop Loop the input media.\n"
+#~ "\n"
+#~ "Interactive control:\n"
+#~ " ESC Leave fullscreen mode, or quit.\n"
+#~ " q Quit.\n"
+#~ " p or SPACE Pause / unpause.\n"
+#~ " f Toggle fullscreen.\n"
+#~ " c Center window.\n"
+#~ " e Swap left/right eye.\n"
+#~ " v Cycle through available video streams.\n"
+#~ " a Cycle through available audio streams.\n"
+#~ " s Cycle through available subtitle streams.\n"
+#~ " 1, 2 Adjust contrast.\n"
+#~ " 3, 4 Adjust brightness.\n"
+#~ " 5, 6 Adjust hue.\n"
+#~ " 7, 8 Adjust saturation.\n"
+#~ " <, > Adjust parallax.\n"
+#~ " (, ) Adjust ghostbusting.\n"
+#~ " left, right Seek 10 seconds backward / forward.\n"
+#~ " up, down Seek 1 minute backward / forward.\n"
+#~ " page up, page down Seek 10 minutes backward / forward.\n"
+#~ " Mouse click Seek according to horizontal click position."
+#~ msgstr ""
+#~ "Использование:\n"
+#~ " %s [опция...] [файл...]\n"
+#~ "\n"
+#~ "Опции:\n"
+#~ " --help Показать помощь.\n"
+#~ " --version Показать версию.\n"
+#~ " -n|--no-gui Не использовать GUI, использовать обычное "
+#~ "окно.\n"
+#~ " -L|--log-level=LEVEL Уровень логов (debug/info/warning/error/"
+#~ "quiet).\n"
+#~ " --device-type=TYPE Тип устройства ввода: default, firewire, x11.\n"
+#~ " --device-frame-size=WxH Потребовать от устройства размер кадра WxH.\n"
+#~ " --device-frame-rate=N/D Потребовать от устройства частоту кадров N/D.\n"
+#~ " --lirc-config=FILE Использовать указанный файл конфигурации "
+#~ "LIRC.\n"
+#~ " Эта опция может использоваться много раз.\n"
+#~ " -v|--video=STREAM Видео дорожка (1-n, по наличию в файлах).\n"
+#~ " -a|--audio=STREAM Аудио дорожка (1-n, по наличию в файлах).\n"
+#~ " -s|--subtitle=STREAM Дорожка субтитров (0-n, по наличию в файлах).\n"
+#~ " -i|--input=TYPE Источник (по умолчанию - автоматически):\n"
+#~ " mono Один видеоряд (2D).\n"
+#~ " separate-left-right Отдельные левый и правый видеофайлы.\n"
+#~ " separate-right-left Отдельные правый и левый видеофайлы.\n"
+#~ " top-bottom Левый сверху, правый снизу.\n"
+#~ " top-bottom-half Левый сверху, правый снизу, половина "
+#~ "высоты.\n"
+#~ " bottom-top Левый снизу, правый сверху.\n"
+#~ " bottom-top-half Левый снизу, правый сверху, половина "
+#~ "высоты.\n"
+#~ " left-right Левый слева, правый справа.\n"
+#~ " left-right-half Левый слева, правый справа, половина "
+#~ "ширины.\n"
+#~ " right-left Левый справа, правый слева.\n"
+#~ " right-left-half Левый справа, правый слева, половина "
+#~ "ширины.\n"
+#~ " even-odd-rows Левый в четных рядах, правый - в нечетных.\n"
+#~ " odd-even-rows Левый в нечетных рядах, правый - в четных.\n"
+#~ " -o|--output=TYPE Режим вывода:\n"
+#~ " mono-left Только левый видеоряд.\n"
+#~ " mono-right Только правый видеоряд.\n"
+#~ " top-bottom Левый сверху, правый снизу.\n"
+#~ " top-bottom-half Левый сверху, правый снизу, половина "
+#~ "высоты.\n"
+#~ " left-right Левый слева, правый справа.\n"
+#~ " left-right-half Левый слева, правый справа, половина "
+#~ "ширины.\n"
+#~ " even-odd-rows Левый в четных рядах, правый - в нечетных.\n"
+#~ " even-odd-columns Левый в четных столбцах, правый - в "
+#~ "нечетных.\n"
+#~ " checkerboard Левый и правый видеоряды в шахматном "
+#~ "порядке.\n"
+#~ " hdmi-frame-pack Режим упаковки кадров HDMI.\n"
+#~ " red-cyan-monochrome Красно-голубой анаглиф, черно-белый режим.\n"
+#~ " red-cyan-half-color Красно-голубой анаглиф, полу-цветной режим.\n"
+#~ " red-cyan-full-color Красно-голубой анаглиф, полноцветный режим.\n"
+#~ " red-cyan-dubois Красно-голубой анаглиф, метод Дюбуа.\n"
+#~ " green-magenta-monochrome Зелёно-пурпурный анаглиф, черно-белый "
+#~ "режим.\n"
+#~ " green-magenta-half-color Зелёно-пурпурный анаглиф, полу-цветной "
+#~ "режим.\n"
+#~ " green-magenta-full-color Зелёно-пурпурный анаглиф, полноцветный "
+#~ "режим.\n"
+#~ " green-magenta-dubois Зелёно-пурпурный анаглиф, метод Дюбуа.\n"
+#~ " amber-blue-monochrome Янтарно-синий анаглиф, черно-белый режим.\n"
+#~ " amber-blue-half-color Янтарно-синий анаглиф, полу-цветной режим.\n"
+#~ " amber-blue-full-color Янтарно-синий анаглиф, полноцветный режим.\n"
+#~ " amber-blue-dubois Янтарно-синий анаглиф, метод Дюбуа.\n"
+#~ " red-green-monochrome Красно-зелёный анаглиф, черно-белый режим.\n"
+#~ " red-blue-monochrome Красно-синий анаглиф, черно-белый режим.\n"
+#~ " stereo OpenGL стерео (quad-buffered).\n"
+#~ " equalizer Много-дисплейный 2D режим через Equalizer.\n"
+#~ " equalizer-3d Много-дисплейный 3D режим через Equalizer.\n"
+#~ " -S|--swap-eyes Поменять левый и правый видеоряды.\n"
+#~ " -f|--fullscreen Полноэкранный режим.\n"
+#~ " --fullscreen-screens= Экраны для полноэкранного режима.\n"
+#~ " [S0[,S1[,...]]] Номера экранов начинаются с 1. По умолчанию\n"
+#~ " (если список пуст) используется главный "
+#~ "экран.\n"
+#~ " В полноэкранном режиме:\n"
+#~ " --fullscreen-flip-left Отразить левый вид по вертикали.\n"
+#~ " --fullscreen-flop-left Отразить левый вид по горизонтали.\n"
+#~ " --fullscreen-flip-right Отразить правый вид по вертикали.\n"
+#~ " --fullscreen-flop-right Отразить правый вид по горизонтали.\n"
+#~ " -c|--center Расположить окно по центру экрана.\n"
+#~ " --subtitle-encoding=ENC Кодировка субтитров.\n"
+#~ " --subtitle-font=FONT Шрифт субтитров.\n"
+#~ " --subtitle-size=N Размер шрифта субтитров.\n"
+#~ " --subtitle-scale=S Коэффициент масштаба субтитров.\n"
+#~ " --subtitle-color=COLOR Цвет субтитров, в формате [AA]RRGGBB.\n"
+#~ " --subtitle-parallax=VAL Корректировка параллакса субтитров (-1 -- "
+#~ "+1).\n"
+#~ " -P|--parallax=VAL Корректировка параллакса (-1 -- +1).\n"
+#~ " -C|--crosstalk=VAL Уровень перекрестных помех (от 0 до 1); знач.\n"
+#~ " для каналов R, G, B, разделенные запятыми.\n"
+#~ " -G|--ghostbust=VAL Сила подавления перекрестных помех (0 -- 1).\n"
+#~ " -b|--benchmark Измерение производительности (FPS, без "
+#~ "аудио).\n"
+#~ " -l|--loop Зациклить воспроизведение.\n"
+#~ "\n"
+#~ "Интерактивное управление:\n"
+#~ " ESC Покинуть полноэкранный режим или выйти.\n"
+#~ " q Выход.\n"
+#~ " p или SPACE Пауза / возобновление.\n"
+#~ " f Переключить полноэкранный режим.\n"
+#~ " c Разместить окно по центру экрана.\n"
+#~ " e Поменять левый и правый видеоряды.\n"
+#~ " v Переключить видео дорожку.\n"
+#~ " a Переключить аудио дорожку.\n"
+#~ " s Переключить дорожку субтитров.\n"
+#~ " 1, 2 Изменить контрастность.\n"
+#~ " 3, 4 Изменить яркость.\n"
+#~ " 5, 6 Изменить оттенок.\n"
+#~ " 7, 8 Изменить цветовую насыщенность.\n"
+#~ " <, > Откорректировать параллакс.\n"
+#~ " (, ) Откорректировать силу подавления перекрестных "
+#~ "помех.\n"
+#~ " влево, вправо Перемотать на 10 секунд назад / вперед.\n"
+#~ " вверх, вниз Перемотать на 1 минуту назад / вперед.\n"
+#~ " page up, page down Перемотать на 10 минут назад / вперед.\n"
+#~ " Щелчок мышью Перемотать по горизонтальному положению курсора."
+
+#~ msgid "Equalizer canvas:"
+#~ msgstr "Полотно Equalizer:"
+
+#~ msgid "Area for %g:1 video: [ %g %g %g %g @ %g ]"
+#~ msgstr "Область для %g:1 видео: [ %g %g %g %g @ %g ]"
+
+#~ msgid "Stereoscopic Video Settings"
+#~ msgstr "Настройки стерео"
+
+#~ msgid "&Open..."
+#~ msgstr "&Открыть..."
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid ""
+#~ "Keyboard control: <table><tr><td>q or ESC</td><td>Stop</td></"
+#~ "tr><tr><td>p or SPACE</td><td>Pause / unpause</td></tr><tr><td>f</"
+#~ "td><td>Toggle fullscreen</td></tr><tr><td>c</td><td>Center window</td></"
+#~ "tr><tr><td>e</td><td>Swap left/right eye</td></tr><tr><td>v</td><td>Cycle "
+#~ "through available video streams</td></tr><tr><td>a</td><td>Cycle through "
+#~ "available audio streams</td></tr><tr><td>s</td><td>Cycle through "
+#~ "available subtitle streams</td></tr><tr><td>1, 2</td><td>Adjust contrast</"
+#~ "td></tr><tr><td>3, 4</td><td>Adjust brightness</td></tr><tr><td>5, 6</"
+#~ "td><td>Adjust hue</td></tr><tr><td>7, 8</td><td>Adjust saturation</td></"
+#~ "tr><tr><td>&lt;, &gt;</td><td>Adjust parallax</td></tr><tr><td>(, )</"
+#~ "td><td>Adjust ghostbusting</td></tr><tr><td>left, right</td><td>Seek 10 "
+#~ "seconds backward / forward</td></tr><tr><td>up, down</td><td>Seek 1 "
+#~ "minute backward / forward</td></tr><tr><td>page up, page down</"
+#~ "td><td>Seek 10 minutes backward / forward</td></tr></table>"
+#~ msgstr ""
+#~ "Управление с клавиатуры: <table><tr><td>q или ESC</td><td>Стоп</"
+#~ "td></tr><tr><td>p или ПРОБЕЛ</td><td>Пауза</td></tr><tr><td>f</"
+#~ "td><td>Полноэкранный режим</td></tr><tr><td>c</td><td>Расположить окно по "
+#~ "центру</td></tr><tr><td>e</td><td>Поменять местами левый и правый "
+#~ "видеоряды</td></tr><tr><td>v</td><td>Переключение видео дорожки</td></"
+#~ "tr><tr><td>a</td><td>Переключение аудио дорожки</td></tr><tr><td>s</"
+#~ "td><td>Переключение дорожки субтитров</td></tr><tr><td>1, 2</"
+#~ "td><td>Регулировка контраста</td></tr><tr><td>3, 4</td><td>Регулировка "
+#~ "яркости</td></tr><tr><td>5, 6</td><td>Регулировка оттенка</td></"
+#~ "tr><tr><td>7, 8</td><td>Регулировка насыщенности</td></tr><tr><td>&lt;, "
+#~ "&gt;</td><td>Регулировка параллакса</td></tr><tr><td>(, )</"
+#~ "td><td>Регулировка подавления перекрестных помех</td></tr><tr><td>ВЛЕВО, "
+#~ "ВПРАВО</td><td>Перемотать 10 секунд назад / вперед</td></"
+#~ "tr><tr><td>ВВЕРХ, ВНИЗ</td><td>Перемотать 1 минуту назад / вперед</td></"
+#~ "tr><tr><td>PGUP, PGDOWN</td><td>Перемотать 10 минут назад / вперед</td></"
+#~ "tr></table>"
+
+#~ msgid "OpenGL FBO error %s."
+#~ msgstr "Ошибка OpenGL FBO %s."
+
+#~ msgid "geometry shader"
+#~ msgstr "геометрический шейдер"
 
 #~ msgid "Unknown exception."
 #~ msgstr "Неизвестное исключение."

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2011
+# Copyright (C) 2010, 2011, 2012
 # Martin Lambers <marlam@marlam.de>
 #
 # Copying and distribution of this file, with or without modification, are
@@ -13,14 +13,13 @@
 	media_data.h media_data.cpp \
 	media_object.h media_object.cpp \
 	media_input.h media_input.cpp \
-	controller.h controller.cpp \
- video_output.h video_output.cpp \
- video_output_qt.h video_output_qt.cpp \
-	xgl.h xgl.cpp \
- subtitle_renderer.h subtitle_renderer.cpp \
+	dispatch.h dispatch.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 \
-	player_qt.h player_qt.cpp \
+	gui.h gui.cpp \
 	lib_versions.h lib_versions.cpp \
 	main.cpp
 
@@ -28,6 +27,8 @@
 	icons-local/input-layout-mono.ipe \
 	icons-local/input-layout-separate-left-right.ipe \
 	icons-local/input-layout-separate-right-left.ipe \
+	icons-local/input-layout-alternating-left-right.ipe \
+	icons-local/input-layout-alternating-right-left.ipe \
 	icons-local/input-layout-top-bottom.ipe \
 	icons-local/input-layout-top-bottom-half.ipe \
 	icons-local/input-layout-bottom-top.ipe \
@@ -38,6 +39,8 @@
 	icons-local/input-layout-right-left-half.ipe \
 	icons-local/input-layout-even-odd-rows.ipe \
 	icons-local/input-layout-odd-even-rows.ipe \
+	icons-local/output-type-stereo.ipe \
+	icons-local/output-type-alternating.ipe \
 	icons-local/output-type-mono-left.ipe \
 	icons-local/output-type-mono-right.ipe \
 	icons-local/output-type-top-bottom.ipe \
@@ -52,13 +55,17 @@
 	icons-local/output-type-green-magenta.ipe \
 	icons-local/output-type-amber-blue.ipe \
 	icons-local/output-type-red-green.ipe \
-	icons-local/output-type-red-blue.ipe \
-	icons-local/output-type-stereo.ipe
+	icons-local/output-type-red-blue.ipe
 
 ICONS = \
 	icons/application-exit.png \
 	icons/applications-internet.png \
+	icons/audio-volume-high.png \
+	icons/audio-volume-low.png \
+	icons/audio-volume-medium.png \
+	icons/audio-volume-muted.png \
 icons/camera-web.png \
+	icons/dialog-information.png \
 	icons/document-open.png \
 	icons/help-about.png \
 	icons/help-contents.png \
@@ -101,7 +108,7 @@
 nodist_bino_SOURCES = \
 	qt_resources.qrc \
 	qt_resources-rcc.cpp \
-	player_qt-moc.cpp \
+	gui-moc.cpp \
 	video_output_qt-moc.cpp \
 	video_output_color.fs.glsl.h \
 	video_output_render.fs.glsl.h
@@ -114,15 +121,15 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/base \
 	$(libavformat_CFLAGS) $(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \
-	$(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglew_CFLAGS) $(libqtopengl_CFLAGS)
+	$(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglewmx_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) $(libglew_LIBS) $(libqtopengl_LIBS)
+	$(libopenal_LIBS) $(libgl_LIBS) $(libglewmx_LIBS) $(libqtopengl_LIBS)
 
 if HAVE_LIBEQUALIZER
 bino_SOURCES += player_equalizer.h player_equalizer.cpp
-AM_CPPFLAGS += $(libEqualizer_CFLAGS) -DGLEW_MX
+AM_CPPFLAGS += $(libEqualizer_CFLAGS)
 bino_LDADD += $(libEqualizer_LIBS)
 endif

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

@@ -15,7 +15,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2010-2011
+# Copyright (C) 2010, 2011, 2012
 # Martin Lambers <marlam@marlam.de>
 #
 # Copying and distribution of this file, with or without modification, are
@@ -45,7 +45,7 @@
 target_triplet = @target@
 bin_PROGRAMS = bino$(EXEEXT)
 @HAVE_LIBEQUALIZER_TRUE@am__append_1 = player_equalizer.h player_equalizer.cpp
-@HAVE_LIBEQUALIZER_TRUE@am__append_2 = $(libEqualizer_CFLAGS) -DGLEW_MX
+@HAVE_LIBEQUALIZER_TRUE@am__append_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)
@@ -74,26 +74,26 @@
 	"$(DESTDIR)$(iconsscaldir)"
 PROGRAMS = $(bin_PROGRAMS)
 am__bino_SOURCES_DIST = media_data.h media_data.cpp media_object.h \
-	media_object.cpp media_input.h media_input.cpp controller.h \
-	controller.cpp video_output.h video_output.cpp \
-	video_output_qt.h video_output_qt.cpp xgl.h xgl.cpp \
-	subtitle_renderer.h subtitle_renderer.cpp audio_output.h \
-	audio_output.cpp player.h player.cpp player_qt.h player_qt.cpp \
-	lib_versions.h lib_versions.cpp main.cpp player_equalizer.h \
-	player_equalizer.cpp lirc.h lirc.cpp logo/bino_logo.ico
+	media_object.cpp media_input.h media_input.cpp dispatch.h \
+	dispatch.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 main.cpp \
+	player_equalizer.h player_equalizer.cpp lirc.h lirc.cpp \
+	logo/bino_logo.ico
 @HAVE_LIBEQUALIZER_TRUE@am__objects_1 = player_equalizer.$(OBJEXT)
 @HAVE_LIBLIRCCLIENT_TRUE@am__objects_2 = lirc.$(OBJEXT)
 am__dirstamp = $(am__leading_dot)dirstamp
 @W32_TRUE@am__objects_3 = logo/bino_logo.$(OBJEXT)
 am_bino_OBJECTS = media_data.$(OBJEXT) media_object.$(OBJEXT) \
-	media_input.$(OBJEXT) controller.$(OBJEXT) \
-	video_output.$(OBJEXT) video_output_qt.$(OBJEXT) xgl.$(OBJEXT) \
+	media_input.$(OBJEXT) dispatch.$(OBJEXT) \
+	video_output.$(OBJEXT) video_output_qt.$(OBJEXT) \
 	subtitle_renderer.$(OBJEXT) audio_output.$(OBJEXT) \
-	player.$(OBJEXT) player_qt.$(OBJEXT) lib_versions.$(OBJEXT) \
+	player.$(OBJEXT) gui.$(OBJEXT) lib_versions.$(OBJEXT) \
 	main.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
 	$(am__objects_3)
-nodist_bino_OBJECTS = qt_resources-rcc.$(OBJEXT) \
-	player_qt-moc.$(OBJEXT) video_output_qt-moc.$(OBJEXT)
+nodist_bino_OBJECTS = qt_resources-rcc.$(OBJEXT) gui-moc.$(OBJEXT) \
+	video_output_qt-moc.$(OBJEXT)
 bino_OBJECTS = $(am_bino_OBJECTS) $(nodist_bino_OBJECTS)
 am__DEPENDENCIES_1 =
 @HAVE_LIBEQUALIZER_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
@@ -216,6 +216,7 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -327,8 +328,8 @@
 libexecdir = @libexecdir@
 libgl_CFLAGS = @libgl_CFLAGS@
 libgl_LIBS = @libgl_LIBS@
-libglew_CFLAGS = @libglew_CFLAGS@
-libglew_LIBS = @libglew_LIBS@
+libglewmx_CFLAGS = @libglewmx_CFLAGS@
+libglewmx_LIBS = @libglewmx_LIBS@
 liblircclient_CFLAGS = @liblircclient_CFLAGS@
 liblircclient_LIBS = @liblircclient_LIBS@
 libopenal_CFLAGS = @libopenal_CFLAGS@
@@ -360,17 +361,18 @@
 top_srcdir = @top_srcdir@
 SUBDIRS = base
 bino_SOURCES = media_data.h media_data.cpp media_object.h \
-	media_object.cpp media_input.h media_input.cpp controller.h \
-	controller.cpp video_output.h video_output.cpp \
-	video_output_qt.h video_output_qt.cpp xgl.h xgl.cpp \
-	subtitle_renderer.h subtitle_renderer.cpp audio_output.h \
-	audio_output.cpp player.h player.cpp player_qt.h player_qt.cpp \
-	lib_versions.h lib_versions.cpp main.cpp $(am__append_1) \
-	$(am__append_4) $(am__append_7)
+	media_object.cpp media_input.h media_input.cpp dispatch.h \
+	dispatch.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 main.cpp \
+	$(am__append_1) $(am__append_4) $(am__append_7)
 ICONS_LOCAL_IPE = \
 	icons-local/input-layout-mono.ipe \
 	icons-local/input-layout-separate-left-right.ipe \
 	icons-local/input-layout-separate-right-left.ipe \
+	icons-local/input-layout-alternating-left-right.ipe \
+	icons-local/input-layout-alternating-right-left.ipe \
 	icons-local/input-layout-top-bottom.ipe \
 	icons-local/input-layout-top-bottom-half.ipe \
 	icons-local/input-layout-bottom-top.ipe \
@@ -381,6 +383,8 @@
 	icons-local/input-layout-right-left-half.ipe \
 	icons-local/input-layout-even-odd-rows.ipe \
 	icons-local/input-layout-odd-even-rows.ipe \
+	icons-local/output-type-stereo.ipe \
+	icons-local/output-type-alternating.ipe \
 	icons-local/output-type-mono-left.ipe \
 	icons-local/output-type-mono-right.ipe \
 	icons-local/output-type-top-bottom.ipe \
@@ -395,13 +399,17 @@
 	icons-local/output-type-green-magenta.ipe \
 	icons-local/output-type-amber-blue.ipe \
 	icons-local/output-type-red-green.ipe \
-	icons-local/output-type-red-blue.ipe \
-	icons-local/output-type-stereo.ipe
+	icons-local/output-type-red-blue.ipe
 
 ICONS = \
 	icons/application-exit.png \
 	icons/applications-internet.png \
+	icons/audio-volume-high.png \
+	icons/audio-volume-low.png \
+	icons/audio-volume-medium.png \
+	icons/audio-volume-muted.png \
 icons/camera-web.png \
+	icons/dialog-information.png \
 	icons/document-open.png \
 	icons/help-about.png \
 	icons/help-contents.png \
@@ -431,7 +439,7 @@
 nodist_bino_SOURCES = \
 	qt_resources.qrc \
 	qt_resources-rcc.cpp \
-	player_qt-moc.cpp \
+	gui-moc.cpp \
 	video_output_qt-moc.cpp \
 	video_output_color.fs.glsl.h \
 	video_output_render.fs.glsl.h
@@ -440,12 +448,13 @@
 CLEANFILES = $(BUILT_SOURCES)
 AM_CPPFLAGS = -I$(top_srcdir)/src/base $(libavformat_CFLAGS) \
 	$(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \
-	$(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglew_CFLAGS) \
+	$(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglewmx_CFLAGS) \
 	$(libqtopengl_CFLAGS) $(am__append_2) $(am__append_5)
 bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) $(LIBICONV) \
 	$(libavformat_LIBS) $(libavdevice_LIBS) $(libswscale_LIBS) \
-	$(libass_LIBS) $(libopenal_LIBS) $(libgl_LIBS) $(libglew_LIBS) \
-	$(libqtopengl_LIBS) $(am__append_3) $(am__append_6)
+	$(libass_LIBS) $(libopenal_LIBS) $(libgl_LIBS) \
+	$(libglewmx_LIBS) $(libqtopengl_LIBS) $(am__append_3) \
+	$(am__append_6)
 iconsdatadir = $(datadir)/icons/hicolor
 icons16dir = $(iconsdatadir)/16x16/apps
 icons32dir = $(iconsdatadir)/32x32/apps
@@ -557,7 +566,9 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_output.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/controller.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dispatch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_versions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lirc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
@@ -566,14 +577,11 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/media_object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player_equalizer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player_qt-moc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player_qt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qt_resources-rcc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subtitle_renderer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_output.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_output_qt-moc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_output_qt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xgl.Po@am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

bino-1.2.1.tar.bz2/src/audio_output.cpp -> bino-1.3.2.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
+ * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 * Gabriele Greco <gabrielegreco@gmail.com>
 *
@@ -45,6 +45,20 @@
 
 audio_output::audio_output() : controller(), _initialized(false)
 {
+ if (alcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT"))
+ {
+ const char *p = alcGetString(NULL, ALC_DEVICE_SPECIFIER);
+ while (p && *p)
+ {
+ _devices.push_back(p);
+ p += _devices.back().length() + 1;
+ }
+ msg::dbg("%d OpenAL devices available:", devices());
+ for (size_t i = 0; i < _devices.size(); i++)
+ {
+ msg::dbg(4, _devices[i]);
+ }
+ }
 }
 
 audio_output::~audio_output()
@@ -52,13 +66,39 @@
 deinit();
 }
 
-void audio_output::init()
+int audio_output::devices() const
+{
+ return _devices.size();
+}
+
+const std::string &audio_output::device_name(int i) const
+{
+ assert(i >= 0 && i < devices());
+ return _devices[i];
+}
+
+void audio_output::init(int i)
 {
 if (!_initialized)
 {
- if (!(_device = alcOpenDevice(NULL)))
+ if (i < 0)
+ {
+ if (!(_device = alcOpenDevice(NULL)))
+ {
+ throw exc(_("No OpenAL device available."));
+ }
+ }
+ else if (i >= static_cast<int>(_devices.size()))
+ {
+ throw exc(str::asprintf(_("OpenAL device '%s' is not available."), _("unknown")));
+ }
+ else
 {
- throw exc(_("No OpenAL device available."));
+ if (!(_device = alcOpenDevice(_devices[i].c_str())))
+ {
+ throw exc(str::asprintf(_("OpenAL device '%s' is not available."),
+ _devices[i].c_str()));
+ }
 }
 if (!(_context = alcCreateContext(_device, NULL)))
 {
@@ -316,6 +356,20 @@
 return format;
 }
 
+void audio_output::set_source_parameters()
+{
+ float gain = dispatch::parameters().audio_volume();
+ if (dispatch::parameters().audio_mute())
+ {
+ gain = 0.0f;
+ }
+ alSourcef(_source, AL_GAIN, gain);
+ if (alGetError() != AL_NO_ERROR)
+ {
+ throw exc(_("Cannot set OpenAL audio volume."));
+ }
+}
+
 void audio_output::data(const audio_blob &blob)
 {
 assert(blob.data);
@@ -323,6 +377,7 @@
 msg::dbg(std::string("Buffering ") + str::from(blob.size) + " bytes of audio data.");
 if (_state == 0)
 {
+ set_source_parameters();
 // Initial buffering
 assert(blob.size == _num_buffers * _buffer_size);
 char *data = static_cast<char *>(blob.data);
@@ -425,3 +480,13 @@
 }
 _state = 0;
 }
+
+void audio_output::receive_notification(const notification& note)
+{
+ if (_initialized
+ && (note.type == notification::audio_volume
+ || note.type == notification::audio_mute))
+ {
+ set_source_parameters();
+ }
+}

bino-1.2.1.tar.bz2/src/audio_output.h -> bino-1.3.2.tar.xz/src/audio_output.h Changed

@@ -1,9 +1,10 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010-2011
+ * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 * Gabriele Greco <gabrielegreco@gmail.com>
+ * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
 *
 * 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
@@ -25,16 +26,15 @@
 #include <vector>
 #include <string>
 
-#ifdef __APPLE__
-# include <OpenAL/al.h>
-# include <OpenAL/alc.h>
-#else
+#if !defined(__APPLE__) || defined(HAVE_AL_AL_H)
 # include <AL/al.h>
 # include <AL/alc.h>
+#else
+# include <OpenAL/al.h>
+# include <OpenAL/alc.h>
 #endif
 
-#include "media_data.h"
-#include "controller.h"
+#include "dispatch.h"
 
 
 class audio_output : public controller
@@ -45,6 +45,7 @@
 static const size_t _buffer_size; // Size of each audio buffer
 
 // OpenAL things
+ std::vector<std::string> _devices; // List of known OpenAL devices
 bool _initialized; // Was this initialized?
 ALCdevice *_device; // Audio device 
 ALCcontext *_context; // Audio context associated with device
@@ -66,12 +67,21 @@
 // Get an OpenAL source format for the audio data in blob (or throw an exception)
 ALenum get_al_format(const audio_blob &blob);
 
+ // Set source parameters
+ void set_source_parameters();
+
 public:
 audio_output();
 ~audio_output();
 
- /* Initialize the audio device for output. Throw an exception if this fails. */
- void init();
+ /* How many OpenAL devices are available? */
+ int devices() const;
+ /* Return the name of OpenAL device i. */
+ const std::string &device_name(int i) const;
+
+ /* Initialize the audio device i for output. If i is < 0, the default device
+ * will be used. Throw an exception if this fails. */
+ void init(int i = -1);
 /* Deinitialize the audio device. */
 void deinit();
 
@@ -99,6 +109,9 @@
 
 /* Stop audio playback, and flush all buffers. */
 void stop();
+
+ /* Receive a notification from the dispatch. */
+ virtual void receive_notification(const notification& note);
 };
 
 #endif

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

bino-1.2.1.tar.bz2/src/base/blob.h -> bino-1.3.2.tar.xz/src/base/blob.h Changed

@@ -1,7 +1,5 @@
 /*
- * This file is part of bino, a 3D video player.
- *
- * Copyright (C) 2010-2011
+ * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -41,76 +39,82 @@
 class blob
 {
 private:
- 
+
 size_t _size;
- void *_ptr;
+ void* _ptr;
 
- static void *alloc(size_t s)
+ static void* alloc(size_t s)
 {
- void *ptr = ::malloc(s);
- if (s != 0 && !ptr)
- {
+ void* ptr = std::malloc(s);
+ if (s != 0 && !ptr) {
 throw exc(ENOMEM);
 }
 return ptr;
 }
 
- static void *realloc(void *p, size_t s)
+ static void* realloc(void* p, size_t s)
 {
- void *ptr = ::realloc(p, s);
- if (s != 0 && !ptr)
- {
+ void* ptr = std::realloc(p, s);
+ if (s != 0 && !ptr) {
 throw exc(ENOMEM);
 }
 return ptr;
 }
 
 public:
- 
- blob() throw ()
- : _size(0), _ptr(NULL)
+
+ blob() throw () :
+ _size(0), _ptr(NULL)
 {
 }
 
- blob(size_t s)
- : _size(s), _ptr(alloc(_size))
+ 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 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(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(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))
+ blob(const blob& b) :
+ _size(b._size), _ptr(alloc(_size))
 {
- memcpy(_ptr, b._ptr, _size);
+ if (_size > 0) {
+ std::memcpy(_ptr, b._ptr, _size);
+ }
 }
 
- const blob &operator=(const blob &b)
+ const blob& operator=(const blob& b)
 {
- void *ptr = alloc(b.size());
- memcpy(ptr, b.ptr(), b.size());
- ::free(_ptr);
- _ptr = ptr;
- _size = b.size();
+ 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 ()
 {
- ::free(_ptr);
+ std::free(_ptr);
 }
 
 void resize(size_t s)
@@ -142,26 +146,26 @@
 return _size;
 }
 
- const void *ptr(size_t offset = 0) const throw ()
+ const void* ptr(size_t offset = 0) const throw ()
 {
- return static_cast<const void *>(static_cast<const char *>(_ptr) + offset);
+ return static_cast<const void*>(static_cast<const char*>(_ptr) + offset);
 }
 
- void *ptr(size_t offset = 0) throw ()
+ void* ptr(size_t offset = 0) throw ()
 {
- return static_cast<void *>(static_cast<char *>(_ptr) + offset);
+ return static_cast<void*>(static_cast<char*>(_ptr) + offset);
 }
 
 template<typename T>
- const T *ptr(size_t offset = 0) const throw ()
+ const T* ptr(size_t offset = 0) const throw ()
 {
- return static_cast<const T *>(ptr(offset * sizeof(T)));
+ return static_cast<const T*>(ptr(offset * sizeof(T)));
 }
 
 template<typename T>
- T *ptr(size_t offset = 0) throw ()
+ T* ptr(size_t offset = 0) throw ()
 {
- return static_cast<T *>(ptr(offset * sizeof(T)));
+ return static_cast<T*>(ptr(offset * sizeof(T)));
 }
 };

bino-1.2.1.tar.bz2/src/base/dbg.cpp -> bino-1.3.2.tar.xz/src/base/dbg.cpp Changed

@@ -1,7 +1,5 @@
 /*
- * This file is part of bino, a 3D video player.
- *
- * Copyright (C) 2006-2007, 2009-2011
+ * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -25,6 +23,7 @@
 #include <cstring>
 #include <new>
 #if HAVE_BACKTRACE
+# include <cstdio>
 # include <execinfo.h>
 #endif
 #if __GNUG__
@@ -80,6 +79,53 @@
 std::set_new_handler(oom_abort);
 }
 
+#ifndef NDEBUG
+# if HAVE_BACKTRACE
+ static char *get_file_and_line(
+ const char *executable, size_t executable_len,
+ const char *addr, size_t addr_len)
+ {
+ /* "addr2line -e EXECUTABLE ADDR" */
+ size_t cmd_len = 9 + 4 + executable_len + 1 + addr_len;
+ char *cmd_buf = static_cast<char*>(malloc(cmd_len + 1));
+ if (!cmd_buf)
+ {
+ return NULL;
+ }
+ strcpy(cmd_buf, "addr2line -e ");
+ strncat(cmd_buf, executable, executable_len);
+ strcat(cmd_buf, " ");
+ strncat(cmd_buf, addr, addr_len);
+ FILE *f = popen(cmd_buf, "r");
+ free(cmd_buf);
+ if (!f)
+ {
+ return NULL;
+ }
+ char line_buf[512];
+ if (!fgets(line_buf, 512, f))
+ {
+ pclose(f);
+ return NULL;
+ }
+ if (pclose(f) != 0)
+ {
+ return NULL;
+ }
+ char *p = strchr(line_buf, '\n');
+ if (p)
+ {
+ *p = '\0';
+ }
+ if (strcmp(line_buf, "??:0") == 0)
+ {
+ return NULL;
+ }
+ return strdup(line_buf);
+ }
+# endif
+#endif
+
 void backtrace()
 {
 #ifndef NDEBUG
@@ -101,11 +147,36 @@
 strings = backtrace_symbols(array, size);
 for (int i = 0; i < size; i++)
 {
+ char *p;
+ char *executable = NULL;
+ size_t executable_len = 0;
+ char *addr = NULL;
+ size_t addr_len = 0;
+ executable = strings[i];
+ p = strchr(strings[i], '(');
+ if (p)
+ {
+ executable_len = p - strings[i];
+ }
+ p = strchr(strings[i], '[');
+ if (p)
+ {
+ addr = p + 1;
+ p = strchr(addr, ']');
+ if (p)
+ {
+ addr_len = p - addr;
+ }
+ }
+ char *file_and_line = NULL;
+ if (executable && executable_len > 0 && addr && addr_len > 0)
+ {
+ file_and_line = get_file_and_line(executable, executable_len, addr, addr_len);
+ }
 # if __GNUG__
 int status;
- char *p, *q;
+ char *q;
 char *realname = NULL;
-
 p = strchr(strings[i], '(');
 if (p)
 {
@@ -121,16 +192,21 @@
 if (realname && status == 0)
 {
 *p = '\0';
- msg::err(" %s%s%s", strings[i], realname, q);
+ msg::err(4, "%s%s%s", strings[i], realname, q);
 }
 else
 {
- msg::err(" %s", strings[i]);
+ msg::err(4, "%s", strings[i]);
 }
 free(realname);
 # else
- msg::err(" %s", strings[i]);
+ msg::err(4, "%s", strings[i]);
 # endif
+ if (file_and_line)
+ {
+ msg::err(8, "at %s", file_and_line);
+ free(file_and_line);
+ }
 }
 free(strings);
 }

bino-1.2.1.tar.bz2/src/base/dbg.h -> bino-1.3.2.tar.xz/src/base/dbg.h Changed

bino-1.2.1.tar.bz2/src/base/exc.cpp -> bino-1.3.2.tar.xz/src/base/exc.cpp Changed

bino-1.2.1.tar.bz2/src/base/exc.h -> bino-1.3.2.tar.xz/src/base/exc.h Changed

bino-1.2.1.tar.bz2/src/base/intcheck.h -> bino-1.3.2.tar.xz/src/base/intcheck.h Changed

bino-1.2.1.tar.bz2/src/base/msg.cpp -> bino-1.3.2.tar.xz/src/base/msg.cpp Changed

bino-1.2.1.tar.bz2/src/base/msg.h -> bino-1.3.2.tar.xz/src/base/msg.h Changed

@@ -1,7 +1,5 @@
 /*
- * This file is part of bino, a 3D video player.
- *
- * Copyright (C) 2009-2011
+ * Copyright (C) 2009, 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -43,7 +41,7 @@
 
 typedef enum
 {
- DBG = 0,
+ DBG = 0, // Only ever printed if NDEBUG is not set!
 INF = 1,
 WRN = 2,
 ERR = 3,
@@ -76,15 +74,29 @@
 void msg_txt(level_t level, const std::string &s);
 void msg_txt(level_t level, const char *format, ...) MSG_AFP(2, 3);
 
+#ifdef NDEBUG
+ inline void dbg(int, const std::string &) { }
+ inline void dbg(int, const char *, ...) { }
+ inline void dbg_txt(int, const std::string &) { }
+ inline void dbg_txt(int, const char *, ...) { }
+#else
 void dbg(int indent, const std::string &s);
 void dbg(int indent, const char *format, ...) MSG_AFP(2, 3);
 void dbg_txt(int indent, const std::string &s);
 void dbg_txt(int indent, const char *format, ...) MSG_AFP(2, 3);
+#endif
 
+#ifdef NDEBUG
+ inline void dbg(const std::string &) { }
+ inline void dbg(const char *, ...) { }
+ inline void dbg_txt(const std::string &) { }
+ inline void dbg_txt(const char *, ...) { }
+#else
 void dbg(const std::string &s);
 void dbg(const char *format, ...) MSG_AFP(1, 2);
 void dbg_txt(const std::string &s);
 void dbg_txt(const char *format, ...) MSG_AFP(1, 2);
+#endif
 
 void inf(int indent, const std::string &s);
 void inf(int indent, const char *format, ...) MSG_AFP(2, 3);

bino-1.2.1.tar.bz2/src/base/opt.cpp -> bino-1.3.2.tar.xz/src/base/opt.cpp Changed

@@ -1,7 +1,5 @@
 /*
- * This file is part of bino, a 3D video player.
- *
- * Copyright (C) 2006-2007, 2009-2011
+ * Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -23,6 +21,9 @@
 #include <typeinfo>
 #include <limits>
 #include <cstring>
+#ifndef NDEBUG
+# include <set>
+#endif
 
 #include "gettext.h"
 #define _(string) gettext(string)
@@ -32,6 +33,7 @@
 #undef required_argument
 #undef optional_argument
 
+#include "dbg.h"
 #include "msg.h"
 #include "opt.h"
 
@@ -66,6 +68,21 @@
 shortopt_count++;
 }
 }
+#ifndef NDEBUG
+ /* Sanity check: are all short and long options unique? */
+ {
+ std::set<char> shortopt_set;
+ std::set<std::string> longopt_set;
+ for (size_t i = 0; i < options.size(); i++)
+ {
+ if (options[i]->shortname() != '\0')
+ shortopt_set.insert(options[i]->shortname());
+ longopt_set.insert(options[i]->longname());
+ }
+ assert(longopt_set.size() == static_cast<size_t>(longopt_count));
+ assert(shortopt_set.size() == static_cast<size_t>(shortopt_count));
+ }
+#endif
 /* Construct an array of type 'struct option', 'longopts', and a short
 * option description string 'shortopts' for use with getopt_long().
 * The indices of options in the given array 'options' and the constructed
@@ -200,6 +217,10 @@
 }
 error = true;
 }
+ else
+ {
+ options[optval]->mark_as_set();
+ }
 if (typeid(*(options[optval])) == typeid(info))
 {
 info_option_was_seen = true;

bino-1.2.1.tar.bz2/src/base/opt.h -> bino-1.3.2.tar.xz/src/base/opt.h Changed

bino-1.2.1.tar.bz2/src/base/s11n.cpp -> bino-1.3.2.tar.xz/src/base/s11n.cpp Changed

@@ -1,7 +1,5 @@
 /*
- * This file is part of bino, a 3D video player.
- *
- * Copyright (C) 2008-2011
+ * Copyright (C) 2008, 2009, 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,111 +18,412 @@
 
 #include "config.h"
 
+#include <cstring>
+
+#include "str.h"
+#include "intcheck.h"
+
 #include "s11n.h"
 
 
+static const char* low_char_encodings[] = {
+ "\\(NUL)", // 0
+ "\\(SOH)", // 1
+ "\\(STX)", // 2
+ "\\(ETX)", // 3
+ "\\(EOT)", // 4
+ "\\(ENQ)", // 5
+ "\\(ACK)", // 6
+ "\\(BEL)", // 7
+ "\\(_BS)", // 8
+ "\\(_HT)", // 9
+ "\\(_LF)", // 10
+ "\\(_VT)", // 11
+ "\\(_FF)", // 12
+ "\\(_CR)", // 13
+ "\\(_SO)", // 14
+ "\\(_SI)", // 15
+ "\\(DLE)", // 16
+ "\\(DC1)", // 17
+ "\\(DC2)", // 18
+ "\\(DC3)", // 19
+ "\\(DC4)", // 20
+ "\\(NAK)", // 21
+ "\\(SYN)", // 22
+ "\\(ETB)", // 23
+ "\\(CAN)", // 24
+ "\\(_EM)", // 25
+ "\\(SUB)", // 26
+ "\\(ESC)", // 27
+ "\\(_FS)", // 28
+ "\\(_GS)", // 29
+ "\\(_RS)", // 30
+ "\\(_US)", // 31
+};
+
+
+void s11n::startgroup(std::ostream& os, const char* name)
+{
+ os << ' ' << name << "={";
+}
+
+void s11n::endgroup(std::ostream& os)
+{
+ os << " }";
+}
+
+void s11n::load(std::istream& is, std::string& name, std::string& value)
+{
+ char c;
+ // skip leading spaces
+ while (is.good() && (c = is.get()) == ' ');
+ // read name
+ name.clear();
+ while (is.good() && c != '=') {
+ name.push_back(c);
+ c = is.get();
+ }
+ c = is.get();
+ // read value
+ value.clear();
+ bool value_is_valid = false;
+ int group_depth = 0;
+ char enc_char[] = "\\(...)";
+ for (;;) {
+ bool c_is_valid = false;
+ if (c == '\\') {
+ c = is.get();
+ if (c == '\\' || c == ' ' || c == '{' || c == '}') {
+ c_is_valid = true;
+ } else {
+ enc_char[1] = c;
+ enc_char[2] = is.get();
+ enc_char[3] = is.get();
+ enc_char[4] = is.get();
+ enc_char[5] = is.get();
+ if (std::memcmp(enc_char, "\\(DEL)", 6) == 0) {
+ c = 127;
+ c_is_valid = true;
+ } else {
+ for (int j = 0; j <= 31; j++) {
+ if (std::memcmp(enc_char, low_char_encodings[j], 6) == 0) {
+ c = j;
+ c_is_valid = true;
+ break;
+ }
+ }
+ }
+ }
+ } else {
+ if (c == '{') {
+ group_depth++;
+ } else if (c == '}') {
+ group_depth--;
+ if (group_depth < 0)
+ break;
+ }
+ c_is_valid = true;
+ }
+ if (!c_is_valid || !is.good())
+ break;
+ value.append(1, c);
+ if (group_depth == 0 && (is.peek() == ' ' || is.eof())) {
+ value_is_valid = true;
+ break;
+ }
+ c = is.get();
+ }
+ if (!value_is_valid)
+ value = "";
+ else if (value.length() >= 2 && value[0] == '{' && value[value.length() - 1] == '}')
+ value = value.substr(1, value.length() - 2);
+}
+
+void serializable::save(std::ostream& os, const char* name) const
+{
+ // Default implementation: use binary save and store binary blob
+ std::ostringstream oss;
+ this->save(oss);
+ s11n::startgroup(os, name);
+ s11n::save(os, "size", oss.str().length());
+ s11n::save(os, "", oss.str().data(), oss.str().length());
+ s11n::endgroup(os);
+}
+
+void serializable::load(const std::string& s)
+{
+ // Default implementation: read and restore binary blob
+ std::istringstream iss(s);
+ std::string name, value;
+ s11n::load(iss, name, value);
+ size_t size = 0;
+ if (name == "size")
+ s11n::load(value, size);
+ s11n::load(iss, name, value);
+ std::string str;
+ char* buf = new char[size];
+ s11n::load(value, buf, size);
+ str.assign(buf, size);
+ delete[] buf;
+ std::istringstream iss2(str);
+ this->load(iss2);
+}
+
+// Return value NULL means the character can be written as is.
+static const char* enc_char(char x)
+{
+ return (x >= 0 && x <= 31 ? low_char_encodings[static_cast<int>(x)]
+ : x == 127 ? "\\(DEL)"
+ : x == '{' ? "\\{"
+ : x == '}' ? "\\}"
+ : x == ' ' ? "\\ "
+ : x == '\\' ? "\\\\"
+ : NULL);
+}
+
+// Decode a character. The index i is incremented according to the characters consumed from s.
+static char dec_char(const char* s, size_t& i)
+{
+ if (s[i] == '\\') {
+ if (s[i + 1] == '\\' || s[i + 1] == ' ' || s[i + 1] == '{' || s[i + 1] == '}') {
+ i++;
+ return s[i++];
+ } else if (s[i + 1] != '\0' && s[i + 2] != '\0' && s[i + 3] != '\0' && s[i + 4] != '\0' && s[i + 5] != '\0') {
+ if (std::memcmp(s, "\\(DEL)", 6) == 0) {
+ i += 6;
+ return 127;
+ } else {
+ for (int j = 0; j <= 31; j++) {
+ if (std::memcmp(s, low_char_encodings[j], 6) == 0) {
+ i += 6;
+ return j;
+ }
+ }
+ // invalid string!
+ return '\0';
+ }
+ } else {
+ // invalid string!
+ return '\0';
+ }
+ } else {
+ return s[i++];
+ }
+}
+
 /*
 * Save a value to a stream
 */
 
 // Fundamental arithmetic data types
 
-void s11n::save(std::ostream &os, const bool x)
+void s11n::save(std::ostream& os, bool x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, bool x)
+{
+ os << ' ' << name << '=' << (x ? '1' : '0');
+}
+
+void s11n::save(std::ostream& os, char x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, char x)
 {
- os.write(reinterpret_cast<const char *>(&x), sizeof(x));
+ const char* e = enc_char(x);
+ os << ' ' << name << '=';
+ if (e)
+ os << e;
+ else
+ os << x;
 }
 
-void s11n::save(std::ostream &os, const char x)
+void s11n::save(std::ostream& os, signed char x)
 {
- os.write(reinterpret_cast<const char *>(&x), sizeof(x));
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
 }
 
-void s11n::save(std::ostream &os, const signed char x)
+void s11n::save(std::ostream& os, const char* name, signed char x)
 {
- os.write(reinterpret_cast<const char *>(&x), sizeof(x));
+ os << ' ' << name << '=' << static_cast<int>(x);
 }
 
-void s11n::save(std::ostream &os, const unsigned char x)
+void s11n::save(std::ostream& os, unsigned char x)
 {
- os.write(reinterpret_cast<const char *>(&x), sizeof(x));
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
 }
 
-void s11n::save(std::ostream &os, const short x)
+void s11n::save(std::ostream& os, const char* name, unsigned char x)
 {
- os.write(reinterpret_cast<const char *>(&x), sizeof(x));
+ os << ' ' << name << '=' << static_cast<int>(x);
 }
 
-void s11n::save(std::ostream &os, const unsigned short x)
+void s11n::save(std::ostream& os, short x)
 {
- os.write(reinterpret_cast<const char *>(&x), sizeof(x));
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
 }
 
-void s11n::save(std::ostream &os, const int x)
+void s11n::save(std::ostream& os, const char* name, short x)
 {
- os.write(reinterpret_cast<const char *>(&x), sizeof(x));
+ os << ' ' << name << '=' << x;
 }
 
-void s11n::save(std::ostream &os, const unsigned int x)
+void s11n::save(std::ostream& os, unsigned short x)
 {
- os.write(reinterpret_cast<const char *>(&x), sizeof(x));
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
 }
 
-void s11n::save(std::ostream &os, const long x)
+void s11n::save(std::ostream& os, const char* name, unsigned short x)
 {
- os.write(reinterpret_cast<const char *>(&x), sizeof(x));
+ os << ' ' << name << '=' << x;
 }
 
-void s11n::save(std::ostream &os, const unsigned long x)
+void s11n::save(std::ostream& os, int x)
 {
- os.write(reinterpret_cast<const char *>(&x), sizeof(x));
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
 }
 
-void s11n::save(std::ostream &os, const long long x)
+void s11n::save(std::ostream& os, const char* name, int x)
 {
- os.write(reinterpret_cast<const char *>(&x), sizeof(x));
+ os << ' ' << name << '=' << x;
 }
 
-void s11n::save(std::ostream &os, const unsigned long long x)
+void s11n::save(std::ostream& os, unsigned int x)
 {
- os.write(reinterpret_cast<const char *>(&x), sizeof(x));
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
 }
 
-void s11n::save(std::ostream &os, const float x)
+void s11n::save(std::ostream& os, const char* name, unsigned int x)
 {
- os.write(reinterpret_cast<const char *>(&x), sizeof(x));
+ os << ' ' << name << '=' << x;
 }
 
-void s11n::save(std::ostream &os, const double x)
+void s11n::save(std::ostream& os, long x)
 {
- os.write(reinterpret_cast<const char *>(&x), sizeof(x));
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
 }
 
-void s11n::save(std::ostream &os, const long double x)
+void s11n::save(std::ostream& os, const char* name, long x)
 {
- os.write(reinterpret_cast<const char *>(&x), sizeof(x));
+ os << ' ' << name << '=' << x;
+}
+
+void s11n::save(std::ostream& os, unsigned long x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, unsigned long x)
+{
+ os << ' ' << name << '=' << x;
+}
+
+void s11n::save(std::ostream& os, long long x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, long long x)
+{
+ os << ' ' << name << '=' << x;
+}
+
+void s11n::save(std::ostream& os, unsigned long long x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, unsigned long long x)
+{
+ os << ' ' << name << '=' << x;
+}
+
+void s11n::save(std::ostream& os, float x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, float x)
+{
+ os << ' ' << name << '=' << str::from(x).c_str();
+}
+
+void s11n::save(std::ostream& os, double x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, double x)
+{
+ os << ' ' << name << '=' << str::from(x).c_str();
+}
+
+void s11n::save(std::ostream& os, long double x)
+{
+ os.write(reinterpret_cast<const char*>(&x), sizeof(x));
+}
+
+void s11n::save(std::ostream& os, const char* name, long double x)
+{
+ os << ' ' << name << '=' << str::from(x).c_str();
 }
 
 // Binary blobs
 
-void s11n::save(std::ostream &os, const void *x, const size_t n)
+void s11n::save(std::ostream& os, const void* x, const size_t n)
+{
+ os.write(reinterpret_cast<const char*>(x), n);
+}
+
+void s11n::save(std::ostream& os, const char* name, const void* x, const size_t n)
 {
- os.write(reinterpret_cast<const char *>(x), n);
+ static const char hex[] = "0123456789abcdef";
+ startgroup(os, name);
+ for (size_t i = 0; i < n; i++) {
+ unsigned char val = static_cast<const unsigned char*>(x)[i];
+ os << hex[(val >> 4) & 0xf] << hex[val & 0xf];
+ if (i < n - 1)
+ os << ' ';
+ }
+ endgroup(os);
 }
 
 // Serializable classes
 
-void s11n::save(std::ostream &os, const s11n &x)
+void s11n::save(std::ostream& os, const serializable& x)
 {
 x.save(os);
 }
 
+void s11n::save(std::ostream& os, const char* name, const serializable& x)
+{
+ x.save(os, name);
+}
+
 // Basic STL types
 
-void s11n::save(std::ostream &os, const std::string &x)
+void s11n::save(std::ostream& os, const std::string& x)
 {
- const size_t s = x.length();
- os.write(reinterpret_cast<const char *>(&s), sizeof(s));
- os.write(reinterpret_cast<const char *>(x.data()), s);
+ size_t s = x.length();
+ os.write(reinterpret_cast<const char*>(&s), sizeof(s));
+ os.write(reinterpret_cast<const char*>(x.data()), s);
+}
+
+void s11n::save(std::ostream& os, const char* name, const std::string& x)
+{
+ os << ' ' << name << '=';
+ for (size_t i = 0; i < x.length(); i++) {
+ char c = x[i];
+ const char* e = enc_char(c);
+ if (e)
+ os << e;
+ else
+ os << c;
+ }
 }
 
 
@@ -134,103 +433,218 @@
 
 // Fundamental arithmetic data types
 
-void s11n::load(std::istream &is, bool &x)
+void s11n::load(std::istream& is, bool& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, bool& x)
+{
+ x = str::to<bool>(s);
+}
+
+void s11n::load(std::istream& is, char& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, char& x)
+{
+ size_t i = 0;
+ x = dec_char(s.c_str(), i);
+}
+
+void s11n::load(std::istream& is, signed char& x)
 {
- is.read(reinterpret_cast<char *>(&x), sizeof(x));
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
 }
 
-void s11n::load(std::istream &is, char &x)
+void s11n::load(const std::string& s, signed char& x)
 {
- is.read(reinterpret_cast<char *>(&x), sizeof(x));
+ x = str::to<int>(s);
 }
 
-void s11n::load(std::istream &is, signed char &x)
+void s11n::load(std::istream& is, unsigned char& x)
 {
- is.read(reinterpret_cast<char *>(&x), sizeof(x));
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
 }
 
-void s11n::load(std::istream &is, unsigned char &x)
+void s11n::load(const std::string& s, unsigned char& x)
 {
- is.read(reinterpret_cast<char *>(&x), sizeof(x));
+ x = str::to<unsigned int>(s);
 }
 
-void s11n::load(std::istream &is, short &x)
+void s11n::load(std::istream& is, short& x)
 {
- is.read(reinterpret_cast<char *>(&x), sizeof(x));
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
 }
 
-void s11n::load(std::istream &is, unsigned short &x)
+void s11n::load(const std::string& s, short& x)
 {
- is.read(reinterpret_cast<char *>(&x), sizeof(x));
+ x = str::to<short>(s);
 }
 
-void s11n::load(std::istream &is, int &x)
+void s11n::load(std::istream& is, unsigned short& x)
 {
- is.read(reinterpret_cast<char *>(&x), sizeof(x));
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
 }
 
-void s11n::load(std::istream &is, unsigned int &x)
+void s11n::load(const std::string& s, unsigned short& x)
 {
- is.read(reinterpret_cast<char *>(&x), sizeof(x));
+ x = str::to<unsigned short>(s);
 }
 
-void s11n::load(std::istream &is, long &x)
+void s11n::load(std::istream& is, int& x)
 {
- is.read(reinterpret_cast<char *>(&x), sizeof(x));
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
 }
 
-void s11n::load(std::istream &is, unsigned long &x)
+void s11n::load(const std::string& s, int& x)
 {
- is.read(reinterpret_cast<char *>(&x), sizeof(x));
+ x = str::to<int>(s);
 }
 
-void s11n::load(std::istream &is, long long &x)
+void s11n::load(std::istream& is, unsigned int& x)
 {
- is.read(reinterpret_cast<char *>(&x), sizeof(x));
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
 }
 
-void s11n::load(std::istream &is, unsigned long long &x)
+void s11n::load(const std::string& s, unsigned int& x)
 {
- is.read(reinterpret_cast<char *>(&x), sizeof(x));
+ x = str::to<unsigned int>(s);
 }
 
-void s11n::load(std::istream &is, float &x)
+void s11n::load(std::istream& is, long& x)
 {
- is.read(reinterpret_cast<char *>(&x), sizeof(x));
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
 }
 
-void s11n::load(std::istream &is, double &x)
+void s11n::load(const std::string& s, long& x)
 {
- is.read(reinterpret_cast<char *>(&x), sizeof(x));
+ x = str::to<long>(s);
 }
 
-void s11n::load(std::istream &is, long double &x)
+void s11n::load(std::istream& is, unsigned long& x)
 {
- is.read(reinterpret_cast<char *>(&x), sizeof(x));
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, unsigned long& x)
+{
+ x = str::to<unsigned long>(s);
+}
+
+void s11n::load(std::istream& is, long long& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, long long& x)
+{
+ x = str::to<long long>(s);
+}
+
+void s11n::load(std::istream& is, unsigned long long& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, unsigned long long& x)
+{
+ x = str::to<unsigned long long>(s);
+}
+
+void s11n::load(std::istream& is, float& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, float& x)
+{
+ x = str::to<float>(s);
+}
+
+void s11n::load(std::istream& is, double& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, double& x)
+{
+ x = str::to<double>(s);
+}
+
+void s11n::load(std::istream& is, long double& x)
+{
+ is.read(reinterpret_cast<char*>(&x), sizeof(x));
+}
+
+void s11n::load(const std::string& s, long double& x)
+{
+ x = str::to<long double>(s);
 }
 
 // Binary blobs
 
-void s11n::load(std::istream &is, void *x, const size_t n)
+void s11n::load(std::istream& is, void* x, const size_t n)
+{
+ is.read(reinterpret_cast<char*>(x), n);
+}
+
+void s11n::load(const std::string& s, void* x, const size_t n)
 {
- is.read(reinterpret_cast<char *>(x), n);
+ std::memset(x, 0, n);
+ size_t i = 0;
+ while (i < n && i + 3 < s.length()) {
+ unsigned char val = 0;
+ if (s[i] == ' ') {
+ i++;
+ if (s[i] >= '0' && s[i] <= '9')
+ val |= (s[i] - '0') << 4;
+ else if (s[i] >= 'a' && s[i] <= 'z')
+ val |= (s[i] - 'a' + 10) << 4;
+ i++;
+ if (s[i] >= '0' && s[i] <= '9')
+ val |= (s[i] - '0');
+ else if (s[i] >= 'a' && s[i] <= 'z')
+ val |= (s[i] - 'a' + 10);
+ }
+ static_cast<unsigned char*>(x)[i] = val;
+ }
 }
 
 // Serializable classes
 
-void s11n::load(std::istream &is, s11n &x)
+void s11n::load(std::istream& is, serializable& x)
 {
 x.load(is);
 }
 
+void s11n::load(const std::string& s, serializable& x)
+{
+ x.load(s);
+}
+
 // Basic STL types
 
-void s11n::load(std::istream &is, std::string &x)
+void s11n::load(std::istream& is, std::string& x)
 {
 size_t s;
- is.read(reinterpret_cast<char *>(&s), sizeof(s));
- char *buf = new char[s];
+ is.read(reinterpret_cast<char*>(&s), sizeof(s));
+ char* buf = new char[s];
 is.read(buf, s);
 x.assign(buf, s);
 delete[] buf;
 }
+
+void s11n::load(const std::string& s, std::string& x)
+{
+ x.clear();
+ if (s.length() == 0)
+ return;
+ const char *sc = s.c_str();
+ size_t i = 0;
+ while (i < s.length()) {
+ x.append(1, dec_char(sc, i));
+ }
+}

bino-1.2.1.tar.bz2/src/base/s11n.h -> bino-1.3.2.tar.xz/src/base/s11n.h Changed

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

@@ -1,7 +1,5 @@
 /*
- * This file is part of bino, a 3D video player.
- *
- * Copyright (C) 2009-2011
+ * Copyright (C) 2009, 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -27,8 +25,19 @@
 #include <cerrno>
 #include <limits>
 #include <sstream>
+#include <locale>
+
+#ifdef HAVE_NL_LANGINFO
+# include <locale.h>
+# include <langinfo.h>
+#else
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
 
-#include <iconv.h>
+#ifdef HAVE_ICONV
+# include <iconv.h>
+#endif
 
 #include "gettext.h"
 #define _(string) gettext(string)
@@ -101,6 +110,7 @@
 static inline std::string float_to_str(T x)
 {
 std::ostringstream os;
+ os.imbue(std::locale::classic());
 os.precision(std::numeric_limits<T>::digits10 + 1);
 os << x;
 return os.str();
@@ -380,6 +390,15 @@
 }
 }
 
+ std::string human_readable_geodetic(double lat, double lon, double elev)
+ {
+ std::string s = str::asprintf("lat %.6f lon %.6f",
+ 180.0 / M_PI * lat, 180.0 / M_PI * lon);
+ if (elev < 0.0 || elev > 0.0)
+ s += " elev " + human_readable_length(elev);
+ return s;
+ }
+
 std::string human_readable_time(int64_t microseconds)
 {
 int64_t hours = microseconds / (1000000ll * 60ll * 60ll);
@@ -396,6 +415,30 @@
 return hr;
 }
 
+ /* Get the name of the user's character set */
+ std::string localcharset()
+ {
+#ifdef HAVE_NL_LANGINFO
+ std::string bak = setlocale(LC_CTYPE, NULL);
+ setlocale(LC_CTYPE, "");
+ char *charset = nl_langinfo(CODESET);
+ setlocale(LC_CTYPE, bak.c_str());
+#else
+ char charset[2 + 10 + 1];
+ snprintf(charset, 2 + 10 + 1, "CP%u", GetACP());
+ /* Another instance of incredibly braindead Windows design.
+ * We need to return the active code page to get correct results when
+ * output goes into files or pipes. But the console output codepage is
+ * not related to the active code page. So we force it to be the same.
+ * but this only works if the console window uses a true type font;
+ * raster fonts ignore the console output codepage.
+ * If you find this too stupid to believe, read Microsofts documentation
+ * of the SetConsoleOutputCP function. */
+ SetConsoleOutputCP(GetACP());
+#endif
+ return std::string(charset);
+ }
+
 /* Convert a string from one character set to another */
 
 std::string convert(const std::string &src, const std::string &from_charset, const std::string &to_charset)
@@ -405,6 +448,7 @@
 return src;
 }
 
+#ifdef HAVE_ICONV
 iconv_t cd = iconv_open(to_charset.c_str(), from_charset.c_str());
 if (cd == reinterpret_cast<iconv_t>(static_cast<size_t>(-1)))
 {
@@ -451,5 +495,8 @@
 }
 free(orig_outbuf);
 return dst;
+#else
+ throw exc(str::asprintf(_("Cannot convert %s to %s."), from_charset.c_str(), to_charset.c_str()), ENOSYS);
+#endif
 }
 }

bino-1.2.1.tar.bz2/src/base/str.h -> bino-1.3.2.tar.xz/src/base/str.h Changed

bino-1.2.1.tar.bz2/src/base/thread.cpp -> bino-1.3.2.tar.xz/src/base/thread.cpp Changed

@@ -1,7 +1,5 @@
 /*
- * This file is part of bino, a 3D video player.
- *
- * Copyright (C) 2011
+ * Copyright (C) 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,13 +18,14 @@
 
 #include "config.h"
 
+#include <cerrno>
 #include <cstring>
 #include <pthread.h>
+#include <sched.h>
 
 #include "gettext.h"
 #define _(string) gettext(string)
 
-#include "dbg.h"
 #include "thread.h"
 
 
@@ -36,20 +35,18 @@
 {
 int e = pthread_mutex_init(&_mutex, NULL);
 if (e != 0)
- {
- throw exc(str::asprintf(_("Cannot initialize mutex: %s"), std::strerror(e)), e);
- }
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_mutex_init(): " + std::strerror(e), e);
 }
 
-mutex::mutex(const mutex &) : _mutex(_mutex_initializer)
+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(str::asprintf(_("Cannot initialize mutex: %s"), std::strerror(e)), e);
- }
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_mutex_init(): " + std::strerror(e), e);
 }
 
 mutex::~mutex()
@@ -61,9 +58,8 @@
 {
 int e = pthread_mutex_lock(&_mutex);
 if (e != 0)
- {
- throw exc(str::asprintf(_("Cannot lock mutex: %s"), std::strerror(e)), e);
- }
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_mutex_lock(): " + std::strerror(e), e);
 }
 
 bool mutex::trylock()
@@ -75,12 +71,64 @@
 {
 int e = pthread_mutex_unlock(&_mutex);
 if (e != 0)
- {
- throw exc(str::asprintf(_("Cannot unlock mutex: %s"), std::strerror(e)), e);
- }
+ 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),
@@ -90,7 +138,7 @@
 {
 }
 
-thread::thread(const thread &) :
+thread::thread(const thread&) :
 __thread_id(pthread_self()),
 __joinable(false),
 __running(false),
@@ -103,28 +151,22 @@
 thread::~thread()
 {
 if (__joinable)
- {
 (void)pthread_detach(__thread_id);
- }
 }
 
-void *thread::__run(void *p)
+void* thread::__run(void* p)
 {
- thread *t = static_cast<thread *>(p);
- try
- {
+ thread* t = static_cast<thread*>(p);
+ try {
 t->run();
 }
- catch (exc &e)
- {
+ catch (exc& e) {
 t->__exception = e;
 }
- catch (std::exception &e)
- {
+ catch (std::exception& e) {
 t->__exception = e;
 }
- catch (...)
- {
+ catch (...) {
 // We must assume this means thread cancellation. In this
 // case, we *must* rethrow the exception.
 t->__running = false;
@@ -134,15 +176,40 @@
 return NULL;
 }
 
-void thread::start()
+void thread::start(int priority)
 {
- if (atomic::bool_compare_and_swap(&__running, false, true))
- {
+ if (atomic::bool_compare_and_swap(&__running, false, true)) {
 wait();
- int e = pthread_create(&__thread_id, NULL, __run, this);
- if (e != 0)
+ int e;
+ pthread_attr_t priority_thread_attr;
+ pthread_attr_t* thread_attr = NULL;
+ if (priority != priority_default)
 {
- throw exc(str::asprintf(_("Cannot create thread: %s"), std::strerror(e)), e);
+ // Currently this means priority_min
+ int policy, min_priority;
+ struct sched_param param;
+ e = pthread_attr_init(&priority_thread_attr);
+ e = e || pthread_attr_getschedpolicy(&priority_thread_attr, &policy);
+ if (e == 0) {
+ min_priority = sched_get_priority_min(policy);
+ if (min_priority == -1)
+ e = errno;
+ }
+ e = e || pthread_attr_getschedparam(&priority_thread_attr, &param);
+ if (e == 0) {
+ param.sched_priority = min_priority;
+ }
+ e = e || pthread_attr_setschedparam(&priority_thread_attr, &param);
+ if (e != 0) {
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_attr_*(): " + std::strerror(e), e);
+ }
+ thread_attr = &priority_thread_attr;
+ }
+ e = pthread_create(&__thread_id, thread_attr, __run, this);
+ if (e != 0) {
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_create(): " + std::strerror(e), e);
 }
 __joinable = true;
 }
@@ -151,13 +218,12 @@
 void thread::wait()
 {
 __wait_mutex.lock();
- if (atomic::bool_compare_and_swap(&__joinable, true, false))
- {
+ if (atomic::bool_compare_and_swap(&__joinable, true, false)) {
 int e = pthread_join(__thread_id, NULL);
- if (e != 0)
- {
+ if (e != 0) {
 __wait_mutex.unlock();
- throw exc(str::asprintf(_("Cannot join with thread: %s"), std::strerror(e)), e);
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_join(): " + std::strerror(e), e);
 }
 }
 __wait_mutex.unlock();
@@ -167,19 +233,68 @@
 {
 wait();
 if (!exception().empty())
- {
 throw exception();
- }
 }
 
 void thread::cancel()
 {
 __wait_mutex.lock();
 int e = pthread_cancel(__thread_id);
- if (e != 0)
- {
+ if (e != 0) {
 __wait_mutex.unlock();
- throw exc(str::asprintf(_("Cannot cancel thread: %s"), std::strerror(e)), e);
+ throw exc(std::string(_("System function failed: "))
+ + "pthread_cancel(): " + std::strerror(e), e);
 }
 __wait_mutex.unlock();
 }
+
+
+thread_group::thread_group(unsigned char size) : __max_size(size)
+{
+ __active_threads.reserve(__max_size);
+ __finished_threads.reserve(__max_size);
+}
+
+thread_group::~thread_group()
+{
+ try {
+ for (size_t i = 0; i < __active_threads.size(); i++) {
+ __active_threads[i]->cancel();
+ }
+ }
+ catch (...) {
+ }
+}
+
+bool thread_group::start(thread* t, int priority)
+{
+ if (__active_threads.size() < __max_size) {
+ t->start(priority);
+ __active_threads.push_back(t);
+ return true;
+ } else {
+ return false;
+ }
+}
+
+thread* thread_group::get_next_finished_thread()
+{
+ if (__finished_threads.size() == 0) {
+ std::vector<thread*>::iterator it = __active_threads.begin();
+ while (it != __active_threads.end()) {
+ if (!(*it)->is_running()) {
+ __finished_threads.push_back(*it);
+ it = __active_threads.erase(it);
+ } else {
+ it++;
+ }
+ }
+ }
+ if (__finished_threads.size() > 0) {
+ thread* ret = __finished_threads.back();
+ __finished_threads.pop_back();
+ return ret;
+ } else {
+ return NULL;
+ }
+}

bino-1.2.1.tar.bz2/src/base/thread.h -> bino-1.3.2.tar.xz/src/base/thread.h Changed

@@ -1,7 +1,5 @@
 /*
- * This file is part of bino, a 3D video player.
- *
- * Copyright (C) 2011
+ * Copyright (C) 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -21,6 +19,7 @@
 #ifndef THREADS_H
 #define THREADS_H
 
+#include <vector>
 #include <pthread.h>
 
 #include "exc.h"
@@ -44,34 +43,35 @@
 
 /* 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); }
+ 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); }
+ 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); }
+ 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(T *ptr) { return fetch_and_add(ptr, static_cast<T>(0)); }
- template<typename T> T increment(T *ptr) { return add_and_fetch(ptr, static_cast<T>(1)); }
- template<typename T> T decrement(T *ptr) { return sub_and_fetch(ptr, static_cast<T>(1)); }
+ 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)); }
 }
 
 
@@ -88,7 +88,7 @@
 public:
 // Constructor / Destructor
 mutex();
- mutex(const mutex &m);
+ mutex(const mutex& m);
 ~mutex();
 
 // Lock the mutex.
@@ -97,6 +97,33 @@
 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();
 };
 
 
@@ -115,12 +142,16 @@
 mutex __wait_mutex;
 exc __exception;
 
- static void *__run(void *p);
+ 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);
+ thread(const thread& t);
 virtual ~thread();
 
 // Implement this in a subclass; it will be executed from the thread via start()
@@ -128,7 +159,7 @@
 
 // Start a new thread that executes the run() function. If the thread is already
 // running, this function does nothing.
- void start();
+ void start(int priority = thread::priority_default);
 
 // Returns whether this thread is currently running.
 bool is_running()
@@ -148,15 +179,48 @@
 void cancel();
 
 // Get an exception that the run() function might have thrown.
- const exc &exception() const
+ const exc& exception() const
 {
 return __exception;
 }
 // Modify the stored exception
- exc &exception()
+ exc& exception()
 {
 return __exception;
 }
 };
 
+
+/*
+ * Thread group.
+ *
+ * This manages a group of threads that has a fixed maximum size. New threads
+ * can only be started if there are still free slots in the group. A finished
+ * thread makes its slot available for future threads.
+ *
+ * A thread group must be managed from a single thread. When the thread group
+ * object is destroyed, all remaining threads are cancelled.
+ */
+
+class thread_group
+{
+private:
+ unsigned char __max_size;
+ std::vector<thread*> __active_threads;
+ std::vector<thread*> __finished_threads;
+
+public:
+ thread_group(unsigned char size);
+ virtual ~thread_group();
+
+ // Start a new thread and return its slot number. If there are no free
+ // slots, the thread is not started and false is returned.
+ bool start(thread* t, int priority = thread::priority_default);
+
+ // Return a finished thread object from the group and free its slot so
+ // that future threads can use it. If there is no finished thread, NULL
+ // is returned.
+ thread* get_next_finished_thread();
+};
+
 #endif

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

@@ -1,7 +1,5 @@
 /*
- * This file is part of bino, a 3D video player.
- *
- * Copyright (C) 2010-2011
+ * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -21,7 +19,9 @@
 #include "config.h"
 
 #include <cerrno>
-#ifndef HAVE_CLOCK_GETTIME
+#ifdef HAVE_CLOCK_GETTIME
+# include <time.h>
+#else
 # include <sys/time.h>
 #endif
 
@@ -38,25 +38,20 @@
 
 struct timespec time;
 int r;
- if (t == realtime)
- {
+ if (t == realtime) {
 r = clock_gettime(CLOCK_REALTIME, &time);
- }
- else if (t == monotonic)
- {
+ } else if (t == monotonic) {
 r = clock_gettime(CLOCK_MONOTONIC, &time);
- }
- else if (t == process_cpu)
- {
-#ifdef CLOCK_PROCESS_CPUTIME_ID
+ } 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
- {
+ } else /* t == thread_cpu */ {
 #ifdef CLOCK_THREAD_CPUTIME_ID
 r = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &time);
 #else
@@ -65,33 +60,24 @@
 #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)
- {
+ 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)
- {
+ } 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
- {
+ } else {
 throw exc(_("Cannot get time."), ENOSYS);
 }

bino-1.2.1.tar.bz2/src/base/timer.h -> bino-1.3.2.tar.xz/src/base/timer.h Changed

bino-1.3.2.tar.xz/src/dispatch.cpp Added

@@ -0,0 +1,825 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * 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 <vector>
+#include <unistd.h>
+
+#include "gettext.h"
+#define _(string) gettext(string)
+
+#include "exc.h"
+#include "dbg.h"
+#include "msg.h"
+#include "str.h"
+#include "timer.h"
+#include "thread.h"
+
+#include "gui.h"
+#include "audio_output.h"
+#include "video_output_qt.h"
+#include "media_input.h"
+#include "player.h"
+#if HAVE_LIBEQUALIZER
+# include "player_equalizer.h"
+#endif
+#include "dispatch.h"
+
+
+// Global objects
+dispatch* global_dispatch = NULL;
+
+
+open_input_data::open_input_data() :
+ dev_request(), urls(), params()
+{
+}
+
+void open_input_data::save(std::ostream &os) const
+{
+ s11n::save(os, dev_request);
+ s11n::save(os, urls);
+ s11n::save(os, params);
+}
+
+void open_input_data::load(std::istream &is)
+{
+ s11n::load(is, dev_request);
+ s11n::load(is, urls);
+ s11n::load(is, params);
+}
+
+
+controller::controller() throw ()
+{
+ assert(global_dispatch);
+ global_dispatch->register_controller(this);
+}
+
+controller::~controller()
+{
+ assert(global_dispatch);
+ global_dispatch->deregister_controller(this);
+}
+
+void controller::send_cmd(const command &cmd)
+{
+ assert(global_dispatch);
+ global_dispatch->receive_cmd(cmd);
+}
+
+void controller::receive_notification(const notification& /* note */)
+{
+ /* default: ignore the notification */
+}
+
+void controller::process_events()
+{
+ /* default: do nothing */
+}
+
+
+dispatch::dispatch(int* argc, char** argv,
+ bool equalizer, bool equalizer_3d, bool equalizer_slave_node,
+ bool gui, bool have_display, msg::level_t log_level,
+ bool benchmark, int swap_interval) throw () :
+ _argc(argc), _argv(argv),
+ _eq(equalizer), _eq_3d(equalizer_3d), _eq_slave_node(equalizer_slave_node),
+ _gui_mode(gui), _have_display(have_display),
+ _gui(NULL), _audio_output(NULL), _video_output(NULL), _media_input(NULL), _player(NULL),
+ _controllers_version(0),
+ _playing(false), _pausing(false), _position(0.0f)
+{
+ assert(!global_dispatch);
+ global_dispatch = this;
+ _parameters.set_log_level(log_level);
+ msg::set_level(log_level);
+ _parameters.set_benchmark(benchmark);
+ _parameters.set_swap_interval(swap_interval);
+}
+
+dispatch::~dispatch()
+{
+ deinit();
+ global_dispatch = NULL;
+}
+
+void dispatch::register_controller(controller* c)
+{
+ // Note about thread safety:
+ // Only the registering and deregistering a controller are thread safe.
+ // The visitation of controllers and the actions performed as a result
+ // are supposed to happen inside a single thread.
+ _controllers_mutex.lock();
+ _controllers.push_back(c);
+ _controllers_version++;
+ _controllers_mutex.unlock();
+}
+
+void dispatch::deregister_controller(controller* c)
+{
+ _controllers_mutex.lock();
+ for (size_t i = 0; i < _controllers.size(); i++) {
+ if (_controllers[i] == c) {
+ _controllers.erase(_controllers.begin() + i);
+ break;
+ }
+ }
+ _controllers_version++;
+ _controllers_mutex.unlock();
+}
+
+void dispatch::init(const open_input_data& input_data)
+{
+ if (_eq) {
+ if (!_eq_slave_node && !_parameters.benchmark())
+ _audio_output = new class audio_output;
+ } else if (!_have_display) {
+ throw exc(_("Cannot connect to X server."));
+ } else if (_gui_mode) {
+ _gui = new gui();
+ if (!_parameters.benchmark())
+ _audio_output = new class audio_output;
+ _video_output = new video_output_qt(_gui->container_widget());
+ if (input_data.urls.size() > 0)
+ _gui->open(input_data);
+ } else {
+ if (!_parameters.benchmark())
+ _audio_output = new class audio_output;
+ _video_output = new video_output_qt();
+ }
+ if ((_eq && !_eq_slave_node) || !_gui_mode) {
+ if (input_data.urls.size() == 0)
+ throw exc(_("No video to play."));
+ std::ostringstream v;
+ s11n::save(v, input_data);
+ controller::send_cmd(command::open, v.str());
+ controller::send_cmd(command::toggle_play);
+ }
+}
+
+void dispatch::deinit()
+{
+ force_stop();
+ delete _player;
+ _player = NULL;
+ delete _media_input;
+ _media_input = NULL;
+ delete _video_output;
+ _video_output = NULL;
+ delete _audio_output;
+ _audio_output = NULL;
+ delete _gui;
+ _gui = NULL;
+}
+
+void dispatch::step()
+{
+ assert(global_dispatch);
+ if (global_dispatch->_playing) {
+ bool more = global_dispatch->_player->run_step();
+ if (!more) {
+ global_dispatch->_playing = false;
+ global_dispatch->_pausing = false;
+ global_dispatch->notify_all(notification::play); 
+ if (!global_dispatch->_gui_mode) {
+ global_dispatch->notify_all(notification::quit);
+ } else {
+ global_dispatch->force_stop();
+ }
+ }
+ } else {
+ usleep(1000);
+ }
+}
+
+void dispatch::visit_all_controllers(int action, const notification& note) const
+{
+ std::vector<controller*> visited_controllers;
+ visited_controllers.reserve(_controllers.size());
+
+ // First, try to visit all controllers in one row without extra checks. This
+ // only works as long as controllers do not vanish or appear as a result of
+ // the function we call. This is the common case.
+ unsigned int controllers_version = _controllers_version;
+ for (size_t i = 0; i < _controllers.size(); i++) {
+ controller *c = _controllers[i];
+ if (action == 0) {
+ c->process_events();
+ } else {
+ c->receive_notification(note);
+ }
+ visited_controllers.push_back(c);
+ if (controllers_version != _controllers_version) {
+ break;
+ }
+ }
+ // If some controllers vanished or appeared, we need to redo the loop and
+ // check for each controller if it was visited before. This is costly, but
+ // it happens seldomly.
+ while (controllers_version != _controllers_version)
+ {
+ controllers_version = _controllers_version;
+ for (size_t i = 0; i < _controllers.size(); i++) {
+ controller *c = _controllers[i];
+ bool visited = false;
+ for (size_t j = 0; j < visited_controllers.size(); j++) {
+ if (visited_controllers[j] == c) {
+ visited = true;
+ break;
+ }
+ }
+ if (!visited) {
+ if (action == 0) {
+ c->process_events();
+ } else {
+ c->receive_notification(note);
+ }
+ visited_controllers.push_back(c);
+ if (controllers_version != _controllers_version) {
+ break;
+ }
+ }
+ }
+ }
+}
+
+void dispatch::notify_all(const notification& note)
+{
+ visit_all_controllers(1, note);
+}
+
+void dispatch::process_all_events()
+{
+ assert(global_dispatch);
+ global_dispatch->visit_all_controllers(0, notification::noop);
+}
+
+class audio_output* dispatch::get_audio_output()
+{
+ return _audio_output;
+}
+
+class video_output* dispatch::get_video_output()
+{
+ return _video_output;
+}
+
+class media_input* dispatch::get_media_input()
+{
+ return _media_input;
+}
+
+class open_input_data* dispatch::get_input_data()
+{
+ return &_input_data;
+}
+
+class player* dispatch::get_player()
+{
+ return _player;
+}
+
+void dispatch::set_playing(bool p)
+{
+ _playing = p;
+ notify_all(notification::play);
+}
+
+void dispatch::set_pausing(bool p)
+{
+ _pausing = p;
+ notify_all(notification::pause);
+}
+
+void dispatch::set_position(float pos)
+{
+ _position = pos;
+ notify_all(notification::pos);
+}
+
+const class parameters& dispatch::parameters()
+{
+ assert(global_dispatch);
+ return global_dispatch->_parameters;
+}
+
+const class media_input* dispatch::media_input()
+{
+ assert(global_dispatch);
+ return global_dispatch->_media_input;
+}
+
+const class video_output* dispatch::video_output()
+{
+ assert(global_dispatch);
+ return global_dispatch->_video_output;
+}
+
+bool dispatch::playing()
+{
+ assert(global_dispatch);
+ return global_dispatch->_playing;
+}
+
+bool dispatch::pausing()
+{
+ assert(global_dispatch);
+ return global_dispatch->_pausing;
+}
+
+float dispatch::position()
+{
+ assert(global_dispatch);
+ float p = 0.0f;
+ if (dispatch::playing()) {
+ assert(global_dispatch->_player);
+ p = global_dispatch->_player->get_pos();
+ }
+ return p;
+}
+
+static float clamp(float x, float lo, float hi)
+{
+ return std::min(std::max(x, lo), hi);
+}
+
+void dispatch::force_stop()
+{
+ if (_player) {
+ _player->close();
+ delete _player;
+ _player = NULL;
+ }
+ if (_media_input) {
+ // close, reopen, and reinitialize media input
+ _media_input->close();
+ _media_input->open(_input_data.urls, _input_data.dev_request);
+ _media_input->set_stereo_layout(_parameters.stereo_layout(), _parameters.stereo_layout_swap());
+ _media_input->select_video_stream(_parameters.video_stream());
+ if (_media_input->audio_streams() > 0)
+ _media_input->select_audio_stream(_parameters.audio_stream());
+ if (_media_input->subtitle_streams() > 0 && _parameters.subtitle_stream() >= 0)
+ _media_input->select_subtitle_stream(_parameters.subtitle_stream());
+ }
+ if (_video_output) {
+ _video_output->deinit();
+ }
+ if (_audio_output) {
+ _audio_output->deinit();
+ }
+ _playing = false;
+ _pausing = false;
+}
+
+void dispatch::receive_cmd(const command& cmd)
+{
+ std::istringstream p(cmd.param);
+
+ switch (cmd.type)
+ {
+ case command::noop:
+ break;
+ // Play state
+ case command::open:
+ force_stop();
+ notify_all(notification::play);
+ s11n::load(p, _input_data);
+ // Create media input
+ try {
+ _media_input = new class media_input;
+ _media_input->open(_input_data.urls, _input_data.dev_request);
+ if (_media_input->video_streams() == 0) {
+ throw exc(_("No video streams found."));
+ }
+ }
+ catch (exc& e) {
+ delete _media_input;
+ _media_input = NULL;
+ throw e;
+ }
+ catch (std::exception& e) {
+ delete _media_input;
+ _media_input = NULL;
+ throw e;
+ }
+ _parameters.unset_video_parameters();
+ // Initialize media input and associated parameters
+ if (_input_data.params.stereo_layout_is_set() || _input_data.params.stereo_layout_swap_is_set()) {
+ if (!_media_input->stereo_layout_is_supported(_input_data.params.stereo_layout(), _input_data.params.stereo_layout_swap())) {
+ throw exc(_("Cannot set requested stereo layout: incompatible media."));
+ }
+ _media_input->set_stereo_layout(_input_data.params.stereo_layout(),
+ _input_data.params.stereo_layout_swap());
+ _parameters.set_stereo_layout(_input_data.params.stereo_layout());
+ _parameters.set_stereo_layout_swap(_input_data.params.stereo_layout_swap());
+ } else {
+ _media_input->set_stereo_layout(_media_input->video_frame_template().stereo_layout,
+ _media_input->video_frame_template().stereo_layout_swap);
+ _parameters.set_stereo_layout(_media_input->video_frame_template().stereo_layout);
+ _parameters.set_stereo_layout_swap(_media_input->video_frame_template().stereo_layout_swap);
+ }
+ notify_all(notification::stereo_layout);
+ notify_all(notification::stereo_layout_swap);
+ if (_media_input->video_streams() < _input_data.params.video_stream() + 1) {
+ throw exc(str::asprintf(_("Video stream %d not found."), _input_data.params.video_stream() + 1));
+ }
+ _media_input->select_video_stream(_input_data.params.video_stream());
+ _parameters.set_video_stream(_input_data.params.video_stream());
+ notify_all(notification::video_stream);
+ if (_media_input->audio_streams() > 0 && _media_input->audio_streams() < _input_data.params.audio_stream() + 1) {
+ throw exc(str::asprintf(_("Audio stream %d not found."), _input_data.params.audio_stream() + 1));
+ }
+ if (_media_input->audio_streams() > 0) {
+ _media_input->select_audio_stream(_input_data.params.audio_stream());
+ _parameters.set_audio_stream(_input_data.params.audio_stream());
+ }
+ notify_all(notification::audio_stream);
+ if (_media_input->subtitle_streams() > 0 && _media_input->subtitle_streams() < _input_data.params.subtitle_stream() + 1) {
+ throw exc(str::asprintf(_("Subtitle stream %d not found."), _input_data.params.subtitle_stream() + 1));
+ }
+ if (_media_input->subtitle_streams() > 0 && _input_data.params.subtitle_stream() >= 0) {
+ _media_input->select_subtitle_stream(_input_data.params.subtitle_stream());
+ _parameters.set_subtitle_stream(_input_data.params.subtitle_stream());
+ }
+ notify_all(notification::subtitle_stream);
+ // Initialize remaining parameters
+ if (_input_data.params.crop_aspect_ratio_is_set())
+ _parameters.set_crop_aspect_ratio(_input_data.params.crop_aspect_ratio());
+ notify_all(notification::crop_aspect_ratio);
+ if (_input_data.params.parallax_is_set())
+ _parameters.set_parallax(_input_data.params.parallax());
+ notify_all(notification::parallax);
+ if (_input_data.params.ghostbust_is_set())
+ _parameters.set_ghostbust(_input_data.params.ghostbust());
+ notify_all(notification::ghostbust);
+ if (_input_data.params.subtitle_parallax_is_set())
+ _parameters.set_subtitle_parallax(_input_data.params.subtitle_parallax());
+ notify_all(notification::subtitle_parallax);
+ if (!_parameters.stereo_mode_is_set()) {
+ if (_media_input->video_frame_template().stereo_layout == parameters::layout_mono)
+ _parameters.set_stereo_mode(parameters::mode_mono_left);
+ else if (_video_output && _video_output->supports_stereo())
+ _parameters.set_stereo_mode(parameters::mode_stereo);
+ else
+ _parameters.set_stereo_mode(parameters::mode_red_cyan_dubois);
+ _parameters.set_stereo_mode_swap(false);
+ }
+ notify_all(notification::stereo_mode);
+ notify_all(notification::stereo_mode_swap);
+ notify_all(notification::open);
+ break;
+ case command::close:
+ force_stop();
+ notify_all(notification::play);
+ notify_all(notification::open);
+ break;
+ case command::toggle_play:
+ if (playing()) {
+ assert(_player);
+ _player->quit_request();
+ /* notify when request is fulfilled */
+ } else if (_media_input) {
+ // Initialize audio output
+ if (_media_input->audio_streams() > 0 && _audio_output) {
+ _audio_output->deinit();
+ _audio_output->init(_parameters.audio_device());
+ }
+ // Initialize video output
+ if (_video_output) {
+ _video_output->deinit();
+ _video_output->init();
+ }
+ // Set initial parameters
+ if (_video_output) {
+ _video_output->set_suitable_size(
+ _media_input->video_frame_template().width,
+ _media_input->video_frame_template().height,
+ _parameters.crop_aspect_ratio() > 0.0f
+ ? _parameters.crop_aspect_ratio()
+ : _media_input->video_frame_template().aspect_ratio,
+ _parameters.stereo_mode());
+ if (_parameters.fullscreen())
+ _video_output->enter_fullscreen();
+ if (_parameters.center() && !_gui_mode)
+ _video_output->center();
+ }
+ if (_eq) {
+#if HAVE_LIBEQUALIZER
+ _player = new class player_equalizer(_argc, _argv, !_eq_3d);
+#else
+ throw exc(_("This version of Bino was compiled without support for Equalizer."));
+#endif
+ } else {
+ _player = new player;
+ }
+ _player->open();
+ _playing = true;
+ notify_all(notification::play);
+ }
+ break;
+ case command::toggle_pause:
+ if (_player)
+ _player->set_pause(!pausing());
+ /* notify when request is fulfilled */
+ break;
+ case command::step:
+ if (_player)
+ _player->set_step(true);
+ break;
+ case command::seek:
+ if (_player)
+ _player->seek(s11n::load<float>(p) * 1e6f);
+ /* notify when request is fulfilled */
+ break;
+ case command::set_pos:
+ if (_player)
+ _player->set_pos(s11n::load<float>(p));
+ /* notify when request is fulfilled */
+ break;
+ // Per-Session parameters
+ case command::set_audio_device:
+ _parameters.set_audio_device(s11n::load<int>(p));
+ notify_all(notification::audio_device);
+ break;
+ case command::set_stereo_mode:
+ _parameters.set_stereo_mode(static_cast<parameters::stereo_mode_t>(s11n::load<int>(p)));
+ notify_all(notification::stereo_mode);
+ break;
+ case command::set_stereo_mode_swap:
+ _parameters.set_stereo_mode_swap(s11n::load<bool>(p));
+ notify_all(notification::stereo_mode_swap);
+ break;
+ case command::toggle_stereo_mode_swap:
+ _parameters.set_stereo_mode_swap(!_parameters.stereo_mode_swap());
+ notify_all(notification::stereo_mode_swap);
+ break;
+ case command::set_crosstalk:
+ _parameters.set_crosstalk_r(clamp(s11n::load<float>(p), -1.0f, +1.0f));
+ _parameters.set_crosstalk_g(clamp(s11n::load<float>(p), -1.0f, +1.0f));
+ _parameters.set_crosstalk_b(clamp(s11n::load<float>(p), -1.0f, +1.0f));
+ notify_all(notification::crosstalk);
+ break;
+ case command::set_fullscreen_screens:
+ _parameters.set_fullscreen_screens(s11n::load<int>(p));
+ notify_all(notification::fullscreen_screens);
+ break;
+ case command::set_fullscreen_flip_left:
+ _parameters.set_fullscreen_flip_left(s11n::load<bool>(p));
+ notify_all(notification::fullscreen_flip_left);
+ break;
+ case command::set_fullscreen_flip_right:
+ _parameters.set_fullscreen_flip_right(s11n::load<bool>(p));
+ notify_all(notification::fullscreen_flip_right);
+ break;
+ case command::set_fullscreen_flop_left:
+ _parameters.set_fullscreen_flop_left(s11n::load<bool>(p));
+ notify_all(notification::fullscreen_flop_left);
+ break;
+ case command::set_fullscreen_flop_right:
+ _parameters.set_fullscreen_flop_right(s11n::load<bool>(p));
+ notify_all(notification::fullscreen_flop_right);
+ break;
+ case command::set_fullscreen_inhibit_screensaver:
+ _parameters.set_fullscreen_inhibit_screensaver(s11n::load<bool>(p));
+ notify_all(notification::fullscreen_inhibit_screensaver);
+ break;
+ case command::adjust_contrast:
+ _parameters.set_contrast(clamp(_parameters.contrast() + s11n::load<float>(p), -1.0f, +1.0f));
+ notify_all(notification::contrast);
+ break;
+ case command::set_contrast:
+ _parameters.set_contrast(clamp(s11n::load<float>(p), -1.0f, +1.0f));
+ notify_all(notification::contrast);
+ break;
+ case command::adjust_brightness:
+ _parameters.set_brightness(clamp(_parameters.brightness() + s11n::load<float>(p), -1.0f, +1.0f));
+ notify_all(notification::brightness);
+ break;
+ case command::set_brightness:
+ _parameters.set_brightness(clamp(s11n::load<float>(p), -1.0f, +1.0f));
+ notify_all(notification::brightness);
+ break;
+ case command::adjust_hue:
+ _parameters.set_hue(clamp(_parameters.hue() + s11n::load<float>(p), -1.0f, +1.0f));
+ notify_all(notification::hue);
+ break;
+ case command::set_hue:
+ _parameters.set_hue(clamp(s11n::load<float>(p), -1.0f, +1.0f));
+ notify_all(notification::hue);
+ break;
+ case command::adjust_saturation:
+ _parameters.set_saturation(clamp(_parameters.saturation() + s11n::load<float>(p), -1.0f, +1.0f));
+ notify_all(notification::saturation);
+ break;
+ case command::set_saturation:
+ _parameters.set_saturation(clamp(s11n::load<float>(p), -1.0f, +1.0f));
+ notify_all(notification::saturation);
+ break;
+ case command::adjust_zoom:
+ _parameters.set_zoom(clamp(_parameters.zoom() + s11n::load<float>(p), 0.0f, 1.0f));
+ notify_all(notification::zoom);
+ break;
+ case command::set_zoom:
+ _parameters.set_zoom(clamp(s11n::load<float>(p), 0.0f, 1.0f));
+ notify_all(notification::zoom);
+ break;
+ case command::set_loop_mode:
+ _parameters.set_loop_mode(static_cast<parameters::loop_mode_t>(s11n::load<int>(p)));
+ notify_all(notification::loop_mode);
+ break;
+ case command::set_audio_delay:
+ _parameters.set_audio_delay(s11n::load<int64_t>(p));
+ notify_all(notification::audio_delay);
+ break;
+ case command::set_subtitle_encoding:
+ _parameters.set_subtitle_encoding(s11n::load<std::string>(p));
+ notify_all(notification::subtitle_encoding);
+ break;
+ case command::set_subtitle_font:
+ _parameters.set_subtitle_font(s11n::load<std::string>(p));
+ notify_all(notification::subtitle_font);
+ break;
+ case command::set_subtitle_size:
+ _parameters.set_subtitle_size(s11n::load<int>(p));
+ notify_all(notification::subtitle_size);
+ break;
+ case command::set_subtitle_scale:
+ _parameters.set_subtitle_scale(std::max(s11n::load<float>(p), 0.0f));
+ notify_all(notification::subtitle_scale);
+ break;
+ case command::set_subtitle_color:
+ _parameters.set_subtitle_color(s11n::load<uint64_t>(p));
+ notify_all(notification::subtitle_color);
+ break;
+ // Per-Video parameters
+ case command::cycle_video_stream:
+ if (_player && _media_input->video_streams() > 1
+ && parameters().stereo_layout() != parameters::layout_separate) {
+ int s = parameters().video_stream() + 1;
+ if (s >= _media_input->video_streams())
+ s = 0;
+ _parameters.set_video_stream(_player->set_video_stream(s));
+ notify_all(notification::video_stream);
+ }
+ break;
+ case command::set_video_stream:
+ if (_player && _media_input->video_streams() > 1
+ && parameters().stereo_layout() != parameters::layout_separate) {
+ _parameters.set_video_stream(_player->set_video_stream(s11n::load<int>(p)));
+ notify_all(notification::video_stream);
+ }
+ break;
+ case command::cycle_audio_stream:
+ if (_player && _media_input->audio_streams() > 1) {
+ int s = parameters().audio_stream() + 1;
+ if (s >= _media_input->audio_streams())
+ s = 0;
+ _parameters.set_audio_stream(_player->set_audio_stream(s));
+ notify_all(notification::audio_stream);
+ }
+ break;
+ case command::set_audio_stream:
+ if (_player && _media_input->audio_streams() > 1) {
+ _parameters.set_audio_stream(_player->set_audio_stream(s11n::load<int>(p)));
+ notify_all(notification::audio_stream);
+ }
+ break;
+ case command::cycle_subtitle_stream:
+ if (_player && _media_input->subtitle_streams() > 0) {
+ int s = parameters().subtitle_stream() + 1;
+ if (s >= _media_input->subtitle_streams())
+ s = -1;
+ _parameters.set_subtitle_stream(_player->set_subtitle_stream(s));
+ notify_all(notification::subtitle_stream);
+ }
+ break;
+ case command::set_subtitle_stream:
+ if (_player && _media_input->subtitle_streams() > 0) {
+ _parameters.set_subtitle_stream(_player->set_subtitle_stream(s11n::load<int>(p)));
+ notify_all(notification::subtitle_stream);
+ }
+ break;
+ case command::set_stereo_layout:
+ _parameters.set_stereo_layout(static_cast<parameters::stereo_layout_t>(s11n::load<int>(p)));
+ if (_player)
+ _player->set_stereo_layout(_parameters.stereo_layout());
+ notify_all(notification::stereo_layout);
+ break;
+ case command::set_stereo_layout_swap:
+ _parameters.set_stereo_layout_swap(s11n::load<bool>(p));
+ if (_player)
+ _player->set_stereo_layout_swap(_parameters.stereo_layout_swap());
+ notify_all(notification::stereo_layout_swap);
+ break;
+ case command::set_crop_aspect_ratio:
+ {
+ float x = s11n::load<float>(p);
+ _parameters.set_crop_aspect_ratio((x <= 0.0f ? 0.0f : clamp(x, 1.0f, 2.39f)));
+ }
+ notify_all(notification::crop_aspect_ratio);
+ break;
+ case command::adjust_parallax:
+ _parameters.set_parallax(clamp(_parameters.contrast() + s11n::load<float>(p), -1.0f, +1.0f));
+ notify_all(notification::parallax);
+ break;
+ case command::set_parallax:
+ _parameters.set_parallax(clamp(s11n::load<float>(p), -1.0f, +1.0f));
+ notify_all(notification::parallax);
+ break;
+ case command::adjust_ghostbust:
+ _parameters.set_ghostbust(clamp(_parameters.ghostbust() + s11n::load<float>(p), 0.0f, 1.0f));
+ notify_all(notification::ghostbust);
+ break;
+ case command::set_ghostbust:
+ _parameters.set_ghostbust(clamp(s11n::load<float>(p), 0.0f, 1.0f));
+ notify_all(notification::ghostbust);
+ break;
+ case command::adjust_subtitle_parallax:
+ _parameters.set_subtitle_parallax(clamp(_parameters.contrast() + s11n::load<float>(p), -1.0f, +1.0f));
+ notify_all(notification::subtitle_parallax);
+ break;
+ case command::set_subtitle_parallax:
+ _parameters.set_subtitle_parallax(clamp(s11n::load<float>(p), -1.0f, +1.0f));
+ notify_all(notification::subtitle_parallax);
+ break;
+ // Volatile parameters
+ case command::toggle_fullscreen:
+ {
+ if (playing()) {
+ bool fs = false;
+ if (_video_output) {
+ if (_parameters.fullscreen()) {
+ _video_output->exit_fullscreen();
+ fs = false;
+ } else {
+ _video_output->enter_fullscreen();
+ fs = true;
+ }
+ }
+ _parameters.set_fullscreen(fs);
+ } else {
+ _parameters.set_fullscreen(!_parameters.fullscreen());
+ }
+ notify_all(notification::fullscreen);
+ }
+ break;
+ case command::center:
+ if (_video_output)
+ _video_output->center();
+ _parameters.set_center(true);
+ notify_all(notification::center);
+ break;
+ case command::adjust_audio_volume:
+ _parameters.set_audio_volume(clamp(_parameters.audio_volume() + s11n::load<float>(p), 0.0f, 1.0f));
+ notify_all(notification::audio_volume);
+ break;
+ case command::set_audio_volume:
+ _parameters.set_audio_volume(clamp(s11n::load<float>(p), 0.0f, 1.0f));
+ notify_all(notification::audio_volume);
+ break;
+ case command::toggle_audio_mute:
+ _parameters.set_audio_mute(!_parameters.audio_mute());
+ notify_all(notification::audio_mute);
+ break;
+ }
+}
+
+std::string dispatch::save_state() const
+{
+ std::ostringstream oss;
+ s11n::save(oss, _input_data);
+ s11n::save(oss, _parameters);
+ s11n::save(oss, _playing);
+ s11n::save(oss, _pausing);
+ s11n::save(oss, _position);
+ return oss.str();
+}
+
+void dispatch::load_state(const std::string& s)
+{
+ std::istringstream iss(s);
+ s11n::load(iss, _input_data);
+ s11n::load(iss, _parameters);
+ s11n::load(iss, _playing);
+ s11n::load(iss, _pausing);
+ s11n::load(iss, _position);
+}

bino-1.3.2.tar.xz/src/dispatch.h Added

@@ -0,0 +1,362 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * Copyright (C) 2010, 2011, 2012
+ * Martin Lambers <marlam@marlam.de>
+ * Joe <cuchac@email.cz>
+ *
+ * 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 DISPATCH_H
+#define DISPATCH_H
+
+#include <string>
+#include <sstream>
+#include <stdint.h>
+
+#include "s11n.h"
+#include "thread.h"
+
+#include "media_data.h"
+
+class gui;
+class audio_output;
+class video_output;
+class media_input;
+class player;
+
+
+/* The open_init_data class contains everything that is needed to open
+ * a media input. */
+
+class open_input_data : public serializable
+{
+public:
+ device_request dev_request; // Request for input device settings
+ std::vector<std::string> urls; // Input media objects
+ parameters params; // Initial per-video output parameters
+ // (other parameter fields are ignored)
+public:
+ open_input_data();
+
+ // Serialization
+ void save(std::ostream &os) const;
+ void load(std::istream &is);
+};
+
+
+/* A controller can send commands to the dispatch (e.g. "pause", "seek",
+ * "adjust colors", ...). The dispatch then reacts on this command, and sends
+ * a notification to all controllers afterwards. The controllers may react
+ * on the notification or ignore it.
+ *
+ * For example, the video output controller may notice that the user pressed the
+ * 'p' key to pause the video. So it sends the "pause" command to the dispatch.
+ * The dipatch updates its state accordingly, and notifies all controllers that
+ * the video is now paused. The video output could use this notification to display
+ * a pause symbol on screen, and the audio output controller may play a pause jingle
+ * (however, in the case of pause, both currently simply ignore the notification).
+ */
+
+// A command that can be sent to the dispatch by a controller.
+
+class command
+{
+public:
+ enum type
+ {
+ noop, // no parameters
+ // Play state
+ open, // open_input_data
+ close, // no parameters
+ toggle_play, // no parameters
+ toggle_pause, // no parameters
+ step, // no parameters
+ seek, // float (relative adjustment)
+ set_pos, // float (absolute position)
+ // Per-Session parameters
+ set_audio_device, // int
+ set_stereo_mode, // parameters::stereo_mode
+ set_stereo_mode_swap, // bool
+ toggle_stereo_mode_swap, // no parameters
+ set_crosstalk, // 3 floats (absolute values)
+ set_fullscreen_screens, // int
+ set_fullscreen_flip_left, // bool
+ set_fullscreen_flop_left, // bool
+ set_fullscreen_flip_right, // bool
+ set_fullscreen_flop_right, // bool
+ set_fullscreen_inhibit_screensaver, // bool
+ adjust_contrast, // float (relative adjustment)
+ set_contrast, // float (absolute value)
+ adjust_brightness, // float (relative adjustment)
+ set_brightness, // float (absolute value)
+ adjust_hue, // float (relative adjustment)
+ set_hue, // float (absolute value)
+ adjust_saturation, // float (relative adjustment)
+ set_saturation, // float (absolute value)
+ adjust_zoom, // float (relative adjustment)
+ set_zoom, // float (absolute value)
+ set_loop_mode, // parameters::loop_mode_t
+ set_audio_delay, // float (absolute value)
+ set_subtitle_encoding, // string (encoding name)
+ set_subtitle_font, // string (font name)
+ set_subtitle_size, // int
+ set_subtitle_scale, // float
+ set_subtitle_color, // uint64_t
+ // Per-Video parameters
+ cycle_video_stream, // no parameters
+ set_video_stream, // int
+ cycle_audio_stream, // no parameters
+ set_audio_stream, // int
+ cycle_subtitle_stream, // no parameters
+ set_subtitle_stream, // int
+ set_stereo_layout, // video_frame::stereo_layout
+ set_stereo_layout_swap, // bool
+ set_crop_aspect_ratio, // float
+ adjust_parallax, // float (relative adjustment)
+ set_parallax, // float (absolute value)
+ adjust_ghostbust, // float (relative adjustment)
+ set_ghostbust, // float (absolute value)
+ adjust_subtitle_parallax, // float (relative adjustment)
+ set_subtitle_parallax, // float (absolute value)
+ // Volatile parameters
+ toggle_fullscreen, // no parameters
+ center, // no parameters
+ adjust_audio_volume, // float (relative adjustment)
+ set_audio_volume, // float (absolute value)
+ toggle_audio_mute, // no parameters
+ };
+ 
+ type type;
+ std::string param;
+
+ command() :
+ type(noop)
+ {
+ }
+
+ command(enum type t) :
+ type(t)
+ {
+ }
+
+ command(enum type t, int p) :
+ type(t)
+ {
+ std::ostringstream oss;
+ s11n::save(oss, p);
+ param = oss.str();
+ }
+
+ command(enum type t, float p) :
+ type(t)
+ {
+ std::ostringstream oss;
+ s11n::save(oss, p);
+ param = oss.str();
+ }
+
+ command(enum type t, int64_t p) :
+ type(t)
+ {
+ std::ostringstream oss;
+ s11n::save(oss, p);
+ param = oss.str();
+ }
+
+ command(enum type t, uint64_t p) :
+ type(t)
+ {
+ std::ostringstream oss;
+ s11n::save(oss, p);
+ param = oss.str();
+ }
+
+ command(enum type t, const std::string &p) :
+ type(t), param(p)
+ {
+ }
+};
+
+// A notification that can be sent to controllers by the dispatch.
+// It signals that the corresponding value has changed.
+
+class notification
+{
+public:
+ enum type
+ {
+ noop,
+ quit,
+ // Play state
+ open,
+ play,
+ pause,
+ pos,
+ // Per-Session parameters
+ audio_device,
+ stereo_mode,
+ stereo_mode_swap,
+ crosstalk,
+ fullscreen_screens,
+ fullscreen_flip_left,
+ fullscreen_flop_left,
+ fullscreen_flip_right,
+ fullscreen_flop_right,
+ fullscreen_inhibit_screensaver,
+ contrast,
+ brightness,
+ hue,
+ saturation,
+ zoom,
+ loop_mode,
+ audio_delay,
+ subtitle_encoding,
+ subtitle_font,
+ subtitle_size,
+ subtitle_scale,
+ subtitle_color,
+ // Per-Video parameters
+ video_stream,
+ audio_stream,
+ subtitle_stream,
+ stereo_layout,
+ stereo_layout_swap,
+ crop_aspect_ratio,
+ parallax,
+ ghostbust,
+ subtitle_parallax,
+ // Volatile parameters
+ fullscreen,
+ center,
+ audio_volume,
+ audio_mute,
+ };
+
+ const enum type type;
+
+public:
+ notification(enum type t) : type(t)
+ {
+ }
+};
+
+// The controller interface.
+
+class controller
+{
+public:
+ controller() throw ();
+ virtual ~controller();
+
+ /* The controller uses this function to send a command to the player. */
+ static void send_cmd(const command& cmd);
+ // Convenience wrappers:
+ static void send_cmd(enum command::type t) { send_cmd(command(t)); }
+ static void send_cmd(enum command::type t, int p) { send_cmd(command(t, p)); }
+ static void send_cmd(enum command::type t, float p) { send_cmd(command(t, p)); }
+ static void send_cmd(enum command::type t, int64_t p) { send_cmd(command(t, p)); }
+ static void send_cmd(enum command::type t, uint64_t p) { send_cmd(command(t, p)); }
+ static void send_cmd(enum command::type t, const std::string& p) { send_cmd(command(t, p)); }
+
+ /* The controller receives notifications via this function. The default
+ * implementation simply ignores the notification. */
+ virtual void receive_notification(const notification& note);
+
+ /* The controller is asked to process events via this function. The default
+ * implementation simply does nothing. */
+ virtual void process_events();
+};
+
+// The dispatch (singleton).
+
+class dispatch
+{
+private:
+ int* _argc;
+ char** _argv;
+ const bool _eq;
+ const bool _eq_3d;
+ const bool _eq_slave_node;
+ const bool _gui_mode;
+ const bool _have_display;
+ // Objects
+ class gui* _gui;
+ class audio_output* _audio_output;
+ class video_output* _video_output;
+ class media_input* _media_input;
+ class player* _player;
+ std::vector<controller*> _controllers;
+ unsigned int _controllers_version;
+ mutex _controllers_mutex;
+ // Parameters
+ open_input_data _input_data;
+ class parameters _parameters;
+ // State
+ bool _playing;
+ bool _pausing;
+ float _position;
+
+ void force_stop();
+
+ void visit_all_controllers(int action, const notification& note) const;
+ void notify_all(const notification& note);
+
+public:
+ dispatch(int* argc, char** argv,
+ bool equalizer, bool equalizer_3d, bool equalizer_slave_node,
+ bool gui, bool have_display, msg::level_t log_level,
+ bool benchmark, int swap_interval) throw ();
+ virtual ~dispatch();
+
+ void register_controller(controller* c);
+ void deregister_controller(controller* c);
+
+ void init(const open_input_data& input_data);
+ void deinit();
+
+ static void step();
+
+ /* Process events for all controllers */
+ static void process_all_events();
+
+ /* Access parameters and state (read-only) */
+ static const class parameters& parameters();
+ static const class audio_output* audio_output(); // NULL if not available
+ static const class video_output* video_output(); // NULL if not available
+ static const class media_input* media_input(); // NULL if no input is opened
+ static bool playing();
+ static bool pausing();
+ static float position();
+
+ /* Receive a command from a controller. */
+ void receive_cmd(const command& cmd);
+
+ /* Interface for the player. TODO: remove this! */
+ class audio_output* get_audio_output(); // NULL if not available
+ class video_output* get_video_output(); // NULL if not available
+ class media_input* get_media_input(); // NULL if not available
+ void set_playing(bool p);
+ void set_pausing(bool p);
+ void set_position(float pos);
+
+ /* Interface for Equalizer. */
+ class open_input_data* get_input_data();
+ class player* get_player();
+ std::string save_state() const;
+ void load_state(const std::string& s);
+};
+
+#endif

bino-1.3.2.tar.xz/src/gui.cpp Added

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

bino-1.3.2.tar.xz/src/gui.h Added

@@ -0,0 +1,433 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * Copyright (C) 2010, 2011, 2012
+ * Martin Lambers <marlam@marlam.de>
+ * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+ * Joe <cuchac@email.cz>
+ * Daniel Schaal <farbing@web.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 PLAYER_GUI_H
+#define PLAYER_GUI_H
+
+#include <QMainWindow>
+#include <QWidget>
+#include <QDialog>
+
+#include "dispatch.h"
+#include "video_output_qt.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 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);
+ virtual ~in_out_widget();
+
+ 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);
+ virtual ~controls_widget();
+
+ 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* _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 zoom_dialog : public QDialog, public controller
+{
+ Q_OBJECT
+
+private:
+ bool _lock;
+ QDoubleSpinBox *_z_spinbox;
+ QSlider *_z_slider;
+
+private slots:
+ void z_slider_changed(int val);
+ void z_spinbox_changed(double val);
+
+public:
+ zoom_dialog(QWidget *parent);
+
+ virtual void receive_notification(const notification &note);
+};
+
+class audio_dialog : public QDialog, public controller
+{
+ Q_OBJECT
+
+private:
+ bool _lock;
+ QComboBox *_device_combobox;
+ QSpinBox *_delay_spinbox;
+
+private slots:
+ void device_changed();
+ void delay_changed();
+
+public:
+ audio_dialog(QWidget *parent);
+
+ virtual void receive_notification(const notification &note);
+};
+
+class subtitle_dialog: public QDialog, public controller
+{
+ Q_OBJECT
+
+private:
+ bool _lock;
+ QCheckBox *_encoding_checkbox;
+ QComboBox *_encoding_combobox;
+ QCheckBox *_font_checkbox;
+ QFontComboBox *_font_combobox;
+ QCheckBox *_size_checkbox;
+ QSpinBox *_size_spinbox;
+ QCheckBox *_scale_checkbox;
+ QDoubleSpinBox *_scale_spinbox;
+ QCheckBox *_color_checkbox;
+ QPushButton *_color_button;
+ 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();
+
+public:
+ subtitle_dialog(QWidget *parent);
+
+ virtual void receive_notification(const notification &note);
+};
+
+class video_dialog : public QDialog, public controller
+{
+ Q_OBJECT
+
+private:
+ bool _lock;
+ QComboBox *_crop_ar_combobox;
+ QDoubleSpinBox *_p_spinbox;
+ QSlider *_p_slider;
+ QDoubleSpinBox *_sp_spinbox;
+ QSlider *_sp_slider;
+ QDoubleSpinBox *_g_spinbox;
+ QSlider *_g_slider;
+
+ void set_crop_ar(float val);
+
+private slots:
+ void crop_ar_changed();
+ void p_slider_changed(int val);
+ void p_spinbox_changed(double val);
+ void sp_slider_changed(int val);
+ void sp_spinbox_changed(double val);
+ void g_slider_changed(int val);
+ void g_spinbox_changed(double val);
+
+public:
+ video_dialog(QWidget *parent);
+ void update();
+
+ virtual void receive_notification(const notification &note);
+};
+
+class open_device_dialog : public QDialog
+{
+ Q_OBJECT
+
+private:
+ QComboBox *_type_combobox;
+ QStackedWidget *_device_chooser_stack;
+ QComboBox *_default_device_combobox;
+ QComboBox *_firewire_device_combobox;
+ QLineEdit *_x11_device_field;
+ QGroupBox *_frame_size_groupbox;
+ QSpinBox *_frame_width_spinbox;
+ QSpinBox *_frame_height_spinbox;
+ QGroupBox *_frame_rate_groupbox;
+ QSpinBox *_frame_rate_num_spinbox;
+ QSpinBox *_frame_rate_den_spinbox;
+
+private slots:
+ void frame_size_groupbox_clicked(bool checked);
+ void frame_rate_groupbox_clicked(bool checked);
+
+public:
+ open_device_dialog(const QStringList &default_devices, const QStringList &firewire_devices,
+ const QString &x11_device, const device_request &dev_request, QWidget *parent);
+ void request(QString &device, device_request &dev_request);
+};
+
+class main_window : public QMainWindow, public controller
+{
+ Q_OBJECT
+
+private:
+ QSettings *_settings;
+ video_container_widget *_video_container_widget;
+ in_out_widget *_in_out_widget;
+ controls_widget *_controls_widget;
+ fullscreen_dialog *_fullscreen_dialog;
+ color_dialog *_color_dialog;
+ crosstalk_dialog *_crosstalk_dialog;
+ zoom_dialog *_zoom_dialog;
+ audio_dialog *_audio_dialog;
+ subtitle_dialog *_subtitle_dialog;
+ video_dialog *_video_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);
+
+private slots:
+ void playloop_step();
+ void file_open();
+ void file_open_urls();
+ void file_open_device();
+ void preferences_fullscreen();
+ void preferences_colors();
+ void preferences_crosstalk();
+ void preferences_zoom();
+ void preferences_audio();
+ void preferences_subtitle();
+ void preferences_video();
+ 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 closeEvent(QCloseEvent *event);
+ bool eventFilter(QObject *obj, QEvent *event);
+
+public:
+ main_window(QSettings *settings);
+ virtual ~main_window();
+
+ void open(QStringList urls, const device_request &dev_request = device_request(),
+ const parameters& initial_params = parameters());
+ video_container_widget* container_widget()
+ {
+ return _video_container_widget;
+ }
+
+ virtual void receive_notification(const notification &note);
+};
+
+class gui
+{
+private:
+ main_window *_main_window;
+ QSettings *_settings;
+
+public:
+ gui();
+ ~gui();
+
+ void open(const open_input_data& input_data);
+
+ class video_container_widget* container_widget()
+ {
+ return _main_window->container_widget();
+ }
+};
+
+#endif

bino-1.2.1.tar.bz2/src/icons-local/README -> bino-1.3.2.tar.xz/src/icons-local/README Changed

bino-1.3.2.tar.xz/src/icons-local/input-layout-alternating-left-right.ipe Added

@@ -0,0 +1,266 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70005" creator="Ipe 7.0.14">
+<info created="D:20110813152635" modified="D:20120309223739"/>
+<preamble>\renewcommand{\familydefault}{\sfdefault}</preamble>
+<ipestyle name="basic">
+<symbol name="arrow/arc(spx)">
+<path stroke="sym-stroke" fill="sym-stroke" pen="sym-pen">
+0 0 m
+-1 0.333 l
+-1 -0.333 l
+h
+</path>
+</symbol>
+<symbol name="arrow/farc(spx)">
+<path stroke="sym-stroke" fill="white" pen="sym-pen">
+0 0 m
+-1 0.333 l
+-1 -0.333 l
+h
+</path>
+</symbol>
+<symbol name="mark/circle(sx)" transformations="translations">
+<path fill="sym-stroke">
+0.6 0 0 0.6 0 0 e
+0.4 0 0 0.4 0 0 e
+</path>
+</symbol>
+<symbol name="mark/disk(sx)" transformations="translations">
+<path fill="sym-stroke">
+0.6 0 0 0.6 0 0 e
+</path>
+</symbol>
+<symbol name="mark/fdisk(sfx)" transformations="translations">
+<group>
+<path fill="sym-stroke" fillrule="eofill">
+0.6 0 0 0.6 0 0 e
+0.4 0 0 0.4 0 0 e
+</path>
+<path fill="sym-fill">
+0.4 0 0 0.4 0 0 e
+</path>
+</group>
+</symbol>
+<symbol name="mark/box(sx)" transformations="translations">
+<path fill="sym-stroke" fillrule="eofill">
+-0.6 -0.6 m
+0.6 -0.6 l
+0.6 0.6 l
+-0.6 0.6 l
+h
+-0.4 -0.4 m
+0.4 -0.4 l
+0.4 0.4 l
+-0.4 0.4 l
+h
+</path>
+</symbol>
+<symbol name="mark/square(sx)" transformations="translations">
+<path fill="sym-stroke">
+-0.6 -0.6 m
+0.6 -0.6 l
+0.6 0.6 l
+-0.6 0.6 l
+h
+</path>
+</symbol>
+<symbol name="mark/fsquare(sfx)" transformations="translations">
+<group>
+<path fill="sym-stroke" fillrule="eofill">
+-0.6 -0.6 m
+0.6 -0.6 l
+0.6 0.6 l
+-0.6 0.6 l
+h
+-0.4 -0.4 m
+0.4 -0.4 l
+0.4 0.4 l
+-0.4 0.4 l
+h
+</path>
+<path fill="sym-fill">
+-0.4 -0.4 m
+0.4 -0.4 l
+0.4 0.4 l
+-0.4 0.4 l
+h
+</path>
+</group>
+</symbol>
+<symbol name="mark/cross(sx)" transformations="translations">
+<group>
+<path fill="sym-stroke">
+-0.43 -0.57 m
+0.57 0.43 l
+0.43 0.57 l
+-0.57 -0.43 l
+h
+</path>
+<path fill="sym-stroke">
+-0.43 0.57 m
+0.57 -0.43 l
+0.43 -0.57 l
+-0.57 0.43 l
+h
+</path>
+</group>
+</symbol>
+<symbol name="arrow/fnormal(spx)">
+<path stroke="sym-stroke" fill="white" pen="sym-pen">
+0 0 m
+-1 0.333 l
+-1 -0.333 l
+h
+</path>
+</symbol>
+<symbol name="arrow/pointed(spx)">
+<path stroke="sym-stroke" fill="sym-stroke" pen="sym-pen">
+0 0 m
+-1 0.333 l
+-0.8 0 l
+-1 -0.333 l
+h
+</path>
+</symbol>
+<symbol name="arrow/fpointed(spx)">
+<path stroke="sym-stroke" fill="white" pen="sym-pen">
+0 0 m
+-1 0.333 l
+-0.8 0 l
+-1 -0.333 l
+h
+</path>
+</symbol>
+<symbol name="arrow/linear(spx)">
+<path stroke="sym-stroke" pen="sym-pen">
+-1 0.333 m
+0 0 l
+-1 -0.333 l
+</path>
+</symbol>
+<symbol name="arrow/fdouble(spx)">
+<path stroke="sym-stroke" fill="white" pen="sym-pen">
+0 0 m
+-1 0.333 l
+-1 -0.333 l
+h
+-1 0 m
+-2 0.333 l
+-2 -0.333 l
+h
+</path>
+</symbol>
+<symbol name="arrow/double(spx)">
+<path stroke="sym-stroke" fill="sym-stroke" pen="sym-pen">
+0 0 m
+-1 0.333 l
+-1 -0.333 l
+h
+-1 0 m
+-2 0.333 l
+-2 -0.333 l
+h
+</path>
+</symbol>
+<pen name="heavier" value="0.8"/>
+<pen name="fat" value="1.2"/>
+<pen name="ultrafat" value="2"/>
+<symbolsize name="large" value="5"/>
+<symbolsize name="small" value="2"/>
+<symbolsize name="tiny" value="1.1"/>
+<arrowsize name="large" value="10"/>
+<arrowsize name="small" value="5"/>
+<arrowsize name="tiny" value="3"/>
+<color name="red" value="1 0 0"/>
+<color name="green" value="0 1 0"/>
+<color name="blue" value="0 0 1"/>
+<color name="yellow" value="1 1 0"/>
+<color name="orange" value="1 0.647 0"/>
+<color name="gold" value="1 0.843 0"/>
+<color name="purple" value="0.627 0.125 0.941"/>
+<color name="gray" value="0.745"/>
+<color name="brown" value="0.647 0.165 0.165"/>
+<color name="navy" value="0 0 0.502"/>
+<color name="pink" value="1 0.753 0.796"/>
+<color name="seagreen" value="0.18 0.545 0.341"/>
+<color name="turquoise" value="0.251 0.878 0.816"/>
+<color name="violet" value="0.933 0.51 0.933"/>
+<color name="darkblue" value="0 0 0.545"/>
+<color name="darkcyan" value="0 0.545 0.545"/>
+<color name="darkgray" value="0.663"/>
+<color name="darkgreen" value="0 0.392 0"/>
+<color name="darkmagenta" value="0.545 0 0.545"/>
+<color name="darkorange" value="1 0.549 0"/>
+<color name="darkred" value="0.545 0 0"/>
+<color name="lightblue" value="0.678 0.847 0.902"/>
+<color name="lightcyan" value="0.878 1 1"/>
+<color name="lightgray" value="0.827"/>
+<color name="lightgreen" value="0.565 0.933 0.565"/>
+<color name="lightyellow" value="1 1 0.878"/>
+<dashstyle name="dashed" value="[4] 0"/>
+<dashstyle name="dotted" value="[1 3] 0"/>
+<dashstyle name="dash dotted" value="[4 2 1 2] 0"/>
+<dashstyle name="dash dot dotted" value="[4 2 1 2 1 2] 0"/>
+<textsize name="large" value="\large"/>
+<textsize name="small" value="\small"/>
+<textsize name="tiny" value="\tiny"/>
+<textsize name="Large" value="\Large"/>
+<textsize name="LARGE" value="\LARGE"/>
+<textsize name="huge" value="\huge"/>
+<textsize name="Huge" value="\Huge"/>
+<textsize name="footnote" value="\footnotesize"/>
+<textstyle name="center" begin="\begin{center}" end="\end{center}"/>
+<textstyle name="itemize" begin="\begin{itemize}" end="\end{itemize}"/>
+<textstyle name="item" begin="\begin{itemize}\item{}" end="\end{itemize}"/>
+<gridsize name="4 pts" value="4"/>
+<gridsize name="8 pts (~3 mm)" value="8"/>
+<gridsize name="16 pts (~6 mm)" value="16"/>
+<gridsize name="32 pts (~12 mm)" value="32"/>
+<gridsize name="10 pts (~3.5 mm)" value="10"/>
+<gridsize name="20 pts (~7 mm)" value="20"/>
+<gridsize name="14 pts (~5 mm)" value="14"/>
+<gridsize name="28 pts (~10 mm)" value="28"/>
+<gridsize name="56 pts (~20 mm)" value="56"/>
+<anglesize name="90 deg" value="90"/>
+<anglesize name="60 deg" value="60"/>
+<anglesize name="45 deg" value="45"/>
+<anglesize name="30 deg" value="30"/>
+<anglesize name="22.5 deg" value="22.5"/>
+<tiling name="falling" angle="-60" step="4" width="1"/>
+<tiling name="rising" angle="30" step="4" width="1"/>
+</ipestyle>
+<page>
+<layer name="alpha"/>
+<view layers="alpha" active="alpha"/>
+<path layer="alpha" matrix="0.8125 0 0 0.75 24 116" stroke="black" fill="red">
+64 768 m
+64 720 l
+128 720 l
+128 768 l
+h
+</path>
+<path matrix="0.8125 0 0 0.75 20 120" stroke="black" fill="green">
+64 768 m
+64 720 l
+128 720 l
+128 768 l
+h
+</path>
+<path matrix="0.8125 0 0 0.75 16 124" stroke="black" fill="red">
+64 768 m
+64 720 l
+128 720 l
+128 768 l
+h
+</path>
+<path matrix="0.8125 0 0 0.75 12 128" stroke="black" fill="green">
+64 768 m
+64 720 l
+128 720 l
+128 768 l
+h
+</path>
+<text matrix="1 0 0 1 0 -56" transformations="translations" pos="64 752" stroke="black" type="minipage" width="52" height="11.093" depth="6.12" valign="top" size="Huge" style="center">\textbf{L}</text>
+</page>
+</ipe>

bino-1.3.2.tar.xz/src/icons-local/input-layout-alternating-left-right.png Added

bino-1.3.2.tar.xz/src/icons-local/input-layout-alternating-right-left.ipe Added

@@ -0,0 +1,266 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70005" creator="Ipe 7.0.14">
+<info created="D:20110813152635" modified="D:20120313204305"/>
+<preamble>\renewcommand{\familydefault}{\sfdefault}</preamble>
+<ipestyle name="basic">
+<symbol name="arrow/arc(spx)">
+<path stroke="sym-stroke" fill="sym-stroke" pen="sym-pen">
+0 0 m
+-1 0.333 l
+-1 -0.333 l
+h
+</path>
+</symbol>
+<symbol name="arrow/farc(spx)">
+<path stroke="sym-stroke" fill="white" pen="sym-pen">
+0 0 m
+-1 0.333 l
+-1 -0.333 l
+h
+</path>
+</symbol>
+<symbol name="mark/circle(sx)" transformations="translations">
+<path fill="sym-stroke">
+0.6 0 0 0.6 0 0 e
+0.4 0 0 0.4 0 0 e
+</path>
+</symbol>
+<symbol name="mark/disk(sx)" transformations="translations">
+<path fill="sym-stroke">
+0.6 0 0 0.6 0 0 e
+</path>
+</symbol>
+<symbol name="mark/fdisk(sfx)" transformations="translations">
+<group>
+<path fill="sym-stroke" fillrule="eofill">
+0.6 0 0 0.6 0 0 e
+0.4 0 0 0.4 0 0 e
+</path>
+<path fill="sym-fill">
+0.4 0 0 0.4 0 0 e
+</path>
+</group>
+</symbol>
+<symbol name="mark/box(sx)" transformations="translations">
+<path fill="sym-stroke" fillrule="eofill">
+-0.6 -0.6 m
+0.6 -0.6 l
+0.6 0.6 l
+-0.6 0.6 l
+h
+-0.4 -0.4 m
+0.4 -0.4 l
+0.4 0.4 l
+-0.4 0.4 l
+h
+</path>
+</symbol>
+<symbol name="mark/square(sx)" transformations="translations">
+<path fill="sym-stroke">
+-0.6 -0.6 m
+0.6 -0.6 l
+0.6 0.6 l
+-0.6 0.6 l
+h
+</path>
+</symbol>
+<symbol name="mark/fsquare(sfx)" transformations="translations">
+<group>
+<path fill="sym-stroke" fillrule="eofill">
+-0.6 -0.6 m
+0.6 -0.6 l
+0.6 0.6 l
+-0.6 0.6 l
+h
+-0.4 -0.4 m
+0.4 -0.4 l
+0.4 0.4 l
+-0.4 0.4 l
+h
+</path>
+<path fill="sym-fill">
+-0.4 -0.4 m
+0.4 -0.4 l
+0.4 0.4 l
+-0.4 0.4 l
+h
+</path>
+</group>
+</symbol>
+<symbol name="mark/cross(sx)" transformations="translations">
+<group>
+<path fill="sym-stroke">
+-0.43 -0.57 m
+0.57 0.43 l
+0.43 0.57 l
+-0.57 -0.43 l
+h
+</path>
+<path fill="sym-stroke">
+-0.43 0.57 m
+0.57 -0.43 l
+0.43 -0.57 l
+-0.57 0.43 l
+h
+</path>
+</group>
+</symbol>
+<symbol name="arrow/fnormal(spx)">
+<path stroke="sym-stroke" fill="white" pen="sym-pen">
+0 0 m
+-1 0.333 l
+-1 -0.333 l
+h
+</path>
+</symbol>
+<symbol name="arrow/pointed(spx)">
+<path stroke="sym-stroke" fill="sym-stroke" pen="sym-pen">
+0 0 m
+-1 0.333 l
+-0.8 0 l
+-1 -0.333 l
+h
+</path>
+</symbol>
+<symbol name="arrow/fpointed(spx)">
+<path stroke="sym-stroke" fill="white" pen="sym-pen">
+0 0 m
+-1 0.333 l
+-0.8 0 l
+-1 -0.333 l
+h
+</path>
+</symbol>
+<symbol name="arrow/linear(spx)">
+<path stroke="sym-stroke" pen="sym-pen">
+-1 0.333 m
+0 0 l
+-1 -0.333 l
+</path>
+</symbol>
+<symbol name="arrow/fdouble(spx)">
+<path stroke="sym-stroke" fill="white" pen="sym-pen">
+0 0 m
+-1 0.333 l
+-1 -0.333 l
+h
+-1 0 m
+-2 0.333 l
+-2 -0.333 l
+h
+</path>
+</symbol>
+<symbol name="arrow/double(spx)">
+<path stroke="sym-stroke" fill="sym-stroke" pen="sym-pen">
+0 0 m
+-1 0.333 l
+-1 -0.333 l
+h
+-1 0 m
+-2 0.333 l
+-2 -0.333 l
+h
+</path>
+</symbol>
+<pen name="heavier" value="0.8"/>
+<pen name="fat" value="1.2"/>
+<pen name="ultrafat" value="2"/>
+<symbolsize name="large" value="5"/>
+<symbolsize name="small" value="2"/>
+<symbolsize name="tiny" value="1.1"/>
+<arrowsize name="large" value="10"/>
+<arrowsize name="small" value="5"/>
+<arrowsize name="tiny" value="3"/>
+<color name="red" value="1 0 0"/>
+<color name="green" value="0 1 0"/>
+<color name="blue" value="0 0 1"/>
+<color name="yellow" value="1 1 0"/>
+<color name="orange" value="1 0.647 0"/>
+<color name="gold" value="1 0.843 0"/>
+<color name="purple" value="0.627 0.125 0.941"/>
+<color name="gray" value="0.745"/>
+<color name="brown" value="0.647 0.165 0.165"/>
+<color name="navy" value="0 0 0.502"/>
+<color name="pink" value="1 0.753 0.796"/>
+<color name="seagreen" value="0.18 0.545 0.341"/>
+<color name="turquoise" value="0.251 0.878 0.816"/>
+<color name="violet" value="0.933 0.51 0.933"/>
+<color name="darkblue" value="0 0 0.545"/>
+<color name="darkcyan" value="0 0.545 0.545"/>
+<color name="darkgray" value="0.663"/>
+<color name="darkgreen" value="0 0.392 0"/>
+<color name="darkmagenta" value="0.545 0 0.545"/>
+<color name="darkorange" value="1 0.549 0"/>
+<color name="darkred" value="0.545 0 0"/>
+<color name="lightblue" value="0.678 0.847 0.902"/>
+<color name="lightcyan" value="0.878 1 1"/>
+<color name="lightgray" value="0.827"/>
+<color name="lightgreen" value="0.565 0.933 0.565"/>
+<color name="lightyellow" value="1 1 0.878"/>
+<dashstyle name="dashed" value="[4] 0"/>
+<dashstyle name="dotted" value="[1 3] 0"/>
+<dashstyle name="dash dotted" value="[4 2 1 2] 0"/>
+<dashstyle name="dash dot dotted" value="[4 2 1 2 1 2] 0"/>
+<textsize name="large" value="\large"/>
+<textsize name="small" value="\small"/>
+<textsize name="tiny" value="\tiny"/>
+<textsize name="Large" value="\Large"/>
+<textsize name="LARGE" value="\LARGE"/>
+<textsize name="huge" value="\huge"/>
+<textsize name="Huge" value="\Huge"/>
+<textsize name="footnote" value="\footnotesize"/>
+<textstyle name="center" begin="\begin{center}" end="\end{center}"/>
+<textstyle name="itemize" begin="\begin{itemize}" end="\end{itemize}"/>
+<textstyle name="item" begin="\begin{itemize}\item{}" end="\end{itemize}"/>
+<gridsize name="4 pts" value="4"/>
+<gridsize name="8 pts (~3 mm)" value="8"/>
+<gridsize name="16 pts (~6 mm)" value="16"/>
+<gridsize name="32 pts (~12 mm)" value="32"/>
+<gridsize name="10 pts (~3.5 mm)" value="10"/>
+<gridsize name="20 pts (~7 mm)" value="20"/>
+<gridsize name="14 pts (~5 mm)" value="14"/>
+<gridsize name="28 pts (~10 mm)" value="28"/>
+<gridsize name="56 pts (~20 mm)" value="56"/>
+<anglesize name="90 deg" value="90"/>
+<anglesize name="60 deg" value="60"/>
+<anglesize name="45 deg" value="45"/>
+<anglesize name="30 deg" value="30"/>
+<anglesize name="22.5 deg" value="22.5"/>
+<tiling name="falling" angle="-60" step="4" width="1"/>
+<tiling name="rising" angle="30" step="4" width="1"/>
+</ipestyle>
+<page>
+<layer name="alpha"/>
+<view layers="alpha" active="alpha"/>
+<path layer="alpha" matrix="0.8125 0 0 0.75 20 120" stroke="black" fill="green">
+64 768 m
+64 720 l
+128 720 l
+128 768 l
+h
+</path>
+<path matrix="0.8125 0 0 0.75 16 124" stroke="black" fill="red">
+64 768 m
+64 720 l
+128 720 l
+128 768 l
+h
+</path>
+<path matrix="0.8125 0 0 0.75 12 128" stroke="black" fill="green">
+64 768 m
+64 720 l
+128 720 l
+128 768 l
+h
+</path>
+<path matrix="0.8125 0 0 0.75 8 132" stroke="black" fill="red">
+64 768 m
+64 720 l
+128 720 l
+128 768 l
+h
+</path>
+<text matrix="1 0 0 1 -4 -52" transformations="translations" pos="64 752" stroke="black" type="minipage" width="52" height="11.093" depth="6.12" valign="top" size="Huge" style="center">\textbf{R}</text>
+</page>
+</ipe>

bino-1.3.2.tar.xz/src/icons-local/input-layout-alternating-right-left.png Added

bino-1.3.2.tar.xz/src/icons-local/output-type-alternating.ipe Added

bino-1.3.2.tar.xz/src/icons-local/output-type-alternating.png Added

bino-1.2.1.tar.bz2/src/icons/README -> bino-1.3.2.tar.xz/src/icons/README Changed

bino-1.3.2.tar.xz/src/icons/audio-volume-high.png Added

bino-1.3.2.tar.xz/src/icons/audio-volume-low.png Added

bino-1.3.2.tar.xz/src/icons/audio-volume-medium.png Added

bino-1.3.2.tar.xz/src/icons/audio-volume-muted.png Added

bino-1.3.2.tar.xz/src/icons/dialog-information.png Added

bino-1.2.1.tar.bz2/src/icons/document-open.png -> bino-1.3.2.tar.xz/src/icons/document-open.png Changed

bino-1.2.1.tar.bz2/src/icons/help-about.png -> bino-1.3.2.tar.xz/src/icons/help-about.png Changed

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

bino-1.2.1.tar.bz2/src/lirc.cpp -> bino-1.3.2.tar.xz/src/lirc.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2011
+ * Copyright (C) 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -41,9 +41,7 @@
 controller(),
 _client_name(client_name),
 _conf_files(conf_files),
- _initialized(false),
- _playing(false),
- _pausing(false)
+ _initialized(false)
 {
 }
 
@@ -106,27 +104,6 @@
 }
 }
 
-void lircclient::receive_notification(const notification &note)
-{
- std::istringstream current(note.current);
-
- switch (note.type)
- {
- case notification::play:
- s11n::load(current, _playing);
- if (!_playing)
- {
- _pausing = false;
- }
- break;
- case notification::pause:
- s11n::load(current, _pausing);
- break;
- default:
- break;
- }
-}
-
 void lircclient::process_events()
 {
 if (_initialized)
@@ -196,6 +173,10 @@
 {
 c = command(command::center);
 }
+ else if (std::sscanf(t.c_str(), "zoom %f", &parameter) == 1)
+ {
+ c = command(command::adjust_zoom, parameter);
+ }
 else if (std::sscanf(t.c_str(), "adjust-contrast %f", &parameter) == 1)
 {
 c = command(command::adjust_contrast, parameter);
@@ -228,14 +209,22 @@
 {
 c = command(command::set_pos, parameter);
 }
+ else if (std::sscanf(t.c_str(), "adjust-audio-volume %f", &parameter) == 1)
+ {
+ c = command(command::adjust_audio_volume, parameter);
+ }
+ else if (t == "toggle-audio-mute")
+ {
+ c = command(command::toggle_audio_mute);
+ }
 /* The following commands need access to state. */
 else if (t == "play")
 {
- if (!_playing)
+ if (!dispatch::playing())
 {
 c = command(command::toggle_play);
 }
- else if (_pausing)
+ else if (dispatch::pausing())
 {
 c = command(command::toggle_pause);
 }
@@ -246,7 +235,7 @@
 }
 else if (t == "pause")
 {
- if (_playing && !_pausing)
+ if (dispatch::playing() && !dispatch::pausing())
 {
 c = command(command::toggle_pause);
 }
@@ -257,7 +246,7 @@
 }
 else if (t == "stop")
 {
- if (_playing)
+ if (dispatch::playing())
 {
 c = command(command::toggle_play);
 }

bino-1.2.1.tar.bz2/src/lirc.h -> bino-1.3.2.tar.xz/src/lirc.h Changed

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

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010-2011
+ * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 * Stefan Eilemann <eile@eyescale.ch>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
@@ -25,6 +25,8 @@
 
 #include <cstring>
 #include <cstdlib>
+#include <cstdio>
+#include <cerrno>
 #include <limits>
 #include <locale.h>
 
@@ -40,6 +42,9 @@
 #include <QApplication>
 #include <QtGlobal>
 #include <QTextCodec>
+#ifdef Q_WS_X11
+# include <X11/Xlib.h>
+#endif
 
 #include "gettext.h"
 #define _(string) gettext(string)
@@ -48,8 +53,8 @@
 #include "msg.h"
 #include "opt.h"
 
-#include "player.h"
-#include "player_qt.h"
+#include "dispatch.h"
+#include "audio_output.h"
 #if HAVE_LIBEQUALIZER
 # include "player_equalizer.h"
 #endif
@@ -145,6 +150,17 @@
 }
 }
 
+// Handle a log file that may be set via the --log-file option; see below
+static FILE *logf = NULL;
+static void close_log_file(void)
+{
+ if (logf)
+ {
+ (void)std::fclose(logf);
+ }
+}
+
+
 int main(int argc, char *argv[])
 {
 /* Initialization: gettext */
@@ -164,6 +180,9 @@
 #ifdef Q_WS_X11
 const char *display = getenv("DISPLAY");
 bool have_display = (display && display[0] != '\0');
+ if (have_display) {
+ XInitThreads();
+ }
 #else
 bool have_display = true;
 #endif
@@ -182,6 +201,8 @@
 options.push_back(&version);
 opt::flag no_gui("no-gui", 'n', opt::optional);
 options.push_back(&no_gui);
+ opt::val<std::string> log_file("log-file", '\0', opt::optional);
+ options.push_back(&log_file);
 std::vector<std::string> log_levels;
 log_levels.push_back("debug");
 log_levels.push_back("info");
@@ -190,6 +211,16 @@
 log_levels.push_back("quiet");
 opt::val<std::string> log_level("log-level", 'L', opt::optional, log_levels, "");
 options.push_back(&log_level);
+ opt::info list_audio_devices("list-audio-devices", '\0', opt::optional);
+ options.push_back(&list_audio_devices);
+ opt::val<int> audio_device("audio-device", 'A', opt::optional, 0, 999, 0);
+ options.push_back(&audio_device);
+ opt::val<int> audio_delay("audio-delay", 'D', opt::optional, -10000, +10000, 0);
+ options.push_back(&audio_delay);
+ opt::val<float> audio_volume("audio-volume", 'V', opt::optional, 0.0f, 1.0f, 1.0f);
+ options.push_back(&audio_volume);
+ opt::flag audio_mute("audio-mute", 'm', opt::optional);
+ options.push_back(&audio_mute);
 std::vector<std::string> device_types;
 device_types.push_back("default");
 device_types.push_back("firewire");
@@ -208,6 +239,8 @@
 input_modes.push_back("mono");
 input_modes.push_back("separate-left-right");
 input_modes.push_back("separate-right-left");
+ input_modes.push_back("alternating-left-right");
+ input_modes.push_back("alternating-right-left");
 input_modes.push_back("top-bottom");
 input_modes.push_back("top-bottom-half");
 input_modes.push_back("bottom-top");
@@ -227,6 +260,8 @@
 opt::val<int> subtitle("subtitle", 's', opt::optional, 0, 999, 0);
 options.push_back(&subtitle);
 std::vector<std::string> video_output_modes;
+ video_output_modes.push_back("stereo");
+ video_output_modes.push_back("alternating");
 video_output_modes.push_back("mono-left");
 video_output_modes.push_back("mono-right");
 video_output_modes.push_back("top-bottom");
@@ -251,7 +286,6 @@
 video_output_modes.push_back("amber-blue-dubois");
 video_output_modes.push_back("red-green-monochrome");
 video_output_modes.push_back("red-blue-monochrome");
- video_output_modes.push_back("stereo");
 video_output_modes.push_back("equalizer");
 video_output_modes.push_back("equalizer-3d");
 opt::val<std::string> video_output_mode("output", 'o', opt::optional, video_output_modes, "");
@@ -270,29 +304,34 @@
 options.push_back(&fullscreen_flip_right);
 opt::flag fullscreen_flop_right("fullscreen-flop-right", '\0', opt::optional);
 options.push_back(&fullscreen_flop_right);
+ opt::val<float> zoom("zoom", 'z', opt::optional, 0.0f, 1.0f);
+ options.push_back(&zoom);
+ opt::tuple<float> crop_aspect_ratio("crop", 'C', opt::optional, 0.0f, 100.0f, std::vector<float>(), 2, ":");
+ options.push_back(&crop_aspect_ratio);
 opt::flag center("center", 'c', opt::optional);
 options.push_back(&center);
- opt::val<std::string> subtitle_encoding("subtitle-encoding", '\0', opt::optional, parameters().subtitle_encoding);
+ opt::val<std::string> subtitle_encoding("subtitle-encoding", '\0', opt::optional);
 options.push_back(&subtitle_encoding);
- opt::val<std::string> subtitle_font("subtitle-font", '\0', opt::optional, parameters().subtitle_font);
+ opt::val<std::string> subtitle_font("subtitle-font", '\0', opt::optional);
 options.push_back(&subtitle_font);
- opt::val<int> subtitle_size("subtitle-size", '\0', opt::optional, 1, 999, parameters().subtitle_size);
+ opt::val<int> subtitle_size("subtitle-size", '\0', opt::optional, 1, 999);
 options.push_back(&subtitle_size);
- opt::val<float> subtitle_scale("subtitle-scale", '\0', opt::optional, 0.0f, false,
- std::numeric_limits<float>::max(), true, parameters().subtitle_scale);
+ opt::val<float> subtitle_scale("subtitle-scale", '\0', opt::optional, 0.0f, false, std::numeric_limits<float>::max(), true);
 options.push_back(&subtitle_scale);
 opt::color subtitle_color("subtitle-color", '\0', opt::optional);
 options.push_back(&subtitle_color);
- opt::val<float> subtitle_parallax("subtitle-parallax", '\0', opt::optional, -1.0f, +1.0f, parameters().subtitle_parallax);
+ opt::val<float> subtitle_parallax("subtitle-parallax", '\0', opt::optional, -1.0f, +1.0f);
 options.push_back(&subtitle_parallax);
- opt::val<float> parallax("parallax", 'P', opt::optional, -1.0f, +1.0f, parameters().parallax);
+ opt::val<float> parallax("parallax", 'P', opt::optional, -1.0f, +1.0f);
 options.push_back(&parallax);
- opt::tuple<float> crosstalk("crosstalk", 'C', opt::optional, 0.0f, 1.0f, std::vector<float>(3, parameters().crosstalk_r), 3);
+ opt::tuple<float> crosstalk("crosstalk", '\0', opt::optional, 0.0f, 1.0f, std::vector<float>(), 3);
 options.push_back(&crosstalk);
- opt::val<float> ghostbust("ghostbust", 'G', opt::optional, 0.0f, 1.0f, parameters().ghostbust);
+ opt::val<float> ghostbust("ghostbust", '\0', opt::optional, 0.0f, 1.0f);
 options.push_back(&ghostbust);
 opt::flag benchmark("benchmark", 'b', opt::optional);
 options.push_back(&benchmark);
+ opt::val<int> swap_interval("swap-interval", '\0', opt::optional, 0, 999);
+ options.push_back(&swap_interval);
 opt::flag loop("loop", 'l', opt::optional);
 options.push_back(&loop);
 // Accept some Equalizer options. These are passed to Equalizer for interpretation.
@@ -320,10 +359,25 @@
 {
 return 1;
 }
+ if (!log_file.value().empty())
+ {
+ logf = std::fopen(log_file.value().c_str(), "a");
+ if (!logf)
+ {
+ 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_columns(80);
+ }
+
 if (version.value())
 {
+ if (msg::file() == stderr)
+ msg::set_file(stdout);
 msg::req(_("%s version %s"), PACKAGE_NAME, VERSION);
- msg::req(4, _("Copyright (C) 2011 the Bino developers."));
+ msg::req(4, _("Copyright (C) 2012 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."));
@@ -338,113 +392,146 @@
 }
 if (help.value())
 {
- /* TRANSLATORS: This is the --help text. Translate only the description,
- not the option names. Please keep a proper indentation with spaces, and
- keep the line length limited. */
- msg::req_txt(_("Usage:\n"
- " %s [option...] [file...]\n"
- "\n"
- "Options:\n"
- " --help Print help.\n"
- " --version Print version.\n"
- " -n|--no-gui Do not use the GUI, just show a plain window.\n"
- " -L|--log-level=LEVEL Set log level (debug/info/warning/error/quiet).\n"
- " --device-type=TYPE Type of input device: default, firewire, x11.\n"
- " --device-frame-size=WxH Request frame size WxH from input device.\n"
- " --device-frame-rate=N/D Request frame rate N/D from input device.\n"
- " --lirc-config=FILE Use the given LIRC configuration file. This\n"
- " option can be used more than once.\n"
- " -v|--video=STREAM Select video stream (1-n, depending on input).\n"
- " -a|--audio=STREAM Select audio stream (1-n, depending on input).\n"
- " -s|--subtitle=STREAM Select subtitle stream (0-n, dep. on input).\n"
- " -i|--input=TYPE Select input type (default autodetect):\n"
- " mono Single view.\n"
- " separate-left-right Left/right separate streams, left first.\n"
- " separate-right-left Left/right separate streams, right first.\n"
- " top-bottom Left top, right bottom.\n"
- " top-bottom-half Left top, right bottom, half height.\n"
- " bottom-top Left bottom, right top.\n"
- " bottom-top-half Left bottom, right top, half height.\n"
- " left-right Left left, right right.\n"
- " left-right-half Left left, right right, half width.\n"
- " right-left Left right, right left.\n"
- " right-left-half Left right, right left, half width.\n"
- " even-odd-rows Left even rows, right odd rows.\n"
- " odd-even-rows Left odd rows, right even rows.\n"
- " -o|--output=TYPE Select output type:\n"
- " mono-left Only left.\n"
- " mono-right Only right.\n"
- " top-bottom Left top, right bottom.\n"
- " top-bottom-half Left top, right bottom, half height.\n"
- " left-right Left left, right right.\n"
- " left-right-half Left left, right right, half width.\n"
- " even-odd-rows Left even rows, right odd rows.\n"
- " even-odd-columns Left even columns, right odd columns.\n"
- " checkerboard Left and right in checkerboard pattern.\n"
- " hdmi-frame-pack HDMI frame packing mode.\n"
- " red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
- " red-cyan-half-color Red/cyan anaglyph, half color method.\n"
- " red-cyan-full-color Red/cyan anaglyph, full color method.\n"
- " red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
- " green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
- " green-magenta-half-color Green/magenta anaglyph, half color method.\n"
- " green-magenta-full-color Green/magenta anaglyph, full color method.\n"
- " green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
- " amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
- " amber-blue-half-color Amber/blue anaglyph, half color method.\n"
- " amber-blue-full-color Amber/blue anaglyph, full color method.\n"
- " amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
- " red-green-monochrome Red/green anaglyph, monochrome method.\n"
- " red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
- " stereo OpenGL quad-buffered stereo.\n"
- " equalizer Multi-display via Equalizer (2D setup).\n"
- " equalizer-3d Multi-display via Equalizer (3D setup).\n"
- " -S|--swap-eyes Swap left/right view.\n"
- " -f|--fullscreen Fullscreen.\n"
- " --fullscreen-screens= Use the listed screens in fullscreen mode.\n"
- " [S0[,S1[,...]]] Screen numbers start with 1. The default\n"
- " (empty list) is to use the primary screen.\n"
- " --fullscreen-flip-left Flip left view vertically when fullscreen.\n"
- " --fullscreen-flop-left Flop left view horizontally when fullscreen.\n"
- " --fullscreen-flip-right Flip right view vertically when fullscreen.\n"
- " --fullscreen-flop-right Flop right view horizontally when fullscreen.\n"
- " -c|--center Center window on screen.\n"
- " --subtitle-encoding=ENC Set subtitle encoding.\n"
- " --subtitle-font=FONT Set subtitle font name.\n"
- " --subtitle-size=N Set subtitle font size.\n"
- " --subtitle-scale=S Set subtitle scale factor.\n"
- " --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
- " --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
- " -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
- " -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-separated\n"
- " values for the R,G,B channels.\n"
- " -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
- " -b|--benchmark Benchmark mode (no audio, show fps).\n"
- " -l|--loop Loop the input media.\n"
- "\n"
- "Interactive control:\n"
- " ESC Leave fullscreen mode, or quit.\n"
- " q Quit.\n"
- " p or SPACE Pause / unpause.\n"
- " f Toggle fullscreen.\n"
- " c Center window.\n"
- " e Swap left/right eye.\n"
- " v Cycle through available video streams.\n"
- " a Cycle through available audio streams.\n"
- " s Cycle through available subtitle streams.\n"
- " 1, 2 Adjust contrast.\n"
- " 3, 4 Adjust brightness.\n"
- " 5, 6 Adjust hue.\n"
- " 7, 8 Adjust saturation.\n"
- " <, > Adjust parallax.\n"
- " (, ) Adjust ghostbusting.\n"
- " left, right Seek 10 seconds backward / forward.\n"
- " up, down Seek 1 minute backward / forward.\n"
- " page up, page down Seek 10 minutes backward / forward.\n"
- " Mouse click Seek according to horizontal click position."),
- program_name);
+ if (msg::file() == stderr)
+ msg::set_file(stdout);
+ /* 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. */
+ msg::req_txt(std::string(_("Usage:")) + '\n'
+ + " " + program_name + ' ' + "[option...] [file...]" + "\n\n"
+ + _("Options:") + '\n'
+ + " --help " + _("Print help.") + '\n'
+ + " --version " + _("Print version.") + '\n'
+ + " -n|--no-gui " + _("Do not use the GUI, just show a plain window.") + '\n'
+ + " --log-file=FILE " + _("Append all log messages to the given file.") + '\n'
+ + " -L|--log-level=LEVEL " + _("Set log level (debug/info/warning/error/quiet).") + '\n'
+ + " --list-audio-devices " + _("Print a list of known audio devices and exit.") + '\n'
+ + " -A|--audio-device=N " + _("Use audio device number N (N=0 is the default).") + '\n'
+ + " -D|--audio-delay=D " + _("Delay audio by D milliseconds. Default is 0.") + '\n'
+ + " -V|--audio-volume=V " + _("Set audio volume (0 to 1). Default is 1.") + '\n'
+ + " -m|--audio-mute " + _("Mute audio.") + '\n'
+ + " --device-type=TYPE " + _("Type of input device: default, firewire, x11.") + '\n'
+ + " --device-frame-size=WxH " + _("Request frame size WxH from input device.") + '\n'
+ + " --device-frame-rate=N/D " + _("Request frame rate N/D from input device.") + '\n'
+ + " --lirc-config=FILE " + _("Use the given LIRC configuration file.") + '\n'
+ + " " + _("This option can be used more than once.") + '\n'
+ + " -v|--video=STREAM " + _("Select video stream (1-n, depending on input).") + '\n'
+ + " -a|--audio=STREAM " + _("Select audio stream (1-n, depending on input).") + '\n'
+ + " -s|--subtitle=STREAM " + _("Select subtitle stream (0-n, dep. on input).") + '\n'
+ + " -i|--input=TYPE " + _("Select input type (default autodetect):") + '\n'
+ + " mono " + _("Single view.") + '\n'
+ + " separate-left-right " + _("Left/right separate streams, left first.") + '\n'
+ + " separate-right-left " + _("Left/right separate streams, right first.") + '\n'
+ + " alternating-left-right " + _("Left/right alternating, left first.") + '\n'
+ + " alternating-right-left " + _("Left/right alternating, right first.") + '\n'
+ + " top-bottom " + _("Left top, right bottom.") + '\n'
+ + " top-bottom-half " + _("Left top, right bottom, half height.") + '\n'
+ + " bottom-top " + _("Left bottom, right top.") + '\n'
+ + " bottom-top-half " + _("Left bottom, right top, half height.") + '\n'
+ + " left-right " + _("Left left, right right.") + '\n'
+ + " left-right-half " + _("Left left, right right, half width.") + '\n'
+ + " right-left " + _("Left right, right left.") + '\n'
+ + " right-left-half " + _("Left right, right left, half width.") + '\n'
+ + " even-odd-rows " + _("Left even rows, right odd rows.") + '\n'
+ + " odd-even-rows " + _("Left odd rows, right even rows.") + '\n'
+ + " -o|--output=TYPE " + _("Select output type:") + '\n'
+ + " stereo " + _("OpenGL quad-buffered stereo.") + '\n'
+ + " alternating " + _("Left and right view alternating.") + '\n'
+ + " mono-left " + _("Only left.") + '\n'
+ + " mono-right " + _("Only right.") + '\n'
+ + " top-bottom " + _("Left top, right bottom.") + '\n'
+ + " top-bottom-half " + _("Left top, right bottom, half height.") + '\n'
+ + " left-right " + _("Left left, right right.") + '\n'
+ + " left-right-half " + _("Left left, right right, half width.") + '\n'
+ + " even-odd-rows " + _("Left even rows, right odd rows.") + '\n'
+ + " even-odd-columns " + _("Left even columns, right odd columns.") + '\n'
+ + " checkerboard " + _("Left and right in checkerboard pattern.") + '\n'
+ + " hdmi-frame-pack " + _("HDMI frame packing mode.") + '\n'
+ + " red-cyan-monochrome " + _("Red/cyan anaglyph, monochrome method.") + '\n'
+ + " red-cyan-half-color " + _("Red/cyan anaglyph, half color method.") + '\n'
+ + " red-cyan-full-color " + _("Red/cyan anaglyph, full color method.") + '\n'
+ + " red-cyan-dubois " + _("Red/cyan anaglyph, Dubois method.") + '\n'
+ + " green-magenta-monochrome " + _("Green/magenta anaglyph, monochrome method.") + '\n'
+ + " green-magenta-half-color " + _("Green/magenta anaglyph, half color method.") + '\n'
+ + " green-magenta-full-color " + _("Green/magenta anaglyph, full color method.") + '\n'
+ + " green-magenta-dubois " + _("Green/magenta anaglyph, Dubois method.") + '\n'
+ + " amber-blue-monochrome " + _("Amber/blue anaglyph, monochrome method.") + '\n'
+ + " amber-blue-half-color " + _("Amber/blue anaglyph, half color method.") + '\n'
+ + " amber-blue-full-color " + _("Amber/blue anaglyph, full color method.") + '\n'
+ + " amber-blue-dubois " + _("Amber/blue anaglyph, Dubois method.") + '\n'
+ + " red-green-monochrome " + _("Red/green anaglyph, monochrome method.") + '\n'
+ + " red-blue-monochrome " + _("Red/blue anaglyph, monochrome method.") + '\n'
+ + " equalizer " + _("Multi-display via Equalizer (2D setup).") + '\n'
+ + " equalizer-3d " + _("Multi-display via Equalizer (3D setup).") + '\n'
+ + " -S|--swap-eyes " + _("Swap left/right view.") + '\n'
+ + " -f|--fullscreen " + _("Fullscreen.") + '\n'
+ + " --fullscreen-screens= " + _("Use the listed screens in fullscreen mode.") + '\n'
+ + " [S0[,S1[,...]]] " + _("Screen numbers start with 1.") + '\n'
+ + " " + _("An empty list defaults to the primary screen.") + '\n'
+ + " --fullscreen-flip-left " + _("Flip left view vertically when fullscreen.") + '\n'
+ + " --fullscreen-flop-left " + _("Flop left view horizontally when fullscreen.") + '\n'
+ + " --fullscreen-flip-right " + _("Flip right view vertically when fullscreen.") + '\n'
+ + " --fullscreen-flop-right " + _("Flop right view horizontally when fullscreen.") + '\n'
+ + " -z|--zoom=Z " + _("Set zoom for wide videos (0=off to 1=full).") + '\n'
+ + " -C|--crop=W:H " + _("Crop video to given aspect ratio (0:0=off).") + '\n'
+ + " -c|--center " + _("Center window on screen.") + '\n'
+ + " --subtitle-encoding=ENC " + _("Set subtitle encoding.") + '\n'
+ + " --subtitle-font=FONT " + _("Set subtitle font name.") + '\n'
+ + " --subtitle-size=N " + _("Set subtitle font size.") + '\n'
+ + " --subtitle-scale=S " + _("Set subtitle scale factor.") + '\n'
+ + " --subtitle-color=COLOR " + _("Set subtitle color, in [AA]RRGGBB format.") + '\n'
+ + " --subtitle-parallax=VAL " + _("Subtitle parallax adjustment (-1 to +1).") + '\n'
+ + " -P|--parallax=VAL " + _("Parallax adjustment (-1 to +1).") + '\n'
+ + " --crosstalk=VAL " + _("Crosstalk leak level (0 to 1).") + '\n'
+ + " " + _("Comma-separated values for R,G,B.") + '\n'
+ + " --ghostbust=VAL " + _("Amount of ghostbusting to apply (0 to 1).") + '\n'
+ + " -b|--benchmark " + _("Benchmark mode (no audio, show fps).") + '\n'
+ + " --swap-interval=D " + _("Frame rate divisor for display refresh rate.") + '\n'
+ + " " + _("Default is 0 for benchmark mode, 1 otherwise.") + '\n'
+ + " -l|--loop " + _("Loop the input media.") + '\n'
+ + '\n'
+ + _("Interactive control:") + '\n'
+ + " ESC " + _("Leave fullscreen mode, or quit.") + '\n'
+ + " q " + _("Quit.") + '\n'
+ + " p / SPACE " + _("Pause / unpause.") + '\n'
+ + " f " + _("Toggle fullscreen.") + '\n'
+ + " c " + _("Center window.") + '\n'
+ + " e " + _("Swap left/right eye.") + '\n'
+ + " v " + _("Cycle through available video streams.") + '\n'
+ + " a " + _("Cycle through available audio streams.") + '\n'
+ + " s " + _("Cycle through available subtitle streams.") + '\n'
+ + " 1, 2 " + _("Adjust contrast.") + '\n'
+ + " 3, 4 " + _("Adjust brightness.") + '\n'
+ + " 5, 6 " + _("Adjust hue.") + '\n'
+ + " 7, 8 " + _("Adjust saturation.") + '\n'
+ + " [, ] " + _("Adjust parallax.") + '\n'
+ + " (, ) " + _("Adjust ghostbusting.") + '\n'
+ + " <, > " + _("Adjust zoom for wide videos.") + '\n'
+ + " /, * " + _("Adjust audio volume.") + '\n'
+ + " m " + _("Toggle audio mute.") + '\n'
+ + " . " + _("Step a single video frame forward.") + '\n'
+ + " left, right " + _("Seek 10 seconds backward / forward.") + '\n'
+ + " down, up " + _("Seek 1 minute backward / forward.") + '\n'
+ + " page down, page up " + _("Seek 10 minutes backward / forward.") + '\n'
+ + " Mouse click " + _("Seek according to horizontal click position.") + '\n'
+ + " Media keys " + _("Media keys should work as expected."));
+ }
+ if (list_audio_devices.value())
+ {
+ audio_output ao;
+ if (ao.devices() == 0)
+ {
+ msg::req(_("No audio devices known."));
+ }
+ else
+ {
+ msg::req("%d audio devices available:", ao.devices());
+ for (int i = 0; i < ao.devices(); i++)
+ {
+ msg::req(4, "%d: %s", i + 1, ao.device_name(i).c_str());
+ }
+ }
 }
- if (version.value() || help.value())
+ if (version.value() || help.value() || list_audio_devices.value())
 {
 return 0;
 }
@@ -466,209 +553,200 @@
 }
 #endif
 
- bool equalizer = false;
- bool equalizer_flat_screen = true;
- player_init_data init_data;
- init_data.log_level = msg::level();
+ /* Find invariant parameters, required for dispatch initialization */
+ bool dispatch_equalizer = false;
+ bool dispatch_equalizer_3d = false;
+ bool dispatch_gui = !no_gui.value();
+ if (audio_device.is_set())
+ controller::send_cmd(command::set_audio_device, audio_device.value() - 1);
+ if (video_output_mode.value() == "equalizer") {
+ dispatch_equalizer = true;
+ dispatch_equalizer_3d = false;
+ dispatch_gui = false;
+ } else if (video_output_mode.value() == "equalizer-3d") {
+ dispatch_equalizer = true;
+ dispatch_equalizer_3d = true;
+ dispatch_gui = false;
+ }
+ msg::level_t dispatch_log_level = msg::level();
 if (log_level.value() == "")
- {
- init_data.log_level = msg::INF;
- }
+ dispatch_log_level = msg::INF;
 else if (log_level.value() == "debug")
- {
- init_data.log_level = msg::DBG;
- }
+ dispatch_log_level = msg::DBG;
 else if (log_level.value() == "info")
- {
- init_data.log_level = msg::INF;
- }
+ dispatch_log_level = msg::INF;
 else if (log_level.value() == "warning")
- {
- init_data.log_level = msg::WRN;
- }
+ dispatch_log_level = msg::WRN;
 else if (log_level.value() == "error")
- {
- init_data.log_level = msg::ERR;
- }
+ dispatch_log_level = msg::ERR;
 else if (log_level.value() == "quiet")
- {
- init_data.log_level = msg::REQ;
+ dispatch_log_level = msg::REQ;
+ bool dispatch_benchmark = benchmark.value();
+ int dispatch_swap_interval = dispatch_benchmark ? 0 : 1;
+ if (swap_interval.is_set())
+ dispatch_swap_interval = swap_interval.value();
+
+ /* Create the central dispatch */
+ dispatch global_dispatch(&argc, argv,
+ dispatch_equalizer, dispatch_equalizer_3d, false,
+ dispatch_gui, have_display, dispatch_log_level,
+ dispatch_benchmark, dispatch_swap_interval);
+ if (dispatch_benchmark)
+ msg::inf(_("Benchmark mode: audio and time synchronization disabled."));
+
+ /* Set session parameters */
+ if (audio_device.is_set())
+ controller::send_cmd(command::set_audio_device, audio_device.value() - 1);
+ if (video_output_mode.is_set()) {
+ if (video_output_mode.value() == "equalizer") {
+ controller::send_cmd(command::set_stereo_mode, static_cast<int>(parameters::mode_mono_left));
+ controller::send_cmd(command::set_stereo_mode_swap, false);
+ } else if (video_output_mode.value() == "equalizer-3d") {
+ controller::send_cmd(command::set_stereo_mode, static_cast<int>(parameters::mode_mono_left));
+ controller::send_cmd(command::set_stereo_mode_swap, false);
+ } else {
+ parameters::stereo_mode_t stereo_mode;
+ bool stereo_mode_swap;
+ parameters::stereo_mode_from_string(video_output_mode.value(), stereo_mode, stereo_mode_swap);
+ controller::send_cmd(command::set_stereo_mode, static_cast<int>(stereo_mode));
+ controller::send_cmd(command::set_stereo_mode_swap, stereo_mode_swap);
+ }
 }
- if (device_type.value() == "")
- {
- init_data.dev_request.device =
+ if (swap_eyes.is_set())
+ controller::send_cmd(command::set_stereo_mode_swap, swap_eyes.value());
+ if (crosstalk.is_set()) {
+ std::ostringstream v;
+ s11n::save(v, crosstalk.value()[0]);
+ s11n::save(v, crosstalk.value()[1]);
+ s11n::save(v, crosstalk.value()[2]);
+ controller::send_cmd(command::set_crosstalk, v.str());
+ }
+ if (fullscreen_screens.is_set()) {
+ int fs = 0;
+ for (size_t i = 0; i < fullscreen_screens.value().size(); i++)
+ fs |= (1 << (fullscreen_screens.value()[i] - 1));
+ controller::send_cmd(command::set_fullscreen_screens, fs);
+ }
+ if (fullscreen_flip_left.is_set())
+ controller::send_cmd(command::set_fullscreen_flip_left, fullscreen_flip_left.value());
+ if (fullscreen_flop_left.is_set())
+ controller::send_cmd(command::set_fullscreen_flop_left, fullscreen_flop_left.value());
+ if (fullscreen_flip_right.is_set())
+ controller::send_cmd(command::set_fullscreen_flip_right, fullscreen_flip_right.value());
+ if (fullscreen_flop_right.is_set())
+ controller::send_cmd(command::set_fullscreen_flop_right, fullscreen_flop_right.value());
+ if (zoom.is_set())
+ controller::send_cmd(command::set_zoom, zoom.value());
+ if (loop.is_set())
+ controller::send_cmd(command::set_loop_mode, loop.value() ? parameters::loop_current : parameters::no_loop);
+ if (audio_delay.is_set())
+ controller::send_cmd(command::set_audio_delay, audio_delay.value() * 1000);
+ if (subtitle_encoding.is_set()) {
+ std::ostringstream v;
+ s11n::save(v, subtitle_encoding.value());
+ controller::send_cmd(command::set_subtitle_encoding, v.str());
+ }
+ if (subtitle_font.is_set()) {
+ std::ostringstream v;
+ s11n::save(v, subtitle_font.value());
+ controller::send_cmd(command::set_subtitle_font, v.str());
+ }
+ if (subtitle_size.is_set())
+ controller::send_cmd(command::set_subtitle_size, subtitle_size.value());
+ if (subtitle_scale.is_set())
+ controller::send_cmd(command::set_subtitle_scale, subtitle_scale.value());
+ if (subtitle_color.is_set())
+ controller::send_cmd(command::set_subtitle_color, static_cast<uint64_t>(subtitle_color.value()));
+
+ /* Set volatile parameters */
+ if (fullscreen.is_set() && fullscreen.value())
+ controller::send_cmd(command::toggle_fullscreen);
+ if (center.is_set())
+ controller::send_cmd(command::center);
+ if (audio_volume.is_set())
+ controller::send_cmd(command::set_audio_volume, audio_volume.value());
+ if (audio_mute.is_set() && audio_mute.value())
+ controller::send_cmd(command::toggle_audio_mute);
+
+ /* Gather initial player data: input URLs and per-video parameters */
+ open_input_data input_data;
+ if (device_type.value() == "") {
+ input_data.dev_request.device =
 (arguments.size() == 1 && arguments[0].substr(0, 5) == "/dev/"
 ? device_request::sys_default : device_request::no_device);
- }
- else
- {
- init_data.dev_request.device =
+ } else {
+ input_data.dev_request.device =
 (device_type.value() == "firewire" ? device_request::firewire
 : device_type.value() == "x11" ? device_request::x11
 : device_request::sys_default);
 }
- init_data.dev_request.width = device_frame_size.value()[0];
- init_data.dev_request.height = device_frame_size.value()[1];
- init_data.dev_request.frame_rate_num = device_frame_rate.value()[0];
- init_data.dev_request.frame_rate_den = device_frame_rate.value()[1];
- init_data.urls = arguments;
- init_data.video_stream = video.value() - 1;
- init_data.audio_stream = audio.value() - 1;
- init_data.subtitle_stream = subtitle.value() - 1;
- if (input_mode.value() == "")
- {
- init_data.stereo_layout_override = false;
- }
- else
- {
- init_data.stereo_layout_override = true;
- video_frame::stereo_layout_from_string(input_mode.value(), init_data.stereo_layout, init_data.stereo_layout_swap);
- }
- if (video_output_mode.value() == "")
- {
- init_data.stereo_mode_override = false;
- }
- else if (video_output_mode.value() == "equalizer")
- {
- equalizer = true;
- equalizer_flat_screen = true;
- init_data.stereo_mode_override = true;
- init_data.stereo_mode = parameters::mono_left;
- init_data.stereo_mode_swap = false;
- }
- else if (video_output_mode.value() == "equalizer-3d")
- {
- equalizer = true;
- equalizer_flat_screen = false;
- init_data.stereo_mode_override = true;
- init_data.stereo_mode = parameters::mono_left;
- init_data.stereo_mode_swap = false;
- }
- else
- {
- init_data.stereo_mode_override = true;
- parameters::stereo_mode_from_string(video_output_mode.value(), init_data.stereo_mode, init_data.stereo_mode_swap);
- init_data.stereo_mode_swap = swap_eyes.value();
- }
- init_data.params.stereo_mode_swap = swap_eyes.value();
- init_data.fullscreen = fullscreen.value();
- if (fullscreen_screens.values().size() > 0)
- {
- init_data.params.fullscreen_screens = 0;
- for (size_t i = 0; i < fullscreen_screens.value().size(); i++)
- {
- init_data.params.fullscreen_screens |= (1 << (fullscreen_screens.value()[i] - 1));
+ input_data.dev_request.width = device_frame_size.value()[0];
+ input_data.dev_request.height = device_frame_size.value()[1];
+ input_data.dev_request.frame_rate_num = device_frame_rate.value()[0];
+ input_data.dev_request.frame_rate_den = device_frame_rate.value()[1];
+ input_data.urls = arguments;
+ if (video.is_set() > 0)
+ input_data.params.set_video_stream(video.value() - 1);
+ if (audio.is_set() > 0)
+ input_data.params.set_audio_stream(audio.value() - 1);
+ if (subtitle.is_set() > 0)
+ input_data.params.set_subtitle_stream(subtitle.value() - 1);
+ if (input_mode.is_set()) {
+ parameters::stereo_layout_t stereo_layout;
+ bool stereo_layout_swap;
+ parameters::stereo_layout_from_string(input_mode.value(), stereo_layout, stereo_layout_swap);
+ input_data.params.set_stereo_layout(stereo_layout);
+ input_data.params.set_stereo_layout_swap(stereo_layout_swap);
+ }
+ if (crop_aspect_ratio.is_set()) {
+ float crop_ar = 0.0f;
+ if (crop_aspect_ratio.value()[0] > 0.0f && crop_aspect_ratio.value()[1] > 0.0f) {
+ crop_ar = crop_aspect_ratio.value()[0] / crop_aspect_ratio.value()[1];
+ crop_ar = std::min(std::max(crop_ar, 1.0f), 2.39f);
 }
- }
- if (fullscreen_flip_left.values().size() > 0)
- {
- init_data.params.fullscreen_flip_left = fullscreen_flip_left.value();
- }
- if (fullscreen_flop_left.values().size() > 0)
- {
- init_data.params.fullscreen_flop_left = fullscreen_flop_left.value();
- }
- if (fullscreen_flip_right.values().size() > 0)
- {
- init_data.params.fullscreen_flip_right = fullscreen_flip_right.value();
- }
- if (fullscreen_flop_right.values().size() > 0)
- {
- init_data.params.fullscreen_flop_right = fullscreen_flop_right.value();
- }
- init_data.center = center.value();
- init_data.params.subtitle_encoding = subtitle_encoding.value();
- init_data.params.subtitle_font = subtitle_font.value();
- init_data.params.subtitle_size = subtitle_size.value();
- init_data.params.subtitle_scale = subtitle_scale.value();
- if (!subtitle_color.values().empty())
- {
- init_data.params.subtitle_color = subtitle_color.value();
- }
- init_data.params.subtitle_parallax = subtitle_parallax.value();
- init_data.params.parallax = parallax.value();
- init_data.params.crosstalk_r = crosstalk.value()[0];
- init_data.params.crosstalk_g = crosstalk.value()[1];
- init_data.params.crosstalk_b = crosstalk.value()[2];
- init_data.params.ghostbust = ghostbust.value();
- init_data.benchmark = benchmark.value();
- if (init_data.benchmark)
- {
- msg::inf(_("Benchmark mode: audio and time synchronization disabled."));
- }
- init_data.params.loop_mode = (loop.value() ? parameters::loop_current : parameters::no_loop);
+ input_data.params.set_crop_aspect_ratio(crop_ar);
+ }
+ if (parallax.is_set())
+ input_data.params.set_parallax(parallax.value());
+ if (ghostbust.is_set())
+ input_data.params.set_ghostbust(ghostbust.value());
+ if (subtitle_parallax.is_set())
+ input_data.params.set_subtitle_parallax(subtitle_parallax.value());
 
+ int retval = 0;
+ try {
+ global_dispatch.init(input_data);
 #if HAVE_LIBLIRCCLIENT
- lircclient lirc(PACKAGE, lirc_config.values());
- try
- {
- lirc.init();
- }
- catch (std::exception &e)
- {
- msg::wrn("%s", e.what());
- }
+ lircclient lirc(PACKAGE, lirc_config.values());
+ try {
+ lirc.init();
+ }
+ catch (std::exception& e) {
+ msg::wrn("%s", e.what());
+ }
 #else
- if (lirc_config.values().size() > 0)
- {
- msg::wrn(_("This version of Bino was compiled without support for LIRC."));
- }
+ if (lirc_config.is_set()) {
+ msg::wrn(_("This version of Bino was compiled without support for LIRC."));
+ }
 #endif
-
- int retval = 0;
- player *player = NULL;
- try
- {
- if (equalizer)
- {
+ if (dispatch_equalizer) {
 #if HAVE_LIBEQUALIZER
- player = new class player_equalizer(&argc, argv, equalizer_flat_screen);
+ player_equalizer::mainloop();
 #else
- throw exc(_("This version of Bino was compiled without support for Equalizer."));
+ msg::err(_("This version of Bino was compiled without support for Equalizer."));
 #endif
+ } else {
+ QApplication::exec();
 }
- else
- {
- if (!have_display)
- {
- throw exc(_("Cannot connect to X server."));
- }
- else if (!no_gui.value())
- {
- if (log_level.value() == "")
- {
- init_data.log_level = msg::WRN; // Be silent by default when the GUI is used
- }
- init_data.fullscreen = false; // GUI overrides fullscreen setting
- init_data.center = false; // GUI overrides center flag
- player = new class player_qt();
- }
- else
- {
- if (arguments.size() == 0)
- {
- throw exc(_("No video to play."));
- }
- player = new class player();
- }
- }
- player->open(init_data);
- player->run();
+#if HAVE_LIBLIRCCLIENT
+ lirc.deinit();
+#endif
+ global_dispatch.deinit();
 }
- catch (std::exception &e)
- {
+ catch (std::exception& e) {
 msg::err("%s", e.what());
 retval = 1;
 }
- if (player)
- {
- try { player->close(); } catch (...) {}
- delete player;
- }
-
-#if HAVE_LIBLIRCCLIENT
- lirc.deinit();
-#endif
 
 delete qt_app;

bino-1.2.1.tar.bz2/src/media_data.cpp -> bino-1.3.2.tar.xz/src/media_data.cpp Changed

@@ -1,9 +1,10 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010-2011
+ * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 * Joe <joe@wpj.cz>
+ * D. Matz <bandregent@yahoo.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
@@ -65,6 +66,746 @@
 }
 
 
+parameters::parameters()
+{
+ // Invariant parameters
+ unset_log_level();
+ unset_benchmark();
+ unset_swap_interval();
+ // Per-Session parameters
+ unset_audio_device();
+ unset_stereo_mode();
+ unset_stereo_mode_swap();
+ unset_crosstalk_r();
+ unset_crosstalk_g();
+ unset_crosstalk_b();
+ unset_fullscreen_screens();
+ unset_fullscreen_flip_left();
+ unset_fullscreen_flop_left();
+ unset_fullscreen_flip_right();
+ unset_fullscreen_flop_right();
+ unset_fullscreen_inhibit_screensaver();
+ unset_contrast();
+ unset_brightness();
+ unset_hue();
+ unset_saturation();
+ unset_zoom();
+ unset_loop_mode();
+ unset_audio_delay();
+ unset_subtitle_encoding();
+ unset_subtitle_font();
+ unset_subtitle_size();
+ unset_subtitle_scale();
+ unset_subtitle_color();
+ // Per-Video parameters
+ unset_video_stream();
+ unset_audio_stream();
+ unset_subtitle_stream();
+ unset_stereo_layout();
+ unset_stereo_layout_swap();
+ unset_crop_aspect_ratio();
+ unset_parallax();
+ unset_ghostbust();
+ unset_subtitle_parallax();
+ // Volatile parameters
+ unset_fullscreen();
+ unset_center();
+ unset_audio_volume();
+ unset_audio_mute();
+}
+
+// Invariant parameters
+const msg::level_t parameters::_log_level_default = msg::INF;
+const bool parameters::_benchmark_default = false;
+const int parameters::_swap_interval_default = 1;
+// Per-Session parameter defaults
+const int parameters::_audio_device_default = -1;
+const parameters::stereo_mode_t parameters::_stereo_mode_default = mode_mono_left;
+const bool parameters::_stereo_mode_swap_default = false;
+const float parameters::_crosstalk_r_default = 0.0f;
+const float parameters::_crosstalk_g_default = 0.0f;
+const float parameters::_crosstalk_b_default = 0.0f;
+const int parameters::_fullscreen_screens_default = 0;
+const bool parameters::_fullscreen_flip_left_default = false;
+const bool parameters::_fullscreen_flop_left_default = false;
+const bool parameters::_fullscreen_flip_right_default = false;
+const bool parameters::_fullscreen_flop_right_default = false;
+const bool parameters::_fullscreen_inhibit_screensaver_default = true;
+const float parameters::_contrast_default = 0.0f;
+const float parameters::_brightness_default = 0.0f;
+const float parameters::_hue_default = 0.0f;
+const float parameters::_saturation_default = 0.0f;
+const float parameters::_zoom_default = 0.0f;
+const parameters::loop_mode_t parameters::_loop_mode_default = no_loop;
+const int64_t parameters::_audio_delay_default = 0;
+const std::string parameters::_subtitle_encoding_default = "";
+const std::string parameters::_subtitle_font_default = "";
+const int parameters::_subtitle_size_default = -1;
+const float parameters::_subtitle_scale_default = -1.0f;
+const uint64_t parameters::_subtitle_color_default = std::numeric_limits<uint64_t>::max();
+// Per-Video parameter defaults
+const int parameters::_video_stream_default = 0;
+const int parameters::_audio_stream_default = 0;
+const int parameters::_subtitle_stream_default = -1;
+const parameters::stereo_layout_t parameters::_stereo_layout_default = layout_mono;
+const bool parameters::_stereo_layout_swap_default = false;
+const float parameters::_crop_aspect_ratio_default = 0.0f;
+const float parameters::_parallax_default = 0.0f;
+const float parameters::_ghostbust_default = 0.0f;
+const float parameters::_subtitle_parallax_default = 0.0f;
+// Volatile parameter defaults
+const bool parameters::_fullscreen_default = false;
+const bool parameters::_center_default = false;
+const float parameters::_audio_volume_default = 1.0f;
+const bool parameters::_audio_mute_default = false;
+
+std::string parameters::stereo_layout_to_string(stereo_layout_t stereo_layout, bool stereo_layout_swap)
+{
+ std::string s;
+ switch (stereo_layout) {
+ case layout_mono:
+ s = "mono";
+ break;
+ case layout_separate:
+ s = stereo_layout_swap ? "separate-right-left" : "separate-left-right";
+ break;
+ case layout_alternating:
+ s = stereo_layout_swap ? "alternating-right-left" : "alternating-left-right";
+ break;
+ case layout_top_bottom:
+ s = stereo_layout_swap ? "bottom-top" : "top-bottom";
+ break;
+ case layout_top_bottom_half:
+ s = stereo_layout_swap ? "bottom-top-half" : "top-bottom-half";
+ break;
+ case layout_left_right:
+ s = stereo_layout_swap ? "right-left" : "left-right";
+ break;
+ case layout_left_right_half:
+ s = stereo_layout_swap ? "right-left-half" : "left-right-half";
+ break;
+ case layout_even_odd_rows:
+ s = stereo_layout_swap ? "odd-even-rows" : "even-odd-rows";
+ break;
+ }
+ return s;
+}
+
+void parameters::stereo_layout_from_string(const std::string &s, stereo_layout_t &stereo_layout, bool &stereo_layout_swap)
+{
+ if (s == "mono") {
+ stereo_layout = layout_mono;
+ stereo_layout_swap = false;
+ } else if (s == "separate-right-left") {
+ stereo_layout = layout_separate;
+ stereo_layout_swap = true;
+ } else if (s == "separate-left-right") {
+ stereo_layout = layout_separate;
+ stereo_layout_swap = false;
+ } else if (s == "alternating-right-left") {
+ stereo_layout = layout_alternating;
+ stereo_layout_swap = true;
+ } else if (s == "alternating-left-right") {
+ stereo_layout = layout_alternating;
+ stereo_layout_swap = false;
+ } else if (s == "bottom-top") {
+ stereo_layout = layout_top_bottom;
+ stereo_layout_swap = true;
+ } else if (s == "top-bottom") {
+ stereo_layout = layout_top_bottom;
+ stereo_layout_swap = false;
+ } else if (s == "bottom-top-half") {
+ stereo_layout = layout_top_bottom_half;
+ stereo_layout_swap = true;
+ } else if (s == "top-bottom-half") {
+ stereo_layout = layout_top_bottom_half;
+ stereo_layout_swap = false;
+ } else if (s == "right-left") {
+ stereo_layout = layout_left_right;
+ stereo_layout_swap = true;
+ } else if (s == "left-right") {
+ stereo_layout = layout_left_right;
+ stereo_layout_swap = false;
+ } else if (s == "right-left-half") {
+ stereo_layout = layout_left_right_half;
+ stereo_layout_swap = true;
+ } else if (s == "left-right-half") {
+ stereo_layout = layout_left_right_half;
+ stereo_layout_swap = false;
+ } else if (s == "odd-even-rows") {
+ stereo_layout = layout_even_odd_rows;
+ stereo_layout_swap = true;
+ } else if (s == "even-odd-rows") {
+ stereo_layout = layout_even_odd_rows;
+ stereo_layout_swap = false;
+ } else {
+ // safe fallback
+ stereo_layout = layout_mono;
+ stereo_layout_swap = false;
+ }
+}
+
+std::string parameters::stereo_mode_to_string(stereo_mode_t stereo_mode, bool stereo_mode_swap)
+{
+ std::string s;
+ switch (stereo_mode) {
+ case mode_stereo:
+ s = "stereo";
+ break;
+ case mode_alternating:
+ s = "alternating";
+ break;
+ case mode_mono_left:
+ s = "mono-left";
+ break;
+ case mode_mono_right:
+ s = "mono-right";
+ break;
+ case mode_top_bottom:
+ s = "top-bottom";
+ break;
+ case mode_top_bottom_half:
+ s = "top-bottom-half";
+ break;
+ case mode_left_right:
+ s = "left-right";
+ break;
+ case mode_left_right_half:
+ s = "left-right-half";
+ break;
+ case mode_even_odd_rows:
+ s = "even-odd-rows";
+ break;
+ case mode_even_odd_columns:
+ s = "even-odd-columns";
+ break;
+ case mode_checkerboard:
+ s = "checkerboard";
+ break;
+ case mode_hdmi_frame_pack:
+ s = "hdmi-frame-pack";
+ break;
+ case mode_red_cyan_monochrome:
+ s = "red-cyan-monochrome";
+ break;
+ case mode_red_cyan_half_color:
+ s = "red-cyan-half-color";
+ break;
+ case mode_red_cyan_full_color:
+ s = "red-cyan-full-color";
+ break;
+ case mode_red_cyan_dubois:
+ s = "red-cyan-dubois";
+ break;
+ case mode_green_magenta_monochrome:
+ s = "green-magenta-monochrome";
+ break;
+ case mode_green_magenta_half_color:
+ s = "green-magenta-half-color";
+ break;
+ case mode_green_magenta_full_color:
+ s = "green-magenta-full-color";
+ break;
+ case mode_green_magenta_dubois:
+ s = "green-magenta-dubois";
+ break;
+ case mode_amber_blue_monochrome:
+ s = "amber-blue-monochrome";
+ break;
+ case mode_amber_blue_half_color:
+ s = "amber-blue-half-color";
+ break;
+ case mode_amber_blue_dubois:
+ s = "amber-blue-dubois";
+ break;
+ case mode_amber_blue_full_color:
+ s = "amber-blue-full-color";
+ break;
+ case mode_red_green_monochrome:
+ s = "red-green-monochrome";
+ break;
+ case mode_red_blue_monochrome:
+ s = "red-blue-monochrome";
+ break;
+ }
+ if (stereo_mode_swap) {
+ s += "-swap";
+ }
+ return s;
+}
+
+void parameters::stereo_mode_from_string(const std::string &s, stereo_mode_t &stereo_mode, bool &stereo_mode_swap)
+{
+ size_t x = s.find_last_of("-");
+ std::string t;
+ if (x != std::string::npos && s.substr(x) == "-swap") {
+ t = s.substr(0, x);
+ stereo_mode_swap = true;
+ } else {
+ t = s;
+ stereo_mode_swap = false;
+ } if (t == "stereo") {
+ stereo_mode = mode_stereo;
+ } else if (t == "alternating") {
+ stereo_mode = mode_alternating;
+ } else if (t == "mono-left") {
+ stereo_mode = mode_mono_left;
+ } else if (t == "mono-right") {
+ stereo_mode = mode_mono_right;
+ } else if (t == "top-bottom") {
+ stereo_mode = mode_top_bottom;
+ } else if (t == "top-bottom-half") {
+ stereo_mode = mode_top_bottom_half;
+ } else if (t == "left-right") {
+ stereo_mode = mode_left_right;
+ } else if (t == "left-right-half") {
+ stereo_mode = mode_left_right_half;
+ } else if (t == "even-odd-rows") {
+ stereo_mode = mode_even_odd_rows;
+ } else if (t == "even-odd-columns") {
+ stereo_mode = mode_even_odd_columns;
+ } else if (t == "checkerboard") {
+ stereo_mode = mode_checkerboard;
+ } else if (t == "hdmi-frame-pack") {
+ stereo_mode = mode_hdmi_frame_pack;
+ } else if (t == "red-cyan-monochrome") {
+ stereo_mode = mode_red_cyan_monochrome;
+ } else if (t == "red-cyan-half-color") {
+ stereo_mode = mode_red_cyan_half_color;
+ } else if (t == "red-cyan-full-color") {
+ stereo_mode = mode_red_cyan_full_color;
+ } else if (t == "red-cyan-dubois") {
+ stereo_mode = mode_red_cyan_dubois;
+ } else if (t == "green-magenta-monochrome") {
+ stereo_mode = mode_green_magenta_monochrome;
+ } else if (t == "green-magenta-half-color") {
+ stereo_mode = mode_green_magenta_half_color;
+ } else if (t == "green-magenta-full-color") {
+ stereo_mode = mode_green_magenta_full_color;
+ } else if (t == "green-magenta-dubois") {
+ stereo_mode = mode_green_magenta_dubois;
+ } else if (t == "amber-blue-monochrome") {
+ stereo_mode = mode_amber_blue_monochrome;
+ } else if (t == "amber-blue-half-color") {
+ stereo_mode = mode_amber_blue_half_color;
+ } else if (t == "amber-blue-full-color") {
+ stereo_mode = mode_amber_blue_full_color;
+ } else if (t == "amber-blue-dubois") {
+ stereo_mode = mode_amber_blue_dubois;
+ } else if (t == "red-green-monochrome") {
+ stereo_mode = mode_red_green_monochrome;
+ } else if (t == "red-blue-monochrome") {
+ stereo_mode = mode_red_blue_monochrome;
+ } else {
+ // safe fallback
+ stereo_mode = mode_mono_left;
+ }
+}
+
+std::string parameters::loop_mode_to_string(loop_mode_t loop_mode)
+{
+ if (loop_mode == loop_current) {
+ return "loop-current";
+ } else {
+ return "no-loop";
+ }
+}
+
+parameters::loop_mode_t parameters::loop_mode_from_string(const std::string &s)
+{
+ if (s == "loop-current") {
+ return loop_current;
+ } else {
+ return no_loop;
+ }
+}
+
+void parameters::save(std::ostream &os) const
+{
+ // Invariant parameters
+ s11n::save(os, static_cast<int>(_log_level));
+ s11n::save(os, _log_level_set);
+ s11n::save(os, _benchmark);
+ s11n::save(os, _benchmark_set);
+ s11n::save(os, _swap_interval);
+ s11n::save(os, _swap_interval_set);
+ // Per-Session parameters
+ s11n::save(os, _audio_device);
+ s11n::save(os, _audio_device_set);
+ s11n::save(os, static_cast<int>(_stereo_mode));
+ s11n::save(os, _stereo_mode_set);
+ s11n::save(os, _stereo_mode_swap);
+ s11n::save(os, _stereo_mode_swap_set);
+ s11n::save(os, _crosstalk_r);
+ s11n::save(os, _crosstalk_r_set);
+ s11n::save(os, _crosstalk_g);
+ s11n::save(os, _crosstalk_g_set);
+ s11n::save(os, _crosstalk_b);
+ s11n::save(os, _crosstalk_b_set);
+ s11n::save(os, _fullscreen_screens);
+ s11n::save(os, _fullscreen_screens_set);
+ s11n::save(os, _fullscreen_flip_left);
+ s11n::save(os, _fullscreen_flip_left_set);
+ s11n::save(os, _fullscreen_flop_left);
+ s11n::save(os, _fullscreen_flop_left_set);
+ s11n::save(os, _fullscreen_flip_right);
+ s11n::save(os, _fullscreen_flip_right_set);
+ s11n::save(os, _fullscreen_flop_right);
+ s11n::save(os, _fullscreen_flop_right_set);
+ s11n::save(os, _fullscreen_inhibit_screensaver);
+ s11n::save(os, _fullscreen_inhibit_screensaver_set);
+ s11n::save(os, _contrast);
+ s11n::save(os, _contrast_set);
+ s11n::save(os, _brightness);
+ s11n::save(os, _brightness_set);
+ s11n::save(os, _hue);
+ s11n::save(os, _hue_set);
+ s11n::save(os, _saturation);
+ s11n::save(os, _saturation_set);
+ s11n::save(os, _zoom);
+ s11n::save(os, _zoom_set);
+ s11n::save(os, static_cast<int>(_loop_mode));
+ s11n::save(os, _loop_mode_set);
+ s11n::save(os, _audio_delay);
+ s11n::save(os, _audio_delay_set);
+ s11n::save(os, _subtitle_encoding);
+ s11n::save(os, _subtitle_encoding_set);
+ s11n::save(os, _subtitle_font);
+ s11n::save(os, _subtitle_font_set);
+ s11n::save(os, _subtitle_size);
+ s11n::save(os, _subtitle_size_set);
+ s11n::save(os, _subtitle_scale);
+ s11n::save(os, _subtitle_scale_set);
+ s11n::save(os, _subtitle_color);
+ s11n::save(os, _subtitle_color_set);
+ // Per-Video parameters
+ s11n::save(os, _video_stream);
+ s11n::save(os, _video_stream_set);
+ s11n::save(os, _audio_stream);
+ s11n::save(os, _audio_stream_set);
+ s11n::save(os, _subtitle_stream);
+ s11n::save(os, _subtitle_stream_set);
+ s11n::save(os, static_cast<int>(_stereo_layout));
+ s11n::save(os, _stereo_layout_set);
+ s11n::save(os, _stereo_layout_swap);
+ s11n::save(os, _stereo_layout_swap_set);
+ s11n::save(os, _crop_aspect_ratio);
+ s11n::save(os, _crop_aspect_ratio_set);
+ s11n::save(os, _parallax);
+ s11n::save(os, _parallax_set);
+ s11n::save(os, _ghostbust);
+ s11n::save(os, _ghostbust_set);
+ s11n::save(os, _subtitle_parallax);
+ s11n::save(os, _subtitle_parallax_set);
+ // Volatile parameters
+ s11n::save(os, _fullscreen);
+ s11n::save(os, _fullscreen_set);
+ s11n::save(os, _center);
+ s11n::save(os, _center_set);
+ s11n::save(os, _audio_volume);
+ s11n::save(os, _audio_volume_set);
+ s11n::save(os, _audio_mute);
+ s11n::save(os, _audio_mute_set);
+}
+
+void parameters::load(std::istream &is)
+{
+ int x;
+ // Invariant parameters
+ s11n::load(is, x); _log_level = static_cast<msg::level_t>(x);
+ s11n::load(is, _log_level_set);
+ s11n::load(is, _benchmark);
+ s11n::load(is, _benchmark_set);
+ s11n::load(is, _swap_interval);
+ s11n::load(is, _swap_interval_set);
+ // Per-Session parameters
+ s11n::load(is, _audio_device);
+ s11n::load(is, _audio_device_set);
+ s11n::load(is, x); _stereo_mode = static_cast<stereo_mode_t>(x);
+ s11n::load(is, _stereo_mode_set);
+ s11n::load(is, _stereo_mode_swap);
+ s11n::load(is, _stereo_mode_swap_set);
+ s11n::load(is, _crosstalk_r);
+ s11n::load(is, _crosstalk_r_set);
+ s11n::load(is, _crosstalk_g);
+ s11n::load(is, _crosstalk_g_set);
+ s11n::load(is, _crosstalk_b);
+ s11n::load(is, _crosstalk_b_set);
+ s11n::load(is, _fullscreen_screens);
+ s11n::load(is, _fullscreen_screens_set);
+ s11n::load(is, _fullscreen_flip_left);
+ s11n::load(is, _fullscreen_flip_left_set);
+ s11n::load(is, _fullscreen_flop_left);
+ s11n::load(is, _fullscreen_flop_left_set);
+ s11n::load(is, _fullscreen_flip_right);
+ s11n::load(is, _fullscreen_flip_right_set);
+ s11n::load(is, _fullscreen_flop_right);
+ s11n::load(is, _fullscreen_flop_right_set);
+ s11n::load(is, _fullscreen_inhibit_screensaver);
+ s11n::load(is, _fullscreen_inhibit_screensaver_set);
+ s11n::load(is, _contrast);
+ s11n::load(is, _contrast_set);
+ s11n::load(is, _brightness);
+ s11n::load(is, _brightness_set);
+ s11n::load(is, _hue);
+ s11n::load(is, _hue_set);
+ s11n::load(is, _saturation);
+ s11n::load(is, _saturation_set);
+ s11n::load(is, _zoom);
+ s11n::load(is, _zoom_set);
+ s11n::load(is, x); _loop_mode = static_cast<loop_mode_t>(x);
+ s11n::load(is, _loop_mode_set);
+ s11n::load(is, _audio_delay);
+ s11n::load(is, _audio_delay_set);
+ s11n::load(is, _subtitle_encoding);
+ s11n::load(is, _subtitle_encoding_set);
+ s11n::load(is, _subtitle_font);
+ s11n::load(is, _subtitle_font_set);
+ s11n::load(is, _subtitle_size);
+ s11n::load(is, _subtitle_size_set);
+ s11n::load(is, _subtitle_scale);
+ s11n::load(is, _subtitle_scale_set);
+ s11n::load(is, _subtitle_color);
+ s11n::load(is, _subtitle_color_set);
+ // Per-Video parameters
+ s11n::load(is, _video_stream);
+ s11n::load(is, _video_stream_set);
+ s11n::load(is, _audio_stream);
+ s11n::load(is, _audio_stream_set);
+ s11n::load(is, _subtitle_stream);
+ s11n::load(is, _subtitle_stream_set);
+ s11n::load(is, x); _stereo_layout = static_cast<stereo_layout_t>(x);
+ s11n::load(is, _stereo_layout_set);
+ s11n::load(is, _stereo_layout_swap);
+ s11n::load(is, _stereo_layout_swap_set);
+ s11n::load(is, _crop_aspect_ratio);
+ s11n::load(is, _crop_aspect_ratio_set);
+ s11n::load(is, _parallax);
+ s11n::load(is, _parallax_set);
+ s11n::load(is, _ghostbust);
+ s11n::load(is, _ghostbust_set);
+ s11n::load(is, _subtitle_parallax);
+ s11n::load(is, _subtitle_parallax_set);
+ // Volatile parameters
+ s11n::load(is, _fullscreen);
+ s11n::load(is, _fullscreen_set);
+ s11n::load(is, _center);
+ s11n::load(is, _center_set);
+ s11n::load(is, _audio_volume);
+ s11n::load(is, _audio_volume_set);
+ s11n::load(is, _audio_mute);
+ s11n::load(is, _audio_mute_set);
+}
+
+std::string parameters::save_session_parameters() const
+{
+ std::stringstream oss;
+ if (!audio_device_is_default())
+ s11n::save(oss, "audio_device", audio_device());
+ if (!stereo_mode_is_default() || !stereo_mode_swap_is_default())
+ s11n::save(oss, "stereo_mode", stereo_mode_to_string(stereo_mode(), stereo_mode_swap()));
+ if (!crosstalk_r_is_default())
+ s11n::save(oss, "crosstalk_r", crosstalk_r());
+ if (!crosstalk_g_is_default())
+ s11n::save(oss, "crosstalk_g", crosstalk_g());
+ if (!crosstalk_b_is_default())
+ s11n::save(oss, "crosstalk_b", crosstalk_b());
+ if (!fullscreen_screens_is_default())
+ s11n::save(oss, "fullscreen_screens", fullscreen_screens());
+ if (!fullscreen_flip_left_is_default())
+ s11n::save(oss, "fullscreen_flip_left", fullscreen_flip_left());
+ if (!fullscreen_flop_left_is_default())
+ s11n::save(oss, "fullscreen_flop_left", fullscreen_flop_left());
+ if (!fullscreen_flip_right_is_default())
+ s11n::save(oss, "fullscreen_flip_right", fullscreen_flip_right());
+ if (!fullscreen_flop_right_is_default())
+ s11n::save(oss, "fullscreen_flop_right", fullscreen_flop_right());
+ if (!fullscreen_inhibit_screensaver_is_default())
+ s11n::save(oss, "fullscreen_inhibit_screensaver", fullscreen_inhibit_screensaver());
+ if (!contrast_is_default())
+ s11n::save(oss, "contrast", contrast());
+ if (!brightness_is_default())
+ s11n::save(oss, "brightness", brightness());
+ if (!hue_is_default())
+ s11n::save(oss, "hue", hue());
+ if (!saturation_is_default())
+ s11n::save(oss, "saturation", saturation());
+ if (!zoom_is_default())
+ s11n::save(oss, "zoom", zoom());
+ if (!loop_mode_is_default())
+ s11n::save(oss, "loop_mode", loop_mode_to_string(loop_mode()));
+ if (!audio_delay_is_default())
+ s11n::save(oss, "audio_delay", audio_delay());
+ if (!subtitle_encoding_is_default())
+ s11n::save(oss, "subtitle_encoding", _subtitle_encoding);
+ if (!subtitle_font_is_default())
+ s11n::save(oss, "subtitle_font", _subtitle_font);
+ if (!subtitle_size_is_default())
+ s11n::save(oss, "subtitle_size", _subtitle_size);
+ if (!subtitle_scale_is_default())
+ s11n::save(oss, "subtitle_scale", _subtitle_scale);
+ if (!subtitle_color_is_default())
+ s11n::save(oss, "subtitle_color", _subtitle_color);
+ return oss.str();
+}
+
+void parameters::load_session_parameters(const std::string &s)
+{
+ std::istringstream iss(s);
+ std::string name, value;
+ while (iss.good()) {
+ s11n::load(iss, name, value);
+ if (name == "audio_device") {
+ s11n::load(value, _audio_device);
+ _audio_device_set = true;
+ } else if (name == "stereo_mode") {
+ std::string s;
+ s11n::load(value, s);
+ stereo_mode_from_string(s, _stereo_mode, _stereo_mode_swap);
+ _stereo_mode_set = true;
+ _stereo_mode_swap_set = true;
+ } else if (name == "crosstalk_r") {
+ s11n::load(value, _crosstalk_r);
+ _crosstalk_r_set = true;
+ } else if (name == "crosstalk_g") {
+ s11n::load(value, _crosstalk_g);
+ _crosstalk_g_set = true;
+ } else if (name == "crosstalk_b") {
+ s11n::load(value, _crosstalk_b);
+ _crosstalk_b_set = true;
+ } else if (name == "fullscreen_screens") {
+ s11n::load(value, _fullscreen_screens);
+ _fullscreen_screens_set = true;
+ } else if (name == "fullscreen_flip_left") {
+ s11n::load(value, _fullscreen_flip_left);
+ _fullscreen_flip_left_set = true;
+ } else if (name == "fullscreen_flop_left") {
+ s11n::load(value, _fullscreen_flop_left);
+ _fullscreen_flop_left_set = true;
+ } else if (name == "fullscreen_flip_right") {
+ s11n::load(value, _fullscreen_flip_right);
+ _fullscreen_flip_right_set = true;
+ } else if (name == "fullscreen_flop_right") {
+ s11n::load(value, _fullscreen_flop_right);
+ _fullscreen_flop_right_set = true;
+ } else if (name == "fullscreen_inhibit_screensaver") {
+ s11n::load(value, _fullscreen_inhibit_screensaver);
+ _fullscreen_inhibit_screensaver_set = true;
+ } else if (name == "contrast") {
+ s11n::load(value, _contrast);
+ _contrast_set = true;
+ } else if (name == "brightness") {
+ s11n::load(value, _brightness);
+ _brightness_set = true;
+ } else if (name == "hue") {
+ s11n::load(value, _hue);
+ _hue_set = true;
+ } else if (name == "saturation") {
+ s11n::load(value, _saturation);
+ _saturation_set = true;
+ } else if (name == "zoom") {
+ s11n::load(value, _zoom);
+ _zoom_set = true;
+ } else if (name == "loop_mode") {
+ std::string s;
+ s11n::load(value, s);
+ _loop_mode = loop_mode_from_string(s);
+ _loop_mode_set = true;
+ } else if (name == "audio_delay") {
+ s11n::load(value, _audio_delay);
+ _audio_delay_set = true;
+ } else if (name == "subtitle_encoding") {
+ s11n::load(value, _subtitle_encoding);
+ _subtitle_encoding_set = true;
+ } else if (name == "subtitle_font") {
+ s11n::load(value, _subtitle_font);
+ _subtitle_font_set = true;
+ } else if (name == "subtitle_size") {
+ s11n::load(value, _subtitle_size);
+ _subtitle_size_set = true;
+ } else if (name == "subtitle_scale") {
+ s11n::load(value, _subtitle_scale);
+ _subtitle_scale_set = true;
+ } else if (name == "subtitle_color") {
+ s11n::load(value, _subtitle_color);
+ _subtitle_color_set = true;
+ }
+ }
+}
+
+void parameters::unset_video_parameters()
+{
+ unset_video_stream();
+ unset_audio_stream();
+ unset_subtitle_stream();
+ unset_stereo_layout();
+ unset_stereo_layout_swap();
+ unset_crop_aspect_ratio();
+ unset_parallax();
+ unset_ghostbust();
+ unset_subtitle_parallax();
+}
+
+std::string parameters::save_video_parameters() const
+{
+ std::stringstream oss;
+ if (!video_stream_is_default())
+ s11n::save(oss, "video_stream", _video_stream);
+ if (!audio_stream_is_default())
+ s11n::save(oss, "audio_stream", _audio_stream);
+ if (!subtitle_stream_is_default())
+ s11n::save(oss, "subtitle_stream", _subtitle_stream);
+ if (!stereo_layout_is_default() || !stereo_layout_swap_is_default())
+ s11n::save(oss, "stereo_layout", stereo_layout_to_string(stereo_layout(), stereo_layout_swap()));
+ if (!crop_aspect_ratio_is_default())
+ s11n::save(oss, "crop_aspect_ratio", _crop_aspect_ratio);
+ if (!parallax_is_default())
+ s11n::save(oss, "parallax", _parallax);
+ if (!ghostbust_is_default())
+ s11n::save(oss, "ghostbust", _ghostbust);
+ if (!subtitle_parallax_is_default())
+ s11n::save(oss, "subtitle_parallax", _subtitle_parallax);
+ return oss.str();
+}
+
+void parameters::load_video_parameters(const std::string &s)
+{
+ std::istringstream iss(s);
+ std::string name, value;
+ while (iss.good()) {
+ s11n::load(iss, name, value);
+ if (name == "video_stream") {
+ s11n::load(value, _video_stream);
+ _video_stream_set = true;
+ } else if (name == "audio_stream") {
+ s11n::load(value, _audio_stream);
+ _audio_stream_set = true;
+ } else if (name == "subtitle_stream") {
+ s11n::load(value, _subtitle_stream);
+ _subtitle_stream_set = true;
+ } else if (name == "stereo_layout") {
+ std::string s;
+ s11n::load(value, s);
+ stereo_layout_from_string(s, _stereo_layout, _stereo_layout_swap);
+ _stereo_layout_set = true;
+ _stereo_layout_swap_set = true;
+ } else if (name == "crop_aspect_ratio") {
+ s11n::load(value, _crop_aspect_ratio);
+ _crop_aspect_ratio_set = true;
+ } else if (name == "parallax") {
+ s11n::load(value, _parallax);
+ _parallax_set = true;
+ } else if (name == "ghostbust") {
+ s11n::load(value, _ghostbust);
+ _ghostbust_set = true;
+ } else if (name == "subtitle_parallax") {
+ s11n::load(value, _subtitle_parallax);
+ _subtitle_parallax_set = true;
+ }
+ }
+}
+
+
 video_frame::video_frame() :
 raw_width(-1),
 raw_height(-1),
@@ -76,7 +817,7 @@
 color_space(srgb),
 value_range(u8_full),
 chroma_location(center),
- stereo_layout(mono),
+ stereo_layout(parameters::layout_mono),
 stereo_layout_swap(false),
 presentation_time(std::numeric_limits<int64_t>::min())
 {
@@ -95,25 +836,25 @@
 width = raw_width;
 height = raw_height;
 aspect_ratio = raw_aspect_ratio;
- if (stereo_layout == left_right)
+ if (stereo_layout == parameters::layout_left_right)
 {
 width /= 2;
 aspect_ratio /= 2.0f;
 }
- else if (stereo_layout == left_right_half)
+ else if (stereo_layout == parameters::layout_left_right_half)
 {
 width /= 2;
 }
- else if (stereo_layout == top_bottom)
+ else if (stereo_layout == parameters::layout_top_bottom)
 {
 height /= 2;
 aspect_ratio *= 2.0f;
 }
- else if (stereo_layout == top_bottom_half)
+ else if (stereo_layout == parameters::layout_top_bottom_half)
 {
 height /= 2;
 }
- else if (stereo_layout == even_odd_rows)
+ else if (stereo_layout == parameters::layout_even_odd_rows)
 {
 height /= 2;
 //aspect_ratio *= 2.0f;
@@ -122,111 +863,6 @@
 }
 }
 
-std::string video_frame::stereo_layout_to_string(stereo_layout_t stereo_layout, bool stereo_layout_swap)
-{
- std::string s;
- switch (stereo_layout)
- {
- case mono:
- s = "mono";
- break;
- case separate:
- s = stereo_layout_swap ? "separate-right-left" : "separate-left-right";
- break;
- case top_bottom:
- s = stereo_layout_swap ? "bottom-top" : "top-bottom";
- break;
- case top_bottom_half:
- s = stereo_layout_swap ? "bottom-top-half" : "top-bottom-half";
- break;
- case left_right:
- s = stereo_layout_swap ? "right-left" : "left-right";
- break;
- case left_right_half:
- s = stereo_layout_swap ? "right-left-half" : "left-right-half";
- break;
- case even_odd_rows:
- s = stereo_layout_swap ? "odd-even-rows" : "even-odd-rows";
- break;
- }
- return s;
-}
-
-void video_frame::stereo_layout_from_string(const std::string &s, stereo_layout_t &stereo_layout, bool &stereo_layout_swap)
-{
- if (s == "mono")
- {
- stereo_layout = mono;
- stereo_layout_swap = false;
- }
- else if (s == "separate-right-left")
- {
- stereo_layout = separate;
- stereo_layout_swap = true;
- }
- else if (s == "separate-left-right")
- {
- stereo_layout = separate;
- stereo_layout_swap = false;
- }
- else if (s == "bottom-top")
- {
- stereo_layout = top_bottom;
- stereo_layout_swap = true;
- }
- else if (s == "top-bottom")
- {
- stereo_layout = top_bottom;
- stereo_layout_swap = false;
- }
- else if (s == "bottom-top-half")
- {
- stereo_layout = top_bottom_half;
- stereo_layout_swap = true;
- }
- else if (s == "top-bottom-half")
- {
- stereo_layout = top_bottom_half;
- stereo_layout_swap = false;
- }
- else if (s == "right-left")
- {
- stereo_layout = left_right;
- stereo_layout_swap = true;
- }
- else if (s == "left-right")
- {
- stereo_layout = left_right;
- stereo_layout_swap = false;
- }
- else if (s == "right-left-half")
- {
- stereo_layout = left_right_half;
- stereo_layout_swap = true;
- }
- else if (s == "left-right-half")
- {
- stereo_layout = left_right_half;
- stereo_layout_swap = false;
- }
- else if (s == "odd-even-rows")
- {
- stereo_layout = even_odd_rows;
- stereo_layout_swap = true;
- }
- else if (s == "even-odd-rows")
- {
- stereo_layout = even_odd_rows;
- stereo_layout_swap = false;
- }
- else
- {
- // safe fallback
- stereo_layout = mono;
- stereo_layout_swap = false;
- }
-}
-
 std::string video_frame::format_name() const
 {
 std::string name = str::asprintf("%dx%d-%.3g:1-", raw_width, raw_height, raw_aspect_ratio);
@@ -267,6 +903,12 @@
 case u8_mpeg:
 name += "-mpeg";
 break;
+ case u10_full:
+ name += "-jpeg10";
+ break;
+ case u10_mpeg:
+ name += "-mpeg10";
+ break;
 }
 }
 if (layout == yuv422p || layout == yuv420p)
@@ -307,18 +949,19 @@
 size_t dst_row_width = 0;
 size_t dst_row_size = 0;
 size_t lines = 0;
+ size_t type_size = (value_range == u8_full || value_range == u8_mpeg) ? 1 : 2;
 
 switch (layout)
 {
 case bgra32:
 dst_row_width = width * 4;
- dst_row_size = dst_row_width;
+ dst_row_size = dst_row_width * type_size;
 lines = height;
 break;
 
 case yuv444p:
 dst_row_width = width;
- dst_row_size = next_multiple_of_4(dst_row_width);
+ dst_row_size = next_multiple_of_4(dst_row_width * type_size);
 lines = height;
 break;
 
@@ -326,13 +969,13 @@
 if (plane == 0)
 {
 dst_row_width = width;
- dst_row_size = next_multiple_of_4(dst_row_width);
+ dst_row_size = next_multiple_of_4(dst_row_width * type_size);
 lines = height;
 }
 else
 {
 dst_row_width = width / 2;
- dst_row_size = next_multiple_of_4(dst_row_width);
+ dst_row_size = next_multiple_of_4(dst_row_width * type_size);
 lines = height;
 }
 break;
@@ -341,13 +984,13 @@
 if (plane == 0)
 {
 dst_row_width = width;
- dst_row_size = next_multiple_of_4(dst_row_width);
+ dst_row_size = next_multiple_of_4(dst_row_width * type_size);
 lines = height;
 }
 else
 {
 dst_row_width = width / 2;
- dst_row_size = next_multiple_of_4(dst_row_width);
+ dst_row_size = next_multiple_of_4(dst_row_width * type_size);
 lines = height / 2;
 }
 break;
@@ -359,35 +1002,37 @@
 }
 switch (stereo_layout)
 {
- case mono:
+ case parameters::layout_mono:
 src = static_cast<const char *>(data[0][plane]);
 src_row_size = line_size[0][plane];
 src_offset = 0;
 break;
- case separate:
+ case parameters::layout_separate:
+ case parameters::layout_alternating:
 src = static_cast<const char *>(data[view][plane]);
 src_row_size = line_size[view][plane];
 src_offset = 0;
 break;
- case top_bottom:
- case top_bottom_half:
+ case parameters::layout_top_bottom:
+ case parameters::layout_top_bottom_half:
 src = static_cast<const char *>(data[0][plane]);
 src_row_size = line_size[0][plane];
 src_offset = view * lines * src_row_size;
 break;
- case left_right:
- case left_right_half:
+ case parameters::layout_left_right:
+ case parameters::layout_left_right_half:
 src = static_cast<const char *>(data[0][plane]);
 src_row_size = line_size[0][plane];
 src_offset = view * dst_row_width;
 break;
- case even_odd_rows:
+ case parameters::layout_even_odd_rows:
 src = static_cast<const char *>(data[0][plane]);
 src_row_size = 2 * line_size[0][plane];
 src_offset = view * line_size[0][plane];
 break;
 }
 
+ assert(src);
 if (src_row_size == dst_row_size)
 {
 std::memcpy(dst, src + src_offset, lines * src_row_size);
@@ -397,7 +1042,7 @@
 size_t dst_offset = 0;
 for (size_t y = 0; y < lines; y++)
 {
- std::memcpy(dst + dst_offset, src + src_offset, dst_row_width);
+ std::memcpy(dst + dst_offset, src + src_offset, dst_row_width * type_size);
 dst_offset += dst_row_size;
 src_offset += src_row_size;
 }
@@ -552,380 +1197,3 @@
 s11n::load(is, presentation_start_time);
 s11n::load(is, presentation_stop_time);
 }
-
-parameters::parameters() :
- stereo_mode(stereo),
- stereo_mode_swap(false),
- parallax(std::numeric_limits<float>::quiet_NaN()),
- crosstalk_r(std::numeric_limits<float>::quiet_NaN()),
- crosstalk_g(std::numeric_limits<float>::quiet_NaN()),
- crosstalk_b(std::numeric_limits<float>::quiet_NaN()),
- ghostbust(std::numeric_limits<float>::quiet_NaN()),
- contrast(std::numeric_limits<float>::quiet_NaN()),
- brightness(std::numeric_limits<float>::quiet_NaN()),
- hue(std::numeric_limits<float>::quiet_NaN()),
- saturation(std::numeric_limits<float>::quiet_NaN()),
- subtitle_encoding(1, '\0'),
- subtitle_font(1, '\0'),
- subtitle_size(std::numeric_limits<int>::min()),
- subtitle_scale(-1.0f),
- subtitle_color(std::numeric_limits<uint64_t>::max()),
- subtitle_parallax(std::numeric_limits<float>::quiet_NaN()),
- loop_mode(no_loop),
- fullscreen_screens(-1),
- fullscreen_flip_left(-1),
- fullscreen_flop_left(-1),
- fullscreen_flip_right(-1),
- fullscreen_flop_right(-1)
-{
-}
-
-void parameters::set_defaults()
-{
- if (!std::isfinite(parallax) || parallax < -1.0f || parallax > +1.0f)
- {
- parallax = 0.0f;
- }
- if (!std::isfinite(crosstalk_r) || crosstalk_r < 0.0f || crosstalk_r > +1.0f)
- {
- crosstalk_r = 0.0f;
- }
- if (!std::isfinite(crosstalk_g) || crosstalk_g < 0.0f || crosstalk_g > +1.0f)
- {
- crosstalk_g = 0.0f;
- }
- if (!std::isfinite(crosstalk_b) || crosstalk_b < 0.0f || crosstalk_b > +1.0f)
- {
- crosstalk_b = 0.0f;
- }
- if (!std::isfinite(ghostbust) || ghostbust < 0.0f || ghostbust > +1.0f)
- {
- ghostbust = 0.0f;
- }
- if (!std::isfinite(contrast) || contrast < -1.0f || contrast > +1.0f)
- {
- contrast = 0.0f;
- }
- if (!std::isfinite(brightness) || brightness < -1.0f || brightness > +1.0f)
- {
- brightness = 0.0f;
- }
- if (!std::isfinite(hue) || hue < -1.0f || hue > +1.0f)
- {
- hue = 0.0f;
- }
- if (!std::isfinite(saturation) || saturation < -1.0f || saturation > +1.0f)
- {
- saturation = 0.0f;
- }
- if (subtitle_encoding.length() == 1 && subtitle_encoding[0] == '\0')
- {
- subtitle_encoding = "";
- }
- if (subtitle_font.length() == 1 && subtitle_font[0] == '\0')
- {
- subtitle_font = "";
- }
- if (subtitle_size < -1)
- {
- subtitle_size = -1;
- }
- if (!std::isfinite(subtitle_scale) || subtitle_scale < 0.0f)
- {
- subtitle_scale = -1.0f;
- }
- if (subtitle_color > std::numeric_limits<uint32_t>::max())
- {
- subtitle_color = std::numeric_limits<uint64_t>::max();
- }
- if (!std::isfinite(subtitle_parallax) || subtitle_parallax < -1.0f || subtitle_parallax > +1.0f)
- {
- subtitle_parallax = 0.0f;
- }
- if (fullscreen_screens < 0)
- {
- fullscreen_screens = 0;
- }
- if (fullscreen_flip_left < 0)
- {
- fullscreen_flip_left = 0;
- }
- if (fullscreen_flop_left < 0)
- {
- fullscreen_flop_left = 0;
- }
- if (fullscreen_flip_right < 0)
- {
- fullscreen_flip_right = 0;
- }
- if (fullscreen_flop_right < 0)
- {
- fullscreen_flop_right = 0;
- }
-}
-
-std::string parameters::stereo_mode_to_string(stereo_mode_t stereo_mode, bool stereo_mode_swap)
-{
- std::string s;
- switch (stereo_mode)
- {
- case stereo:
- s = "stereo";
- break;
- case mono_left:
- s = "mono-left";
- break;
- case mono_right:
- s = "mono-right";
- break;
- case top_bottom:
- s = "top-bottom";
- break;
- case top_bottom_half:
- s = "top-bottom-half";
- break;
- case left_right:
- s = "left-right";
- break;
- case left_right_half:
- s = "left-right-half";
- break;
- case even_odd_rows:
- s = "even-odd-rows";
- break;
- case even_odd_columns:
- s = "even-odd-columns";
- break;
- case checkerboard:
- s = "checkerboard";
- break;
- case hdmi_frame_pack:
- s = "hdmi-frame-pack";
- break;
- case red_cyan_monochrome:
- s = "red-cyan-monochrome";
- break;
- case red_cyan_half_color:
- s = "red-cyan-half-color";
- break;
- case red_cyan_full_color:
- s = "red-cyan-full-color";
- break;
- case red_cyan_dubois:
- s = "red-cyan-dubois";
- break;
- case green_magenta_monochrome:
- s = "green-magenta-monochrome";
- break;
- case green_magenta_half_color:
- s = "green-magenta-half-color";
- break;
- case green_magenta_full_color:
- s = "green-magenta-full-color";
- break;
- case green_magenta_dubois:
- s = "green-magenta-dubois";
- break;
- case amber_blue_monochrome:
- s = "amber-blue-monochrome";
- break;
- case amber_blue_half_color:
- s = "amber-blue-half-color";
- break;
- case amber_blue_dubois:
- s = "amber-blue-dubois";
- break;
- case amber_blue_full_color:
- s = "amber-blue-full-color";
- break;
- case red_green_monochrome:
- s = "red-green-monochrome";
- break;
- case red_blue_monochrome:
- s = "red-blue-monochrome";
- break;
- }
- if (stereo_mode_swap)
- {
- s += "-swap";
- }
- return s;
-}
-
-void parameters::stereo_mode_from_string(const std::string &s, stereo_mode_t &stereo_mode, bool &stereo_mode_swap)
-{
- size_t x = s.find_last_of("-");
- std::string t;
- if (x != std::string::npos && s.substr(x) == "-swap")
- {
- t = s.substr(0, x);
- stereo_mode_swap = true;
- }
- else
- {
- t = s;
- stereo_mode_swap = false;
- }
- if (t == "stereo")
- {
- stereo_mode = stereo;
- }
- else if (t == "mono-left")
- {
- stereo_mode = mono_left;
- }
- else if (t == "mono-right")
- {
- stereo_mode = mono_right;
- }
- else if (t == "top-bottom")
- {
- stereo_mode = top_bottom;
- }
- else if (t == "top-bottom-half")
- {
- stereo_mode = top_bottom_half;
- }
- else if (t == "left-right")
- {
- stereo_mode = left_right;
- }
- else if (t == "left-right-half")
- {
- stereo_mode = left_right_half;
- }
- else if (t == "even-odd-rows")
- {
- stereo_mode = even_odd_rows;
- }
- else if (t == "even-odd-columns")
- {
- stereo_mode = even_odd_columns;
- }
- else if (t == "checkerboard")
- {
- stereo_mode = checkerboard;
- }
- else if (t == "hdmi-frame-pack")
- {
- stereo_mode = hdmi_frame_pack;
- }
- else if (t == "red-cyan-monochrome")
- {
- stereo_mode = red_cyan_monochrome;
- }
- else if (t == "red-cyan-half-color")
- {
- stereo_mode = red_cyan_half_color;
- }
- else if (t == "red-cyan-full-color")
- {
- stereo_mode = red_cyan_full_color;
- }
- else if (t == "red-cyan-dubois")
- {
- stereo_mode = red_cyan_dubois;
- }
- else if (t == "green-magenta-monochrome")
- {
- stereo_mode = green_magenta_monochrome;
- }
- else if (t == "green-magenta-half-color")
- {
- stereo_mode = green_magenta_half_color;
- }
- else if (t == "green-magenta-full-color")
- {
- stereo_mode = green_magenta_full_color;
- }
- else if (t == "green-magenta-dubois")
- {
- stereo_mode = green_magenta_dubois;
- }
- else if (t == "amber-blue-monochrome")
- {
- stereo_mode = amber_blue_monochrome;
- }
- else if (t == "amber-blue-half-color")
- {
- stereo_mode = amber_blue_half_color;
- }
- else if (t == "amber-blue-full-color")
- {
- stereo_mode = amber_blue_full_color;
- }
- else if (t == "amber-blue-dubois")
- {
- stereo_mode = amber_blue_dubois;
- }
- else if (t == "red-green-monochrome")
- {
- stereo_mode = red_green_monochrome;
- }
- else if (t == "red-blue-monochrome")
- {
- stereo_mode = red_blue_monochrome;
- }
- else
- {
- // safe fallback
- stereo_mode = mono_left;
- }
-}
-
-void parameters::save(std::ostream &os) const
-{
- s11n::save(os, static_cast<int>(stereo_mode));
- s11n::save(os, stereo_mode_swap);
- s11n::save(os, parallax);
- s11n::save(os, crosstalk_r);
- s11n::save(os, crosstalk_g);
- s11n::save(os, crosstalk_b);
- s11n::save(os, ghostbust);
- s11n::save(os, contrast);
- s11n::save(os, brightness);
- s11n::save(os, hue);
- s11n::save(os, saturation);
- s11n::save(os, subtitle_encoding);
- s11n::save(os, subtitle_font);
- s11n::save(os, subtitle_size);
- s11n::save(os, subtitle_scale);
- s11n::save(os, subtitle_color);
- s11n::save(os, subtitle_parallax);
- s11n::save(os, static_cast<int>(loop_mode));
- s11n::save(os, fullscreen_screens);
- s11n::save(os, fullscreen_flip_left);
- s11n::save(os, fullscreen_flop_left);
- s11n::save(os, fullscreen_flip_right);
- s11n::save(os, fullscreen_flop_right);
-}
-
-void parameters::load(std::istream &is)
-{
- int x;
- s11n::load(is, x);
- stereo_mode = static_cast<stereo_mode_t>(x);
- s11n::load(is, stereo_mode_swap);
- s11n::load(is, parallax);
- s11n::load(is, crosstalk_r);
- s11n::load(is, crosstalk_g);
- s11n::load(is, crosstalk_b);
- s11n::load(is, ghostbust);
- s11n::load(is, contrast);
- s11n::load(is, brightness);
- s11n::load(is, hue);
- s11n::load(is, saturation);
- s11n::load(is, subtitle_encoding);
- s11n::load(is, subtitle_font);
- s11n::load(is, subtitle_size);
- s11n::load(is, subtitle_scale);
- s11n::load(is, subtitle_color);
- s11n::load(is, subtitle_parallax);
- s11n::load(is, x);
- loop_mode = static_cast<loop_mode_t>(x);
- s11n::load(is, fullscreen_screens);
- s11n::load(is, fullscreen_flip_left);
- s11n::load(is, fullscreen_flop_left);
- s11n::load(is, fullscreen_flip_right);
- s11n::load(is, fullscreen_flop_right);
-}

bino-1.2.1.tar.bz2/src/media_data.h -> bino-1.3.2.tar.xz/src/media_data.h Changed

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

bino-1.2.1.tar.bz2/src/media_input.h -> bino-1.3.2.tar.xz/src/media_input.h Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010-2011
+ * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 * Joe <cuchac@email.cz>
 *
@@ -76,6 +76,11 @@
 
 /* Get information */
 
+ // The number of URLs (= the number of media objects)
+ size_t urls() const;
+ // Get the URL with the given index
+ const std::string &url(size_t i) const;
+
 // Identifier.
 const std::string &id() const;
 
@@ -174,9 +179,9 @@
 void select_subtitle_stream(int subtitle_stream);
 
 /* Check whether a stereo layout is supported by this input. */
- bool stereo_layout_is_supported(video_frame::stereo_layout_t layout, bool swap) const;
+ bool stereo_layout_is_supported(parameters::stereo_layout_t layout, bool swap) const;
 /* Set the stereo layout. It must be supported by the input. */
- void set_stereo_layout(video_frame::stereo_layout_t layout, bool swap);
+ void set_stereo_layout(parameters::stereo_layout_t layout, bool swap);
 
 /* Start to read a video frame from the active stream asynchronously
 * (in a separate thread). */

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

@@ -1,10 +1,11 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010-2011
+ * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <frederic.devernay@inrialpes.fr>
 * Joe <cuchac@email.cz>
+ * D. Matz <bandregent@yahoo.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
@@ -86,11 +87,16 @@
 struct ffmpeg_stuff *_ffmpeg;
 int _video_stream;
 video_frame _frame;
+ int _raw_frames;
 
 int64_t handle_timestamp(int64_t timestamp);
 
 public:
 video_decode_thread(const std::string &url, struct ffmpeg_stuff *ffmpeg, int video_stream);
+ void set_raw_frames(int raw_frames)
+ {
+ _raw_frames = raw_frames;
+ }
 void run();
 const video_frame &frame()
 {
@@ -158,15 +164,17 @@
 std::vector<int> video_streams;
 std::vector<AVCodecContext *> video_codec_ctxs;
 std::vector<video_frame> video_frame_templates;
- std::vector<struct SwsContext *> video_img_conv_ctxs;
+ std::vector<struct SwsContext *> video_sws_ctxs;
 std::vector<AVCodec *> video_codecs;
 std::vector<std::deque<AVPacket> > video_packet_queues;
 std::vector<mutex> video_packet_queue_mutexes;
 std::vector<AVPacket> video_packets;
 std::vector<video_decode_thread> video_decode_threads;
 std::vector<AVFrame *> video_frames;
- std::vector<AVFrame *> video_out_frames;
+ std::vector<AVFrame *> video_buffered_frames;
 std::vector<uint8_t *> video_buffers;
+ std::vector<AVFrame *> video_sws_frames;
+ std::vector<uint8_t *> video_sws_buffers;
 std::vector<int64_t> video_last_timestamps;
 
 std::vector<int> audio_streams;
@@ -368,7 +376,7 @@
 && (width_before_avcodec_open != video_codec_ctx->width
 || height_before_avcodec_open != video_codec_ctx->height))
 {
- msg::wrn(_("%s video stream %d: Using frame size %dx%d instead of %dx%d."),
+ msg::dbg("%s video stream %d: using frame size %dx%d instead of %dx%d.",
 _url.c_str(), index + 1,
 width_before_avcodec_open, height_before_avcodec_open,
 video_codec_ctx->width, video_codec_ctx->height);
@@ -401,14 +409,19 @@
 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_YUV420P))
+ || 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)
+ if (video_codec_ctx->pix_fmt == PIX_FMT_YUV444P
+ || video_codec_ctx->pix_fmt == PIX_FMT_YUV444P10)
 {
 video_frame_template.layout = video_frame::yuv444p;
 }
- else if (video_codec_ctx->pix_fmt == PIX_FMT_YUV422P)
+ else if (video_codec_ctx->pix_fmt == PIX_FMT_YUV422P
+ || video_codec_ctx->pix_fmt == PIX_FMT_YUV422P10)
 {
 video_frame_template.layout = video_frame::yuv422p;
 }
@@ -421,10 +434,23 @@
 {
 video_frame_template.color_space = video_frame::yuv709;
 }
- video_frame_template.value_range = video_frame::u8_mpeg;
- if (video_codec_ctx->color_range == AVCOL_RANGE_JPEG)
+ 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)
+ {
+ video_frame_template.value_range = video_frame::u10_mpeg;
+ if (video_codec_ctx->color_range == AVCOL_RANGE_JPEG)
+ {
+ video_frame_template.value_range = video_frame::u10_full;
+ }
+ }
+ else
 {
- video_frame_template.value_range = video_frame::u8_full;
+ video_frame_template.value_range = video_frame::u8_mpeg;
+ if (video_codec_ctx->color_range == AVCOL_RANGE_JPEG)
+ {
+ video_frame_template.value_range = video_frame::u8_full;
+ }
 }
 video_frame_template.chroma_location = video_frame::center;
 if (video_codec_ctx->chroma_sample_location == AVCHROMA_LOC_LEFT)
@@ -458,22 +484,44 @@
 video_frame_template.chroma_location = video_frame::center;
 }
 // Stereo layout
- video_frame_template.stereo_layout = video_frame::mono;
+ video_frame_template.stereo_layout = parameters::layout_mono;
 video_frame_template.stereo_layout_swap = false;
 std::string val;
 /* Determine the stereo layout from the resolution.*/
 if (video_frame_template.raw_width / 2 > video_frame_template.raw_height)
 {
- video_frame_template.stereo_layout = video_frame::left_right;
+ video_frame_template.stereo_layout = parameters::layout_left_right;
 }
 else if (video_frame_template.raw_height > video_frame_template.raw_width)
 {
- video_frame_template.stereo_layout = video_frame::top_bottom;
+ video_frame_template.stereo_layout = parameters::layout_top_bottom;
+ }
+ /* Gather hints from the filename extension */
+ std::string extension;
+ size_t extension_dot_pos = _url.find_last_of('.');
+ if (extension_dot_pos != std::string::npos)
+ {
+ extension = _url.substr(extension_dot_pos + 1);
+ for (size_t i = 0; i < extension.length(); i++)
+ {
+ extension[i] = std::tolower(extension[i]);
+ }
+ }
+ if (extension == "mpo")
+ {
+ /* MPO files are alternating-left-right. */
+ video_frame_template.stereo_layout = parameters::layout_alternating;
+ }
+ else if (extension == "jps" || extension == "pns")
+ {
+ /* JPS and PNS are side-by-side in right-left mode */
+ video_frame_template.stereo_layout = parameters::layout_left_right;
+ video_frame_template.stereo_layout_swap = true;
 }
 /* Determine the input mode by looking at the file name.
 * This should be compatible to these conventions:
 * http://www.tru3d.com/technology/3D_Media_Formats_Software.php?file=TriDef%20Supported%203D%20Formats */
- std::string marker = _url.substr(0, _url.find_last_of('.'));
+ std::string marker = _url.substr(0, extension_dot_pos);
 size_t last_dash = marker.find_last_of('-');
 if (last_dash != std::string::npos)
 {
@@ -489,69 +537,69 @@
 }
 if (marker == "lr")
 {
- video_frame_template.stereo_layout = video_frame::left_right;
+ video_frame_template.stereo_layout = parameters::layout_left_right;
 video_frame_template.stereo_layout_swap = false;
 }
 else if (marker == "rl")
 {
- video_frame_template.stereo_layout = video_frame::left_right;
+ video_frame_template.stereo_layout = parameters::layout_left_right;
 video_frame_template.stereo_layout_swap = true;
 }
 else if (marker == "lrh" || marker == "lrq")
 {
- video_frame_template.stereo_layout = video_frame::left_right_half;
+ video_frame_template.stereo_layout = parameters::layout_left_right_half;
 video_frame_template.stereo_layout_swap = false;
 }
 else if (marker == "rlh" || marker == "rlq")
 {
- video_frame_template.stereo_layout = video_frame::left_right_half;
+ video_frame_template.stereo_layout = parameters::layout_left_right_half;
 video_frame_template.stereo_layout_swap = true;
 }
 else if (marker == "tb" || marker == "ab")
 {
- video_frame_template.stereo_layout = video_frame::top_bottom;
+ video_frame_template.stereo_layout = parameters::layout_top_bottom;
 video_frame_template.stereo_layout_swap = false;
 }
 else if (marker == "bt" || marker == "ba")
 {
- video_frame_template.stereo_layout = video_frame::top_bottom;
+ video_frame_template.stereo_layout = parameters::layout_top_bottom;
 video_frame_template.stereo_layout_swap = true;
 }
 else if (marker == "tbh" || marker == "abq")
 {
- video_frame_template.stereo_layout = video_frame::top_bottom_half;
+ video_frame_template.stereo_layout = parameters::layout_top_bottom_half;
 video_frame_template.stereo_layout_swap = false;
 }
 else if (marker == "bth" || marker == "baq")
 {
- video_frame_template.stereo_layout = video_frame::top_bottom_half;
+ video_frame_template.stereo_layout = parameters::layout_top_bottom_half;
 video_frame_template.stereo_layout_swap = true;
 }
 else if (marker == "eo")
 {
- video_frame_template.stereo_layout = video_frame::even_odd_rows;
+ video_frame_template.stereo_layout = parameters::layout_even_odd_rows;
 video_frame_template.stereo_layout_swap = false;
 // all image lines are given in this case, and there should be no interpolation [TODO]
 }
 else if (marker == "oe")
 {
- video_frame_template.stereo_layout = video_frame::even_odd_rows;
+ video_frame_template.stereo_layout = parameters::layout_even_odd_rows;
 video_frame_template.stereo_layout_swap = true;
 // all image lines are given in this case, and there should be no interpolation [TODO]
 }
 else if (marker == "eoq" || marker == "3dir")
 {
- video_frame_template.stereo_layout = video_frame::even_odd_rows;
+ video_frame_template.stereo_layout = parameters::layout_even_odd_rows;
 video_frame_template.stereo_layout_swap = false;
 }
 else if (marker == "oeq" || marker == "3di")
 {
- video_frame_template.stereo_layout = video_frame::even_odd_rows;
+ video_frame_template.stereo_layout = parameters::layout_even_odd_rows;
 video_frame_template.stereo_layout_swap = true;
 }
 else if (marker == "2d")
 {
- video_frame_template.stereo_layout = video_frame::mono;
+ video_frame_template.stereo_layout = parameters::layout_mono;
 video_frame_template.stereo_layout_swap = false;
 }
 /* Check some tags defined at this link: http://www.3dtv.at/Knowhow/StereoWmvSpec_en.aspx
@@ -561,14 +609,14 @@
 {
 video_frame_template.stereo_layout_swap = (val == "SideBySideRF");
 val = tag_value("StereoscopicHalfWidth");
- video_frame_template.stereo_layout = (val == "1" ? video_frame::left_right_half : video_frame::left_right);
+ video_frame_template.stereo_layout = (val == "1" ? parameters::layout_left_right_half : parameters::layout_left_right);
 
 }
 else if (val == "OverUnderRT" || val == "OverUnderLT")
 {
 video_frame_template.stereo_layout_swap = (val == "OverUnderRT");
 val = tag_value("StereoscopicHalfHeight");
- video_frame_template.stereo_layout = (val == "1" ? video_frame::top_bottom_half : video_frame::top_bottom);
+ video_frame_template.stereo_layout = (val == "1" ? parameters::layout_top_bottom_half : parameters::layout_top_bottom);
 }
 /* Check the Matroska StereoMode metadata, which is translated by FFmpeg to a "stereo_mode" tag.
 * This tag is per-track, not per-file!
@@ -587,18 +635,18 @@
 }
 if (val == "mono")
 {
- video_frame_template.stereo_layout = video_frame::mono;
+ video_frame_template.stereo_layout = parameters::layout_mono;
 video_frame_template.stereo_layout_swap = false;
 }
 else if (val == "left_right" || val == "right_left")
 {
 if (video_frame_template.raw_width / 2 > video_frame_template.raw_height)
 {
- video_frame_template.stereo_layout = video_frame::left_right;
+ video_frame_template.stereo_layout = parameters::layout_left_right;
 }
 else
 {
- video_frame_template.stereo_layout = video_frame::left_right_half;
+ video_frame_template.stereo_layout = parameters::layout_left_right_half;
 }
 video_frame_template.stereo_layout_swap = (val == "right_left");
 }
@@ -606,37 +654,42 @@
 {
 if (video_frame_template.raw_height > video_frame_template.raw_width)
 {
- video_frame_template.stereo_layout = video_frame::top_bottom;
+ video_frame_template.stereo_layout = parameters::layout_top_bottom;
 }
 else
 {
- video_frame_template.stereo_layout = video_frame::top_bottom_half;
+ video_frame_template.stereo_layout = parameters::layout_top_bottom_half;
 }
 video_frame_template.stereo_layout_swap = (val == "bottom_top");
 }
 else if (val == "row_interleaved_lr" || val == "row_interleaved_rl")
 {
- video_frame_template.stereo_layout = video_frame::even_odd_rows;
+ video_frame_template.stereo_layout = parameters::layout_even_odd_rows;
 video_frame_template.stereo_layout_swap = (val == "row_interleaved_rl");
 }
+ else if (val == "block_lr" || val == "block_rl")
+ {
+ video_frame_template.stereo_layout = parameters::layout_alternating;
+ video_frame_template.stereo_layout_swap = (val == "block_rl");
+ }
 else if (!val.empty())
 {
 msg::wrn(_("%s video stream %d: Unsupported stereo layout %s."),
 _url.c_str(), index + 1, str::sanitize(val).c_str());
- video_frame_template.stereo_layout = video_frame::mono;
+ video_frame_template.stereo_layout = parameters::layout_mono;
 video_frame_template.stereo_layout_swap = false;
 }
 /* Sanity checks. If these fail, use safe fallback */
- if (((video_frame_template.stereo_layout == video_frame::left_right
- || video_frame_template.stereo_layout == video_frame::left_right_half)
+ if (((video_frame_template.stereo_layout == parameters::layout_left_right
+ || video_frame_template.stereo_layout == parameters::layout_left_right_half)
 && video_frame_template.raw_width % 2 != 0)
- || ((video_frame_template.stereo_layout == video_frame::top_bottom
- || video_frame_template.stereo_layout == video_frame::top_bottom_half)
+ || ((video_frame_template.stereo_layout == parameters::layout_top_bottom
+ || video_frame_template.stereo_layout == parameters::layout_top_bottom_half)
 && video_frame_template.raw_height % 2 != 0)
- || (video_frame_template.stereo_layout == video_frame::even_odd_rows
+ || (video_frame_template.stereo_layout == parameters::layout_even_odd_rows
 && video_frame_template.raw_height % 2 != 0))
 {
- video_frame_template.stereo_layout = video_frame::mono;
+ video_frame_template.stereo_layout = parameters::layout_mono;
 video_frame_template.stereo_layout_swap = false;
 }
 /* Set width and height of a single view */
@@ -713,6 +766,9 @@
 _url = url;
 _is_device = dev_request.is_device();
 _ffmpeg = new struct ffmpeg_stuff;
+ _ffmpeg->format_ctx = NULL;
+ _ffmpeg->have_active_audio_stream = false;
+ _ffmpeg->pos = 0;
 _ffmpeg->reader = new read_thread(_url, _is_device, _ffmpeg);
 int e;
 
@@ -794,7 +850,8 @@
 {
 _ffmpeg->format_ctx->streams[i]->discard = AVDISCARD_ALL; // ignore by default; user must activate streams
 AVCodecContext *codec_ctx = _ffmpeg->format_ctx->streams[i]->codec;
- AVCodec *codec = NULL;
+ AVCodec *codec = (codec_ctx->codec_id == CODEC_ID_TEXT
+ ? NULL : avcodec_find_decoder(codec_ctx->codec_id));
 // XXX: Sometimes the reported width and height for a video stream change after avcodec_open(),
 // but the original values seem to be correct. This seems to happen mostly with 1920x1080 video
 // that later is reported as 1920x1088, which results in a gray bar displayed at the bottom of
@@ -802,25 +859,28 @@
 // them later in set_video_frame_template().
 int width_before_avcodec_open = codec_ctx->width;
 int height_before_avcodec_open = codec_ctx->height;
- if (_ffmpeg->format_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+ if (codec_ctx->codec_type == AVMEDIA_TYPE_VIDEO)
 {
 // Activate multithreaded decoding. This must be done before opening the codec; see
 // http://lists.gnu.org/archive/html/bino-list/2011-08/msg00019.html
 codec_ctx->thread_count = video_decoding_threads();
+ // Set CODEC_FLAG_EMU_EDGE in the same situations in which ffplay sets it.
+ // I don't know what exactly this does, but it is necessary to fix the problem
+ // described in this thread: http://lists.nongnu.org/archive/html/bino-list/2012-02/msg00039.html
+ if (codec_ctx->lowres || (codec && (codec->capabilities & CODEC_CAP_DR1)))
+ codec_ctx->flags |= CODEC_FLAG_EMU_EDGE;
 }
 // Find and open the codec. CODEC_ID_TEXT is a special case: it has no decoder since it is unencoded raw data.
- if (_ffmpeg->format_ctx->streams[i]->codec->codec_id != CODEC_ID_TEXT
- && (!(codec = avcodec_find_decoder(_ffmpeg->format_ctx->streams[i]->codec->codec_id))
- || (e = avcodec_open(codec_ctx, codec)) < 0))
+ if (codec_ctx->codec_id != CODEC_ID_TEXT && (!codec || (e = avcodec_open(codec_ctx, codec)) < 0))
 {
 msg::wrn(_("%s stream %d: Cannot open %s: %s"), _url.c_str(), i,
- _ffmpeg->format_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO ? _("video codec")
- : _ffmpeg->format_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO ? _("audio codec")
- : _ffmpeg->format_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_SUBTITLE ? _("subtitle codec")
+ codec_ctx->codec_type == AVMEDIA_TYPE_VIDEO ? _("video codec")
+ : codec_ctx->codec_type == AVMEDIA_TYPE_AUDIO ? _("audio codec")
+ : codec_ctx->codec_type == AVMEDIA_TYPE_SUBTITLE ? _("subtitle codec")
 : _("data"),
 codec ? my_av_strerror(e).c_str() : _("codec not supported"));
 }
- else if (_ffmpeg->format_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+ else if (codec_ctx->codec_type == AVMEDIA_TYPE_VIDEO)
 {
 _ffmpeg->video_streams.push_back(i);
 int j = _ffmpeg->video_streams.size() - 1;
@@ -840,29 +900,37 @@
 av_init_packet(&(_ffmpeg->video_packets[j]));
 _ffmpeg->video_decode_threads.push_back(video_decode_thread(_url, _ffmpeg, j));
 _ffmpeg->video_frames.push_back(avcodec_alloc_frame());
- if (!_ffmpeg->video_frames[j])
+ _ffmpeg->video_buffered_frames.push_back(avcodec_alloc_frame());
+ enum PixelFormat frame_fmt = (_ffmpeg->video_frame_templates[j].layout == video_frame::bgra32
+ ? PIX_FMT_BGRA : _ffmpeg->video_codec_ctxs[j]->pix_fmt);
+ int frame_bufsize = (avpicture_get_size(frame_fmt,
+ _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)));
+ avpicture_fill(reinterpret_cast<AVPicture *>(_ffmpeg->video_buffered_frames[j]), _ffmpeg->video_buffers[j],
+ frame_fmt, _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height);
+ if (!_ffmpeg->video_frames[j] || !_ffmpeg->video_buffered_frames[j] || !_ffmpeg->video_buffers[j])
 {
 throw exc(HERE + ": " + strerror(ENOMEM));
 }
 if (_ffmpeg->video_frame_templates[j].layout == video_frame::bgra32)
 {
 // Initialize things needed for software pixel format conversion
- int bufsize = avpicture_get_size(PIX_FMT_BGRA,
+ int sws_bufsize = avpicture_get_size(PIX_FMT_BGRA,
 _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height);
- _ffmpeg->video_out_frames.push_back(avcodec_alloc_frame());
- _ffmpeg->video_buffers.push_back(static_cast<uint8_t *>(av_malloc(bufsize)));
- if (!_ffmpeg->video_out_frames[j] || !_ffmpeg->video_buffers[j])
+ _ffmpeg->video_sws_frames.push_back(avcodec_alloc_frame());
+ _ffmpeg->video_sws_buffers.push_back(static_cast<uint8_t *>(av_malloc(sws_bufsize)));
+ if (!_ffmpeg->video_sws_frames[j] || !_ffmpeg->video_sws_buffers[j])
 {
 throw exc(HERE + ": " + strerror(ENOMEM));
 }
- avpicture_fill(reinterpret_cast<AVPicture *>(_ffmpeg->video_out_frames[j]), _ffmpeg->video_buffers[j],
+ 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);
 // Call sws_getCachedContext(NULL, ...) instead of sws_getContext(...) just to avoid a deprecation warning.
- _ffmpeg->video_img_conv_ctxs.push_back(sws_getCachedContext(NULL,
+ _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,
 SWS_POINT, NULL, NULL, NULL));
- if (!_ffmpeg->video_img_conv_ctxs[j])
+ if (!_ffmpeg->video_sws_ctxs[j])
 {
 throw exc(str::asprintf(_("%s video stream %d: Cannot initialize conversion context."),
 _url.c_str(), j + 1));
@@ -870,13 +938,13 @@
 }
 else
 {
- _ffmpeg->video_out_frames.push_back(NULL);
- _ffmpeg->video_buffers.push_back(NULL);
- _ffmpeg->video_img_conv_ctxs.push_back(NULL);
+ _ffmpeg->video_sws_frames.push_back(NULL);
+ _ffmpeg->video_sws_buffers.push_back(NULL);
+ _ffmpeg->video_sws_ctxs.push_back(NULL);
 }
 _ffmpeg->video_last_timestamps.push_back(std::numeric_limits<int64_t>::min());
 }
- else if (_ffmpeg->format_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+ else if (codec_ctx->codec_type == AVMEDIA_TYPE_AUDIO)
 {
 _ffmpeg->audio_streams.push_back(i);
 int j = _ffmpeg->audio_streams.size() - 1;
@@ -897,7 +965,7 @@
 _ffmpeg->audio_buffers.push_back(std::vector<unsigned char>());
 _ffmpeg->audio_last_timestamps.push_back(std::numeric_limits<int64_t>::min());
 }
- else if (_ffmpeg->format_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_SUBTITLE)
+ else if (codec_ctx->codec_type == AVMEDIA_TYPE_SUBTITLE)
 {
 _ffmpeg->subtitle_streams.push_back(i);
 int j = _ffmpeg->subtitle_streams.size() - 1;
@@ -1316,7 +1384,7 @@
 }
 
 video_decode_thread::video_decode_thread(const std::string &url, struct ffmpeg_stuff *ffmpeg, int video_stream) :
- _url(url), _ffmpeg(ffmpeg), _video_stream(video_stream), _frame()
+ _url(url), _ffmpeg(ffmpeg), _video_stream(video_stream), _frame(), _raw_frames(1)
 {
 }
 
@@ -1332,87 +1400,124 @@
 
 void video_decode_thread::run()
 {
- int frame_finished = 0;
- do
+ _frame = _ffmpeg->video_frame_templates[_video_stream];
+ for (int raw_frame = 0; raw_frame < _raw_frames; raw_frame++)
 {
- bool empty;
+ int frame_finished = 0;
+read_frame:
 do
 {
- _ffmpeg->video_packet_queue_mutexes[_video_stream].lock();
- empty = _ffmpeg->video_packet_queues[_video_stream].empty();
- _ffmpeg->video_packet_queue_mutexes[_video_stream].unlock();
- if (empty)
+ bool empty;
+ do
 {
- if (_ffmpeg->reader->eof())
+ _ffmpeg->video_packet_queue_mutexes[_video_stream].lock();
+ empty = _ffmpeg->video_packet_queues[_video_stream].empty();
+ _ffmpeg->video_packet_queue_mutexes[_video_stream].unlock();
+ if (empty)
 {
- _frame = video_frame();
- return;
+ if (_ffmpeg->reader->eof())
+ {
+ if (raw_frame == 1)
+ {
+ _frame.data[1][0] = _frame.data[0][0];
+ _frame.data[1][1] = _frame.data[0][1];
+ _frame.data[1][2] = _frame.data[0][2];
+ _frame.line_size[1][0] = _frame.line_size[0][0];
+ _frame.line_size[1][1] = _frame.line_size[0][1];
+ _frame.line_size[1][2] = _frame.line_size[0][2];
+ }
+ else
+ {
+ _frame = video_frame();
+ }
+ return;
+ }
+ msg::dbg(_url + ": video stream " + str::from(_video_stream) + ": need to wait for packets...");
+ _ffmpeg->reader->start();
+ _ffmpeg->reader->finish();
 }
- msg::dbg(_url + ": video stream " + str::from(_video_stream) + ": need to wait for packets...");
- _ffmpeg->reader->start();
- _ffmpeg->reader->finish();
 }
+ while (empty);
+ av_free_packet(&(_ffmpeg->video_packets[_video_stream]));
+ _ffmpeg->video_packet_queue_mutexes[_video_stream].lock();
+ _ffmpeg->video_packets[_video_stream] = _ffmpeg->video_packet_queues[_video_stream].front();
+ _ffmpeg->video_packet_queues[_video_stream].pop_front();
+ _ffmpeg->video_packet_queue_mutexes[_video_stream].unlock();
+ _ffmpeg->reader->start(); // Refill the packet queue
+ avcodec_decode_video2(_ffmpeg->video_codec_ctxs[_video_stream],
+ _ffmpeg->video_frames[_video_stream], &frame_finished,
+ &(_ffmpeg->video_packets[_video_stream]));
+ }
+ while (!frame_finished);
+#if LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MINOR >= 8
+ if (_ffmpeg->video_frames[_video_stream]->width != _ffmpeg->video_frame_templates[_video_stream].raw_width
+ || _ffmpeg->video_frames[_video_stream]->height != _ffmpeg->video_frame_templates[_video_stream].raw_height)
+ {
+ msg::wrn(_("%s video stream %d: Dropping %dx%d frame"), _url.c_str(), _video_stream + 1, 
+ _ffmpeg->video_frames[_video_stream]->width, _ffmpeg->video_frames[_video_stream]->height);
+ goto read_frame;
+ }
+#endif
+ if (_frame.layout == video_frame::bgra32)
+ {
+ sws_scale(_ffmpeg->video_sws_ctxs[_video_stream],
+ _ffmpeg->video_frames[_video_stream]->data,
+ _ffmpeg->video_frames[_video_stream]->linesize,
+ 0, _frame.raw_height,
+ _ffmpeg->video_sws_frames[_video_stream]->data,
+ _ffmpeg->video_sws_frames[_video_stream]->linesize);
+ // TODO: Handle sws_scale errors. How?
+ _frame.data[raw_frame][0] = _ffmpeg->video_sws_frames[_video_stream]->data[0];
+ _frame.line_size[raw_frame][0] = _ffmpeg->video_sws_frames[_video_stream]->linesize[0];
+ }
+ else
+ {
+ const AVFrame *src_frame = _ffmpeg->video_frames[_video_stream];
+ if (_raw_frames == 2 && raw_frame == 0)
+ {
+ // 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),
+ _ffmpeg->video_codec_ctxs[_video_stream]->width,
+ _ffmpeg->video_codec_ctxs[_video_stream]->height);
+ src_frame = _ffmpeg->video_buffered_frames[_video_stream];
+ }
+ _frame.data[raw_frame][0] = src_frame->data[0];
+ _frame.data[raw_frame][1] = src_frame->data[1];
+ _frame.data[raw_frame][2] = src_frame->data[2];
+ _frame.line_size[raw_frame][0] = src_frame->linesize[0];
+ _frame.line_size[raw_frame][1] = src_frame->linesize[1];
+ _frame.line_size[raw_frame][2] = src_frame->linesize[2];
 }
- while (empty);
- av_free_packet(&(_ffmpeg->video_packets[_video_stream]));
- _ffmpeg->video_packet_queue_mutexes[_video_stream].lock();
- _ffmpeg->video_packets[_video_stream] = _ffmpeg->video_packet_queues[_video_stream].front();
- _ffmpeg->video_packet_queues[_video_stream].pop_front();
- _ffmpeg->video_packet_queue_mutexes[_video_stream].unlock();
- _ffmpeg->reader->start(); // Refill the packet queue
- avcodec_decode_video2(_ffmpeg->video_codec_ctxs[_video_stream],
- _ffmpeg->video_frames[_video_stream], &frame_finished,
- &(_ffmpeg->video_packets[_video_stream]));
- }
- while (!frame_finished);
-
- _frame = _ffmpeg->video_frame_templates[_video_stream];
- if (_frame.layout == video_frame::bgra32)
- {
- sws_scale(_ffmpeg->video_img_conv_ctxs[_video_stream],
- _ffmpeg->video_frames[_video_stream]->data,
- _ffmpeg->video_frames[_video_stream]->linesize,
- 0, _frame.raw_height,
- _ffmpeg->video_out_frames[_video_stream]->data,
- _ffmpeg->video_out_frames[_video_stream]->linesize);
- // TODO: Handle sws_scale errors. How?
- _frame.data[0][0] = _ffmpeg->video_out_frames[_video_stream]->data[0];
- _frame.line_size[0][0] = _ffmpeg->video_out_frames[_video_stream]->linesize[0];
- }
- else
- {
- _frame.data[0][0] = _ffmpeg->video_frames[_video_stream]->data[0];
- _frame.data[0][1] = _ffmpeg->video_frames[_video_stream]->data[1];
- _frame.data[0][2] = _ffmpeg->video_frames[_video_stream]->data[2];
- _frame.line_size[0][0] = _ffmpeg->video_frames[_video_stream]->linesize[0];
- _frame.line_size[0][1] = _ffmpeg->video_frames[_video_stream]->linesize[1];
- _frame.line_size[0][2] = _ffmpeg->video_frames[_video_stream]->linesize[2];
- }
 
- if (_ffmpeg->video_packets[_video_stream].dts != static_cast<int64_t>(AV_NOPTS_VALUE))
- {
- _frame.presentation_time = handle_timestamp(_ffmpeg->video_packets[_video_stream].dts * 1000000
- * _ffmpeg->format_ctx->streams[_ffmpeg->video_streams[_video_stream]]->time_base.num
- / _ffmpeg->format_ctx->streams[_ffmpeg->video_streams[_video_stream]]->time_base.den);
- }
- else if (_ffmpeg->video_last_timestamps[_video_stream] != std::numeric_limits<int64_t>::min())
- {
- msg::dbg(_url + ": video stream " + str::from(_video_stream)
- + ": no timestamp available, using a questionable guess");
- _frame.presentation_time = _ffmpeg->video_last_timestamps[_video_stream];
- }
- else
- {
- msg::dbg(_url + ": video stream " + str::from(_video_stream)
- + ": no timestamp available, using a bad guess");
- _frame.presentation_time = _ffmpeg->pos;
+ if (_ffmpeg->video_packets[_video_stream].dts != static_cast<int64_t>(AV_NOPTS_VALUE))
+ {
+ _frame.presentation_time = handle_timestamp(_ffmpeg->video_packets[_video_stream].dts * 1000000
+ * _ffmpeg->format_ctx->streams[_ffmpeg->video_streams[_video_stream]]->time_base.num
+ / _ffmpeg->format_ctx->streams[_ffmpeg->video_streams[_video_stream]]->time_base.den);
+ }
+ else if (_ffmpeg->video_last_timestamps[_video_stream] != std::numeric_limits<int64_t>::min())
+ {
+ msg::dbg(_url + ": video stream " + str::from(_video_stream)
+ + ": no timestamp available, using a questionable guess");
+ _frame.presentation_time = _ffmpeg->video_last_timestamps[_video_stream];
+ }
+ else
+ {
+ msg::dbg(_url + ": video stream " + str::from(_video_stream)
+ + ": no timestamp available, using a bad guess");
+ _frame.presentation_time = _ffmpeg->pos;
+ }
 }
 }
 
-void media_object::start_video_frame_read(int video_stream)
+void media_object::start_video_frame_read(int video_stream, int raw_frames)
 {
 assert(video_stream >= 0);
 assert(video_stream < video_streams());
+ assert(raw_frames == 1 || raw_frames == 2);
+ _ffmpeg->video_decode_threads[video_stream].set_raw_frames(raw_frames);
 _ffmpeg->video_decode_threads[video_stream].start();
 }
 
@@ -1757,15 +1862,7 @@
 }
 // Stop reading packets
 _ffmpeg->reader->finish();
- // Seek
- int e = av_seek_frame(_ffmpeg->format_ctx, -1,
- dest_pos * AV_TIME_BASE / 1000000,
- dest_pos < _ffmpeg->pos ? AVSEEK_FLAG_BACKWARD : 0);
- if (e < 0)
- {
- msg::err(_("%s: Seeking failed."), _url.c_str());
- }
- // Throw away all queued packets
+ // Throw away all queued packets and buffered data
 for (size_t i = 0; i < _ffmpeg->video_streams.size(); i++)
 {
 avcodec_flush_buffers(_ffmpeg->format_ctx->streams[_ffmpeg->video_streams[i]]->codec);
@@ -1813,6 +1910,14 @@
 _ffmpeg->subtitle_last_timestamps[i] = std::numeric_limits<int64_t>::min();
 }
 _ffmpeg->pos = std::numeric_limits<int64_t>::min();
+ // Seek
+ int e = av_seek_frame(_ffmpeg->format_ctx, -1,
+ dest_pos * AV_TIME_BASE / 1000000,
+ dest_pos < _ffmpeg->pos ? AVSEEK_FLAG_BACKWARD : 0);
+ if (e < 0)
+ {
+ msg::err(_("%s: Seeking failed."), _url.c_str());
+ }
 // Restart packet reading
 _ffmpeg->reader->reset();
 _ffmpeg->reader->start();
@@ -1849,14 +1954,22 @@
 {
 av_free(_ffmpeg->video_frames[i]);
 }
- for (size_t i = 0; i < _ffmpeg->video_out_frames.size(); i++)
+ for (size_t i = 0; i < _ffmpeg->video_buffered_frames.size(); i++)
 {
- av_free(_ffmpeg->video_out_frames[i]);
+ av_free(_ffmpeg->video_buffered_frames[i]);
 }
 for (size_t i = 0; i < _ffmpeg->video_buffers.size(); i++)
 {
 av_free(_ffmpeg->video_buffers[i]);
 }
+ for (size_t i = 0; i < _ffmpeg->video_sws_frames.size(); i++)
+ {
+ av_free(_ffmpeg->video_sws_frames[i]);
+ }
+ for (size_t i = 0; i < _ffmpeg->video_sws_buffers.size(); i++)
+ {
+ av_free(_ffmpeg->video_sws_buffers[i]);
+ }
 for (size_t i = 0; i < _ffmpeg->video_codec_ctxs.size(); i++)
 {
 if (i < _ffmpeg->video_codecs.size() && _ffmpeg->video_codecs[i])
@@ -1864,9 +1977,9 @@
 avcodec_close(_ffmpeg->video_codec_ctxs[i]);
 }
 }
- for (size_t i = 0; i < _ffmpeg->video_img_conv_ctxs.size(); i++)
+ for (size_t i = 0; i < _ffmpeg->video_sws_ctxs.size(); i++)
 {
- sws_freeContext(_ffmpeg->video_img_conv_ctxs[i]);
+ sws_freeContext(_ffmpeg->video_sws_ctxs[i]);
 }
 for (size_t i = 0; i < _ffmpeg->video_packet_queues.size(); i++)
 {

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

bino-1.2.1.tar.bz2/src/player.cpp -> bino-1.3.2.tar.xz/src/player.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010-2011
+ * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 * Alexey Osipov <lion-simba@pridelands.ru>
 * Joe <cuchac@email.cz>
@@ -33,108 +33,27 @@
 #include "msg.h"
 #include "timer.h"
 
-#include "controller.h"
-#include "media_data.h"
-#include "media_input.h"
 #include "audio_output.h"
-#include "video_output_qt.h"
+#include "video_output.h"
+#include "media_input.h"
 #include "player.h"
 
 
-player_init_data::player_init_data() :
- log_level(msg::INF),
- dev_request(),
- urls(),
- video_stream(0),
- audio_stream(0),
- subtitle_stream(-1),
- benchmark(false),
- fullscreen(false),
- center(false),
- stereo_layout_override(false),
- stereo_layout(video_frame::mono),
- stereo_layout_swap(false),
- stereo_mode_override(false),
- stereo_mode(parameters::mono_left),
- stereo_mode_swap(false),
- params()
-{
-}
-
-player_init_data::~player_init_data()
-{
-}
+extern dispatch* global_dispatch;
 
-void player_init_data::save(std::ostream &os) const
+player::player()
 {
- s11n::save(os, static_cast<int>(log_level));
- s11n::save(os, dev_request);
- s11n::save(os, urls);
- s11n::save(os, video_stream);
- s11n::save(os, audio_stream);
- s11n::save(os, subtitle_stream);
- s11n::save(os, benchmark);
- s11n::save(os, fullscreen);
- s11n::save(os, center);
- s11n::save(os, stereo_layout_override);
- s11n::save(os, static_cast<int>(stereo_layout));
- s11n::save(os, stereo_layout_swap);
- s11n::save(os, stereo_mode_override);
- s11n::save(os, static_cast<int>(stereo_mode));
- s11n::save(os, stereo_mode_swap);
- s11n::save(os, params);
-}
-
-void player_init_data::load(std::istream &is)
-{
- int x;
- s11n::load(is, x);
- log_level = static_cast<msg::level_t>(x);
- s11n::load(is, dev_request);
- s11n::load(is, urls);
- s11n::load(is, video_stream);
- s11n::load(is, audio_stream);
- s11n::load(is, subtitle_stream);
- s11n::load(is, benchmark);
- s11n::load(is, fullscreen);
- s11n::load(is, center);
- s11n::load(is, stereo_layout_override);
- s11n::load(is, x);
- stereo_layout = static_cast<video_frame::stereo_layout_t>(x);
- s11n::load(is, stereo_layout_swap);
- s11n::load(is, stereo_mode_override);
- s11n::load(is, x);
- stereo_mode = static_cast<parameters::stereo_mode_t>(x);
- s11n::load(is, stereo_mode_swap);
- s11n::load(is, params);
-}
-
-
-player::player(type t) :
- _media_input(NULL), _audio_output(NULL), _video_output(NULL)
-{
- if (t == master)
- {
- make_master();
- }
 reset_playstate();
 }
 
 player::~player()
 {
- if (controller::get_global_player() == this)
- {
- controller::set_global_player(NULL);
- }
- delete _media_input;
- delete _audio_output;
- delete _video_output;
 }
 
-float player::normalize_pos(int64_t pos)
+float player::normalize_pos(int64_t pos) const
 {
- double pos_min = _start_pos + _media_input->initial_skip();
- double pos_max = pos_min + _media_input->duration();
+ double pos_min = _start_pos + global_dispatch->get_media_input()->initial_skip();
+ double pos_max = pos_min + global_dispatch->get_media_input()->duration();
 double npos = (pos_max > pos_min ? (static_cast<double>(pos) - pos_min) / (pos_max - pos_min) : 0.0f);
 return npos;
 }
@@ -148,8 +67,10 @@
 _drop_next_frame = false;
 _previous_frame_dropped = false;
 _in_pause = false;
+ _recently_seeked = false;
 _quit_request = false;
 _pause_request = false;
+ _step_request = false;
 _seek_request = 0;
 _set_pos_request = -1.0f;
 _video_frame = video_frame();
@@ -157,158 +78,21 @@
 _next_subtitle_box = subtitle_box();
 }
 
-void player::stop_playback()
-{
- if (_video_output)
- {
- _video_output->exit_fullscreen();
- _video_output->prepare_next_frame(video_frame(), subtitle_box());
- _video_output->activate_next_frame();
- if (_audio_output)
- {
- _audio_output->stop();
- }
- }
- controller::notify_all(notification::play, true, false);
-}
-
-video_output *player::create_video_output()
+void player::open()
 {
- return new video_output_qt(_benchmark);
-}
-
-void player::destroy_video_output(video_output *vo)
-{
- delete vo;
-}
-
-audio_output *player::create_audio_output()
-{
- return new audio_output();
-}
-
-void player::destroy_audio_output(audio_output *ao)
-{
- delete ao;
-}
-
-void player::make_master()
-{
- controller::set_global_player(this);
+ reset_playstate();
 }
 
-void player::open(const player_init_data &init_data)
+void player::close()
 {
- // Initialize basics
- msg::set_level(init_data.log_level);
- _benchmark = init_data.benchmark;
 reset_playstate();
-
- // Create media input
- _media_input = new media_input();
- _media_input->open(init_data.urls, init_data.dev_request);
- if (_media_input->video_streams() == 0)
- {
- throw exc(_("No video streams found."));
- }
- if (init_data.stereo_layout_override)
- {
- if (!_media_input->stereo_layout_is_supported(init_data.stereo_layout, init_data.stereo_layout_swap))
- {
- throw exc(_("Cannot set requested stereo layout: incompatible media."));
- }
- _media_input->set_stereo_layout(init_data.stereo_layout, init_data.stereo_layout_swap);
- }
- if (_media_input->video_streams() < init_data.video_stream + 1)
- {
- throw exc(str::asprintf(_("Video stream %d not found."), init_data.video_stream + 1));
- }
- _media_input->select_video_stream(init_data.video_stream);
- if (_media_input->audio_streams() > 0 && _media_input->audio_streams() < init_data.audio_stream + 1)
- {
- throw exc(str::asprintf(_("Audio stream %d not found."), init_data.audio_stream + 1));
- }
- if (_media_input->audio_streams() > 0)
- {
- _media_input->select_audio_stream(init_data.audio_stream);
- }
- if (_media_input->subtitle_streams() > 0 && _media_input->subtitle_streams() < init_data.subtitle_stream + 1)
- {
- throw exc(str::asprintf(_("Subtitle stream %d not found."), init_data.subtitle_stream + 1));
- }
- if (_media_input->subtitle_streams() > 0 && init_data.subtitle_stream >= 0)
- {
- _media_input->select_subtitle_stream(init_data.subtitle_stream);
- }
-
- // Create audio output
- if (_media_input->audio_streams() > 0 && !_benchmark)
- {
- _audio_output = create_audio_output();
- }
- if (_audio_output)
- {
- _audio_output->init();
- }
-
- // Create video output
- _video_output = create_video_output();
- if (_video_output)
- {
- _video_output->init();
- }
-
- // Initialize output parameters
- _params = init_data.params;
- _params.set_defaults();
- if (init_data.stereo_mode_override)
- {
- _params.stereo_mode = init_data.stereo_mode;
- _params.stereo_mode_swap = init_data.stereo_mode_swap;
- }
- else
- {
- if (_media_input->video_frame_template().stereo_layout == video_frame::mono)
- {
- _params.stereo_mode = parameters::mono_left;
- }
- else if (_video_output && _video_output->supports_stereo())
- {
- _params.stereo_mode = parameters::stereo;
- }
- else
- {
- _params.stereo_mode = parameters::red_cyan_dubois;
- }
- _params.stereo_mode_swap = false;
- }
-
- // Set initial parameters
- if (_video_output)
- {
- _video_output->set_parameters(_params);
- _video_output->set_suitable_size(
- _media_input->video_frame_template().width,
- _media_input->video_frame_template().height,
- _media_input->video_frame_template().aspect_ratio,
- _params.stereo_mode);
- if (init_data.fullscreen)
- {
- _video_output->enter_fullscreen(_params.fullscreen_screens);
- }
- if (init_data.center)
- {
- _video_output->center();
- }
- controller::process_all_events();
- }
 }
 
 void player::set_current_subtitle_box()
 {
 _current_subtitle_box = subtitle_box();
 if (_next_subtitle_box.is_valid()
- && _next_subtitle_box.presentation_start_time < _video_pos + _media_input->video_frame_duration())
+ && _next_subtitle_box.presentation_start_time < _video_pos + global_dispatch->get_media_input()->video_frame_duration())
 {
 _current_subtitle_box = _next_subtitle_box;
 }
@@ -324,50 +108,47 @@
 
 if (_quit_request)
 {
- stop_playback();
 return 0;
 }
 else if (!_running)
 {
 // Read initial data and start output
- _media_input->start_video_frame_read();
- _video_frame = _media_input->finish_video_frame_read();
+ global_dispatch->get_media_input()->start_video_frame_read();
+ _video_frame = global_dispatch->get_media_input()->finish_video_frame_read();
 if (!_video_frame.is_valid())
 {
 msg::dbg("Empty video input.");
- stop_playback();
 return 0;
 }
 _video_pos = _video_frame.presentation_time;
- if (_media_input->selected_subtitle_stream() >= 0)
+ if (global_dispatch->get_media_input()->selected_subtitle_stream() >= 0)
 {
 do
 {
- _media_input->start_subtitle_box_read();
- _next_subtitle_box = _media_input->finish_subtitle_box_read();
+ global_dispatch->get_media_input()->start_subtitle_box_read();
+ _next_subtitle_box = global_dispatch->get_media_input()->finish_subtitle_box_read();
 if (!_next_subtitle_box.is_valid())
 {
 msg::dbg("Empty subtitle stream.");
- stop_playback();
 return 0;
 }
 }
 while (_next_subtitle_box.presentation_stop_time < _video_pos);
 }
- if (_audio_output)
+ if (global_dispatch->get_audio_output()
+ && global_dispatch->get_media_input()->selected_audio_stream() >= 0)
 {
- _media_input->start_audio_blob_read(_audio_output->required_initial_data_size());
- audio_blob blob = _media_input->finish_audio_blob_read();
+ global_dispatch->get_media_input()->start_audio_blob_read(global_dispatch->get_audio_output()->required_initial_data_size());
+ audio_blob blob = global_dispatch->get_media_input()->finish_audio_blob_read();
 if (!blob.is_valid())
 {
 msg::dbg("Empty audio input.");
- stop_playback();
 return 0;
 }
 _audio_pos = blob.presentation_time;
- _audio_output->data(blob);
- _media_input->start_audio_blob_read(_audio_output->required_update_data_size());
- _master_time_start = _audio_output->start();
+ global_dispatch->get_audio_output()->data(blob);
+ global_dispatch->get_media_input()->start_audio_blob_read(global_dispatch->get_audio_output()->required_update_data_size());
+ _master_time_start = global_dispatch->get_audio_output()->start();
 _master_time_pos = _audio_pos;
 _current_pos = _audio_pos;
 }
@@ -381,9 +162,9 @@
 _fps_mark_time = timer::get_microseconds(timer::monotonic);
 _frames_shown = 0;
 _running = true;
- if (_media_input->initial_skip() > 0)
+ if (global_dispatch->get_media_input()->initial_skip() > 0)
 {
- _seek_request = _media_input->initial_skip();
+ _seek_request = global_dispatch->get_media_input()->initial_skip();
 }
 else
 {
@@ -398,11 +179,10 @@
 }
 if (_seek_request != 0 || _set_pos_request >= 0.0f)
 {
- int64_t old_pos = _current_pos;
 if (_set_pos_request >= 0.0f)
 {
- int64_t dest_pos_min = _start_pos + _media_input->initial_skip();
- int64_t dest_pos_max = dest_pos_min + _media_input->duration() - 2000000;
+ int64_t dest_pos_min = _start_pos + global_dispatch->get_media_input()->initial_skip();
+ int64_t dest_pos_max = dest_pos_min + global_dispatch->get_media_input()->duration() - 2000000;
 if (dest_pos_max <= dest_pos_min)
 {
 *seek_to = _current_pos;
@@ -415,64 +195,62 @@
 }
 else
 {
- if (_current_pos + _seek_request < _start_pos + _media_input->initial_skip())
+ if (_current_pos + _seek_request < _start_pos + global_dispatch->get_media_input()->initial_skip())
 {
- _seek_request = _start_pos + _media_input->initial_skip() - _current_pos;
+ _seek_request = _start_pos + global_dispatch->get_media_input()->initial_skip() - _current_pos;
 }
- if (_media_input->duration() > 0)
+ if (global_dispatch->get_media_input()->duration() > 0)
 {
- if (_seek_request > 0 && _current_pos + _seek_request >= std::max(_start_pos + _media_input->duration() - 2000000, static_cast<int64_t>(0)))
+ if (_seek_request > 0 && _current_pos + _seek_request >= std::max(_start_pos + global_dispatch->get_media_input()->duration() - 2000000, static_cast<int64_t>(0)))
 {
- _seek_request = std::max(_start_pos + _media_input->duration() - 2000000 - _current_pos, static_cast<int64_t>(0));
+ _seek_request = std::max(_start_pos + global_dispatch->get_media_input()->duration() - 2000000 - _current_pos, static_cast<int64_t>(0));
 }
 }
 *seek_to = _current_pos + _seek_request;
 }
 _seek_request = 0;
 _set_pos_request = -1.0f;
- _media_input->seek(*seek_to);
+ global_dispatch->get_media_input()->seek(*seek_to);
 _next_subtitle_box = subtitle_box();
 _current_subtitle_box = subtitle_box();
 
- _media_input->start_video_frame_read();
- _video_frame = _media_input->finish_video_frame_read();
+ global_dispatch->get_media_input()->start_video_frame_read();
+ _video_frame = global_dispatch->get_media_input()->finish_video_frame_read();
 if (!_video_frame.is_valid())
 {
 msg::dbg("Seeked to end of video?!");
- stop_playback();
 return 0;
 }
 _video_pos = _video_frame.presentation_time;
- if (_media_input->selected_subtitle_stream() >= 0)
+ if (global_dispatch->get_media_input()->selected_subtitle_stream() >= 0)
 {
 do
 {
- _media_input->start_subtitle_box_read();
- _next_subtitle_box = _media_input->finish_subtitle_box_read();
+ global_dispatch->get_media_input()->start_subtitle_box_read();
+ _next_subtitle_box = global_dispatch->get_media_input()->finish_subtitle_box_read();
 if (!_next_subtitle_box.is_valid())
 {
 msg::dbg("Seeked to end of subtitle?!");
- stop_playback();
 return 0;
 }
 }
 while (_next_subtitle_box.presentation_stop_time < _video_pos);
 }
- if (_audio_output)
+ if (global_dispatch->get_audio_output()
+ && global_dispatch->get_media_input()->selected_audio_stream() >= 0)
 {
- _audio_output->stop();
- _media_input->start_audio_blob_read(_audio_output->required_initial_data_size());
- audio_blob blob = _media_input->finish_audio_blob_read();
+ global_dispatch->get_audio_output()->stop();
+ global_dispatch->get_media_input()->start_audio_blob_read(global_dispatch->get_audio_output()->required_initial_data_size());
+ audio_blob blob = global_dispatch->get_media_input()->finish_audio_blob_read();
 if (!blob.is_valid())
 {
 msg::dbg("Seeked to end of audio?!");
- stop_playback();
 return 0;
 }
 _audio_pos = blob.presentation_time;
- _audio_output->data(blob);
- _media_input->start_audio_blob_read(_audio_output->required_update_data_size());
- _master_time_start = _audio_output->start();
+ global_dispatch->get_audio_output()->data(blob);
+ global_dispatch->get_media_input()->start_audio_blob_read(global_dispatch->get_audio_output()->required_update_data_size());
+ _master_time_start = global_dispatch->get_audio_output()->start();
 _master_time_pos = _audio_pos;
 _current_pos = _audio_pos;
 }
@@ -482,36 +260,45 @@
 _master_time_pos = _video_pos;
 _current_pos = _video_pos;
 }
- controller::notify_all(notification::pos, normalize_pos(old_pos), normalize_pos(_current_pos));
- _need_frame_now = false;
- _need_frame_soon = true;
+ global_dispatch->set_position(normalize_pos(_current_pos));
+ set_current_subtitle_box();
+ _recently_seeked = true;
+ *prep_frame = true;
+ *more_steps = true;
+ return 0;
+ }
+ else if (_recently_seeked)
+ {
+ _recently_seeked = false;
+ _need_frame_now = true;
+ _need_frame_soon = false;
 _previous_frame_dropped = false;
+ *display_frame = true;
 *more_steps = true;
- *prep_frame = true;
- set_current_subtitle_box();
 return 0;
 }
 else if (_pause_request)
 {
 if (!_in_pause)
 {
- if (_audio_output)
+ if (global_dispatch->get_audio_output()
+ && global_dispatch->get_media_input()->selected_audio_stream() >= 0)
 {
- _audio_output->pause();
+ global_dispatch->get_audio_output()->pause();
 }
 else
 {
 _pause_start = timer::get_microseconds(timer::monotonic);
 }
 _in_pause = true;
- controller::notify_all(notification::pause, false, true);
+ global_dispatch->set_pausing(true);
 }
 *more_steps = true;
 return 1000; // allow some sleep in pause mode
 }
 else if (_need_frame_now)
 {
- _video_frame = _media_input->finish_video_frame_read();
+ _video_frame = global_dispatch->get_media_input()->finish_video_frame_read();
 if (!_video_frame.is_valid())
 {
 if (_first_frame)
@@ -522,15 +309,11 @@
 else
 {
 msg::dbg("End of video stream.");
- if (_params.loop_mode == parameters::loop_current)
+ if (dispatch::parameters().loop_mode() == parameters::loop_current)
 {
 _set_pos_request = 0.0f;
 *more_steps = true;
 }
- else
- {
- stop_playback();
- }
 return 0;
 }
 }
@@ -539,23 +322,24 @@
 _first_frame = false;
 }
 _video_pos = _video_frame.presentation_time;
- if (_media_input->selected_subtitle_stream() >= 0)
+ if (global_dispatch->get_media_input()->selected_subtitle_stream() >= 0)
 {
 while (_next_subtitle_box.is_valid()
 && _next_subtitle_box.presentation_stop_time < _video_pos)
 {
- _next_subtitle_box = _media_input->finish_subtitle_box_read();
- _media_input->start_subtitle_box_read();
+ _next_subtitle_box = global_dispatch->get_media_input()->finish_subtitle_box_read();
+ global_dispatch->get_media_input()->start_subtitle_box_read();
 // If the box is invalid, we reached the end of the subtitle stream.
 // Ignore this and let audio/video continue.
 }
 }
- if (!_audio_output)
+ if (!global_dispatch->get_audio_output()
+ || global_dispatch->get_media_input()->selected_audio_stream() < 0)
 {
 _master_time_start += (_video_pos - _master_time_pos);
 _master_time_pos = _video_pos;
 _current_pos = _video_pos;
- controller::notify_all(notification::pos, normalize_pos(_current_pos), normalize_pos(_current_pos));
+ global_dispatch->set_position(normalize_pos(_current_pos));
 }
 _need_frame_now = false;
 _need_frame_soon = true;
@@ -573,7 +357,7 @@
 }
 else if (_need_frame_soon)
 {
- _media_input->start_video_frame_read();
+ global_dispatch->get_media_input()->start_video_frame_read();
 _need_frame_soon = false;
 *more_steps = true;
 return 0;
@@ -582,48 +366,46 @@
 {
 if (_in_pause)
 {
- if (_audio_output)
+ if (global_dispatch->get_audio_output()
+ && global_dispatch->get_media_input()->selected_audio_stream() >= 0)
 {
- _audio_output->unpause();
+ global_dispatch->get_audio_output()->unpause();
 }
 else
 {
 _master_time_start += timer::get_microseconds(timer::monotonic) - _pause_start;
 }
 _in_pause = false;
- controller::notify_all(notification::pause, true, false);
+ global_dispatch->set_pausing(false);
 }
 
- if (_audio_output)
+ if (global_dispatch->get_audio_output()
+ && global_dispatch->get_media_input()->selected_audio_stream() >= 0)
 {
 // Check if audio needs more data, and get audio time
 bool need_audio_data;
- _master_time_current = _audio_output->status(&need_audio_data) - _master_time_start + _master_time_pos;
+ _master_time_current = global_dispatch->get_audio_output()->status(&need_audio_data) - _master_time_start + _master_time_pos;
 // Output requested audio data
 if (need_audio_data)
 {
- audio_blob blob = _media_input->finish_audio_blob_read();
+ audio_blob blob = global_dispatch->get_media_input()->finish_audio_blob_read();
 if (!blob.is_valid())
 {
 msg::dbg("End of audio stream.");
- if (_params.loop_mode == parameters::loop_current)
+ if (dispatch::parameters().loop_mode() == parameters::loop_current)
 {
 _set_pos_request = 0.0f;
 *more_steps = true;
 }
- else
- {
- stop_playback();
- }
 return 0;
 }
 _audio_pos = blob.presentation_time;
 _master_time_start += (_audio_pos - _master_time_pos);
 _master_time_pos = _audio_pos;
- _audio_output->data(blob);
- _media_input->start_audio_blob_read(_audio_output->required_update_data_size());
+ global_dispatch->get_audio_output()->data(blob);
+ global_dispatch->get_media_input()->start_audio_blob_read(global_dispatch->get_audio_output()->required_update_data_size());
 _current_pos = _audio_pos;
- controller::notify_all(notification::pos, normalize_pos(_current_pos), normalize_pos(_current_pos));
+ global_dispatch->set_position(normalize_pos(_current_pos));
 }
 }
 else
@@ -634,20 +416,32 @@
 }
 
 int64_t allowable_sleep = 0;
- if (_master_time_current >= _video_pos || _benchmark || _media_input->is_device())
+ int64_t next_frame_presentation_time = _master_time_current + dispatch::parameters().audio_delay();
+ if (dispatch::video_output())
+ next_frame_presentation_time += dispatch::video_output()->time_to_next_frame_presentation();
+ if (next_frame_presentation_time >= _video_pos
+ || dispatch::parameters().benchmark()
+ || global_dispatch->get_media_input()->is_device())
 {
 // Output current video frame
 _drop_next_frame = false;
- if (_master_time_current - _video_pos > _media_input->video_frame_duration() * 75 / 100
- && !_benchmark && !_media_input->is_device())
+ int64_t delay = next_frame_presentation_time - _video_pos;
+ if (delay > global_dispatch->get_media_input()->video_frame_duration() * 75 / 100
+ && !dispatch::parameters().benchmark()
+ && !global_dispatch->get_media_input()->is_device()
+ && !_step_request)
 {
- msg::wrn(_("Video: delay %g seconds; dropping next frame."), (_master_time_current - _video_pos) / 1e6f);
+ msg::wrn(_("Video: delay %g seconds/%g frames; dropping next frame."),
+ float(delay) / 1e6f, 
+ float(delay) / float(global_dispatch->get_media_input()->video_frame_duration()));
 _drop_next_frame = true;
 }
 if (!_previous_frame_dropped)
 {
 *display_frame = true;
- if (_benchmark)
+ if (_step_request)
+ _pause_request = true;
+ if (dispatch::parameters().benchmark())
 {
 _frames_shown++;
 if (_frames_shown == 100) //show fps each 100 frames
@@ -665,7 +459,7 @@
 }
 else
 {
- allowable_sleep = _video_pos - _master_time_current;
+ allowable_sleep = _video_pos - next_frame_presentation_time;
 if (allowable_sleep < 100)
 {
 allowable_sleep = 0;
@@ -698,21 +492,21 @@
 }
 if (prep_frame)
 {
- if (_current_subtitle_box.is_valid() && _video_output)
+ if (_current_subtitle_box.is_valid() && global_dispatch->get_video_output())
 {
- _master_time_start += _video_output->wait_for_subtitle_renderer();
+ _master_time_start += global_dispatch->get_video_output()->wait_for_subtitle_renderer();
 }
- _video_output->prepare_next_frame(_video_frame, _current_subtitle_box);
+ global_dispatch->get_video_output()->prepare_next_frame(_video_frame, _current_subtitle_box);
 }
 else if (drop_frame)
 {
 }
 else if (display_frame)
 {
- _video_output->activate_next_frame();
+ global_dispatch->get_video_output()->activate_next_frame();
 }
 
- controller::process_all_events();
+ dispatch::process_all_events();
 if (allowed_sleep > 0)
 {
 usleep(allowed_sleep);
@@ -721,419 +515,75 @@
 return true;
 }
 
-void player::run()
+void player::quit_request()
 {
- controller::notify_all(notification::play, false, true);
- while (run_step());
+ _quit_request = true;
 }
 
-void player::close()
+void player::set_pause(bool p)
 {
- reset_playstate();
- if (_audio_output)
- {
- try { _audio_output->deinit(); } catch (...) {}
- destroy_audio_output(_audio_output);
- _audio_output = NULL;
- }
- if (_video_output)
- {
- try { _video_output->deinit(); } catch (...) {}
- destroy_video_output(_video_output);
- _video_output = NULL;
- }
- if (_media_input)
- {
- try { _media_input->close(); } catch (...) {}
- delete _media_input;
- _media_input = NULL;
- }
+ _pause_request = p;
+ if (!p)
+ _step_request = false;
 }
 
-void player::receive_cmd(const command &cmd)
+void player::set_step(bool s)
 {
- std::istringstream p(cmd.param);
- bool flag;
- float oldval;
- float param;
+ _step_request = s;
+ if (s)
+ _pause_request = false;
+}
 
- bool parameters_changed = false;
+void player::seek(int64_t offset)
+{
+ _seek_request = offset;
+}
 
- switch (cmd.type)
- {
- case command::noop:
- break;
- case command::toggle_play:
- _quit_request = true;
- /* notify when request is fulfilled */
- break;
- case command::toggle_stereo_mode_swap:
- _params.stereo_mode_swap = !_params.stereo_mode_swap;
- parameters_changed = true;
- controller::notify_all(notification::stereo_mode_swap, !_params.stereo_mode_swap, _params.stereo_mode_swap);
- break;
- case command::cycle_video_stream:
- if (_media_input->video_streams() > 1
- && _media_input->video_frame_template().stereo_layout != video_frame::separate)
- {
- int oldstream = _media_input->selected_video_stream();
- int newstream = oldstream + 1;
- if (newstream >= _media_input->video_streams())
- {
- newstream = 0;
- }
- _media_input->select_video_stream(newstream);
- controller::notify_all(notification::video_stream, oldstream, newstream);
- _seek_request = -1; // Get position right
- }
- break;
- case command::set_video_stream:
- if (_media_input->video_streams() > 1
- && _media_input->video_frame_template().stereo_layout != video_frame::separate)
- {
- int oldstream = _media_input->selected_video_stream();
- int newstream;
- s11n::load(p, newstream);
- if (newstream < 0 || newstream >= _media_input->video_streams())
- {
- newstream = 0;
- }
- if (newstream != oldstream)
- {
- _media_input->select_video_stream(newstream);
- controller::notify_all(notification::video_stream, oldstream, newstream);
- _seek_request = -1; // Get position right
- }
- }
- break;
- case command::cycle_audio_stream:
- if (_media_input->audio_streams() > 1)
- {
- int oldstream = _media_input->selected_audio_stream();
- int newstream = oldstream + 1;
- if (newstream >= _media_input->audio_streams())
- {
- newstream = 0;
- }
- _media_input->select_audio_stream(newstream);
- controller::notify_all(notification::audio_stream, oldstream, newstream);
- _seek_request = -1; // Get position right
- }
- break;
- case command::set_audio_stream:
- if (_media_input->audio_streams() > 1)
- {
- int oldstream = _media_input->selected_audio_stream();
- int newstream;
- s11n::load(p, newstream);
- if (newstream < 0 || newstream >= _media_input->audio_streams())
- {
- newstream = 0;
- }
- if (newstream != oldstream)
- {
- _media_input->select_audio_stream(newstream);
- controller::notify_all(notification::audio_stream, oldstream, newstream);
- _seek_request = -1; // Get position right
- }
- }
- break;
- case command::cycle_subtitle_stream:
- if (_media_input->subtitle_streams() > 1)
- {
- int oldstream = _media_input->selected_subtitle_stream();
- int newstream = oldstream + 1;
- if (newstream >= _media_input->subtitle_streams())
- {
- newstream = -1;
- }
- _media_input->select_subtitle_stream(newstream);
- controller::notify_all(notification::subtitle_stream, oldstream, newstream);
- _seek_request = -1; // Get position right
- }
- break;
- case command::set_subtitle_stream:
- if (_media_input->subtitle_streams() > 0)
- {
- int oldstream = _media_input->selected_subtitle_stream();
- int newstream;
- s11n::load(p, newstream);
- if (newstream < -1 || newstream >= _media_input->subtitle_streams())
- {
- newstream = -1;
- }
- if (newstream != oldstream)
- {
- _media_input->select_subtitle_stream(newstream);
- controller::notify_all(notification::subtitle_stream, oldstream, newstream);
- _seek_request = -1; // Get position right
- }
- }
- break;
- case command::set_stereo_layout:
- {
- int stereo_layout;
- bool stereo_layout_swap;
- s11n::load(p, stereo_layout);
- s11n::load(p, stereo_layout_swap);
- _media_input->set_stereo_layout(static_cast<video_frame::stereo_layout_t>(stereo_layout), stereo_layout_swap);
- if (stereo_layout == video_frame::separate)
- {
- _seek_request = -1; // Get position of both streams right
- }
- }
- break;
- case command::set_stereo_mode:
- {
- int stereo_mode;
- bool stereo_mode_swap;
- s11n::load(p, stereo_mode);
- s11n::load(p, stereo_mode_swap);
- _params.stereo_mode = static_cast<parameters::stereo_mode_t>(stereo_mode);
- _params.stereo_mode_swap = stereo_mode_swap;
- parameters_changed = true;
- }
- break;
- case command::toggle_fullscreen:
- flag = false;
- if (_video_output)
- {
- flag = _video_output->toggle_fullscreen(_params.fullscreen_screens);
- }
- controller::notify_all(notification::fullscreen, flag, !flag);
- break;
- case command::center:
- if (_video_output)
- {
- _video_output->center();
- }
- controller::notify_all(notification::center);
- break;
- case command::toggle_pause:
- _pause_request = !_pause_request;
- /* notify when request is fulfilled */
- break;
- case command::adjust_contrast:
- s11n::load(p, param);
- oldval = _params.contrast;
- _params.contrast = std::max(std::min(_params.contrast + param, 1.0f), -1.0f);
- parameters_changed = true;
- controller::notify_all(notification::contrast, oldval, _params.contrast);
- break;
- case command::set_contrast:
- s11n::load(p, param);
- oldval = _params.contrast;
- _params.contrast = std::max(std::min(param, 1.0f), -1.0f);
- parameters_changed = true;
- controller::notify_all(notification::contrast, oldval, _params.contrast);
- break;
- case command::adjust_brightness:
- s11n::load(p, param);
- oldval = _params.brightness;
- _params.brightness = std::max(std::min(_params.brightness + param, 1.0f), -1.0f);
- parameters_changed = true;
- controller::notify_all(notification::brightness, oldval, _params.brightness);
- break;
- case command::set_brightness:
- s11n::load(p, param);
- oldval = _params.brightness;
- _params.brightness = std::max(std::min(param, 1.0f), -1.0f);
- parameters_changed = true;
- controller::notify_all(notification::brightness, oldval, _params.brightness);
- break;
- case command::adjust_hue:
- s11n::load(p, param);
- oldval = _params.hue;
- _params.hue = std::max(std::min(_params.hue + param, 1.0f), -1.0f);
- parameters_changed = true;
- controller::notify_all(notification::hue, oldval, _params.hue);
- break;
- case command::set_hue:
- s11n::load(p, param);
- oldval = _params.hue;
- _params.hue = std::max(std::min(param, 1.0f), -1.0f);
- parameters_changed = true;
- controller::notify_all(notification::hue, oldval, _params.hue);
- break;
- case command::adjust_saturation:
- s11n::load(p, param);
- oldval = _params.saturation;
- _params.saturation = std::max(std::min(_params.saturation + param, 1.0f), -1.0f);
- parameters_changed = true;
- controller::notify_all(notification::saturation, oldval, _params.saturation);
- break;
- case command::set_saturation:
- s11n::load(p, param);
- oldval = _params.saturation;
- _params.saturation = std::max(std::min(param, 1.0f), -1.0f);
- parameters_changed = true;
- controller::notify_all(notification::saturation, oldval, _params.saturation);
- break;
- case command::adjust_parallax:
- s11n::load(p, param);
- oldval = _params.parallax;
- _params.parallax = std::max(std::min(_params.parallax + param, 1.0f), -1.0f);
- parameters_changed = true;
- controller::notify_all(notification::parallax, oldval, _params.parallax);
- break;
- case command::set_parallax:
- s11n::load(p, param);
- oldval = _params.parallax;
- _params.parallax = std::max(std::min(param, 1.0f), -1.0f);
- parameters_changed = true;
- controller::notify_all(notification::parallax, oldval, _params.parallax);
- break;
- case command::set_crosstalk:
- {
- float r, g, b;
- std::ostringstream oldval, newval;
- s11n::load(p, r);
- s11n::load(p, g);
- s11n::load(p, b);
- s11n::save(oldval, _params.crosstalk_r);
- s11n::save(oldval, _params.crosstalk_g);
- s11n::save(oldval, _params.crosstalk_b);
- _params.crosstalk_r = std::max(std::min(r, 1.0f), 0.0f);
- _params.crosstalk_g = std::max(std::min(g, 1.0f), 0.0f);
- _params.crosstalk_b = std::max(std::min(b, 1.0f), 0.0f);
- s11n::save(newval, _params.crosstalk_r);
- s11n::save(newval, _params.crosstalk_g);
- s11n::save(newval, _params.crosstalk_b);
- parameters_changed = true;
- controller::notify_all(notification::crosstalk, oldval.str(), newval.str());
- }
- break;
- case command::adjust_ghostbust:
- s11n::load(p, param);
- oldval = _params.ghostbust;
- _params.ghostbust = std::max(std::min(_params.ghostbust + param, 1.0f), 0.0f);
- parameters_changed = true;
- controller::notify_all(notification::ghostbust, oldval, _params.ghostbust);
- break;
- case command::set_ghostbust:
- s11n::load(p, param);
- oldval = _params.ghostbust;
- _params.ghostbust = std::max(std::min(param, 1.0f), 0.0f);
- parameters_changed = true;
- controller::notify_all(notification::ghostbust, oldval, _params.ghostbust);
- break;
- case command::set_subtitle_encoding:
- {
- std::string oldenc = _params.subtitle_encoding;
- s11n::load(p, _params.subtitle_encoding);
- parameters_changed = true;
- controller::notify_all(notification::subtitle_encoding, oldenc, _params.subtitle_encoding);
- break;
- }
- case command::set_subtitle_font:
- {
- std::string oldfont = _params.subtitle_font;
- s11n::load(p, _params.subtitle_font);
- parameters_changed = true;
- controller::notify_all(notification::subtitle_font, oldfont, _params.subtitle_font);
- break;
- }
- case command::set_subtitle_size:
- {
- int oldval = _params.subtitle_size;
- s11n::load(p, _params.subtitle_size);
- parameters_changed = true;
- controller::notify_all(notification::subtitle_size, oldval, _params.subtitle_size);
- break;
- }
- case command::set_subtitle_scale:
- s11n::load(p, param);
- oldval = _params.subtitle_scale;
- _params.subtitle_scale = std::max(param, 0.0f);
- parameters_changed = true;
- controller::notify_all(notification::subtitle_scale, oldval, _params.subtitle_scale);
- break;
- case command::set_subtitle_color:
- {
- uint64_t oldval = _params.subtitle_color;
- s11n::load(p, _params.subtitle_color);
- parameters_changed = true;
- controller::notify_all(notification::subtitle_color, oldval, _params.subtitle_color);
- break;
- }
- case command::adjust_subtitle_parallax:
- s11n::load(p, param);
- oldval = _params.subtitle_parallax;
- _params.subtitle_parallax = std::max(std::min(_params.subtitle_parallax + param, 1.0f), -1.0f);
- parameters_changed = true;
- controller::notify_all(notification::parallax, oldval, _params.subtitle_parallax);
- break;
- case command::set_subtitle_parallax:
- s11n::load(p, param);
- oldval = _params.subtitle_parallax;
- _params.subtitle_parallax = std::max(std::min(param, 1.0f), -1.0f);
- parameters_changed = true;
- controller::notify_all(notification::subtitle_parallax, oldval, _params.subtitle_parallax);
- break;
- case command::seek:
- s11n::load(p, param);
- _seek_request = param * 1e6f;
- /* notify when request is fulfilled */
- break;
- case command::set_pos:
- s11n::load(p, param);
- _set_pos_request = param;
- /* notify when request is fulfilled */
- break;
- case command::set_loop_mode:
- {
- int old_loop_mode = static_cast<int>(_params.loop_mode);
- int loop_mode;
- s11n::load(p, loop_mode);
- _params.loop_mode = static_cast<parameters::loop_mode_t>(loop_mode);
- parameters_changed = true;
- controller::notify_all(notification::loop_mode, old_loop_mode, loop_mode);
- }
- break;
- case command::set_fullscreen_screens:
- {
- int old_screen = _params.fullscreen_screens;
- s11n::load(p, _params.fullscreen_screens);
- parameters_changed = true;
- controller::notify_all(notification::fullscreen_screens, old_screen, _params.fullscreen_screens);
- }
- break;
- case command::set_fullscreen_flip_left:
- {
- int old = _params.fullscreen_flip_left;
- s11n::load(p, _params.fullscreen_flip_left);
- parameters_changed = true;
- controller::notify_all(notification::fullscreen_flip_left, old, _params.fullscreen_flip_left);
- }
- break;
- case command::set_fullscreen_flop_left:
- {
- int old = _params.fullscreen_flop_left;
- s11n::load(p, _params.fullscreen_flop_left);
- parameters_changed = true;
- controller::notify_all(notification::fullscreen_flop_left, old, _params.fullscreen_flop_left);
- }
- break;
- case command::set_fullscreen_flip_right:
- {
- int old = _params.fullscreen_flip_right;
- s11n::load(p, _params.fullscreen_flip_right);
- parameters_changed = true;
- controller::notify_all(notification::fullscreen_flip_right, old, _params.fullscreen_flip_right);
- }
- break;
- case command::set_fullscreen_flop_right:
- {
- int old = _params.fullscreen_flop_right;
- s11n::load(p, _params.fullscreen_flop_right);
- parameters_changed = true;
- controller::notify_all(notification::fullscreen_flop_right, old, _params.fullscreen_flop_right);
- }
- break;
- }
+void player::set_pos(float pos)
+{
+ _set_pos_request = pos;
+}
 
- if (parameters_changed && _video_output)
- {
- _video_output->set_parameters(_params);
- }
+int player::set_video_stream(int s)
+{
+ if (s < 0 || s >= global_dispatch->get_media_input()->video_streams())
+ s = 0;
+ global_dispatch->get_media_input()->select_video_stream(s);
+ _seek_request = -1; // Get position right
+ return s;
+}
+
+int player::set_audio_stream(int s)
+{
+ if (s < 0 || s >= global_dispatch->get_media_input()->audio_streams())
+ s = 0;
+ global_dispatch->get_media_input()->select_audio_stream(s);
+ _seek_request = -1; // Get position right
+ return s;
+}
+
+int player::set_subtitle_stream(int s)
+{
+ if (s < -1 || s >= global_dispatch->get_media_input()->subtitle_streams())
+ s = -1;
+ global_dispatch->get_media_input()->select_subtitle_stream(s);
+ _seek_request = -1; // Get position right
+ return s;
+}
+
+void player::set_stereo_layout(parameters::stereo_layout_t stereo_layout)
+{
+ global_dispatch->get_media_input()->set_stereo_layout(stereo_layout, dispatch::parameters().stereo_layout_swap());
+ if (stereo_layout == parameters::layout_separate)
+ _seek_request = -1; // Get position of both streams right
+}
+
+void player::set_stereo_layout_swap(bool swap)
+{
+ global_dispatch->get_media_input()->set_stereo_layout(dispatch::parameters().stereo_layout(), swap);
+}
+
+float player::get_pos() const
+{
+ return normalize_pos(_current_pos);
 }

bino-1.2.1.tar.bz2/src/player.h -> bino-1.3.2.tar.xz/src/player.h Changed

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

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010-2011
+ * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 * Stefan Eilemann <eile@eyescale.ch>
 *
@@ -34,6 +34,8 @@
 #include "msg.h"
 #include "s11n.h"
 
+#include "dispatch.h"
+#include "media_input.h"
 #include "video_output.h"
 #include "player_equalizer.h"
 
@@ -55,6 +57,7 @@
 * the video.
 */
 
+extern dispatch* global_dispatch;
 
 /*
 * player_eq_node
@@ -66,50 +69,25 @@
 class player_eq_node : public player
 {
 private:
- bool _is_master;
-
-protected:
- video_output *create_video_output()
- {
- // A node does not have its own video output; this is handled via eq_window.
- return NULL;
- }
-
- void destory_video_output(video_output *)
- {
- }
-
- audio_output *create_audio_output()
- {
- // Only the master player may have an audio output.
- return _is_master ? new audio_output() : NULL;
- }
-
- void destroy_audio_output(audio_output *ao)
- {
- delete ao;
- }
+ class media_input _media_input;
 
 public:
- player_eq_node() : player(player::slave), _is_master(false)
+ player_eq_node() : player()
 {
 }
 
- void make_master()
+ bool init(const open_input_data& input)
 {
- player::make_master();
- _is_master = true;
- }
-
- bool init(const player_init_data &init_data, video_frame &frame_template)
- {
- try
- {
- player::open(init_data);
- frame_template = get_media_input().video_frame_template();
+ try {
+ _media_input.open(input.urls, input.dev_request);
+ if (_media_input.video_streams() == 0)
+ throw exc(_("No video streams found."));
+ if (input.params.stereo_layout_is_set() || input.params.stereo_layout_swap_is_set())
+ _media_input.set_stereo_layout(input.params.stereo_layout(), input.params.stereo_layout_swap());
+ _media_input.select_video_stream(input.params.video_stream());
+ player::open();
 }
- catch (std::exception &e)
- {
+ catch (std::exception& e) {
 msg::err("%s", e.what());
 return false;
 }
@@ -118,7 +96,7 @@
 
 void seek(int64_t pos)
 {
- get_media_input_nonconst().seek(pos);
+ _media_input.seek(pos);
 // The master player read a video frame; do the same to keep sync
 start_frame_read();
 }
@@ -126,35 +104,19 @@
 void start_frame_read()
 {
 // Only called on slave nodes
- get_media_input_nonconst().start_video_frame_read();
+ _media_input.start_video_frame_read();
 }
 
 void finish_frame_read()
 {
 // Only called on slave nodes
- _video_frame = get_media_input_nonconst().finish_video_frame_read();
+ _video_frame = _media_input.finish_video_frame_read();
 if (!_video_frame.is_valid())
 {
 msg::err(_("Reading input frame failed."));
 std::exit(1);
 }
 }
-
- void step(bool *more_steps, int64_t *seek_to, bool *prep_frame, bool *drop_frame, bool *display_frame)
- {
- // Only called on the master node
- player::step(more_steps, seek_to, prep_frame, drop_frame, display_frame);
- }
-
- const video_frame &get_video_frame()
- {
- return _video_frame;
- }
-
- const subtitle_box &get_subtitle()
- {
- return _current_subtitle_box;
- }
 };
 
 /*
@@ -172,16 +134,27 @@
 eq::Channel *_channel;
 const float _canvas_width;
 const float _canvas_height;
- const float _canvas_video_area_w;
- const float _canvas_video_area_h;
+ float _canvas_video_area_w;
+ float _canvas_video_area_h;
 
 protected:
- int video_display_width() { return screen_width() * _canvas_video_area_w; }
- int video_display_height() { return screen_height() * _canvas_video_area_h; }
- void make_context_current() { _channel->getWindow()->makeCurrent(); }
- bool context_is_stereo() { return false; }
+ int video_display_width() const { return screen_width() * _canvas_video_area_w; }
+ int video_display_height() const { return screen_height() * _canvas_video_area_h; }
+ int screen_width() const { return _channel->getPixelViewport().w / _channel->getViewport().w; }
+ int screen_height() const { return _channel->getPixelViewport().h / _channel->getViewport().h; }
+ float screen_pixel_aspect_ratio() const
+ {
+ float pixels_per_unit_x = _channel->getPixelViewport().w / (_canvas_width * _channel->getViewport().w);
+ float pixels_per_unit_y = _channel->getPixelViewport().h / (_canvas_height * _channel->getViewport().h);
+ return pixels_per_unit_y / pixels_per_unit_x;
+ }
+ int width() const { return _channel->getPixelViewport().w; }
+ int height() const { return _channel->getPixelViewport().h; }
+ int pos_x() const { return 0; }
+ int pos_y() const { return 0; }
+ GLEWContext* glewGetContext() const { return const_cast<GLEWContext*>(_channel->getWindow()->glewGetContext()); }
+ bool context_is_stereo() const { return false; }
 void recreate_context(bool) { }
- void trigger_update() { }
 void trigger_resize(int, int) { }
 
 public:
@@ -206,47 +179,51 @@
 return 0;
 }
 bool supports_stereo() const { return false; }
- int screen_width() { return _channel->getPixelViewport().w / _channel->getViewport().w; }
- int screen_height() { return _channel->getPixelViewport().h / _channel->getViewport().h; }
- float screen_pixel_aspect_ratio()
- {
- float pixels_per_unit_x = _channel->getPixelViewport().w / (_canvas_width * _channel->getViewport().w);
- float pixels_per_unit_y = _channel->getPixelViewport().h / (_canvas_height * _channel->getViewport().h);
- return pixels_per_unit_y / pixels_per_unit_x;
- }
- int width() { return _channel->getPixelViewport().w; }
- int height() { return _channel->getPixelViewport().h; }
- int pos_x() { return 0; }
- int pos_y() { return 0; }
- bool fullscreen() { return false; }
 void center() { }
- void enter_fullscreen(int) { }
+ void enter_fullscreen() { }
 void exit_fullscreen() { }
- bool toggle_fullscreen(int) { return false; }
- bool has_events() { return false; }
 void process_events() { }
- void receive_notification(const notification &) { }
 
 public:
 video_output_eq_channel(eq::Channel *channel,
- float canvas_width, float canvas_height,
- float canvas_video_area_w, float canvas_video_area_h) :
+ float canvas_width, float canvas_height) :
 video_output(),
 _channel(channel),
 _canvas_width(canvas_width),
- _canvas_height(canvas_height),
- _canvas_video_area_w(canvas_video_area_w),
- _canvas_video_area_h(canvas_video_area_h)
+ _canvas_height(canvas_height)
 {
 }
 
+ void set_canvas_size(float canvas_video_area_w, float canvas_video_area_h)
+ {
+ _canvas_video_area_w = canvas_video_area_w;
+ _canvas_video_area_h = canvas_video_area_h;
+ }
+
 void display_current_frame(bool mono_right_instead_of_left,
- float x, float y, float w, float h, const GLint viewport[4])
+ float x, float y, float w, float h,
+ const GLint viewport[4], const float tex_coords[4][2])
 {
+ float my_tex_coords[2][4][2] =
+ {
+ {
+ { tex_coords[0][0], tex_coords[0][1] },
+ { tex_coords[1][0], tex_coords[1][1] },
+ { tex_coords[2][0], tex_coords[2][1] },
+ { tex_coords[3][0], tex_coords[3][1] },
+ },
+ {
+ { tex_coords[0][0], tex_coords[0][1] },
+ { tex_coords[1][0], tex_coords[1][1] },
+ { tex_coords[2][0], tex_coords[2][1] },
+ { tex_coords[3][0], tex_coords[3][1] },
+ },
+ };
 GLint vp[2][4];
 std::memcpy(vp[0], viewport, 4 * sizeof(int));
 std::memcpy(vp[1], viewport, 4 * sizeof(int));
- video_output::display_current_frame(true, mono_right_instead_of_left, x, y, w, h, vp);
+ video_output::display_current_frame(0, true, mono_right_instead_of_left,
+ x, y, w, h, vp, my_tex_coords);
 }
 };
 
@@ -303,20 +280,15 @@
 {
 public:
 eq::uint128_t frame_data_id;
- player_init_data init_data;
+ open_input_data input;
+ parameters params;
 bool flat_screen;
 float canvas_width;
 float canvas_height;
- struct { float x, y, w, h, d; } canvas_video_area;
 
- eq_init_data() : init_data()
+ eq_init_data()
 {
 flat_screen = true;
- canvas_video_area.x = 0.0f;
- canvas_video_area.y = 0.0f;
- canvas_video_area.w = 1.0f;
- canvas_video_area.h = 1.0f;
- canvas_video_area.d = 1.0f;
 }
 
 virtual ~eq_init_data()
@@ -334,15 +306,11 @@
 std::ostringstream oss;
 s11n::save(oss, frame_data_id.high());
 s11n::save(oss, frame_data_id.low());
- s11n::save(oss, init_data);
+ s11n::save(oss, input);
+ s11n::save(oss, params);
 s11n::save(oss, flat_screen);
 s11n::save(oss, canvas_width);
 s11n::save(oss, canvas_height);
- s11n::save(oss, canvas_video_area.x);
- s11n::save(oss, canvas_video_area.y);
- s11n::save(oss, canvas_video_area.w);
- s11n::save(oss, canvas_video_area.h);
- s11n::save(oss, canvas_video_area.d);
 os << oss.str();
 }
 
@@ -353,15 +321,11 @@
 std::istringstream iss(s);
 s11n::load(iss, frame_data_id.high());
 s11n::load(iss, frame_data_id.low());
- s11n::load(iss, init_data);
+ s11n::load(iss, input);
+ s11n::load(iss, params);
 s11n::load(iss, flat_screen);
 s11n::load(iss, canvas_width);
 s11n::load(iss, canvas_height);
- s11n::load(iss, canvas_video_area.x);
- s11n::load(iss, canvas_video_area.y);
- s11n::load(iss, canvas_video_area.w);
- s11n::load(iss, canvas_video_area.h);
- s11n::load(iss, canvas_video_area.d);
 }
 };
 
@@ -372,21 +336,23 @@
 class eq_frame_data : public co::Object
 {
 public:
+ std::string dispatch_state;
 subtitle_box subtitle;
- parameters params;
 int64_t seek_to;
 bool prep_frame;
 bool drop_frame;
 bool display_frame;
+ bool display_statistics;
+ struct { float x, y, w, h, d; } canvas_video_area;
+ float tex_coords[4][2];
 
 public:
 eq_frame_data() :
- subtitle(),
- params(),
 seek_to(0),
 prep_frame(false),
 drop_frame(false),
- display_frame(false)
+ display_frame(false),
+ display_statistics(false)
 {
 }
 
@@ -399,12 +365,15 @@
 virtual void getInstanceData(co::DataOStream &os)
 {
 std::ostringstream oss;
+ s11n::save(oss, dispatch_state);
 s11n::save(oss, subtitle);
- s11n::save(oss, params);
 s11n::save(oss, seek_to);
 s11n::save(oss, prep_frame);
 s11n::save(oss, drop_frame);
 s11n::save(oss, display_frame);
+ s11n::save(oss, display_statistics);
+ s11n::save(oss, &canvas_video_area, sizeof(canvas_video_area));
+ s11n::save(oss, tex_coords, sizeof(tex_coords));
 os << oss.str();
 }
 
@@ -413,12 +382,15 @@
 std::string s;
 is >> s;
 std::istringstream iss(s);
+ s11n::load(iss, dispatch_state);
 s11n::load(iss, subtitle);
- s11n::load(iss, params);
 s11n::load(iss, seek_to);
 s11n::load(iss, prep_frame);
 s11n::load(iss, drop_frame);
 s11n::load(iss, display_frame);
+ s11n::load(iss, display_statistics);
+ s11n::load(iss, &canvas_video_area, sizeof(canvas_video_area));
+ s11n::load(iss, tex_coords, sizeof(tex_coords));
 }
 };
 
@@ -432,21 +404,9 @@
 bool _is_master_config;
 eq_init_data _eq_init_data; // Master eq_init_data instance
 eq_frame_data _eq_frame_data; // Master eq_frame_data instance
- player_eq_node _player; // Master player
- controller _controller; // Sends commands to the player
-
-public:
- video_frame frame_template; // Video frame properties
 
 public:
- eq_config(eq::ServerPtr parent) :
- eq::Config(parent),
- _is_master_config(false),
- _eq_init_data(),
- _eq_frame_data(),
- _player(),
- _controller(),
- frame_template()
+ eq_config(eq::ServerPtr parent) : eq::Config(parent), _is_master_config(false)
 {
 }
 
@@ -455,23 +415,16 @@
 return _is_master_config;
 }
 
- bool init(const player_init_data &init_data, bool flat_screen)
+ bool init(const open_input_data& input, bool flat_screen)
 {
- msg::set_level(init_data.log_level);
 msg::dbg(HERE);
 // If this function is called, then this is the master config
 _is_master_config = true;
 // Initialize master init/frame data instances
- _eq_init_data.init_data = init_data;
+ _eq_init_data.input = input;
+ _eq_init_data.params = dispatch::parameters();
 _eq_init_data.flat_screen = flat_screen;
- _eq_frame_data.params = _eq_init_data.init_data.params;
- // Initialize master player
- _player.make_master();
- if (!_player.init(init_data, frame_template))
- {
- return false;
- }
- // Find region of canvas to use, depending on the video aspect ratio
+ // Find canvas
 if (getCanvases().size() < 1)
 {
 msg::err(_("No canvas in Equalizer configuration."));
@@ -479,42 +432,9 @@
 }
 float canvas_w = getCanvases()[0]->getWall().getWidth();
 float canvas_h = getCanvases()[0]->getWall().getHeight();
- float canvas_aspect_ratio = canvas_w / canvas_h;
 _eq_init_data.canvas_width = canvas_w;
 _eq_init_data.canvas_height = canvas_h;
- _eq_init_data.canvas_video_area.w = 1.0f;
- _eq_init_data.canvas_video_area.h = 1.0f;
-
- if (flat_screen)
- {
- if (frame_template.aspect_ratio > canvas_aspect_ratio)
- {
- // need black borders top and bottom
- _eq_init_data.canvas_video_area.h = canvas_aspect_ratio / frame_template.aspect_ratio;
- }
- else
- {
- // need black borders left and right
- _eq_init_data.canvas_video_area.w = frame_template.aspect_ratio / canvas_aspect_ratio;
- }
- _eq_init_data.canvas_video_area.x = (1.0f - _eq_init_data.canvas_video_area.w) / 2.0f;
- _eq_init_data.canvas_video_area.y = (1.0f - _eq_init_data.canvas_video_area.h) / 2.0f;
- }
- else
- {
- compute_3d_canvas(&_eq_init_data.canvas_video_area.h, &_eq_init_data.canvas_video_area.d);
- // compute width and offset for 1m high 'screen' quad in 3D space
- _eq_init_data.canvas_video_area.w = _eq_init_data.canvas_video_area.h * frame_template.aspect_ratio;
- _eq_init_data.canvas_video_area.x = -0.5f * _eq_init_data.canvas_video_area.w;
- _eq_init_data.canvas_video_area.y = -0.5f * _eq_init_data.canvas_video_area.h;
- }
- msg::inf(_("Equalizer canvas:"));
- msg::inf(4, _("%gx%g, aspect ratio %g:1"), canvas_w, canvas_h, canvas_w / canvas_h);
- msg::inf(4, _("Area for %g:1 video: [ %g %g %g %g @ %g ]"),
- frame_template.aspect_ratio,
- _eq_init_data.canvas_video_area.x, _eq_init_data.canvas_video_area.y,
- _eq_init_data.canvas_video_area.w, _eq_init_data.canvas_video_area.h,
- _eq_init_data.canvas_video_area.d);
+ msg::inf(_("Equalizer canvas: %gx%g, aspect ratio %g:1"), canvas_w, canvas_h, canvas_w / canvas_h);
 // Register master instances
 registerObject(&_eq_frame_data);
 _eq_init_data.frame_data_id = _eq_frame_data.getID();
@@ -530,25 +450,98 @@
 // Deregister master instances
 deregisterObject(&_eq_init_data);
 deregisterObject(&_eq_frame_data);
- // Cleanup
- _player.close();
 msg::dbg(HERE);
 return ret;
 }
 
 virtual uint32_t startFrame()
 {
- // Run one player step to find out what to do
+ // Run player steps until we are told to do something
 bool more_steps;
- _player.step(&more_steps, &_eq_frame_data.seek_to,
- &_eq_frame_data.prep_frame, &_eq_frame_data.drop_frame, &_eq_frame_data.display_frame);
+ do {
+ global_dispatch->get_player()->step(&more_steps, &_eq_frame_data.seek_to,
+ &_eq_frame_data.prep_frame, &_eq_frame_data.drop_frame, &_eq_frame_data.display_frame);
+ dispatch::process_all_events();
+ }
+ while (more_steps
+ && _eq_frame_data.seek_to == -1
+ && !_eq_frame_data.prep_frame
+ && !_eq_frame_data.drop_frame
+ && !_eq_frame_data.display_frame
+ && !dispatch::pausing());
 if (!more_steps)
 {
 this->exit();
 }
 // Update the video state for all (it might have changed via handleEvent())
- _eq_frame_data.subtitle = _player.get_subtitle();
- _eq_frame_data.params = _player.get_parameters();
+ _eq_frame_data.subtitle = global_dispatch->get_player()->get_subtitle_box();
+ _eq_frame_data.dispatch_state = global_dispatch->save_state();
+ // Find region of canvas to use, depending on the video aspect ratio and zoom level
+ float aspect_ratio = dispatch::media_input()->video_frame_template().aspect_ratio;
+ float crop_aspect_ratio = dispatch::parameters().crop_aspect_ratio();
+ float canvas_aspect_ratio = _eq_init_data.canvas_width / _eq_init_data.canvas_height;
+ float zoom = dispatch::parameters().zoom();
+ if (_eq_init_data.flat_screen) {
+ _eq_frame_data.tex_coords[0][0] = 0.0f;
+ _eq_frame_data.tex_coords[0][1] = 0.0f;
+ _eq_frame_data.tex_coords[1][0] = 1.0f;
+ _eq_frame_data.tex_coords[1][1] = 0.0f;
+ _eq_frame_data.tex_coords[2][0] = 1.0f;
+ _eq_frame_data.tex_coords[2][1] = 1.0f;
+ _eq_frame_data.tex_coords[3][0] = 0.0f;
+ _eq_frame_data.tex_coords[3][1] = 1.0f;
+ if (crop_aspect_ratio > 0.0f) {
+ if (aspect_ratio >= crop_aspect_ratio) {
+ float cutoff = (1.0f - crop_aspect_ratio / aspect_ratio) / 2.0f;
+ _eq_frame_data.tex_coords[0][0] += cutoff;
+ _eq_frame_data.tex_coords[1][0] -= cutoff;
+ _eq_frame_data.tex_coords[2][0] -= cutoff;
+ _eq_frame_data.tex_coords[3][0] += cutoff;
+ } else {
+ float cutoff = (1.0f - aspect_ratio / crop_aspect_ratio) / 2.0f;
+ _eq_frame_data.tex_coords[0][1] += cutoff;
+ _eq_frame_data.tex_coords[1][1] += cutoff;
+ _eq_frame_data.tex_coords[2][1] -= cutoff;
+ _eq_frame_data.tex_coords[3][1] -= cutoff;
+ }
+ aspect_ratio = crop_aspect_ratio;
+ }
+ if (aspect_ratio >= canvas_aspect_ratio) {
+ // need black borders top and bottom
+ float zoom_aspect_ratio = zoom * canvas_aspect_ratio + (1.0f - zoom) * aspect_ratio;
+ _eq_frame_data.canvas_video_area.w = 1.0f;
+ _eq_frame_data.canvas_video_area.h = canvas_aspect_ratio / zoom_aspect_ratio;
+ _eq_frame_data.canvas_video_area.x = (1.0f - _eq_frame_data.canvas_video_area.w) / 2.0f;
+ _eq_frame_data.canvas_video_area.y = (1.0f - _eq_frame_data.canvas_video_area.h) / 2.0f;
+ float cutoff = (1.0f - zoom_aspect_ratio / aspect_ratio) / 2.0f;
+ _eq_frame_data.tex_coords[0][0] += cutoff;
+ _eq_frame_data.tex_coords[1][0] -= cutoff;
+ _eq_frame_data.tex_coords[2][0] -= cutoff;
+ _eq_frame_data.tex_coords[3][0] += cutoff;
+ } else {
+ // need black borders left and right
+ _eq_frame_data.canvas_video_area.w = aspect_ratio / canvas_aspect_ratio;
+ _eq_frame_data.canvas_video_area.h = 1.0f;
+ _eq_frame_data.canvas_video_area.x = (1.0f - _eq_frame_data.canvas_video_area.w) / 2.0f;
+ _eq_frame_data.canvas_video_area.y = (1.0f - _eq_frame_data.canvas_video_area.h) / 2.0f;
+ }
+ }
+ else
+ {
+ compute_3d_canvas(&_eq_frame_data.canvas_video_area.h, &_eq_frame_data.canvas_video_area.d);
+ // compute width and offset for 1m high 'screen' quad in 3D space
+ _eq_frame_data.canvas_video_area.w = _eq_frame_data.canvas_video_area.h * aspect_ratio;
+ _eq_frame_data.canvas_video_area.x = -0.5f * _eq_frame_data.canvas_video_area.w;
+ _eq_frame_data.canvas_video_area.y = -0.5f * _eq_frame_data.canvas_video_area.h;
+ _eq_frame_data.tex_coords[0][0] = 0.0f;
+ _eq_frame_data.tex_coords[0][1] = 0.0f;
+ _eq_frame_data.tex_coords[1][0] = 1.0f;
+ _eq_frame_data.tex_coords[1][1] = 0.0f;
+ _eq_frame_data.tex_coords[2][0] = 1.0f;
+ _eq_frame_data.tex_coords[2][1] = 1.0f;
+ _eq_frame_data.tex_coords[3][0] = 0.0f;
+ _eq_frame_data.tex_coords[3][1] = 1.0f;
+ }
 // Commit the updated frame data
 const eq::uint128_t version = _eq_frame_data.commit();
 // Start this frame with the committed frame data
@@ -565,11 +558,14 @@
 {
 switch (event->data.keyPress.key)
 {
+ case 'S':
+ _eq_frame_data.display_statistics = !_eq_frame_data.display_statistics;
+ break;
 case 'q':
- _controller.send_cmd(command::toggle_play);
+ controller::send_cmd(command::toggle_play);
 break;
 case 'e':
- _controller.send_cmd(command::toggle_stereo_mode_swap);
+ controller::send_cmd(command::toggle_stereo_mode_swap);
 break;
 case 'f':
 /* fullscreen toggling not supported with Equalizer */
@@ -579,79 +575,88 @@
 break;
 case ' ':
 case 'p':
- _controller.send_cmd(command::toggle_pause);
+ controller::send_cmd(command::toggle_pause);
+ break;
+ case '.':
+ controller::send_cmd(command::step);
 break;
 case 'v':
 /* TODO: cycling video streams is currently not supported with Equalizer.
 * We would have to cycle the streams in all node players, and thus communicate
 * the change via frame data. */
- //_controller.send_cmd(command::cycle_video_stream);
+ //controller::send_cmd(command::cycle_video_stream);
 break;
 case 'a':
 /* TODO: cycling audio streams is currently not supported with Equalizer.
 * We would have to cycle the streams in all node players, and thus communicate
 * the change via frame data. */
- //_controller.send_cmd(command::cycle_audio_stream);
+ //controller::send_cmd(command::cycle_audio_stream);
 break;
 case 's':
 /* TODO: cycling subtitle streams is currently not supported with Equalizer.
 * We would have to cycle the streams in all node players, and thus communicate
 * the change via frame data. */
- //_controller.send_cmd(command::cycle_subtitle_stream);
+ //controller::send_cmd(command::cycle_subtitle_stream);
 break;
 case '1':
- _controller.send_cmd(command::adjust_contrast, -0.05f);
+ controller::send_cmd(command::adjust_contrast, -0.05f);
 break;
 case '2':
- _controller.send_cmd(command::adjust_contrast, +0.05f);
+ controller::send_cmd(command::adjust_contrast, +0.05f);
 break;
 case '3':
- _controller.send_cmd(command::adjust_brightness, -0.05f);
+ controller::send_cmd(command::adjust_brightness, -0.05f);
 break;
 case '4':
- _controller.send_cmd(command::adjust_brightness, +0.05f);
+ controller::send_cmd(command::adjust_brightness, +0.05f);
 break;
 case '5':
- _controller.send_cmd(command::adjust_hue, -0.05f);
+ controller::send_cmd(command::adjust_hue, -0.05f);
 break;
 case '6':
- _controller.send_cmd(command::adjust_hue, +0.05f);
+ controller::send_cmd(command::adjust_hue, +0.05f);
 break;
 case '7':
- _controller.send_cmd(command::adjust_saturation, -0.05f);
+ controller::send_cmd(command::adjust_saturation, -0.05f);
 break;
 case '8':
- _controller.send_cmd(command::adjust_saturation, +0.05f);
+ controller::send_cmd(command::adjust_saturation, +0.05f);
 break;
- case '<':
- _controller.send_cmd(command::adjust_parallax, -0.01f);
+ case '[':
+ controller::send_cmd(command::adjust_parallax, -0.01f);
 break;
- case '>':
- _controller.send_cmd(command::adjust_parallax, +0.01f);
+ case ']':
+ controller::send_cmd(command::adjust_parallax, +0.01f);
 break;
 case '(':
- _controller.send_cmd(command::adjust_ghostbust, -0.01f);
+ controller::send_cmd(command::adjust_ghostbust, -0.01f);
 break;
 case ')':
- _controller.send_cmd(command::adjust_ghostbust, +0.01f);
+ controller::send_cmd(command::adjust_ghostbust, +0.01f);
+ break;
+ case '<':
+ controller::send_cmd(command::adjust_zoom, -0.1f);
+ break;
+ case '>':
+ controller::send_cmd(command::adjust_zoom, +0.1f);
 break;
 case eq::KC_LEFT:
- _controller.send_cmd(command::seek, -10.0f);
+ controller::send_cmd(command::seek, -10.0f);
 break;
 case eq::KC_RIGHT:
- _controller.send_cmd(command::seek, +10.0f);
- break;
- case eq::KC_UP:
- _controller.send_cmd(command::seek, -60.0f);
+ controller::send_cmd(command::seek, +10.0f);
 break;
 case eq::KC_DOWN:
- _controller.send_cmd(command::seek, +60.0f);
+ controller::send_cmd(command::seek, -60.0f);
 break;
- case eq::KC_PAGE_UP:
- _controller.send_cmd(command::seek, -600.0f);
+ case eq::KC_UP:
+ controller::send_cmd(command::seek, +60.0f);
 break;
 case eq::KC_PAGE_DOWN:
- _controller.send_cmd(command::seek, +600.0f);
+ controller::send_cmd(command::seek, -600.0f);
+ break;
+ case eq::KC_PAGE_UP:
+ controller::send_cmd(command::seek, +600.0f);
 break;
 }
 }
@@ -663,16 +668,11 @@
 // Event position relative to destination view (which seems to be the same as the canvas?)
 float dest = event->data.context.vp.x + event_x * event->data.context.vp.w;
 dest = std::min(std::max(dest, 0.0f), 1.0f); // Clamp to [0,1] - just to be sure
- _controller.send_cmd(command::set_pos, dest); // Seek to this position
+ controller::send_cmd(command::set_pos, dest); // Seek to this position
 }
 return true;
 }
 
- player_eq_node *player()
- {
- return &_player;
- }
-
 private:
 void compute_3d_canvas(float *height, float *distance)
 {
@@ -751,22 +751,21 @@
 class eq_node : public eq::Node
 {
 private:
+ dispatch* _dispatch;
 bool _is_app_node;
 player_eq_node _player;
 
 public:
 eq_init_data init_data;
 eq_frame_data frame_data;
- video_frame frame_template;
-
- eq_node(eq::Config *parent) :
- eq::Node(parent),
- _is_app_node(false),
- _player(),
- init_data(),
- frame_data(),
- frame_template()
+
+ eq_node(eq::Config *parent) : eq::Node(parent), _dispatch(NULL), _is_app_node(false)
+ {
+ }
+
+ ~eq_node()
 {
+ delete _dispatch;
 }
 
 protected:
@@ -778,6 +777,7 @@
 }
 // Map our InitData instance to the master instance
 eq_config *config = static_cast<eq_config *>(getConfig());
+ config->setLatency( 0 );
 if (!config->mapObject(&init_data, init_id))
 {
 setError(ERROR_MAP_INITDATA_FAILED);
@@ -795,21 +795,19 @@
 return false;
 }
 
- msg::set_level(init_data.init_data.log_level);
 msg::dbg(HERE);
 // Create decoders and input
 if (!_is_app_node)
 {
- if (!_player.init(init_data.init_data, frame_template))
+ _dispatch = new dispatch(NULL, NULL, true, init_data.flat_screen, true,
+ false, false, init_data.params.log_level(), init_data.params.benchmark(),
+ init_data.params.swap_interval());
+ if (!_player.init(init_data.input))
 {
 setError(ERROR_PLAYER_INIT_FAILED);
 return false;
 }
 }
- else
- {
- frame_template = config->frame_template;
- }
 msg::dbg(HERE);
 return true;
 }
@@ -823,7 +821,8 @@
 // Unmap our InitData instance
 config->unmapObject(&init_data);
 // Cleanup
- _player.close();
+ if (!_is_app_node)
+ _player.close();
 msg::dbg(HERE);
 return eq::Node::configExit();
 }
@@ -839,6 +838,7 @@
 }
 else
 {
+ _dispatch->load_state(frame_data.dispatch_state);
 if (frame_data.seek_to >= 0)
 {
 _player.seek(frame_data.seek_to);
@@ -878,14 +878,9 @@
 const video_frame &get_video_frame()
 {
 if (_is_app_node)
- {
- eq_config *config = static_cast<eq_config *>(getConfig());
- return config->player()->get_video_frame();
- }
+ return global_dispatch->get_player()->get_video_frame();
 else
- {
 return _player.get_video_frame();
- }
 }
 };
 
@@ -913,6 +908,7 @@
 }
 
 protected:
+
 virtual bool configInitGL(const eq::uint128_t &init_id)
 {
 msg::dbg(HERE);
@@ -940,6 +936,13 @@
 msg::dbg(HERE);
 return eq::Window::configExitGL();
 }
+
+ virtual void swapBuffers()
+ {
+ eq_node *node = static_cast<eq_node *>(getNode());
+ if (node->frame_data.display_frame)
+ eq::Window::swapBuffers();
+ }
 };
 
 /*
@@ -956,9 +959,7 @@
 eq::Channel(parent),
 _video_output(this,
 static_cast<eq_node *>(getNode())->init_data.canvas_width,
- static_cast<eq_node *>(getNode())->init_data.canvas_height,
- static_cast<eq_node *>(getNode())->init_data.canvas_video_area.w,
- static_cast<eq_node *>(getNode())->init_data.canvas_video_area.h)
+ static_cast<eq_node *>(getNode())->init_data.canvas_height)
 {
 }
 
@@ -982,12 +983,13 @@
 eq_node *node = static_cast<eq_node *>(getNode());
 const struct { float x, y, w, h, d; } canvas_video_area =
 {
- node->init_data.canvas_video_area.x,
- node->init_data.canvas_video_area.y,
- node->init_data.canvas_video_area.w,
- node->init_data.canvas_video_area.h,
- node->init_data.canvas_video_area.d
+ node->frame_data.canvas_video_area.x,
+ node->frame_data.canvas_video_area.y,
+ node->frame_data.canvas_video_area.w,
+ node->frame_data.canvas_video_area.h,
+ node->frame_data.canvas_video_area.d
 };
+ _video_output.set_canvas_size(canvas_video_area.w, canvas_video_area.h);
 const eq::Viewport &canvas_channel_area = getViewport();
 // Determine the video quad to render
 float quad_x = canvas_video_area.x;
@@ -1016,14 +1018,14 @@
 bool mono_right_instead_of_left = (getEye() == eq::EYE_RIGHT);
 GLint viewport[4];
 glGetIntegerv(GL_VIEWPORT, viewport);
- _video_output.display_current_frame(mono_right_instead_of_left, quad_x, quad_y, quad_w, quad_h, viewport);
+ _video_output.display_current_frame(mono_right_instead_of_left, quad_x, quad_y, quad_w, quad_h,
+ viewport, node->frame_data.tex_coords);
 }
 
 virtual void frameStart(const eq::uint128_t &, const uint32_t frame_number)
 {
 // Get frame data via from the node
 eq_node *node = static_cast<eq_node *>(getNode());
- _video_output.set_parameters(node->frame_data.params);
 // Do as we're told
 if (node->frame_data.prep_frame)
 {
@@ -1042,9 +1044,12 @@
 startFrame(frame_number);
 }
 
- virtual void frameFinish(const eq::uint128_t &, const uint32_t frame_number)
+ void frameViewFinish( const eq::uint128_t& id )
 {
- releaseFrame(frame_number);
+ eq_node *node = static_cast<eq_node *>(getNode());
+ if (node->frame_data.display_statistics)
+ drawStatistics();
+ eq::Channel::frameViewFinish( id );
 }
 };
 
@@ -1085,18 +1090,22 @@
 * player_equalizer
 */
 
+static player_equalizer* global_player_equalizer = NULL;
+
 player_equalizer::player_equalizer(int *argc, char *argv[], bool flat_screen) :
- player(player::slave), _flat_screen(flat_screen)
+ player(), _flat_screen(flat_screen)
 {
+ assert(!global_player_equalizer);
+ global_player_equalizer = this;
 /* Initialize Equalizer */
 initErrors();
- _node_factory = static_cast<void *>(new eq_node_factory);
- if (!eq::init(*argc, argv, static_cast<eq::NodeFactory *>(_node_factory)))
+ _node_factory = new eq_node_factory;
+ if (!eq::init(*argc, argv, _node_factory))
 {
 throw exc(_("Equalizer initialization failed."));
 }
 /* Get a configuration */
- _config = static_cast<void *>(eq::getConfig(*argc, argv));
+ _config = static_cast<eq_config *>(eq::getConfig(*argc, argv));
 // The following code is only executed on the application node because
 // eq::getConfig() does not return on other nodes.
 if (!_config)
@@ -1107,32 +1116,32 @@
 
 player_equalizer::~player_equalizer()
 {
- delete static_cast<eq_node_factory *>(_node_factory);
+ delete _node_factory;
+ global_player_equalizer = NULL;
 }
 
-void player_equalizer::open(const player_init_data &init_data)
+void player_equalizer::open()
 {
- eq_config *config = static_cast<eq_config *>(_config);
- if (!config->init(init_data, _flat_screen))
+ if (!_config->init(*(global_dispatch->get_input_data()), _flat_screen))
 {
 throw exc(_("Equalizer configuration initialization failed."));
 }
 }
 
-void player_equalizer::run()
+void player_equalizer::close()
 {
- eq_config *config = static_cast<eq_config *>(_config);
- while (config->isRunning())
- {
- config->startFrame();
- config->finishFrame();
- }
- config->exit();
- eq::releaseConfig(config);
+ _config->exit();
+ eq::releaseConfig(_config);
 eq::exit();
 exitErrors();
 }
 
-void player_equalizer::close()
+void player_equalizer::mainloop()
 {
+ assert(global_player_equalizer);
+ eq_config* config = global_player_equalizer->_config;
+ while (config->isRunning()) {
+ config->startFrame();
+ config->finishFrame();
+ }
 }

bino-1.2.1.tar.bz2/src/player_equalizer.h -> bino-1.3.2.tar.xz/src/player_equalizer.h Changed

bino-1.2.1.tar.bz2/src/subtitle_renderer.cpp -> bino-1.3.2.tar.xz/src/subtitle_renderer.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2011
+ * Copyright (C) 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 * Joe <cuchac@email.cz>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
@@ -98,7 +98,7 @@
 {
 try
 {
- _initializer.cancel();
+ _initializer.finish();
 }
 catch (...)
 {
@@ -346,17 +346,17 @@
 {
 std::vector<std::string> overrides;
 overrides.clear();
- if (params.subtitle_font != "")
+ if (!params.subtitle_font_is_default())
 {
- overrides.push_back(std::string("Default.Fontname=") + params.subtitle_font);
+ overrides.push_back(std::string("Default.Fontname=") + params.subtitle_font());
 }
- if (params.subtitle_size > 0)
+ if (!params.subtitle_size_is_default())
 {
- overrides.push_back(std::string("Default.Fontsize=") + str::from(params.subtitle_size));
+ overrides.push_back(std::string("Default.Fontsize=") + str::from(params.subtitle_size()));
 }
- if (params.subtitle_color <= std::numeric_limits<uint32_t>::max())
+ if (!params.subtitle_color_is_default())
 {
- unsigned int color = params.subtitle_color;
+ unsigned int color = params.subtitle_color();
 unsigned int a = 255u - ((color >> 24u) & 0xffu);
 unsigned int r = (color >> 16u) & 0xffu;
 unsigned int g = (color >> 8u) & 0xffu;
@@ -372,7 +372,7 @@
 }
 ass_overrides[overrides.size()] = NULL;
 ass_set_style_overrides(_ass_library, const_cast<char **>(ass_overrides));
- ass_set_font_scale(_ass_renderer, (params.subtitle_scale >= 0.0f ? params.subtitle_scale : 1.0));
+ ass_set_font_scale(_ass_renderer, (params.subtitle_scale() >= 0.0f ? params.subtitle_scale() : 1.0));
 ass_process_force_style(_ass_track);
 }
 
@@ -398,11 +398,11 @@
 throw exc(_("Cannot initialize LibASS track."));
 }
 std::string conv_str = box.str;
- if (params.subtitle_encoding != "")
+ if (params.subtitle_encoding() != "")
 {
 try
 {
- conv_str = str::convert(box.str, params.subtitle_encoding, "UTF-8");
+ conv_str = str::convert(box.str, params.subtitle_encoding(), "UTF-8");
 }
 catch (std::exception &e)
 {

bino-1.2.1.tar.bz2/src/video_output.cpp -> bino-1.3.2.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
+ * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <frederic.devernay@inrialpes.fr>
 * Joe <cuchac@email.cz>
@@ -24,6 +24,7 @@
 
 #include <limits>
 #include <cstdlib>
+#include <cstring>
 #include <cmath>
 
 #include <GL/glew.h>
@@ -40,7 +41,6 @@
 #include "video_output.h"
 #include "video_output_color.fs.glsl.h"
 #include "video_output_render.fs.glsl.h"
-#include "xgl.h"
 
 
 /* Video output overview:
@@ -58,23 +58,29 @@
 * The input data is first converted to YUV (for the common planar YUV frame
 * formats, this just means gathering of the three components from the
 * three planes). Then color adjustment in the YUV space is performed.
- * Finally the result is converted to sRGB and stored in an GL_SRGB texture.
+ * If the input data had an 8 bit value range, the result is converted to sRGB
+ * and stored in an GL_SRGB texture. If the input data had a larger value range,
+ * the result is converted to linear RGB and stored in an GL_RGB16 texture.
 * In this color correction step, no interpolation is done, because we're
 * dealing with non-linear values, and interpolating them would lead to
- * errors. We do not convert to linear RGB (as opposed to sRGB) in this step
- * because storing linear RGB in a GL_RGB texture would lose some precision
- * when compared to the non-linear input data.
+ * errors. We do not store linear RGB in GL_RGB8 textures because that would
+ * lose some precision when compared to the input data - so we either use
+ * GL_SRGB8 (and store sRGB values) or GL_RGB16 (and store linear values).
+ * In both cases, the rendering step can properly interpolate.
 *
 * Step 3: Rendering.
- * This step reads from the sRGB textures created in the previous step, which
- * means that the GL will transform the input to linear RGB automatically and
- * handle hardware accelerated bilinear interpolation correctly. Thus,
- * magnification or minification are safe in this step. Furthermore, we can
- * do interpolation on the linear RGB values for the masking output modes.
- * We then transform the resulting linear RGB values back to non-linear sRGB
- * values for output. We do not use the GL_ARB_framebuffer_sRGB extension for
- * this purpose because 1) we need computations on non-linear values for the
- * anaglyph methods and 2) sRGB framebuffers are not yet widely supported.
+ * This step reads from the color textures created in the previous step. In the
+ * case of GL_SRGB8 textures, this means that OpenGL will transform the input to
+ * linear RGB automatically and handle hardware accelerated bilinear
+ * interpolation correctly. Thus, magnification or minification are safe in this
+ * step. With GL_RGB16 textures and the linear values stored therein, no special
+ * handling is necessary.
+ * Furthermore, we can do interpolation on the linear RGB values for the masking
+ * output modes. We then transform the resulting linear RGB values back to
+ * non-linear sRGB values for output. We do not use the GL_ARB_framebuffer_sRGB
+ * extension for this purpose because 1) we need computations on non-linear
+ * values for the anaglyph methods and 2) sRGB framebuffers are not yet widely
+ * supported.
 *
 * Open issues / TODO:
 * The 420p and 422p chroma subsampling formats are currently handled by
@@ -85,11 +91,14 @@
 * interpolation, too.
 */
 
-video_output::video_output() : controller(), _initialized(false)
+static const float full_tex_coords[2][4][2] =
 {
- // XXX: Hack: work around broken SRGB texture implementations
- _srgb_textures_are_broken = std::getenv("SRGB_TEXTURES_ARE_BROKEN");
+ { { 0.0f, 0.0f }, { 1.0f, 0.0f }, { 1.0f, 1.0f }, { 0.0f, 1.0f } },
+ { { 0.0f, 0.0f }, { 1.0f, 0.0f }, { 1.0f, 1.0f }, { 0.0f, 1.0f } }
+};
 
+video_output::video_output() : controller(), _initialized(false)
+{
 _input_pbo = 0;
 _input_fbo = 0;
 _active_index = 1;
@@ -102,7 +111,7 @@
 _input_yuv_v_tex[i][j] = 0;
 _input_bgra32_tex[i][j] = 0;
 }
- _color_srgb_tex[i] = 0;
+ _color_tex[i] = 0;
 _input_subtitle_tex[i] = 0;
 _input_subtitle_width[i] = -1;
 _input_subtitle_height[i] = -1;
@@ -119,6 +128,189 @@
 {
 }
 
+/**
+ * \param where Location of the check.
+ * \returns True.
+ *
+ * Checks if a GL error occured.
+ * If an error occured, an appropriate exception is thrown.\n
+ * The purpose of the return value is to be able to put this function
+ * into an assert statement.
+ */
+bool video_output::xglCheckError(const std::string& where) const
+{
+ GLenum e = glGetError();
+ if (e != GL_NO_ERROR) {
+ std::string pfx = (where.length() > 0 ? where + ": " : "");
+ throw exc(pfx + str::asprintf(_("OpenGL error 0x%04X."), static_cast<unsigned int>(e)));
+ // Don't use gluErrorString(e) here to avoid depending on libGLU just for this
+ return false;
+ }
+ return true;
+}
+
+static void xglKillCrlf(char* str)
+{
+ size_t l = std::strlen(str);
+ if (l > 0 && str[l - 1] == '\n')
+ str[--l] = '\0';
+ if (l > 0 && str[l - 1] == '\r')
+ str[l - 1] = '\0';
+}
+
+/**
+ * \param name Name of the shader. Can be an arbitrary string.
+ * \param type GL_VERTEX_SHADER or GL_FRAGMENT_SHADER.
+ * \param src The source code of the shader.
+ * \returns The GL shader object.
+ *
+ * Creates a GL shader object. The \a name of the shader is only used
+ * for error reporting purposes. If compilation fails, an exception is thrown.
+ */
+GLuint video_output::xglCompileShader(const std::string& name, GLenum type, const std::string& src) const
+{
+ msg::dbg("Compiling %s shader %s.", type == GL_VERTEX_SHADER ? "vertex" : "fragment", name.c_str());
+
+ // XXX: Work around a bad bad bug in the free OpenGL drivers for ATI cards on Ubuntu
+ // 10.10: the compilation of shader source depends on the locale, and gives wrong
+ // results e.g. in de_DE.UTF-8. So we backup the locale, set it to "C", and restore
+ // the backup after compilation.
+ std::string locale_backup = setlocale(LC_ALL, NULL);
+ setlocale(LC_ALL, "C");
+
+ GLuint shader = glCreateShader(type);
+ const GLchar* glsrc = src.c_str();
+ glShaderSource(shader, 1, &glsrc, NULL);
+ glCompileShader(shader);
+
+ setlocale(LC_ALL, locale_backup.c_str());
+
+ std::string log;
+ GLint e, l;
+ glGetShaderiv(shader, GL_COMPILE_STATUS, &e);
+ glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &l);
+ if (l > 0) {
+ char* tmplog = new char[l];
+ glGetShaderInfoLog(shader, l, NULL, tmplog);
+ xglKillCrlf(tmplog);
+ log = std::string(tmplog);
+ delete[] tmplog;
+ } else {
+ log = std::string("");
+ }
+
+ if (e == GL_TRUE && log.length() > 0) {
+ msg::wrn(_("OpenGL %s '%s': compiler warning:"),
+ type == GL_VERTEX_SHADER ? _("vertex shader") : _("fragment shader"),
+ name.c_str());
+ msg::wrn_txt("%s", log.c_str());
+ } else if (e != GL_TRUE) {
+ std::string when = str::asprintf(_("OpenGL %s '%s': compilation failed."),
+ type == GL_VERTEX_SHADER ? _("vertex shader") : _("fragment shader"),
+ name.c_str());
+ std::string what = str::asprintf("\n%s", log.length() > 0 ? log.c_str() : _("unknown error"));
+ throw exc(str::asprintf(_("%s: %s"), when.c_str(), what.c_str()));
+ }
+ return shader;
+}
+
+/**
+ * \param vshader A vertex shader, or 0.
+ * \param fshader A fragment shader, or 0.
+ * \returns The GL program object.
+ *
+ * Creates a GL program object.
+ */
+GLuint video_output::xglCreateProgram(GLuint vshader, GLuint fshader) const
+{
+ assert(vshader != 0 || fshader != 0);
+ GLuint program = glCreateProgram();
+ if (vshader != 0)
+ glAttachShader(program, vshader);
+ if (fshader != 0)
+ glAttachShader(program, fshader);
+ return program;
+}
+
+/**
+ * \param name Name of the program. Can be an arbitrary string.
+ * \param vshader_src Source of the vertex shader, or an empty string.
+ * \param fshader_src Source of the fragment shader, or an empty string.
+ * \returns The GL program object.
+ *
+ * Creates a GL program object. The \a name of the program is only used
+ * for error reporting purposes.
+ */
+GLuint video_output::xglCreateProgram(const std::string& name,
+ const std::string& vshader_src, const std::string& fshader_src) const
+{
+ GLuint vshader = 0, fshader = 0;
+ if (vshader_src.length() > 0)
+ vshader = xglCompileShader(name, GL_VERTEX_SHADER, vshader_src);
+ if (fshader_src.length() > 0)
+ fshader = xglCompileShader(name, GL_FRAGMENT_SHADER, fshader_src);
+ return xglCreateProgram(vshader, fshader);
+}
+
+/**
+ * \param name Name of the program. Can be an arbitrary string.
+ * \param prg The GL program object.
+ * \returns The relinked GL program object.
+ *
+ * Links a GL program object. The \a name of the program is only used
+ * for error reporting purposes. If linking fails, an exception is thrown.
+ */
+void video_output::xglLinkProgram(const std::string& name, const GLuint prg) const
+{
+ msg::dbg("Linking OpenGL program %s.", name.c_str());
+
+ glLinkProgram(prg);
+
+ std::string log;
+ GLint e, l;
+ glGetProgramiv(prg, GL_LINK_STATUS, &e);
+ glGetProgramiv(prg, GL_INFO_LOG_LENGTH, &l);
+ if (l > 0) {
+ char *tmplog = new char[l];
+ glGetProgramInfoLog(prg, l, NULL, tmplog);
+ xglKillCrlf(tmplog);
+ log = std::string(tmplog);
+ delete[] tmplog;
+ } else {
+ log = std::string("");
+ }
+
+ if (e == GL_TRUE && log.length() > 0) {
+ msg::wrn(_("OpenGL program '%s': linker warning:"), name.c_str());
+ msg::wrn_txt("%s", log.c_str());
+ } else if (e != GL_TRUE) {
+ std::string when = str::asprintf(_("OpenGL program '%s': linking failed."), name.c_str());
+ std::string what = str::asprintf("\n%s", log.length() > 0 ? log.c_str() : _("unknown error"));
+ throw exc(when + ": " + what);
+ }
+}
+
+/**
+ * \param program The program.
+ *
+ * Deletes a GL program and all its associated shaders. Does nothing if
+ * \a program is not a valid program.
+ */
+void video_output::xglDeleteProgram(GLuint program) const
+{
+ if (glIsProgram(program)) {
+ GLint shader_count;
+ glGetProgramiv(program, GL_ATTACHED_SHADERS, &shader_count);
+ GLuint* shaders = new GLuint[shader_count];
+ glGetAttachedShaders(program, shader_count, NULL, shaders);
+ for (int i = 0; i < shader_count; i++)
+ glDeleteShader(shaders[i]);
+ delete[] shaders;
+ glDeleteProgram(program);
+ }
+}
+
+
 void video_output::init()
 {
 if (!_initialized)
@@ -132,14 +324,13 @@
 {
 if (_initialized)
 {
- make_context_current();
- assert(xgl::CheckError(HERE));
 clear();
+ assert(xglCheckError(HERE));
 input_deinit(0);
 input_deinit(1);
 color_deinit();
 render_deinit();
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 _initialized = false;
 }
 }
@@ -147,12 +338,12 @@
 void video_output::set_suitable_size(int width, int height, float ar, parameters::stereo_mode_t stereo_mode)
 {
 float aspect_ratio = width * screen_pixel_aspect_ratio() / height;
- if (stereo_mode == parameters::left_right)
+ if (stereo_mode == parameters::mode_left_right)
 {
 aspect_ratio /= 2.0f;
 }
- else if (stereo_mode == parameters::top_bottom
- || stereo_mode == parameters::hdmi_frame_pack)
+ else if (stereo_mode == parameters::mode_top_bottom
+ || stereo_mode == parameters::mode_hdmi_frame_pack)
 {
 aspect_ratio *= 2.0f;
 }
@@ -179,12 +370,12 @@
 
 void video_output::input_init(int index, const video_frame &frame)
 {
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 glGenBuffers(1, &_input_pbo);
 glGenFramebuffersEXT(1, &_input_fbo);
 if (frame.layout == video_frame::bgra32)
 {
- for (int i = 0; i < (frame.stereo_layout == video_frame::mono ? 1 : 2); i++)
+ for (int i = 0; i < (frame.stereo_layout == parameters::layout_mono ? 1 : 2); i++)
 {
 glGenTextures(1, &(_input_bgra32_tex[index][i]));
 glBindTexture(GL_TEXTURE_2D, _input_bgra32_tex[index][i]);
@@ -212,7 +403,10 @@
 _input_yuv_chroma_height_divisor[index] = 2;
 need_chroma_filtering = true;
 }
- for (int i = 0; i < (frame.stereo_layout == video_frame::mono ? 1 : 2); i++)
+ bool type_u8 = (frame.value_range == video_frame::u8_full || frame.value_range == video_frame::u8_mpeg);
+ GLint internal_format = type_u8 ? GL_LUMINANCE8 : GL_LUMINANCE16;
+ GLint type = type_u8 ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT;
+ for (int i = 0; i < (frame.stereo_layout == parameters::layout_mono ? 1 : 2); i++)
 {
 glGenTextures(1, &(_input_yuv_y_tex[index][i]));
 glBindTexture(GL_TEXTURE_2D, _input_yuv_y_tex[index][i]);
@@ -220,33 +414,33 @@
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE8,
+ glTexImage2D(GL_TEXTURE_2D, 0, internal_format,
 frame.width,
 frame.height,
- 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, NULL);
+ 0, GL_LUMINANCE, type, NULL);
 glGenTextures(1, &(_input_yuv_u_tex[index][i]));
 glBindTexture(GL_TEXTURE_2D, _input_yuv_u_tex[index][i]);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, need_chroma_filtering ? GL_LINEAR : GL_NEAREST);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, need_chroma_filtering ? GL_LINEAR : GL_NEAREST);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE8,
+ glTexImage2D(GL_TEXTURE_2D, 0, internal_format,
 frame.width / _input_yuv_chroma_width_divisor[index],
 frame.height / _input_yuv_chroma_height_divisor[index],
- 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, NULL);
+ 0, GL_LUMINANCE, type, NULL);
 glGenTextures(1, &(_input_yuv_v_tex[index][i]));
 glBindTexture(GL_TEXTURE_2D, _input_yuv_v_tex[index][i]);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, need_chroma_filtering ? GL_LINEAR : GL_NEAREST);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, need_chroma_filtering ? GL_LINEAR : GL_NEAREST);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE8,
+ glTexImage2D(GL_TEXTURE_2D, 0, internal_format,
 frame.width / _input_yuv_chroma_width_divisor[index],
 frame.height / _input_yuv_chroma_height_divisor[index],
- 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, NULL);
+ 0, GL_LUMINANCE, type, NULL);
 }
 }
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 }
 
 bool video_output::input_is_compatible(int index, const video_frame &current_frame)
@@ -262,7 +456,7 @@
 
 void video_output::input_deinit(int index)
 {
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 glDeleteBuffers(1, &_input_pbo);
 _input_pbo = 0;
 glDeleteFramebuffersEXT(1, &_input_fbo);
@@ -302,7 +496,7 @@
 _input_yuv_chroma_width_divisor[index] = 0;
 _input_yuv_chroma_height_divisor[index] = 0;
 _frame[index] = video_frame();
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 }
 
 static int next_multiple_of_4(int x)
@@ -312,24 +506,30 @@
 
 void video_output::prepare_next_frame(const video_frame &frame, const subtitle_box &subtitle)
 {
- assert(xgl::CheckError(HERE));
 int index = (_active_index == 0 ? 1 : 0);
 if (!frame.is_valid())
 {
 _frame[index] = frame;
 return;
 }
- make_context_current();
+ assert(xglCheckError(HERE));
 if (!input_is_compatible(index, frame))
 {
 input_deinit(index);
 input_init(index, frame);
 }
 _frame[index] = frame;
- int bytes_per_pixel = (frame.layout == video_frame::bgra32 ? 4 : 1);
- GLenum format = (frame.layout == video_frame::bgra32 ? GL_BGRA : GL_LUMINANCE);
- GLenum type = (frame.layout == video_frame::bgra32 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE);
- for (int i = 0; i < (frame.stereo_layout == video_frame::mono ? 1 : 2); i++)
+ int bytes_per_pixel = 4;
+ GLenum format = GL_BGRA;
+ GLenum type = GL_UNSIGNED_INT_8_8_8_8_REV;
+ if (frame.layout != video_frame::bgra32)
+ {
+ bool type_u8 = (frame.value_range == video_frame::u8_full || frame.value_range == video_frame::u8_mpeg);
+ bytes_per_pixel = type_u8 ? 1 : 2;
+ format = GL_LUMINANCE;
+ type = type_u8 ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT;
+ }
+ for (int i = 0; i < (frame.stereo_layout == parameters::layout_mono ? 1 : 2); i++)
 {
 for (int plane = 0; plane < (frame.layout == video_frame::bgra32 ? 1 : 3); plane++)
 {
@@ -377,7 +577,7 @@
 glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
 }
 }
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 // In the common case, the video display width and height do not change
 // between preparing a frame and rendering it, so it is benefical to update
 // to subtitle texture in this function (because other threads can do other
@@ -385,13 +585,13 @@
 update_subtitle_tex(index, frame, subtitle, _params);
 }
 
-int video_output::video_display_width()
+int video_output::video_display_width() const
 {
 assert(_viewport[0][2] > 0);
 return _viewport[0][2];
 }
 
-int video_output::video_display_height()
+int video_output::video_display_height() const
 {
 assert(_viewport[0][3] > 0);
 return _viewport[0][3];
@@ -399,7 +599,7 @@
 
 void video_output::update_subtitle_tex(int index, const video_frame &frame, const subtitle_box &subtitle, const parameters &params)
 {
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 int width = 0;
 int height = 0;
 if (subtitle.is_valid())
@@ -421,12 +621,12 @@
 || (!subtitle.is_constant() && frame.presentation_time != _input_subtitle_time[index])
 || width != _input_subtitle_width[index]
 || height != _input_subtitle_height[index]
- || params.subtitle_encoding != _input_subtitle_params.subtitle_encoding
- || params.subtitle_font != _input_subtitle_params.subtitle_font
- || params.subtitle_size != _input_subtitle_params.subtitle_size
- || (params.subtitle_scale < _input_subtitle_params.subtitle_scale
- || params.subtitle_scale > _input_subtitle_params.subtitle_scale)
- || params.subtitle_color != _input_subtitle_params.subtitle_color))
+ || params.subtitle_encoding() != _input_subtitle_params.subtitle_encoding()
+ || params.subtitle_font() != _input_subtitle_params.subtitle_font()
+ || params.subtitle_size() != _input_subtitle_params.subtitle_size()
+ || (params.subtitle_scale() < _input_subtitle_params.subtitle_scale()
+ || params.subtitle_scale() > _input_subtitle_params.subtitle_scale())
+ || params.subtitle_color() != _input_subtitle_params.subtitle_color()))
 {
 // We have a new subtitle or a new video display size or new parameters,
 // therefore we need to render the subtitle into _input_subtitle_tex.
@@ -451,11 +651,13 @@
 GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
 }
 // Clear the texture
+ GLint framebuffer_bak;
+ glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &framebuffer_bak);
 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, _input_fbo);
 glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
 GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, _input_subtitle_tex[index], 0);
 glClear(GL_COLOR_BUFFER_BIT);
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framebuffer_bak);
 // Prerender the subtitle to get a bounding box
 int bb_x, bb_y, bb_w, bb_h;
 _subtitle_renderer.prerender(subtitle, frame.presentation_time, params,
@@ -491,16 +693,17 @@
 _input_subtitle_height[index] = height;
 _input_subtitle_time[index] = frame.presentation_time;
 _input_subtitle_params = params;
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 }
 
 void video_output::color_init(const video_frame &frame)
 {
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 glGenFramebuffersEXT(1, &_color_fbo);
 std::string layout_str;
 std::string color_space_str;
 std::string value_range_str;
+ std::string storage_str;
 std::string chroma_offset_x_str;
 std::string chroma_offset_y_str;
 if (frame.layout == video_frame::bgra32)
@@ -508,6 +711,7 @@
 layout_str = "layout_bgra32";
 color_space_str = "color_space_srgb";
 value_range_str = "value_range_8bit_full";
+ storage_str = "storage_srgb";
 }
 else
 {
@@ -523,10 +727,22 @@
 if (frame.value_range == video_frame::u8_full)
 {
 value_range_str = "value_range_8bit_full";
+ storage_str = "storage_srgb";
 }
- else
+ else if (frame.value_range == video_frame::u8_mpeg)
 {
 value_range_str = "value_range_8bit_mpeg";
+ storage_str = "storage_srgb";
+ }
+ else if (frame.value_range == video_frame::u10_full)
+ {
+ value_range_str = "value_range_10bit_full";
+ storage_str = "storage_linear_rgb";
+ }
+ else
+ {
+ value_range_str = "value_range_10bit_mpeg";
+ storage_str = "storage_linear_rgb";
 }
 chroma_offset_x_str = "0.0";
 chroma_offset_y_str = "0.0";
@@ -561,49 +777,57 @@
 }
 }
 }
+ // XXX: Hack: work around broken SRGB texture implementations
+ if (std::getenv("SRGB_TEXTURES_ARE_BROKEN"))
+ {
+ msg::dbg("Avoiding broken SRGB texture implementation.");
+ storage_str = "storage_linear_rgb";
+ }
+
 std::string color_fs_src(VIDEO_OUTPUT_COLOR_FS_GLSL_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);
- _color_prg = xgl::CreateProgram("video_output_color", "", "", color_fs_src);
- xgl::LinkProgram("video_output_color", _color_prg);
- for (int i = 0; i < (frame.stereo_layout == video_frame::mono ? 1 : 2); i++)
+ str::replace(color_fs_src, "$storage", storage_str);
+ _color_prg = xglCreateProgram("video_output_color", "", color_fs_src);
+ xglLinkProgram("video_output_color", _color_prg);
+ for (int i = 0; i < (frame.stereo_layout == parameters::layout_mono ? 1 : 2); i++)
 {
- glGenTextures(1, &(_color_srgb_tex[i]));
- glBindTexture(GL_TEXTURE_2D, _color_srgb_tex[i]);
+ glGenTextures(1, &(_color_tex[i]));
+ glBindTexture(GL_TEXTURE_2D, _color_tex[i]);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
 glTexImage2D(GL_TEXTURE_2D, 0,
- _srgb_textures_are_broken ? GL_RGB8 : GL_SRGB8,
+ storage_str == "storage_srgb" ? GL_SRGB8 : GL_RGB16,
 frame.width, frame.height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
 }
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 }
 
 void video_output::color_deinit()
 {
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 glDeleteFramebuffersEXT(1, &_color_fbo);
 _color_fbo = 0;
 if (_color_prg != 0)
 {
- xgl::DeleteProgram(_color_prg);
+ xglDeleteProgram(_color_prg);
 _color_prg = 0;
 }
 for (int i = 0; i < 2; i++)
 {
- if (_color_srgb_tex[i] != 0)
+ if (_color_tex[i] != 0)
 {
- glDeleteTextures(1, &(_color_srgb_tex[i]));
- _color_srgb_tex[i] = 0;
+ glDeleteTextures(1, &(_color_tex[i]));
+ _color_tex[i] = 0;
 }
 }
 _color_last_frame = video_frame();
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 }
 
 bool video_output::color_is_compatible(const video_frame &current_frame)
@@ -619,32 +843,30 @@
 
 void video_output::render_init()
 {
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 std::string mode_str = (
- _params.stereo_mode == parameters::even_odd_rows ? "mode_even_odd_rows"
- : _params.stereo_mode == parameters::even_odd_columns ? "mode_even_odd_columns"
- : _params.stereo_mode == parameters::checkerboard ? "mode_checkerboard"
- : _params.stereo_mode == parameters::red_cyan_monochrome ? "mode_red_cyan_monochrome"
- : _params.stereo_mode == parameters::red_cyan_half_color ? "mode_red_cyan_half_color"
- : _params.stereo_mode == parameters::red_cyan_full_color ? "mode_red_cyan_full_color"
- : _params.stereo_mode == parameters::red_cyan_dubois ? "mode_red_cyan_dubois"
- : _params.stereo_mode == parameters::green_magenta_monochrome ? "mode_green_magenta_monochrome"
- : _params.stereo_mode == parameters::green_magenta_half_color ? "mode_green_magenta_half_color"
- : _params.stereo_mode == parameters::green_magenta_full_color ? "mode_green_magenta_full_color"
- : _params.stereo_mode == parameters::green_magenta_dubois ? "mode_green_magenta_dubois"
- : _params.stereo_mode == parameters::amber_blue_monochrome ? "mode_amber_blue_monochrome"
- : _params.stereo_mode == parameters::amber_blue_half_color ? "mode_amber_blue_half_color"
- : _params.stereo_mode == parameters::amber_blue_full_color ? "mode_amber_blue_full_color"
- : _params.stereo_mode == parameters::amber_blue_dubois ? "mode_amber_blue_dubois"
- : _params.stereo_mode == parameters::red_green_monochrome ? "mode_red_green_monochrome"
- : _params.stereo_mode == parameters::red_blue_monochrome ? "mode_red_blue_monochrome"
+ _params.stereo_mode() == parameters::mode_even_odd_rows ? "mode_even_odd_rows"
+ : _params.stereo_mode() == parameters::mode_even_odd_columns ? "mode_even_odd_columns"
+ : _params.stereo_mode() == parameters::mode_checkerboard ? "mode_checkerboard"
+ : _params.stereo_mode() == parameters::mode_red_cyan_monochrome ? "mode_red_cyan_monochrome"
+ : _params.stereo_mode() == parameters::mode_red_cyan_half_color ? "mode_red_cyan_half_color"
+ : _params.stereo_mode() == parameters::mode_red_cyan_full_color ? "mode_red_cyan_full_color"
+ : _params.stereo_mode() == parameters::mode_red_cyan_dubois ? "mode_red_cyan_dubois"
+ : _params.stereo_mode() == parameters::mode_green_magenta_monochrome ? "mode_green_magenta_monochrome"
+ : _params.stereo_mode() == parameters::mode_green_magenta_half_color ? "mode_green_magenta_half_color"
+ : _params.stereo_mode() == parameters::mode_green_magenta_full_color ? "mode_green_magenta_full_color"
+ : _params.stereo_mode() == parameters::mode_green_magenta_dubois ? "mode_green_magenta_dubois"
+ : _params.stereo_mode() == parameters::mode_amber_blue_monochrome ? "mode_amber_blue_monochrome"
+ : _params.stereo_mode() == parameters::mode_amber_blue_half_color ? "mode_amber_blue_half_color"
+ : _params.stereo_mode() == parameters::mode_amber_blue_full_color ? "mode_amber_blue_full_color"
+ : _params.stereo_mode() == parameters::mode_amber_blue_dubois ? "mode_amber_blue_dubois"
+ : _params.stereo_mode() == parameters::mode_red_green_monochrome ? "mode_red_green_monochrome"
+ : _params.stereo_mode() == parameters::mode_red_blue_monochrome ? "mode_red_blue_monochrome"
 : "mode_onechannel");
- std::string srgb_broken_str = (_srgb_textures_are_broken ? "1" : "0");
 std::string render_fs_src(VIDEO_OUTPUT_RENDER_FS_GLSL_STR);
 str::replace(render_fs_src, "$mode", mode_str);
- str::replace(render_fs_src, "$srgb_broken", srgb_broken_str);
- _render_prg = xgl::CreateProgram("video_output_render", "", "", render_fs_src);
- xgl::LinkProgram("video_output_render", _render_prg);
+ _render_prg = xglCreateProgram("video_output_render", "", render_fs_src);
+ xglLinkProgram("video_output_render", _render_prg);
 uint32_t dummy_texture = 0;
 glGenTextures(1, &_render_dummy_tex);
 glBindTexture(GL_TEXTURE_2D, _render_dummy_tex);
@@ -656,9 +878,9 @@
 glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0,
 GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, &dummy_texture);
- if (_params.stereo_mode == parameters::even_odd_rows
- || _params.stereo_mode == parameters::even_odd_columns
- || _params.stereo_mode == parameters::checkerboard)
+ if (_params.stereo_mode() == parameters::mode_even_odd_rows
+ || _params.stereo_mode() == parameters::mode_even_odd_columns
+ || _params.stereo_mode() == parameters::mode_checkerboard)
 {
 GLubyte even_odd_rows_mask[4] = { 0xff, 0xff, 0x00, 0x00 };
 GLubyte even_odd_columns_mask[4] = { 0xff, 0x00, 0xff, 0x00 };
@@ -672,19 +894,19 @@
 glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE8, 2, 2, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE,
- _params.stereo_mode == parameters::even_odd_rows ? even_odd_rows_mask
- : _params.stereo_mode == parameters::even_odd_columns ? even_odd_columns_mask
+ _params.stereo_mode() == parameters::mode_even_odd_rows ? even_odd_rows_mask
+ : _params.stereo_mode() == parameters::mode_even_odd_columns ? even_odd_columns_mask
 : checkerboard_mask);
 }
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 }
 
 void video_output::render_deinit()
 {
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 if (_render_prg != 0)
 {
- xgl::DeleteProgram(_render_prg);
+ xglDeleteProgram(_render_prg);
 _render_prg = 0;
 }
 if (_render_dummy_tex != 0)
@@ -698,60 +920,49 @@
 _render_mask_tex = 0;
 }
 _render_last_params = parameters();
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 }
 
 bool video_output::render_is_compatible()
 {
- return (_render_last_params.stereo_mode == _params.stereo_mode);
+ return (_render_last_params.stereo_mode() == _params.stereo_mode());
 }
 
 void video_output::activate_next_frame()
 {
 _active_index = (_active_index == 0 ? 1 : 0);
- trigger_update();
 }
 
-void video_output::set_parameters(const parameters &params)
-{
- _params = params;
- bool context_needs_stereo = (_params.stereo_mode == parameters::stereo);
- if (context_needs_stereo != context_is_stereo())
- {
- recreate_context(context_needs_stereo);
- _color_last_frame = video_frame();
- }
- trigger_update();
-}
-
-static void draw_quad(float x, float y, float w, float h,
+void video_output::draw_quad(float x, float y, float w, float h,
 const float tex_coords[2][4][2],
- const float more_tex_coords[4][2] = NULL)
+ const float more_tex_coords[4][2]) const
 {
+ const float (*my_tex_coords)[4][2] = (tex_coords ? tex_coords : full_tex_coords);
+
 glBegin(GL_QUADS);
- glTexCoord2f(tex_coords[0][0][0], tex_coords[0][0][1]);
- glMultiTexCoord2f(GL_TEXTURE1, tex_coords[1][0][0], tex_coords[1][0][1]);
+ glTexCoord2f(my_tex_coords[0][0][0], my_tex_coords[0][0][1]);
+ glMultiTexCoord2f(GL_TEXTURE1, my_tex_coords[1][0][0], my_tex_coords[1][0][1]);
 if (more_tex_coords)
 {
 glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[0][0], more_tex_coords[0][1]);
 }
 glVertex2f(x, y);
- glTexCoord2f(tex_coords[0][1][0], tex_coords[0][1][1]);
- glMultiTexCoord2f(GL_TEXTURE1, tex_coords[1][1][0], tex_coords[1][1][1]);
+ glTexCoord2f(my_tex_coords[0][1][0], my_tex_coords[0][1][1]);
+ glMultiTexCoord2f(GL_TEXTURE1, my_tex_coords[1][1][0], my_tex_coords[1][1][1]);
 if (more_tex_coords)
 {
 glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[1][0], more_tex_coords[1][1]);
 }
 glVertex2f(x + w, y);
- glTexCoord2f(tex_coords[0][2][0], tex_coords[0][2][1]);
- glMultiTexCoord2f(GL_TEXTURE1, tex_coords[1][2][0], tex_coords[1][2][1]);
+ glTexCoord2f(my_tex_coords[0][2][0], my_tex_coords[0][2][1]);
+ glMultiTexCoord2f(GL_TEXTURE1, my_tex_coords[1][2][0], my_tex_coords[1][2][1]);
 if (more_tex_coords)
 {
 glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[2][0], more_tex_coords[2][1]);
 }
 glVertex2f(x + w, y + h);
- glTexCoord2f(tex_coords[0][3][0], tex_coords[0][3][1]);
- glMultiTexCoord2f(GL_TEXTURE1, tex_coords[1][3][0], tex_coords[1][3][1]);
+ glTexCoord2f(my_tex_coords[0][3][0], my_tex_coords[0][3][1]);
+ glMultiTexCoord2f(GL_TEXTURE1, my_tex_coords[1][3][0], my_tex_coords[1][3][1]);
 if (more_tex_coords)
 {
 glMultiTexCoord2f(GL_TEXTURE2, more_tex_coords[3][0], more_tex_coords[3][1]);
@@ -761,11 +972,12 @@
 }
 
 void video_output::display_current_frame(
+ int64_t display_frameno,
 bool keep_viewport, bool mono_right_instead_of_left,
- float x, float y, float w, float h, const GLint viewport[2][4])
+ float x, float y, float w, float h,
+ const GLint viewport[2][4],
+ const float tex_coords[2][4][2])
 {
- make_context_current();
- assert(xgl::CheckError(HERE));
 clear();
 const video_frame &frame = _frame[_active_index];
 if (!frame.is_valid())
@@ -773,15 +985,34 @@
 return;
 }
 
+ /* debug: make sure the current frame is always newer than the last one
+ static int64_t last_timestamp = -1000;
+ int64_t timestamp = frame.presentation_time;
+ assert(timestamp >= last_timestamp);
+ last_timestamp = timestamp;
+ */
+
+ _params = dispatch::parameters();
+ bool context_needs_stereo = (_params.stereo_mode() == parameters::mode_stereo);
+ if (context_needs_stereo != context_is_stereo())
+ {
+ recreate_context(context_needs_stereo);
+ return;
+ }
 if (!keep_viewport
 && (frame.width != _color_last_frame.width
 || frame.height != _color_last_frame.height
 || frame.aspect_ratio < _color_last_frame.aspect_ratio
 || frame.aspect_ratio > _color_last_frame.aspect_ratio
- || _render_last_params.stereo_mode != _params.stereo_mode))
+ || _render_last_params.stereo_mode() != _params.stereo_mode()
+ || _render_last_params.crop_aspect_ratio() < _params.crop_aspect_ratio()
+ || _render_last_params.crop_aspect_ratio() > _params.crop_aspect_ratio()
+ || _render_last_params.zoom() < _params.zoom()
+ || _render_last_params.zoom() > _params.zoom()))
 {
 reshape(width(), height());
 }
+ assert(xglCheckError(HERE));
 if (!_color_prg || !color_is_compatible(frame))
 {
 color_deinit();
@@ -792,25 +1023,25 @@
 { 
 render_deinit();
 render_init();
- _render_last_params = _params;
 }
+ _render_last_params = _params;
 
 /* Use correct left and right view indices */
 
 int left = 0;
- int right = (frame.stereo_layout == video_frame::mono ? 0 : 1);
- if (_params.stereo_mode_swap)
+ int right = (frame.stereo_layout == parameters::layout_mono ? 0 : 1);
+ if (_params.stereo_mode_swap())
 {
 std::swap(left, right);
 }
- if ((_params.stereo_mode == parameters::even_odd_rows
- || _params.stereo_mode == parameters::checkerboard)
+ if ((_params.stereo_mode() == parameters::mode_even_odd_rows
+ || _params.stereo_mode() == parameters::mode_checkerboard)
 && (pos_y() + viewport[0][1]) % 2 == 0)
 {
 std::swap(left, right);
 }
- if ((_params.stereo_mode == parameters::even_odd_columns
- || _params.stereo_mode == parameters::checkerboard)
+ if ((_params.stereo_mode() == parameters::mode_even_odd_columns
+ || _params.stereo_mode() == parameters::mode_checkerboard)
 && (pos_x() + viewport[0][0]) % 2 == 1)
 {
 std::swap(left, right);
@@ -820,11 +1051,6 @@
 
 glEnable(GL_TEXTURE_2D);
 glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
- float tex_coords[2][4][2] =
- {
- { { 0.0f, 0.0f }, { 1.0f, 0.0f }, { 1.0f, 1.0f }, { 0.0f, 1.0f } },
- { { 0.0f, 0.0f }, { 1.0f, 0.0f }, { 1.0f, 1.0f }, { 0.0f, 1.0f } }
- };
 
 /* Step 2: color-correction */
 
@@ -848,13 +1074,15 @@
 glUniform1i(glGetUniformLocation(_color_prg, "u_tex"), 1);
 glUniform1i(glGetUniformLocation(_color_prg, "v_tex"), 2);
 }
- glUniform1f(glGetUniformLocation(_color_prg, "contrast"), _params.contrast);
- glUniform1f(glGetUniformLocation(_color_prg, "brightness"), _params.brightness);
- glUniform1f(glGetUniformLocation(_color_prg, "saturation"), _params.saturation);
- glUniform1f(glGetUniformLocation(_color_prg, "cos_hue"), std::cos(_params.hue * M_PI));
- glUniform1f(glGetUniformLocation(_color_prg, "sin_hue"), std::sin(_params.hue * M_PI));
+ glUniform1f(glGetUniformLocation(_color_prg, "contrast"), _params.contrast());
+ glUniform1f(glGetUniformLocation(_color_prg, "brightness"), _params.brightness());
+ glUniform1f(glGetUniformLocation(_color_prg, "saturation"), _params.saturation());
+ glUniform1f(glGetUniformLocation(_color_prg, "cos_hue"), std::cos(_params.hue() * M_PI));
+ glUniform1f(glGetUniformLocation(_color_prg, "sin_hue"), std::sin(_params.hue() * M_PI));
+ GLint framebuffer_bak;
+ glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &framebuffer_bak);
 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, _color_fbo);
- // left view: render into _color_srgb_tex[0]
+ // left view: render into _color_tex[0]
 if (frame.layout == video_frame::bgra32)
 {
 glActiveTexture(GL_TEXTURE0);
@@ -870,9 +1098,9 @@
 glBindTexture(GL_TEXTURE_2D, _input_yuv_v_tex[_active_index][left]);
 }
 glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
- GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, _color_srgb_tex[0], 0);
- draw_quad(-1.0f, +1.0f, +2.0f, -2.0f, tex_coords);
- // right view: render into _color_srgb_tex[1]
+ GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, _color_tex[0], 0);
+ draw_quad(-1.0f, +1.0f, +2.0f, -2.0f);
+ // right view: render into _color_tex[1]
 if (left != right)
 {
 if (frame.layout == video_frame::bgra32)
@@ -890,10 +1118,10 @@
 glBindTexture(GL_TEXTURE_2D, _input_yuv_v_tex[_active_index][right]);
 }
 glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
- GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, _color_srgb_tex[1], 0);
- draw_quad(-1.0f, +1.0f, +2.0f, -2.0f, tex_coords);
+ GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, _color_tex[1], 0);
+ draw_quad(-1.0f, +1.0f, +2.0f, -2.0f);
 }
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framebuffer_bak);
 glViewport(viewport[0][0], viewport[0][1], viewport[0][2], viewport[0][3]);
 glMatrixMode(GL_PROJECTION);
 glPopMatrix();
@@ -904,43 +1132,45 @@
 glEnable(GL_SCISSOR_TEST);
 }
 
- // at this point, the left view is in _color_srgb_tex[0],
- // and the right view (if it exists) is in _color_srgb_tex[1]
+ // at this point, the left view is in _color_tex[0],
+ // and the right view (if it exists) is in _color_tex[1]
 right = (left != right ? 1 : 0);
 left = 0;
 
 /* Step 3: rendering */
 
 // Apply fullscreen flipping/flopping
- if (fullscreen())
+ float my_tex_coords[2][4][2];
+ std::memcpy(my_tex_coords, tex_coords, sizeof(my_tex_coords));
+ if (dispatch::parameters().fullscreen())
 {
- if (_params.fullscreen_flip_left)
+ if (_params.fullscreen_flip_left())
 {
- std::swap(tex_coords[0][0][0], tex_coords[0][3][0]);
- std::swap(tex_coords[0][0][1], tex_coords[0][3][1]);
- std::swap(tex_coords[0][1][0], tex_coords[0][2][0]);
- std::swap(tex_coords[0][1][1], tex_coords[0][2][1]);
+ std::swap(my_tex_coords[0][0][0], my_tex_coords[0][3][0]);
+ std::swap(my_tex_coords[0][0][1], my_tex_coords[0][3][1]);
+ std::swap(my_tex_coords[0][1][0], my_tex_coords[0][2][0]);
+ std::swap(my_tex_coords[0][1][1], my_tex_coords[0][2][1]);
 }
- if (_params.fullscreen_flop_left)
+ if (_params.fullscreen_flop_left())
 {
- std::swap(tex_coords[0][0][0], tex_coords[0][1][0]);
- std::swap(tex_coords[0][0][1], tex_coords[0][1][1]);
- std::swap(tex_coords[0][3][0], tex_coords[0][2][0]);
- std::swap(tex_coords[0][3][1], tex_coords[0][2][1]);
+ std::swap(my_tex_coords[0][0][0], my_tex_coords[0][1][0]);
+ std::swap(my_tex_coords[0][0][1], my_tex_coords[0][1][1]);
+ std::swap(my_tex_coords[0][3][0], my_tex_coords[0][2][0]);
+ std::swap(my_tex_coords[0][3][1], my_tex_coords[0][2][1]);
 }
- if (_params.fullscreen_flip_right)
+ if (_params.fullscreen_flip_right())
 {
- std::swap(tex_coords[1][0][0], tex_coords[1][3][0]);
- std::swap(tex_coords[1][0][1], tex_coords[1][3][1]);
- std::swap(tex_coords[1][1][0], tex_coords[1][2][0]);
- std::swap(tex_coords[1][1][1], tex_coords[1][2][1]);
+ std::swap(my_tex_coords[1][0][0], my_tex_coords[1][3][0]);
+ std::swap(my_tex_coords[1][0][1], my_tex_coords[1][3][1]);
+ std::swap(my_tex_coords[1][1][0], my_tex_coords[1][2][0]);
+ std::swap(my_tex_coords[1][1][1], my_tex_coords[1][2][1]);
 }
- if (_params.fullscreen_flop_right)
+ if (_params.fullscreen_flop_right())
 {
- std::swap(tex_coords[1][0][0], tex_coords[1][1][0]);
- std::swap(tex_coords[1][0][1], tex_coords[1][1][1]);
- std::swap(tex_coords[1][3][0], tex_coords[1][2][0]);
- std::swap(tex_coords[1][3][1], tex_coords[1][2][1]);
+ std::swap(my_tex_coords[1][0][0], my_tex_coords[1][1][0]);
+ std::swap(my_tex_coords[1][0][1], my_tex_coords[1][1][1]);
+ std::swap(my_tex_coords[1][3][0], my_tex_coords[1][2][0]);
+ std::swap(my_tex_coords[1][3][1], my_tex_coords[1][2][1]);
 }
 }
 
@@ -952,61 +1182,61 @@
 
 glUseProgram(_render_prg);
 glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, _color_srgb_tex[left]);
+ glBindTexture(GL_TEXTURE_2D, _color_tex[left]);
 if (left != right)
 {
 glActiveTexture(GL_TEXTURE1);
- glBindTexture(GL_TEXTURE_2D, _color_srgb_tex[right]);
+ glBindTexture(GL_TEXTURE_2D, _color_tex[right]);
 }
 glActiveTexture(GL_TEXTURE2);
 glBindTexture(GL_TEXTURE_2D, (_input_subtitle_box[_active_index].is_valid()
 ? _input_subtitle_tex[_active_index] : _render_dummy_tex));
 glUniform1i(glGetUniformLocation(_render_prg, "rgb_l"), left);
 glUniform1i(glGetUniformLocation(_render_prg, "rgb_r"), right);
- glUniform1f(glGetUniformLocation(_render_prg, "parallax"), _params.parallax * 0.05f);
+ glUniform1f(glGetUniformLocation(_render_prg, "parallax"), _params.parallax() * 0.05f);
 glUniform1i(glGetUniformLocation(_render_prg, "subtitle"), 2);
- glUniform1f(glGetUniformLocation(_render_prg, "subtitle_parallax"), _params.subtitle_parallax * 0.05f);
- if (_params.stereo_mode != parameters::red_green_monochrome
- && _params.stereo_mode != parameters::red_cyan_half_color
- && _params.stereo_mode != parameters::red_cyan_full_color
- && _params.stereo_mode != parameters::red_cyan_dubois
- && _params.stereo_mode != parameters::green_magenta_monochrome
- && _params.stereo_mode != parameters::green_magenta_half_color
- && _params.stereo_mode != parameters::green_magenta_full_color
- && _params.stereo_mode != parameters::green_magenta_dubois
- && _params.stereo_mode != parameters::amber_blue_monochrome
- && _params.stereo_mode != parameters::amber_blue_half_color
- && _params.stereo_mode != parameters::amber_blue_full_color
- && _params.stereo_mode != parameters::amber_blue_dubois
- && _params.stereo_mode != parameters::red_blue_monochrome
- && _params.stereo_mode != parameters::red_cyan_monochrome)
+ glUniform1f(glGetUniformLocation(_render_prg, "subtitle_parallax"), _params.subtitle_parallax() * 0.05f);
+ if (_params.stereo_mode() != parameters::mode_red_green_monochrome
+ && _params.stereo_mode() != parameters::mode_red_cyan_half_color
+ && _params.stereo_mode() != parameters::mode_red_cyan_full_color
+ && _params.stereo_mode() != parameters::mode_red_cyan_dubois
+ && _params.stereo_mode() != parameters::mode_green_magenta_monochrome
+ && _params.stereo_mode() != parameters::mode_green_magenta_half_color
+ && _params.stereo_mode() != parameters::mode_green_magenta_full_color
+ && _params.stereo_mode() != parameters::mode_green_magenta_dubois
+ && _params.stereo_mode() != parameters::mode_amber_blue_monochrome
+ && _params.stereo_mode() != parameters::mode_amber_blue_half_color
+ && _params.stereo_mode() != parameters::mode_amber_blue_full_color
+ && _params.stereo_mode() != parameters::mode_amber_blue_dubois
+ && _params.stereo_mode() != parameters::mode_red_blue_monochrome
+ && _params.stereo_mode() != parameters::mode_red_cyan_monochrome)
 {
 glUniform3f(glGetUniformLocation(_render_prg, "crosstalk"),
- _params.crosstalk_r * _params.ghostbust,
- _params.crosstalk_g * _params.ghostbust,
- _params.crosstalk_b * _params.ghostbust);
+ _params.crosstalk_r() * _params.ghostbust(),
+ _params.crosstalk_g() * _params.ghostbust(),
+ _params.crosstalk_b() * _params.ghostbust());
 }
- if (_params.stereo_mode == parameters::even_odd_rows
- || _params.stereo_mode == parameters::even_odd_columns
- || _params.stereo_mode == parameters::checkerboard)
+ if (_params.stereo_mode() == parameters::mode_even_odd_rows
+ || _params.stereo_mode() == parameters::mode_even_odd_columns
+ || _params.stereo_mode() == parameters::mode_checkerboard)
 {
 glUniform1i(glGetUniformLocation(_render_prg, "mask_tex"), 3);
 glUniform1f(glGetUniformLocation(_render_prg, "step_x"), 1.0f / static_cast<float>(viewport[0][2]));
 glUniform1f(glGetUniformLocation(_render_prg, "step_y"), 1.0f / static_cast<float>(viewport[0][3]));
 }
 
- if (_params.stereo_mode == parameters::stereo)
+ if (_params.stereo_mode() == parameters::mode_stereo)
 {
 glUniform1f(glGetUniformLocation(_render_prg, "channel"), 0.0f);
 glDrawBuffer(GL_BACK_LEFT);
- draw_quad(x, y, w, h, tex_coords);
+ draw_quad(x, y, w, h, my_tex_coords);
 glUniform1f(glGetUniformLocation(_render_prg, "channel"), 1.0f);
 glDrawBuffer(GL_BACK_RIGHT);
- draw_quad(x, y, w, h, tex_coords);
+ draw_quad(x, y, w, h, my_tex_coords);
 }
- else if (_params.stereo_mode == parameters::even_odd_rows
- || _params.stereo_mode == parameters::even_odd_columns
- || _params.stereo_mode == parameters::checkerboard)
+ else if (_params.stereo_mode() == parameters::mode_even_odd_rows
+ || _params.stereo_mode() == parameters::mode_even_odd_columns
+ || _params.stereo_mode() == parameters::mode_checkerboard)
 {
 float vpw = static_cast<float>(viewport[0][2]);
 float vph = static_cast<float>(viewport[0][3]);
@@ -1016,56 +1246,60 @@
 };
 glActiveTexture(GL_TEXTURE3);
 glBindTexture(GL_TEXTURE_2D, _render_mask_tex);
- draw_quad(x, y, w, h, tex_coords, more_tex_coords);
- }
- else if (_params.stereo_mode == parameters::red_cyan_monochrome
- || _params.stereo_mode == parameters::red_cyan_half_color
- || _params.stereo_mode == parameters::red_cyan_full_color
- || _params.stereo_mode == parameters::red_cyan_dubois
- || _params.stereo_mode == parameters::green_magenta_monochrome
- || _params.stereo_mode == parameters::green_magenta_half_color
- || _params.stereo_mode == parameters::green_magenta_full_color
- || _params.stereo_mode == parameters::green_magenta_dubois
- || _params.stereo_mode == parameters::amber_blue_monochrome
- || _params.stereo_mode == parameters::amber_blue_half_color
- || _params.stereo_mode == parameters::amber_blue_full_color
- || _params.stereo_mode == parameters::amber_blue_dubois
- || _params.stereo_mode == parameters::red_green_monochrome
- || _params.stereo_mode == parameters::red_blue_monochrome)
- {
- draw_quad(x, y, w, h, tex_coords);
- }
- else if (_params.stereo_mode == parameters::mono_left
- && !mono_right_instead_of_left)
+ draw_quad(x, y, w, h, my_tex_coords, more_tex_coords);
+ }
+ else if (_params.stereo_mode() == parameters::mode_red_cyan_monochrome
+ || _params.stereo_mode() == parameters::mode_red_cyan_half_color
+ || _params.stereo_mode() == parameters::mode_red_cyan_full_color
+ || _params.stereo_mode() == parameters::mode_red_cyan_dubois
+ || _params.stereo_mode() == parameters::mode_green_magenta_monochrome
+ || _params.stereo_mode() == parameters::mode_green_magenta_half_color
+ || _params.stereo_mode() == parameters::mode_green_magenta_full_color
+ || _params.stereo_mode() == parameters::mode_green_magenta_dubois
+ || _params.stereo_mode() == parameters::mode_amber_blue_monochrome
+ || _params.stereo_mode() == parameters::mode_amber_blue_half_color
+ || _params.stereo_mode() == parameters::mode_amber_blue_full_color
+ || _params.stereo_mode() == parameters::mode_amber_blue_dubois
+ || _params.stereo_mode() == parameters::mode_red_green_monochrome
+ || _params.stereo_mode() == parameters::mode_red_blue_monochrome)
+ {
+ draw_quad(x, y, w, h, my_tex_coords);
+ }
+ else if ((_params.stereo_mode() == parameters::mode_mono_left && !mono_right_instead_of_left)
+ || (_params.stereo_mode() == parameters::mode_alternating && display_frameno % 2 == 0))
 {
 glUniform1f(glGetUniformLocation(_render_prg, "channel"), 0.0f);
- draw_quad(x, y, w, h, tex_coords);
+ draw_quad(x, y, w, h, my_tex_coords);
 }
- else if (_params.stereo_mode == parameters::mono_right
- || (_params.stereo_mode == parameters::mono_left && mono_right_instead_of_left))
+ else if (_params.stereo_mode() == parameters::mode_mono_right
+ || (_params.stereo_mode() == parameters::mode_mono_left && mono_right_instead_of_left)
+ || (_params.stereo_mode() == parameters::mode_alternating && display_frameno % 2 == 1))
 {
 glUniform1f(glGetUniformLocation(_render_prg, "channel"), 1.0f);
- draw_quad(x, y, w, h, tex_coords);
+ draw_quad(x, y, w, h, my_tex_coords);
 }
- else if (_params.stereo_mode == parameters::left_right
- || _params.stereo_mode == parameters::left_right_half
- || _params.stereo_mode == parameters::top_bottom
- || _params.stereo_mode == parameters::top_bottom_half
- || _params.stereo_mode == parameters::hdmi_frame_pack)
+ else if (_params.stereo_mode() == parameters::mode_left_right
+ || _params.stereo_mode() == parameters::mode_left_right_half
+ || _params.stereo_mode() == parameters::mode_top_bottom
+ || _params.stereo_mode() == parameters::mode_top_bottom_half
+ || _params.stereo_mode() == parameters::mode_hdmi_frame_pack)
 {
 glUniform1f(glGetUniformLocation(_render_prg, "channel"), 0.0f);
- draw_quad(x, y, w, h, tex_coords);
+ draw_quad(x, y, w, h, my_tex_coords);
 glViewport(viewport[1][0], viewport[1][1], viewport[1][2], viewport[1][3]);
 glUniform1f(glGetUniformLocation(_render_prg, "channel"), 1.0f);
- draw_quad(x, y, w, h, tex_coords);
+ draw_quad(x, y, w, h, my_tex_coords);
 }
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
+ glUseProgram(0);
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D, 0);
+ glDisable(GL_TEXTURE_2D);
 }
 
-void video_output::clear()
+void video_output::clear() const
 {
- make_context_current();
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 if (context_is_stereo())
 {
 glDrawBuffer(GL_BACK_LEFT);
@@ -1077,30 +1311,60 @@
 {
 glClear(GL_COLOR_BUFFER_BIT);
 }
- assert(xgl::CheckError(HERE));
+ assert(xglCheckError(HERE));
 }
 
-static void compute_viewport(int vp[4], int w, int h, float dst_w, float dst_h, float dst_ar, float src_ar)
+static void compute_viewport_and_tex_coords(int vp[4], float tc[4][2],
+ float src_ar, int w, int h, float dst_w, float dst_h, float dst_ar,
+ float crop_ar, float zoom)
 {
- vp[2] = dst_w;
- vp[3] = dst_h;
+ std::memcpy(tc, full_tex_coords[0], sizeof(tc));
+ if (crop_ar > 0.0f)
+ {
+ if (src_ar >= crop_ar)
+ {
+ float cutoff = (1.0f - crop_ar / src_ar) / 2.0f;
+ tc[0][0] += cutoff;
+ tc[1][0] -= cutoff;
+ tc[2][0] -= cutoff;
+ tc[3][0] += cutoff;
+ }
+ else
+ {
+ float cutoff = (1.0f - src_ar / crop_ar) / 2.0f;
+ tc[0][1] += cutoff;
+ tc[1][1] += cutoff;
+ tc[2][1] -= cutoff;
+ tc[3][1] -= cutoff;
+ }
+ src_ar = crop_ar;
+ }
 if (src_ar >= dst_ar)
 {
 // need black borders top and bottom
- vp[3] = dst_ar / src_ar * dst_h;
+ float zoom_src_ar = zoom * dst_ar + (1.0f - zoom) * src_ar;
+ vp[2] = dst_w;
+ vp[3] = dst_ar / zoom_src_ar * dst_h;
+ vp[0] = (w - vp[2]) / 2;
+ vp[1] = (h - vp[3]) / 2;
+ float cutoff = (1.0f - zoom_src_ar / src_ar) / 2.0f;
+ tc[0][0] += cutoff;
+ tc[1][0] -= cutoff;
+ tc[2][0] -= cutoff;
+ tc[3][0] += cutoff;
 }
 else
 {
 // need black borders left and right
 vp[2] = src_ar / dst_ar * dst_w;
+ vp[3] = dst_h;
+ vp[0] = (w - vp[2]) / 2;
+ vp[1] = (h - vp[3]) / 2;
 }
- vp[0] = (w - vp[2]) / 2;
- vp[1] = (h - vp[3]) / 2;
 }
 
 void video_output::reshape(int w, int h)
 {
- make_context_current();
 // Clear
 _viewport[0][0] = 0;
 _viewport[0][1] = 0;
@@ -1110,6 +1374,7 @@
 _viewport[1][1] = 0;
 _viewport[1][2] = w;
 _viewport[1][3] = h;
+ std::memcpy(_tex_coords, full_tex_coords, sizeof(_tex_coords));
 glViewport(0, 0, w, h);
 clear();
 if (!_frame[_active_index].is_valid())
@@ -1118,41 +1383,47 @@
 }
 
 // Compute viewport with the right aspect ratio
- if (_params.stereo_mode == parameters::left_right
- || _params.stereo_mode == parameters::left_right_half)
+ if (_params.stereo_mode() == parameters::mode_left_right
+ || _params.stereo_mode() == parameters::mode_left_right_half)
 {
 float dst_w = w / 2;
 float dst_h = h;
 float dst_ar = dst_w * screen_pixel_aspect_ratio() / dst_h;
 float src_ar = _frame[_active_index].aspect_ratio;
- if (_params.stereo_mode == parameters::left_right_half)
+ float crop_ar = _params.crop_aspect_ratio();
+ if (_params.stereo_mode() == parameters::mode_left_right_half)
 {
 src_ar /= 2.0f;
+ crop_ar /= 2.0f;
 }
- compute_viewport(_viewport[0], w / 2, h, dst_w, dst_h, dst_ar, src_ar);
+ compute_viewport_and_tex_coords(_viewport[0], _tex_coords[0], src_ar,
+ w / 2, h, dst_w, dst_h, dst_ar,
+ crop_ar, _params.zoom());
+ std::memcpy(_viewport[1], _viewport[0], sizeof(_viewport[1]));
 _viewport[1][0] = _viewport[0][0] + w / 2;
- _viewport[1][1] = _viewport[0][1];
- _viewport[1][2] = _viewport[0][2];
- _viewport[1][3] = _viewport[0][3];
+ std::memcpy(_tex_coords[1], _tex_coords[0], sizeof(_tex_coords[1]));
 }
- else if (_params.stereo_mode == parameters::top_bottom
- || _params.stereo_mode == parameters::top_bottom_half)
+ else if (_params.stereo_mode() == parameters::mode_top_bottom
+ || _params.stereo_mode() == parameters::mode_top_bottom_half)
 {
 float dst_w = w;
 float dst_h = h / 2;
 float dst_ar = dst_w * screen_pixel_aspect_ratio() / dst_h;
 float src_ar = _frame[_active_index].aspect_ratio;
- if (_params.stereo_mode == parameters::top_bottom_half)
+ float crop_ar = _params.crop_aspect_ratio();
+ if (_params.stereo_mode() == parameters::mode_top_bottom_half)
 {
 src_ar *= 2.0f;
+ crop_ar *= 2.0f;
 }
- compute_viewport(_viewport[0], w, h / 2, dst_w, dst_h, dst_ar, src_ar);
- _viewport[1][0] = _viewport[0][0];
+ compute_viewport_and_tex_coords(_viewport[0], _tex_coords[0], src_ar,
+ w, h / 2, dst_w, dst_h, dst_ar,
+ crop_ar, _params.zoom());
+ std::memcpy(_viewport[1], _viewport[0], sizeof(_viewport[1]));
 _viewport[1][1] = _viewport[0][1] + h / 2;
- _viewport[1][2] = _viewport[0][2];
- _viewport[1][3] = _viewport[0][3];
+ std::memcpy(_tex_coords[1], _tex_coords[0], sizeof(_tex_coords[1]));
 }
- else if (_params.stereo_mode == parameters::hdmi_frame_pack)
+ else if (_params.stereo_mode() == parameters::mode_hdmi_frame_pack)
 {
 // HDMI frame packing mode has left view top, right view bottom, plus a
 // blank area separating the two. 720p uses 30 blank lines (total: 720
@@ -1166,11 +1437,12 @@
 float dst_h = (h - blank_lines) / 2;
 float dst_ar = dst_w * screen_pixel_aspect_ratio() / dst_h;
 float src_ar = _frame[_active_index].aspect_ratio;
- compute_viewport(_viewport[0], w, (h - blank_lines) / 2, dst_w, dst_h, dst_ar, src_ar);
- _viewport[1][0] = _viewport[0][0];
+ compute_viewport_and_tex_coords(_viewport[0], _tex_coords[0], src_ar,
+ w, (h - blank_lines) / 2, dst_w, dst_h, dst_ar,
+ _params.crop_aspect_ratio(), _params.zoom());
+ std::memcpy(_viewport[1], _viewport[0], sizeof(_viewport[1]));
 _viewport[1][1] = _viewport[0][1] + (h - blank_lines) / 2 + blank_lines;
- _viewport[1][2] = _viewport[0][2];
- _viewport[1][3] = _viewport[0][3];
+ std::memcpy(_tex_coords[1], _tex_coords[0], sizeof(_tex_coords[1]));
 }
 else
 {
@@ -1178,20 +1450,15 @@
 float dst_h = h;
 float dst_ar = dst_w * screen_pixel_aspect_ratio() / dst_h;
 float src_ar = _frame[_active_index].aspect_ratio;
- compute_viewport(_viewport[0], w, h, dst_w, dst_h, dst_ar, src_ar);
- _viewport[1][0] = _viewport[0][0];
- _viewport[1][1] = _viewport[0][1];
- _viewport[1][2] = _viewport[0][2];
- _viewport[1][3] = _viewport[0][3];
+ compute_viewport_and_tex_coords(_viewport[0], _tex_coords[0], src_ar,
+ w, h, dst_w, dst_h, dst_ar,
+ _params.crop_aspect_ratio(), _params.zoom());
+ std::memcpy(_viewport[1], _viewport[0], sizeof(_viewport[1]));
+ std::memcpy(_tex_coords[1], _tex_coords[0], sizeof(_tex_coords[1]));
 }
 }
 
-bool video_output::need_redisplay_on_move()
+int64_t video_output::time_to_next_frame_presentation() const
 {
- // The masking modes must know if the video area starts with an even or
- // odd columns and/or row. If this changes, the display must be updated.
- return (_frame[_active_index].is_valid()
- && (_render_last_params.stereo_mode == parameters::even_odd_rows
- || _render_last_params.stereo_mode == parameters::even_odd_columns
- || _render_last_params.stereo_mode == parameters::checkerboard));
+ return 0;
 }

bino-1.2.1.tar.bz2/src/video_output.h -> bino-1.3.2.tar.xz/src/video_output.h Changed

bino-1.2.1.tar.bz2/src/video_output_color.fs.glsl -> bino-1.3.2.tar.xz/src/video_output_color.fs.glsl Changed

@@ -31,6 +31,8 @@
 
 // value_range_8bit_full
 // value_range_8bit_mpeg
+// value_range_10bit_full
+// value_range_10bit_mpeg
 #define $value_range
 
 // the offset between the y texture coordinates and the appropriate
@@ -38,6 +40,10 @@
 #define chroma_offset_x $chroma_offset_x
 #define chroma_offset_y $chroma_offset_y
 
+// storage_srgb
+// storage_linear_rgb
+#define $storage
+
 #if defined(layout_yuv_p)
 uniform sampler2D y_tex;
 uniform sampler2D u_tex;
@@ -75,10 +81,13 @@
 
 vec3 yuv_to_srgb(vec3 yuv)
 {
+ // Convert the MPEG range to the full range for each component, if necessary
 #if defined(value_range_8bit_mpeg)
- // Convert the MPEG range to the full range for each component
 yuv = (yuv - vec3(16.0 / 255.0)) * vec3(256.0 / 220.0, 256.0 / 225.0, 256.0 / 225.0);
+#elif defined(value_range_10bit_mpeg)
+ yuv = (yuv - vec3(64.0 / 1023.0)) * vec3(1024.0 / 877.0, 1024.0 / 897.0, 1024.0 / 897.0);
 #endif
+
 #if defined(color_space_yuv709)
 // According to ITU.BT-709 (see entries 3.2 and 3.3 in Sec. 3 ("Signal format"))
 mat3 m = mat3(
@@ -96,6 +105,21 @@
 #endif
 }
 
+#if defined(storage_linear_rgb)
+// See GL_ARB_framebuffer_sRGB extension
+float nonlinear_to_linear(float x)
+{
+ return (x <= 0.04045 ? (x / 12.92) : pow((x + 0.055) / 1.055, 2.4));
+}
+vec3 srgb_to_rgb(vec3 srgb)
+{
+ float r = nonlinear_to_linear(srgb.r);
+ float g = nonlinear_to_linear(srgb.g);
+ float b = nonlinear_to_linear(srgb.b);
+ return vec3(r, g, b);
+}
+#endif
+
 vec3 adjust_yuv(vec3 yuv)
 {
 // Adapted from http://www.silicontrip.net/~mark/lavtools/yuvadjust.c
@@ -114,11 +138,16 @@
 {
 #if defined(layout_bgra32)
 return srgb_to_yuv(texture2D(srgb_tex, tex_coord).xyz);
-#elif defined(layout_yuv_p)
+#elif defined(value_range_8bit_full) || defined(value_range_8bit_mpeg)
 return vec3(
 texture2D(y_tex, tex_coord).x,
 texture2D(u_tex, tex_coord + vec2(chroma_offset_x, chroma_offset_y)).x,
 texture2D(v_tex, tex_coord + vec2(chroma_offset_x, chroma_offset_y)).x);
+#else
+ return (65535.0 / 1023.0) * vec3(
+ texture2D(y_tex, tex_coord).x,
+ texture2D(u_tex, tex_coord + vec2(chroma_offset_x, chroma_offset_y)).x,
+ texture2D(v_tex, tex_coord + vec2(chroma_offset_x, chroma_offset_y)).x);
 #endif
 }
 
@@ -127,5 +156,10 @@
 vec3 yuv = get_yuv(gl_TexCoord[0].xy);
 vec3 adjusted_yuv = adjust_yuv(yuv);
 vec3 srgb = yuv_to_srgb(adjusted_yuv);
+#if defined(storage_srgb)
 gl_FragColor = vec4(srgb, 1.0);
+#else
+ vec3 rgb = srgb_to_rgb(srgb);
+ gl_FragColor = vec4(rgb, 1.0);
+#endif
 }

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

bino-1.2.1.tar.bz2/src/video_output_qt.h -> bino-1.3.2.tar.xz/src/video_output_qt.h Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010-2011
+ * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -26,6 +26,15 @@
 #include <QWidget>
 #include <QGLWidget>
 #include <QGLFormat>
+#include <QTimer>
+#include <QThread>
+#include <QMutex>
+
+#ifdef Q_WS_X11
+# include <GL/glxew.h>
+#endif
+
+#include "thread.h"
 
 #include "video_output.h"
 
@@ -33,49 +42,125 @@
 /* Internal interface */
 
 class video_output_qt;
+class video_output_qt_widget;
+
+class gl_thread : public QThread
+{
+private:
+ video_output_qt* _vo_qt;
+ video_output_qt_widget* _vo_qt_widget;
+ bool _render;
+ bool _resize;
+ int _w, _h;
+ mutex _action_mutex;
+ condition _action_cond;
+ bool _action_activate;
+ bool _action_prepare;
+ video_frame _next_frame;
+ subtitle_box _next_subtitle;
+ bool _failure;
+ exc _e;
+
+ // The display frame number
+ int64_t _display_frameno;
+
+ // For estimation of next display frame presentation time
+ mutex _pt_mutex;
+ static const int _pts = 5;
+ int64_t _pt[_pts];
+ int _ptc;
+ int _pti;
+
+public:
+ gl_thread(video_output_qt* vo_qt, video_output_qt_widget* vo_qt_widget);
+
+#ifdef Q_WS_X11
+ GLXEWContext* glxewGetContext() const;
+#endif
+
+ void set_render(bool r);
+ void resize(int w, int h);
+ void activate_next_frame();
+ void prepare_next_frame(const video_frame &frame, const subtitle_box &subtitle);
+
+ int64_t time_to_next_frame_presentation();
+
+ void run();
+
+ bool failure() const
+ {
+ return _failure;
+ }
+ const exc& exception() const
+ {
+ return _e;
+ }
+};
 
 class video_output_qt_widget : public QGLWidget
 {
 Q_OBJECT
-
 private:
 video_output_qt *_vo;
+ class gl_thread _gl_thread;
+ QTimer _timer;
+ int _width, _height;
+ int _pos_x, _pos_y;
+
+private slots:
+ void check_gl_thread();
 
 public:
 video_output_qt_widget(video_output_qt *vo, const QGLFormat &format, QWidget *parent = NULL);
- ~video_output_qt_widget();
 
-public slots:
- void move_event();
+ int vo_width() const;
+ int vo_height() const;
+ int vo_pos_x() const;
+ int vo_pos_y() const;
+
+ void start_rendering();
+ void stop_rendering();
+ class gl_thread* gl_thread()
+ {
+ return &_gl_thread;
+ }
 
 protected:
- virtual void paintGL();
- virtual void resizeGL(int width, int height);
- virtual void moveEvent(QMoveEvent *event);
+#ifdef Q_WS_X11
+# if QT_VERSION < 0x040800
+ /* Work around a bug in Qt < 4.8: On a hide event, the GLWidget calls
+ * makeCurrent() and glFinish(), but this interferes with our GL thread.
+ * This has been fixed in Qt 4.8. */
+ virtual bool event(QEvent* e) { return QWidget::event(e); }
+# endif
+#endif
+ virtual void paintEvent(QPaintEvent*) {}
+ virtual void resizeEvent(QResizeEvent* event);
 virtual void keyPressEvent(QKeyEvent *event);
 virtual void mouseReleaseEvent(QMouseEvent *event);
 virtual void mouseDoubleClickEvent(QMouseEvent *event);
 virtual void focusOutEvent(QFocusEvent *event);
 };
 
-/* Public interface. You can use this as a video container widget, to
- * conveniently catch move events and pass them to the video output, as
- * described below (but note that you still must catch move events for
- * parent widgets yourself). */
+/* Public interface */
 
 class video_container_widget : public QWidget, public controller
 {
 Q_OBJECT
 int _w, _h;
+ QTimer *_timer;
+private slots:
+ void playloop_step();
 public:
 video_container_widget(QWidget *parent = NULL);
+ void start_timer();
 void set_recommended_size(int w, int h);
+ void grab_focus();
 signals:
- void move_event();
 protected:
 virtual QSize sizeHint() const;
- virtual void moveEvent(QMoveEvent *event);
 virtual void closeEvent(QCloseEvent *event);
+ virtual void receive_notification(const notification& note);
 };
 
 /* Public interface. See the video_output documentation. */
@@ -83,12 +168,21 @@
 class video_output_qt : public video_output
 {
 private:
+#ifdef Q_WS_X11
+ GLXEWContext _glxew_context;
+#endif
+ GLEWContext _glew_context;
+ int _screen_width, _screen_height;
+ float _screen_pixel_aspect_ratio;
 video_container_widget *_container_widget;
 bool _container_is_external;
 video_output_qt_widget *_widget;
 QGLFormat _format;
 bool _fullscreen;
- bool _playing;
+ QRect _geom;
+ bool _screensaver_inhibited;
+ bool _recreate_context;
+ bool _recreate_context_stereo;
 
 void create_widget();
 void mouse_set_pos(float dest);
@@ -97,53 +191,48 @@
 void resume_screensaver();
 
 protected:
- virtual void make_context_current();
- virtual bool context_is_stereo();
+#ifdef Q_WS_X11
+ GLXEWContext* glxewGetContext() const;
+#endif
+ virtual GLEWContext* glewGetContext() const;
+ virtual bool context_is_stereo() const;
 virtual void recreate_context(bool stereo);
- virtual void trigger_update();
 virtual void trigger_resize(int w, int h);
 
+ virtual int screen_width() const;
+ virtual int screen_height() const;
+ virtual float screen_pixel_aspect_ratio() const;
+ virtual int width() const;
+ virtual int height() const;
+ virtual int pos_x() const;
+ virtual int pos_y() const;
+
 public:
 /* Constructor, Destructor */
 /* If a container widget is given, then it is assumed that this widget is
- * part of another widget (e.g. a main window). In this case, you also need
- * to use the move_event() function; see below. If no container widget is
+ * part of another widget (e.g. a main window). If no container widget is
 * given, we will use our own, and it will be a top-level window. */
- video_output_qt(bool benchmark, video_container_widget *container_widget = NULL);
+ video_output_qt(video_container_widget *container_widget = NULL);
 virtual ~video_output_qt();
 
- /* If you give a container element to the constructor, you have to call
- * this function for every move events that the container widget or its
- * parent widgets receive. This is required for the masking output modes
- * (even-odd-*, checkerboard). */
- void move_event();
-
- /* Grab the keyboard focus for the video widget, to enable keyboard shortcuts */
- void grab_focus();
-
 virtual void init();
 virtual int64_t wait_for_subtitle_renderer();
 virtual void deinit();
 
 virtual bool supports_stereo() const;
- virtual int screen_width();
- virtual int screen_height();
- virtual float screen_pixel_aspect_ratio();
- virtual int width();
- virtual int height();
- virtual int pos_x();
- virtual int pos_y();
- virtual bool fullscreen();
 
 virtual void center();
- virtual void enter_fullscreen(int screens);
+ virtual void enter_fullscreen();
 virtual void exit_fullscreen();
- virtual bool toggle_fullscreen(int screens);
 
- virtual void process_events();
+ virtual void prepare_next_frame(const video_frame &frame, const subtitle_box &subtitle);
+ virtual void activate_next_frame();
+ virtual int64_t time_to_next_frame_presentation() const;
 
- virtual void receive_notification(const notification &note);
+ virtual void process_events();
+ virtual void receive_notification(const notification& note);
 
+ friend class gl_thread;
 friend class video_output_qt_widget;
 };

bino-1.2.1.tar.bz2/src/video_output_render.fs.glsl -> bino-1.3.2.tar.xz/src/video_output_render.fs.glsl Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010-2011
+ * Copyright (C) 2010, 2011, 2012
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
 *
@@ -77,24 +77,20 @@
 
 vec3 rgb_to_srgb(vec3 rgb)
 {
-#if $srgb_broken
- return rgb;
-#else
-# if 1
+#if 1
 // Correct variant, see GL_ARB_framebuffer_sRGB extension
 float sr = linear_to_nonlinear(rgb.r);
 float sg = linear_to_nonlinear(rgb.g);
 float sb = linear_to_nonlinear(rgb.b);
 return vec3(sr, sg, sb);
-# endif
-# if 0
+#endif
+#if 0
 // Faster variant
 return pow(rgb, 1.0 / 2.2);
-# endif
-# if 0
+#endif
+#if 0
 // Even faster variant, assuming gamma = 2.0
 return sqrt(rgb);
-# endif
 #endif
 }
 
@@ -132,12 +128,13 @@
 
 void main()
 {
+ vec3 l, r;
 vec3 srgb;
 
 #if defined(mode_onechannel)
 
- vec3 l = blend_subtitle(tex_l(gl_TexCoord[0].xy), sub_l(gl_TexCoord[0].xy));
- vec3 r = blend_subtitle(tex_r(gl_TexCoord[1].xy), sub_r(gl_TexCoord[1].xy));
+ l = blend_subtitle(tex_l(gl_TexCoord[0].xy), sub_l(gl_TexCoord[0].xy));
+ r = blend_subtitle(tex_r(gl_TexCoord[1].xy), sub_r(gl_TexCoord[1].xy));
 srgb = rgb_to_srgb(ghostbust(mix(l, r, channel), mix(r, l, channel)));
 
 #elif defined(mode_even_odd_rows) || defined(mode_even_odd_columns) || defined(mode_checkerboard)
@@ -198,8 +195,8 @@
 // This method depends on the characteristics of the display device and the anaglyph glasses.
 // According to the author, the matrices below are intended to be applied to linear RGB values,
 // and are designed for CRT displays.
- vec3 l = blend_subtitle(tex_l(gl_TexCoord[0].xy), sub_l(gl_TexCoord[0].xy));
- vec3 r = blend_subtitle(tex_r(gl_TexCoord[1].xy), sub_r(gl_TexCoord[1].xy));
+ l = blend_subtitle(tex_l(gl_TexCoord[0].xy), sub_l(gl_TexCoord[0].xy));
+ r = blend_subtitle(tex_r(gl_TexCoord[1].xy), sub_r(gl_TexCoord[1].xy));
 # if defined(mode_red_cyan_dubois)
 // Source of this matrix: http://www.site.uottawa.ca/~edubois/anaglyph/LeastSquaresHowToPhotoshop.pdf
 mat3 m0 = mat3(
@@ -235,8 +232,8 @@
 
 #else // lower quality anaglyph methods
 
- vec3 l = rgb_to_srgb(blend_subtitle(tex_l(gl_TexCoord[0].xy), sub_l(gl_TexCoord[0].xy)));
- vec3 r = rgb_to_srgb(blend_subtitle(tex_r(gl_TexCoord[1].xy), sub_r(gl_TexCoord[1].xy)));
+ l = rgb_to_srgb(blend_subtitle(tex_l(gl_TexCoord[0].xy), sub_l(gl_TexCoord[0].xy)));
+ r = rgb_to_srgb(blend_subtitle(tex_r(gl_TexCoord[1].xy), sub_r(gl_TexCoord[1].xy)));
 # if defined(mode_red_cyan_monochrome)
 srgb = vec3(srgb_to_lum(l), srgb_to_lum(r), srgb_to_lum(r));
 # elif defined(mode_red_cyan_half_color)