Packman Build Service PMBS

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

Changes of Revision 9

bino.changes Changed

bino.spec Changed

bino-1.1.1.tar.bz2/src/qt_app.cpp Deleted

@@ -1,92 +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 <cstdlib>
-
-#include <QCoreApplication>
-#include <QApplication>
-#include <QtGlobal>
-#include <QTextCodec>
-
-#include "qt_app.h"
-
-#include "msg.h"
-
-
-static int qt_argc = 0;
-static char **qt_argv = NULL;
-static QApplication *qt_app = NULL;
-
-void set_qt_argv(int argc, char *argv[])
-{
-    qt_argc = argc;
-    qt_argv = argv;
-}
-
-static void qt_msg_handler(QtMsgType type, const char *msg)
-{
-    switch (type)
-    {
-    case QtDebugMsg:
-        msg::dbg("%s", msg);
-        break;
-    case QtWarningMsg:
-        msg::wrn("%s", msg);
-        break;
-    case QtCriticalMsg:
-        msg::err("%s", msg);
-        break;
-    case QtFatalMsg:
-        msg::err("%s", msg);
-        std::abort();
-    }
-}
-
-bool init_qt()
-{
-    if (!qt_app)
-    {
-        qInstallMsgHandler(qt_msg_handler);
-        qt_app = new QApplication(qt_argc, const_cast<char **>(qt_argv));
-        // The following is necessary for i18n via gettext:
-        QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale());
-        QCoreApplication::setOrganizationName("Bino");
-        QCoreApplication::setOrganizationDomain("bino.nongnu.org");
-        QCoreApplication::setApplicationName(PACKAGE_NAME);
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-void exit_qt()
-{
-    delete qt_app;
-    qt_app = NULL;
-}
-
-int exec_qt()
-{
-    return qt_app->exec();
-}

bino-1.1.1.tar.bz2/src/qt_app.h Deleted

@@ -1,41 +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 QT_APP_H
-#define QT_APP_H
-
-/* Set the command line to pass to Qt.
- * This is necessary only because of Mac OS X. This system 'helpfully'
- * generates FileOpen events for command line arguments, but we want to
- * handle command line arguments ourselves. If Qt knows the command line
- * arguments, it filters out these FileOpen events for us. See
- * http://doc.qt.nokia.com/4.7/qfileopenevent.html */
-void set_qt_argv(int argc, char *argv[]);
-
-/* Initialize Qt. If init_qt() returns true, then the caller is responsible for
- * calling exit_qt() later. If it returns false, then Qt was already
- * initialized elsewhere and the caller must not call exit_qt(). */
-bool init_qt();
-void exit_qt();
-
-/* Run the Qt application */
-int exec_qt();
-
-#endif

bino-1.1.1.tar.bz2/AUTHORS -> bino-1.1.3.tar.bz2/AUTHORS Changed

bino-1.1.1.tar.bz2/ChangeLog -> bino-1.1.3.tar.bz2/ChangeLog Changed

@@ -1,3 +1,576 @@
+commit a362bfa7c69069a31afafd7f2b7d8015dd2a09e6
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-08-14 10:25:48 +0200
+
+    Manual: create icon symlinks during build; remove them from the repository.
+
+ configure.ac                             |    1 +
+ doc/Makefile.am                          |    6 ++++++
+ doc/input-layout-bottom-top-half.png     |    1 -
+ doc/input-layout-bottom-top.png          |    1 -
+ doc/input-layout-even-odd-rows.png       |    1 -
+ doc/input-layout-left-right-half.png     |    1 -
+ doc/input-layout-left-right.png          |    1 -
+ doc/input-layout-mono.png                |    1 -
+ doc/input-layout-odd-even-rows.png       |    1 -
+ doc/input-layout-right-left-half.png     |    1 -
+ doc/input-layout-right-left.png          |    1 -
+ doc/input-layout-separate-left-right.png |    1 -
+ doc/input-layout-separate-right-left.png |    1 -
+ doc/input-layout-top-bottom-half.png     |    1 -
+ doc/input-layout-top-bottom.png          |    1 -
+ doc/output-type-amber-blue.png           |    1 -
+ doc/output-type-checkerboard.png         |    1 -
+ doc/output-type-even-odd-columns.png     |    1 -
+ doc/output-type-even-odd-rows.png        |    1 -
+ doc/output-type-green-magenta.png        |    1 -
+ doc/output-type-hdmi-frame-pack.png      |    1 -
+ doc/output-type-left-right-half.png      |    1 -
+ doc/output-type-left-right.png           |    1 -
+ doc/output-type-mono-left.png            |    1 -
+ doc/output-type-mono-right.png           |    1 -
+ doc/output-type-red-blue.png             |    1 -
+ doc/output-type-red-cyan.png             |    1 -
+ doc/output-type-red-green.png            |    1 -
+ doc/output-type-stereo.png               |    1 -
+ doc/output-type-top-bottom-half.png      |    1 -
+ doc/output-type-top-bottom.png           |    1 -
+ 31 files changed, 7 insertions(+), 29 deletions(-)
+
+commit 7db522e74399bafa83f5f58adb8facc30e73e921
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-08-14 01:39:40 +0200
+
+    Update de.po.
+
+ po/de.po |   26 +++++++++++++++-----------
+ 1 files changed, 15 insertions(+), 11 deletions(-)
+
+commit 49388466c7f521e10a682a7237f73ebc72e74576
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-08-14 01:34:05 +0200
+
+    Initialize Qt in non-GUI mode when no X11 display is available.
+    
+    This removes most of the disadvantages introduced in
+    902792e5841ce25688056ed22ada52805965058a: an X11 connection is now no longer
+    necessary for --help/--version or for Equalizer nodes.
+
+ src/main.cpp |   39 ++++++++++++++++++++++++++-------------
+ 1 files changed, 26 insertions(+), 13 deletions(-)
+
+commit 2d56d7003a4241680d23b9c29e6bbe8c83e1a9b1
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-08-13 22:51:01 +0200
+
+    Update de.po.
+
+ po/de.po |  449 +++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 227 insertions(+), 222 deletions(-)
+
+commit f7e233001b4f84864d2ce55ede83defa7e8b65ab
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-08-13 22:49:26 +0200
+
+    Remove obsolete source file from list of translatable files.
+
+ po/POTFILES.in |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 432d1bf74e7e1632926afee047601970c36bd77e
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-08-13 22:48:22 +0200
+
+    Manual: document support for the Matroska/WebM StereoMode field.
+
+ doc/bino.texi |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 902792e5841ce25688056ed22ada52805965058a
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-08-13 22:29:57 +0200
+
+    Always initialize a Qt application object.
+    
+    This was done to prevent Qt initialization from clashing with other threads,
+    i.e. the subtitle renderer initialization. This caused occasional crashes in
+    non-gui mode.
+    
+    This gets rid of the cumbersome qt_app module, and has the following advantage:
+    - Qt command line arguments are supported, e.g. -style=XYZ.
+    
+    But it also has disadvantages:
+    - We initialize Qt even if we don't need it (e.g. on Equalizer nodes).
+    - We *always* need an X11 connection, even for --help and --version.
+
+ src/Makefile.am         |    1 -
+ src/lib_versions.cpp    |    7 ----
+ src/main.cpp            |   37 ++++++++++++++++++-
+ src/player_qt.cpp       |    8 +----
+ src/player_qt.h         |    1 -
+ src/qt_app.cpp          |   92 -----------------------------------------------
+ src/qt_app.h            |   41 ---------------------
+ src/video_output_qt.cpp |    7 ----
+ src/video_output_qt.h   |    1 -
+ 9 files changed, 36 insertions(+), 159 deletions(-)
+
+commit c12aa9f97bdfd9f36ef1abdb702c8bdc3b6455e6
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-08-13 22:11:51 +0200
+
+    Media object: add support for the Matroska StereoMode metadata.
+
+ src/media_object.cpp |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 56 insertions(+), 0 deletions(-)
+
+commit a32e6a3d072da77fc4954c9d3a07f25db096ee65
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-08-13 20:40:35 +0200
+
+    Bump version to 1.1.3.
+
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b69451ac8f90efab615e084c4d71bbe4192dde9d
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-08-13 20:37:48 +0200
+
+    GUI / manual: improve icons for input layouts and output techniques.
+
+ src/icons-local/input-layout-bottom-top-half.ipe   |    8 ++++----
+ src/icons-local/input-layout-bottom-top-half.png   |  Bin 468 -> 579 bytes
+ src/icons-local/input-layout-bottom-top.ipe        |    8 ++++----
+ src/icons-local/input-layout-bottom-top.png        |  Bin 645 -> 837 bytes
+ src/icons-local/input-layout-even-odd-rows.ipe     |    2 +-
+ src/icons-local/input-layout-left-right-half.ipe   |    8 ++++----
+ src/icons-local/input-layout-left-right-half.png   |  Bin 433 -> 623 bytes
+ src/icons-local/input-layout-left-right.ipe        |    8 ++++----
+ src/icons-local/input-layout-left-right.png        |  Bin 562 -> 718 bytes
+ src/icons-local/input-layout-mono.ipe              |    6 +++---
+ src/icons-local/input-layout-mono.png              |  Bin 569 -> 1080 bytes
+ src/icons-local/input-layout-odd-even-rows.ipe     |    2 +-
+ src/icons-local/input-layout-right-left-half.ipe   |    8 ++++----
+ src/icons-local/input-layout-right-left-half.png   |  Bin 444 -> 619 bytes
+ src/icons-local/input-layout-right-left.ipe        |    8 ++++----
+ src/icons-local/input-layout-right-left.png        |  Bin 551 -> 698 bytes
+ .../input-layout-separate-left-right.ipe           |   17 ++++++++++++-----
+ .../input-layout-separate-left-right.png           |  Bin 597 -> 861 bytes
+ .../input-layout-separate-right-left.ipe           |   17 ++++++++++++-----
+ .../input-layout-separate-right-left.png           |  Bin 595 -> 872 bytes
+ src/icons-local/input-layout-top-bottom-half.ipe   |    8 ++++----
+ src/icons-local/input-layout-top-bottom-half.png   |  Bin 471 -> 579 bytes
+ src/icons-local/input-layout-top-bottom.ipe        |    8 ++++----
+ src/icons-local/input-layout-top-bottom.png        |  Bin 649 -> 838 bytes
+ src/icons-local/output-type-amber-blue.ipe         |    2 +-
+ src/icons-local/output-type-checkerboard.ipe       |    2 +-
+ src/icons-local/output-type-even-odd-columns.ipe   |    2 +-
+ src/icons-local/output-type-even-odd-rows.ipe      |    2 +-
+ src/icons-local/output-type-green-magenta.ipe      |    2 +-
+ src/icons-local/output-type-hdmi-frame-pack.ipe    |    6 +++---
+ src/icons-local/output-type-hdmi-frame-pack.png    |  Bin 1211 -> 1067 bytes
+ src/icons-local/output-type-left-right-half.ipe    |    8 ++++----
+ src/icons-local/output-type-left-right-half.png    |  Bin 433 -> 623 bytes
+ src/icons-local/output-type-left-right.ipe         |    8 ++++----
+ src/icons-local/output-type-left-right.png         |  Bin 562 -> 718 bytes
+ src/icons-local/output-type-mono-left.ipe          |    6 +++---
+ src/icons-local/output-type-mono-left.png          |  Bin 324 -> 323 bytes
+ src/icons-local/output-type-mono-right.ipe         |    6 +++---
+ src/icons-local/output-type-mono-right.png         |  Bin 372 -> 480 bytes
+ src/icons-local/output-type-red-blue.ipe           |    2 +-
+ src/icons-local/output-type-red-cyan.ipe           |    2 +-
+ src/icons-local/output-type-red-green.ipe          |    2 +-
+ src/icons-local/output-type-stereo.ipe             |    4 ++--
+ src/icons-local/output-type-stereo.png             |  Bin 885 -> 842 bytes
+ src/icons-local/output-type-top-bottom-half.ipe    |    8 ++++----
+ src/icons-local/output-type-top-bottom-half.png    |  Bin 471 -> 579 bytes
+ src/icons-local/output-type-top-bottom.ipe         |    8 ++++----
+ src/icons-local/output-type-top-bottom.png         |  Bin 649 -> 838 bytes
+ 48 files changed, 96 insertions(+), 82 deletions(-)
+
+commit e22dfeab57f02f5fb19e01786fad2ec97980be9c
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-08-13 19:54:30 +0200
+
+    Manual: add full table of contents.
+
+ doc/bino.texi |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+

bino-1.1.1.tar.bz2/Makefile.am -> bino-1.1.3.tar.bz2/Makefile.am Changed

bino-1.1.1.tar.bz2/Makefile.in -> bino-1.1.3.tar.bz2/Makefile.in Changed

bino-1.1.1.tar.bz2/NEWS -> bino-1.1.3.tar.bz2/NEWS Changed

bino-1.1.1.tar.bz2/README -> bino-1.1.3.tar.bz2/README Changed

bino-1.1.1.tar.bz2/README.MacOSX -> bino-1.1.3.tar.bz2/README.MacOSX Changed

bino-1.1.1.tar.bz2/configure -> bino-1.1.3.tar.bz2/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.1.1.
+# Generated by GNU Autoconf 2.67 for Bino 1.1.3.
 #
 # Report bugs to <bino-list@nongnu.org>.
 #
@@ -552,10 +552,10 @@
 # Identity of this package.
 PACKAGE_NAME='Bino'
 PACKAGE_TARNAME='bino'
-PACKAGE_VERSION='1.1.1'
-PACKAGE_STRING='Bino 1.1.1'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='Bino 1.1.3'
 PACKAGE_BUGREPORT='bino-list@nongnu.org'
-PACKAGE_URL='http://bino.nongnu.org/'
+PACKAGE_URL='http://bino3d.org/'
 
 ac_unique_file="src/main.cpp"
 # Factoring default headers for most tests.
@@ -652,6 +652,7 @@
 HAVE_MAKENSIS_TRUE
 MAKENSIS
 WINDRES
+LN_S
 RANLIB
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
@@ -1346,7 +1347,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.1.1 to adapt to many kinds of systems.
+\`configure' configures Bino 1.1.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1417,7 +1418,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Bino 1.1.1:";;
+     short | recursive ) echo "Configuration of Bino 1.1.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1506,7 +1507,7 @@
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <bino-list@nongnu.org>.
-Bino home page: <http://bino.nongnu.org/>.
+Bino home page: <http://bino3d.org/>.
 _ACEOF
 ac_status=$?
 fi
@@ -1569,7 +1570,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Bino configure 1.1.1
+Bino configure 1.1.3
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2101,7 +2102,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Bino $as_me 1.1.1, which was
+It was created by Bino $as_me 1.1.3, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -4552,7 +4553,7 @@
 
 # Define the identity of the package.
  PACKAGE='bino'
- VERSION='1.1.1'
+ VERSION='1.1.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5289,6 +5290,17 @@
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8207,12 +8219,12 @@
     pkg_cv_libavformat_CFLAGS="$libavformat_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.108.0 libavcodec libavutil\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavformat >= 52.108.0 libavcodec libavutil") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.110.0 libavcodec libavutil\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libavformat >= 52.110.0 libavcodec libavutil") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libavformat_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 52.108.0 libavcodec libavutil" 2>/dev/null`
+  pkg_cv_libavformat_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 52.110.0 libavcodec libavutil" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -8223,12 +8235,12 @@
     pkg_cv_libavformat_LIBS="$libavformat_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.108.0 libavcodec libavutil\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavformat >= 52.108.0 libavcodec libavutil") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.110.0 libavcodec libavutil\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libavformat >= 52.110.0 libavcodec libavutil") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libavformat_LIBS=`$PKG_CONFIG --libs "libavformat >= 52.108.0 libavcodec libavutil" 2>/dev/null`
+  pkg_cv_libavformat_LIBS=`$PKG_CONFIG --libs "libavformat >= 52.110.0 libavcodec libavutil" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -8248,9 +8260,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        libavformat_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavformat >= 52.108.0 libavcodec libavutil" 2>&1`
+	        libavformat_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavformat >= 52.110.0 libavcodec libavutil" 2>&1`
         else
-	        libavformat_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavformat >= 52.108.0 libavcodec libavutil" 2>&1`
+	        libavformat_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavformat >= 52.110.0 libavcodec libavutil" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libavformat_PKG_ERRORS" >&5
@@ -8268,12 +8280,12 @@
 	HAVE_LIBAVFORMAT=1
 fi
 if test "$HAVE_LIBAVFORMAT" != "1"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: library libavformat >= 52.108.0 not found:" >&5
-$as_echo "$as_me: WARNING: library libavformat >= 52.108.0 not found:" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: library libavformat >= 52.110.0 not found:" >&5
+$as_echo "$as_me: WARNING: library libavformat >= 52.110.0 not found:" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $libavformat_PKG_ERRORS" >&5
 $as_echo "$as_me: WARNING: $libavformat_PKG_ERRORS" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libavformat >= 52.108.0 is provided by FFmpeg >= 0.7-rc1" >&5
-$as_echo "$as_me: WARNING: libavformat >= 52.108.0 is provided by FFmpeg >= 0.7-rc1" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libavformat >= 52.110.0 is provided by libav >= 0.7 or FFmpeg >= 0.7" >&5
+$as_echo "$as_me: WARNING: libavformat >= 52.110.0 is provided by libav >= 0.7 or FFmpeg >= 0.7" >&2;}
 fi
 
 pkg_failed=no
@@ -8284,12 +8296,12 @@
     pkg_cv_libavdevice_CFLAGS="$libavdevice_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavdevice >= 52.4.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavdevice >= 52.4.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavdevice >= 52.5.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libavdevice >= 52.5.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libavdevice_CFLAGS=`$PKG_CONFIG --cflags "libavdevice >= 52.4.0" 2>/dev/null`
