Packman Build Service PMBS

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

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

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;

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

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

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)

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

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

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

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

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

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

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

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

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

@@ -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
@@ -85,6 +83,7 @@
 std::string _longname;
 char _shortname;
 option_policy _policy;
+ bool _is_set;
 
 public:
 /**
@@ -94,7 +93,7 @@
 * \param mandatory Whether this option is mandatory or optional.
 */
 option(const std::string &longname, char shortname, option_policy policy)
- : _longname(longname), _shortname(shortname), _policy(policy)
+ : _longname(longname), _shortname(shortname), _policy(policy), _is_set(false)
 {
 }
 
@@ -113,6 +112,16 @@
 return _policy;
 }
 
+ bool is_set() const
+ {
+ return _is_set;
+ }
+
+ void mark_as_set()
+ {
+ _is_set = true;
+ }
+
 /**
 * \brief Argument policy
 *

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

bino-1.2.1.tar.bz2/src/base/s11n.h -> bino-1.3.2.tar.xz/src/base/s11n.h 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
@@ -31,21 +29,37 @@
 */
 
 #include <iostream>
+#include <sstream>
 #include <string>
 #include <vector>
 
 
-class s11n
+class serializable
 {
 public:
-
 /*
 * Interface for serializable classes
 */
 
- virtual void save(std::ostream &os) const = 0;
- virtual void load(std::istream &is) = 0;
+ // Save binary. Efficient. Needs compatible architectures and application versions on the writing and reading end.
+ virtual void save(std::ostream& os) const = 0;
+ virtual void load(std::istream& is) = 0;
 
+ // Save in human-readable and editable text format. Can be used for machine- and application version independent
+ // saving of data. The default implementation falls back on the above binary functions and stores the binary data in
+ // strings.
+ virtual void save(std::ostream& os, const char* name) const;
+ virtual void load(const std::string& s);
+};
+
+namespace s11n
+{
+ // Functions needed to human-readable save/load:
+ // - When saving a group of values contained in a serializable class, use startgroup()/endgroup()
+ // - When loading back, get the next name/value pair and interpret it
+ void startgroup(std::ostream& os, const char* name);
+ void endgroup(std::ostream& os);
+ void load(std::istream& is, std::string& name, std::string& value);
 
 /*
 * Save a value to a stream
@@ -53,49 +67,77 @@
 
 // Fundamental arithmetic data types
 
- static void save(std::ostream &os, const bool x);
- static void save(std::ostream &os, const char x);
- static void save(std::ostream &os, const signed char x);
- static void save(std::ostream &os, const unsigned char x);
- static void save(std::ostream &os, const short x);
- static void save(std::ostream &os, const unsigned short x);
- static void save(std::ostream &os, const int x);
- static void save(std::ostream &os, const unsigned int x);
- static void save(std::ostream &os, const long x);
- static void save(std::ostream &os, const unsigned long x);
- static void save(std::ostream &os, const long long x);
- static void save(std::ostream &os, const unsigned long long x);
- static void save(std::ostream &os, const float x);
- static void save(std::ostream &os, const double x);
- static void save(std::ostream &os, const long double x);
+ void save(std::ostream& os, bool x);
+ void save(std::ostream& os, const char* name, bool x);
+ void save(std::ostream& os, char x);
+ void save(std::ostream& os, const char* name, char x);
+ void save(std::ostream& os, signed char x);
+ void save(std::ostream& os, const char* name, signed char x);
+ void save(std::ostream& os, unsigned char x);
+ void save(std::ostream& os, const char* name, unsigned char x);
+ void save(std::ostream& os, short x);
+ void save(std::ostream& os, const char* name, short x);
+ void save(std::ostream& os, unsigned short x);
+ void save(std::ostream& os, const char* name, unsigned short x);
+ void save(std::ostream& os, int x);
+ void save(std::ostream& os, const char* name, int x);
+ void save(std::ostream& os, unsigned int x);
+ void save(std::ostream& os, const char* name, unsigned int x);
+ void save(std::ostream& os, long x);
+ void save(std::ostream& os, const char* name, long x);
+ void save(std::ostream& os, unsigned long x);
+ void save(std::ostream& os, const char* name, unsigned long x);
+ void save(std::ostream& os, long long x);
+ void save(std::ostream& os, const char* name, long long x);
+ void save(std::ostream& os, unsigned long long x);
+ void save(std::ostream& os, const char* name, unsigned long long x);
+ void save(std::ostream& os, float x);
+ void save(std::ostream& os, const char* name, float x);
+ void save(std::ostream& os, double x);
+ void save(std::ostream& os, const char* name, double x);
+ void save(std::ostream& os, long double x);
+ void save(std::ostream& os, const char* name, long double x);
 
 // Binary blobs
 
- static void save(std::ostream &os, const void *x, const size_t n);
+ void save(std::ostream& os, const void* x, const size_t n);
+ void save(std::ostream& os, const char* name, const void* x, const size_t n);
 
 // Serializable classes
 
- static void save(std::ostream &os, const s11n &x);
+ void save(std::ostream& os, const serializable& x);
+ void save(std::ostream& os, const char* name, const serializable& x);
 
 // Basic STL types
 
- static void save(std::ostream &os, const std::string &x);
+ void save(std::ostream& os, const std::string& x);
+ void save(std::ostream& os, const char* name, const std::string& x);
 
 // STL containters
 
 template<typename T>
- static void save(std::ostream &os, const std::vector<T> &x)
+ void save(std::ostream& os, const std::vector<T>& x)
 {
 size_t s = x.size();
 save(os, s);
- for (size_t i = 0; i < s; i++)
- {
+ for (size_t i = 0; i < s; i++) {
 save(os, x[i]);
 }
 }
 
- // TODO: add more STL containers as needed
+ template<typename T>
+ void save(std::ostream& os, const char* name, const std::vector<T>& x)
+ {
+ size_t s = x.size();
+ startgroup(os, name);
+ save(os, "size", s);
+ for (size_t i = 0; i < s; i++) {
+ save(os, "", x[i]);
+ }
+ endgroup(os);
+ }
 
+ // TODO: add more STL containers as needed
 
 /*
 * Load a value from a stream
@@ -103,51 +145,106 @@
 
 // Fundamental arithmetic data types
 
- static void load(std::istream &is, bool &x);
- static void load(std::istream &is, char &x);
- static void load(std::istream &is, signed char &x);
- static void load(std::istream &is, unsigned char &x);
- static void load(std::istream &is, short &x);
- static void load(std::istream &is, unsigned short &x);
- static void load(std::istream &is, int &x);
- static void load(std::istream &is, unsigned int &x);
- static void load(std::istream &is, long &x);
- static void load(std::istream &is, unsigned long &x);
- static void load(std::istream &is, long long &x);
- static void load(std::istream &is, unsigned long long &x);
- static void load(std::istream &is, float &x);
- static void load(std::istream &is, double &x);
- static void load(std::istream &is, long double &x);
+ void load(std::istream& is, bool& x);
+ void load(const std::string& s, bool& x);
+ void load(std::istream& is, char& x);
+ void load(const std::string& s, char& x);
+ void load(std::istream& is, signed char& x);
+ void load(const std::string& s, signed char& x);
+ void load(std::istream& is, unsigned char& x);
+ void load(const std::string& s, unsigned char& x);
+ void load(std::istream& is, short& x);
+ void load(const std::string& s, short& x);
+ void load(std::istream& is, unsigned short& x);
+ void load(const std::string& s, unsigned short& x);
+ void load(std::istream& is, int& x);
+ void load(const std::string& s, int& x);
+ void load(std::istream& is, unsigned int& x);
+ void load(const std::string& s, unsigned int& x);
+ void load(std::istream& is, long& x);
+ void load(const std::string& s, long& x);
+ void load(std::istream& is, unsigned long& x);
+ void load(const std::string& s, unsigned long& x);
+ void load(std::istream& is, long long& x);
+ void load(const std::string& s, long long& x);
+ void load(std::istream& is, unsigned long long& x);
+ void load(const std::string& s, unsigned long long& x);
+ void load(std::istream& is, float& x);
+ void load(const std::string& s, float& x);
+ void load(std::istream& is, double& x);
+ void load(const std::string& s, double& x);
+ void load(std::istream& is, long double& x);
+ void load(const std::string& s, long double& x);

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

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

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

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

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
+

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

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

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

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

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"

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:

bino-1.2.1.tar.bz2/src/media_data.h -> bino-1.3.2.tar.xz/src/media_data.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>
 * 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
@@ -26,9 +27,10 @@
 #include <stdint.h>
 
 #include "s11n.h"
+#include "msg.h"
 
 
-class device_request : public s11n
+class device_request : public serializable
 {
 public:
 typedef enum
@@ -59,6 +61,160 @@
 void load(std::istream &is);
 };
 
+class parameters : public serializable
+{
+public:
+
+ // Stereo layout: describes how left and right view are stored
+ typedef enum {
+ layout_mono, // 1 video source: center view
+ layout_separate, // 2 video sources: left and right view independent
+ layout_alternating, // 2 video sources: left and right view consecutively
+ layout_top_bottom, // 1 video source: left view top, right view bottom, both with full size
+ layout_top_bottom_half,// 1 video source: left view top, right view bottom, both with half size
+ layout_left_right, // 1 video source: left view left, right view right, both with full size
+ layout_left_right_half,// 1 video source: left view left, right view right, both with half size
+ layout_even_odd_rows // 1 video source: left view even lines, right view odd lines
+ } stereo_layout_t;
+
+ // Convert the stereo layout to and from a string representation
+ static std::string stereo_layout_to_string(stereo_layout_t stereo_layout, bool stereo_layout_swap);
+ static void stereo_layout_from_string(const std::string &s, stereo_layout_t &stereo_layout, bool &stereo_layout_swap);
+
+ // Stereo mode: the output mode for left and right view
+ typedef enum {
+ mode_stereo, // OpenGL quad buffered stereo
+ mode_alternating, // Left and right view alternating
+ mode_mono_left, // Left view only
+ mode_mono_right, // Right view only
+ mode_top_bottom, // Left view top, right view bottom
+ mode_top_bottom_half, // Left view top, right view bottom, half height
+ mode_left_right, // Left view left, right view right
+ mode_left_right_half, // Left view left, right view right, half width
+ mode_even_odd_rows, // Left view even rows, right view odd rows
+ mode_even_odd_columns, // Left view even columns, right view odd columns
+ mode_checkerboard, // Checkerboard pattern
+ mode_hdmi_frame_pack, // HDMI Frame packing (top-bottom separated by 1/49 height)
+ mode_red_cyan_monochrome, // Red/cyan anaglyph, monochrome method
+ mode_red_cyan_half_color, // Red/cyan anaglyph, half color method
+ mode_red_cyan_full_color, // Red/cyan anaglyph, full color method
+ mode_red_cyan_dubois, // Red/cyan anaglyph, high quality Dubois method
+ mode_green_magenta_monochrome, // Green/magenta anaglyph, monochrome method
+ mode_green_magenta_half_color, // Green/magenta anaglyph, half color method
+ mode_green_magenta_full_color, // Green/magenta anaglyph, full color method
+ mode_green_magenta_dubois, // Green/magenta anaglyph, high quality Dubois method
+ mode_amber_blue_monochrome, // Amber/blue anaglyph, monochrome method
+ mode_amber_blue_half_color, // Amber/blue anaglyph, half color method
+ mode_amber_blue_full_color, // Amber/blue anaglyph, full color method
+ mode_amber_blue_dubois, // Amber/blue anaglyph, high quality Dubois method
+ mode_red_green_monochrome, // Red/green anaglyph, monochrome method
+ mode_red_blue_monochrome, // Red/blue anaglyph, monochrome method
+ } stereo_mode_t;
+
+ // Convert the stereo mode to and from a string representation
+ static std::string stereo_mode_to_string(stereo_mode_t stereo_mode, bool stereo_mode_swap);
+ static void stereo_mode_from_string(const std::string &s, stereo_mode_t &stereo_mode, bool &stereo_mode_swap);
+
+ typedef enum {
+ no_loop, // Do not loop.
+ loop_current, // Loop the current media input.
+ } loop_mode_t;
+
+ // Convert the loop mode to and from a string representation
+ static std::string loop_mode_to_string(loop_mode_t loop_mode);
+ static loop_mode_t loop_mode_from_string(const std::string &s);
+
+#define PARAMETER(TYPE, NAME) \
+ private: \
+ TYPE _ ## NAME; \
+ bool _ ## NAME ## _set; \
+ static const TYPE _ ## NAME ## _default; \
+ public: \
+ TYPE NAME() const \
+ { \
+ return _ ## NAME ## _set ? _ ## NAME : _ ## NAME ## _default; \
+ } \
+ void set_ ## NAME(TYPE val) \
+ { \
+ _ ## NAME = val; \
+ _ ## NAME ## _set = true; \
+ } \
+ void unset_ ## NAME() \
+ { \
+ _ ## NAME ## _set = false; \
+ } \
+ bool NAME ## _is_set() const \
+ { \
+ return _ ## NAME ## _set; \
+ } \
+ bool NAME ## _is_default() const \
+ { \
+ return (NAME() >= _ ## NAME ## _default && NAME() <= _ ## NAME ## _default); \
+ }
+
+ // Invariant parameters
+ PARAMETER(msg::level_t, log_level) // Global log level
+ PARAMETER(bool, benchmark) // Benchmark mode
+ PARAMETER(int, swap_interval) // Swap interval
+ // Per-Session parameters
+ PARAMETER(int, audio_device) // Audio output device index, -1 = default
+ PARAMETER(stereo_mode_t, stereo_mode) // Stereo mode
+ PARAMETER(bool, stereo_mode_swap) // Swap left and right view
+ PARAMETER(float, crosstalk_r) // Crosstalk level for red, 0 .. 1
+ PARAMETER(float, crosstalk_g) // Crosstalk level for green, 0 .. 1
+ PARAMETER(float, crosstalk_b) // Crosstalk level for blue, 0 .. 1
+ PARAMETER(int, fullscreen_screens) // Screens to use in fullscreen mode (bit set), 0=primary screen
+ PARAMETER(bool, fullscreen_flip_left) // Flip left view vertically in fullscreen mode
+ PARAMETER(bool, fullscreen_flop_left) // Flop left view horizontally in fullscreen mode
+ PARAMETER(bool, fullscreen_flip_right) // Flip right view vertically in fullscreen mode
+ PARAMETER(bool, fullscreen_flop_right) // Flop right view horizontally in fullscreen mode
+ PARAMETER(bool, fullscreen_inhibit_screensaver) // Inhibit screensaver when in fullscreen mode
+ PARAMETER(float, contrast) // Contrast adjustment, -1 .. +1
+ PARAMETER(float, brightness) // Brightness adjustment, -1 .. +1
+ PARAMETER(float, hue) // Hue adjustment, -1 .. +1
+ PARAMETER(float, saturation) // Saturation adjustment, -1 .. +1
+ PARAMETER(float, zoom) // Zoom, 0 = off (show full video width) .. 1 = full (use full screen height)
+ PARAMETER(loop_mode_t, loop_mode) // Current loop behaviour.
+ PARAMETER(int64_t, audio_delay) // Audio delay in microseconds
+ PARAMETER(std::string, subtitle_encoding) // Subtitle encoding, empty means keep default
+ PARAMETER(std::string, subtitle_font) // Subtitle font name, empty means keep default
+ PARAMETER(int, subtitle_size) // Subtitle point size, -1 means keep default
+ PARAMETER(float, subtitle_scale) // Scale factor
+ PARAMETER(uint64_t, subtitle_color) // Subtitle color in uint32_t bgra32 format, > UINT32_MAX means keep default
+ // Per-Video parameters
+ PARAMETER(int, video_stream) // Video stream index
+ PARAMETER(int, audio_stream) // Audio stream index, or -1 if there is no audio stream
+ PARAMETER(int, subtitle_stream) // Subtitle stream index, or -1 to disable subtitles
+ PARAMETER(stereo_layout_t, stereo_layout) // Assume this stereo layout
+ PARAMETER(bool, stereo_layout_swap) // Assume this stereo layout
+ PARAMETER(float, crop_aspect_ratio) // Crop the video to this aspect ratio, 0 = don't crop.
+ PARAMETER(float, parallax) // Parallax adjustment, -1 .. +1
+ PARAMETER(float, ghostbust) // Amount of crosstalk ghostbusting, 0 .. 1
+ PARAMETER(float, subtitle_parallax) // Subtitle parallax adjustment, -1 .. +1
+ // Volatile parameters
+ PARAMETER(bool, fullscreen) // Fullscreen mode
+ PARAMETER(bool, center) // Should the video be centered?
+ PARAMETER(float, audio_volume) // Audio volume, 0 .. 1
+ PARAMETER(bool, audio_mute) // Audio mute: -1 = unknown, 0 = off, 1 = on
+
+public:
+ // Constructor
+ parameters();
+
+ // Serialization
+ void save(std::ostream &os) const;
+ void load(std::istream &is);
+
+ // Serialize per-session parameters
+ std::string save_session_parameters() const;
+ void load_session_parameters(const std::string &s);
+
+ // Serialize per-video parameters
+ void unset_video_parameters();
+ std::string save_video_parameters() const;
+ void load_video_parameters(const std::string &s);
+};
+
 class video_frame
 {
 public:
@@ -83,7 +239,9 @@
 typedef enum
 {
 u8_full, // 0-255 for all components
- u8_mpeg // 16-235 for Y, 16-240 for U and V
+ u8_mpeg, // 16-235 for Y, 16-240 for U and V
+ u10_full, // 0-1023 for all components (stored in 16 bits)
+ u10_mpeg, // 64-940 for Y, 64-960 for U and V (stored in 16 bits)
 } value_range_t;
 
 // Location of chroma samples (only relevant for chroma subsampling layouts)
@@ -94,18 +252,6 @@
 topleft // U/V at the corresponding top left Y location
 } chroma_location_t;

bino-1.2.1.tar.bz2/src/media_input.cpp -> bino-1.3.2.tar.xz/src/media_input.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>
@@ -242,7 +242,7 @@
 int o, s;
 get_video_stream(_active_video_stream, o, s);
 _video_frame = _media_objects[o].video_frame_template(s);
- _video_frame.stereo_layout = video_frame::separate;
+ _video_frame.stereo_layout = parameters::layout_separate;
 }
 else if (video_streams() > 0)
 {
@@ -311,11 +311,21 @@
 msg::inf(4, _("Duration: %g seconds"), duration() / 1e6f);
 if (video_streams() > 0)
 {
- msg::inf(4, _("Stereo layout: %s"), video_frame::stereo_layout_to_string(
+ msg::inf(4, _("Stereo layout: %s"), parameters::stereo_layout_to_string(
 video_frame_template().stereo_layout, video_frame_template().stereo_layout_swap).c_str());
 }
 }
 
+size_t media_input::urls() const
+{
+ return _media_objects.size();
+}
+
+const std::string &media_input::url(size_t i) const
+{
+ return _media_objects[i].url();
+}
+
 const std::string &media_input::id() const
 {
 return _id;
@@ -396,7 +406,7 @@
 return _subtitle_box;
 }
 
-bool media_input::stereo_layout_is_supported(video_frame::stereo_layout_t layout, bool) const
+bool media_input::stereo_layout_is_supported(parameters::stereo_layout_t layout, bool) const
 {
 if (video_streams() < 1)
 {
@@ -408,17 +418,17 @@
 get_video_stream(_active_video_stream, o, s);
 const video_frame &t = _media_objects[o].video_frame_template(s);
 bool supported = true;
- if (((layout == video_frame::left_right || layout == video_frame::left_right_half) && t.raw_width % 2 != 0)
- || ((layout == video_frame::top_bottom || layout == video_frame::top_bottom_half) && t.raw_height % 2 != 0)
- || (layout == video_frame::even_odd_rows && t.raw_height % 2 != 0)
- || (layout == video_frame::separate && !_supports_stereo_layout_separate))
+ if (((layout == parameters::layout_left_right || layout == parameters::layout_left_right_half) && t.raw_width % 2 != 0)
+ || ((layout == parameters::layout_top_bottom || layout == parameters::layout_top_bottom_half) && t.raw_height % 2 != 0)
+ || (layout == parameters::layout_even_odd_rows && t.raw_height % 2 != 0)
+ || (layout == parameters::layout_separate && !_supports_stereo_layout_separate))
 {
 supported = false;
 }
 return supported;
 }
 
-void media_input::set_stereo_layout(video_frame::stereo_layout_t layout, bool swap)
+void media_input::set_stereo_layout(parameters::stereo_layout_t layout, bool swap)
 {
 assert(stereo_layout_is_supported(layout, swap));
 if (_have_active_video_read)
@@ -442,7 +452,7 @@
 _video_frame.set_view_dimensions();
 // Reset active stream in case we switched to or from 'separate'.
 select_video_stream(_active_video_stream);
- if (layout == video_frame::separate)
+ if (layout == parameters::layout_separate)
 {
 // If we switched the layout to 'separate', then we have to seek to the
 // position of the first video stream, or else the second video stream
@@ -471,7 +481,7 @@
 }
 assert(video_stream >= 0);
 assert(video_stream < video_streams());
- if (_video_frame.stereo_layout == video_frame::separate)
+ if (_video_frame.stereo_layout == parameters::layout_separate)
 {
 _active_video_stream = 0;
 for (size_t i = 0; i < _media_objects.size(); i++)
@@ -563,19 +573,20 @@
 {
 return;
 }
- if (_video_frame.stereo_layout == video_frame::separate)
+ if (_video_frame.stereo_layout == parameters::layout_separate)
 {
 int o0, s0, o1, s1;
 get_video_stream(0, o0, s0);
 get_video_stream(1, o1, s1);
- _media_objects[o0].start_video_frame_read(s0);
- _media_objects[o1].start_video_frame_read(s1);
+ _media_objects[o0].start_video_frame_read(s0, 1);
+ _media_objects[o1].start_video_frame_read(s1, 1);
 }
 else
 {
 int o, s;
 get_video_stream(_active_video_stream, o, s);
- _media_objects[o].start_video_frame_read(s);
+ _media_objects[o].start_video_frame_read(s,
+ _video_frame.stereo_layout == parameters::layout_alternating ? 2 : 1);
 }
 _have_active_video_read = true;
 }
@@ -588,7 +599,7 @@
 start_video_frame_read();
 }
 video_frame frame;
- if (_video_frame.stereo_layout == video_frame::separate)
+ if (_video_frame.stereo_layout == parameters::layout_separate)
 {
 int o0, s0, o1, s1;
 get_video_stream(0, o0, s0);
@@ -616,10 +627,13 @@
 if (f.is_valid())
 {
 frame = _video_frame;
- for (int p = 0; p < 3; p++)
+ for (int v = 0; v < 2; v++)
 {
- frame.data[0][p] = f.data[0][p];
- frame.line_size[0][p] = f.line_size[0][p];
+ for (int p = 0; p < 3; p++)
+ {
+ frame.data[v][p] = f.data[v][p];
+ frame.line_size[v][p] = f.line_size[v][p];
+ }
 }
 frame.presentation_time = f.presentation_time;
 }

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;

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

bino-1.2.1.tar.bz2/src/player.h -> bino-1.3.2.tar.xz/src/player.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>
 * Alexey Osipov <lion-simba@pridelands.ru>
 * Joe <cuchac@email.cz>
@@ -29,75 +29,19 @@
 #include "msg.h"
 #include "s11n.h"
 
-#include "media_data.h"
-#include "media_input.h"
-#include "audio_output.h"
-#include "video_output.h"
+#include "dispatch.h"
 
 
-/* The player_init_data contains everything that a player needs to start. */
-
-class player_init_data : public s11n
-{
-public:
- msg::level_t log_level; // Level of log messages
- device_request dev_request; // Request for input device settings
- std::vector<std::string> urls; // Input media objects
- int video_stream; // Selected video stream
- int audio_stream; // Selected audio stream
- int subtitle_stream; // Selected subtitle stream
- bool benchmark; // Benchmark mode?
- bool fullscreen; // Make video fullscreen?
- bool center; // Center video on screen?
- bool stereo_layout_override; // Manual input layout override?
- video_frame::stereo_layout_t stereo_layout; // Override layout
- bool stereo_layout_swap; // Override layout swap
- bool stereo_mode_override; // Manual output mode override?
- parameters::stereo_mode_t stereo_mode; // Override mode
- bool stereo_mode_swap; // Override mode swap
- parameters params; // Initial output parameters
-
-public:
- player_init_data();
- ~player_init_data();
-
- // Serialization
- void save(std::ostream &os) const;
- void load(std::istream &is);
-};
-
 /*
 * The player class.
- *
- * A player handles the input and determines the next actions.
- * It receives commands from a controller, reacts on them, and then sends
- * notifications to the controllers to inform them about any state changes.
 */
 
 class player
 {
-public:
- enum type
- {
- master, // Only the master player receives commands from controllers
- slave // Slave players do not receive commands
- };
-
 private:
-
- /* Input and output objects */
-
- media_input *_media_input; // The media input
- audio_output *_audio_output; // Audio output
- video_output *_video_output; // Video output
-
 /* Current state */
 
- // The current output parameters
- parameters _params;
-
 // Benchmark mode
- bool _benchmark; // Is benchmark mode active?
 int _frames_shown; // Frames shown since last reset
 int64_t _fps_mark_time; // Time when _frames_shown was reset to zero
 
@@ -109,10 +53,12 @@
 bool _drop_next_frame; // Do we need to drop the next video frame (to catch up)?
 bool _previous_frame_dropped; // Did we drop the previous video frame?
 bool _in_pause; // Are we in pause mode?
+ bool _recently_seeked; // We did not yet display a video frame after the last seek.
 
 // Requests made by controller commands
 bool _quit_request; // Request to quit
 bool _pause_request; // Request to go into pause mode
+ bool _step_request; // Request for single-frame stepping mode
 int64_t _seek_request; // Request to seek relative to the current position
 float _set_pos_request; // Request to seek to the absolute position (normalized 0..1)
 
@@ -132,7 +78,7 @@
 /* Helper functions */
 
 // Normalize an input position to [0,1]
- float normalize_pos(int64_t pos);
+ float normalize_pos(int64_t pos) const;
 
 // Set the current subtitle from the next subtitle
 void set_current_subtitle_box();
@@ -149,14 +95,18 @@
 subtitle_box _current_subtitle_box;
 subtitle_box _next_subtitle_box;
 
- // Create and destroy video and audio output (overridable by subclasses)
- virtual video_output *create_video_output();
- virtual void destroy_video_output(video_output *vo);
- virtual audio_output *create_audio_output();
- virtual void destroy_audio_output(audio_output *ao);
+public:
+ /* Constructor/destructor.
+ * Only a single player instance can exist. The constructor throws an
+ * exception if and only if it detects that this instance already exists. */
+ player();
+ ~player();
 
- // Make this player the master player
- void make_master();
+ /* Open a player. */
+ virtual void open();
+
+ /* Close the player and clean up. */
+ virtual void close();
 
 // Execute one step and indicate required actions. Returns the number of microseconds
 // that the caller may sleep before starting the next step.
@@ -165,45 +115,33 @@
 // Execute one step and immediately take required actions. Return true if more steps are required.
 bool run_step();
 
- // Get the media input for potential changes
- media_input &get_media_input_nonconst()
- {
- return *_media_input;
- }
-
-public:
- /* Constructor/destructor.
- * Only a single player instance can exist. The constructor throws an
- * exception if and only if it detects that this instance already exists. */
- player(type t = master);
- virtual ~player();
-
- /* Open a player. */
- virtual void open(const player_init_data &init_data);
-
- /* Get information about input and output parameters */
- bool has_media_input() const
- {
- return _media_input;
- }
- const media_input &get_media_input() const
+ /* Dispatch interface. TODO: remove this */
+ void quit_request();
+ void set_pause(bool p);
+ void set_step(bool s);
+ void seek(int64_t offset);
+ void set_pos(float pos);
+
+ int set_video_stream(int s);
+ int set_audio_stream(int s);
+ int set_subtitle_stream(int s);
+ bool set_fullscreen(bool fs);
+ void center();
+ 
+ void set_stereo_layout(parameters::stereo_layout_t stereo_layout);
+ void set_stereo_layout_swap(bool swap);
+
+ float get_pos() const;
+
+ /* Equalizer interface. */
+ const video_frame& get_video_frame() const
 {
- return *_media_input;
+ return _video_frame;
 }
- const parameters &get_parameters() const
+ const subtitle_box& get_subtitle_box() const
 {
- return _params;
+ return _current_subtitle_box;
 }
-
- /* Run the player. It will take care of all interaction. This function
- * returns when the user quits the player. */
- virtual void run();
-
- /* Close the player and clean up. */
- virtual void close();
-
- /* Receive a command from a controller. */
- virtual void receive_cmd(const command &cmd);

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,

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

bino-1.2.1.tar.bz2/src/video_output.h -> bino-1.3.2.tar.xz/src/video_output.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>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
 * Joe <cuchac@email.cz>
@@ -30,14 +30,13 @@
 
 #include "media_data.h"
 #include "subtitle_renderer.h"
-#include "controller.h"
+#include "dispatch.h"
 
 
 class video_output : public controller
 {
 private:
 bool _initialized;
- bool _srgb_textures_are_broken; // XXX: Hack: work around broken SRGB texture implementations
 
 /* We manage two frames, each with its own set of properties etc.
 * The active frame is the one that is displayed, the other frame is the one
@@ -66,16 +65,30 @@
 video_frame _color_last_frame; // last frame for this step; used for reinitialization check
 GLuint _color_prg; // color space transformation, color adjustment
 GLuint _color_fbo; // framebuffer object to render into the sRGB texture
- GLuint _color_srgb_tex[2]; // output: sRGB texture
+ GLuint _color_tex[2]; // output: SRGB8 or linear RGB16 texture
 // Step 3: rendering
 parameters _render_last_params; // last params for this step; used for reinitialization check
 GLuint _render_prg; // reads sRGB texture, renders according to _params[_active_index]
 GLuint _render_dummy_tex; // an empty subtitle texture
 GLuint _render_mask_tex; // for the masking modes even-odd-{rows,columns}, checkerboard
- // OpenGL viewports for drawing the two views of the video frame
+ // OpenGL viewports and tex coordinates for drawing the two views of the video frame
 GLint _viewport[2][4];
+ float _tex_coords[2][4][2];
 
 private:
+ // GL Helper functions
+ bool xglCheckError(const std::string& where = std::string()) const;
+ GLuint xglCompileShader(const std::string& name, GLenum type, const std::string& src) const;
+ GLuint xglCreateProgram(GLuint vshader, GLuint fshader) const;
+ GLuint xglCreateProgram(const std::string& name,
+ const std::string& vshader_src, const std::string& fshader_src) const;
+ void xglLinkProgram(const std::string& name, const GLuint prg) const;
+ void xglDeleteProgram(GLuint prg) const;
+
+ void draw_quad(float x, float y, float w, float h,
+ const float tex_coords[2][4][2] = NULL,
+ const float more_tex_coords[4][2] = NULL) const;
+
 // Step 1: initialize/deinitialize, and check if reinitialization is necessary
 void input_init(int index, const video_frame &frame);
 void input_deinit(int index);
@@ -96,31 +109,42 @@
 protected:
 subtitle_renderer _subtitle_renderer;
 
+ virtual GLEWContext* glewGetContext() const = 0;
+
 // Get total size of the video display area. For single window output, this
 // is the same as the current viewport. The Equalizer video output can override
 // this function.
- virtual int video_display_width();
- virtual int video_display_height();
+ virtual int video_display_width() const;
+ virtual int video_display_height() const;
 
- virtual void make_context_current() = 0; // Make sure our OpenGL context is current
- virtual bool context_is_stereo() = 0; // Is our current OpenGL context a stereo context?
+ virtual bool context_is_stereo() const = 0; // Is our current OpenGL context a stereo context?
 virtual void recreate_context(bool stereo) = 0; // Recreate an OpenGL context and make it current
- virtual void trigger_update() = 0; // Trigger a redraw (i.e. make GL context current and call display())
 virtual void trigger_resize(int w, int h) = 0; // Trigger a resize the video area
 
- void clear(); // Clear the video area
+ void clear() const; // Clear the video area
 void reshape(int w, int h); // Call this when the video area was resized
- bool need_redisplay_on_move(); // Whether we need to redisplay if the video area moved
+
+ /* Get screen properties (fixed) */
+ virtual int screen_width() const = 0; // in pixels
+ virtual int screen_height() const = 0; // in pixels
+ virtual float screen_pixel_aspect_ratio() const = 0;// the aspect ratio of a pixel on screen
+
+ /* Get current video area properties */
+ virtual int width() const = 0; // in pixels
+ virtual int height() const = 0; // in pixels
+ virtual int pos_x() const = 0; // in pixels
+ virtual int pos_y() const = 0; // in pixels
 
 /* Display the current frame.
 * The first version is used by Equalizer, which needs to set some special properties.
 * The second version is for everyone else.
 * TODO: This function needs to handle interlaced frames! */
- void display_current_frame(bool keep_viewport, bool mono_right_instead_of_left,
- float x, float y, float w, float h, const GLint viewport[2][4]);
- void display_current_frame()
+ void 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], const float tex_coords[2][4][2]);
+ void display_current_frame(int64_t display_frameno = 0)
 {
- display_current_frame(false, false, -1.0f, -1.0f, 2.0f, 2.0f, _viewport);
+ display_current_frame(display_frameno, false, false, -1.0f, -1.0f, 2.0f, 2.0f, _viewport, _tex_coords);
 }
 
 public:
@@ -141,40 +165,24 @@
 void set_suitable_size(int w, int h, float ar, parameters::stereo_mode_t stereo_mode);
 
 /* Get capabilities */
- virtual bool supports_stereo() const = 0; // Is OpenGL quad buffered stereo available?
-
- /* Get screen properties (fixed) */
- virtual int screen_width() = 0; // in pixels
- virtual int screen_height() = 0; // in pixels
- virtual float screen_pixel_aspect_ratio() = 0; // the aspect ratio of a pixel on screen
-
- /* Get current video area properties */
- virtual int width() = 0; // in pixels
- virtual int height() = 0; // in pixels
- virtual int pos_x() = 0; // in pixels
- virtual int pos_y() = 0; // in pixels
- virtual bool fullscreen() = 0; // whether the video area is in fullscreen mode
+ virtual bool supports_stereo() const = 0; // Is OpenGL quad buffered stereo available?
 
 /* Center video area on screen */
 virtual void center() = 0;
 
 /* Enter/exit fullscreen mode */
- virtual void enter_fullscreen(int screen) = 0;
+ virtual void enter_fullscreen() = 0;
 virtual void exit_fullscreen() = 0;
- virtual bool toggle_fullscreen(int screen) = 0;
 
 /* Process window system events (if applicable) */
 virtual void process_events() = 0;
 
 /* Prepare a new frame for display. */
- void prepare_next_frame(const video_frame &frame, const subtitle_box &subtitle);
+ virtual void prepare_next_frame(const video_frame &frame, const subtitle_box &subtitle);
 /* Switch to the next frame (make it the current one) */
- void activate_next_frame();
- /* Set display parameters. */
- void set_parameters(const parameters &params);
-
- /* Receive a notification from the player. */
- virtual void receive_notification(const notification &note) = 0;
+ virtual void activate_next_frame();
+ /* Get an estimation of when the next frame will appear on screen */
+ virtual int64_t time_to_next_frame_presentation() const;
 };
 
 #endif

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

@@ -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>
@@ -23,15 +23,14 @@
 #include "config.h"
 
 #include <GL/glew.h>
-#ifdef GLEW_MX
-static GLEWContext _glewContext;
-static GLEWContext* glewGetContext() { return &_glewContext; }
-#endif
 
 #include <cmath>
 #include <cstdlib>
+#include <cerrno>
+#include <cstring>
 #include <unistd.h>
 
+#include <QCoreApplication>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QGridLayout>
@@ -45,6 +44,7 @@
 #ifdef Q_WS_X11
 # include <QX11Info>
 # include <X11/Xlib.h>
+# include <GL/glxew.h>
 #endif
 
 #include "gettext.h"
@@ -60,67 +60,212 @@
 #include "lib_versions.h"
 
 
+/* The GL thread */
+
+gl_thread::gl_thread(video_output_qt* vo_qt, video_output_qt_widget* vo_qt_widget) :
+ _vo_qt(vo_qt), _vo_qt_widget(vo_qt_widget),
+ _render(false),
+ _resize(false),
+ _action_activate(false),
+ _action_prepare(false),
+ _failure(false)
+{
+}
+
+#ifdef Q_WS_X11
+GLXEWContext* gl_thread::glxewGetContext() const
+{
+ return _vo_qt->glxewGetContext();
+}
+#endif
+
+void gl_thread::set_render(bool r)
+{
+ _render = r;
+ _display_frameno = 0;
+ _pti = 0;
+ _ptc = 0;
+}
+
+void gl_thread::resize(int w, int h)
+{
+ _w = w;
+ _h = h;
+ _resize = true;
+}
+
+void gl_thread::activate_next_frame()
+{
+ _action_mutex.lock();
+ _action_activate = true;
+ _action_cond.wait(_action_mutex);
+ _action_mutex.unlock();
+}
+
+void gl_thread::prepare_next_frame(const video_frame &frame, const subtitle_box &subtitle)
+{
+ _action_mutex.lock();
+ _next_subtitle = subtitle;
+ _next_frame = frame;
+ _action_prepare = true;
+ _action_cond.wait(_action_mutex);
+ _action_mutex.unlock();
+}
+
+void gl_thread::run()
+{
+ try {
+ assert(_vo_qt_widget->context()->isValid());
+ _vo_qt_widget->makeCurrent();
+ assert(QGLContext::currentContext() == _vo_qt_widget->context());
+ while (_render) {
+ _action_mutex.lock();
+ if (_action_activate) {
+ _vo_qt->video_output::activate_next_frame();
+ _action_activate = false;
+ _action_cond.wake_one();
+ }
+ if (_action_prepare) {
+ _vo_qt->video_output::prepare_next_frame(_next_frame, _next_subtitle);
+ _action_prepare = false;
+ _action_cond.wake_one();
+ }
+ _action_mutex.unlock();
+ if (_resize) {
+ _vo_qt->reshape(_w, _h);
+ _resize = false;
+ }
+#ifdef Q_WS_X11
+ GLuint counter;
+ if (GLXEW_SGI_video_sync && glXGetVideoSyncSGI(&counter) == 0)
+ _display_frameno = counter;
+ else
+ _display_frameno++;
+#else
+ _display_frameno++;
+#endif
+ _vo_qt->display_current_frame(_display_frameno);
+ _vo_qt_widget->swapBuffers();
+ // When the buffer swap returns, the current frame is just now presented on screen.
+ _pt_mutex.lock();
+ _pt[_pti] = timer::get_microseconds(timer::monotonic);
+ _pti++;
+ if (_pti >= _pts)
+ _pti = 0;
+ if (_ptc < _pts)
+ _ptc++;
+ _pt_mutex.unlock();
+ }
+ }
+ catch (std::exception& e) {
+ _e = e;
+ _render = false;
+ _failure = true;
+ }
+ _vo_qt_widget->doneCurrent();
+}
+
+int64_t gl_thread::time_to_next_frame_presentation()
+{
+ if (_ptc < _pts) // no reliable data yet; assume immediate display
+ return 0;
+ _pt_mutex.lock();
+ int last_pti = _pti == 0 ? _pts - 1 : _pti - 1;
+ int64_t last_pt = _pt[last_pti];
+ int64_t presentation_duration = 0;
+ for (int i = 0; i < _pts - 1; i++) {
+ int cpti = _pti - i - 1;
+ if (cpti < 0)
+ cpti += _pts;
+ int ppti = cpti - 1;
+ if (ppti < 0)
+ ppti = _pts - 1;
+ assert(_pt[cpti] - _pt[ppti] >= 0);
+ presentation_duration += _pt[cpti] - _pt[ppti];
+ }
+ presentation_duration /= _pts - 1;
+ _pt_mutex.unlock();
+ int64_t now = timer::get_microseconds(timer::monotonic);
+ return last_pt + presentation_duration - now;
+}
+
 /* The GL widget */
 
 video_output_qt_widget::video_output_qt_widget(
 video_output_qt *vo, const QGLFormat &format, QWidget *parent) :
- QGLWidget(format, parent), _vo(vo)
+ QGLWidget(format, parent), _vo(vo), _gl_thread(vo, this),
+ _width(0), _height(0), _pos_x(0), _pos_y(0)
 {
+ setAutoBufferSwap(false);
 setFocusPolicy(Qt::StrongFocus);
+ connect(&_timer, SIGNAL(timeout()), this, SLOT(check_gl_thread()));
 }
 
-video_output_qt_widget::~video_output_qt_widget()
+int video_output_qt_widget::vo_width() const
 {
+ return _width;
 }
 
-void video_output_qt_widget::move_event()
+int video_output_qt_widget::vo_height() const
 {
- if (_vo->need_redisplay_on_move())
- {
- update();
- }
+ return _height;
 }
 
-void video_output_qt_widget::paintGL()
+int video_output_qt_widget::vo_pos_x() const

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

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)

Changes of Revision 11