+  pkg_cv_libavdevice_CFLAGS=`$PKG_CONFIG --cflags "libavdevice >= 52.5.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -8300,12 +8312,12 @@
     pkg_cv_libavdevice_LIBS="$libavdevice_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavdevice >= 52.4.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavdevice >= 52.4.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavdevice >= 52.5.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libavdevice >= 52.5.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libavdevice_LIBS=`$PKG_CONFIG --libs "libavdevice >= 52.4.0" 2>/dev/null`
+  pkg_cv_libavdevice_LIBS=`$PKG_CONFIG --libs "libavdevice >= 52.5.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -8325,9 +8337,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        libavdevice_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavdevice >= 52.4.0" 2>&1`

bino-1.1.1.tar.bz2/configure.ac -> bino-1.1.3.tar.bz2/configure.ac Changed

@@ -22,7 +22,7 @@
 
 dnl Autotools init stuff
 AC_PREREQ([2.65])
-AC_INIT([Bino], [1.1.1], [bino-list@nongnu.org], [bino], [http://bino.nongnu.org/])
+AC_INIT([Bino], [1.1.3], [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])
@@ -35,6 +35,7 @@
 AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_RANLIB
+AC_PROG_LN_S
 AC_LANG([C++])
 AC_C_BIGENDIAN
 
@@ -90,23 +91,23 @@
 fi
 
 dnl FFmpeg
-PKG_CHECK_MODULES([libavformat], [libavformat >= 52.108.0 libavcodec libavutil], [HAVE_LIBAVFORMAT=1], [HAVE_LIBAVFORMAT=0])
+PKG_CHECK_MODULES([libavformat], [libavformat >= 52.110.0 libavcodec libavutil], [HAVE_LIBAVFORMAT=1], [HAVE_LIBAVFORMAT=0])
 if test "$HAVE_LIBAVFORMAT" != "1"; then
-    AC_MSG_WARN([library libavformat >= 52.108.0 not found:])
+    AC_MSG_WARN([library libavformat >= 52.110.0 not found:])
     AC_MSG_WARN([$libavformat_PKG_ERRORS])
-    AC_MSG_WARN([libavformat >= 52.108.0 is provided by FFmpeg >= 0.7-rc1])
+    AC_MSG_WARN([libavformat >= 52.110.0 is provided by libav >= 0.7 or FFmpeg >= 0.7])
 fi
-PKG_CHECK_MODULES([libavdevice], [libavdevice >= 52.4.0], [HAVE_LIBAVDEVICE=1], [HAVE_LIBAVDEVICE=0])
+PKG_CHECK_MODULES([libavdevice], [libavdevice >= 52.5.0], [HAVE_LIBAVDEVICE=1], [HAVE_LIBAVDEVICE=0])
 if test "$HAVE_LIBAVDEVICE" != "1"; then
-    AC_MSG_WARN([library libavdevice >= 52.4.0 not found:])
+    AC_MSG_WARN([library libavdevice >= 52.5.0 not found:])
     AC_MSG_WARN([$libavdevice_PKG_ERRORS])
-    AC_MSG_WARN([libavdevice >= 52.4.0 is provided by FFmpeg >= 0.7-rc1])
+    AC_MSG_WARN([libavdevice >= 52.5.0 is provided by libav >= 0.7 or FFmpeg >= 0.7])
 fi
-PKG_CHECK_MODULES([libswscale], [libswscale >= 0.13.0 libavutil], [HAVE_LIBSWSCALE=1], [HAVE_LIBSWSCALE=0])
+PKG_CHECK_MODULES([libswscale], [libswscale >= 0.14.1 libavutil], [HAVE_LIBSWSCALE=1], [HAVE_LIBSWSCALE=0])
 if test "$HAVE_LIBSWSCALE" != "1"; then
-    AC_MSG_WARN([library libswscale >= 0.13.0 not found:])
+    AC_MSG_WARN([library libswscale >= 0.14.1 not found:])
     AC_MSG_WARN([$libswscale_PKG_ERRORS])
-    AC_MSG_WARN([libswscale >= 0.13.0 is provided by FFmpeg >= 0.7-rc1])
+    AC_MSG_WARN([libswscale >= 0.14.1 is provided by libav >= 0.7 or FFmpeg >= 0.7])
 fi
 AC_CHECK_FUNCS([sysconf])

bino-1.1.1.tar.bz2/doc/Makefile.am -> bino-1.1.3.tar.bz2/doc/Makefile.am Changed

@@ -2,11 +2,49 @@
 
 info_TEXINFOS = bino.texi
 
+ICONS_LOCAL = \
+	input-layout-mono.png \
+	input-layout-separate-left-right.png \
+	input-layout-separate-right-left.png \
+	input-layout-top-bottom.png \
+	input-layout-top-bottom-half.png \
+	input-layout-bottom-top.png \
+	input-layout-bottom-top-half.png \
+	input-layout-left-right.png \
+	input-layout-left-right-half.png \
+	input-layout-right-left.png \
+	input-layout-right-left-half.png \
+	input-layout-even-odd-rows.png \
+	input-layout-odd-even-rows.png \
+	output-type-mono-left.png \
+	output-type-mono-right.png \
+	output-type-top-bottom.png \
+	output-type-top-bottom-half.png \
+	output-type-left-right.png \
+	output-type-left-right-half.png \
+	output-type-even-odd-rows.png \
+	output-type-even-odd-columns.png \
+	output-type-checkerboard.png \
+	output-type-hdmi-frame-pack.png \
+	output-type-red-cyan.png \
+	output-type-green-magenta.png \
+	output-type-amber-blue.png \
+	output-type-red-green.png \
+	output-type-red-blue.png \
+	output-type-stereo.png
+
+input-layout-%.png:
+	$(LN_S) $(top_srcdir)/src/icons-local/$@
+
+output-type-%.png:
+	$(LN_S) $(top_srcdir)/src/icons-local/$@
+
 IMAGES = \
 	multi-display-vrlab.jpg \
 	multi-display-rotated.jpg \
 	gamma-pattern-tb.png \
-	crosstalk-pattern-tb.png
+	crosstalk-pattern-tb.png \
+	$(ICONS_LOCAL)
 
 bino_TEXINFOS = bino.texi $(IMAGES)

bino-1.1.1.tar.bz2/doc/Makefile.in -> bino-1.1.3.tar.bz2/doc/Makefile.in Changed

@@ -139,6 +139,7 @@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -250,11 +251,43 @@
 top_srcdir = @top_srcdir@
 man_MANS = bino.1
 info_TEXINFOS = bino.texi
+ICONS_LOCAL = \
+	input-layout-mono.png \
+	input-layout-separate-left-right.png \
+	input-layout-separate-right-left.png \
+	input-layout-top-bottom.png \
+	input-layout-top-bottom-half.png \
+	input-layout-bottom-top.png \
+	input-layout-bottom-top-half.png \
+	input-layout-left-right.png \
+	input-layout-left-right-half.png \
+	input-layout-right-left.png \
+	input-layout-right-left-half.png \
+	input-layout-even-odd-rows.png \
+	input-layout-odd-even-rows.png \
+	output-type-mono-left.png \
+	output-type-mono-right.png \
+	output-type-top-bottom.png \
+	output-type-top-bottom-half.png \
+	output-type-left-right.png \
+	output-type-left-right-half.png \
+	output-type-even-odd-rows.png \
+	output-type-even-odd-columns.png \
+	output-type-checkerboard.png \
+	output-type-hdmi-frame-pack.png \
+	output-type-red-cyan.png \
+	output-type-green-magenta.png \
+	output-type-amber-blue.png \
+	output-type-red-green.png \
+	output-type-red-blue.png \
+	output-type-stereo.png
+
 IMAGES = \
 	multi-display-vrlab.jpg \
 	multi-display-rotated.jpg \
 	gamma-pattern-tb.png \
-	crosstalk-pattern-tb.png
+	crosstalk-pattern-tb.png \
+	$(ICONS_LOCAL)
 
 bino_TEXINFOS = bino.texi $(IMAGES)
 AM_MAKEINFOHTMLFLAGS = --no-split
@@ -768,6 +801,12 @@
 	uninstall-man uninstall-man1 uninstall-pdf-am uninstall-ps-am
 
 
+input-layout-%.png:
+	$(LN_S) $(top_srcdir)/src/icons-local/$@
+
+output-type-%.png:
+	$(LN_S) $(top_srcdir)/src/icons-local/$@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

bino-1.1.1.tar.bz2/doc/bino.html -> bino-1.1.3.tar.bz2/doc/bino.html Changed

@@ -1,14 +1,14 @@
 <html lang="en">
 <head>
-<title>Bino 1.1.0</title>
+<title>Bino 1.1.3</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="Bino 1.1.0">
+<meta name="description" content="Bino 1.1.3">
 <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.1.0</h1>
+<h1 class="settitle">Bino 1.1.3</h1>
 <div class="node">
 <a name="Top"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Overview">Overview</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#Introduction">Introduction</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 
 </div>
 
 <h2 class="unnumbered">Bino</h2>
 
-<p>This manual was last updated 17 May 2011 for version
-1.1.0 of Bino.
+<p>This manual was last updated 14 August 2011 for version
+1.1.3 of Bino.
 
    <p>Copyright &copy; 2011
 Martin Lambers (<a href="mailto:marlam@marlam.de">marlam@marlam.de</a>),
@@ -60,22 +60,54 @@
 without any warranty. 
 </blockquote>
 
-   <p>Table of Contents:
+   <p>Short Contents:
 
 <ul class="menu">
-<li><a accesskey="1" href="#Overview">Overview</a>
+<li><a accesskey="1" href="#Introduction">Introduction</a>
 <li><a accesskey="2" href="#Invocation">Invocation</a>
 <li><a accesskey="3" href="#Input-Layouts">Input Layouts</a>
 <li><a accesskey="4" href="#Output-Techniques">Output Techniques</a>
-<li><a accesskey="5" href="#File-Name-Conventions">File Name Conventions</a>
-<li><a accesskey="6" href="#Interactive-Control">Interactive Control</a>
-<li><a accesskey="7" href="#Camera-Devices">Camera Devices</a>
-<li><a accesskey="8" href="#Crosstalk-Ghostbusting">Crosstalk Ghostbusting</a>
-<li><a accesskey="9" href="#Advanced-Multi-Display-Support">Advanced Multi Display Support</a>
+<li><a accesskey="5" href="#Interactive-Control">Interactive Control</a>
+<li><a accesskey="6" href="#Camera-Devices">Camera Devices</a>
 </ul>
+   <div class="contents">
+<h2>Table of Contents</h2>
+<ul>
+<li><a name="toc_Top" href="#Top">Bino</a>
+<li><a name="toc_Introduction" href="#Introduction">1 Introduction</a>
+<li><a name="toc_Invocation" href="#Invocation">2 Invocation</a>
+<li><a name="toc_Input-Layouts" href="#Input-Layouts">3 Input Layouts</a>
+<ul>
+<li><a href="#Input-Layouts">3.1 Overview</a>
+<li><a href="#Input-Layouts">3.2 Supported Input Layouts</a>
+<li><a href="#Input-Layouts">3.3 File Name Conventions</a>
+</li></ul>
+<li><a name="toc_Output-Techniques" href="#Output-Techniques">4 Output Techniques</a>
+<ul>
+<li><a href="#Output-Techniques">4.1 Overview</a>
+<li><a href="#Output-Techniques">4.2 Supported Output Techniques</a>
+<li><a href="#Output-Techniques">4.3 Crosstalk Ghostbusting</a>
+<li><a href="#Output-Techniques">4.4 Basic Multi Display Support</a>
+<li><a href="#Output-Techniques">4.5 Advanced Multi Display Support</a>
+<ul>
+<li><a href="#Output-Techniques">4.5.1 Building Bino with Equalizer Support</a>
+<li><a href="#Output-Techniques">4.5.2 Configuring Equalizer and Starting Bino</a>
+<li><a href="#Output-Techniques">4.5.3 Example Configurations</a>
+</li></ul>
+</li></ul>
+<li><a name="toc_Interactive-Control" href="#Interactive-Control">5 Interactive Control</a>
+<ul>
+<li><a href="#Interactive-Control">5.1 Keyboard Shortcuts</a>
+<li><a href="#Interactive-Control">5.2 Remote Controls</a>
+</li></ul>
+<li><a name="toc_Camera-Devices" href="#Camera-Devices">6 Camera Devices</a>
+</li></ul>
+</div>
+
+
 
 <div class="node">
-<a name="Overview"></a>
+<a name="Introduction"></a>
 <p><hr>
 Next:&nbsp;<a rel="next" accesskey="n" href="#Invocation">Invocation</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#Top">Top</a>,
@@ -83,7 +115,7 @@
 
 </div>
 
-<h2 class="chapter">1 Overview</h2>
+<h2 class="chapter">1 Introduction</h2>
 
 <p>Bino is a 3D video player with multi-display support.
 
@@ -91,28 +123,34 @@
 separate views for the left and right eye and thus allow depth perception
 through stereopsis.
 
-   <p>All input files are combined into one media source, so you can have video,
-audio, and subtitle streams in separate files. The files are decoded with the
-<a href="http://ffmpeg.org/">FFmpeg</a>  libraries, so URLs and other special
-constructs are supported.
+   <p>The left and right view of a stereoscopic video can be stored using different
+layouts. Bino supports all commonly used layouts. See <a href="#Input-Layouts">Input Layouts</a>.
 
-   <p>Bino supports a wide variety of stereoscopic input layouts and display
-techniques.
+   <p>To display a stereoscopic video, the left and right view have to be prepared
+in a special way depending on the output display technique. Bino supports a
+wide variety of display techniques. See <a href="#Output-Techniques">Output Techniques</a>.
 
 <div class="node">
 <a name="Invocation"></a>
 <p><hr>
 Next:&nbsp;<a rel="next" accesskey="n" href="#Input-Layouts">Input Layouts</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Overview">Overview</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#Introduction">Introduction</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 
 </div>
 
 <h2 class="chapter">2 Invocation</h2>
 
-<p>Synopsis:
+<p>This section describes the command line interface of Bino.
+
+   <p>Synopsis:
 <code>bino [</code><var>option</var><code>...] [</code><var>file</var><code>...]</code>
 
+   <p>Bino combines all input files into one media source which is then played. This
+means you can have video, audio, and subtitle streams in separate files. The
+files are decoded with the <a href="http://ffmpeg.org/">FFmpeg</a> libraries, so URLs
+and other special constructs are supported.
+
      <dl>
 <dt>&lsquo;<samp><span class="samp">--help</span></samp>&rsquo;<dd>Print help. 
 <br><dt>&lsquo;<samp><span class="samp">--version</span></samp>&rsquo;<dd>Print version. 
@@ -127,8 +165,8 @@
 <br><dt>&lsquo;<samp><span class="samp">-v</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--video=</span><var>STREAM</var></samp>&rsquo;<dd>Select video stream (1-n, depending on the input). 
 <br><dt>&lsquo;<samp><span class="samp">-a</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--audio=</span><var>STREAM</var></samp>&rsquo;<dd>Select audio stream (1-n, depending on the input). 
 <br><dt>&lsquo;<samp><span class="samp">-s</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--subtitle=</span><var>STREAM</var></samp>&rsquo;<dd>Select subtitle stream (1-n, depending on the input). 
-<br><dt>&lsquo;<samp><span class="samp">-i</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--input=</span><var>TYPE</var></samp>&rsquo;<dd>Select input type. See <a href="#Input-Layouts">Input Layouts</a>. 
-<br><dt>&lsquo;<samp><span class="samp">-o</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--output=</span><var>TYPE</var></samp>&rsquo;<dd>Select output type. See <a href="#Output-Techniques">Output Techniques</a>. 
+<br><dt>&lsquo;<samp><span class="samp">-i</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--input=</span><var>TYPE</var></samp>&rsquo;<dd>Select input layout. See <a href="#Input-Layouts">Input Layouts</a>. 
+<br><dt>&lsquo;<samp><span class="samp">-o</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--output=</span><var>TYPE</var></samp>&rsquo;<dd>Select output technique. See <a href="#Output-Techniques">Output Techniques</a>. 
 <br><dt>&lsquo;<samp><span class="samp">-S</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--swap-eyes</span></samp>&rsquo;<dd>Swap left/right view. 
 <br><dt>&lsquo;<samp><span class="samp">-f</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--fullscreen</span></samp>&rsquo;<dd>Fullscreen. 
 <br><dt>&lsquo;<samp><span class="samp">--fullscreen-screens=[</span><var>S0</var><span class="samp">[,</span><var>S1</var><span class="samp">[,...]]]</span></samp>&rsquo;<dd>Use the listed screens <var>S0</var>, <small class="dots">...</small>, <var>Sn</var> in fullscreen mode. Screen
@@ -164,89 +202,55 @@
 
 <h2 class="chapter">3 Input Layouts</h2>
 
-<p>Bino supports the following stereoscopic input layouts:
-     <dl>
-<dt><var>mono</var><dd>Single view (2D). 
-<br><dt><var>separate-left-right</var><dd>Left/right view in separate streams, left first. 
-<br><dt><var>separate-right-left</var><dd>Left/right view in separate streams, right first. 
-<br><dt><var>top-bottom</var><dd>Left view top, right view bottom. 
-<br><dt><var>top-bottom-half</var><dd>Left view top, right view bottom, half height. 
-<br><dt><var>bottom-top</var><dd>Left view bottom, right view top. 
-<br><dt><var>bottom-top-half</var><dd>Left view bottom, right view top, half height. 
-<br><dt><var>left-right</var><dd>Left view left, right view right. 
-<br><dt><var>left-right-half</var><dd>Left view left, right view right, half width. 
-<br><dt><var>right-left</var><dd>Left view right, right view left. 
-<br><dt><var>right-left-half</var><dd>Left view right, right view left, half width. 
-<br><dt><var>even-odd-rows</var><dd>Left view even rows, right view odd rows. 
-<br><dt><var>odd-even-rows</var><dd>Left view odd rows, right view even rows. 
-</dl>
-
-   <p>The default is to autodetect the input type from meta data stored in the file. 
-If this fails, Bino tries to autodetect the input type based on the file name. 
-See <a href="#File-Name-Conventions">File Name Conventions</a>.  If that fails, too, Bino guesses based on the
-resolution of the input.
+<h3 class="section">3.1 Overview</h3>
 
-<div class="node">
-<a name="Output-Techniques"></a>
-<p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#File-Name-Conventions">File Name Conventions</a>,

bino-1.1.1.tar.bz2/doc/bino.info -> bino-1.1.3.tar.bz2/doc/bino.info Changed

@@ -1,7 +1,7 @@
 This is ../../sources/bino/doc/bino.info, produced by makeinfo version
 4.13 from ../../sources/bino/doc/bino.texi.
 
-This manual was last updated 17 May 2011 for version 1.1.1 of Bino.
+This manual was last updated 14 August 2011 for version 1.1.3 of Bino.
 
    Copyright (C) 2011 Martin Lambers (<marlam@marlam.de>), Stefan
 Eilemann (<eile@eyescale.ch>), Frédéric Devernay
@@ -18,12 +18,12 @@
 END-INFO-DIR-ENTRY
 
 &#x1f;
-File: bino.info,  Node: Top,  Next: Overview,  Up: (dir)
+File: bino.info,  Node: Top,  Next: Introduction,  Up: (dir)
 
 Bino
 ****
 
-This manual was last updated 17 May 2011 for version 1.1.1 of Bino.
+This manual was last updated 14 August 2011 for version 1.1.3 of Bino.
 
    Copyright (C) 2011 Martin Lambers (<marlam@marlam.de>), Stefan
 Eilemann (<eile@eyescale.ch>), Frédéric Devernay
@@ -36,21 +36,18 @@
 
 * Menu:
 
-* Overview::
+* Introduction::
 * Invocation::
 * Input Layouts::
 * Output Techniques::
-* File Name Conventions::
 * Interactive Control::
 * Camera Devices::
-* Crosstalk Ghostbusting::
-* Advanced Multi Display Support::
 
 &#x1f;
-File: bino.info,  Node: Overview,  Next: Invocation,  Prev: Top,  Up: Top
+File: bino.info,  Node: Introduction,  Next: Invocation,  Prev: Top,  Up: Top
 
-1 Overview
-**********
+1 Introduction
+**************
 
 Bino is a 3D video player with multi-display support.
 
@@ -58,21 +55,30 @@
 videos have separate views for the left and right eye and thus allow
 depth perception through stereopsis.
 
-   All input files are combined into one media source, so you can have
-video, audio, and subtitle streams in separate files. The files are
-decoded with the FFmpeg (http://ffmpeg.org/)  libraries, so URLs and
-other special constructs are supported.
+   The left and right view of a stereoscopic video can be stored using
+different layouts. Bino supports all commonly used layouts. *Note Input
+Layouts::.
 
-   Bino supports a wide variety of stereoscopic input layouts and
-display techniques.
+   To display a stereoscopic video, the left and right view have to be
+prepared in a special way depending on the output display technique.
+Bino supports a wide variety of display techniques. *Note Output
+Techniques::.
 
 &#x1f;
-File: bino.info,  Node: Invocation,  Next: Input Layouts,  Prev: Overview,  Up: Top
+File: bino.info,  Node: Invocation,  Next: Input Layouts,  Prev: Introduction,  Up: Top
 
 2 Invocation
 ************
 
-Synopsis: `bino [OPTION...] [FILE...]'
+This section describes the command line interface of Bino.
+
+   Synopsis: `bino [OPTION...] [FILE...]'
+
+   Bino combines all input files into one media source which is then
+played. This means you can have video, audio, and subtitle streams in
+separate files. The files are decoded with the FFmpeg
+(http://ffmpeg.org/) libraries, so URLs and other special constructs
+are supported.
 
 `--help'
      Print help.
@@ -117,11 +123,11 @@
 
 `-i'
 `--input=TYPE'
-     Select input type. *Note Input Layouts::.
+     Select input layout. *Note Input Layouts::.
 
 `-o'
 `--output=TYPE'
-     Select output type. *Note Output Techniques::.
+     Select output technique. *Note Output Techniques::.
 
 `-S'
 `--swap-eyes'
@@ -198,152 +204,54 @@
 3 Input Layouts
 ***************
 
-Bino supports the following stereoscopic input layouts:
+3.1 Overview
+============
+
+The left and right view of a stereoscopic video can be stored using
+different layouts. Sometimes they are stored in separate files,
+sometimes in separate streams inside the same file, and often they are
+packed into a single video on top of each other or next to each other,
+with or without a reduction of resolution.
+
+   By default, Bino autodetects the input layout from meta data stored
+in the file (for example, the Matroska and WebM formats have a
+`StereoMode' field for that purpose).  If no meta data is available,
+Bino tries to autodetect the input layout based on the file name. *Note
+File Name Conventions::. If that fails, too, Bino guesses based on the
+resolution of the input.
+
+3.2 Supported Input Layouts
+===========================
+
 MONO
      Single view (2D).
-
 SEPARATE-LEFT-RIGHT
      Left/right view in separate streams, left first.
-
 SEPARATE-RIGHT-LEFT
      Left/right view in separate streams, right first.
-
 TOP-BOTTOM
      Left view top, right view bottom.
-
 TOP-BOTTOM-HALF
      Left view top, right view bottom, half height.
-
 BOTTOM-TOP
      Left view bottom, right view top.
-
 BOTTOM-TOP-HALF
      Left view bottom, right view top, half height.
-
 LEFT-RIGHT
      Left view left, right view right.
-
 LEFT-RIGHT-HALF
      Left view left, right view right, half width.
-
 RIGHT-LEFT
      Left view right, right view left.
-
 RIGHT-LEFT-HALF
      Left view right, right view left, half width.
-
 EVEN-ODD-ROWS
      Left view even rows, right view odd rows.
-
 ODD-EVEN-ROWS
      Left view odd rows, right view even rows.
 
-   The default is to autodetect the input type from meta data stored in
-the file.  If this fails, Bino tries to autodetect the input type based
-on the file name.  *Note File Name Conventions::.  If that fails, too,
-Bino guesses based on the resolution of the input.
-
-&#x1f;
-File: bino.info,  Node: Output Techniques,  Next: File Name Conventions,  Prev: Input Layouts,  Up: Top
-
-4 Output Techniques
-*******************
-
-Bino supports the following stereoscopic display techniques:
-MONO-LEFT
-     Left view only.
-
-MONO-RIGHT
-     Right view only.
-
-TOP-BOTTOM
-     Left view top, right view bottom.
-
-TOP-BOTTOM-HALF
-     Left view top, right view bottom, half height.
-
-LEFT-RIGHT
-     Left view left, right view right.
-
-LEFT-RIGHT-HALF
-     Left view left, right view right, half width.
-
-EVEN-ODD-ROWS
-     Left view even rows, right view odd rows.
-
-EVEN-ODD-COLUMNS

bino-1.1.1.tar.bz2/doc/bino.texi -> bino-1.1.3.tar.bz2/doc/bino.texi Changed

@@ -50,22 +50,22 @@
 @end ifnottex
 
 @ifhtml
-Table of Contents:
+Short Contents:
 @end ifhtml
 @menu
-* Overview::
+* Introduction::
 * Invocation::
 * Input Layouts::
 * Output Techniques::
-* File Name Conventions::
 * Interactive Control::
 * Camera Devices::
-* Crosstalk Ghostbusting::
-* Advanced Multi Display Support::
 @end menu
+@ifhtml
+@contents
+@end ifhtml
 
-@node Overview
-@chapter Overview
+@node Introduction
+@chapter Introduction
 
 Bino is a 3D video player with multi-display support.
 
@@ -73,20 +73,26 @@
 separate views for the left and right eye and thus allow depth perception
 through stereopsis.
 
-All input files are combined into one media source, so you can have video,
-audio, and subtitle streams in separate files. The files are decoded with the
-@url{http://ffmpeg.org/,FFmpeg}  libraries, so URLs and other special
-constructs are supported.
+The left and right view of a stereoscopic video can be stored using different
+layouts. Bino supports all commonly used layouts. @xref{Input Layouts}.
 
-Bino supports a wide variety of stereoscopic input layouts and display
-techniques.
+To display a stereoscopic video, the left and right view have to be prepared
+in a special way depending on the output display technique. Bino supports a
+wide variety of display techniques. @xref{Output Techniques}.
 
 @node Invocation
 @chapter Invocation
 
+This section describes the command line interface of Bino.
+
 Synopsis:
 @code{bino [@var{option}@dots{}] [@var{file}@dots{}]}
 
+Bino combines all input files into one media source which is then played. This
+means you can have video, audio, and subtitle streams in separate files. The
+files are decoded with the @url{http://ffmpeg.org/,FFmpeg} libraries, so URLs
+and other special constructs are supported.
+
 @table @samp
 @item --help
 Print help.
@@ -119,10 +125,10 @@
 Select subtitle stream (1-n, depending on the input).
 @item -i
 @itemx --input=@var{TYPE}
-Select input type. @xref{Input Layouts}.
+Select input layout. @xref{Input Layouts}.
 @item -o
 @itemx --output=@var{TYPE}
-Select output type. @xref{Output Techniques}.
+Select output technique. @xref{Output Techniques}.
 @item -S
 @itemx --swap-eyes
 Swap left/right view.
@@ -177,111 +183,67 @@
 @node Input Layouts
 @chapter Input Layouts
 
-Bino supports the following stereoscopic input layouts:
+@section Overview
+
+The left and right view of a stereoscopic video can be stored using different
+layouts. Sometimes they are stored in separate files, sometimes in separate
+streams inside the same file, and often they are packed into a single video on
+top of each other or next to each other, with or without a reduction of
+resolution.
+
+By default, Bino autodetects the input layout from meta data stored in the file
+(for example, the Matroska and WebM formats have a @code{StereoMode} field for
+that purpose).
+If no meta data is available, Bino tries to autodetect the input layout based on
+the file name. @xref{File Name Conventions}. If that fails, too, Bino guesses
+based on the resolution of the input.
+
+@section Supported Input Layouts
+
 @table @var
 @item mono
-Single view (2D).
+Single view (2D).@*
+@image{input-layout-mono,,,,png}
 @item separate-left-right
-Left/right view in separate streams, left first.
+Left/right view in separate streams, left first.@*
+@image{input-layout-separate-left-right,,,,png}
 @item separate-right-left
-Left/right view in separate streams, right first.
+Left/right view in separate streams, right first.@*
+@image{input-layout-separate-right-left,,,,png}
 @item top-bottom
-Left view top, right view bottom.
+Left view top, right view bottom.@*
+@image{input-layout-top-bottom,,,,png}
 @item top-bottom-half
-Left view top, right view bottom, half height.
+Left view top, right view bottom, half height.@*
+@image{input-layout-top-bottom-half,,,,png}
 @item bottom-top
-Left view bottom, right view top.
+Left view bottom, right view top.@*
+@image{input-layout-bottom-top,,,,png}
 @item bottom-top-half
-Left view bottom, right view top, half height.
+Left view bottom, right view top, half height.@*
+@image{input-layout-bottom-top-half,,,,png}
 @item left-right
-Left view left, right view right.
+Left view left, right view right.@*
+@image{input-layout-left-right,,,,png}
 @item left-right-half
-Left view left, right view right, half width.
+Left view left, right view right, half width.@*
+@image{input-layout-left-right-half,,,,png}
 @item right-left
-Left view right, right view left.
+Left view right, right view left.@*
+@image{input-layout-right-left,,,,png}
 @item right-left-half
-Left view right, right view left, half width.
+Left view right, right view left, half width.@*
+@image{input-layout-right-left-half,,,,png}
 @item even-odd-rows
-Left view even rows, right view odd rows.
+Left view even rows, right view odd rows.@*
+@image{input-layout-even-odd-rows,,,,png}
 @item odd-even-rows
-Left view odd rows, right view even rows.
-@end table
-
-The default is to autodetect the input type from meta data stored in the file.
-If this fails, Bino tries to autodetect the input type based on the file name.
-@xref{File Name Conventions}.  If that fails, too, Bino guesses based on the
-resolution of the input.
-
-@node Output Techniques
-@chapter Output Techniques
-
-Bino supports the following stereoscopic display techniques:
-@table @var
-@item mono-left
-Left view only.
-@item mono-right
-Right view only.
-@item top-bottom
-Left view top, right view bottom.
-@item top-bottom-half
-Left view top, right view bottom, half height.
-@item left-right
-Left view left, right view right.
-@item left-right-half
-Left view left, right view right, half width.
-@item even-odd-rows
-Left view even rows, right view odd rows.
-@item even-odd-columns
-Left view even columns, right view odd columns.
-@item checkerboard
-Left and right view in checkerboard pattern.
-@item hdmi-frame-pack
-HDMI frame packing mode (left top, right bottom, plus extra blank lines
-separating the two views). This mode is only necessary if you are forcing your
-display into the corresponding HDMI 3D mode. A description how to do this on
-GNU/Linux can be found in
-@url{http://lists.nongnu.org/archive/html/bino-list/2011-03/msg00033.html,this post to the Bino mailing list}.
-@item red-cyan-monochrome
-Red/cyan anaglyph, monochrome method.
-@item red-cyan-half-color
-Red/cyan anaglyph, half color method.
-@item red-cyan-full-color
-Red/cyan anaglyph, full color method.
-@item red-cyan-dubois
-Red/cyan anaglyph, high-quality Dubois method.
-@item green-magenta-monochrome
-Green/magenta anaglyph, monochrome method.
-@item green-magenta-half-color
-Green/magenta anaglyph, half color method.
-@item green-magenta-full-color
-Green/magenta anaglyph, full color method.
-@item green-magenta-dubois

bino-1.1.3.tar.bz2/doc/input-layout-bottom-top-half.png Added

bino-1.1.3.tar.bz2/doc/input-layout-bottom-top.png Added

bino-1.1.3.tar.bz2/doc/input-layout-even-odd-rows.png Added

bino-1.1.3.tar.bz2/doc/input-layout-left-right-half.png Added

bino-1.1.3.tar.bz2/doc/input-layout-left-right.png Added

bino-1.1.3.tar.bz2/doc/input-layout-mono.png Added

bino-1.1.3.tar.bz2/doc/input-layout-odd-even-rows.png Added

bino-1.1.3.tar.bz2/doc/input-layout-right-left-half.png Added

bino-1.1.3.tar.bz2/doc/input-layout-right-left.png Added

bino-1.1.3.tar.bz2/doc/input-layout-separate-left-right.png Added

bino-1.1.3.tar.bz2/doc/input-layout-separate-right-left.png Added

bino-1.1.3.tar.bz2/doc/input-layout-top-bottom-half.png Added

bino-1.1.3.tar.bz2/doc/input-layout-top-bottom.png Added

bino-1.1.3.tar.bz2/doc/output-type-amber-blue.png Added

bino-1.1.3.tar.bz2/doc/output-type-checkerboard.png Added

bino-1.1.3.tar.bz2/doc/output-type-even-odd-columns.png Added

bino-1.1.3.tar.bz2/doc/output-type-even-odd-rows.png Added

bino-1.1.3.tar.bz2/doc/output-type-green-magenta.png Added

bino-1.1.3.tar.bz2/doc/output-type-hdmi-frame-pack.png Added

bino-1.1.3.tar.bz2/doc/output-type-left-right-half.png Added

bino-1.1.3.tar.bz2/doc/output-type-left-right.png Added

bino-1.1.3.tar.bz2/doc/output-type-mono-left.png Added

bino-1.1.3.tar.bz2/doc/output-type-mono-right.png Added

bino-1.1.3.tar.bz2/doc/output-type-red-blue.png Added

bino-1.1.3.tar.bz2/doc/output-type-red-cyan.png Added

bino-1.1.3.tar.bz2/doc/output-type-red-green.png Added

bino-1.1.3.tar.bz2/doc/output-type-stereo.png Added

bino-1.1.3.tar.bz2/doc/output-type-top-bottom-half.png Added

bino-1.1.3.tar.bz2/doc/output-type-top-bottom.png Added

bino-1.1.1.tar.bz2/doc/stamp-vti -> bino-1.1.3.tar.bz2/doc/stamp-vti Changed

bino-1.1.1.tar.bz2/doc/version.texi -> bino-1.1.3.tar.bz2/doc/version.texi Changed

bino-1.1.1.tar.bz2/pkg/macosx/Info.plist.in -> bino-1.1.3.tar.bz2/pkg/macosx/Info.plist.in Changed

bino-1.1.1.tar.bz2/pkg/w32/bino.nsi -> bino-1.1.3.tar.bz2/pkg/w32/bino.nsi Changed

@@ -92,9 +92,9 @@
   WriteRegExpandStr HKLM $MYTMP "InstallLocation" "$INSTDIR"
   WriteRegStr       HKLM $MYTMP "DisplayVersion"  "${PACKAGE_VERSION}"
   WriteRegStr       HKLM $MYTMP "Publisher"       "The Bino developers"
-  WriteRegStr       HKLM $MYTMP "URLInfoAbout"    "http://bino.nongnu.org/"
-  WriteRegStr       HKLM $MYTMP "HelpLink"        "http://bino.nongnu.org/"
-  WriteRegStr       HKLM $MYTMP "URLUpdateInfo"   "http://bino.nongnu.org/"
+  WriteRegStr       HKLM $MYTMP "URLInfoAbout"    "http://bino3d.org/"
+  WriteRegStr       HKLM $MYTMP "HelpLink"        "http://bino3d.org/"
+  WriteRegStr       HKLM $MYTMP "URLUpdateInfo"   "http://bino3d.org/"
   WriteRegDWORD     HKLM $MYTMP "NoModify"        "1"
   WriteRegDWORD     HKLM $MYTMP "NoRepair"        "1"
   ; Start menu
@@ -102,7 +102,7 @@
   CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
   CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Bino.lnk" "$INSTDIR\bin\bino.exe"
   CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Manual.lnk" "$INSTDIR\doc\bino.html"
-  WriteINIStr "$SMPROGRAMS\$STARTMENU_FOLDER\Website.url" "InternetShortcut" "URL" "http://bino.nongnu.org/"
+  WriteINIStr "$SMPROGRAMS\$STARTMENU_FOLDER\Website.url" "InternetShortcut" "URL" "http://bino3d.org/"
   CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
   !insertmacro MUI_STARTMENU_WRITE_END
 SectionEnd

bino-1.1.1.tar.bz2/pkg/w32/notes.txt -> bino-1.1.3.tar.bz2/pkg/w32/notes.txt Changed

bino-1.1.1.tar.bz2/po/POTFILES.in -> bino-1.1.3.tar.bz2/po/POTFILES.in Changed

bino-1.1.1.tar.bz2/po/bino.pot -> bino-1.1.3.tar.bz2/po/bino.pot Changed

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: bino 1.1.1\n"
+"Project-Id-Version: bino 1.1.3\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2011-05-22 11:26+0200\n"
+"POT-Creation-Date: 2011-08-14 01:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,8 +95,8 @@
 msgid "Cannot convert string to %s."
 msgstr ""
 
-#: src/base/str.cpp:395 src/base/str.cpp:413 src/base/str.cpp:423
-#: src/base/str.cpp:434
+#: src/base/str.cpp:411 src/base/str.cpp:429 src/base/str.cpp:439
+#: src/base/str.cpp:450
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr ""
@@ -116,20 +116,21 @@
 msgid "Cannot unlock mutex: %s"
 msgstr ""
 
-#: src/base/thread.cpp:128
-msgid "Unknown exception."
-msgstr ""
-
-#: src/base/thread.cpp:142
+#: src/base/thread.cpp:145
 #, c-format
 msgid "Cannot create thread: %s"
 msgstr ""
 
-#: src/base/thread.cpp:157
+#: src/base/thread.cpp:160
 #, c-format
 msgid "Cannot join with thread: %s"
 msgstr ""
 
+#: src/base/thread.cpp:182
+#, c-format
+msgid "Cannot cancel thread: %s"
+msgstr ""
+
 #: src/base/timer.cpp:52 src/base/timer.cpp:64 src/base/timer.cpp:78
 msgid "Cannot get time."
 msgstr ""
@@ -195,43 +196,43 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr ""
 
-#: src/lib_versions.cpp:123 src/lib_versions.cpp:162 src/media_data.cpp:422
+#: src/lib_versions.cpp:121 src/lib_versions.cpp:155 src/media_data.cpp:422
 #: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
 msgid "unknown"
 msgstr ""
 
-#: src/lib_versions.cpp:186 src/lib_versions.cpp:198
+#: src/lib_versions.cpp:179 src/lib_versions.cpp:191
 msgid "not used"
 msgstr ""
 
-#: src/main.cpp:288
+#: src/main.cpp:325
 #, c-format
 msgid "%s version %s"
 msgstr ""
 
-#: src/main.cpp:289
+#: src/main.cpp:326
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr ""
 
-#: src/main.cpp:290
+#: src/main.cpp:327
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
 "permitted by law."
 msgstr ""
 
-#: src/main.cpp:293 src/player_qt.cpp:2859
+#: src/main.cpp:330 src/player_qt.cpp:2903
 msgid "Platform:"
 msgstr ""
 
-#: src/main.cpp:295 src/player_qt.cpp:2860
+#: src/main.cpp:332 src/player_qt.cpp:2904
 msgid "Libraries used:"
 msgstr ""
 
 #. TRANSLATORS: This is the --help text. Translate only the description,
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
-#: src/main.cpp:307
+#: src/main.cpp:344
 #, c-format
 msgid ""
 "Usage:\n"
@@ -337,19 +338,23 @@
 "  Mouse click              Seek according to horizontal click position."
 msgstr ""
 
-#: src/main.cpp:560
+#: src/main.cpp:597
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr ""
 
-#: src/main.cpp:577
+#: src/main.cpp:614
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr ""
 
-#: src/main.cpp:590
+#: src/main.cpp:627
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr ""
 
-#: src/main.cpp:607
+#: src/main.cpp:634
+msgid "Cannot connect to X server."
+msgstr ""
+
+#: src/main.cpp:650
 msgid "No video to play."
 msgstr ""
 
@@ -365,7 +370,7 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr ""
 
-#: src/media_input.cpp:286 src/player_qt.cpp:184
+#: src/media_input.cpp:286 src/player_qt.cpp:187
 msgid "Input:"
 msgstr ""
 
@@ -406,791 +411,800 @@
 msgid "Stereo layout: %s"
 msgstr ""
 
-#: src/media_object.cpp:587
+#: src/media_object.cpp:608
+#, c-format
+msgid "%s video stream %d: Unsupported stereo layout %s."
+msgstr ""
+
+#: src/media_object.cpp:646
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with %d channels."
 msgstr ""
 
-#: src/media_object.cpp:616
+#: src/media_object.cpp:675
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with sample format %s."
 msgstr ""
 
-#: src/media_object.cpp:686
+#: src/media_object.cpp:728
 #, c-format
 msgid "No support available for %s device."
 msgstr ""
 
-#: src/media_object.cpp:687 src/player_qt.cpp:1746
+#: src/media_object.cpp:729 src/player_qt.cpp:1788
 msgid "Firewire"
 msgstr ""
 
-#: src/media_object.cpp:688 src/player_qt.cpp:1747
+#: src/media_object.cpp:730 src/player_qt.cpp:1789
 msgid "X11"
 msgstr ""
 
-#: src/media_object.cpp:689
+#: src/media_object.cpp:731
 msgid "default"
 msgstr ""
 
-#: src/media_object.cpp:712 src/media_object.cpp:1177 src/xgl.cpp:297
+#: src/media_object.cpp:749 src/media_object.cpp:1189 src/xgl.cpp:297
 #, c-format
 msgid "%s: %s"
 msgstr ""
 
-#: src/media_object.cpp:722
+#: src/media_object.cpp:760
 #, c-format
 msgid "%s: Cannot read stream info: %s"
 msgstr ""
 
-#: src/media_object.cpp:750
+#: src/media_object.cpp:786
 #, c-format
-msgid "%s video stream %d: Invalid frame size."
+msgid "%s stream %d: Cannot open %s: %s"
 msgstr ""

bino-1.1.1.tar.bz2/po/cs.gmo -> bino-1.1.3.tar.bz2/po/cs.gmo Changed

bino-1.1.1.tar.bz2/po/cs.po -> bino-1.1.3.tar.bz2/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-05-22 11:26+0200\n"
+"POT-Creation-Date: 2011-08-14 01:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Joe <cuchac@email.cz>\n"
 "Language-Team: none\n"
@@ -96,8 +96,8 @@
 msgid "Cannot convert string to %s."
 msgstr "Nelze převést text do %s."
 
-#: src/base/str.cpp:395 src/base/str.cpp:413 src/base/str.cpp:423
-#: src/base/str.cpp:434
+#: src/base/str.cpp:411 src/base/str.cpp:429 src/base/str.cpp:439
+#: src/base/str.cpp:450
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Nelze převést %s to %s."
@@ -117,20 +117,21 @@
 msgid "Cannot unlock mutex: %s"
 msgstr "Nelze otevřít mutex: %s"
 
-#: src/base/thread.cpp:128
-msgid "Unknown exception."
-msgstr "Neznámá výjimka."
-
-#: src/base/thread.cpp:142
+#: src/base/thread.cpp:145
 #, c-format
 msgid "Cannot create thread: %s"
 msgstr "Nelze vytvořit vlákno: %s"
 
-#: src/base/thread.cpp:157
+#: 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
+#, fuzzy, c-format
+msgid "Cannot cancel thread: %s"
+msgstr "Nelze vytvořit vlákno: %s"
+
 #: src/base/timer.cpp:52 src/base/timer.cpp:64 src/base/timer.cpp:78
 msgid "Cannot get time."
 msgstr "Nelze získat aktuální čas."
@@ -196,25 +197,25 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Nelze odpojit buffery OpeanAL zdroje."
 
-#: src/lib_versions.cpp:123 src/lib_versions.cpp:162 src/media_data.cpp:422
+#: src/lib_versions.cpp:121 src/lib_versions.cpp:155 src/media_data.cpp:422
 #: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
 msgid "unknown"
 msgstr "neznámá"
 
-#: src/lib_versions.cpp:186 src/lib_versions.cpp:198
+#: src/lib_versions.cpp:179 src/lib_versions.cpp:191
 msgid "not used"
 msgstr "nevyužívá se"
 
-#: src/main.cpp:288
+#: src/main.cpp:325
 #, c-format
 msgid "%s version %s"
 msgstr "%s verze %s"
 
-#: src/main.cpp:289
+#: src/main.cpp:326
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr "Copyright (C) 2011 Bino vývojáři."
 
-#: src/main.cpp:290
+#: src/main.cpp:327
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -225,18 +226,18 @@
 "že bude užitečný, avšak BEZ JAKÉKOLI ZÁRUKY; neposkytují se ani odvozené "
 "záruky PRODEJNOSTI anebo VHODNOSTI PRO URČITÝ ÚČEL."
 
-#: src/main.cpp:293 src/player_qt.cpp:2859
+#: src/main.cpp:330 src/player_qt.cpp:2903
 msgid "Platform:"
 msgstr "Platforma:"
 
-#: src/main.cpp:295 src/player_qt.cpp:2860
+#: src/main.cpp:332 src/player_qt.cpp:2904
 msgid "Libraries used:"
 msgstr "Použité knihovny:"
 
 #. TRANSLATORS: This is the --help text. Translate only the description,
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
-#: src/main.cpp:307
+#: src/main.cpp:344
 #, fuzzy, c-format
 msgid ""
 "Usage:\n"
@@ -433,20 +434,25 @@
 "  page up, page down       Přeskoč 10 minut dopředu / zpět.\n"
 "  Stisk myši               Přeskoč vzhledem k horizontální pozici myši."
 
-#: src/main.cpp:560
+#: src/main.cpp:597
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Testovací režim, synchronizace zvuku a času je vypnuta."
 
-#: src/main.cpp:577
+#: src/main.cpp:614
 #, fuzzy
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Tato verze Bina byla zkompilována bez podpory knihovny Equalizer."
 
-#: src/main.cpp:590
+#: src/main.cpp:627
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Tato verze Bina byla zkompilována bez podpory knihovny Equalizer."
 
-#: src/main.cpp:607
+#: src/main.cpp:634
+#, fuzzy
+msgid "Cannot connect to X server."
+msgstr "Nelze převést %s to %s."
+
+#: src/main.cpp:650
 msgid "No video to play."
 msgstr "Nenalezeno žádné video."
 
@@ -462,7 +468,7 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d ch., %g kHz, %d bit"
 
-#: src/media_input.cpp:286 src/player_qt.cpp:184
+#: src/media_input.cpp:286 src/player_qt.cpp:187
 msgid "Input:"
 msgstr "Vstup:"
 
@@ -503,390 +509,396 @@
 msgid "Stereo layout: %s"
 msgstr "Stereo režim: %s"
 
-#: src/media_object.cpp:587
+#: src/media_object.cpp:608
+#, fuzzy, c-format
+msgid "%s video stream %d: Unsupported stereo layout %s."
+msgstr "%s video stopa %d: Nepodporovaný kodek videa."
+
+#: src/media_object.cpp:646
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with %d channels."
 msgstr "%s zvuková stopa %d: Nemohu přehrát zvukovou stopu s %d kanály."
 
-#: src/media_object.cpp:616
+#: src/media_object.cpp:675
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with sample format %s."
 msgstr "%s zvuková stopa %d: Nemohu přehrát zvukovou stopu ve formátu %s."
 
-#: src/media_object.cpp:686
+#: src/media_object.cpp:728
 #, c-format
 msgid "No support available for %s device."
 msgstr ""
 
-#: src/media_object.cpp:687 src/player_qt.cpp:1746
+#: src/media_object.cpp:729 src/player_qt.cpp:1788
 msgid "Firewire"
 msgstr ""
 
-#: src/media_object.cpp:688 src/player_qt.cpp:1747
+#: src/media_object.cpp:730 src/player_qt.cpp:1789
 msgid "X11"
 msgstr ""
 
-#: src/media_object.cpp:689
+#: src/media_object.cpp:731
 msgid "default"
 msgstr ""
 
-#: src/media_object.cpp:712 src/media_object.cpp:1177 src/xgl.cpp:297
+#: src/media_object.cpp:749 src/media_object.cpp:1189 src/xgl.cpp:297
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: src/media_object.cpp:722
+#: src/media_object.cpp:760
 #, c-format
 msgid "%s: Cannot read stream info: %s"
 msgstr "%s: Nemohu přečíst informace o stopě: %s"
 
-#: src/media_object.cpp:750
-#, c-format
-msgid "%s video stream %d: Invalid frame size."
-msgstr "%s video stopa %d: Špatná velikost obrazu."
+#: src/media_object.cpp:786
+#, fuzzy, c-format

bino-1.1.1.tar.bz2/po/de.gmo -> bino-1.1.3.tar.bz2/po/de.gmo Changed

bino-1.1.1.tar.bz2/po/de.po -> bino-1.1.3.tar.bz2/po/de.po Changed

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bino 0.9.2\n"
+"Project-Id-Version: bino 1.1.1\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2011-05-22 11:26+0200\n"
+"POT-Creation-Date: 2011-08-14 01:38+0200\n"
 "PO-Revision-Date: 2011-04-10 17:23+0200\n"
 "Last-Translator: Martin Lambers <marlam@marlam.de>\n"
 "Language-Team: none\n"
@@ -93,8 +93,8 @@
 msgid "Cannot convert string to %s."
 msgstr "Kann Zeichenkette nicht zu %s konvertieren."
 
-#: src/base/str.cpp:395 src/base/str.cpp:413 src/base/str.cpp:423
-#: src/base/str.cpp:434
+#: src/base/str.cpp:411 src/base/str.cpp:429 src/base/str.cpp:439
+#: src/base/str.cpp:450
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Kann %s nicht zu %s konvertieren."
@@ -114,20 +114,21 @@
 msgid "Cannot unlock mutex: %s"
 msgstr "Kann Mutex nicht entsichern: %s"
 
-#: src/base/thread.cpp:128
-msgid "Unknown exception."
-msgstr "Unbekannte Ausnahme."
-
-#: src/base/thread.cpp:142
+#: src/base/thread.cpp:145
 #, c-format
 msgid "Cannot create thread: %s"
 msgstr "Kann Thread nicht erzeugen: %s"
 
-#: src/base/thread.cpp:157
+#: 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/timer.cpp:52 src/base/timer.cpp:64 src/base/timer.cpp:78
 msgid "Cannot get time."
 msgstr "Kann Zeit nicht abfragen."
@@ -193,25 +194,25 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Kann OpenAL Quellenpuffer nicht aus Warteschlange entfernen."
 
-#: src/lib_versions.cpp:123 src/lib_versions.cpp:162 src/media_data.cpp:422
+#: src/lib_versions.cpp:121 src/lib_versions.cpp:155 src/media_data.cpp:422
 #: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
 msgid "unknown"
 msgstr "unbekannt"
 
-#: src/lib_versions.cpp:186 src/lib_versions.cpp:198
+#: src/lib_versions.cpp:179 src/lib_versions.cpp:191
 msgid "not used"
 msgstr "nicht benutzt"
 
-#: src/main.cpp:288
+#: src/main.cpp:325
 #, c-format
 msgid "%s version %s"
 msgstr "%s Version %s"
 
-#: src/main.cpp:289
+#: src/main.cpp:326
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr "Copyright (C) 2011 Bino Entwickler."
 
-#: src/main.cpp:290
+#: src/main.cpp:327
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -220,19 +221,19 @@
 "Dies ist freie Software. Du kannst Kopien davon verteilen unter den "
 "Bedingungen der GNU General Public License. Es gibt keine Garantie."
 
-#: src/main.cpp:293 src/player_qt.cpp:2859
+#: src/main.cpp:330 src/player_qt.cpp:2903
 msgid "Platform:"
 msgstr "Plattform:"
 
-#: src/main.cpp:295 src/player_qt.cpp:2860
+#: src/main.cpp:332 src/player_qt.cpp:2904
 msgid "Libraries used:"
 msgstr "Benutzte Bibliotheken:"
 
 #. TRANSLATORS: This is the --help text. Translate only the description,
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
-#: src/main.cpp:307
-#, fuzzy, c-format
+#: src/main.cpp:344
+#, c-format
 msgid ""
 "Usage:\n"
 "  %s [option...] [file...]\n"
@@ -343,7 +344,12 @@
 "  --help                   Zeige Hilfe.\n"
 "  --version                Zeige Version.\n"
 "  -n|--no-gui              Starte ohne GUI, zeige nur ein Video Fenster.\n"
-"  -l|--log-level=LEVEL     Setze Loglevel (debug/info/warning/error/quiet).\n"
+"  -L|--log-level=LEVEL     Setze Loglevel (debug/info/warning/error/quiet).\n"
+"  --device-type=TYPE       Kameratyp: default, firewire, x11.\n"
+"  --device-frame-size=BxH  Fordere Kameraauflösung BxH an.\n"
+"  --device-frame-rate=N/D  Fordere Kamerabildrate N/D an.\n"
+"  --lirc-config=FILE       Setze LIRC Konfigurationsdatei. Diese Option\n"
+"                           kann mehrfach verwendet werden.\n"
 "  -v|--video=STREAM        Wähle Videokanal (1-n, je nach Eingabe).\n"
 "  -a|--audio=STREAM        Wähle Audiokanal (1-n, je nach Eingabe).\n"
 "  -s|--subtitle=STREAM     Wähle Untertitelkanal (0-n, je nach Eingabe).\n"
@@ -391,19 +397,26 @@
 "    equalizer-3d             Multidisplay via Equalizer (3D Konfiguration).\n"
 "  -S|--swap-eyes           Tausche linke/rechte Ansicht.\n"
 "  -f|--fullscreen          Vollbild.\n"
+"  --fullscreen-screens=    Setze Bildschirme für den Vollbildmodus.\n"
+"     [S0[,S1[,...]]]       Bildschirmnummern starten mit 1. Standard\n"
+"                           (leere Liste) ist der Hauptbildschirm.\n"
+"  --fullscreen-flip-left   Spiegele linke Sicht vertikal für Vollbild.\n"
+"  --fullscreen-flop-left   Spiegele linke Sicht horiztonal für Vollbild.\n"
+"  --fullscreen-flip-right  Spiegele rechte Sicht vertikal für Vollbild.\n"
+"  --fullscreen-flop-right  Spiegele rechte  Sicht horiztonal für Vollbild.\n"
 "  -c|--center              Zentriere Fenster auf Bildschirm.\n"
 "  --subtitle-encoding=ENC  Setze Zeichensatz für Untertitel.\n"
 "  --subtitle-font=FONT     Setze Schriftart für Untertitel.\n"
 "  --subtitle-size=N        Setze Schriftgröße für Untertitel.\n"
 "  --subtitle-scale=S       Setze Skalierungsfaktor für Untertitel.\n"
-"  --subtitle-color=COLOR   Setze Farbe für Untertitel, im [AA]RRGGBB "
-"Format.\n"
+"  --subtitle-color=COLOR   Setze Farbe für Untertitel ([AA]RRGGBB).\n"
 "  --subtitle-parallax=VAL  Untertitel-Parallaxenjustierung (-1 bis +1).\n"
 "  -P|--parallax=VAL        Parallaxenjustierung (-1 bis +1).\n"
 "  -C|--crosstalk=VAL       Crosstalk-Level (0 bis 1); kamma-getrennte\n"
 "                           Werte für die R,G,B Kanäle.\n"
 "  -G|--ghostbust=VAL       Crosstalk-Verringerungsfaktor (0 bis 1).\n"
 "  -b|--benchmark           Benchmarkmodus (kein Audio, zeige FPS).\n"
+"  -l|--loop                Wiederhole das Video.\n"
 "\n"
 "Interaktion:\n"
 "  ESC                      Verlasse Vollbildmodus, oder beende.\n"
@@ -426,22 +439,24 @@
 "  Seite rauf, Seite runter Spule 10 Minuten zurück / vor.\n"
 "  Mausklick                Spule zur Stelle der horizontalen Klickposition."
 
-#: src/main.cpp:560
+#: src/main.cpp:597
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Benchmark Modus: Audio und Videosynchronisation deaktiviert."
 
-#: src/main.cpp:577
-#, fuzzy
+#: src/main.cpp:614
 msgid "This version of Bino was compiled without support for LIRC."
-msgstr ""
-"Diese Version von Bino wurde ohne Unterstützung für Equalizer erstellt."
+msgstr "Diese Version von Bino wurde ohne Unterstützung für LIRC erstellt."
 
-#: src/main.cpp:590
+#: src/main.cpp:627
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr ""
 "Diese Version von Bino wurde ohne Unterstützung für Equalizer erstellt."
 
-#: src/main.cpp:607
+#: src/main.cpp:634
+msgid "Cannot connect to X server."
+msgstr "Kann keine Verbindung zum X Server aufbauen."
+
+#: src/main.cpp:650
 msgid "No video to play."
 msgstr "Kein Video abzuspielen."
 
@@ -457,7 +472,7 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d Kan., %g kHz, %d bit"
 
-#: src/media_input.cpp:286 src/player_qt.cpp:184
+#: src/media_input.cpp:286 src/player_qt.cpp:187
 msgid "Input:"
 msgstr "Eingabe:"
 
@@ -498,190 +513,195 @@
 msgid "Stereo layout: %s"
 msgstr "Stereolayout: %s"
 
-#: src/media_object.cpp:587
+#: src/media_object.cpp:608
+#, c-format
+msgid "%s video stream %d: Unsupported stereo layout %s."
+msgstr "%s Videokanal %d: Stereolayout %s wird nicht unterstützt."
+

bino-1.1.1.tar.bz2/po/fr.gmo -> bino-1.1.3.tar.bz2/po/fr.gmo Changed

bino-1.1.1.tar.bz2/po/fr.po -> bino-1.1.3.tar.bz2/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-05-22 11:26+0200\n"
+"POT-Creation-Date: 2011-08-14 01:38+0200\n"
 "PO-Revision-Date: 2011-04-21 16:48+0200\n"
 "Last-Translator: Frédéric Devernay <>\n"
 "Language-Team: French\n"
@@ -96,8 +96,8 @@
 msgid "Cannot convert string to %s."
 msgstr "Impossible de convertir la chaîne de caractères en %s."
 
-#: src/base/str.cpp:395 src/base/str.cpp:413 src/base/str.cpp:423
-#: src/base/str.cpp:434
+#: src/base/str.cpp:411 src/base/str.cpp:429 src/base/str.cpp:439
+#: src/base/str.cpp:450
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Impossible de convertir %s en %s."
@@ -117,20 +117,21 @@
 msgid "Cannot unlock mutex: %s"
 msgstr "Impossible de déverrouiller le mutex: %s"
 
-#: src/base/thread.cpp:128
-msgid "Unknown exception."
-msgstr "Exception inconnue."
-
-#: src/base/thread.cpp:142
+#: src/base/thread.cpp:145
 #, c-format
 msgid "Cannot create thread: %s"
 msgstr "Impossible de créer le thread: %s"
 
-#: src/base/thread.cpp:157
+#: 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
+#, fuzzy, c-format
+msgid "Cannot cancel thread: %s"
+msgstr "Impossible de créer le thread: %s"
+
 #: src/base/timer.cpp:52 src/base/timer.cpp:64 src/base/timer.cpp:78
 msgid "Cannot get time."
 msgstr "Impossible d'obtenir l'heure."
@@ -196,25 +197,25 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Impossible de vider la queue de tampons de la source OpenAL."
 
-#: src/lib_versions.cpp:123 src/lib_versions.cpp:162 src/media_data.cpp:422
+#: src/lib_versions.cpp:121 src/lib_versions.cpp:155 src/media_data.cpp:422
 #: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/lib_versions.cpp:186 src/lib_versions.cpp:198
+#: src/lib_versions.cpp:179 src/lib_versions.cpp:191
 msgid "not used"
 msgstr "inutilisé"
 
-#: src/main.cpp:288
+#: src/main.cpp:325
 #, c-format
 msgid "%s version %s"
 msgstr "%s version %s"
 
-#: src/main.cpp:289
+#: src/main.cpp:326
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr "Copyright (C) 2011 les développeurs Bino."
 
-#: src/main.cpp:290
+#: src/main.cpp:327
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -224,18 +225,18 @@
 "termes de la GNU General Public License. Il n'y a AUCUNE GARANTIE, dans les "
 "limites autorisées par la loi."
 
-#: src/main.cpp:293 src/player_qt.cpp:2859
+#: src/main.cpp:330 src/player_qt.cpp:2903
 msgid "Platform:"
 msgstr "Plateforme :"
 
-#: src/main.cpp:295 src/player_qt.cpp:2860
+#: src/main.cpp:332 src/player_qt.cpp:2904
 msgid "Libraries used:"
 msgstr "Bibliothèques utilisées :"
 
 #. TRANSLATORS: This is the --help text. Translate only the description,
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
-#: src/main.cpp:307
+#: src/main.cpp:344
 #, fuzzy, c-format
 msgid ""
 "Usage:\n"
@@ -447,20 +448,25 @@
 "  Mouse click              Aller à la position définie par l'abscisse du "
 "clic."
 
-#: src/main.cpp:560
+#: src/main.cpp:597
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Mode banc d'essai: audio et synchronisation temporelle désactivés."
 
-#: src/main.cpp:577
+#: src/main.cpp:614
 #, fuzzy
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Cette version de Bino a été compilée sans le support Equalizer."
 
-#: src/main.cpp:590
+#: src/main.cpp:627
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Cette version de Bino a été compilée sans le support Equalizer."
 
-#: src/main.cpp:607
+#: src/main.cpp:634
+#, fuzzy
+msgid "Cannot connect to X server."
+msgstr "Impossible de convertir %s en %s."
+
+#: src/main.cpp:650
 msgid "No video to play."
 msgstr "Aucune vidéo à jouer."
 
@@ -476,7 +482,7 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d ch., %g kHz, %d bit"
 
-#: src/media_input.cpp:286 src/player_qt.cpp:184
+#: src/media_input.cpp:286 src/player_qt.cpp:187
 msgid "Input:"
 msgstr "Entrée :"
 
@@ -517,192 +523,197 @@
 msgid "Stereo layout: %s"
 msgstr "Mode stéréo : %s"
 
-#: src/media_object.cpp:587
+#: src/media_object.cpp:608
+#, fuzzy, c-format
+msgid "%s video stream %d: Unsupported stereo layout %s."
+msgstr "%s flux vidéo %d : Codec vidéo non supporté."
+
+#: src/media_object.cpp:646
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with %d channels."
 msgstr "%s flux audio %d : Impossible de gérer de l'audio à %d canaux."
 
-#: src/media_object.cpp:616
+#: src/media_object.cpp:675
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with sample format %s."
 msgstr ""
 "%s flux audio %d : Impossible de gérer de l'audio au format d'échantillon %s."
 
-#: src/media_object.cpp:686
+#: src/media_object.cpp:728
 #, c-format
 msgid "No support available for %s device."
 msgstr ""
 
-#: src/media_object.cpp:687 src/player_qt.cpp:1746
+#: src/media_object.cpp:729 src/player_qt.cpp:1788
 msgid "Firewire"
 msgstr ""
 
-#: src/media_object.cpp:688 src/player_qt.cpp:1747
+#: src/media_object.cpp:730 src/player_qt.cpp:1789
 msgid "X11"
 msgstr ""
 
-#: src/media_object.cpp:689
+#: src/media_object.cpp:731
 msgid "default"
 msgstr ""
 
-#: src/media_object.cpp:712 src/media_object.cpp:1177 src/xgl.cpp:297
+#: src/media_object.cpp:749 src/media_object.cpp:1189 src/xgl.cpp:297
 #, c-format
 msgid "%s: %s"
 msgstr "%s : %s"
 
-#: src/media_object.cpp:722
+#: src/media_object.cpp:760
 #, c-format
 msgid "%s: Cannot read stream info: %s"
 msgstr "%s : Impossible de lire l'information du flux : %s"
 
-#: src/media_object.cpp:750
-#, c-format
-msgid "%s video stream %d: Invalid frame size."
-msgstr "%s flux vidéo %d : Taille de l'image invalide."
+#: src/media_object.cpp:786

bino-1.1.1.tar.bz2/po/pl.gmo -> bino-1.1.3.tar.bz2/po/pl.gmo Changed

bino-1.1.1.tar.bz2/po/pl.po -> bino-1.1.3.tar.bz2/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-05-22 11:26+0200\n"
+"POT-Creation-Date: 2011-08-14 01:38+0200\n"
 "PO-Revision-Date: 2011-04-20 11:14+0100\n"
 "Last-Translator: Robert Pliszko <plesken@systems-design.eu>\n"
 "Language-Team: Bino Developers <bino-list@nongnu.org>\n"
@@ -99,8 +99,8 @@
 msgid "Cannot convert string to %s."
 msgstr "Nie można skonwertować tekstu do %s."
 
-#: src/base/str.cpp:395 src/base/str.cpp:413 src/base/str.cpp:423
-#: src/base/str.cpp:434
+#: src/base/str.cpp:411 src/base/str.cpp:429 src/base/str.cpp:439
+#: src/base/str.cpp:450
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Nie można skonwertować %s do %s."
@@ -120,20 +120,21 @@
 msgid "Cannot unlock mutex: %s"
 msgstr "Nie można odblokować mutex: %s"
 
-#: src/base/thread.cpp:128
-msgid "Unknown exception."
-msgstr "Nieznany wyjątek."
-
-#: src/base/thread.cpp:142
+#: src/base/thread.cpp:145
 #, c-format
 msgid "Cannot create thread: %s"
 msgstr "Nie można utworzyć wątku: %s"
 
-#: src/base/thread.cpp:157
+#: 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
+#, fuzzy, c-format
+msgid "Cannot cancel thread: %s"
+msgstr "Nie można utworzyć wątku: %s"
+
 #: src/base/timer.cpp:52 src/base/timer.cpp:64 src/base/timer.cpp:78
 msgid "Cannot get time."
 msgstr "Nie można pobrać czasu."
@@ -199,25 +200,25 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Nie można odkolejkować źródła buforów OpenAL."
 
-#: src/lib_versions.cpp:123 src/lib_versions.cpp:162 src/media_data.cpp:422
+#: src/lib_versions.cpp:121 src/lib_versions.cpp:155 src/media_data.cpp:422
 #: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
 msgid "unknown"
 msgstr "nieznany"
 
-#: src/lib_versions.cpp:186 src/lib_versions.cpp:198
+#: src/lib_versions.cpp:179 src/lib_versions.cpp:191
 msgid "not used"
 msgstr "nie używany"
 
-#: src/main.cpp:288
+#: src/main.cpp:325
 #, c-format
 msgid "%s version %s"
 msgstr "%s wersja %s"
 
-#: src/main.cpp:289
+#: src/main.cpp:326
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr "Copyright (C) 2011 deweloperzy Bino."
 
-#: src/main.cpp:290
+#: src/main.cpp:327
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -227,18 +228,18 @@
 "the GNU General Public License. There is NO WARRANTY, to the extent "
 "permitted by law."
 
-#: src/main.cpp:293 src/player_qt.cpp:2859
+#: src/main.cpp:330 src/player_qt.cpp:2903
 msgid "Platform:"
 msgstr "Platforma:"
 
-#: src/main.cpp:295 src/player_qt.cpp:2860
+#: src/main.cpp:332 src/player_qt.cpp:2904
 msgid "Libraries used:"
 msgstr "Użyte biblioteki:"
 
 #. TRANSLATORS: This is the --help text. Translate only the description,
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
-#: src/main.cpp:307
+#: src/main.cpp:344
 #, fuzzy, c-format
 msgid ""
 "Usage:\n"
@@ -441,20 +442,25 @@
 "  page up, page down       Przesuń 10 minut do tyłu / do przodu.\n"
 "  Mouse click              Przesuń zgodnie z pozycją myszki na suwaku czasu.."
 
-#: src/main.cpp:560
+#: src/main.cpp:597
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Opcja testowa: audio i synchronizacja czasu wyłączona."
 
-#: src/main.cpp:577
+#: src/main.cpp:614
 #, fuzzy
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Ta wersja bino została skompilowana bez obsługi korektora."
 
-#: src/main.cpp:590
+#: src/main.cpp:627
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Ta wersja bino została skompilowana bez obsługi korektora."
 
-#: src/main.cpp:607
+#: src/main.cpp:634
+#, fuzzy
+msgid "Cannot connect to X server."
+msgstr "Nie można skonwertować %s do %s."
+
+#: src/main.cpp:650
 msgid "No video to play."
 msgstr "Brak video do odtwarzania."
 
@@ -470,7 +476,7 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d ch., %g kHz, %d bit"
 
-#: src/media_input.cpp:286 src/player_qt.cpp:184
+#: src/media_input.cpp:286 src/player_qt.cpp:187
 msgid "Input:"
 msgstr "Wejście:"
 
@@ -511,390 +517,395 @@
 msgid "Stereo layout: %s"
 msgstr "Układ stereo: %s"
 
-#: src/media_object.cpp:587
+#: src/media_object.cpp:608
+#, fuzzy, c-format
+msgid "%s video stream %d: Unsupported stereo layout %s."
+msgstr "%s strumień video %d: Nie wspierany kodek video."
+
+#: src/media_object.cpp:646
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with %d channels."
 msgstr "%s strumień audio %d: Nie można obsłużyć audio z %d kanałem/ami."
 
-#: src/media_object.cpp:616
+#: src/media_object.cpp:675
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with sample format %s."
 msgstr "%s strumień audio %d: Nie można obsłużyć próbki formatu audio %s."
 
-#: src/media_object.cpp:686
+#: src/media_object.cpp:728
 #, c-format
 msgid "No support available for %s device."
 msgstr ""
 
-#: src/media_object.cpp:687 src/player_qt.cpp:1746
+#: src/media_object.cpp:729 src/player_qt.cpp:1788
 msgid "Firewire"
 msgstr ""
 
-#: src/media_object.cpp:688 src/player_qt.cpp:1747
+#: src/media_object.cpp:730 src/player_qt.cpp:1789
 msgid "X11"
 msgstr ""
 
-#: src/media_object.cpp:689
+#: src/media_object.cpp:731
 msgid "default"
 msgstr ""
 
-#: src/media_object.cpp:712 src/media_object.cpp:1177 src/xgl.cpp:297
+#: src/media_object.cpp:749 src/media_object.cpp:1189 src/xgl.cpp:297
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: src/media_object.cpp:722
+#: src/media_object.cpp:760
 #, c-format
 msgid "%s: Cannot read stream info: %s"
 msgstr "%s: Nie można odczytać strumienia info: %s"
 
-#: src/media_object.cpp:750
-#, c-format
-msgid "%s video stream %d: Invalid frame size."
-msgstr "%s strumień video %d: Zły rozmiar ramki."
+#: src/media_object.cpp:786
+#, fuzzy, c-format

bino-1.1.1.tar.bz2/po/ru.gmo -> bino-1.1.3.tar.bz2/po/ru.gmo Changed

bino-1.1.1.tar.bz2/po/ru.po -> bino-1.1.3.tar.bz2/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-05-22 11:26+0200\n"
+"POT-Creation-Date: 2011-08-14 01:38+0200\n"
 "PO-Revision-Date: 2011-04-19 11:52+0600\n"
 "Last-Translator: Alexey Osipov <simba@lerlan.ru>\n"
 "Language-Team: \n"
@@ -93,8 +93,8 @@
 msgid "Cannot convert string to %s."
 msgstr "Невозможно преобразовать строку в %s."
 
-#: src/base/str.cpp:395 src/base/str.cpp:413 src/base/str.cpp:423
-#: src/base/str.cpp:434
+#: src/base/str.cpp:411 src/base/str.cpp:429 src/base/str.cpp:439
+#: src/base/str.cpp:450
 #, c-format
 msgid "Cannot convert %s to %s."
 msgstr "Невозможно преобразовать %s в %s."
@@ -114,20 +114,21 @@
 msgid "Cannot unlock mutex: %s"
 msgstr "Невозможно разблокировать mutex: %s"
 
-#: src/base/thread.cpp:128
-msgid "Unknown exception."
-msgstr "Неизвестное исключение."
-
-#: src/base/thread.cpp:142
+#: src/base/thread.cpp:145
 #, c-format
 msgid "Cannot create thread: %s"
 msgstr "Невозможно создать поток: %s"
 
-#: src/base/thread.cpp:157
+#: src/base/thread.cpp:160
 #, c-format
 msgid "Cannot join with thread: %s"
 msgstr "Невозможно присоединиться к потоку: %s"
 
+#: src/base/thread.cpp:182
+#, fuzzy, c-format
+msgid "Cannot cancel thread: %s"
+msgstr "Невозможно создать поток: %s"
+
 #: src/base/timer.cpp:52 src/base/timer.cpp:64 src/base/timer.cpp:78
 msgid "Cannot get time."
 msgstr "Невозможно получить время."
@@ -193,25 +194,25 @@
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Невозможно получить из очереди буферы источника OpenAL."
 
-#: src/lib_versions.cpp:123 src/lib_versions.cpp:162 src/media_data.cpp:422
+#: src/lib_versions.cpp:121 src/lib_versions.cpp:155 src/media_data.cpp:422
 #: src/media_data.cpp:445 src/media_data.cpp:483 src/media_data.cpp:488
 msgid "unknown"
 msgstr "неизвестно"
 
-#: src/lib_versions.cpp:186 src/lib_versions.cpp:198
+#: src/lib_versions.cpp:179 src/lib_versions.cpp:191
 msgid "not used"
 msgstr "не используется"
 
-#: src/main.cpp:288
+#: src/main.cpp:325
 #, c-format
 msgid "%s version %s"
 msgstr "%s версия %s"
 
-#: src/main.cpp:289
+#: src/main.cpp:326
 msgid "Copyright (C) 2011 the Bino developers."
 msgstr "Copyright (C) 2011 Разработчики Bino."
 
-#: src/main.cpp:290
+#: src/main.cpp:327
 msgid ""
 "This is free software. You may redistribute copies of it under the terms of "
 "the GNU General Public License. There is NO WARRANTY, to the extent "
@@ -221,18 +222,18 @@
 "требованиям лицензии GNU General Public License. Программное обеспечение "
 "поставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, за исключением предусмотренных законом."
 
-#: src/main.cpp:293 src/player_qt.cpp:2859
+#: src/main.cpp:330 src/player_qt.cpp:2903
 msgid "Platform:"
 msgstr "Платформа:"
 
-#: src/main.cpp:295 src/player_qt.cpp:2860
+#: src/main.cpp:332 src/player_qt.cpp:2904
 msgid "Libraries used:"
 msgstr "Используемые библиотеки:"
 
 #. TRANSLATORS: This is the --help text. Translate only the description,
 #. not the option names. Please keep a proper indentation with spaces, and
 #. keep the line length limited.
-#: src/main.cpp:307
+#: src/main.cpp:344
 #, fuzzy, c-format
 msgid ""
 "Usage:\n"
@@ -426,22 +427,27 @@
 "  page up, page down  Перемотать на 10 минут назад / вперед.\n"
 "  Щелчок мышью        Перемотать по горизонтальному положению курсора."
 
-#: src/main.cpp:560
+#: src/main.cpp:597
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr ""
 "Режим оценки производительности: воспроизведение аудио отключено, "
 "воспроизведение видео с максимально-возможной скоростью."
 
-#: src/main.cpp:577
+#: src/main.cpp:614
 #, fuzzy
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Эта версия Bino была собрана без поддержки Equalizer."
 
-#: src/main.cpp:590
+#: src/main.cpp:627
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Эта версия Bino была собрана без поддержки Equalizer."
 
-#: src/main.cpp:607
+#: src/main.cpp:634
+#, fuzzy
+msgid "Cannot connect to X server."
+msgstr "Невозможно преобразовать %s в %s."
+
+#: src/main.cpp:650
 msgid "No video to play."
 msgstr "Нет видео для воспроизведения."
 
@@ -457,7 +463,7 @@
 msgid "%s, %d ch., %g kHz, %d bit"
 msgstr "%s, %d к., %g кГц, %d бит"
 
-#: src/media_input.cpp:286 src/player_qt.cpp:184
+#: src/media_input.cpp:286 src/player_qt.cpp:187
 msgid "Input:"
 msgstr "Источник:"
 
@@ -498,393 +504,399 @@
 msgid "Stereo layout: %s"
 msgstr "Стерео раскладка: %s"
 
-#: src/media_object.cpp:587
+#: src/media_object.cpp:608
+#, fuzzy, c-format
+msgid "%s video stream %d: Unsupported stereo layout %s."
+msgstr "%s видео дорожка %d: Неподдерживаемый видео кодек."
+
+#: src/media_object.cpp:646
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with %d channels."
 msgstr "%s аудио дорожка %d: Невозможно обработать аудио с %d каналами."
 
-#: src/media_object.cpp:616
+#: src/media_object.cpp:675
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with sample format %s."
 msgstr "%s аудио дорожка %d: Невозможно обработать аудио в формате %s."
 
-#: src/media_object.cpp:686
+#: src/media_object.cpp:728
 #, c-format
 msgid "No support available for %s device."
 msgstr ""
 
-#: src/media_object.cpp:687 src/player_qt.cpp:1746
+#: src/media_object.cpp:729 src/player_qt.cpp:1788
 msgid "Firewire"
 msgstr ""
 
-#: src/media_object.cpp:688 src/player_qt.cpp:1747
+#: src/media_object.cpp:730 src/player_qt.cpp:1789
 msgid "X11"
 msgstr ""
 
-#: src/media_object.cpp:689
+#: src/media_object.cpp:731
 msgid "default"
 msgstr ""
 
-#: src/media_object.cpp:712 src/media_object.cpp:1177 src/xgl.cpp:297
+#: src/media_object.cpp:749 src/media_object.cpp:1189 src/xgl.cpp:297
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: src/media_object.cpp:722
+#: src/media_object.cpp:760
 #, c-format
 msgid "%s: Cannot read stream info: %s"
 msgstr "%s: Невозможно прочитать информацию о дорожке: %s"
 
-#: src/media_object.cpp:750
-#, c-format
-msgid "%s video stream %d: Invalid frame size."
-msgstr "%s видео дорожка %d: Неверный размер кадра."

bino-1.1.1.tar.bz2/src/Makefile.am -> bino-1.1.3.tar.bz2/src/Makefile.am Changed

@@ -21,10 +21,41 @@
 	audio_output.h audio_output.cpp \
 	player.h player.cpp \
 	player_qt.h player_qt.cpp \
-	qt_app.h qt_app.cpp \
 	lib_versions.h lib_versions.cpp \
 	main.cpp
 
+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-top-bottom.ipe \
+	icons-local/input-layout-top-bottom-half.ipe \
+	icons-local/input-layout-bottom-top.ipe \
+	icons-local/input-layout-bottom-top-half.ipe \
+	icons-local/input-layout-left-right.ipe \
+	icons-local/input-layout-left-right-half.ipe \
+	icons-local/input-layout-right-left.ipe \
+	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-mono-left.ipe \
+	icons-local/output-type-mono-right.ipe \
+	icons-local/output-type-top-bottom.ipe \
+	icons-local/output-type-top-bottom-half.ipe \
+	icons-local/output-type-left-right.ipe \
+	icons-local/output-type-left-right-half.ipe \
+	icons-local/output-type-even-odd-rows.ipe \
+	icons-local/output-type-even-odd-columns.ipe \
+	icons-local/output-type-checkerboard.ipe \
+	icons-local/output-type-hdmi-frame-pack.ipe \
+	icons-local/output-type-red-cyan.ipe \
+	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 = \
 	icons/application-exit.png \
 	icons/applications-internet.png \
@@ -40,7 +71,8 @@
 	icons/media-seek-forward.png \
 	icons/preferences-desktop-keyboard.png \
 	icons/view-fullscreen.png \
-	icons/view-restore.png
+	icons/view-restore.png \
+	$(patsubst %.ipe,%.png,$(ICONS_LOCAL_IPE))
 
 EXTRA_DIST = \
 	video_output_color.fs.glsl \
@@ -56,7 +88,8 @@
 	logo/bino_logo_small_64x64.png \
 	icons/COPYING \
 	icons/README \
-	$(ICONS)
+	icons-local/README \
+	$(ICONS) $(ICONS_LOCAL_IPE)
 
 qt_resources.qrc:
 	$(AM_V_GEN)(echo '<!DOCTYPE RCC><RCC version="1.0">'; \

bino-1.1.1.tar.bz2/src/Makefile.in -> bino-1.1.3.tar.bz2/src/Makefile.in Changed

@@ -74,9 +74,8 @@
 	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 \
-	qt_app.h qt_app.cpp lib_versions.h lib_versions.cpp main.cpp \
-	player_equalizer.h player_equalizer.cpp lirc.h lirc.cpp \
-	logo/bino_logo.ico
+	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
@@ -85,9 +84,9 @@
 	media_input.$(OBJEXT) controller.$(OBJEXT) \
 	video_output.$(OBJEXT) video_output_qt.$(OBJEXT) xgl.$(OBJEXT) \
 	subtitle_renderer.$(OBJEXT) audio_output.$(OBJEXT) \
-	player.$(OBJEXT) player_qt.$(OBJEXT) qt_app.$(OBJEXT) \
-	lib_versions.$(OBJEXT) main.$(OBJEXT) $(am__objects_1) \
-	$(am__objects_2) $(am__objects_3)
+	player.$(OBJEXT) player_qt.$(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)
 bino_OBJECTS = $(am_bino_OBJECTS) $(nodist_bino_OBJECTS)
@@ -216,6 +215,7 @@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -332,8 +332,39 @@
 	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 \
-	qt_app.h qt_app.cpp lib_versions.h lib_versions.cpp main.cpp \
-	$(am__append_1) $(am__append_6) $(am__append_9)
+	lib_versions.h lib_versions.cpp main.cpp $(am__append_1) \
+	$(am__append_6) $(am__append_9)
+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-top-bottom.ipe \
+	icons-local/input-layout-top-bottom-half.ipe \
+	icons-local/input-layout-bottom-top.ipe \
+	icons-local/input-layout-bottom-top-half.ipe \
+	icons-local/input-layout-left-right.ipe \
+	icons-local/input-layout-left-right-half.ipe \
+	icons-local/input-layout-right-left.ipe \
+	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-mono-left.ipe \
+	icons-local/output-type-mono-right.ipe \
+	icons-local/output-type-top-bottom.ipe \
+	icons-local/output-type-top-bottom-half.ipe \
+	icons-local/output-type-left-right.ipe \
+	icons-local/output-type-left-right-half.ipe \
+	icons-local/output-type-even-odd-rows.ipe \
+	icons-local/output-type-even-odd-columns.ipe \
+	icons-local/output-type-checkerboard.ipe \
+	icons-local/output-type-hdmi-frame-pack.ipe \
+	icons-local/output-type-red-cyan.ipe \
+	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 = \
 	icons/application-exit.png \
 	icons/applications-internet.png \
@@ -349,7 +380,8 @@
 	icons/media-seek-forward.png \
 	icons/preferences-desktop-keyboard.png \
 	icons/view-fullscreen.png \
-	icons/view-restore.png
+	icons/view-restore.png \
+	$(patsubst %.ipe,%.png,$(ICONS_LOCAL_IPE))
 
 EXTRA_DIST = \
 	video_output_color.fs.glsl \
@@ -365,7 +397,8 @@
 	logo/bino_logo_small_64x64.png \
 	icons/COPYING \
 	icons/README \
-	$(ICONS)
+	icons-local/README \
+	$(ICONS) $(ICONS_LOCAL_IPE)
 
 nodist_bino_SOURCES = \
 	qt_resources.qrc \
@@ -495,7 +528,6 @@
 @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_app.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@

bino-1.1.1.tar.bz2/src/base/Makefile.in -> bino-1.1.3.tar.bz2/src/base/Makefile.in Changed

bino-1.1.1.tar.bz2/src/base/str.cpp -> bino-1.1.3.tar.bz2/src/base/str.cpp Changed

bino-1.1.1.tar.bz2/src/base/str.h -> bino-1.1.3.tar.bz2/src/base/str.h Changed

bino-1.1.1.tar.bz2/src/base/thread.cpp -> bino-1.1.3.tar.bz2/src/base/thread.cpp Changed

bino-1.1.1.tar.bz2/src/base/thread.h -> bino-1.1.3.tar.bz2/src/base/thread.h Changed

bino-1.1.3.tar.bz2/src/icons-local Added

bino-1.1.3.tar.bz2/src/icons-local/README Added

bino-1.1.3.tar.bz2/src/icons-local/input-layout-bottom-top-half.ipe Added

@@ -0,0 +1,253 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202213"/>
+<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.1.3.tar.bz2/src/icons-local/input-layout-bottom-top-half.png Added

bino-1.1.3.tar.bz2/src/icons-local/input-layout-bottom-top.ipe Added

@@ -0,0 +1,260 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202236"/>
+<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.1.3.tar.bz2/src/icons-local/input-layout-bottom-top.png Added

bino-1.1.3.tar.bz2/src/icons-local/input-layout-even-odd-rows.ipe Added

@@ -0,0 +1,279 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813173711"/>
+<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.1.3.tar.bz2/src/icons-local/input-layout-even-odd-rows.png Added

bino-1.1.3.tar.bz2/src/icons-local/input-layout-left-right-half.ipe Added

@@ -0,0 +1,253 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202306"/>
+<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.1.3.tar.bz2/src/icons-local/input-layout-left-right-half.png Added

bino-1.1.3.tar.bz2/src/icons-local/input-layout-left-right.ipe Added

@@ -0,0 +1,253 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202327"/>
+<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.1.3.tar.bz2/src/icons-local/input-layout-left-right.png Added

bino-1.1.3.tar.bz2/src/icons-local/input-layout-mono.ipe Added

@@ -0,0 +1,245 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202359"/>
+<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.1.3.tar.bz2/src/icons-local/input-layout-mono.png Added

bino-1.1.3.tar.bz2/src/icons-local/input-layout-odd-even-rows.ipe Added

@@ -0,0 +1,279 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813173753"/>
+<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.1.3.tar.bz2/src/icons-local/input-layout-odd-even-rows.png Added

bino-1.1.3.tar.bz2/src/icons-local/input-layout-right-left-half.ipe Added

@@ -0,0 +1,253 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202425"/>
+<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.1.3.tar.bz2/src/icons-local/input-layout-right-left-half.png Added

bino-1.1.3.tar.bz2/src/icons-local/input-layout-right-left.ipe Added

@@ -0,0 +1,253 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202444"/>
+<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.1.3.tar.bz2/src/icons-local/input-layout-right-left.png Added

bino-1.1.3.tar.bz2/src/icons-local/input-layout-separate-left-right.ipe Added

@@ -0,0 +1,260 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202517"/>
+<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.1.3.tar.bz2/src/icons-local/input-layout-separate-left-right.png Added

bino-1.1.3.tar.bz2/src/icons-local/input-layout-separate-right-left.ipe Added

@@ -0,0 +1,260 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202552"/>
+<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.1.3.tar.bz2/src/icons-local/input-layout-separate-right-left.png Added

bino-1.1.3.tar.bz2/src/icons-local/input-layout-top-bottom-half.ipe Added

@@ -0,0 +1,253 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202612"/>
+<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.1.3.tar.bz2/src/icons-local/input-layout-top-bottom-half.png Added

bino-1.1.3.tar.bz2/src/icons-local/input-layout-top-bottom.ipe Added

@@ -0,0 +1,260 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202625"/>
+<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.1.3.tar.bz2/src/icons-local/input-layout-top-bottom.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-amber-blue.ipe Added

@@ -0,0 +1,272 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813182326"/>
+<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.1.3.tar.bz2/src/icons-local/output-type-amber-blue.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-checkerboard.ipe Added

@@ -0,0 +1,573 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813173517"/>
+<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.1.3.tar.bz2/src/icons-local/output-type-checkerboard.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-even-odd-columns.ipe Added

@@ -0,0 +1,293 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813173606"/>
+<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.1.3.tar.bz2/src/icons-local/output-type-even-odd-columns.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-even-odd-rows.ipe Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-even-odd-rows.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-green-magenta.ipe Added

@@ -0,0 +1,272 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813182310"/>
+<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.1.3.tar.bz2/src/icons-local/output-type-green-magenta.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-hdmi-frame-pack.ipe Added

@@ -0,0 +1,245 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813203632"/>
+<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.1.3.tar.bz2/src/icons-local/output-type-hdmi-frame-pack.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-left-right-half.ipe Added

@@ -0,0 +1,253 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202713"/>
+<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.1.3.tar.bz2/src/icons-local/output-type-left-right-half.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-left-right.ipe Added

@@ -0,0 +1,253 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202732"/>
+<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.1.3.tar.bz2/src/icons-local/output-type-left-right.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-mono-left.ipe Added

@@ -0,0 +1,245 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202755"/>
+<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.1.3.tar.bz2/src/icons-local/output-type-mono-left.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-mono-right.ipe Added

@@ -0,0 +1,245 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202810"/>
+<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.1.3.tar.bz2/src/icons-local/output-type-mono-right.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-red-blue.ipe Added

@@ -0,0 +1,272 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813182402"/>
+<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.1.3.tar.bz2/src/icons-local/output-type-red-blue.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-red-cyan.ipe Added

@@ -0,0 +1,272 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813182226"/>
+<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.1.3.tar.bz2/src/icons-local/output-type-red-cyan.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-red-green.ipe Added

@@ -0,0 +1,272 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813182344"/>
+<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.1.3.tar.bz2/src/icons-local/output-type-red-green.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-stereo.ipe Added

@@ -0,0 +1,245 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813174039"/>
+<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.1.3.tar.bz2/src/icons-local/output-type-stereo.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-top-bottom-half.ipe Added

@@ -0,0 +1,253 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202843"/>
+<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.1.3.tar.bz2/src/icons-local/output-type-top-bottom-half.png Added

bino-1.1.3.tar.bz2/src/icons-local/output-type-top-bottom.ipe Added

@@ -0,0 +1,260 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipe SYSTEM "ipe.dtd">
+<ipe version="70010" creator="Ipe 7.0.10">
+<info created="D:20110813152635" modified="D:20110813202859"/>
+<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.1.3.tar.bz2/src/icons-local/output-type-top-bottom.png Added

bino-1.1.1.tar.bz2/src/lib_versions.cpp -> bino-1.1.3.tar.bz2/src/lib_versions.cpp Changed

bino-1.1.1.tar.bz2/src/main.cpp -> bino-1.1.3.tar.bz2/src/main.cpp Changed

@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <cstring>
+#include <cstdlib>
 #include <limits>
 #include <locale.h>
 
@@ -35,6 +36,11 @@
 # include <mach-o/dyld.h> // for _NSGetExecutablePath()
 #endif
 
+#include <QCoreApplication>
+#include <QApplication>
+#include <QtGlobal>
+#include <QTextCodec>
+
 #include "gettext.h"
 #define _(string) gettext(string)
 
@@ -50,7 +56,6 @@
 #if HAVE_LIBLIRCCLIENT
 # include "lirc.h"
 #endif
-#include "qt_app.h"
 #include "lib_versions.h"
 
 
@@ -121,6 +126,25 @@
 #endif
 }
 
+static void qt_msg_handler(QtMsgType type, const char *msg)
+{
+    switch (type)
+    {
+    case QtDebugMsg:
+        msg::dbg("%s", msg);
+        break;
+    case QtWarningMsg:
+        msg::wrn("%s", msg);
+        break;
+    case QtCriticalMsg:
+        msg::err("%s", msg);
+        break;
+    case QtFatalMsg:
+        msg::err("%s", msg);
+        std::abort();
+    }
+}
+
 int main(int argc, char *argv[])
 {
     /* Initialization: gettext */
@@ -136,6 +160,20 @@
     msg::set_columns_from_env();
     dbg::init_crashhandler();
 
+    /* Initialization: Qt */
+#ifdef Q_WS_X11
+    const char *display = getenv("DISPLAY");
+    bool have_display = (display && display[0] != '\0');
+#else
+    bool have_display = true;
+#endif
+    qInstallMsgHandler(qt_msg_handler);
+    QApplication *qt_app = new QApplication(argc, argv, have_display);
+    QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale()); // necessary for i18n via gettext
+    QCoreApplication::setOrganizationName("Bino");
+    QCoreApplication::setOrganizationDomain("bino3d.org");
+    QCoreApplication::setApplicationName(PACKAGE_NAME);
+
     /* Command line handling */
     std::vector<opt::option *> options;
     opt::info help("help", '\0', opt::optional);
@@ -282,7 +320,6 @@
     {
         return 1;
     }
-    set_qt_argv(argc, argv);
     if (version.value())
     {
         msg::req(_("%s version %s"), PACKAGE_NAME, VERSION);
@@ -590,23 +627,30 @@
             throw exc(_("This version of Bino was compiled without support for Equalizer."));
 #endif
         }
-        else if (!no_gui.value())
+        else
         {
-            if (log_level.value() == "")
+            if (!have_display)
             {
-                init_data.log_level = msg::WRN;         // Be silent by default when the GUI is used
+                throw exc(_("Cannot connect to X server."));
             }
-            init_data.fullscreen = false;               // GUI overrides fullscreen setting
-            init_data.center = false;                   // GUI overrides center flag
-            player = new class player_qt();
-        }
-        else
-        {
-            if (arguments.size() == 0)
+            else if (!no_gui.value())
             {
-                throw exc(_("No video to play."));
+                if (log_level.value() == "")
+                {
+                    init_data.log_level = msg::WRN;         // Be silent by default when the GUI is used
+                }
+                init_data.fullscreen = false;               // GUI overrides fullscreen setting
+                init_data.center = false;                   // GUI overrides center flag
+                player = new class player_qt();
+            }
+            else
+            {
+                if (arguments.size() == 0)
+                {
+                    throw exc(_("No video to play."));
+                }
+                player = new class player();
             }
-            player = new class player();
         }
         player->open(init_data);
         player->run();
@@ -626,5 +670,7 @@
     lirc.deinit();
 #endif
 
+    delete qt_app;
+
     return retval;
 }

bino-1.1.1.tar.bz2/src/media_object.cpp -> bino-1.1.3.tar.bz2/src/media_object.cpp Changed

@@ -315,7 +315,8 @@
 }
 
 
-media_object::media_object() : _ffmpeg(NULL)
+media_object::media_object(bool always_convert_to_bgra32) :
+    _always_convert_to_bgra32(always_convert_to_bgra32), _ffmpeg(NULL)
 {
     avdevice_register_all();
     av_register_all();
@@ -382,9 +383,10 @@
     video_frame_template.color_space = video_frame::srgb;
     video_frame_template.value_range = video_frame::u8_full;
     video_frame_template.chroma_location = video_frame::center;
-    if (video_codec_ctx->pix_fmt == PIX_FMT_YUV444P
-            || video_codec_ctx->pix_fmt == PIX_FMT_YUV422P
-            || video_codec_ctx->pix_fmt == PIX_FMT_YUV420P)
+    if (!_always_convert_to_bgra32
+            && (video_codec_ctx->pix_fmt == PIX_FMT_YUV444P
+                || video_codec_ctx->pix_fmt == PIX_FMT_YUV422P
+                || video_codec_ctx->pix_fmt == PIX_FMT_YUV420P))
     {
         if (video_codec_ctx->pix_fmt == PIX_FMT_YUV444P)
         {
@@ -418,9 +420,10 @@
             video_frame_template.chroma_location = video_frame::topleft;
         }
     }
-    else if (video_codec_ctx->pix_fmt == PIX_FMT_YUVJ444P
-            || video_codec_ctx->pix_fmt == PIX_FMT_YUVJ422P
-            || video_codec_ctx->pix_fmt == PIX_FMT_YUVJ420P)
+    else if (!_always_convert_to_bgra32
+            && (video_codec_ctx->pix_fmt == PIX_FMT_YUVJ444P
+                || video_codec_ctx->pix_fmt == PIX_FMT_YUVJ422P
+                || video_codec_ctx->pix_fmt == PIX_FMT_YUVJ420P))
     {
         if (video_codec_ctx->pix_fmt == PIX_FMT_YUVJ444P)
         {
@@ -551,6 +554,62 @@
         val = tag_value("StereoscopicHalfHeight");
         video_frame_template.stereo_layout = (val == "1" ? video_frame::top_bottom_half : video_frame::top_bottom);
     }
+    /* Check the Matroska StereoMode metadata, which is translated by FFmpeg to a "stereo_mode" tag.
+     * This tag is per-track, not per-file!
+     * This tag is the most reliable source of information about the stereo layout and should be used
+     * by everyone. Unfortunately, we still have to look at the resolution to guess whether we have
+     * a reduced resolution (*_half) stereo layout. */
+    val = "";
+    AVDictionaryEntry *tag = NULL;
+    while ((tag = av_dict_get(video_stream->metadata, "", tag, AV_DICT_IGNORE_SUFFIX)))
+    {
+        if (std::string(tag->key) == "stereo_mode")
+        {
+            val = tag->value;
+            break;
+        }
+    }
+    if (val == "mono")
+    {
+        video_frame_template.stereo_layout = video_frame::mono;
+        video_frame_template.stereo_layout_swap = false;
+    }
+    else if (val == "left_right" || val == "right_left")
+    {
+        if (video_frame_template.raw_width / 2 > video_frame_template.raw_height)
+        {
+            video_frame_template.stereo_layout = video_frame::left_right;
+        }
+        else
+        {
+            video_frame_template.stereo_layout = video_frame::left_right_half;
+        }
+        video_frame_template.stereo_layout_swap = (val == "right_left");
+    }
+    else if (val == "top_bottom" || val == "bottom_top")
+    {
+        if (video_frame_template.raw_height > video_frame_template.raw_width)
+        {
+            video_frame_template.stereo_layout = video_frame::top_bottom;
+        }
+        else
+        {
+            video_frame_template.stereo_layout = video_frame::top_bottom_half;
+        }
+        video_frame_template.stereo_layout_swap = (val == "bottom_top");
+    }
+    else if (val == "row_interleaved_lr" || val == "row_interleaved_rl")
+    {
+        video_frame_template.stereo_layout = video_frame::even_odd_rows;
+        video_frame_template.stereo_layout_swap = (val == "row_interleaved_rl");
+    }
+    else if (!val.empty())
+    {
+        msg::wrn(_("%s video stream %d: Unsupported stereo layout %s."),
+                _url.c_str(), index + 1, str::sanitize(val).c_str());
+        video_frame_template.stereo_layout = video_frame::mono;
+        video_frame_template.stereo_layout_swap = false;
+    }
     /* Sanity checks. If these fail, use safe fallback */
     if (((video_frame_template.stereo_layout == video_frame::left_right
                     || video_frame_template.stereo_layout == video_frame::left_right_half)
@@ -574,7 +633,7 @@
     AVCodecContext *audio_codec_ctx = _ffmpeg->audio_codec_ctxs[index];
     audio_blob &audio_blob_template = _ffmpeg->audio_blob_templates[index];
 
-    AVMetadataTag *tag = av_metadata_get(audio_stream->metadata, "language", NULL, AV_METADATA_IGNORE_SUFFIX);
+    AVDictionaryEntry *tag = av_dict_get(audio_stream->metadata, "language", NULL, AV_DICT_IGNORE_SUFFIX);
     if (tag)
     {
         audio_blob_template.language = tag->value;
@@ -624,7 +683,7 @@
     //AVCodecContext *subtitle_codec_ctx = _ffmpeg->subtitle_codec_ctxs[index];
     subtitle_box &subtitle_box_template = _ffmpeg->subtitle_box_templates[index];
 
-    AVMetadataTag *tag = av_metadata_get(subtitle_stream->metadata, "language", NULL, AV_METADATA_IGNORE_SUFFIX);
+    AVDictionaryEntry *tag = av_dict_get(subtitle_stream->metadata, "language", NULL, AV_DICT_IGNORE_SUFFIX);
     if (tag)
     {
         subtitle_box_template.language = tag->value;
@@ -643,16 +702,11 @@
 
     /* Set format and parameters for device input */
     AVInputFormat *iformat = NULL;
-    AVFormatParameters iparams;
-    std::memset(&iparams, 0, sizeof(iparams));
-    iparams.pix_fmt = PIX_FMT_NONE;
-    bool use_iparams = false;
+    AVDictionary *iparams = NULL;
     switch (dev_request.device)
     {
     case device_request::firewire:
         iformat = av_find_input_format("libdc1394");
-        // libdc1394 requires pix_fmt = PIX_FMT_NONE to choose a suitable default pixel format.
-        use_iparams = true;
         break;
     case device_request::x11:
         iformat = av_find_input_format("x11grab");
@@ -660,22 +714,10 @@
     case device_request::sys_default:
 #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
         iformat = av_find_input_format("vfwcap");
-        // vfwcap requires a time_base parameter. Set the default to 1/25.
-        iparams.time_base.num = 1;
-        iparams.time_base.den = 25;
-        use_iparams = true;
 #elif defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined __APPLE__
         iformat = av_find_input_format("bktr");
-        // bktr requires width, height, time_base parameters.
-        // Set the defaults to 640x480 and 1/25.
-        iparams.width = 640;
-        iparams.height = 480;
-        iparams.time_base.num = 1;
-        iparams.time_base.den = 25;
-        use_iparams = true;
 #else
         iformat = av_find_input_format("video4linux2");
-        // video4linux2 can use default parameters.
 #endif
         break;
     case device_request::no_device:
@@ -688,30 +730,26 @@
                 : dev_request.device == device_request::x11 ? _("X11")
                 : _("default")));
     }
-    if (_is_device
-            && ((dev_request.width != 0 && dev_request.height != 0)
-                || (dev_request.frame_rate_num != 0 && dev_request.frame_rate_den != 0)))
+    if (_is_device && dev_request.width != 0 && dev_request.height != 0)
     {
-        use_iparams = true;
-        if (dev_request.width != 0 && dev_request.height != 0)
-        {
-            iparams.width = dev_request.width;
-            iparams.height = dev_request.height;
-        }
-        if (dev_request.frame_rate_num != 0 && dev_request.frame_rate_den != 0)
-        {
-            iparams.time_base.den = dev_request.frame_rate_num;
-            iparams.time_base.num = dev_request.frame_rate_den;
-        }
+        av_dict_set(&iparams, "video_size", str::asprintf("%dx%d",
+                    dev_request.width, dev_request.height).c_str(), 0);
+    }
+    if (_is_device && dev_request.frame_rate_num != 0 && dev_request.frame_rate_den != 0)
+    {
+        av_dict_set(&iparams, "framerate", str::asprintf("%d/%d",
+                    dev_request.frame_rate_num, dev_request.frame_rate_den).c_str(), 0);
     }
 
     /* Open the input */
-    if ((e = av_open_input_file(&_ffmpeg->format_ctx, _url.c_str(), iformat, 0,
-                    use_iparams ? &iparams : NULL)) != 0)
+    _ffmpeg->format_ctx = NULL;
+    if ((e = avformat_open_input(&_ffmpeg->format_ctx, _url.c_str(), iformat, &iparams)) != 0)
     {
+        av_dict_free(&iparams);
         throw exc(str::asprintf(_("%s: %s"),
                     _url.c_str(), my_av_strerror(e).c_str()));
     }
+    av_dict_free(&iparams);

bino-1.1.1.tar.bz2/src/media_object.h -> bino-1.1.3.tar.bz2/src/media_object.h Changed

bino-1.1.1.tar.bz2/src/player.cpp -> bino-1.1.3.tar.bz2/src/player.cpp Changed

@@ -152,6 +152,9 @@
     _pause_request = false;
     _seek_request = 0;
     _set_pos_request = -1.0f;
+    _video_frame = video_frame();
+    _current_subtitle_box = subtitle_box();
+    _next_subtitle_box = subtitle_box();
 }
 
 void player::stop_playback()
@@ -174,11 +177,21 @@
     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);
@@ -685,6 +698,10 @@
     }
     if (prep_frame)
     {
+        if (_current_subtitle_box.is_valid() && _video_output)
+        {
+            _master_time_start += _video_output->wait_for_subtitle_renderer();
+        }
         _video_output->prepare_next_frame(_video_frame, _current_subtitle_box);
     }
     else if (drop_frame)
@@ -716,13 +733,13 @@
     if (_audio_output)
     {
         try { _audio_output->deinit(); } catch (...) {}
-        delete _audio_output;
+        destroy_audio_output(_audio_output);
         _audio_output = NULL;
     }
     if (_video_output)
     {
         try { _video_output->deinit(); } catch (...) {}
-        delete _video_output;
+        destroy_video_output(_video_output);
         _video_output = NULL;
     }
     if (_media_input)

bino-1.1.1.tar.bz2/src/player.h -> bino-1.1.3.tar.bz2/src/player.h Changed

bino-1.1.1.tar.bz2/src/player_equalizer.cpp -> bino-1.1.3.tar.bz2/src/player_equalizer.cpp Changed

@@ -75,12 +75,21 @@
         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;
+    }
+
 public:
     player_eq_node() : player(player::slave), _is_master(false)
     {
@@ -176,6 +185,26 @@
     void trigger_resize(int, int) { }
 
 public:
+    int64_t wait_for_subtitle_renderer()
+    {
+        if (!_subtitle_renderer.is_initialized())
+        {
+            msg::wrn(_("Waiting for subtitle renderer initialization..."));
+            try
+            {
+                while (!_subtitle_renderer.is_initialized())
+                {
+                    usleep(10000);
+                }
+            }
+            catch (std::exception &e)
+            {
+                msg::err("%s", e.what());
+                abort();
+            }
+        }
+        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; }
@@ -999,6 +1028,10 @@
         if (node->frame_data.prep_frame)
         {
             getWindow()->makeCurrent();
+            if (node->frame_data.subtitle.is_valid())
+            {
+                _video_output.wait_for_subtitle_renderer();
+            }
             _video_output.prepare_next_frame(node->get_video_frame(), node->frame_data.subtitle);
         }
         if (node->frame_data.display_frame)

bino-1.1.1.tar.bz2/src/player_qt.cpp -> bino-1.1.3.tar.bz2/src/player_qt.cpp Changed

@@ -64,7 +64,6 @@
 #define _(string) gettext(string)
 
 #include "player_qt.h"
-#include "qt_app.h"
 #include "video_output_qt.h"
 #include "lib_versions.h"
 
@@ -81,8 +80,8 @@
 }
 
 
-player_qt_internal::player_qt_internal(bool benchmark, video_container_widget *widget) :
-    player(player::master), _benchmark(benchmark), _playing(false), _container_widget(widget), _video_output(NULL)
+player_qt_internal::player_qt_internal(video_output_qt *video_output) :
+    player(player::master), _playing(false), _video_output(video_output)
 {
 }
 
@@ -92,10 +91,14 @@
 
 video_output *player_qt_internal::create_video_output()
 {
-    _video_output = new video_output_qt(_benchmark, _container_widget);
     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)
@@ -186,19 +189,19 @@
     layout1->addWidget(input_label, 0, 0);
     _input_combobox = new QComboBox(this);
     _input_combobox->setToolTip(input_label->toolTip());
-    _input_combobox->addItem(_("2D"));
-    _input_combobox->addItem(_("Separate streams, left first"));
-    _input_combobox->addItem(_("Separate streams, right first"));
-    _input_combobox->addItem(_("Top/bottom"));
-    _input_combobox->addItem(_("Top/bottom, half height"));
-    _input_combobox->addItem(_("Bottom/top"));
-    _input_combobox->addItem(_("Bottom/top, half height"));
-    _input_combobox->addItem(_("Left/right"));
-    _input_combobox->addItem(_("Left/right, half width"));
-    _input_combobox->addItem(_("Right/left"));
-    _input_combobox->addItem(_("Right/left, half width"));
-    _input_combobox->addItem(_("Even/odd rows"));
-    _input_combobox->addItem(_("Odd/even rows"));
+    _input_combobox->addItem(QIcon(":icons-local/input-layout-mono.png"), _("2D"));
+    _input_combobox->addItem(QIcon(":icons-local/input-layout-separate-left-right.png"), _("Separate streams, left first"));
+    _input_combobox->addItem(QIcon(":icons-local/input-layout-separate-right-left.png"), _("Separate streams, right first"));
+    _input_combobox->addItem(QIcon(":icons-local/input-layout-top-bottom.png"), _("Top/bottom"));
+    _input_combobox->addItem(QIcon(":icons-local/input-layout-top-bottom-half.png"), _("Top/bottom, half height"));
+    _input_combobox->addItem(QIcon(":icons-local/input-layout-bottom-top.png"), _("Bottom/top"));
+    _input_combobox->addItem(QIcon(":icons-local/input-layout-bottom-top-half.png"), _("Bottom/top, half height"));
+    _input_combobox->addItem(QIcon(":icons-local/input-layout-left-right.png"), _("Left/right"));
+    _input_combobox->addItem(QIcon(":icons-local/input-layout-left-right-half.png"), _("Left/right, half width"));
+    _input_combobox->addItem(QIcon(":icons-local/input-layout-right-left.png"), _("Right/left"));
+    _input_combobox->addItem(QIcon(":icons-local/input-layout-right-left-half.png"), _("Right/left, half width"));
+    _input_combobox->addItem(QIcon(":icons-local/input-layout-even-odd-rows.png"), _("Even/odd rows"));
+    _input_combobox->addItem(QIcon(":icons-local/input-layout-odd-even-rows.png"), _("Odd/even rows"));
     connect(_input_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(input_changed()));
     layout1->addWidget(_input_combobox, 0, 1);
     layout1->setColumnStretch(1, 1);
@@ -209,31 +212,31 @@
     layout2->addWidget(output_label, 0, 0);
     _output_combobox = new QComboBox(this);
     _output_combobox->setToolTip(output_label->toolTip());
-    _output_combobox->addItem(_("Left view"));
-    _output_combobox->addItem(_("Right view"));
-    _output_combobox->addItem(_("OpenGL stereo"));
-    _output_combobox->addItem(_("Top/bottom"));
-    _output_combobox->addItem(_("Top/bottom, half height"));
-    _output_combobox->addItem(_("Left/right"));
-    _output_combobox->addItem(_("Left/right, half width"));
-    _output_combobox->addItem(_("Even/odd rows"));
-    _output_combobox->addItem(_("Even/odd columns"));
-    _output_combobox->addItem(_("Checkerboard pattern"));
-    _output_combobox->addItem(_("HDMI frame packing mode"));
-    _output_combobox->addItem(_("Red/cyan glasses, monochrome method"));
-    _output_combobox->addItem(_("Red/cyan glasses, half-color method"));
-    _output_combobox->addItem(_("Red/cyan glasses, full-color method"));
-    _output_combobox->addItem(_("Red/cyan glasses, high-quality Dubois method"));
-    _output_combobox->addItem(_("Green/magenta glasses, monochrome method"));
-    _output_combobox->addItem(_("Green/magenta glasses, half-color method"));
-    _output_combobox->addItem(_("Green/magenta glasses, full-color method"));
-    _output_combobox->addItem(_("Green/magenta glasses, high-quality Dubois method"));
-    _output_combobox->addItem(_("Amber/blue glasses, monochrome method"));
-    _output_combobox->addItem(_("Amber/blue glasses, half-color method"));
-    _output_combobox->addItem(_("Amber/blue glasses, full-color method"));
-    _output_combobox->addItem(_("Amber/blue glasses, high-quality Dubois method"));
-    _output_combobox->addItem(_("Red/green glasses, monochrome method"));
-    _output_combobox->addItem(_("Red/blue glasses, monochrome method"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-mono-left.png"), _("Left view"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-mono-right.png"), _("Right view"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-stereo.png"), _("OpenGL stereo"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-top-bottom.png"), _("Top/bottom"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-top-bottom-half.png"), _("Top/bottom, half height"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-left-right.png"), _("Left/right"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-left-right-half.png"), _("Left/right, half width"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-even-odd-rows.png"), _("Even/odd rows"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-even-odd-columns.png"), _("Even/odd columns"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-checkerboard.png"), _("Checkerboard pattern"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-hdmi-frame-pack.png"), _("HDMI frame packing mode"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, monochrome method"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, half-color method"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, full-color method"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-red-cyan.png"), _("Red/cyan glasses, high-quality Dubois method"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, monochrome method"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, half-color method"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, full-color method"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-green-magenta.png"), _("Green/magenta glasses, high-quality Dubois method"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, monochrome method"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, half-color method"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, full-color method"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-amber-blue.png"), _("Amber/blue glasses, high-quality Dubois method"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-red-green.png"), _("Red/green glasses, monochrome method"));
+    _output_combobox->addItem(QIcon(":icons-local/output-type-red-blue.png"), _("Red/blue glasses, monochrome method"));
     connect(_output_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(output_changed()));
     layout2->addWidget(_output_combobox, 0, 1);
     layout2->setColumnStretch(1, 1);
@@ -734,86 +737,100 @@
 }
 
 
-controls_widget::controls_widget(QSettings *settings, QWidget *parent, const player_init_data &init_data)
+controls_widget::controls_widget(QSettings *settings, const player_init_data &init_data, QWidget *parent)
     : QWidget(parent), _lock(false), _settings(settings), _playing(false)
 {
-    QGridLayout *layout = new QGridLayout;
+    QGridLayout *row0_layout = new QGridLayout;
     _seek_slider = new QSlider(Qt::Horizontal);
     _seek_slider->setToolTip(_("<p>This slider shows the progress during video playback, "
                 "and can be used to seek in the video.</p>"));
     _seek_slider->setRange(0, 2000);
     _seek_slider->setTracking(false);
     connect(_seek_slider, SIGNAL(valueChanged(int)), this, SLOT(seek_slider_changed()));
-    layout->addWidget(_seek_slider, 0, 0, 1, 15);
+    row0_layout->addWidget(_seek_slider, 0, 0);
+    _pos_label = new QLabel("0:00");
+    _pos_label->setToolTip(_("<p>Elapsed / total time.</p>"));
+    _pos_label->setAlignment(Qt::AlignRight);
+    _pos_label->setTextFormat(Qt::PlainText);
+    _pos_label->setFrameShape(QFrame::StyledPanel);
+    _pos_label->setMinimumSize(QSize(0, 0));
+    row0_layout->addWidget(_pos_label, 0, 1);
+    row0_layout->setColumnStretch(0, 1);
+
+    QGridLayout *row1_layout = new QGridLayout;
     _play_button = new QPushButton(get_icon("media-playback-start"), "");
     _play_button->setToolTip(_("<p>Play.</p>"));
     connect(_play_button, SIGNAL(pressed()), this, SLOT(play_pressed()));
-    layout->addWidget(_play_button, 1, 0);
+    row1_layout->addWidget(_play_button, 1, 0);
     _pause_button = new QPushButton(get_icon("media-playback-pause"), "");
     _pause_button->setToolTip(_("<p>Pause.</p>"));
     connect(_pause_button, SIGNAL(pressed()), this, SLOT(pause_pressed()));
-    layout->addWidget(_pause_button, 1, 1);
+    row1_layout->addWidget(_pause_button, 1, 1);
     _stop_button = new QPushButton(get_icon("media-playback-stop"), "");
     _stop_button->setToolTip(_("<p>Stop.</p>"));
     connect(_stop_button, SIGNAL(pressed()), this, SLOT(stop_pressed()));
-    layout->addWidget(_stop_button, 1, 2);
-    layout->addWidget(new QWidget, 1, 3);
+    row1_layout->addWidget(_stop_button, 1, 2);
+    row1_layout->addWidget(new QWidget, 1, 3);
     _loop_button = new QPushButton(get_icon("media-playlist-repeat"), "");
     _loop_button->setToolTip(_("<p>Toggle loop mode.</p>"));
     _loop_button->setCheckable(true);
     _loop_button->setChecked(init_data.params.loop_mode != parameters::no_loop);
     connect(_loop_button, SIGNAL(toggled(bool)), this, SLOT(loop_pressed()));
-    layout->addWidget(_loop_button, 1, 4);
-    layout->addWidget(new QWidget, 1, 5);
+    row1_layout->addWidget(_loop_button, 1, 4);
+    row1_layout->addWidget(new QWidget, 1, 5);
     _fullscreen_button = new QPushButton(get_icon("view-fullscreen"), "");
     _fullscreen_button->setToolTip(_("<p>Switch to fullscreen mode. "
                 "You can leave fullscreen mode by pressing the f key.</p>"));
     _fullscreen_button->setCheckable(true);
     connect(_fullscreen_button, SIGNAL(pressed()), this, SLOT(fullscreen_pressed()));
-    layout->addWidget(_fullscreen_button, 1, 6);
+    row1_layout->addWidget(_fullscreen_button, 1, 6);
     _center_button = new QPushButton(get_icon("view-restore"), "");
     _center_button->setToolTip(_("<p>Center the video area on your screen.</p>"));
     connect(_center_button, SIGNAL(pressed()), this, SLOT(center_pressed()));
-    layout->addWidget(_center_button, 1, 7);
-    layout->addWidget(new QWidget, 1, 8);
+    row1_layout->addWidget(_center_button, 1, 7);
+    row1_layout->addWidget(new QWidget, 1, 8);
     _bbb_button = new QPushButton(get_icon("media-seek-backward"), "");
     _bbb_button->setFixedSize(_bbb_button->minimumSizeHint());
     _bbb_button->setIconSize(_bbb_button->iconSize() * 12 / 10);
     _bbb_button->setToolTip(_("<p>Seek backward 10 minutes.</p>"));
     connect(_bbb_button, SIGNAL(pressed()), this, SLOT(bbb_pressed()));
-    layout->addWidget(_bbb_button, 1, 9);
+    row1_layout->addWidget(_bbb_button, 1, 9);

bino-1.1.1.tar.bz2/src/player_qt.h -> bino-1.1.3.tar.bz2/src/player_qt.h Changed

@@ -46,16 +46,15 @@
 class player_qt_internal : public player, public controller
 {
 private:
-    bool _benchmark;
     bool _playing;
-    video_container_widget *_container_widget;
     video_output_qt *_video_output;
 
 protected:
     virtual video_output *create_video_output();
+    virtual void destroy_video_output(video_output *vo);
 
 public:
-    player_qt_internal(bool benchmark, video_container_widget *widget);
+    player_qt_internal(video_output_qt *video_output);
     virtual ~player_qt_internal();
 
     virtual void receive_cmd(const command &cmd);
@@ -116,6 +115,7 @@
     Q_OBJECT
 
 private:
+    int64_t _input_duration;
     bool _lock;
     QSettings *_settings;
     QPushButton *_play_button;
@@ -131,6 +131,7 @@
     QPushButton *_ff_button;
     QPushButton *_fff_button;
     QSlider *_seek_slider;
+    QLabel *_pos_label;
     bool _playing;
 
 private slots:
@@ -149,10 +150,10 @@
     void seek_slider_changed();
 
 public:
-    controls_widget(QSettings *settings, QWidget *parent, const player_init_data &init_data);
+    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);
+    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);
 };
 
@@ -304,6 +305,7 @@
 private:
     QSettings *_settings;
     video_container_widget *_video_container_widget;
+    video_output_qt *_video_output;
     in_out_widget *_in_out_widget;
     controls_widget *_controls_widget;
     color_dialog *_color_dialog;
@@ -353,7 +355,6 @@
 class player_qt : public player
 {
 private:
-    bool _qt_app_owner;
     main_window *_main_window;
     QSettings *_settings;

bino-1.1.1.tar.bz2/src/subtitle_renderer.cpp -> bino-1.1.3.tar.bz2/src/subtitle_renderer.cpp Changed

@@ -4,6 +4,7 @@
  * Copyright (C) 2011
  * Martin Lambers <marlam@marlam.de>
  * Joe <cuchac@email.cz>
+ * 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
@@ -32,6 +33,9 @@
 #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
 # include <windows.h>
 #endif
+#if defined __APPLE__
+# include <unistd.h>
+#endif
 
 extern "C"
 {
@@ -41,6 +45,7 @@
 #include "gettext.h"
 #define _(string) gettext(string)
 
+#include "dbg.h"
 #include "exc.h"
 #include "str.h"
 #include "blob.h"
@@ -50,6 +55,17 @@
 #include "subtitle_renderer.h"
 
 
+subtitle_renderer_initializer::subtitle_renderer_initializer(subtitle_renderer &renderer) :
+    _subtitle_renderer(renderer)
+{
+}
+
+void subtitle_renderer_initializer::run()
+{
+    _subtitle_renderer.init();
+}
+
+
 /* Rendering subtitles with LibASS is not thread-safe.
  *
  * We have multiple concurrent subtitle rendering threads if we are running from Equalizer
@@ -66,16 +82,28 @@
 static mutex global_libass_mutex;
 
 subtitle_renderer::subtitle_renderer() :
-    _ass_initialized(false),
+    _initializer(*this),
+    _initialized(false),
     _fontconfig_conffile(NULL),
     _ass_library(NULL),
     _ass_renderer(NULL),
     _ass_track(NULL)
 {
+    _initializer.start();
 }
 
 subtitle_renderer::~subtitle_renderer()
 {
+    if (_initializer.is_running())
+    {
+        try
+        {
+            _initializer.cancel();
+        }
+        catch (...)
+        {
+        }
+    }
     if (_ass_track)
     {
         ass_free_track(_ass_track);
@@ -94,59 +122,26 @@
     }
 }
 
-bool subtitle_renderer::render_to_display_size(const subtitle_box &box) const
-{
-    return (box.format != subtitle_box::image);
-}
-
-void subtitle_renderer::prerender(const subtitle_box &box, int64_t timestamp,
-        const parameters &params,
-        int width, int height, float pixel_aspect_ratio,
-        int &bb_x, int &bb_y, int &bb_w, int &bb_h)
-{
-    _fmt = box.format;
-    switch (_fmt)
-    {
-    case subtitle_box::text:
-    case subtitle_box::ass:
-        init_ass();
-        prerender_ass(box, timestamp, params, width, height, pixel_aspect_ratio);
-        break;
-    case subtitle_box::image:
-        prerender_img(box);
-        break;
-    }
-    bb_x = _bb_x;
-    bb_y = _bb_y;
-    bb_w = _bb_w;
-    bb_h = _bb_h;
-}
-
-void subtitle_renderer::render(uint32_t *bgra32_buffer)
+static void libass_msg_callback(int level, const char *fmt, va_list args, void *)
 {
-    switch (_fmt)
-    {
-    case subtitle_box::text:
-    case subtitle_box::ass:
-        render_ass(bgra32_buffer);
-        break;
-    case subtitle_box::image:
-        render_img(bgra32_buffer);
-        break;
-    }
+    msg::level_t msg_levels[8] = { msg::ERR, msg::ERR, msg::WRN, msg::WRN, msg::WRN, msg::INF, msg::DBG, msg::DBG };
+    msg::level_t l = (level < 0 || level > 7 ? msg::ERR : msg_levels[level]);
+    std::string s = str::vasprintf(fmt, args);
+    msg::msg(l, std::string("LibASS: ") + s);
 }
 
 const char *subtitle_renderer::get_fontconfig_conffile()
 {
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __APPLE__
     /* Fontconfig annoyingly requires a configuration file, but there is no
-     * default location for it on Windows. So we just create a temporary one.
-     * Note that due to lack of mkstemp() on Windows, this code has race
-     * conditions. Note also that if something goes wrong and we return NULL
-     * here, the application will likely crash when we try to render a subtitle. */
+     * default location for it on Windows or Mac OS X. So we just create a temporary one.
+     * Note that if something goes wrong and we return NULL here, the application will
+     * likely crash when trying to render a subtitle. */
+    FILE *f;
+# if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__)
+    /* Note that due to lack of mkstemp() on Windows, this code has race conditions. */
     char tmppathname[MAX_PATH];
     static char tmpfilename[MAX_PATH];
-    FILE *f;
     DWORD ret;
     ret = GetTempPath(MAX_PATH, tmppathname);
     if (ret > MAX_PATH || ret == 0)
@@ -155,14 +150,38 @@
         return NULL;
     if (!(f = fopen(tmpfilename, "w")))
         return NULL;
+# else /* __APPLE__ */
+    static char tmpfilename[] = "/tmp/fontsXXXXXX.conf";
+    int d = mkstemps(tmpfilename, 5);
+    if (d == -1)
+        return NULL;
+    if (!(f = fdopen(d, "w")))
+        return NULL;
+# endif
     fprintf(f,
             "<?xml version=\"1.0\"?>\n"
             "<!DOCTYPE fontconfig SYSTEM \"fonts.dtd\">\n"
             "<fontconfig>\n"
+# if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__)
             "<dir>WINDOWSFONTDIR</dir>\n"
             "<dir>~/.fonts</dir>\n"
             "<cachedir>WINDOWSTEMPDIR_FONTCONFIG_CACHE</cachedir>\n"
             "<cachedir>~/.fontconfig</cachedir>\n"
+# else /* __APPLE__ */
+            "<dir>/usr/share/fonts</dir>\n"
+            "<dir>/usr/X11/lib/X11/fonts</dir>\n"
+            "<dir>/usr/X11/share/fonts</dir>\n"
+            "<dir>/opt/X11/share/fonts</dir>\n"
+            "<dir>/Library/Fonts</dir>\n"
+            "<dir>/Network/Library/Fonts</dir>\n"
+            "<dir>/System/Library/Fonts</dir>\n"
+            "<dir>~/Library/Application Support/Bino/fonts</dir>\n"
+            "<cachedir>/var/cache/fontconfig</cachedir>\n"
+            "<cachedir>/usr/X11/var/cache/fontconfig</cachedir>\n"
+            "<cachedir>/opt/X11/var/cache/fontconfig</cachedir>\n"
+            "<cachedir>~/Library/Application Support/Bino/cache/fonts</cachedir>\n"
+            "<cachedir>~/.fontconfig</cachedir>\n"
+# endif
             "<config>\n"
             "<blank>\n"
             "<int>0x0020</int> <int>0x00A0</int> <int>0x00AD</int> <int>0x034F</int> <int>0x0600</int>\n"
@@ -184,69 +203,107 @@
     fclose(f);
     return tmpfilename;
 #else
+    /* Systems other than Windows and Mac OS are expected to have a default
+     * fontconfig configuration file so that we can simply return NULL. */
     return NULL;
 #endif
 }
 
-static void libass_msg_callback(int level, const char *fmt, va_list args, void *)
+void subtitle_renderer::init()
 {
-    msg::level_t l;
-    switch (level)

bino-1.1.1.tar.bz2/src/subtitle_renderer.h -> bino-1.1.3.tar.bz2/src/subtitle_renderer.h Changed

@@ -31,15 +31,35 @@
 #include <ass/ass.h>
 }
 
+#include "thread.h"
+
 #include "media_data.h"
 
 
+class subtitle_renderer;
+
+class subtitle_renderer_initializer : public thread
+{
+private:
+    subtitle_renderer &_subtitle_renderer;
+
+public:
+    subtitle_renderer_initializer(subtitle_renderer &renderer);
+    void run();
+};
+
 class subtitle_renderer
 {
 private:
-    // Static ASS data
-    bool _ass_initialized;
+    // Initialization
+    subtitle_renderer_initializer _initializer;
+    bool _initialized;
     const char *_fontconfig_conffile;
+    const char *get_fontconfig_conffile();
+    void init();
+    friend class subtitle_renderer_initializer;
+
+    // Static ASS data
     ASS_Library *_ass_library;
     ASS_Renderer *_ass_renderer;
 
@@ -51,8 +71,6 @@
     int _bb_x, _bb_y, _bb_w, _bb_h;
 
     // ASS helper functions
-    const char *get_fontconfig_conffile();
-    void init_ass();
     void blend_ass_image(const ASS_Image *img, uint32_t *buf);
     void set_ass_parameters(const parameters &params);
 
@@ -70,6 +88,15 @@
     subtitle_renderer();
     ~subtitle_renderer();
 
+    // Check if the subtitle renderer is initialized. Since initialization may
+    // take a long time on systems where fontconfig needs to create its cache first,
+    // it is done in a separate thread in the background.
+    // You must make sure that the renderer is initialized before calling any of
+    // the functions below!
+    // In the case of initialization failure, this function will throw the appropriate
+    // exception.
+    bool is_initialized();
+
     /*
      * To render a subtitle, the following steps are necessary:
      * 1. Call render_to_display_size() to determine if the subtitle

bino-1.1.1.tar.bz2/src/video_output.cpp -> bino-1.1.3.tar.bz2/src/video_output.cpp Changed

bino-1.1.1.tar.bz2/src/video_output.h -> bino-1.1.3.tar.bz2/src/video_output.h Changed

@@ -36,7 +36,6 @@
 class video_output : public controller
 {
 private:
-    subtitle_renderer _subtitle_renderer;
     bool _initialized;
     bool _srgb_textures_are_broken;     // XXX: Hack: work around broken SRGB texture implementations
 
@@ -95,6 +94,8 @@
     void update_subtitle_tex(int index, const video_frame &frame, const subtitle_box &subtitle, const parameters &params);
 
 protected:
+    subtitle_renderer _subtitle_renderer;
+
     // 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.
@@ -129,6 +130,10 @@
 
     /* Initialize the video output, or throw an exception */
     virtual void init();
+    /* Wait for subtitle renderer initialization to finish. Has to be called
+     * if the video has subtitles. Returns the number of microseconds that the
+     * waiting took. */
+    virtual int64_t wait_for_subtitle_renderer() = 0;
     /* Deinitialize the video output */
     virtual void deinit();

bino-1.1.1.tar.bz2/src/video_output_qt.cpp -> bino-1.1.3.tar.bz2/src/video_output_qt.cpp Changed

@@ -30,6 +30,7 @@
 
 #include <cmath>
 #include <cstdlib>
+#include <unistd.h>
 
 #include <QApplication>
 #include <QDesktopWidget>
@@ -38,6 +39,9 @@
 #include <QIcon>
 #include <QMessageBox>
 #include <QPalette>
+#include <QProcess>
+#include <QDialog>
+#include <QLabel>
 #ifdef Q_WS_X11
 # include <QX11Info>
 # include <X11/Xlib.h>
@@ -50,8 +54,8 @@
 #include "msg.h"
 #include "str.h"
 #include "dbg.h"
+#include "timer.h"
 
-#include "qt_app.h"
 #include "video_output_qt.h"
 #include "lib_versions.h"
 
@@ -269,14 +273,12 @@
 
 video_output_qt::video_output_qt(bool benchmark, video_container_widget *container_widget) :
     video_output(),
-    _qt_app_owner(false),
     _container_widget(container_widget),
     _container_is_external(container_widget != NULL),
     _widget(NULL),
     _fullscreen(false),
     _playing(false)
 {
-    _qt_app_owner = init_qt();
     if (!_container_widget)
     {
         _container_widget = new video_container_widget(NULL);
@@ -296,10 +298,6 @@
     {
         delete _container_widget;
     }
-    if (_qt_app_owner)
-    {
-        exit_qt();
-    }
 }
 
 void video_output_qt::init()
@@ -328,6 +326,58 @@
     }
 }
 
+int64_t video_output_qt::wait_for_subtitle_renderer()
+{
+    if (_subtitle_renderer.is_initialized())
+    {
+        return 0;
+    }
+    int64_t wait_start = timer::get_microseconds(timer::monotonic);
+    exc init_exception;
+    QDialog *mbox = NULL;
+    // Show a dialog only in GUI mode
+    if (_container_is_external && !_fullscreen)
+    {
+        mbox = new QDialog(_container_widget);
+        mbox->setModal(true);
+        mbox->setWindowTitle(_("Please wait"));
+        QGridLayout *mbox_layout = new QGridLayout;
+        QLabel *mbox_label = new QLabel(_("Waiting for subtitle renderer initialization..."));
+        mbox_layout->addWidget(mbox_label, 0, 0);
+        mbox->setLayout(mbox_layout);
+        mbox->show();
+    }
+    else
+    {
+        msg::wrn(_("Waiting for subtitle renderer initialization..."));
+    }
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+    try
+    {
+        while (!_subtitle_renderer.is_initialized())
+        {
+            process_events();
+            usleep(10000);
+        }
+    }
+    catch (std::exception &e)
+    {
+        init_exception = e;
+    }
+    QApplication::restoreOverrideCursor();
+    if (mbox)
+    {
+        mbox->hide();
+        delete mbox;
+    }
+    if (!init_exception.empty())
+    {
+        throw init_exception;
+    }
+    int64_t wait_stop = timer::get_microseconds(timer::monotonic);
+    return (wait_stop - wait_start);
+}
+
 void video_output_qt::deinit()
 {
     if (_widget)
@@ -439,6 +489,36 @@
     }
 }
 
+void video_output_qt::suspend_screensaver()
+{
+#if defined(Q_WS_X11)
+    if (QProcess::execute(QString("xdg-screensaver suspend ")
+                + str::from(_container_widget->winId()).c_str()) != 0)
+    {
+        msg::wrn(_("Cannot suspend screensaver."));
+    }
+#elif defined(Q_WS_WIN)
+    /* TODO */
+#elif defined(Q_WS_MAC)
+    /* TODO */
+#endif
+}
+
+void video_output_qt::resume_screensaver()
+{
+#if defined(Q_WS_X11)
+    if (QProcess::execute(QString("xdg-screensaver resume ")
+                + str::from(_container_widget->winId()).c_str()) != 0)
+    {
+        msg::wrn(_("Cannot resume screensaver."));
+    }
+#elif defined(Q_WS_WIN)
+    /* TODO */
+#elif defined(Q_WS_MAC)
+    /* TODO */
+#endif
+}
+
 void video_output_qt::move_event()
 {
     if (_widget)
@@ -579,6 +659,7 @@
             // would also require the window manager to support this extension...
             _container_widget->setWindowFlags(_container_widget->windowFlags()
                     | Qt::X11BypassWindowManagerHint
+                    | Qt::FramelessWindowHint
                     | Qt::WindowStaysOnTopHint);
             _container_widget->setWindowState(_widget->windowState() | Qt::WindowFullScreen);
             _container_widget->setGeometry(geom);
@@ -594,8 +675,11 @@
             XSetInputFocus(QX11Info::display(), _container_widget->winId(), RevertToParent, CurrentTime);
             XFlush(QX11Info::display());
 #endif
-            grab_focus();
         }
+        grab_focus();
+        // Suspend the screensaver after going fullscreen, so that our window ID
+        // represents the fullscreen window. We need to have the same ID for resume.
+        suspend_screensaver();
     }
 }
 
@@ -616,6 +700,9 @@
 {
     if (_fullscreen)
     {
+        // Resume the screensaver before disabling fullscreen, so that our window ID
+        // still represents the fullscreen window and was the same when suspending the screensaver.
+        resume_screensaver();
         _fullscreen = false;
         if (_container_is_external)
         {
@@ -623,6 +710,7 @@
         }
         _container_widget->setWindowFlags(_container_widget->windowFlags()
                 & ~Qt::X11BypassWindowManagerHint
+                & ~Qt::FramelessWindowHint
                 & ~Qt::WindowStaysOnTopHint);
         _container_widget->setWindowState(_widget->windowState() & ~Qt::WindowFullScreen);
         _container_widget->setCursor(Qt::ArrowCursor);

bino-1.1.1.tar.bz2/src/video_output_qt.h -> bino-1.1.3.tar.bz2/src/video_output_qt.h Changed