Packman Build Service PMBS

Changes of Revision 3

bino.changes Changed

bino.spec Changed

bino-0.9.0.tar.bz2/src/icons/appicon.ico Deleted

bino-0.9.0.tar.bz2/src/icons/appicon.png Deleted

bino-0.9.0.tar.bz2/AUTHORS -> bino-0.9.1.tar.bz2/AUTHORS Changed

bino-0.9.0.tar.bz2/ChangeLog -> bino-0.9.1.tar.bz2/ChangeLog Changed

@@ -1,3 +1,296 @@
+commit b5fca890b049c4d9074bbbdfcb69f7376aaec588
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-26 20:58:43 +0100
+
+    GUI: Add license tab to the About Box.
+
+ src/player_qt.cpp    |   10 ++++++++++
+ src/qt_resources.qrc |    1 +
+ 2 files changed, 11 insertions(+), 0 deletions(-)
+
+commit a9562de7d2aa4bbd1202bb548d19dad3c6be5f29
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-26 20:44:23 +0100
+
+    Keep AUTHORS information in a single place, and update it.
+
+ AUTHORS              |   16 +++++++++-------
+ src/player_qt.cpp    |   22 +++-------------------
+ src/qt_resources.qrc |    1 +
+ 3 files changed, 13 insertions(+), 26 deletions(-)
+
+commit b97baa23fa3752ad394363e8c1e5c147a19f139f
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-26 18:17:11 +0100
+
+    Bump version to 0.9.1.
+
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 02922792bf476a106aa22c4451067edcf52a59ee
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-26 18:16:45 +0100
+
+    GUI: Add a "Team" tab to the About Box.
+
+ src/player_qt.cpp |   23 +++++++++++++++++++++++
+ 1 files changed, 23 insertions(+), 0 deletions(-)
+
+commit db0403ab4cbfd5974e3a52484ea7f83272b27e27
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-26 18:15:17 +0100
+
+    Make Qt interpret C strings as UTF-8.
+    
+    I cannot believe that this is not the default.
+
+ src/qt_app.cpp |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 5cdfdbfb102e28905381489b637f24e8a3d7571b
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-26 16:59:01 +0100
+
+    Windows: Document requirement of pthreads.
+
+ README.Windows |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 36f6e70530c06a3b0918b94d458e0f66e04441bd
+Author: Tobias Lange <tobias@longly-home.de>
+Date:   2011-02-26 16:54:43 +0100
+
+    Improve logo.
+
+ src/logo/bino_logo.png |  Bin 23017 -> 23222 bytes
+ src/logo/bino_logo.svg |    8 ++++----
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 9055755fc5ef353e1757e62bec6bacdb1f03abeb
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-26 14:31:47 +0100
+
+    Use the new logo, remove the old one.
+
+ Makefile.am             |    2 +-
+ pkg/w32/bino.nsi        |    2 +-
+ src/Makefile.am         |   12 ++++++++++--
+ src/icons/appicon.ico   |  Bin 1078 -> 0 bytes
+ src/icons/appicon.png   |  Bin 3657 -> 0 bytes
+ src/player_qt.cpp       |    4 ++--
+ src/qt_resources.qrc    |    3 ++-
+ src/video_output_qt.cpp |    2 +-
+ 8 files changed, 17 insertions(+), 8 deletions(-)
+
+commit f16c7545f4dfc4fde683c3b6f9890ea2b34e93d9
+Author: Tobias Lange <tobias@longly-home.de>
+Date:   2011-02-26 14:31:13 +0100
+
+    Add a new logo.
+
+ src/logo/README                    |   17 +
+ src/logo/bino_logo.ico             |  Bin 0 -> 32038 bytes
+ src/logo/bino_logo.png             |  Bin 0 -> 23017 bytes
+ src/logo/bino_logo.svg             | 1081 ++++++++++++++++++++++++++++++++++++
+ src/logo/bino_logo_small.svg       | 1011 +++++++++++++++++++++++++++++++++
+ src/logo/bino_logo_small_16x16.png |  Bin 0 -> 714 bytes
+ src/logo/bino_logo_small_32x32.png |  Bin 0 -> 1698 bytes
+ src/logo/bino_logo_small_48x48.png |  Bin 0 -> 2554 bytes
+ src/logo/bino_logo_small_64x64.png |  Bin 0 -> 3914 bytes
+ 9 files changed, 2109 insertions(+), 0 deletions(-)
+
+commit 2e503d672b639e89fcb909dc70b9764bc042703e
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-26 08:25:45 +0100
+
+    Print Qt messages through the base msg module.
+
+ src/qt_app.cpp |   23 +++++++++++++++++++++++
+ 1 files changed, 23 insertions(+), 0 deletions(-)
+
+commit a30b35646601da9247e83e7a6f2e64ed0ca7b8e1
+Author: Frédéric Devernay <frederic.devernay@inrialpes.fr>
+Date:   2011-02-26 07:35:39 +0100
+
+    Mac OS X: Fix opening of files from the command line.
+
+ src/main.cpp   |    2 ++
+ src/qt_app.cpp |   10 ++++++++--
+ src/qt_app.h   |    9 +++++++++
+ 3 files changed, 19 insertions(+), 2 deletions(-)
+
+commit 35abf9c953949cda3b60d6302ad04180938fe4b8
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-23 06:31:12 +0100
+
+    Equalizer: minor cleanup (avoid bumpyCaps).
+
+ src/player_equalizer.cpp |   32 ++++++++++++++++----------------
+ 1 files changed, 16 insertions(+), 16 deletions(-)
+
+commit b7a13a7cf193924421b23a36ff6eb5900d751621
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-23 06:26:35 +0100
+
+    Equalizer: use multithreaded input also on slave nodes.
+
+ src/player_equalizer.cpp |   30 +++++++++++++++++++++++++++---
+ 1 files changed, 27 insertions(+), 3 deletions(-)
+
+commit 7f8a6f76a588ae34b187e84c73916ce57ff5613e
+Author: Stefan Eilemann <eilemann@gmail.com>
+Date:   2011-02-22 13:55:32 +0100
+
+    Mac OS X compile fixes
+
+ src/audio_output.h   |    9 +++++++--
+ src/lib_versions.cpp |    9 +++++++--
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+commit e018df654a090dfb2a0e68647496e0c2fd516f38
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-22 08:52:49 +0100
+
+    Media object: use fixed temporary buffers for audio.
+    
+    This avoids malloc/free for every single audio packet.
+
+ src/media_object.cpp |   25 ++++++++++++++++++-------
+ 1 files changed, 18 insertions(+), 7 deletions(-)
+
+commit 36bbc46de75214d1f85b8ad1b4f31ff8fab9c5b8
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-22 08:40:50 +0100
+
+    Media object: improve packet buffering.
+    
+    A few packets (instead of only one) are now buffered asynchronously, to avoid
+    waiting for audio and video packets in many common situations.
+
+ src/media_object.cpp |   52 +++++++++++++++++++++++++++----------------------
+ 1 files changed, 29 insertions(+), 23 deletions(-)
+
+commit 66f327e182a2d486690f04d4dbbbbfeb603886f1
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-21 13:35:28 +0100
+
+    Do not crash when opening a file without video streams.
+
+ src/media_input.cpp |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+commit d75b70419e7adafb71724e4c6ef4855fc8aa237e
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-21 13:20:55 +0100
+
+    Minor improvement of the base thread module.
+
+ src/base/thread.cpp |  148 ++++++++++++++++++++++++++++-----------------------
+ src/base/thread.h   |   17 +++---
+ 2 files changed, 91 insertions(+), 74 deletions(-)
+
+commit c95361737f0cdecff39e35192b89cd29cfac81ba
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-21 06:58:46 +0100
+
+    Fix video stream selection.
+
+ src/media_input.cpp |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 7ebb4d55b8951cfd4fe299761e2b2c9468e78d2c
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-20 19:43:25 +0100
+
+    GUI: Fix handling of errors that occur during playback.
+
+ src/player_qt.cpp |   13 +++++++------
+ 1 files changed, 7 insertions(+), 6 deletions(-)
+
+commit e102a54a5326014e5764f11091a849a704b49aec
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-20 19:38:29 +0100
+
+    Improve closing of input files.
+
+ src/media_input.cpp  |   22 ++++++++++++++--------
+ src/media_object.cpp |   18 +++++++++++++++++-
+ 2 files changed, 31 insertions(+), 9 deletions(-)
+
+commit e0a7c6f22de8163b2591e19aad96ed123b7fa211
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-20 12:38:44 +0100
+
+    Use multithreaded reading and decoding for better performance.
+    
+    We now have a reader thread per media object. This thread reads packages and
+    puts them into the appropriate queues.
+    
+    For every stream and its packet queue, we have a decoder thread (audio or
+    video). These decoder threads can run concurrently.
+    
+    Once a packet is consumed by a decoder, the reader thread is started to get a
+    new one asynchronously.
+    
+    Similarly, once a video frame is consumed by the video output
+    (via prepare_next_frame()), or an audio blob is consumed by the audio output
+    (via data()), we start the decoder thread to decode new data asynchronously.
+
+ configure.ac         |    1 +
+ src/audio_output.cpp |   24 ++-
+ src/audio_output.h   |   26 ++--
+ src/base/Makefile.am |    3 +-
+ src/base/thread.cpp  |  151 ++++++++++++++
+ src/base/thread.h    |  152 ++++++++++++++
+ src/media_input.cpp  |  110 ++++++++---
+ src/media_input.h    |    3 +
+ src/media_object.cpp |  531 ++++++++++++++++++++++++++++++++++----------------
+ src/media_object.h   |   11 +-
+ src/player.cpp       |   95 ++++++---
+ src/player.h         |    8 +-
+ 12 files changed, 854 insertions(+), 261 deletions(-)
+
+commit 7d22db9f7c0af36377db35fde207671ad3af2040
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-20 11:43:09 +0100
+
+    Improve the base msg module for multithreaded situations.
+    
+    Now, messages from different threads are not intermixed anymore.
+
+ src/base/msg.cpp |   19 ++++++++++---------
+ 1 files changed, 10 insertions(+), 9 deletions(-)
+
+commit 0c9ce1f2f651395374a0b6edb5b0b3250bd0b9e2
+Author: Stefan Eilemann <eilemann@gmail.com>
+Date:   2011-02-20 08:47:19 +0100
+
+    Equalizer: re-add setting of error codes.
+    
+    (This was accidentaly removed during the rewrite.)
+
+ src/player_equalizer.cpp |   51 ++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 51 insertions(+), 0 deletions(-)
+
+commit c10fb59331b55238b5aa796e692b7dc25b532f7a
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-19 23:11:05 +0100
+
+    Fix mouse-based seeking in non-GUI mode.
+
+ src/video_output_qt.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 64dea2eacefb8ddad3cafbb4f9f59966abcdd55d
+Author: Martin Lambers <marlam@marlam.de>
+Date:   2011-02-19 23:08:54 +0100
+
+    Fix application icon in non-GUI mode.
+
+ src/video_output_qt.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
 commit 84a15084cf40184ca78c35aba247dbe1ba6909d2
 Author: Martin Lambers <marlam@marlam.de>
 Date:   2011-02-18 08:35:31 +0100

bino-0.9.0.tar.bz2/Makefile.am -> bino-0.9.1.tar.bz2/Makefile.am Changed

bino-0.9.0.tar.bz2/Makefile.in -> bino-0.9.1.tar.bz2/Makefile.in Changed

bino-0.9.0.tar.bz2/README.Windows -> bino-0.9.1.tar.bz2/README.Windows Changed

bino-0.9.0.tar.bz2/configure -> bino-0.9.1.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 0.9.0.
+# Generated by GNU Autoconf 2.67 for Bino 0.9.1.
 #
 # Report bugs to <bino-list@nongnu.org>.
 #
@@ -552,8 +552,8 @@
 # Identity of this package.
 PACKAGE_NAME='Bino'
 PACKAGE_TARNAME='bino'
-PACKAGE_VERSION='0.9.0'
-PACKAGE_STRING='Bino 0.9.0'
+PACKAGE_VERSION='0.9.1'
+PACKAGE_STRING='Bino 0.9.1'
 PACKAGE_BUGREPORT='bino-list@nongnu.org'
 PACKAGE_URL='http://bino.nongnu.org/'
 
@@ -1306,7 +1306,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 0.9.0 to adapt to many kinds of systems.
+\`configure' configures Bino 0.9.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1377,7 +1377,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Bino 0.9.0:";;
+     short | recursive ) echo "Configuration of Bino 0.9.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1508,7 +1508,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Bino configure 0.9.0
+Bino configure 0.9.1
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2003,7 +2003,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 0.9.0, which was
+It was created by Bino $as_me 0.9.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -4453,7 +4453,7 @@
 
 # Define the identity of the package.
  PACKAGE='bino'
- VERSION='0.9.0'
+ VERSION='0.9.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5726,6 +5726,62 @@
 
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
+$as_echo_n "checking for library containing pthread_create... " >&6; }
+if test "${ac_cv_search_pthread_create+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_create ();
+int
+main ()
+{
+return pthread_create ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' pthread; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_search_pthread_create=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_pthread_create+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_pthread_create+set}" = set; then :
+
+else
+  ac_cv_search_pthread_create=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5
+$as_echo "$ac_cv_search_pthread_create" >&6; }
+ac_res=$ac_cv_search_pthread_create
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
 for ac_func in backtrace clock_gettime sigaction vasprintf
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -7123,7 +7179,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Bino $as_me 0.9.0, which was
+This file was extended by Bino $as_me 0.9.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7190,7 +7246,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Bino config.status 0.9.0
+Bino config.status 0.9.1
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"

bino-0.9.0.tar.bz2/configure.ac -> bino-0.9.1.tar.bz2/configure.ac Changed

bino-0.9.0.tar.bz2/doc/bino.html -> bino-0.9.1.tar.bz2/doc/bino.html Changed

@@ -1,14 +1,14 @@
 <html lang="en">
 <head>
-<title>Bino 0.9.0</title>
+<title>Bino 0.9.1</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="Bino 0.9.0">
+<meta name="description" content="Bino 0.9.1">
 <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 0.9.0</h1>
+<h1 class="settitle">Bino 0.9.1</h1>
 <div class="node">
 <a name="Top"></a>
 <p><hr>
@@ -45,8 +45,8 @@
 
 <h2 class="unnumbered">Bino</h2>
 
-<p>This manual was last updated 15 February 2011 for version
-0.9.0 of Bino.
+<p>This manual was last updated 26 February 2011 for version
+0.9.1 of Bino.
 
    <p>Copyright &copy; 2011
 Martin Lambers (<a href="mailto:marlam@marlam.de">marlam@marlam.de</a>),

bino-0.9.0.tar.bz2/doc/bino.info -> bino-0.9.1.tar.bz2/doc/bino.info Changed

bino-0.9.0.tar.bz2/doc/stamp-vti -> bino-0.9.1.tar.bz2/doc/stamp-vti Changed

bino-0.9.0.tar.bz2/doc/version.texi -> bino-0.9.1.tar.bz2/doc/version.texi Changed

bino-0.9.0.tar.bz2/pkg/w32/bino.nsi -> bino-0.9.1.tar.bz2/pkg/w32/bino.nsi Changed

bino-0.9.0.tar.bz2/src/Makefile.am -> bino-0.9.1.tar.bz2/src/Makefile.am Changed

bino-0.9.0.tar.bz2/src/Makefile.in -> bino-0.9.1.tar.bz2/src/Makefile.in Changed

@@ -48,7 +48,7 @@
 @HAVE_LIBEQUALIZER_TRUE@am__append_3 = $(libEqualizer_LIBS)
 @HAVE_LIBEQUALIZER_FALSE@am__append_4 = $(libglew_CFLAGS)
 @HAVE_LIBEQUALIZER_FALSE@am__append_5 = $(libglew_LIBS)
-@W32_TRUE@am__append_6 = icons/appicon.ico
+@W32_TRUE@am__append_6 = logo/bino_logo.ico
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -68,10 +68,10 @@
 	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 icons/appicon.ico
+	player_equalizer.cpp logo/bino_logo.ico
 @HAVE_LIBEQUALIZER_TRUE@am__objects_1 = player_equalizer.$(OBJEXT)
 am__dirstamp = $(am__leading_dot)dirstamp
-@W32_TRUE@am__objects_2 = icons/appicon.$(OBJEXT)
+@W32_TRUE@am__objects_2 = logo/bino_logo.$(OBJEXT)
 am_bino_OBJECTS = media_data.$(OBJEXT) media_object.$(OBJEXT) \
 	media_input.$(OBJEXT) controller.$(OBJEXT) \
 	video_output.$(OBJEXT) video_output_qt.$(OBJEXT) xgl.$(OBJEXT) \
@@ -298,7 +298,15 @@
 	lib_versions.cpp main.cpp $(am__append_1) $(am__append_6)
 EXTRA_DIST = \
 	qt_resources.qrc \
-	icons/appicon.png \
+	logo/README \
+	logo/bino_logo.ico \
+	logo/bino_logo.png \
+	logo/bino_logo.svg \
+	logo/bino_logo_small.svg \
+	logo/bino_logo_small_16x16.png \
+	logo/bino_logo_small_32x32.png \
+	logo/bino_logo_small_48x48.png \
+	logo/bino_logo_small_64x64.png \
 	icons/README \
 	icons/play.ipe icons/play.png \
 	icons/pause.ipe icons/pause.png \
@@ -407,21 +415,21 @@
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-icons/$(am__dirstamp):
-	@$(MKDIR_P) icons
-	@: > icons/$(am__dirstamp)
-icons/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) icons/$(DEPDIR)
-	@: > icons/$(DEPDIR)/$(am__dirstamp)
-icons/appicon.$(OBJEXT): icons/$(am__dirstamp) \
-	icons/$(DEPDIR)/$(am__dirstamp)
+logo/$(am__dirstamp):
+	@$(MKDIR_P) logo
+	@: > logo/$(am__dirstamp)
+logo/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) logo/$(DEPDIR)
+	@: > logo/$(DEPDIR)/$(am__dirstamp)
+logo/bino_logo.$(OBJEXT): logo/$(am__dirstamp) \
+	logo/$(DEPDIR)/$(am__dirstamp)
 bino$(EXEEXT): $(bino_OBJECTS) $(bino_DEPENDENCIES) 
 	@rm -f bino$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(bino_OBJECTS) $(bino_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f icons/appicon.$(OBJEXT)
+	-rm -f logo/bino_logo.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -685,8 +693,8 @@
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f icons/$(DEPDIR)/$(am__dirstamp)
-	-rm -f icons/$(am__dirstamp)
+	-rm -f logo/$(DEPDIR)/$(am__dirstamp)
+	-rm -f logo/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"

bino-0.9.0.tar.bz2/src/audio_output.cpp -> bino-0.9.1.tar.bz2/src/audio_output.cpp Changed

@@ -120,13 +120,23 @@
     }
 }
 
-int64_t audio_output::status(size_t *required_data)
+size_t audio_output::required_initial_data_size() const
+{
+    return _num_buffers * _buffer_size;
+}
+
+size_t audio_output::required_update_data_size() const
+{
+    return _buffer_size;
+}
+
+int64_t audio_output::status(bool *need_data)
 {
     if (_state == 0)
     {
-        if (required_data)
+        if (need_data)
         {
-            *required_data = _num_buffers * _buffer_size;
+            *need_data = true;
         }
         return std::numeric_limits<int64_t>::min();
     }
@@ -149,16 +159,16 @@
                     throw exc("Cannot restart OpenAL source playback.");
                 }
             }
-            if (required_data)
+            if (need_data)
             {
-                *required_data = 0;
+                *need_data = false;
             }
         }
         else
         {
-            if (required_data)
+            if (need_data)
             {
-                *required_data = _buffer_size;
+                *need_data = true;
             }
         }
         ALint offset;

bino-0.9.0.tar.bz2/src/audio_output.h -> bino-0.9.1.tar.bz2/src/audio_output.h Changed

@@ -25,8 +25,13 @@
 #include <vector>
 #include <string>
 
-#include <AL/al.h>
-#include <AL/alc.h>
+#ifdef __APPLE__
+#  include <OpenAL/al.h>
+#  include <OpenAL/alc.h>
+#else
+#  include <AL/al.h>
+#  include <AL/alc.h>
+#endif
 
 #include "media_data.h"
 #include "controller.h"
@@ -71,18 +76,20 @@
     void deinit();
 
     /* To play audio, do the following:
-     * - First, call status() to find out the initial amount of audio data that
-     *   is required. The returned time stamp is meaningless on this first call.
-     * - Then provide exactly the requested amount of data using the data() function.
-     * - Then start audio playback using start(). This function returns the audio start
-     *   time, in microseconds.
-     * - Regularly call status() to get the current audio time and to be notified when
-     *   more data is needed (required_data > 0). Provide the requested data using the
-     *   data() function. The time position in the audio stream is the time returned by
-     *   status() minus the start time that the start() function returned. You can also
-     *   just query the time without asking if more data is needed by passing NULL as
-     *   required_data. */
-    int64_t status(size_t *required_data);
+     * - First, call required_initial_data_size() to find out the initial amount
+     *   of audio data that is required.
+     * - Then provide exactly this amount of data using the data() function.
+     * - Then start audio playback using start(). This function returns the audio
+     *   start time, in microseconds.
+     * - Regularly call status() to get the current audio time and to be notified
+     *   when more data is needed. Provide the amount of data given by
+     *   required_update_data_size() using the data() function. The time position
+     *   in the audio stream is the time returned by status() minus the start time
+     *   that the start() function returned. You can also just query the time
+     *   without asking if more data is needed by passing NULL as need_data. */
+    size_t required_initial_data_size() const;
+    size_t required_update_data_size() const;
+    int64_t status(bool *need_data);
     void data(const audio_blob &blob);
     int64_t start();

bino-0.9.0.tar.bz2/src/base/Makefile.am -> bino-0.9.1.tar.bz2/src/base/Makefile.am Changed

bino-0.9.0.tar.bz2/src/base/Makefile.in -> bino-0.9.1.tar.bz2/src/base/Makefile.in Changed

bino-0.9.0.tar.bz2/src/base/msg.cpp -> bino-0.9.1.tar.bz2/src/base/msg.cpp Changed

@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include <cstdlib>
+#include <cstdio>
 
 #include "str.h"
 #include "msg.h"
@@ -44,7 +45,7 @@
     void set_file(FILE *f)
     {
         _file = f;
-        ::setvbuf(f, NULL, _IOLBF, 0);
+        std::setvbuf(f, NULL, _IOLBF, 0);
     }
 
     level_t level()
@@ -131,10 +132,8 @@
             return;
         }
 
-        std::string pfx = prefix(level);
-        ::fputs(pfx.c_str(), _file);
-        ::fputs(s.c_str(), _file);
-        ::fputc('\n', _file);
+        std::string out = prefix(level) + s.c_str() + '\n';
+        std::fputs(out.c_str(), _file);
     }
 
     void msg(level_t level, const char *format, ...)
@@ -163,6 +162,7 @@
         int pfx_len = pfx.length();
         std::string text(s);
 
+        std::string out;
         int line_len = 0;
         int first_unprinted = 0;
         int last_blank = -1;
@@ -177,8 +177,8 @@
             if (text[text_index] == '\n')
             {
                 // output from first_unprinted to text_index
-                ::fputs(pfx.c_str(), _file);
-                ::fwrite(text.c_str() + first_unprinted, sizeof(char), text_index - first_unprinted + 1, _file);
+                out += pfx;
+                out += std::string(text.c_str() + first_unprinted, text_index - first_unprinted + 1);
                 first_unprinted = text_index + 1;
                 last_blank = -1;
                 line_len = 0;
@@ -211,8 +211,8 @@
                         last_blank = text_index;
                     }
                     text[last_blank] = '\n';
-                    ::fputs(pfx.c_str(), _file);
-                    ::fwrite(text.c_str() + first_unprinted, sizeof(char), last_blank - first_unprinted + 1, _file);
+                    out += pfx;
+                    out += std::string(text.c_str() + first_unprinted, last_blank - first_unprinted + 1);
                     first_unprinted = last_blank + 1;
                     last_blank = -1;
                     line_len = text_index - first_unprinted + 1;
@@ -223,6 +223,7 @@
                 }
             }
         }
+        std::fputs(out.c_str(), _file);
     }
 
     void msg_txt(level_t level, const char *format, ...)

bino-0.9.1.tar.bz2/src/base/thread.cpp Added

@@ -0,0 +1,167 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * Copyright (C) 2011
+ * Martin Lambers <marlam@marlam.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cstring>
+#include <pthread.h>
+
+#include "dbg.h"
+#include "thread.h"
+
+
+const pthread_mutex_t mutex::_mutex_initializer = PTHREAD_MUTEX_INITIALIZER;
+
+mutex::mutex() : _mutex(_mutex_initializer)
+{
+    int e = pthread_mutex_init(&_mutex, NULL);
+    if (e != 0)
+    {
+        throw exc(std::string("Cannot initialize mutex: ") + std::strerror(e), e);
+    }
+}
+
+mutex::mutex(const mutex &) : _mutex(_mutex_initializer)
+{
+    // You cannot have multiple copies of the same mutex.
+    // Instead, we create a new one. This allows easier use of mutexes in STL containers.
+    int e = pthread_mutex_init(&_mutex, NULL);
+    if (e != 0)
+    {
+        throw exc(std::string("Cannot initialize mutex: ") + std::strerror(e), e);
+    }
+}
+
+mutex::~mutex()
+{
+    (void)pthread_mutex_destroy(&_mutex);
+}
+
+void mutex::lock()
+{
+    int e = pthread_mutex_lock(&_mutex);
+    if (e != 0)
+    {
+        throw exc(std::string("Cannot lock mutex: ") + std::strerror(e), e);
+    }
+}
+
+bool mutex::trylock()
+{
+    return (pthread_mutex_trylock(&_mutex) == 0);
+}
+
+void mutex::unlock()
+{
+    int e = pthread_mutex_unlock(&_mutex);
+    if (e != 0)
+    {
+        throw exc(std::string("Cannot unlock mutex: ") + std::strerror(e), e);
+    }
+}
+
+
+thread::thread() :
+    __thread_id(pthread_self()),
+    __joinable(false),
+    __running(false),
+    __wait_mutex(),
+    __exception()
+{
+}
+
+thread::thread(const thread &) :
+    __thread_id(pthread_self()),
+    __joinable(false),
+    __running(false),
+    __wait_mutex(),
+    __exception()
+{
+    // The thread state cannot be copied; a new state is created instead.
+}
+
+thread::~thread()
+{
+    if (__joinable)
+    {
+        (void)pthread_detach(__thread_id);
+    }
+}
+
+void *thread::__run(void *p)
+{
+    thread *t = static_cast<thread *>(p);
+    try
+    {
+        t->run();
+    }
+    catch (exc &e)
+    {
+        t->__exception = e;
+    }
+    catch (std::exception &e)
+    {
+        t->__exception = e;
+    }
+    catch (...)
+    {
+        t->__exception = exc("Unknown exception");
+    }
+    t->__running = false;
+    return NULL;
+}
+
+void thread::start()
+{
+    if (atomic::bool_compare_and_swap(&__running, false, true))
+    {
+        wait();
+        int e = pthread_create(&__thread_id, NULL, __run, this);
+        if (e != 0)
+        {
+            throw exc(std::string("Cannot create thread: ") + std::strerror(e), e);
+        }
+        __joinable = true;
+    }
+}
+
+void thread::wait()
+{
+    __wait_mutex.lock();
+    if (atomic::bool_compare_and_swap(&__joinable, true, false))
+    {
+        int e = pthread_join(__thread_id, NULL);
+        if (e != 0)
+        {
+            __wait_mutex.unlock();
+            throw exc(std::string("Cannot join with thread: ") + std::strerror(e), e);
+        }
+    }
+    __wait_mutex.unlock();
+}
+
+void thread::finish()
+{
+    wait();
+    if (!exception().empty())
+    {
+        throw exception();
+    }
+}

bino-0.9.1.tar.bz2/src/base/thread.h Added

@@ -0,0 +1,153 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * Copyright (C) 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 THREADS_H
+#define THREADS_H
+
+#include <pthread.h>
+
+#include "exc.h"
+
+
+/*
+ * Atomic operations
+ */
+
+namespace atomic
+{
+    // TODO
+    //
+    // Currently this is just an interface to the GCC atomic builtin functions; see
+    // http://gcc.gnu.org/onlinedocs/gcc-4.4.1/gcc/Atomic-Builtins.html#Atomic-Builtins
+    //
+    // This must be extended when (if) other compilers are used some day.
+    //
+    // The functions obviously only work for basic data types.
+    // The comments were copied from the GCC manual referenced above.
+
+    /* The following functions perform the operation suggested by the name,
+     * and return the value that had previously been in memory. */
+    template<typename T> T fetch_and_add(T *ptr, T value) { return __sync_fetch_and_add(ptr, value); }
+    template<typename T> T fetch_and_sub(T *ptr, T value) { return __sync_fetch_and_sub(ptr, value); }
+    template<typename T> T fetch_and_or(T *ptr, T value) { return __sync_fetch_and_or(ptr, value); }
+    template<typename T> T fetch_and_and(T *ptr, T value) { return __sync_fetch_and_and(ptr, value); }
+    template<typename T> T fetch_and_xor(T *ptr, T value) { return __sync_fetch_and_xor(ptr, value); }
+    template<typename T> T fetch_and_nand(T *ptr, T value) { return __sync_fetch_and_nand(ptr, value); }
+
+    /* The following functions perform the operation suggested by the name,
+     * and return the new value. */
+    template<typename T> T add_and_fetch(T *ptr, T value) { return __sync_add_and_fetch(ptr, value); }
+    template<typename T> T sub_and_fetch(T *ptr, T value) { return __sync_sub_and_fetch(ptr, value); }
+    template<typename T> T or_and_fetch(T *ptr, T value) { return __sync_or_and_fetch(ptr, value); }
+    template<typename T> T and_and_fetch(T *ptr, T value) { return __sync_and_and_fetch(ptr, value); }
+    template<typename T> T xor_and_fetch(T *ptr, T value) { return __sync_xor_and_fetch(ptr, value); }
+    template<typename T> T nand_and_fetch(T *ptr, T value) { return __sync_nand_and_fetch(ptr, value); }
+
+    /* The following functions perform an atomic compare and swap.
+     * That is, if the current value of *ptr is oldval, then write newval into *ptr.
+     * The "bool" version returns true if the comparison is successful and newval was written.
+     * The "val" version returns the contents of *ptr before the operation. */
+    template<typename T> bool bool_compare_and_swap(T *ptr, T oldval, T newval) { return __sync_bool_compare_and_swap(ptr, oldval, newval); }
+    template<typename T> T val_compare_and_swap(T *ptr, T oldval, T newval) { return __sync_val_compare_and_swap(ptr, oldval, newval); }
+
+    /* The following are convenience functions implemented on top of the above
+     * basic atomic operations. */
+    template<typename T> T fetch(T *ptr) { return fetch_and_add(ptr, static_cast<T>(0)); }
+    template<typename T> T increment(T *ptr) { return add_and_fetch(ptr, static_cast<T>(1)); }
+    template<typename T> T decrement(T *ptr) { return sub_and_fetch(ptr, static_cast<T>(1)); }
+}
+
+
+/*
+ * Mutex
+ */
+
+class mutex
+{
+private:
+    static const pthread_mutex_t _mutex_initializer;
+    pthread_mutex_t _mutex;
+
+public:
+    // Constructor / Destructor
+    mutex();
+    mutex(const mutex &m);
+    ~mutex();
+
+    // Lock the mutex.
+    void lock();
+    // Try to lock the mutex. Return true on success, false otherwise.
+    bool trylock();
+    // Unlock the mutex
+    void unlock();
+};
+
+
+/*
+ * Thread
+ *
+ * Implement the run() function in a subclass.
+ */
+
+class thread
+{
+private:
+    pthread_t __thread_id;
+    bool __joinable;
+    bool __running;
+    mutex __wait_mutex;
+    exc __exception;
+
+    static void *__run(void *p);
+
+public:
+    // Constructor / Destructor
+    thread();
+    thread(const thread &t);
+    virtual ~thread();
+
+    // Implement this in a subclass; it will be executed from the thread via start()
+    virtual void run() = 0;
+
+    // Start a new thread that executes the run() function. If the thread is already
+    // running, this function does nothing.
+    void start();
+
+    // Wait for the thread to finish. If the thread is not running, this function
+    // returns immediately.
+    void wait();
+
+    // Wait for the thread to finish, like wait(), and rethrow an exception that the
+    // run() function might have thrown during its execution.
+    void finish();
+
+    // Get an exception that the run() function might have thrown.
+    const exc &exception() const
+    {
+        return __exception;
+    }
+    // Modify the stored exception
+    exc &exception()
+    {
+        return __exception;
+    }
+};
+
+#endif

bino-0.9.0.tar.bz2/src/lib_versions.cpp -> bino-0.9.1.tar.bz2/src/lib_versions.cpp Changed

bino-0.9.1.tar.bz2/src/logo Added

bino-0.9.1.tar.bz2/src/logo/README Added

bino-0.9.1.tar.bz2/src/logo/bino_logo.ico Added

bino-0.9.1.tar.bz2/src/logo/bino_logo.png Added

bino-0.9.1.tar.bz2/src/logo/bino_logo.svg Added

@@ -0,0 +1,1081 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="597.65656"
+   height="448.53503"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48+devel r10069"
+   sodipodi:docname="bino_logo.svg"
+   inkscape:export-filename="/tmp/bino_logo_web.png"
+   inkscape:export-xdpi="38.268589"
+   inkscape:export-ydpi="38.268589">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="88.430556"
+     inkscape:cy="91.43607"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1436"
+     inkscape:window-height="856"
+     inkscape:window-x="4"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-top="10"
+     fit-margin-left="10"
+     fit-margin-right="10"
+     fit-margin-bottom="10" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient25240">
+      <stop
+         style="stop-color:#f00000;stop-opacity:1;"
+         offset="0"
+         id="stop25242" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop25244" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25228">
+      <stop
+         style="stop-color:#06439f;stop-opacity:1;"
+         offset="0"
+         id="stop25230" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop25232" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25222">
+      <stop
+         id="stop25224"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop25226"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25206">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop25208" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop25210" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25198">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop25200" />
+      <stop
+         style="stop-color:#be0000;stop-opacity:1;"
+         offset="1"
+         id="stop25202" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25184">
+      <stop
+         style="stop-color:#2a7fff;stop-opacity:1;"
+         offset="0"
+         id="stop25186" />
+      <stop
+         style="stop-color:#005ce6;stop-opacity:1;"
+         offset="1"
+         id="stop25188" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25176">
+      <stop
+         style="stop-color:#ffd52d;stop-opacity:1;"
+         offset="0"
+         id="stop25178" />
+      <stop
+         style="stop-color:#dbaf00;stop-opacity:1;"
+         offset="1"
+         id="stop25180" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25162">
+      <stop
+         style="stop-color:#d6ff2f;stop-opacity:1;"
+         offset="0"
+         id="stop25164" />
+      <stop
+         style="stop-color:#779500;stop-opacity:1;"
+         offset="1"
+         id="stop25166" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25148">
+      <stop
+         style="stop-color:#55d400;stop-opacity:1;"
+         offset="0"
+         id="stop25150" />
+      <stop
+         style="stop-color:#317a00;stop-opacity:1;"
+         offset="1"
+         id="stop25152" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective7096"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient3929">
+      <stop
+         id="stop3931"
+         offset="0"
+         style="stop-color:#8f1c1c;stop-opacity:1;" />
+      <stop
+         id="stop3933"
+         offset="1"
+         style="stop-color:#5e1a1a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3915">
+      <stop
+         style="stop-color:#af0000;stop-opacity:1;"
+         offset="0"
+         id="stop3917" />
+      <stop
+         style="stop-color:#540000;stop-opacity:1;"
+         offset="1"
+         id="stop3919" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3901">
+      <stop
+         style="stop-color:#c12626;stop-opacity:1;"
+         offset="0"
+         id="stop3903" />
+      <stop
+         style="stop-color:#5e1a1a;stop-opacity:1;"
+         offset="1"
+         id="stop3905" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3887">
+      <stop
+         id="stop3889"
+         offset="0"
+         style="stop-color:#af0000;stop-opacity:1;" />
+      <stop
+         id="stop3891"
+         offset="1"
+         style="stop-color:#540000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3869">
+      <stop
+         id="stop3871"
+         offset="0"
+         style="stop-color:#d52a2a;stop-opacity:1;" />
+      <stop
+         id="stop3873"
+         offset="1"
+         style="stop-color:#711f1f;stop-opacity:1;" />
+    </linearGradient>
+    <inkscape:path-effect
+       bendpath-nodetypes="cc"
+       vertical="false"
+       scale_y_rel="false"
+       prop_scale="1"
+       bendpath="M -514.33704,574.92098 -248.23005,466.34955"
+       is_visible="true"
+       id="path-effect3830"
+       effect="bend_path" />
+    <inkscape:path-effect
+       crossing_points_vector="-359.9896 | 767.08354 | 0 | 0 | 0 | 1 | 2.9126599e-15 | 13 | 1 | -380.05477 | 535.56238 | 1 | 1 | 0 | 1 | 0 | 8 | 1"
+       switcher_size="15"
+       add_other_stroke_width="true"
+       add_stroke_width="true"
+       prop_to_stroke_width="true"
+       interruption_width="3"
+       is_visible="true"
+       id="path-effect3828"
+       effect="knot" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect3826"
+       effect="spiro" />
+    <inkscape:path-effect
+       border_marks="both"
+       mark_dir="left"
+       offset="0"
+       shift="0"
+       major_mark_steps="5"
+       minor_mark_length="7"
+       mark_length="14"
+       mark_distance="20"
+       unit="px"
+       is_visible="true"
+       id="path-effect3824"
+       effect="ruler" />
+    <inkscape:path-effect
+       crossing_points_vector="-359.9896 | 767.08354 | 0 | 0 | 0 | 1 | 2.9126599e-15 | 13 | 1 | -380.05477 | 535.56238 | 1 | 1 | 0 | 1 | 0 | 8 | 1"
+       switcher_size="15"
+       add_other_stroke_width="true"
+       add_stroke_width="true"
+       prop_to_stroke_width="true"
+       interruption_width="3"
+       is_visible="true"
+       id="path-effect3822"
+       effect="knot" />
+    <inkscape:path-effect
+       bendpath4="m -514.33704,382.75842 0,384.32512"
+       bendpath3="m -514.33704,767.08354 267.53556,0"
+       bendpath2="m -246.80148,382.75842 0,384.32512"
+       bendpath1="m -514.33704,382.75842 267.53556,0"
+       xx="true"
+       yy="true"
+       is_visible="true"
+       id="path-effect3820"
+       effect="envelope" />
+    <inkscape:path-effect
+       bendpath4="m 66.504545,773.4785 0,417.0081"
+       bendpath3="m 66.504545,1190.4866 244.272525,0"
+       bendpath2="m 310.77707,773.4785 0,417.0081"
+       bendpath1="m 66.504545,773.4785 244.272525,0"
+       xx="true"
+       yy="true"
+       is_visible="true"
+       id="path-effect3807"
+       effect="envelope" />
+    <inkscape:path-effect
+       maxComplexity="1000"
+       drawall="true"
+       nbgenerations="1"
+       similar_only="false"
+       generator="m 66.504545,1190.4866 81.424175,0 m 81.42417,0 81.42418,0"
+       ref_path="m 66.504545,981.98255 244.272525,0"
+       is_visible="true"
+       id="path-effect3033"
+       effect="vonkoch" />
+    <inkscape:path-effect
+       scale_y_rel="false"
+       prop_scale="1"
+       strokepath="M 0,0 1,0"
+       endpoint_spacing_variation="0;1"
+       endpoint_edge_variation="0;1"
+       startpoint_spacing_variation="0;1"
+       startpoint_edge_variation="0;1"
+       count="5"
+       is_visible="true"
+       id="path-effect3031"
+       effect="curvestitching" />
+    <inkscape:path-effect
+       steps="5"
+       equidistant_spacing="true"
+       trajectory="M 0,0 0,0"
+       is_visible="true"
+       id="path-effect3029"
+       effect="interpolate" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect3027"
+       effect="spiro" />
+    <inkscape:path-effect
+       tgtlength_rdm="0.3;1"
+       tgtlength="100"
+       tgtscale="10"
+       tgt_places_rdmness="1;1"
+       nbtangents="5"
+       tremble_frequency="1"
+       tremble_size="5;1"
+       parallel_offset="5;1"
+       ends_tolerance="0.1;1"
+       strokeoverlap_rdm="0.3;1"
+       strokeoverlap="0.3"
+       strokelength_rdm="0.3;1"
+       strokelength="100"
+       nbiter_approxstrokes="5"
+       is_visible="true"
+       id="path-effect3025"
+       effect="sketch" />
+    <inkscape:path-effect
+       back_thickness="0.25"
+       front_thickness="1"
+       stroke_width_bottom="1"
+       stroke_width_top="1"
+       fat_output="true"
+       bottom_smth_variation="0;1"
+       top_smth_variation="0;1"
+       scale_tb="1"
+       scale_tf="1"
+       scale_bb="1"
+       scale_bf="1"
+       top_tgt_variation="0;1"
+       bottom_tgt_variation="0;1"
+       top_edge_variation="41.70081;1"
+       bottom_edge_variation="41.70081;1"
+       bender="188.64081,981.98255 , 5,0"
+       do_bend="true"
+       growth="0"
+       dist_rdm="75.1;1"
+       direction="188.64081,976.98255 , 61.068131,0"
+       is_visible="true"
+       id="path-effect3023"
+       effect="rough_hatches" />
+    <inkscape:path-effect
+       back_thickness="0.25"
+       front_thickness="1"
+       stroke_width_bottom="1"
+       stroke_width_top="1"
+       fat_output="true"
+       bottom_smth_variation="0;1"
+       top_smth_variation="0;1"
+       scale_tb="1"
+       scale_tf="1"
+       scale_bb="1"
+       scale_bf="1"
+       top_tgt_variation="0;1"
+       bottom_tgt_variation="0;1"
+       top_edge_variation="41.70081;1"
+       bottom_edge_variation="41.70081;1"
+       bender="191.49795,871.98255 , 5,0"
+       do_bend="true"
+       growth="0"
+       dist_rdm="75;1"
+       direction="191.49795,866.98255 , 61.068133,0"
+       is_visible="true"
+       id="path-effect3014"
+       effect="rough_hatches" />
+    <inkscape:path-effect
+       fuse_tolerance="0"
+       vertical_pattern="false"
+       prop_units="false"
+       tang_offset="0"
+       normal_offset="0"
+       spacing="0"
+       scale_y_rel="false"
+       prop_scale="1"
+       copytype="single_stretched"
+       pattern="M 0,0 1,0"
+       is_visible="true"
+       id="path-effect3012"
+       effect="skeletal" />
+    <inkscape:path-effect
+       fuse_tolerance="0"
+       vertical_pattern="false"
+       prop_units="false"
+       tang_offset="0"
+       normal_offset="0"
+       spacing="0"
+       scale_y_rel="false"
+       prop_scale="1"
+       copytype="single_stretched"
+       pattern="M 0,0 1,0"
+       is_visible="true"
+       id="path-effect3010"
+       effect="skeletal" />
+    <inkscape:path-effect
+       border_marks="both"
+       mark_dir="left"
+       offset="0"
+       shift="0"
+       major_mark_steps="5"
+       minor_mark_length="7"
+       mark_length="14"
+       mark_distance="20"
+       unit="px"
+       is_visible="true"
+       id="path-effect3008"
+       effect="ruler" />
+    <inkscape:path-effect
+       crossing_points_vector="135.66424 | 792.01238 | 0 | 0 | 0 | 3 | 0.99971396 | 1 | 1 | 135.66423 | 792.01238 | 0 | 0 | 1 | 2 | 0.99988558 | 1 | 1 | 135.66423 | 792.01189 | 0 | 1 | 0 | 0 | 1.0000038 | 1.0000038 | 1 | 135.66423 | 792.01091 | 0 | 1 | 0 | 0 | 1.0000114 | 1.0000038 | 1 | 135.66423 | 792.01189 | 0 | 1 | 0 | 0 | 1.0000038 | 1.0000114 | 1 | 135.66423 | 792.01091 | 0 | 1 | 0 | 0 | 1.0000114 | 1.0000114 | 1 | 135.66423 | 792.00993 | 0 | 1 | 0 | 0 | 1.0000191 | 1.0000038 | 1 | 135.66423 | 792.00895 | 0 | 1 | 0 | 0 | 1.0000267 | 1.0000038 | 1 | 135.66423 | 792.00993 | 0 | 1 | 0 | 0 | 1.0000191 | 1.0000114 | 1 | 135.66423 | 792.00895 | 0 | 1 | 0 | 0 | 1.0000267 | 1.0000114 | 1 | 135.66423 | 792.01189 | 0 | 1 | 0 | 0 | 1.0000038 | 1.0000191 | 1 | 135.66423 | 792.01189 | 0 | 1 | 0 | 0 | 1.0000038 | 1.0000267 | 1 | 135.66423 | 792.01091 | 0 | 1 | 0 | 0 | 1.0000114 | 1.0000191 | 1 | 135.66423 | 792.01091 | 0 | 1 | 5 | 0 | 1.0000114 | 1.0000267 | 1 | 135.66423 | 792.00993 | 0 | 1 | 0 | 0 | 1.0000191 | 1.0000191 | 1 | 135.66423 | 792.00895 | 0 | 1 | 0 | 0 | 1.0000267 | 1.0000191 | 1 | 135.66423 | 792.00993 | 0 | 1 | 6 | 0 | 1.0000191 | 1.0000267 | 1 | 135.66423 | 792.00895 | 0 | 1 | 7 | 0 | 1.0000267 | 1.0000267 | 1 | 135.66423 | 792.00797 | 0 | 1 | 0 | 0 | 1.0000343 | 1.0000038 | 1 | 135.66423 | 792.00699 | 0 | 1 | 0 | 0 | 1.000042 | 1.0000038 | 1 | 135.66423 | 792.00797 | 0 | 1 | 0 | 0 | 1.0000343 | 1.0000114 | 1 | 135.66423 | 792.00699 | 0 | 1 | 0 | 0 | 1.000042 | 1.0000114 | 1 | 135.66423 | 792.00601 | 0 | 1 | 0 | 0 | 1.0000496 | 1.0000038 | 1 | 135.66423 | 792.00503 | 0 | 1 | 0 | 3 | 1.0000572 | 1.0000038 | 1 | 135.66423 | 792.00601 | 0 | 1 | 0 | 0 | 1.0000496 | 1.0000114 | 1 | 135.66423 | 792.00503 | 0 | 1 | 0 | 4 | 1.0000572 | 1.0000114 | 1 | 135.66423 | 792.00797 | 0 | 1 | 0 | 0 | 1.0000343 | 1.0000191 | 1 | 135.66423 | 792.00699 | 0 | 1 | 0 | 0 | 1.000042 | 1.0000191 | 1 | 135.66423 | 792.00797 | 0 | 1 | 8 | 0 | 1.0000343 | 1.0000267 | 1 | 135.66423 | 792.00699 | 0 | 1 | 9 | 0 | 1.000042 | 1.0000267 | 1 | 135.66423 | 792.00601 | 0 | 1 | 0 | 0 | 1.0000496 | 1.0000191 | 1 | 135.66423 | 792.00503 | 0 | 1 | 0 | 5 | 1.0000572 | 1.0000191 | 1 | 135.66423 | 792.00601 | 0 | 1 | 10 | 0 | 1.0000496 | 1.0000267 | 1 | 135.66423 | 792.00503 | 0 | 1 | 11 | 6 | 1.0000572 | 1.0000267 | 1 | 135.66423 | 792.01189 | 0 | 1 | 0 | 7 | 1.0000038 | 1.0000343 | 1 | 135.66423 | 792.01189 | 0 | 1 | 4 | 8 | 1.0000038 | 1.000042 | 1 | 135.66423 | 1020.0001 | 1 | 1 | 1 | 2 | 0.99983724 | 1 | 1 | 173.46831 | 1022.3265 | 1 | 1 | 0 | 9 | 4.294784e-16 | 5 | 1"
+       switcher_size="15"
+       add_other_stroke_width="true"
+       add_stroke_width="true"
+       prop_to_stroke_width="true"
+       interruption_width="3.1"
+       is_visible="true"
+       id="path-effect3006"
+       effect="knot" />
+    <inkscape:path-effect
+       bendpath1-nodetypes="cc"
+       bendpath4="m 69.361688,663.4785 0,417.0081"
+       bendpath3="m 69.361688,1080.4866 244.272532,0"
+       bendpath2="m 313.63422,663.4785 0,417.0081"
+       bendpath1="m 69.361688,663.4785 c 121.424182,-48.09524 2397.703712,585.7867 -10.013182,0"
+       xx="true"
+       yy="true"
+       is_visible="true"
+       id="path-effect3004"
+       effect="envelope" />
+    <inkscape:path-effect
+       nr_y="5"
+       nr_x="4"
+       is_visible="true"
+       id="path-effect3002"
+       effect="construct_grid" />
+    <inkscape:path-effect
+       vertical="false"
+       scale_y_rel="false"
+       prop_scale="1.07"
+       bendpath="m 69.361688,871.98255 244.272532,0"
+       is_visible="true"
+       id="path-effect3000"
+       effect="bend_path" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="981.20905"
+       x2="310.71057"
+       y1="981.20905"
+       x1="66.438042"
+       id="linearGradient3875"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1255.3976"
+       x2="203.63234"
+       y1="812.63562"
+       x1="203.63234"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3877"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="981.20905"
+       x2="310.71057"
+       y1="981.20905"
+       x1="66.438042"
+       id="linearGradient3897"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1258.0605"
+       x2="204.9648"
+       y1="812.29944"
+       x1="204.9648"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3899"
+       xlink:href="#linearGradient3901"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="801.79364"
+       x2="182.48363"
+       y1="1243.5411"
+       x1="190.57265"
+       id="linearGradient3913"
+       xlink:href="#linearGradient3929"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1185.9991"
+       x2="197.48891"
+       y1="809.82562"
+       x1="197.48891"
+       id="linearGradient3927"
+       xlink:href="#linearGradient3929"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1258.0605"
+       x2="204.9648"
+       y1="812.29944"
+       x1="204.9648"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3391"
+       xlink:href="#linearGradient3901"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="981.20905"
+       x2="310.71057"
+       y1="981.20905"
+       x1="66.438042"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3393"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(-0.7405178,-0.47250837,0,0.87820187,-507.79853,2.5901693)"
+       y2="1258.0605"
+       x2="204.9648"
+       y1="812.29944"
+       x1="204.9648"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3396"
+       xlink:href="#linearGradient3901"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1255.3976"
+       x2="203.63234"
+       y1="812.63562"
+       x1="203.63234"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3398"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="981.20905"
+       x2="310.71057"
+       y1="981.20905"
+       x1="66.438042"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3400"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.7405178,-0.47250837,0,0.87820187,-606.19563,2.5901693)"
+       y2="1255.3976"
+       x2="203.63234"
+       y1="812.63562"
+       x1="203.63234"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3403"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1255.3976"
+       x2="203.63234"
+       y1="812.63562"
+       x1="203.63234"
+       gradientTransform="matrix(0.7405178,-0.47250837,0,0.87820187,-645.48134,-18.838402)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7674"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1258.0605"
+       x2="204.9648"
+       y1="812.29944"
+       x1="204.9648"
+       gradientTransform="matrix(-0.7405178,-0.47250837,0,0.87820187,-800.65567,10.447312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7676"
+       xlink:href="#linearGradient3901"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25190"
+       x1="294.99542"
+       y1="-541.98041"
+       x2="294.99542"
+       y2="-340.96005"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25192"
+       x1="154.64746"
+       y1="-464.22653"
+       x2="154.64746"
+       y2="-235.71924"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25194"
+       x1="58.556332"
+       y1="-453.95908"
+       x2="58.556332"
+       y2="-207.48184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25196"
+       x1="-23.901735"
+       y1="-395.92374"
+       x2="-23.901735"
+       y2="-127.22314"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25198"
+       id="linearGradient25204"
+       x1="-137.99643"
+       y1="-396.93387"
+       x2="-137.99643"
+       y2="-126.86163"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25212"
+       x1="263.52002"
+       y1="-355.83359"
+       x2="247.50426"
+       y2="-430.5849"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25214"
+       x1="110.11074"
+       y1="-251.80611"
+       x2="110.10816"
+       y2="-366.9635"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25216"
+       x1="1.4187797"
+       y1="-226.37386"
+       x2="25.222071"
+       y2="-357.6937"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25238"
+       x1="-90.669044"
+       y1="-201.89088"
+       x2="5.2316294"
+       y2="-278.55612"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25240"
+       id="linearGradient25246"
+       x1="-66.820183"
+       y1="-219.86819"
+       x2="-167.80438"
+       y2="-263.30475"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25240"
+       id="linearGradient25256"
+       gradientUnits="userSpaceOnUse"
+       x1="-66.820183"
+       y1="-219.86819"
+       x2="-167.80438"
+       y2="-263.30475"
+       gradientTransform="translate(737.41135,-294.96454)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25258"
+       gradientUnits="userSpaceOnUse"
+       x1="-90.669044"
+       y1="-201.89088"
+       x2="5.2316294"
+       y2="-278.55612"
+       gradientTransform="translate(737.41135,-294.96454)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25260"
+       gradientUnits="userSpaceOnUse"
+       x1="-23.901735"
+       y1="-395.92374"
+       x2="-23.901735"
+       y2="-127.22314"
+       gradientTransform="translate(737.41135,-294.96454)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25198"
+       id="linearGradient25262"
+       gradientUnits="userSpaceOnUse"
+       x1="-137.99643"
+       y1="-396.93387"
+       x2="-137.99643"
+       y2="-126.86163"
+       gradientTransform="translate(737.41135,-294.96454)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25240"
+       id="linearGradient25272"
+       gradientUnits="userSpaceOnUse"
+       x1="-66.820183"
+       y1="-219.86819"
+       x2="-167.80438"
+       y2="-263.30475"
+       gradientTransform="matrix(0.12797797,0,0,0.12797797,494.19632,-474.10199)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25274"
+       gradientUnits="userSpaceOnUse"
+       x1="-90.669044"
+       y1="-201.89088"
+       x2="5.2316294"
+       y2="-278.55612"
+       gradientTransform="matrix(0.12797797,0,0,0.12797797,494.19632,-474.10199)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25276"
+       gradientUnits="userSpaceOnUse"
+       x1="-23.901735"
+       y1="-395.92374"
+       x2="-23.901735"
+       y2="-127.22314"
+       gradientTransform="matrix(0.12797797,0,0,0.12797797,494.19632,-474.10199)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25198"
+       id="linearGradient25278"
+       gradientUnits="userSpaceOnUse"
+       x1="-137.99643"
+       y1="-396.93387"
+       x2="-137.99643"
+       y2="-126.86163"
+       gradientTransform="matrix(0.12797797,0,0,0.12797797,494.19632,-474.10199)" />
+    <filter
+       id="filter25480"
+       inkscape:label="Drop shadow"
+       width="1.5"
+       height="1.5"
+       x="-0.25"
+       y="-0.25"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur25482"
+         in="SourceAlpha"
+         stdDeviation="3.9"
+         result="blur" />
+      <feColorMatrix
+         id="feColorMatrix25484"
+         result="bluralpha"
+         type="matrix"
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 " />
+      <feOffset
+         id="feOffset25486"
+         in="bluralpha"
+         dx="-5.9"
+         dy="-3.8"
+         result="offsetBlur" />
+      <feMerge
+         id="feMerge25488">
+        <feMergeNode
+           id="feMergeNode25490"
+           in="offsetBlur" />
+        <feMergeNode
+           id="feMergeNode25492"
+           in="SourceGraphic" />
+      </feMerge>
+    </filter>
+    <filter
+       id="filter25648"
+       inkscape:label="Drop shadow"
+       width="1.5"
+       height="1.5"
+       x="-.25"
+       y="-.25"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur25650"
+         in="SourceAlpha"
+         stdDeviation="3.9"
+         result="blur" />
+      <feColorMatrix
+         id="feColorMatrix25652"
+         result="bluralpha"
+         type="matrix"
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 " />
+      <feOffset
+         id="feOffset25654"
+         in="bluralpha"
+         dx="-6.2"
+         dy="-5.3"
+         result="offsetBlur" />
+      <feMerge
+         id="feMerge25656"
+         result="fbSourceGraphic">
+        <feMergeNode
+           id="feMergeNode25658"
+           in="offsetBlur" />
+        <feMergeNode
+           id="feMergeNode25660"
+           in="SourceGraphic" />
+      </feMerge>
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix25757" />
+      <feGaussianBlur
+         id="feGaussianBlur25759"
+         in="fbSourceGraphicAlpha"
+         stdDeviation="3.9"
+         result="blur" />
+      <feColorMatrix
+         id="feColorMatrix25761"
+         result="bluralpha"
+         type="matrix"
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.7 0 " />
+      <feOffset
+         id="feOffset25763"
+         in="bluralpha"
+         dx="-6.2"
+         dy="-5.3"
+         result="offsetBlur" />
+      <feMerge
+         id="feMerge25765">
+        <feMergeNode
+           id="feMergeNode25767"
+           in="offsetBlur" />
+        <feMergeNode
+           id="feMergeNode25769"
+           in="fbSourceGraphic" />
+      </feMerge>
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25198"
+       id="linearGradient25676"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="-137.99643"
+       y1="-396.93387"
+       x2="-137.99643"
+       y2="-126.86163" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="294.99542"
+       y1="-541.98041"
+       x2="294.99542"
+       y2="-340.96005" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25680"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="154.64746"
+       y1="-464.22653"
+       x2="154.64746"
+       y2="-235.71924" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25682"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="58.556332"
+       y1="-453.95908"
+       x2="58.556332"
+       y2="-207.48184" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25684"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="-23.901735"
+       y1="-395.92374"
+       x2="-23.901735"
+       y2="-127.22314" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25686"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="1.4187797"
+       y1="-226.37386"
+       x2="25.222071"
+       y2="-357.6937" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25688"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="110.11074"
+       y1="-251.80611"
+       x2="110.10816"
+       y2="-366.9635" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25690"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="263.52002"
+       y1="-355.83359"
+       x2="247.50426"
+       y2="-430.5849" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25692"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="-90.669044"
+       y1="-201.89088"
+       x2="5.2316294"
+       y2="-278.55612" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25240"
+       id="linearGradient25694"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="-66.820183"
+       y1="-219.86819"
+       x2="-167.80438"
+       y2="-263.30475" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Ebene 1"
+     transform="translate(-85.751851,-50.143842)">
+    <path
+       sodipodi:nodetypes="ccccccccsccccccccccccccscc"
+       inkscape:connector-curvature="0"
+       id="path24376"
+       d="m 210.78464,205.17893 33.625,21.59375 0,250.25 -33.625,21.6562 -33.18751,-21.28125 0,-12.5 c -2.71593,1.65038 -5.68869,3.7008 -8.1875,5.2182 -2.66735,1.59189 -5.5312,2.58147 -8.625,2.96875 -6.56958,0.61258 -13.95294,-1.69408 -22.125,-6.9375 -17.14494,-11.0007 -30.60057,-29.60031 -40.374999,-55.8125 -8.33205,-22.34817 -12.49981,-45.27199 -12.5,-68.78125 1.2e-4,-23.92856 4.16814,-41.61612 12.5,-53.0625 2.291899,-3.15591 4.802869,-5.62639 7.499999,-7.4375 11.22554,-7.21187 22.37523,-14.45034 33.625,-21.65625 0.0397,-0.0251 0.0853,-0.0377 0.125,-0.0625 8.78878,-5.83756 19.70528,-4.57729 32.78125,3.8125 1.62562,1.04308 3.2281,2.21393 4.8125,3.4375 l 0,-39.75 z m -57.21876,129.5625 c -0.14798,2.18981 -0.24998,4.49946 -0.25,6.90625 1e-4,13.43402 2.26351,26.40329 6.75,38.9375 4.27676,12.0814 9.9558,21.31103 17.0625,27.65625 0.16222,-2.3148 0.25,-4.75196 0.25,-7.3125 4e-5,-13.22367 -2.32203,-26.24676 -6.96875,-39.09375 -4.33953,-11.81297 -9.96249,-20.84154 -16.84375,-27.09375 z"
+       style="font-size:275.09402466px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-11.67278576px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient25694);fill-opacity:1;stroke:none;font-family:TitilliumMaps29L;-inkscape-font-specification:TitilliumMaps29L"
+       inkscape:export-filename="/Users/Tobi/Dropbox/Inkscape/Logos/bino 3d player/bino_3d_player_klein.png"
+       inkscape:export-xdpi="90.349998"
+       inkscape:export-ydpi="90.349998" />
+    <path
+       style="font-size:275.09402466px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-11.67278576px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient25692);fill-opacity:1;stroke:none;font-family:TitilliumMaps29L;-inkscape-font-specification:TitilliumMaps29L"
+       d="m 210.79489,205.17893 -33.625,21.59375 0,250.25 33.625,21.6562 33.1875,-21.28125 0,-12.5 c 2.71593,1.65038 5.6887,3.7008 8.1875,5.2182 2.66736,1.59189 5.53121,2.58147 8.625,2.96875 6.56959,0.61258 13.95294,-1.69408 22.125,-6.9375 17.14495,-11.0007 30.60057,-29.60031 40.375,-55.8125 8.33205,-22.34817 12.49981,-45.27199 12.5,-68.78125 -1.2e-4,-23.92856 -4.16814,-41.61612 -12.5,-53.0625 -2.2919,-3.15591 -4.80287,-5.62639 -7.5,-7.4375 -11.22553,-7.21187 -22.37522,-14.45034 -33.625,-21.65625 -0.0397,-0.0251 -0.0853,-0.0377 -0.125,-0.0625 -8.78877,-5.83756 -19.70527,-4.57729 -32.78125,3.8125 -1.62562,1.04308 -3.2281,2.21393 -4.8125,3.4375 l 0,-39.75 z m 57.21875,129.5625 c 0.14798,2.18981 0.24998,4.49946 0.25,6.90625 -9e-5,13.43402 -2.2635,26.40329 -6.75,38.9375 -4.27675,12.0814 -9.9558,21.31103 -17.0625,27.65625 -0.16221,-2.3148 -0.24999,-4.75196 -0.25,-7.3125 -3e-5,-13.22367 2.32204,-26.24676 6.96875,-39.09375 4.33954,-11.81297 9.96249,-20.84154 16.84375,-27.09375 z"
+       id="path21425"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccsccccccccccccccscc"
+       inkscape:export-filename="/Users/Tobi/Dropbox/Inkscape/Logos/bino 3d player/bino_3d_player_klein.png"
+       inkscape:export-xdpi="90.349998"
+       inkscape:export-ydpi="90.349998" />
+    <path
+       style="font-size:275.09402466px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-8.99922943px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient25690);fill-opacity:1;stroke:none;font-family:MgOpen Moderna;-inkscape-font-specification:MgOpen Moderna Bold"
+       d="m 578.51364,60.147682 c -8.74276,0.0972 -18.69876,3.73543 -29.875,10.90625 -19.70883,12.64592 -35.66594,31.608478 -47.84375,56.843748 -12.01765,24.92317 -18,50.48079 -18,76.71875 0,26.02821 6.07212,43.6552 18.25,52.84375 12.6911,8.08416 24.26138,15.96695 35.21795,22.7169 0.076,0.0504 0.14243,0.10667 0.21875,0.15625 11.92929,7.75013 27.20508,5.65779 45.8125,-6.28125 19.86908,-12.74858 35.88453,-31.52775 48.0625,-56.34375 12.17775,-24.81582 18.24987,-50.2217 18.25,-76.25 -1.3e-4,-26.02796 -6.07225,-43.860131 -18.25,-53.468748 -12.45439,-8.26181 -25.1967,-16.38414 -35.96875,-23.3125 -4.74696,-3.07906 -10.04649,-4.59603 -15.875,-4.53125 z m 0.25,73.156248 c 0.26497,2.86264 0.40623,5.9038 0.40625,9.15625 -9e-5,14.06374 -2.41179,27.47891 -7.21875,40.21875 -4.89366,13.03041 -11.50296,22.81431 -19.8125,29.40625 -0.2512,-2.76035 -0.37501,-5.69351 -0.375,-8.8125 -5e-5,-13.85357 2.41165,-27.2375 7.21875,-40.1875 4.96376,-13.40295 11.55371,-23.32799 19.78125,-29.78125 z"
+       id="path19697"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccscccsssccsccccsccc"
+       inkscape:export-filename="/Users/Tobi/Dropbox/Inkscape/Logos/bino 3d player/bino_3d_player_klein.png"
+       inkscape:export-xdpi="90.349998"
+       inkscape:export-ydpi="90.349998" />
+    <path
+       style="font-size:275.09402466px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-11.54173183px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient25688);fill-opacity:1;stroke:none;font-family:TitilliumMaps29L;-inkscape-font-specification:TitilliumMaps29L"
+       d="m 449.63864,139.96018 c -5.7571,0.10753 -12.39423,2.57532 -19.875,7.375 -7.69124,4.93508 -14.98505,11.89912 -21.875,20.9375 l 0,0.0312 c -3.48728,4.57485 -6.61678,9.36513 -9.40625,14.40625 l 0,-0.125 c -1.57271,-1.07221 -7.15625,-4.59375 -7.15625,-4.59375 l -33.65625,21.59375 0,169.6875 33.65625,21.6563 34.59375,-22.21875 0,-100.125 c -3e-5,-9.65547 2.55994,-19.69814 7.6875,-30.125 1.6712,-3.39418 3.44922,-6.46641 5.3125,-9.25 l 0,87.9375 33.625,21.65625 34.625,-22.21875 0,-115.53125 c -1.1e-4,-17.63178 -4.0196,-29.45293 -12.03125,-35.4375 -0.63496,-0.50923 -1.29816,-0.93151 -1.96875,-1.34375 -0.0368,-0.0226 -0.0569,-0.0714 -0.0937,-0.0937 -0.0316,-0.0207 -0.062,-0.042 -0.0937,-0.0625 -10.79326,-7.01074 -21.66775,-13.88064 -32.4375,-20.875 -0.0828,-0.0543 -0.16662,-0.10347 -0.25,-0.15625 -3.14902,-2.15458 -6.68852,-3.19911 -10.65625,-3.125 z"
+       id="path20147"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccscccccsccccccsc"
+       inkscape:export-filename="/Users/Tobi/Dropbox/Inkscape/Logos/bino 3d player/bino_3d_player_klein.png"
+       inkscape:export-xdpi="90.349998"
+       inkscape:export-ydpi="90.349998" />
+    <path
+       style="font-size:275.09402466px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-8.99922943px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient25686);fill-opacity:1;stroke:none;font-family:MgOpen Moderna;-inkscape-font-specification:MgOpen Moderna Bold"
+       d="m 346.20114,147.11643 -34.59375,22.1875 0,41.5625 14.34375,9.0625 -14.34375,9.21875 0,169.6875 33.625,21.65625 34.625,-22.21875 0,-169.71875 -14.34375,-9.03125 14.34375,-9.21875 0,-41.5625 z"
+       id="path20723"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:export-filename="/Users/Tobi/Dropbox/Inkscape/Logos/bino 3d player/bino_3d_player_klein.png"
+       inkscape:export-xdpi="90.349998"
+       inkscape:export-ydpi="90.349998" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path11858"
+       style="font-size:275.09402466px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-11.67278576px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient25684);fill-opacity:1;stroke:none;font-family:TitilliumMaps29L;-inkscape-font-specification:TitilliumMaps29L"
+       d="m 282.90673,466.14963 c -8.17206,5.24342 -15.54287,7.55885 -22.11246,6.94627 -6.56969,-0.82239 -11.73597,-4.55014 -16.38276,-10.80445 l 0,14.90333 -33.67759,21.47137 0,-250.23873 33.71636,-21.59041 0,109.39269 c 4.00584,-10.96629 9.45383,-20.96891 16.34399,-30.0079 6.89006,-9.24849 14.26087,-16.39171 22.11246,-21.42969 17.14508,-11.0006 30.60482,-9.77125 40.37927,3.68805 8.33211,11.44636 12.49823,29.13399 12.49835,53.06292 -1.2e-4,23.50945 -4.16624,46.43831 -12.49835,68.78665 -9.77445,26.21251 -23.23419,44.81912 -40.37927,55.8199 m -9.37376,-135.67109 c -9.45393,6.06604 -16.90486,16.51419 -22.35281,31.34447 -4.64686,12.84718 -6.97027,25.88268 -6.97024,39.10655 -3e-5,13.22408 2.16314,23.17096 6.48953,29.84067 5.28772,8.15204 12.65853,9.19508 22.11246,3.12913 9.61404,-6.16861 17.06497,-16.7217 22.35281,-31.65932 4.4865,-12.53421 6.72979,-25.51831 6.72988,-38.95233 -9e-5,-13.01393 -2.16326,-22.85586 -6.48952,-29.52581 -5.28785,-8.15179 -12.57854,-9.24625 -21.87211,-3.28336"
+       sodipodi:nodetypes="ccccccccccccccccscscccc"
+       inkscape:export-filename="/Users/Tobi/Dropbox/Inkscape/Logos/bino 3d player/bino_3d_player_klein.png"
+       inkscape:export-xdpi="90.349998"
+       inkscape:export-ydpi="90.349998" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path11860"
+       style="font-size:275.09402466px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-8.99922943px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient25682);fill-opacity:1;stroke:none;font-family:MgOpen Moderna;-inkscape-font-specification:MgOpen Moderna Bold"
+       d="m 379.85662,210.30687 -34.61081,22.20728 0,-41.56109 34.61081,-22.20729 0,41.5611 m 0,187.96951 -34.61081,22.20728 0,-169.70782 34.61081,-22.20728 0,169.70782"
+       inkscape:export-filename="/Users/Tobi/Dropbox/Inkscape/Logos/bino 3d player/bino_3d_player_klein.png"
+       inkscape:export-xdpi="90.349998"
+       inkscape:export-ydpi="90.349998" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path11862"
+       style="font-size:275.09402466px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-11.54173183px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient25680);fill-opacity:1;stroke:none;font-family:TitilliumMaps29L;-inkscape-font-specification:TitilliumMaps29L"
+       d="m 507.16231,316.59341 -34.6108,22.20728 0,-102.64332 c -9e-5,-9.23562 -1.52232,-15.92042 -4.56671,-20.05441 -3.52525,-4.87472 -8.73288,-5.10173 -15.62293,-0.68102 -7.21064,4.6267 -13.4598,12.30967 -18.74752,23.04894 -5.12756,10.42686 -7.69133,20.46802 -7.6913,30.12349 l 0,100.12447 -34.6108,22.20728 0,-169.70782 33.6494,-21.59041 0,20.15083 c 4.16607,-10.85918 9.69419,-20.80827 16.58435,-29.84725 6.89005,-9.03858 14.18074,-16.02545 21.8721,-20.96061 13.29943,-8.53313 23.87495,-9.65127 31.72657,-3.35441 8.01165,5.98457 12.01753,17.79274 12.01764,35.42452 l 0,115.55244"
+       inkscape:export-filename="/Users/Tobi/Dropbox/Inkscape/Logos/bino 3d player/bino_3d_player_klein.png"
+       inkscape:export-xdpi="90.349998"
+       inkscape:export-ydpi="90.349998" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path11864"
+       style="font-size:275.09402466px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-8.99922943px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient25678);fill-opacity:1;stroke:none;font-family:MgOpen Moderna;-inkscape-font-specification:MgOpen Moderna Bold"
+       d="m 582.28323,274.06111 c -19.54874,12.54302 -35.41201,14.22023 -47.58986,5.03161 -12.17788,-9.18855 -18.26682,-26.79692 -18.26682,-52.82513 0,-26.23796 6.00882,-51.81849 18.02647,-76.74166 12.17785,-25.23556 28.12123,-44.17632 47.83021,-56.822338 19.86908,-12.7484 35.89259,-14.31851 48.07056,-4.71034 12.17775,9.608617 18.26669,27.426888 18.26682,53.454848 -1.3e-4,26.0283 -6.08907,51.45034 -18.26682,76.26616 -12.17797,24.816 -28.20148,43.59827 -48.07056,56.34685 m -0.24035,-37.62861 c 10.09474,-6.47704 17.94626,-17.18222 23.55458,-32.11555 4.80696,-12.73984 7.21049,-26.1416 7.21058,-40.20534 -9e-5,-13.85354 -2.40362,-24.17096 -7.21058,-30.9523 -5.60832,-7.94616 -13.45984,-8.68076 -23.55458,-2.20383 -9.77441,6.27168 -17.46569,16.97899 -23.07387,32.12198 -4.8071,12.95 -7.21063,26.35176 -7.21058,40.20533 -5e-5,13.64389 2.40348,23.85636 7.21058,30.63744 5.60818,7.94643 13.29946,8.78384 23.07387,2.51227"
+       inkscape:export-filename="/Users/Tobi/Dropbox/Inkscape/Logos/bino 3d player/bino_3d_player_klein.png"
+       inkscape:export-xdpi="90.349998"
+       inkscape:export-ydpi="90.349998" />
+    <path
+       sodipodi:nodetypes="ccccccccccccccccscscccc"
+       d="m 138.62948,466.14963 c 8.17206,5.24342 15.54287,7.55885 22.11246,6.94627 6.56968,-0.82239 11.73597,-4.61328 16.38275,-10.86759 l 0,14.90333 33.61063,21.53451 0,-250.23873 -33.64939,-21.59041 0,109.39269 c -4.00584,-10.96629 -9.45384,-20.96891 -16.34399,-30.0079 -6.89006,-9.24849 -14.26087,-16.39171 -22.11246,-21.42969 -17.14508,-11.0006 -30.60483,-9.77125 -40.379279,3.68805 -8.33211,11.44636 -12.49822,29.13399 -12.49835,53.06292 1.3e-4,23.50945 4.16624,46.43831 12.49835,68.78665 9.774449,26.21251 23.234199,44.81912 40.379279,55.8199 m 9.37376,-135.67109 c 9.45393,6.06604 16.90486,16.51419 22.35281,31.34447 4.64686,12.84718 6.97027,25.88268 6.97023,39.10655 4e-5,13.22408 -2.16314,23.17096 -6.48952,29.84067 -5.28772,8.15204 -12.65853,9.19508 -22.11246,3.12913 -9.61405,-6.16861 -17.06498,-16.7217 -22.35282,-31.65932 -4.48649,-12.53421 -6.72979,-25.51831 -6.72988,-38.95233 9e-5,-13.01393 2.16327,-22.85586 6.48953,-29.52581 5.28784,-8.15179 12.57854,-9.24625 21.87211,-3.28336"
+       style="font-size:275.09402466px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-11.67278576px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient25676);fill-opacity:1;stroke:none;font-family:TitilliumMaps29L;-inkscape-font-specification:TitilliumMaps29L"
+       id="path24378"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/Tobi/Dropbox/Inkscape/Logos/bino 3d player/bino_3d_player_klein.png"
+       inkscape:export-xdpi="90.349998"
+       inkscape:export-ydpi="90.349998" />
+    <text
+       xml:space="preserve"
+       style="font-size:42.78503417999999670px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e30000;fill-opacity:1;stroke:none;filter:url(#filter25648);font-family:TitilliumMaps29L;-inkscape-font-specification:TitilliumMaps29L"
+       x="62.936035"
+       y="-134.17923"
+       id="text25280"
+       sodipodi:linespacing="125%"
+       transform="matrix(0.74185528,-0.4801257,0,1.3479718,308.67338,612.82754)"
+       inkscape:export-xdpi="90.349998"
+       inkscape:export-ydpi="90.349998"
+       inkscape:export-filename="/Users/Tobi/Dropbox/Inkscape/Logos/bino 3d player/bino_3d_player_klein.png"><tspan
+         sodipodi:role="line"
+         id="tspan25282"
+         x="62.936035"
+         y="-134.17923"
+         style="font-size:42.78503417999999670px;font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:TitilliumMaps29L;-inkscape-font-specification:TitilliumMaps29L Ultra-Bold;fill:#e30000;fill-opacity:1">free 3d video player</tspan></text>
+  </g>
+</svg>

bino-0.9.1.tar.bz2/src/logo/bino_logo_small.svg Added

@@ -0,0 +1,1011 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="250.04305"
+   height="303.49994"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48+devel r10068"
+   sodipodi:docname="bino_3d_player_icon.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="227.68849"
+     inkscape:cy="91.436074"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1436"
+     inkscape:window-height="856"
+     inkscape:window-x="4"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-top="10"
+     fit-margin-left="10"
+     fit-margin-right="10"
+     fit-margin-bottom="10" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient25240">
+      <stop
+         style="stop-color:#f00000;stop-opacity:1;"
+         offset="0"
+         id="stop25242" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop25244" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25228">
+      <stop
+         style="stop-color:#06439f;stop-opacity:1;"
+         offset="0"
+         id="stop25230" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop25232" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25222">
+      <stop
+         id="stop25224"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop25226"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25206">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop25208" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop25210" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25198">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop25200" />
+      <stop
+         style="stop-color:#be0000;stop-opacity:1;"
+         offset="1"
+         id="stop25202" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25184">
+      <stop
+         style="stop-color:#2a7fff;stop-opacity:1;"
+         offset="0"
+         id="stop25186" />
+      <stop
+         style="stop-color:#005ce6;stop-opacity:1;"
+         offset="1"
+         id="stop25188" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25176">
+      <stop
+         style="stop-color:#ffd52d;stop-opacity:1;"
+         offset="0"
+         id="stop25178" />
+      <stop
+         style="stop-color:#dbaf00;stop-opacity:1;"
+         offset="1"
+         id="stop25180" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25162">
+      <stop
+         style="stop-color:#d6ff2f;stop-opacity:1;"
+         offset="0"
+         id="stop25164" />
+      <stop
+         style="stop-color:#779500;stop-opacity:1;"
+         offset="1"
+         id="stop25166" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25148">
+      <stop
+         style="stop-color:#55d400;stop-opacity:1;"
+         offset="0"
+         id="stop25150" />
+      <stop
+         style="stop-color:#317a00;stop-opacity:1;"
+         offset="1"
+         id="stop25152" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective7096"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient3929">
+      <stop
+         id="stop3931"
+         offset="0"
+         style="stop-color:#8f1c1c;stop-opacity:1;" />
+      <stop
+         id="stop3933"
+         offset="1"
+         style="stop-color:#5e1a1a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3915">
+      <stop
+         style="stop-color:#af0000;stop-opacity:1;"
+         offset="0"
+         id="stop3917" />
+      <stop
+         style="stop-color:#540000;stop-opacity:1;"
+         offset="1"
+         id="stop3919" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3901">
+      <stop
+         style="stop-color:#c12626;stop-opacity:1;"
+         offset="0"
+         id="stop3903" />
+      <stop
+         style="stop-color:#5e1a1a;stop-opacity:1;"
+         offset="1"
+         id="stop3905" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3887">
+      <stop
+         id="stop3889"
+         offset="0"
+         style="stop-color:#af0000;stop-opacity:1;" />
+      <stop
+         id="stop3891"
+         offset="1"
+         style="stop-color:#540000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3869">
+      <stop
+         id="stop3871"
+         offset="0"
+         style="stop-color:#d52a2a;stop-opacity:1;" />
+      <stop
+         id="stop3873"
+         offset="1"
+         style="stop-color:#711f1f;stop-opacity:1;" />
+    </linearGradient>
+    <inkscape:path-effect
+       bendpath-nodetypes="cc"
+       vertical="false"
+       scale_y_rel="false"
+       prop_scale="1"
+       bendpath="M -514.33704,574.92098 -248.23005,466.34955"
+       is_visible="true"
+       id="path-effect3830"
+       effect="bend_path" />
+    <inkscape:path-effect
+       crossing_points_vector="-359.9896 | 767.08354 | 0 | 0 | 0 | 1 | 2.9126599e-15 | 13 | 1 | -380.05477 | 535.56238 | 1 | 1 | 0 | 1 | 0 | 8 | 1"
+       switcher_size="15"
+       add_other_stroke_width="true"
+       add_stroke_width="true"
+       prop_to_stroke_width="true"
+       interruption_width="3"
+       is_visible="true"
+       id="path-effect3828"
+       effect="knot" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect3826"
+       effect="spiro" />
+    <inkscape:path-effect
+       border_marks="both"
+       mark_dir="left"
+       offset="0"
+       shift="0"
+       major_mark_steps="5"
+       minor_mark_length="7"
+       mark_length="14"
+       mark_distance="20"
+       unit="px"
+       is_visible="true"
+       id="path-effect3824"
+       effect="ruler" />
+    <inkscape:path-effect
+       crossing_points_vector="-359.9896 | 767.08354 | 0 | 0 | 0 | 1 | 2.9126599e-15 | 13 | 1 | -380.05477 | 535.56238 | 1 | 1 | 0 | 1 | 0 | 8 | 1"
+       switcher_size="15"
+       add_other_stroke_width="true"
+       add_stroke_width="true"
+       prop_to_stroke_width="true"
+       interruption_width="3"
+       is_visible="true"
+       id="path-effect3822"
+       effect="knot" />
+    <inkscape:path-effect
+       bendpath4="m -514.33704,382.75842 0,384.32512"
+       bendpath3="m -514.33704,767.08354 267.53556,0"
+       bendpath2="m -246.80148,382.75842 0,384.32512"
+       bendpath1="m -514.33704,382.75842 267.53556,0"
+       xx="true"
+       yy="true"
+       is_visible="true"
+       id="path-effect3820"
+       effect="envelope" />
+    <inkscape:path-effect
+       bendpath4="m 66.504545,773.4785 0,417.0081"
+       bendpath3="m 66.504545,1190.4866 244.272525,0"
+       bendpath2="m 310.77707,773.4785 0,417.0081"
+       bendpath1="m 66.504545,773.4785 244.272525,0"
+       xx="true"
+       yy="true"
+       is_visible="true"
+       id="path-effect3807"
+       effect="envelope" />
+    <inkscape:path-effect
+       maxComplexity="1000"
+       drawall="true"
+       nbgenerations="1"
+       similar_only="false"
+       generator="m 66.504545,1190.4866 81.424175,0 m 81.42417,0 81.42418,0"
+       ref_path="m 66.504545,981.98255 244.272525,0"
+       is_visible="true"
+       id="path-effect3033"
+       effect="vonkoch" />
+    <inkscape:path-effect
+       scale_y_rel="false"
+       prop_scale="1"
+       strokepath="M 0,0 1,0"
+       endpoint_spacing_variation="0;1"
+       endpoint_edge_variation="0;1"
+       startpoint_spacing_variation="0;1"
+       startpoint_edge_variation="0;1"
+       count="5"
+       is_visible="true"
+       id="path-effect3031"
+       effect="curvestitching" />
+    <inkscape:path-effect
+       steps="5"
+       equidistant_spacing="true"
+       trajectory="M 0,0 0,0"
+       is_visible="true"
+       id="path-effect3029"
+       effect="interpolate" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect3027"
+       effect="spiro" />
+    <inkscape:path-effect
+       tgtlength_rdm="0.3;1"
+       tgtlength="100"
+       tgtscale="10"
+       tgt_places_rdmness="1;1"
+       nbtangents="5"
+       tremble_frequency="1"
+       tremble_size="5;1"
+       parallel_offset="5;1"
+       ends_tolerance="0.1;1"
+       strokeoverlap_rdm="0.3;1"
+       strokeoverlap="0.3"
+       strokelength_rdm="0.3;1"
+       strokelength="100"
+       nbiter_approxstrokes="5"
+       is_visible="true"
+       id="path-effect3025"
+       effect="sketch" />
+    <inkscape:path-effect
+       back_thickness="0.25"
+       front_thickness="1"
+       stroke_width_bottom="1"
+       stroke_width_top="1"
+       fat_output="true"
+       bottom_smth_variation="0;1"
+       top_smth_variation="0;1"
+       scale_tb="1"
+       scale_tf="1"
+       scale_bb="1"
+       scale_bf="1"
+       top_tgt_variation="0;1"
+       bottom_tgt_variation="0;1"
+       top_edge_variation="41.70081;1"
+       bottom_edge_variation="41.70081;1"
+       bender="188.64081,981.98255 , 5,0"
+       do_bend="true"
+       growth="0"
+       dist_rdm="75.1;1"
+       direction="188.64081,976.98255 , 61.068131,0"
+       is_visible="true"
+       id="path-effect3023"
+       effect="rough_hatches" />
+    <inkscape:path-effect
+       back_thickness="0.25"
+       front_thickness="1"
+       stroke_width_bottom="1"
+       stroke_width_top="1"
+       fat_output="true"
+       bottom_smth_variation="0;1"
+       top_smth_variation="0;1"
+       scale_tb="1"
+       scale_tf="1"
+       scale_bb="1"
+       scale_bf="1"
+       top_tgt_variation="0;1"
+       bottom_tgt_variation="0;1"
+       top_edge_variation="41.70081;1"
+       bottom_edge_variation="41.70081;1"
+       bender="191.49795,871.98255 , 5,0"
+       do_bend="true"
+       growth="0"
+       dist_rdm="75;1"
+       direction="191.49795,866.98255 , 61.068133,0"
+       is_visible="true"
+       id="path-effect3014"
+       effect="rough_hatches" />
+    <inkscape:path-effect
+       fuse_tolerance="0"
+       vertical_pattern="false"
+       prop_units="false"
+       tang_offset="0"
+       normal_offset="0"
+       spacing="0"
+       scale_y_rel="false"
+       prop_scale="1"
+       copytype="single_stretched"
+       pattern="M 0,0 1,0"
+       is_visible="true"
+       id="path-effect3012"
+       effect="skeletal" />
+    <inkscape:path-effect
+       fuse_tolerance="0"
+       vertical_pattern="false"
+       prop_units="false"
+       tang_offset="0"
+       normal_offset="0"
+       spacing="0"
+       scale_y_rel="false"
+       prop_scale="1"
+       copytype="single_stretched"
+       pattern="M 0,0 1,0"
+       is_visible="true"
+       id="path-effect3010"
+       effect="skeletal" />
+    <inkscape:path-effect
+       border_marks="both"
+       mark_dir="left"
+       offset="0"
+       shift="0"
+       major_mark_steps="5"
+       minor_mark_length="7"
+       mark_length="14"
+       mark_distance="20"
+       unit="px"
+       is_visible="true"
+       id="path-effect3008"
+       effect="ruler" />
+    <inkscape:path-effect
+       crossing_points_vector="135.66424 | 792.01238 | 0 | 0 | 0 | 3 | 0.99971396 | 1 | 1 | 135.66423 | 792.01238 | 0 | 0 | 1 | 2 | 0.99988558 | 1 | 1 | 135.66423 | 792.01189 | 0 | 1 | 0 | 0 | 1.0000038 | 1.0000038 | 1 | 135.66423 | 792.01091 | 0 | 1 | 0 | 0 | 1.0000114 | 1.0000038 | 1 | 135.66423 | 792.01189 | 0 | 1 | 0 | 0 | 1.0000038 | 1.0000114 | 1 | 135.66423 | 792.01091 | 0 | 1 | 0 | 0 | 1.0000114 | 1.0000114 | 1 | 135.66423 | 792.00993 | 0 | 1 | 0 | 0 | 1.0000191 | 1.0000038 | 1 | 135.66423 | 792.00895 | 0 | 1 | 0 | 0 | 1.0000267 | 1.0000038 | 1 | 135.66423 | 792.00993 | 0 | 1 | 0 | 0 | 1.0000191 | 1.0000114 | 1 | 135.66423 | 792.00895 | 0 | 1 | 0 | 0 | 1.0000267 | 1.0000114 | 1 | 135.66423 | 792.01189 | 0 | 1 | 0 | 0 | 1.0000038 | 1.0000191 | 1 | 135.66423 | 792.01189 | 0 | 1 | 0 | 0 | 1.0000038 | 1.0000267 | 1 | 135.66423 | 792.01091 | 0 | 1 | 0 | 0 | 1.0000114 | 1.0000191 | 1 | 135.66423 | 792.01091 | 0 | 1 | 5 | 0 | 1.0000114 | 1.0000267 | 1 | 135.66423 | 792.00993 | 0 | 1 | 0 | 0 | 1.0000191 | 1.0000191 | 1 | 135.66423 | 792.00895 | 0 | 1 | 0 | 0 | 1.0000267 | 1.0000191 | 1 | 135.66423 | 792.00993 | 0 | 1 | 6 | 0 | 1.0000191 | 1.0000267 | 1 | 135.66423 | 792.00895 | 0 | 1 | 7 | 0 | 1.0000267 | 1.0000267 | 1 | 135.66423 | 792.00797 | 0 | 1 | 0 | 0 | 1.0000343 | 1.0000038 | 1 | 135.66423 | 792.00699 | 0 | 1 | 0 | 0 | 1.000042 | 1.0000038 | 1 | 135.66423 | 792.00797 | 0 | 1 | 0 | 0 | 1.0000343 | 1.0000114 | 1 | 135.66423 | 792.00699 | 0 | 1 | 0 | 0 | 1.000042 | 1.0000114 | 1 | 135.66423 | 792.00601 | 0 | 1 | 0 | 0 | 1.0000496 | 1.0000038 | 1 | 135.66423 | 792.00503 | 0 | 1 | 0 | 3 | 1.0000572 | 1.0000038 | 1 | 135.66423 | 792.00601 | 0 | 1 | 0 | 0 | 1.0000496 | 1.0000114 | 1 | 135.66423 | 792.00503 | 0 | 1 | 0 | 4 | 1.0000572 | 1.0000114 | 1 | 135.66423 | 792.00797 | 0 | 1 | 0 | 0 | 1.0000343 | 1.0000191 | 1 | 135.66423 | 792.00699 | 0 | 1 | 0 | 0 | 1.000042 | 1.0000191 | 1 | 135.66423 | 792.00797 | 0 | 1 | 8 | 0 | 1.0000343 | 1.0000267 | 1 | 135.66423 | 792.00699 | 0 | 1 | 9 | 0 | 1.000042 | 1.0000267 | 1 | 135.66423 | 792.00601 | 0 | 1 | 0 | 0 | 1.0000496 | 1.0000191 | 1 | 135.66423 | 792.00503 | 0 | 1 | 0 | 5 | 1.0000572 | 1.0000191 | 1 | 135.66423 | 792.00601 | 0 | 1 | 10 | 0 | 1.0000496 | 1.0000267 | 1 | 135.66423 | 792.00503 | 0 | 1 | 11 | 6 | 1.0000572 | 1.0000267 | 1 | 135.66423 | 792.01189 | 0 | 1 | 0 | 7 | 1.0000038 | 1.0000343 | 1 | 135.66423 | 792.01189 | 0 | 1 | 4 | 8 | 1.0000038 | 1.000042 | 1 | 135.66423 | 1020.0001 | 1 | 1 | 1 | 2 | 0.99983724 | 1 | 1 | 173.46831 | 1022.3265 | 1 | 1 | 0 | 9 | 4.294784e-16 | 5 | 1"
+       switcher_size="15"
+       add_other_stroke_width="true"
+       add_stroke_width="true"
+       prop_to_stroke_width="true"
+       interruption_width="3.1"
+       is_visible="true"
+       id="path-effect3006"
+       effect="knot" />
+    <inkscape:path-effect
+       bendpath1-nodetypes="cc"
+       bendpath4="m 69.361688,663.4785 0,417.0081"
+       bendpath3="m 69.361688,1080.4866 244.272532,0"
+       bendpath2="m 313.63422,663.4785 0,417.0081"
+       bendpath1="m 69.361688,663.4785 c 121.424182,-48.09524 2397.703712,585.7867 -10.013182,0"
+       xx="true"
+       yy="true"
+       is_visible="true"
+       id="path-effect3004"
+       effect="envelope" />
+    <inkscape:path-effect
+       nr_y="5"
+       nr_x="4"
+       is_visible="true"
+       id="path-effect3002"
+       effect="construct_grid" />
+    <inkscape:path-effect
+       vertical="false"
+       scale_y_rel="false"
+       prop_scale="1.07"
+       bendpath="m 69.361688,871.98255 244.272532,0"
+       is_visible="true"
+       id="path-effect3000"
+       effect="bend_path" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="981.20905"
+       x2="310.71057"
+       y1="981.20905"
+       x1="66.438042"
+       id="linearGradient3875"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1255.3976"
+       x2="203.63234"
+       y1="812.63562"
+       x1="203.63234"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3877"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="981.20905"
+       x2="310.71057"
+       y1="981.20905"
+       x1="66.438042"
+       id="linearGradient3897"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1258.0605"
+       x2="204.9648"
+       y1="812.29944"
+       x1="204.9648"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3899"
+       xlink:href="#linearGradient3901"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="801.79364"
+       x2="182.48363"
+       y1="1243.5411"
+       x1="190.57265"
+       id="linearGradient3913"
+       xlink:href="#linearGradient3929"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1185.9991"
+       x2="197.48891"
+       y1="809.82562"
+       x1="197.48891"
+       id="linearGradient3927"
+       xlink:href="#linearGradient3929"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1258.0605"
+       x2="204.9648"
+       y1="812.29944"
+       x1="204.9648"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3391"
+       xlink:href="#linearGradient3901"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="981.20905"
+       x2="310.71057"
+       y1="981.20905"
+       x1="66.438042"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3393"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(-0.7405178,-0.47250837,0,0.87820187,-507.79853,2.5901693)"
+       y2="1258.0605"
+       x2="204.9648"
+       y1="812.29944"
+       x1="204.9648"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3396"
+       xlink:href="#linearGradient3901"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1255.3976"
+       x2="203.63234"
+       y1="812.63562"
+       x1="203.63234"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3398"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="981.20905"
+       x2="310.71057"
+       y1="981.20905"
+       x1="66.438042"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3400"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.7405178,-0.47250837,0,0.87820187,-606.19563,2.5901693)"
+       y2="1255.3976"
+       x2="203.63234"
+       y1="812.63562"
+       x1="203.63234"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3403"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1255.3976"
+       x2="203.63234"
+       y1="812.63562"
+       x1="203.63234"
+       gradientTransform="matrix(0.7405178,-0.47250837,0,0.87820187,-645.48134,-18.838402)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7674"
+       xlink:href="#linearGradient3869"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1258.0605"
+       x2="204.9648"
+       y1="812.29944"
+       x1="204.9648"
+       gradientTransform="matrix(-0.7405178,-0.47250837,0,0.87820187,-800.65567,10.447312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7676"
+       xlink:href="#linearGradient3901"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25190"
+       x1="294.99542"
+       y1="-541.98041"
+       x2="294.99542"
+       y2="-340.96005"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25192"
+       x1="154.64746"
+       y1="-464.22653"
+       x2="154.64746"
+       y2="-235.71924"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25194"
+       x1="58.556332"
+       y1="-453.95908"
+       x2="58.556332"
+       y2="-207.48184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25196"
+       x1="-23.901735"
+       y1="-395.92374"
+       x2="-23.901735"
+       y2="-127.22314"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25198"
+       id="linearGradient25204"
+       x1="-137.99643"
+       y1="-396.93387"
+       x2="-137.99643"
+       y2="-126.86163"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25212"
+       x1="263.52002"
+       y1="-355.83359"
+       x2="247.50426"
+       y2="-430.5849"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25214"
+       x1="110.11074"
+       y1="-251.80611"
+       x2="110.10816"
+       y2="-366.9635"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25216"
+       x1="1.4187797"
+       y1="-226.37386"
+       x2="25.222071"
+       y2="-357.6937"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25238"
+       x1="-90.669044"
+       y1="-201.89088"
+       x2="5.2316294"
+       y2="-278.55612"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25240"
+       id="linearGradient25246"
+       x1="-66.820183"
+       y1="-219.86819"
+       x2="-167.80438"
+       y2="-263.30475"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(294.96454,630.33518)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25240"
+       id="linearGradient25256"
+       gradientUnits="userSpaceOnUse"
+       x1="-66.820183"
+       y1="-219.86819"
+       x2="-167.80438"
+       y2="-263.30475"
+       gradientTransform="translate(737.41135,-294.96454)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25258"
+       gradientUnits="userSpaceOnUse"
+       x1="-90.669044"
+       y1="-201.89088"
+       x2="5.2316294"
+       y2="-278.55612"
+       gradientTransform="translate(737.41135,-294.96454)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25260"
+       gradientUnits="userSpaceOnUse"
+       x1="-23.901735"
+       y1="-395.92374"
+       x2="-23.901735"
+       y2="-127.22314"
+       gradientTransform="translate(737.41135,-294.96454)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25198"
+       id="linearGradient25262"
+       gradientUnits="userSpaceOnUse"
+       x1="-137.99643"
+       y1="-396.93387"
+       x2="-137.99643"
+       y2="-126.86163"
+       gradientTransform="translate(737.41135,-294.96454)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25240"
+       id="linearGradient25272"
+       gradientUnits="userSpaceOnUse"
+       x1="-66.820183"
+       y1="-219.86819"
+       x2="-167.80438"
+       y2="-263.30475"
+       gradientTransform="matrix(0.12797797,0,0,0.12797797,494.19632,-474.10199)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25274"
+       gradientUnits="userSpaceOnUse"
+       x1="-90.669044"
+       y1="-201.89088"
+       x2="5.2316294"
+       y2="-278.55612"
+       gradientTransform="matrix(0.12797797,0,0,0.12797797,494.19632,-474.10199)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25276"
+       gradientUnits="userSpaceOnUse"
+       x1="-23.901735"
+       y1="-395.92374"
+       x2="-23.901735"
+       y2="-127.22314"
+       gradientTransform="matrix(0.12797797,0,0,0.12797797,494.19632,-474.10199)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25198"
+       id="linearGradient25278"
+       gradientUnits="userSpaceOnUse"
+       x1="-137.99643"
+       y1="-396.93387"
+       x2="-137.99643"
+       y2="-126.86163"
+       gradientTransform="matrix(0.12797797,0,0,0.12797797,494.19632,-474.10199)" />
+    <filter
+       id="filter25480"
+       inkscape:label="Drop shadow"
+       width="1.5"
+       height="1.5"
+       x="-0.25"
+       y="-0.25"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur25482"
+         in="SourceAlpha"
+         stdDeviation="3.9"
+         result="blur" />
+      <feColorMatrix
+         id="feColorMatrix25484"
+         result="bluralpha"
+         type="matrix"
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 " />
+      <feOffset
+         id="feOffset25486"
+         in="bluralpha"
+         dx="-5.9"
+         dy="-3.8"
+         result="offsetBlur" />
+      <feMerge
+         id="feMerge25488">
+        <feMergeNode
+           id="feMergeNode25490"
+           in="offsetBlur" />
+        <feMergeNode
+           id="feMergeNode25492"
+           in="SourceGraphic" />
+      </feMerge>
+    </filter>
+    <filter
+       id="filter25648"
+       inkscape:label="Drop shadow"
+       width="1.5"
+       height="1.5"
+       x="-0.25"
+       y="-0.25"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur25650"
+         in="SourceAlpha"
+         stdDeviation="3.9"
+         result="blur" />
+      <feColorMatrix
+         id="feColorMatrix25652"
+         result="bluralpha"
+         type="matrix"
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 " />
+      <feOffset
+         id="feOffset25654"
+         in="bluralpha"
+         dx="-6.2"
+         dy="-5.3"
+         result="offsetBlur" />
+      <feMerge
+         id="feMerge25656"
+         result="fbSourceGraphic">
+        <feMergeNode
+           id="feMergeNode25658"
+           in="offsetBlur" />
+        <feMergeNode
+           id="feMergeNode25660"
+           in="SourceGraphic" />
+      </feMerge>
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix25757" />
+      <feGaussianBlur
+         id="feGaussianBlur25759"
+         in="fbSourceGraphicAlpha"
+         stdDeviation="3.9"
+         result="blur" />
+      <feColorMatrix
+         id="feColorMatrix25761"
+         result="bluralpha"
+         type="matrix"
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.7 0 " />
+      <feOffset
+         id="feOffset25763"
+         in="bluralpha"
+         dx="-6.2"
+         dy="-5.3"
+         result="offsetBlur" />
+      <feMerge
+         id="feMerge25765">
+        <feMergeNode
+           id="feMergeNode25767"
+           in="offsetBlur" />
+        <feMergeNode
+           id="feMergeNode25769"
+           in="fbSourceGraphic" />
+      </feMerge>
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25198"
+       id="linearGradient25676"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="-137.99643"
+       y1="-396.93387"
+       x2="-137.99643"
+       y2="-126.86163" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="294.99542"
+       y1="-541.98041"
+       x2="294.99542"
+       y2="-340.96005" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25680"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="154.64746"
+       y1="-464.22653"
+       x2="154.64746"
+       y2="-235.71924" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25682"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="58.556332"
+       y1="-453.95908"
+       x2="58.556332"
+       y2="-207.48184" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25184"
+       id="linearGradient25684"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="-23.901735"
+       y1="-395.92374"
+       x2="-23.901735"
+       y2="-127.22314" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25686"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="1.4187797"
+       y1="-226.37386"
+       x2="25.222071"
+       y2="-357.6937" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25688"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="110.11074"
+       y1="-251.80611"
+       x2="110.10816"
+       y2="-366.9635" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25690"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="263.52002"
+       y1="-355.83359"
+       x2="247.50426"
+       y2="-430.5849" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25228"
+       id="linearGradient25692"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="-90.669044"
+       y1="-201.89088"
+       x2="5.2316294"
+       y2="-278.55612" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25240"
+       id="linearGradient25694"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(302.10739,625.33518)"
+       x1="-66.820183"
+       y1="-219.86819"
+       x2="-167.80438"
+       y2="-263.30475" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Ebene 1"
+     transform="translate(-85.751851,-195.17893)">
+    <path
+       sodipodi:nodetypes="ccccccccsccccccccccccccscc"
+       inkscape:connector-curvature="0"
+       id="path24376"
+       d="m 210.78464,205.17893 33.625,21.59375 0,250.25 -33.625,21.6562 -33.18751,-21.28125 0,-12.5 c -2.71593,1.65038 -5.68869,3.7008 -8.1875,5.2182 -2.66735,1.59189 -5.5312,2.58147 -8.625,2.96875 -6.56958,0.61258 -13.95294,-1.69408 -22.125,-6.9375 -17.14494,-11.0007 -30.60057,-29.60031 -40.374999,-55.8125 -8.33205,-22.34817 -12.49981,-45.27199 -12.5,-68.78125 1.2e-4,-23.92856 4.16814,-41.61612 12.5,-53.0625 2.291899,-3.15591 4.802869,-5.62639 7.499999,-7.4375 11.22554,-7.21187 22.37523,-14.45034 33.625,-21.65625 0.0397,-0.0251 0.0853,-0.0377 0.125,-0.0625 8.78878,-5.83756 19.70528,-4.57729 32.78125,3.8125 1.62562,1.04308 3.2281,2.21393 4.8125,3.4375 l 0,-39.75 z m -57.21876,129.5625 c -0.14798,2.18981 -0.24998,4.49946 -0.25,6.90625 1e-4,13.43402 2.26351,26.40329 6.75,38.9375 4.27676,12.0814 9.9558,21.31103 17.0625,27.65625 0.16222,-2.3148 0.25,-4.75196 0.25,-7.3125 4e-5,-13.22367 -2.32203,-26.24676 -6.96875,-39.09375 -4.33953,-11.81297 -9.96249,-20.84154 -16.84375,-27.09375 z"
+       style="font-size:275.09402466px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-11.67278576px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient25694);fill-opacity:1;stroke:none;font-family:TitilliumMaps29L;-inkscape-font-specification:TitilliumMaps29L"
+       inkscape:export-filename="/Users/Tobi/Dropbox/Inkscape/Logos/bino 3d player/bino_3d_player_icon_klein.png"
+       inkscape:export-xdpi="90.349998"
+       inkscape:export-ydpi="90.349998" />
+    <path
+       style="font-size:275.09402466px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-11.67278576px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient25692);fill-opacity:1;stroke:none;font-family:TitilliumMaps29L;-inkscape-font-specification:TitilliumMaps29L"
+       d="m 210.79489,205.17893 -33.625,21.59375 0,250.25 33.625,21.6562 33.1875,-21.28125 0,-12.5 c 2.71593,1.65038 5.6887,3.7008 8.1875,5.2182 2.66736,1.59189 5.53121,2.58147 8.625,2.96875 6.56959,0.61258 13.95294,-1.69408 22.125,-6.9375 17.14495,-11.0007 30.60057,-29.60031 40.375,-55.8125 8.33205,-22.34817 12.49981,-45.27199 12.5,-68.78125 -1.2e-4,-23.92856 -4.16814,-41.61612 -12.5,-53.0625 -2.2919,-3.15591 -4.80287,-5.62639 -7.5,-7.4375 -11.22553,-7.21187 -22.37522,-14.45034 -33.625,-21.65625 -0.0397,-0.0251 -0.0853,-0.0377 -0.125,-0.0625 -8.78877,-5.83756 -19.70527,-4.57729 -32.78125,3.8125 -1.62562,1.04308 -3.2281,2.21393 -4.8125,3.4375 l 0,-39.75 z m 57.21875,129.5625 c 0.14798,2.18981 0.24998,4.49946 0.25,6.90625 -9e-5,13.43402 -2.2635,26.40329 -6.75,38.9375 -4.27675,12.0814 -9.9558,21.31103 -17.0625,27.65625 -0.16221,-2.3148 -0.24999,-4.75196 -0.25,-7.3125 -3e-5,-13.22367 2.32204,-26.24676 6.96875,-39.09375 4.33954,-11.81297 9.96249,-20.84154 16.84375,-27.09375 z"
+       id="path21425"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccsccccccccccccccscc"
+       inkscape:export-filename="/Users/Tobi/Dropbox/Inkscape/Logos/bino 3d player/bino_3d_player_icon_klein.png"
+       inkscape:export-xdpi="90.349998"
+       inkscape:export-ydpi="90.349998" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path11858"
+       style="font-size:275.09402466px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-11.67278576px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient25684);fill-opacity:1;stroke:none;font-family:TitilliumMaps29L;-inkscape-font-specification:TitilliumMaps29L"
+       d="m 282.90673,466.14963 c -8.17206,5.24342 -15.54287,7.55885 -22.11246,6.94627 -6.56969,-0.82239 -11.73597,-4.55014 -16.38276,-10.80445 l 0,14.90333 -33.67759,21.47137 0,-250.23873 33.71636,-21.59041 0,109.39269 c 4.00584,-10.96629 9.45383,-20.96891 16.34399,-30.0079 6.89006,-9.24849 14.26087,-16.39171 22.11246,-21.42969 17.14508,-11.0006 30.60482,-9.77125 40.37927,3.68805 8.33211,11.44636 12.49823,29.13399 12.49835,53.06292 -1.2e-4,23.50945 -4.16624,46.43831 -12.49835,68.78665 -9.77445,26.21251 -23.23419,44.81912 -40.37927,55.8199 m -9.37376,-135.67109 c -9.45393,6.06604 -16.90486,16.51419 -22.35281,31.34447 -4.64686,12.84718 -6.97027,25.88268 -6.97024,39.10655 -3e-5,13.22408 2.16314,23.17096 6.48953,29.84067 5.28772,8.15204 12.65853,9.19508 22.11246,3.12913 9.61404,-6.16861 17.06497,-16.7217 22.35281,-31.65932 4.4865,-12.53421 6.72979,-25.51831 6.72988,-38.95233 -9e-5,-13.01393 -2.16326,-22.85586 -6.48952,-29.52581 -5.28785,-8.15179 -12.57854,-9.24625 -21.87211,-3.28336"
+       sodipodi:nodetypes="ccccccccccccccccscscccc"
+       inkscape:export-filename="/Users/Tobi/Dropbox/Inkscape/Logos/bino 3d player/bino_3d_player_icon_klein.png"
+       inkscape:export-xdpi="90.349998"
+       inkscape:export-ydpi="90.349998" />
+    <path
+       sodipodi:nodetypes="ccccccccccccccccscscccc"
+       d="m 138.62948,466.14963 c 8.17206,5.24342 15.54287,7.55885 22.11246,6.94627 6.56968,-0.82239 11.73597,-4.61328 16.38275,-10.86759 l 0,14.90333 33.61063,21.53451 0,-250.23873 -33.64939,-21.59041 0,109.39269 c -4.00584,-10.96629 -9.45384,-20.96891 -16.34399,-30.0079 -6.89006,-9.24849 -14.26087,-16.39171 -22.11246,-21.42969 -17.14508,-11.0006 -30.60483,-9.77125 -40.379279,3.68805 -8.33211,11.44636 -12.49822,29.13399 -12.49835,53.06292 1.3e-4,23.50945 4.16624,46.43831 12.49835,68.78665 9.774449,26.21251 23.234199,44.81912 40.379279,55.8199 m 9.37376,-135.67109 c 9.45393,6.06604 16.90486,16.51419 22.35281,31.34447 4.64686,12.84718 6.97027,25.88268 6.97023,39.10655 4e-5,13.22408 -2.16314,23.17096 -6.48952,29.84067 -5.28772,8.15204 -12.65853,9.19508 -22.11246,3.12913 -9.61405,-6.16861 -17.06498,-16.7217 -22.35282,-31.65932 -4.48649,-12.53421 -6.72979,-25.51831 -6.72988,-38.95233 9e-5,-13.01393 2.16327,-22.85586 6.48953,-29.52581 5.28784,-8.15179 12.57854,-9.24625 21.87211,-3.28336"
+       style="font-size:275.09402466px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-11.67278576px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient25676);fill-opacity:1;stroke:none;font-family:TitilliumMaps29L;-inkscape-font-specification:TitilliumMaps29L"
+       id="path24378"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/Tobi/Dropbox/Inkscape/Logos/bino 3d player/bino_3d_player_icon_klein.png"
+       inkscape:export-xdpi="90.349998"
+       inkscape:export-ydpi="90.349998" />
+  </g>
+</svg>

bino-0.9.1.tar.bz2/src/logo/bino_logo_small_16x16.png Added

bino-0.9.1.tar.bz2/src/logo/bino_logo_small_32x32.png Added

bino-0.9.1.tar.bz2/src/logo/bino_logo_small_48x48.png Added

bino-0.9.1.tar.bz2/src/logo/bino_logo_small_64x64.png Added

bino-0.9.0.tar.bz2/src/main.cpp -> bino-0.9.1.tar.bz2/src/main.cpp Changed

bino-0.9.0.tar.bz2/src/media_input.cpp -> bino-0.9.1.tar.bz2/src/media_input.cpp Changed

@@ -33,6 +33,7 @@
 
 media_input::media_input() :
     _active_video_stream(-1), _active_audio_stream(-1),
+    _have_active_video_read(false), _have_active_audio_read(false), _last_audio_data_size(0),
     _initial_skip(0), _duration(-1)
 {
 }
@@ -228,9 +229,6 @@
 
     // Print summary
     msg::inf("Input:");
-    msg::inf("    Duration: %g seconds", duration() / 1e6f);
-    msg::inf("    Stereo layout: %s", video_frame::stereo_layout_to_string(
-                video_frame_template().stereo_layout, video_frame_template().stereo_layout_swap).c_str());
     for (int i = 0; i < video_streams(); i++)
     {
         int o, s;
@@ -253,6 +251,12 @@
     {
         msg::inf("    No audio.");
     }
+    msg::inf("    Duration: %g seconds", duration() / 1e6f);
+    if (video_streams() > 0)
+    {
+        msg::inf("    Stereo layout: %s", video_frame::stereo_layout_to_string(
+                    video_frame_template().stereo_layout, video_frame_template().stereo_layout_swap).c_str());
+    }
 }
 
 const std::string &media_input::id() const
@@ -349,6 +353,14 @@
 void media_input::set_stereo_layout(video_frame::stereo_layout_t layout, bool swap)
 {
     assert(stereo_layout_is_supported(layout, swap));
+    if (_have_active_video_read)
+    {
+        (void)finish_video_frame_read();
+    }
+    if (_have_active_audio_read)
+    {
+        (void)finish_audio_blob_read();
+    }
     int o, s;
     get_video_stream(_active_video_stream, o, s);
     const video_frame &t = _media_objects[o].video_frame_template(s);
@@ -356,6 +368,8 @@
     _video_frame.stereo_layout = layout;
     _video_frame.stereo_layout_swap = swap;
     _video_frame.set_view_dimensions();
+    // Reset active stream in case we switched to or from 'separate'.
+    select_video_stream(_active_video_stream);
     if (layout == video_frame::separate)
     {
         // If we switched the layout to 'separate', then we have to seek to the
@@ -371,10 +385,19 @@
 
 void media_input::select_video_stream(int video_stream)
 {
+    if (_have_active_video_read)
+    {
+        (void)finish_video_frame_read();
+    }
+    if (_have_active_audio_read)
+    {
+        (void)finish_audio_blob_read();
+    }
     assert(video_stream >= 0);
     assert(video_stream < video_streams());
     if (_video_frame.stereo_layout == video_frame::separate)
     {
+        _active_video_stream = 0;
         for (size_t i = 0; i < _media_objects.size(); i++)
         {
             for (int j = 0; j < _media_objects[i].video_streams(); j++)
@@ -385,10 +408,7 @@
     }
     else
     {
-        video_frame::stereo_layout_t layout = _video_frame.stereo_layout;
-        bool swap = _video_frame.stereo_layout_swap;
         _active_video_stream = video_stream;
-        set_stereo_layout(layout, swap);
         int o, s;
         get_video_stream(_active_video_stream, o, s);
         for (size_t i = 0; i < _media_objects.size(); i++)
@@ -403,6 +423,14 @@
 
 void media_input::select_audio_stream(int audio_stream)
 {
+    if (_have_active_video_read)
+    {
+        (void)finish_video_frame_read();
+    }
+    if (_have_active_audio_read)
+    {
+        (void)finish_audio_blob_read();
+    }
     assert(audio_stream >= 0);
     assert(audio_stream < audio_streams());
     _active_audio_stream = audio_stream;
@@ -420,6 +448,10 @@
 void media_input::start_video_frame_read()
 {
     assert(_active_video_stream >= 0);
+    if (_have_active_video_read)
+    {
+        return;
+    }
     if (_video_frame.stereo_layout == video_frame::separate)
     {
         int o0, s0, o1, s1;
@@ -434,11 +466,17 @@
         get_video_stream(_active_video_stream, o, s);
         _media_objects[o].start_video_frame_read(s);
     }
+    _have_active_video_read = true;
 }
 
 video_frame media_input::finish_video_frame_read()
 {
     assert(_active_video_stream >= 0);
+    if (!_have_active_video_read)
+    {
+        start_video_frame_read();
+    }
+    video_frame frame;
     if (_video_frame.stereo_layout == video_frame::separate)
     {
         int o0, s0, o1, s1;
@@ -446,47 +484,51 @@
         get_video_stream(1, o1, s1);
         video_frame f0 = _media_objects[o0].finish_video_frame_read(s0);
         video_frame f1 = _media_objects[o1].finish_video_frame_read(s1);
-        if (!f0.is_valid() || !f1.is_valid())
-        {
-            return video_frame();
-        }
-        video_frame frame = _video_frame;
-        for (int p = 0; p < 3; p++)
+        if (f0.is_valid() && f1.is_valid())
         {
-            frame.data[0][p] = f0.data[0][p];
-            frame.data[1][p] = f1.data[0][p];
-            frame.line_size[0][p] = f0.line_size[0][p];
-            frame.line_size[1][p] = f1.line_size[0][p];
+            frame = _video_frame;
+            for (int p = 0; p < 3; p++)
+            {
+                frame.data[0][p] = f0.data[0][p];
+                frame.data[1][p] = f1.data[0][p];
+                frame.line_size[0][p] = f0.line_size[0][p];
+                frame.line_size[1][p] = f1.line_size[0][p];
+            }
+            frame.presentation_time = f0.presentation_time;
         }
-        frame.presentation_time = f0.presentation_time;
-        return frame;
     }
     else
     {
         int o, s;
         get_video_stream(_active_video_stream, o, s);
         video_frame f = _media_objects[o].finish_video_frame_read(s);
-        if (!f.is_valid())
+        if (f.is_valid())
         {
-            return video_frame();
-        }
-        video_frame frame = _video_frame;
-        for (int p = 0; p < 3; p++)
-        {
-            frame.data[0][p] = f.data[0][p];
-            frame.line_size[0][p] = f.line_size[0][p];
+            frame = _video_frame;
+            for (int p = 0; p < 3; p++)
+            {
+                frame.data[0][p] = f.data[0][p];
+                frame.line_size[0][p] = f.line_size[0][p];
+            }
+            frame.presentation_time = f.presentation_time;
         }
-        frame.presentation_time = f.presentation_time;
-        return frame;
     }
+    _have_active_video_read = false;
+    return frame;
 }
 
 void media_input::start_audio_blob_read(size_t size)
 {
     assert(_active_audio_stream >= 0);
+    if (_have_active_audio_read)
+    {
+        return;
+    }
     int o, s;
     get_audio_stream(_active_audio_stream, o, s);
     _media_objects[o].start_audio_blob_read(s, size);
+    _last_audio_data_size = size;
+    _have_active_audio_read = true;
 }
 
 audio_blob media_input::finish_audio_blob_read()
@@ -494,6 +536,11 @@
     assert(_active_audio_stream >= 0);
     int o, s;
     get_audio_stream(_active_audio_stream, o, s);
+    if (!_have_active_audio_read)
+    {
+        start_audio_blob_read(_last_audio_data_size);
+    }
+    _have_active_audio_read = false;
     return _media_objects[o].finish_audio_blob_read(s);
 }
 
@@ -516,6 +563,14 @@
 
 void media_input::seek(int64_t pos)
 {
+    if (_have_active_video_read)
+    {
+        (void)finish_video_frame_read();
+    }
+    if (_have_active_audio_read)
+    {
+        (void)finish_audio_blob_read();
+    }
     for (size_t i = 0; i < _media_objects.size(); i++)
     {
         _media_objects[i].seek(pos);
@@ -524,11 +579,25 @@
 
 void media_input::close()
 {
-    _id = "";
-    for (size_t i = 0; i < _media_objects.size(); i++)
+    try
+    {
+        if (_have_active_video_read)
+        {
+            (void)finish_video_frame_read();
+        }
+        if (_have_active_audio_read)
+        {
+            (void)finish_audio_blob_read();
+        }
+        for (size_t i = 0; i < _media_objects.size(); i++)
+        {
+            _media_objects[i].close();
+        }
+    }
+    catch (...)
     {
-        _media_objects[i].close();
     }
+    _id = "";
     _media_objects.clear();
     _tag_names.clear();
     _tag_values.clear();

bino-0.9.0.tar.bz2/src/media_input.h -> bino-0.9.1.tar.bz2/src/media_input.h Changed

bino-0.9.0.tar.bz2/src/media_object.cpp -> bino-0.9.1.tar.bz2/src/media_object.cpp Changed

@@ -46,12 +46,79 @@
 #include "exc.h"
 #include "msg.h"
 #include "str.h"
+#include "thread.h"
 
 #include "media_object.h"
 
 
+// The read thread.
+// This thread reads packets from the AVFormatContext and stores them in the
+// appropriate packet queues.
+class read_thread : public thread
+{
+private:
+    const std::string _url;
+    struct ffmpeg_stuff *_ffmpeg;
+    bool _eof;
+
+public:
+    read_thread(const std::string &url, struct ffmpeg_stuff *ffmpeg);
+    void run();
+    void reset();
+    bool eof() const
+    {
+        return _eof;
+    }
+};
+
+// The video decode thread.
+// This thread reads packets from its packet queue and decodes them to video frames.
+class video_decode_thread : public thread
+{
+private:
+    std::string _url;
+    struct ffmpeg_stuff *_ffmpeg;
+    int _video_stream;
+    video_frame _frame;
+
+    int64_t handle_timestamp(int64_t timestamp);
+
+public:
+    video_decode_thread(const std::string &url, struct ffmpeg_stuff *ffmpeg, int video_stream);
+    void run();
+    const video_frame &frame()
+    {
+        return _frame;
+    }
+};
+
+// The audio decode thread.
+// This thread reads packets from its packet queue and decodes them to audio blobs.
+class audio_decode_thread : public thread
+{
+private:
+    std::string _url;
+    struct ffmpeg_stuff *_ffmpeg;
+    int _audio_stream;
+    audio_blob _blob;
+
+    int64_t handle_timestamp(int64_t timestamp);
+
+public:
+    audio_decode_thread(const std::string &url, struct ffmpeg_stuff *ffmpeg, int audio_stream);
+    void run();
+    const audio_blob &blob()
+    {
+        return _blob;
+    }
+};
+
+
 // Hide the FFmpeg stuff so that their messy header files cannot cause problems
 // in other source files.
+
+static const size_t audio_tmpbuf_size = (AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2;
+
 struct ffmpeg_stuff
 {
     AVFormatContext *format_ctx;
@@ -59,14 +126,16 @@
     bool have_active_audio_stream;
     int64_t pos;
 
+    read_thread *reader;
+
     std::vector<int> video_streams;
     std::vector<AVCodecContext *> video_codec_ctxs;
     std::vector<video_frame> video_frame_templates;
     std::vector<struct SwsContext *> video_img_conv_ctxs;
     std::vector<AVCodec *> video_codecs;
     std::vector<std::deque<AVPacket> > video_packet_queues;
-    std::vector<AVPacket> video_packets;
-    std::vector<bool> video_flush_flags;
+    std::vector<mutex> video_packet_queue_mutexes;
+    std::vector<video_decode_thread> video_decode_threads;
     std::vector<AVFrame *> video_frames;
     std::vector<AVFrame *> video_out_frames;
     std::vector<uint8_t *> video_buffers;
@@ -77,14 +146,16 @@
     std::vector<audio_blob> audio_blob_templates;
     std::vector<AVCodec *> audio_codecs;
     std::vector<std::deque<AVPacket> > audio_packet_queues;
+    std::vector<mutex> audio_packet_queue_mutexes;
+    std::vector<audio_decode_thread> audio_decode_threads;
+    std::vector<unsigned char *> audio_tmpbufs;
     std::vector<blob> audio_blobs;
-    std::vector<bool> audio_flush_flags;
     std::vector<std::vector<unsigned char> > audio_buffers;
     std::vector<int64_t> audio_last_timestamps;
 };
 
-// Use one decoding thread per processor.
-static int decoding_threads()
+// Use one decoding thread per processor for video decoding.
+static int video_decoding_threads()
 {
     static long n = -1;
     if (n < 0)
@@ -119,12 +190,14 @@
 // Convert FFmpeg log messages to our log messages.
 static void my_av_log(void *ptr, int level, const char *fmt, va_list vl)
 {
+    static mutex line_mutex;
     static std::string line;
     if (level > av_log_get_level())
     {
         return;
     }
 
+    line_mutex.lock();
     std::string p;
     AVClass* avc = ptr ? *reinterpret_cast<AVClass**>(ptr) : NULL;
     if (avc)
@@ -171,6 +244,18 @@
         msg::msg(l, std::string("FFmpeg: ") + p + line);
         line.clear();
     }
+    line_mutex.unlock();
+}
+
+// Handle timestamps
+static int64_t timestamp_helper(int64_t &last_timestamp, int64_t timestamp)
+{
+    if (timestamp == std::numeric_limits<int64_t>::min())
+    {
+        timestamp = last_timestamp;
+    }
+    last_timestamp = timestamp;
+    return timestamp;
 }
 
 media_object::media_object() : _ffmpeg(NULL)
@@ -470,8 +555,11 @@
 
 void media_object::open(const std::string &url)
 {
+    assert(!_ffmpeg);
+
     _url = url;
     _ffmpeg = new struct ffmpeg_stuff;
+    _ffmpeg->reader = new read_thread(_url, _ffmpeg);
     int e;
 
     if ((e = av_open_input_file(&_ffmpeg->format_ctx, _url.c_str(), NULL, 0, NULL)) != 0)
@@ -509,7 +597,7 @@
             {
                 throw exc(_url + " stream " + str::from(i) + ": Invalid frame size.");
             }
-            _ffmpeg->video_codec_ctxs[j]->thread_count = decoding_threads();
+            _ffmpeg->video_codec_ctxs[j]->thread_count = video_decoding_threads();
             if (avcodec_thread_init(_ffmpeg->video_codec_ctxs[j], _ffmpeg->video_codec_ctxs[j]->thread_count) != 0)
             {
                 _ffmpeg->video_codec_ctxs[j]->thread_count = 1;
@@ -527,9 +615,8 @@
             // Determine frame template.
             _ffmpeg->video_frame_templates.push_back(video_frame());
             set_video_frame_template(j);
-            // Allocate packets and frames
-            _ffmpeg->video_packets.push_back(AVPacket());
-            _ffmpeg->video_flush_flags.push_back(false);
+            // Allocate things required for decoding
+            _ffmpeg->video_decode_threads.push_back(video_decode_thread(_url, _ffmpeg, j));
             _ffmpeg->video_frames.push_back(avcodec_alloc_frame());
             if (!_ffmpeg->video_frames[j])
             {
@@ -583,8 +670,15 @@
             }
             _ffmpeg->audio_blob_templates.push_back(audio_blob());
             set_audio_blob_template(j);
+            _ffmpeg->audio_decode_threads.push_back(audio_decode_thread(_url, _ffmpeg, j));
+            // Manage audio_tmpbufs with av_malloc/av_free, to guarantee correct alignment.
+            // Not doing this results in hard to debug crashes on some systems.
+            _ffmpeg->audio_tmpbufs.push_back(static_cast<unsigned char*>(av_malloc(audio_tmpbuf_size)));
+            if (!_ffmpeg->audio_tmpbufs[j])
+            {
+                throw exc(HERE + ": " + strerror(ENOMEM));
+            }
             _ffmpeg->audio_blobs.push_back(blob());
-            _ffmpeg->audio_flush_flags.push_back(false);
             _ffmpeg->audio_buffers.push_back(std::vector<unsigned char>());
             _ffmpeg->audio_last_timestamps.push_back(std::numeric_limits<int64_t>::min());
         }
@@ -595,6 +689,8 @@
     }
     _ffmpeg->video_packet_queues.resize(video_streams());
     _ffmpeg->audio_packet_queues.resize(audio_streams());
+    _ffmpeg->video_packet_queue_mutexes.resize(video_streams());
+    _ffmpeg->audio_packet_queue_mutexes.resize(audio_streams());
 
     msg::inf(_url + ":");
     for (int i = 0; i < video_streams(); i++)
@@ -668,14 +764,40 @@
 {
     assert(index >= 0);
     assert(index < video_streams());
+    // Stop decoder threads
+    for (size_t i = 0; i < _ffmpeg->video_streams.size(); i++)
+    {
+        _ffmpeg->video_decode_threads[i].finish();
+    }
+    for (size_t i = 0; i < _ffmpeg->audio_streams.size(); i++)
+    {
+        _ffmpeg->audio_decode_threads[i].finish();
+    }
+    // Stop reading packets
+    _ffmpeg->reader->finish();
+    // Set status
     _ffmpeg->format_ctx->streams[_ffmpeg->video_streams.at(index)]->discard =
         (active ? AVDISCARD_DEFAULT : AVDISCARD_ALL);
+    // Restart reader
+    _ffmpeg->reader->start();
 }
 
 void media_object::audio_stream_set_active(int index, bool active)
 {
     assert(index >= 0);
     assert(index < audio_streams());
+    // Stop decoder threads
+    for (size_t i = 0; i < _ffmpeg->video_streams.size(); i++)
+    {
+        _ffmpeg->video_decode_threads[i].finish();
+    }
+    for (size_t i = 0; i < _ffmpeg->audio_streams.size(); i++)
+    {
+        _ffmpeg->audio_decode_threads[i].finish();
+    }
+    // Stop reading packets
+    _ffmpeg->reader->finish();
+    // Set status
     _ffmpeg->format_ctx->streams[_ffmpeg->audio_streams.at(index)]->discard =
         (active ? AVDISCARD_DEFAULT : AVDISCARD_ALL);
     _ffmpeg->have_active_audio_stream = false;
@@ -687,6 +809,8 @@
             break;
         }
     }
+    // Restart reader
+    _ffmpeg->reader->start();
 }
 
 const video_frame &media_object::video_frame_template(int video_stream) const
@@ -755,78 +879,116 @@
     }
 }
 
-bool media_object::read()
+read_thread::read_thread(const std::string &url, struct ffmpeg_stuff *ffmpeg) :
+    _url(url), _ffmpeg(ffmpeg), _eof(false)
 {
-    msg::dbg(_url + ": Reading a packet.");
+}
 
-    AVPacket packet;
-    int e;
-    if ((e = av_read_frame(_ffmpeg->format_ctx, &packet)) < 0)
+void read_thread::run()
+{
+    while (!_eof)
     {
-        if (e == AVERROR_EOF)
+        // We need another packet if the number of queued packets for an active stream is below a threshold.
+        const size_t video_stream_low_threshold = 2;    // Often, 1 packet results in one video frame
+        const size_t audio_stream_low_threshold = 5;    // Often, 3-4 packets are needed for one buffer fill
+        bool need_another_packet = false;
+        for (size_t i = 0; !need_another_packet && i < _ffmpeg->video_streams.size(); i++)
         {
-            msg::dbg(_url + ": EOF.");
-            return false;
+            if (_ffmpeg->format_ctx->streams[_ffmpeg->video_streams[i]]->discard == AVDISCARD_DEFAULT)
+            {
+                _ffmpeg->video_packet_queue_mutexes[i].lock();
+                need_another_packet = _ffmpeg->video_packet_queues[i].size() < video_stream_low_threshold;
+                _ffmpeg->video_packet_queue_mutexes[i].unlock();
+            }
         }
-        else
+        for (size_t i = 0; !need_another_packet && i < _ffmpeg->audio_streams.size(); i++)
         {
-            throw exc(_url + ": " + my_av_strerror(e));
+            if (_ffmpeg->format_ctx->streams[_ffmpeg->audio_streams[i]]->discard == AVDISCARD_DEFAULT)
+            {
+                _ffmpeg->audio_packet_queue_mutexes[i].lock();
+                need_another_packet = _ffmpeg->audio_packet_queues[i].size() < audio_stream_low_threshold;
+                _ffmpeg->audio_packet_queue_mutexes[i].unlock();
+            }
         }
-    }
-    bool packet_queued = false;
-    for (size_t i = 0; i < _ffmpeg->video_streams.size() && !packet_queued; i++)
-    {
-        if (packet.stream_index == _ffmpeg->video_streams[i])
+        if (!need_another_packet)
+        {
+            msg::dbg(_url + ": No need to read more packets.");
+            break;
+        }
+        // Read a packet.
+        msg::dbg(_url + ": Reading a packet.");
+        AVPacket packet;
+        int e = av_read_frame(_ffmpeg->format_ctx, &packet);
+        if (e < 0)
         {
-            if (av_dup_packet(&packet) < 0)
+            if (e == AVERROR_EOF)
             {
-                msg::dbg(_url + ": Cannot duplicate packet.");
-                return false;
+                msg::dbg(_url + ": EOF.");
+                _eof = true;
+                return;
+            }
+            else
+            {
+                throw exc(_url + ": " + my_av_strerror(e));
             }
-            _ffmpeg->video_packet_queues[i].push_back(packet);
-            msg::dbg(_url + ": "
-                    + str::from(_ffmpeg->video_packet_queues[i].size())
-                    + " packets queued in video stream " + str::from(i) + ".");
-            packet_queued = true;
         }
-    }
-    for (size_t i = 0; i < _ffmpeg->audio_streams.size() && !packet_queued; i++)
-    {
-        if (packet.stream_index == _ffmpeg->audio_streams[i])
+        // Put the packet in the right queue.
+        bool packet_queued = false;
+        for (size_t i = 0; i < _ffmpeg->video_streams.size() && !packet_queued; i++)
         {
-            if (av_dup_packet(&packet) < 0)
+            if (packet.stream_index == _ffmpeg->video_streams[i])
             {
-                msg::dbg(_url + ": Cannot duplicate packet.");
-                return false;
+                if (av_dup_packet(&packet) < 0)
+                {
+                    throw exc(_url + ": Cannot duplicate packet.");
+                }
+                _ffmpeg->video_packet_queue_mutexes[i].lock();
+                _ffmpeg->video_packet_queues[i].push_back(packet);
+                msg::dbg(_url + ": "
+                        + str::from(_ffmpeg->video_packet_queues[i].size())
+                        + " packets queued in video stream " + str::from(i) + ".");
+                _ffmpeg->video_packet_queue_mutexes[i].unlock();
+                packet_queued = true;
             }
-            _ffmpeg->audio_packet_queues[i].push_back(packet);
-            msg::dbg(_url + ": "
-                    + str::from(_ffmpeg->audio_packet_queues[i].size())
-                    + " packets queued in audio stream " + str::from(i) + ".");
-            packet_queued = true;
+        }
+        for (size_t i = 0; i < _ffmpeg->audio_streams.size() && !packet_queued; i++)
+        {
+            if (packet.stream_index == _ffmpeg->audio_streams[i])
+            {
+                if (av_dup_packet(&packet) < 0)
+                {
+                    throw exc(_url + ": Cannot duplicate packet.");
+                }
+                _ffmpeg->audio_packet_queue_mutexes[i].lock();
+                _ffmpeg->audio_packet_queues[i].push_back(packet);
+                msg::dbg(_url + ": "
+                        + str::from(_ffmpeg->audio_packet_queues[i].size())
+                        + " packets queued in audio stream " + str::from(i) + ".");
+                _ffmpeg->audio_packet_queue_mutexes[i].unlock();
+                packet_queued = true;
+            }
+        }
+        if (!packet_queued)
+        {
+            av_free_packet(&packet);
         }
     }
-    if (!packet_queued)
-    {
-        av_free_packet(&packet);
-    }
+}
 
-    return true;
+void read_thread::reset()
+{
+    exception() = exc();
+    _eof = false;
 }
 
-int64_t media_object::handle_timestamp(int64_t &last_timestamp, int64_t timestamp)
+video_decode_thread::video_decode_thread(const std::string &url, struct ffmpeg_stuff *ffmpeg, int video_stream) :
+    _url(url), _ffmpeg(ffmpeg), _video_stream(video_stream), _frame()
 {
-    if (timestamp == std::numeric_limits<int64_t>::min())
-    {
-        timestamp = last_timestamp;
-    }
-    last_timestamp = timestamp;
-    return timestamp;
 }
 
-int64_t media_object::handle_video_timestamp(int video_stream, int64_t timestamp)
+int64_t video_decode_thread::handle_timestamp(int64_t timestamp)
 {
-    int64_t ts = handle_timestamp(_ffmpeg->video_last_timestamps[video_stream], timestamp);
+    int64_t ts = timestamp_helper(_ffmpeg->video_last_timestamps[_video_stream], timestamp);
     if (!_ffmpeg->have_active_audio_stream || _ffmpeg->pos == std::numeric_limits<int64_t>::min())
     {
         _ffmpeg->pos = ts;
@@ -834,161 +996,158 @@
     return ts;
 }
 
-int64_t media_object::handle_audio_timestamp(int audio_stream, int64_t timestamp)
+void video_decode_thread::run()
 {
-    int64_t ts = handle_timestamp(_ffmpeg->audio_last_timestamps[audio_stream], timestamp);
-    _ffmpeg->pos = ts;
-    return ts;
-}
-
-void media_object::start_video_frame_read(int video_stream)
-{
-    assert(video_stream >= 0);
-    assert(video_stream < video_streams());
-    if (_ffmpeg->video_flush_flags[video_stream])
-    {
-        avcodec_flush_buffers(_ffmpeg->format_ctx->streams[_ffmpeg->video_streams[video_stream]]->codec);
-        for (size_t j = 0; j < _ffmpeg->video_packet_queues[video_stream].size(); j++)
-        {
-            av_free_packet(&_ffmpeg->video_packet_queues[video_stream][j]);
-        }
-        _ffmpeg->video_packet_queues[video_stream].clear();
-        _ffmpeg->video_flush_flags[video_stream] = false;
-    }
-
-    // TODO: start thread that reads a frame
-}
-
-video_frame media_object::finish_video_frame_read(int video_stream)
-{
-    assert(video_stream >= 0);
-    assert(video_stream < video_streams());
-    // TODO: wait for thread, use its results
-
+    AVPacket pkt;
     int frame_finished = 0;
     do
     {
-        while (_ffmpeg->video_packet_queues[video_stream].empty())
+        bool empty;
+        do
         {
-            if (!read())
+            _ffmpeg->video_packet_queue_mutexes[_video_stream].lock();
+            empty = _ffmpeg->video_packet_queues[_video_stream].empty();
+            _ffmpeg->video_packet_queue_mutexes[_video_stream].unlock();
+            if (empty)
             {
-                return video_frame();
+                if (_ffmpeg->reader->eof())
+                {
+                    _frame = video_frame();
+                    return;
+                }
+                msg::dbg(_url + ": video stream " + str::from(_video_stream) + ": need to wait for packets...");
+                _ffmpeg->reader->start();
+                _ffmpeg->reader->finish();
             }
         }
-        _ffmpeg->video_packets[video_stream] = _ffmpeg->video_packet_queues[video_stream].front();
-        _ffmpeg->video_packet_queues[video_stream].pop_front();
-        avcodec_decode_video2(_ffmpeg->video_codec_ctxs[video_stream],
-                _ffmpeg->video_frames[video_stream], &frame_finished,
-                &(_ffmpeg->video_packets[video_stream]));
-        av_free_packet(&(_ffmpeg->video_packets[video_stream]));
+        while (empty);
+        _ffmpeg->video_packet_queue_mutexes[_video_stream].lock();
+        pkt = _ffmpeg->video_packet_queues[_video_stream].front();
+        _ffmpeg->video_packet_queues[_video_stream].pop_front();
+        _ffmpeg->video_packet_queue_mutexes[_video_stream].unlock();
+        _ffmpeg->reader->start();       // Refill the packet queue
+        avcodec_decode_video2(_ffmpeg->video_codec_ctxs[_video_stream],
+                _ffmpeg->video_frames[_video_stream], &frame_finished, &pkt);
+        av_free_packet(&pkt);
     }
     while (!frame_finished);
 
-    video_frame frame = _ffmpeg->video_frame_templates[video_stream];
-    if (frame.layout == video_frame::bgra32)
+    _frame = _ffmpeg->video_frame_templates[_video_stream];
+    if (_frame.layout == video_frame::bgra32)
     {
-        sws_scale(_ffmpeg->video_img_conv_ctxs[video_stream],
-                _ffmpeg->video_frames[video_stream]->data,
-                _ffmpeg->video_frames[video_stream]->linesize,
-                0, frame.raw_height,
-                _ffmpeg->video_out_frames[video_stream]->data,
-                _ffmpeg->video_out_frames[video_stream]->linesize);
+        sws_scale(_ffmpeg->video_img_conv_ctxs[_video_stream],
+                _ffmpeg->video_frames[_video_stream]->data,
+                _ffmpeg->video_frames[_video_stream]->linesize,
+                0, _frame.raw_height,
+                _ffmpeg->video_out_frames[_video_stream]->data,
+                _ffmpeg->video_out_frames[_video_stream]->linesize);
         // TODO: Handle sws_scale errors. How?
-        frame.data[0][0] = _ffmpeg->video_out_frames[video_stream]->data[0];
-        frame.line_size[0][0] = _ffmpeg->video_out_frames[video_stream]->linesize[0];
+        _frame.data[0][0] = _ffmpeg->video_out_frames[_video_stream]->data[0];
+        _frame.line_size[0][0] = _ffmpeg->video_out_frames[_video_stream]->linesize[0];
     }
     else
     {
-        frame.data[0][0] = _ffmpeg->video_frames[video_stream]->data[0];
-        frame.data[0][1] = _ffmpeg->video_frames[video_stream]->data[1];
-        frame.data[0][2] = _ffmpeg->video_frames[video_stream]->data[2];
-        frame.line_size[0][0] = _ffmpeg->video_frames[video_stream]->linesize[0];
-        frame.line_size[0][1] = _ffmpeg->video_frames[video_stream]->linesize[1];
-        frame.line_size[0][2] = _ffmpeg->video_frames[video_stream]->linesize[2];
+        _frame.data[0][0] = _ffmpeg->video_frames[_video_stream]->data[0];
+        _frame.data[0][1] = _ffmpeg->video_frames[_video_stream]->data[1];
+        _frame.data[0][2] = _ffmpeg->video_frames[_video_stream]->data[2];
+        _frame.line_size[0][0] = _ffmpeg->video_frames[_video_stream]->linesize[0];
+        _frame.line_size[0][1] = _ffmpeg->video_frames[_video_stream]->linesize[1];
+        _frame.line_size[0][2] = _ffmpeg->video_frames[_video_stream]->linesize[2];
     }
 
-    frame.presentation_time = handle_video_timestamp(video_stream,
-            _ffmpeg->video_packets[video_stream].dts * 1000000
-            * _ffmpeg->format_ctx->streams[_ffmpeg->video_streams[video_stream]]->time_base.num 
-            / _ffmpeg->format_ctx->streams[_ffmpeg->video_streams[video_stream]]->time_base.den);
-
-    return frame;
+    _frame.presentation_time = handle_timestamp(pkt.dts * 1000000
+            * _ffmpeg->format_ctx->streams[_ffmpeg->video_streams[_video_stream]]->time_base.num
+            / _ffmpeg->format_ctx->streams[_ffmpeg->video_streams[_video_stream]]->time_base.den);
 }
 
-void media_object::start_audio_blob_read(int audio_stream, size_t size)
+void media_object::start_video_frame_read(int video_stream)
 {
-    assert(audio_stream >= 0);
-    assert(audio_stream < audio_streams());
-    _ffmpeg->audio_blobs[audio_stream].resize(size);
-    if (_ffmpeg->audio_flush_flags[audio_stream])
-    {
-        avcodec_flush_buffers(_ffmpeg->format_ctx->streams[_ffmpeg->audio_streams[audio_stream]]->codec);
-        _ffmpeg->audio_buffers[audio_stream].clear();
-        for (size_t j = 0; j < _ffmpeg->audio_packet_queues[audio_stream].size(); j++)
-        {
-            av_free_packet(&_ffmpeg->audio_packet_queues[audio_stream][j]);
-        }
-        _ffmpeg->audio_packet_queues[audio_stream].clear();
-        _ffmpeg->audio_flush_flags[audio_stream] = false;
-    }
+    assert(video_stream >= 0);
+    assert(video_stream < video_streams());
+    _ffmpeg->video_decode_threads[video_stream].start();
+}
 
-    // TODO: start thread that reads a blob
+video_frame media_object::finish_video_frame_read(int video_stream)
+{
+    assert(video_stream >= 0);
+    assert(video_stream < video_streams());
+    _ffmpeg->video_decode_threads[video_stream].finish();
+    return _ffmpeg->video_decode_threads[video_stream].frame();
 }
 
-audio_blob media_object::finish_audio_blob_read(int audio_stream)
+audio_decode_thread::audio_decode_thread(const std::string &url, struct ffmpeg_stuff *ffmpeg, int audio_stream) :
+    _url(url), _ffmpeg(ffmpeg), _audio_stream(audio_stream), _blob()
 {
-    assert(audio_stream >= 0);
-    assert(audio_stream < audio_streams());
+}
 
-    // TODO: wait for thread, use its results
+int64_t audio_decode_thread::handle_timestamp(int64_t timestamp)
+{
+    int64_t ts = timestamp_helper(_ffmpeg->audio_last_timestamps[_audio_stream], timestamp);
+    _ffmpeg->pos = ts;
+    return ts;
+}
 
-    size_t size = _ffmpeg->audio_blobs[audio_stream].size();
-    void *buffer = _ffmpeg->audio_blobs[audio_stream].ptr();
+void audio_decode_thread::run()
+{
+    size_t size = _ffmpeg->audio_blobs[_audio_stream].size();
+    void *buffer = _ffmpeg->audio_blobs[_audio_stream].ptr();
     int64_t timestamp = std::numeric_limits<int64_t>::min();
     size_t i = 0;
     while (i < size)
     {
-        if (_ffmpeg->audio_buffers[audio_stream].size() > 0)
+        if (_ffmpeg->audio_buffers[_audio_stream].size() > 0)
         {
             // Use available decoded audio data
-            size_t remaining = std::min(size - i, _ffmpeg->audio_buffers[audio_stream].size());
-            memcpy(buffer, &(_ffmpeg->audio_buffers[audio_stream][0]), remaining);
-            _ffmpeg->audio_buffers[audio_stream].erase(
-                    _ffmpeg->audio_buffers[audio_stream].begin(),
-                    _ffmpeg->audio_buffers[audio_stream].begin() + remaining);
+            size_t remaining = std::min(size - i, _ffmpeg->audio_buffers[_audio_stream].size());
+            memcpy(buffer, &(_ffmpeg->audio_buffers[_audio_stream][0]), remaining);
+            _ffmpeg->audio_buffers[_audio_stream].erase(
+                    _ffmpeg->audio_buffers[_audio_stream].begin(),
+                    _ffmpeg->audio_buffers[_audio_stream].begin() + remaining);
             buffer = reinterpret_cast<unsigned char *>(buffer) + remaining;
             i += remaining;
         }
-        if (_ffmpeg->audio_buffers[audio_stream].size() == 0)
+        if (_ffmpeg->audio_buffers[_audio_stream].size() == 0)
         {
             // Read more audio data
             AVPacket packet, tmppacket;
-            while (_ffmpeg->audio_packet_queues[audio_stream].empty())
+            bool empty;
+            do
             {
-                if (!read())
+                _ffmpeg->audio_packet_queue_mutexes[_audio_stream].lock();
+                empty = _ffmpeg->audio_packet_queues[_audio_stream].empty();
+                _ffmpeg->audio_packet_queue_mutexes[_audio_stream].unlock();
+                if (empty)
                 {
-                    return audio_blob();
+                    if (_ffmpeg->reader->eof())
+                    {
+                        _blob = audio_blob();
+                        return;
+                    }
+                    msg::dbg(_url + ": audio stream " + str::from(_audio_stream) + ": need to wait for packets...");
+                    _ffmpeg->reader->start();
+                    _ffmpeg->reader->finish();
                 }
             }
-            packet = _ffmpeg->audio_packet_queues[audio_stream].front();
-            _ffmpeg->audio_packet_queues[audio_stream].pop_front();
+            while (empty);
+            _ffmpeg->audio_packet_queue_mutexes[_audio_stream].lock();
+            packet = _ffmpeg->audio_packet_queues[_audio_stream].front();
+            _ffmpeg->audio_packet_queues[_audio_stream].pop_front();
+            _ffmpeg->audio_packet_queue_mutexes[_audio_stream].unlock();
+            _ffmpeg->reader->start();   // Refill the packet queue
             if (timestamp == std::numeric_limits<int64_t>::min())
             {
                 timestamp = packet.dts * 1000000
-                    * _ffmpeg->format_ctx->streams[_ffmpeg->audio_streams[audio_stream]]->time_base.num 
-                    / _ffmpeg->format_ctx->streams[_ffmpeg->audio_streams[audio_stream]]->time_base.den;
+                    * _ffmpeg->format_ctx->streams[_ffmpeg->audio_streams[_audio_stream]]->time_base.num
+                    / _ffmpeg->format_ctx->streams[_ffmpeg->audio_streams[_audio_stream]]->time_base.den;
             }
 
             // Decode audio data
             tmppacket = packet;
             while (tmppacket.size > 0)
             {
-                // Manage tmpbuf with av_malloc/av_free, to guarantee correct alignment.
-                // Not doing this results in hard to debug crashes on some systems.
-                int tmpbuf_size = (AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2;
-                unsigned char *tmpbuf = static_cast<unsigned char *>(av_malloc(tmpbuf_size));
-                int len = avcodec_decode_audio3(_ffmpeg->audio_codec_ctxs[audio_stream],
-                        reinterpret_cast<int16_t *>(&(tmpbuf[0])), &tmpbuf_size, &tmppacket);
+                int tmpbuf_size = audio_tmpbuf_size;
+                int len = avcodec_decode_audio3(_ffmpeg->audio_codec_ctxs[_audio_stream],
+                        reinterpret_cast<int16_t *>(&(_ffmpeg->audio_tmpbufs[_audio_stream][0])), &tmpbuf_size, &tmppacket);
                 if (len < 0)
                 {
                     tmppacket.size = 0;
@@ -1001,21 +1160,35 @@
                     continue;
                 }
                 // Put it in the decoded audio data buffer
-                size_t old_size = _ffmpeg->audio_buffers[audio_stream].size();
-                _ffmpeg->audio_buffers[audio_stream].resize(old_size + tmpbuf_size);
-                memcpy(&(_ffmpeg->audio_buffers[audio_stream][old_size]), tmpbuf, tmpbuf_size);
-                av_free(tmpbuf);
+                size_t old_size = _ffmpeg->audio_buffers[_audio_stream].size();
+                _ffmpeg->audio_buffers[_audio_stream].resize(old_size + tmpbuf_size);
+                memcpy(&(_ffmpeg->audio_buffers[_audio_stream][old_size]), _ffmpeg->audio_tmpbufs[_audio_stream], tmpbuf_size);
             }
             
             av_free_packet(&packet);
         }
     }
 
-    audio_blob blob = _ffmpeg->audio_blob_templates[audio_stream];
-    blob.data = _ffmpeg->audio_blobs[audio_stream].ptr();
-    blob.size = _ffmpeg->audio_blobs[audio_stream].size();
-    blob.presentation_time = handle_audio_timestamp(audio_stream, timestamp);
-    return blob;
+    _blob = _ffmpeg->audio_blob_templates[_audio_stream];
+    _blob.data = _ffmpeg->audio_blobs[_audio_stream].ptr();
+    _blob.size = _ffmpeg->audio_blobs[_audio_stream].size();
+    _blob.presentation_time = handle_timestamp(timestamp);
+}
+
+void media_object::start_audio_blob_read(int audio_stream, size_t size)
+{
+    assert(audio_stream >= 0);
+    assert(audio_stream < audio_streams());
+    _ffmpeg->audio_blobs[audio_stream].resize(size);
+    _ffmpeg->audio_decode_threads[audio_stream].start();
+}
+
+audio_blob media_object::finish_audio_blob_read(int audio_stream)
+{
+    assert(audio_stream >= 0);
+    assert(audio_stream < audio_streams());
+    _ffmpeg->audio_decode_threads[audio_stream].finish();
+    return _ffmpeg->audio_decode_threads[audio_stream].blob();
 }
 
 int64_t media_object::tell()
@@ -1027,6 +1200,18 @@
 {
     msg::dbg(_url + ": Seeking from " + str::from(_ffmpeg->pos / 1e6f) + " to " + str::from(dest_pos / 1e6f) + ".");
 
+    // Stop decoder threads
+    for (size_t i = 0; i < _ffmpeg->video_streams.size(); i++)
+    {
+        _ffmpeg->video_decode_threads[i].finish();
+    }
+    for (size_t i = 0; i < _ffmpeg->audio_streams.size(); i++)
+    {
+        _ffmpeg->audio_decode_threads[i].finish();
+    }
+    // Stop reading packets
+    _ffmpeg->reader->finish();
+    // Seek
     int e = av_seek_frame(_ffmpeg->format_ctx, -1,
             dest_pos * AV_TIME_BASE / 1000000,
             dest_pos < _ffmpeg->pos ?  AVSEEK_FLAG_BACKWARD : 0);
@@ -1034,24 +1219,52 @@
     {
         msg::err(_url + ": Seeking failed.");
     }
-    else
+    // Throw away all queued packets
+    for (size_t i = 0; i < _ffmpeg->video_streams.size(); i++)
     {
-        /* Set a flag to throw away all queued packets */
-        for (size_t i = 0; i < _ffmpeg->video_packet_queues.size(); i++)
+        avcodec_flush_buffers(_ffmpeg->format_ctx->streams[_ffmpeg->video_streams[i]]->codec);
+        for (size_t j = 0; j < _ffmpeg->video_packet_queues[i].size(); j++)
         {
-            _ffmpeg->video_flush_flags[i] = true;
+            av_free_packet(&_ffmpeg->video_packet_queues[i][j]);
         }
-        for (size_t i = 0; i < _ffmpeg->audio_packet_queues.size(); i++)
+        _ffmpeg->video_packet_queues[i].clear();
+    }
+    for (size_t i = 0; i < _ffmpeg->audio_streams.size(); i++)
+    {
+        avcodec_flush_buffers(_ffmpeg->format_ctx->streams[_ffmpeg->audio_streams[i]]->codec);
+        _ffmpeg->audio_buffers[i].clear();
+        for (size_t j = 0; j < _ffmpeg->audio_packet_queues[i].size(); j++)
         {
-            _ffmpeg->audio_flush_flags[i] = true;
+            av_free_packet(&_ffmpeg->audio_packet_queues[i][j]);
         }
-        /* The next read request must update the position */
-        _ffmpeg->pos = std::numeric_limits<int64_t>::min();
+        _ffmpeg->audio_packet_queues[i].clear();
     }
+    // The next read request must update the position
+    _ffmpeg->pos = std::numeric_limits<int64_t>::min();
+    // Restart packet reading
+    _ffmpeg->reader->reset();
+    _ffmpeg->reader->start();
 }
 
 void media_object::close()
 {
+    try
+    {
+        // Stop decoder threads
+        for (size_t i = 0; i < _ffmpeg->video_streams.size(); i++)
+        {
+            _ffmpeg->video_decode_threads[i].finish();
+        }
+        for (size_t i = 0; i < _ffmpeg->audio_streams.size(); i++)
+        {
+            _ffmpeg->audio_decode_threads[i].finish();
+        }
+        // Stop reading packets
+        _ffmpeg->reader->finish();
+    }
+    catch (...)
+    {
+    }
     for (size_t i = 0; i < _ffmpeg->video_frames.size(); i++)
     {
         av_free(_ffmpeg->video_frames[i]);
@@ -1106,10 +1319,15 @@
             av_free_packet(&_ffmpeg->audio_packet_queues[i][j]);
         }
     }
+    for (size_t i = 0; i < _ffmpeg->audio_tmpbufs.size(); i++)
+    {
+        av_free(_ffmpeg->audio_tmpbufs[i]);
+    }
     if (_ffmpeg->format_ctx)
     {
         av_close_input_file(_ffmpeg->format_ctx);
     }
+    delete _ffmpeg->reader;
     delete _ffmpeg;
     _ffmpeg = NULL;
 }

bino-0.9.0.tar.bz2/src/media_object.h -> bino-0.9.1.tar.bz2/src/media_object.h Changed

bino-0.9.0.tar.bz2/src/player.cpp -> bino-0.9.1.tar.bz2/src/player.cpp Changed

@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include <vector>
+#include <unistd.h>
 
 #include "exc.h"
 #include "str.h"
@@ -138,7 +139,8 @@
 {
     _running = false;
     _first_frame = false;
-    _need_frame = false;
+    _need_frame_now = false;
+    _need_frame_soon = false;
     _drop_next_frame = false;
     _previous_frame_dropped = false;
     _in_pause = false;
@@ -277,7 +279,7 @@
     }
 }
 
-void player::step(bool *more_steps, int64_t *seek_to, bool *prep_frame, bool *drop_frame, bool *display_frame)
+int64_t player::step(bool *more_steps, int64_t *seek_to, bool *prep_frame, bool *drop_frame, bool *display_frame)
 {
     *more_steps = false;
     *seek_to = -1;
@@ -288,7 +290,7 @@
     if (_quit_request)
     {
         stop_playback();
-        return;
+        return 0;
     }
     else if (!_running)
     {
@@ -299,23 +301,22 @@
         {
             msg::dbg("Empty video input.");
             stop_playback();
-            return;
+            return 0;
         }
         _video_pos = _video_frame.presentation_time;
         if (_audio_output)
         {
-            size_t required_audio_data_size;
-            _audio_output->status(&required_audio_data_size);
-            _media_input->start_audio_blob_read(required_audio_data_size);
+            _media_input->start_audio_blob_read(_audio_output->required_initial_data_size());
             audio_blob blob = _media_input->finish_audio_blob_read();
             if (!blob.is_valid())
             {
                 msg::dbg("Empty audio input.");
                 stop_playback();
-                return;
+                return 0;
             }
             _audio_pos = blob.presentation_time;
             _audio_output->data(blob);
+            _media_input->start_audio_blob_read(_audio_output->required_update_data_size());
             _master_time_start = _audio_output->start();
             _master_time_pos = _audio_pos;
             _current_pos = _audio_pos;
@@ -336,11 +337,12 @@
         }
         else
         {
-            _need_frame = false;
+            _need_frame_now = false;
+            _need_frame_soon = true;
             _first_frame = true;
             *more_steps = true;
             *prep_frame = true;
-            return;
+            return 0;
         }
     }
     if (_seek_request != 0 || _set_pos_request >= 0.0f)
@@ -385,24 +387,23 @@
         {
             msg::wrn("Seeked to end of video?!");
             stop_playback();
-            return;
+            return 0;
         }
         _video_pos = _video_frame.presentation_time;
         if (_audio_output)
         {
             _audio_output->stop();
-            size_t required_audio_data_size;
-            _audio_output->status(&required_audio_data_size);
-            _media_input->start_audio_blob_read(required_audio_data_size);
+            _media_input->start_audio_blob_read(_audio_output->required_initial_data_size());
             audio_blob blob = _media_input->finish_audio_blob_read();
             if (!blob.is_valid())
             {
                 msg::wrn("Seeked to end of audio?!");
                 stop_playback();
-                return;
+                return 0;
             }
             _audio_pos = blob.presentation_time;
             _audio_output->data(blob);
+            _media_input->start_audio_blob_read(_audio_output->required_update_data_size());
             _master_time_start = _audio_output->start();
             _master_time_pos = _audio_pos;
             _current_pos = _audio_pos;
@@ -414,11 +415,12 @@
             _current_pos = _video_pos;
         }
         notify(notification::pos, normalize_pos(old_pos), normalize_pos(_current_pos));
-        _need_frame = false;
+        _need_frame_now = false;
+        _need_frame_soon = true;
         _previous_frame_dropped = false;
         *more_steps = true;
         *prep_frame = true;
-        return;
+        return 0;
     }
     else if (_pause_request)
     {
@@ -436,11 +438,10 @@
             notify(notification::pause, false, true);
         }
         *more_steps = true;
-        return;
+        return 0;
     }
-    else if (_need_frame)
+    else if (_need_frame_now)
     {
-        _media_input->start_video_frame_read();
         _video_frame = _media_input->finish_video_frame_read();
         if (!_video_frame.is_valid())
         {
@@ -453,7 +454,7 @@
             {
                 msg::dbg("End of video stream.");
                 stop_playback();
-                return;
+                return 0;
             }
         }
         else
@@ -468,7 +469,8 @@
             _current_pos = _video_pos;
             notify(notification::pos, normalize_pos(_current_pos), normalize_pos(_current_pos));
         }
-        _need_frame = false;
+        _need_frame_now = false;
+        _need_frame_soon = true;
         if (_drop_next_frame)
         {
             *drop_frame = true;
@@ -478,7 +480,14 @@
             *prep_frame = true;
         }
         *more_steps = true;
-        return;
+        return 0;
+    }
+    else if (_need_frame_soon)
+    {
+        _media_input->start_video_frame_read();
+        _need_frame_soon = false;
+        *more_steps = true;
+        return 0;
     }
     else
     {
@@ -499,24 +508,23 @@
         if (_audio_output)
         {
             // Check if audio needs more data, and get audio time
-            size_t required_audio_data_size;
-            _master_time_current = _audio_output->status(&required_audio_data_size) - _master_time_start
-                + _master_time_pos;
+            bool need_audio_data;
+            _master_time_current = _audio_output->status(&need_audio_data) - _master_time_start + _master_time_pos;
             // Output requested audio data
-            if (required_audio_data_size > 0)
+            if (need_audio_data)
             {
-                _media_input->start_audio_blob_read(required_audio_data_size);
                 audio_blob blob = _media_input->finish_audio_blob_read();
                 if (!blob.is_valid())
                 {
                     msg::dbg("End of audio stream.");
                     stop_playback();
-                    return;
+                    return 0;
                 }
                 _audio_pos = blob.presentation_time;
                 _master_time_start += (_audio_pos - _master_time_pos);
                 _master_time_pos = _audio_pos;
                 _audio_output->data(blob);
+                _media_input->start_audio_blob_read(_audio_output->required_update_data_size());
                 _current_pos = _audio_pos;
                 notify(notification::pos, normalize_pos(_current_pos), normalize_pos(_current_pos));
             }
@@ -528,6 +536,7 @@
                 + _master_time_pos;
         }
 
+        int64_t allowable_sleep = 0;
         if (_master_time_current >= _video_pos || _benchmark)
         {
             // Output current video frame
@@ -552,11 +561,25 @@
                     }
                 }
             }
-            _need_frame = true;
+            _need_frame_now = true;
+            _need_frame_soon = false;
             _previous_frame_dropped = _drop_next_frame;
         }
+        else
+        {
+            allowable_sleep = _video_pos - _master_time_current;
+            if (allowable_sleep < 100)
+            {
+                allowable_sleep = 0;
+            }
+            else if (allowable_sleep > 1100)
+            {
+                allowable_sleep = 1100;
+            }
+            allowable_sleep -= 100;
+        }
         *more_steps = true;
-        return;
+        return allowable_sleep;
     }
 }
 
@@ -567,8 +590,10 @@
     bool prep_frame;
     bool drop_frame;
     bool display_frame;
+    int64_t allowed_sleep;
+
+    allowed_sleep = step(&more_steps, &seek_to, &prep_frame, &drop_frame, &display_frame);
 
-    step(&more_steps, &seek_to, &prep_frame, &drop_frame, &display_frame);
     if (!more_steps)
     {
         return false;
@@ -584,7 +609,13 @@
     {
         _video_output->activate_next_frame();
     }
+
     _video_output->process_events();
+    if (allowed_sleep > 0)
+    {
+        usleep(allowed_sleep);
+    }
+
     return true;
 }

bino-0.9.0.tar.bz2/src/player.h -> bino-0.9.1.tar.bz2/src/player.h Changed

@@ -102,7 +102,8 @@
     // The play state
     bool _running;                              // Are we running?
     bool _first_frame;                          // Did we already process the first video frame?
-    bool _need_frame;                           // Do we need another video frame?
+    bool _need_frame_now;                       // Do we need another video frame right now?
+    bool _need_frame_soon;                      // Do we need another video frame soon?
     bool _drop_next_frame;                      // Do we need to drop the next video frame (to catch up)?
     bool _previous_frame_dropped;               // Did we drop the previous video frame?
     bool _in_pause;                             // Are we in pause mode?
@@ -148,8 +149,9 @@
     // Make this player the master player
     void make_master();
 
-    // Execute one step and indicate required actions
-    void step(bool *more_steps, int64_t *seek_to, bool *prep_frame, bool *drop_frame, bool *display_frame);
+    // Execute one step and indicate required actions. Returns the number of microseconds
+    // that the caller may sleep before starting the next step.
+    int64_t step(bool *more_steps, int64_t *seek_to, bool *prep_frame, bool *drop_frame, bool *display_frame);
 
     // Execute one step and immediately take required actions. Return true if more steps are required.
     bool run_step();

bino-0.9.0.tar.bz2/src/player_equalizer.cpp -> bino-0.9.1.tar.bz2/src/player_equalizer.cpp Changed

@@ -108,9 +108,13 @@
         get_media_input_nonconst().seek(pos);
     }
 
-    void read_frame()   // Only called on slave nodes to force reading the next frame
+    void start_frame_read()     // Only called on slave nodes
     {
         get_media_input_nonconst().start_video_frame_read();
+    }
+
+    void finish_frame_read()    // Only called on slave nodes
+    {
         _video_frame = get_media_input_nonconst().finish_video_frame_read();
         if (!_video_frame.is_valid())
         {
@@ -181,6 +185,51 @@
 };
 
 /*
+ * Define errors produced by player.
+ */
+
+enum Error
+{
+    ERROR_MAP_INITDATA_FAILED = eq::ERROR_CUSTOM,
+    ERROR_MAP_FRAMEDATA_FAILED,
+    ERROR_PLAYER_INIT_FAILED,
+    ERROR_OPENGL_2_1_NEEDED
+};
+
+struct ErrorData
+{
+    const uint32_t code;
+    const std::string text;
+};
+
+static ErrorData errors[] =
+{
+    { ERROR_MAP_FRAMEDATA_FAILED, "Init data mapping failed" },
+    { ERROR_MAP_INITDATA_FAILED, "Frame data mapping failed" },
+    { ERROR_PLAYER_INIT_FAILED, "Video player initialization failed" },
+    { ERROR_OPENGL_2_1_NEEDED, "Need at least OpenGL 2.1" },
+    { 0, "" } // last!
+};
+
+static void initErrors()
+{
+    co::base::ErrorRegistry &registry = co::base::Global::getErrorRegistry();
+    for (size_t i = 0; errors[i].code != 0; i++)
+    {
+        registry.setString(errors[i].code, errors[i].text);
+    }
+}
+
+static void exitErrors()
+{
+    co::base::ErrorRegistry &registry = co::base::Global::getErrorRegistry();
+    for (size_t i = 0; errors[i].code != 0; i++)
+    {
+        registry.eraseString(errors[i].code);
+    }
+}
+
+/*
  * eq_init_data
  */
 
@@ -622,16 +671,17 @@
     }
 
 protected:
-    virtual bool configInit(const eq::uint128_t& initID)
+    virtual bool configInit(const eq::uint128_t &init_id)
     {
-        if (!eq::Node::configInit(initID))
+        if (!eq::Node::configInit(init_id))
         {
             return false;
         }
         // Map our InitData instance to the master instance
         eq_config *config = static_cast<eq_config *>(getConfig());
-        if (!config->mapObject(&init_data, initID))
+        if (!config->mapObject(&init_data, init_id))
         {
+            setError(ERROR_MAP_INITDATA_FAILED);
             return false;
         }
         // Is this the application node?
@@ -642,6 +692,7 @@
         // Map our FrameData instance to the master instance
         if (!config->mapObject(&frame_data, init_data.frame_data_id))
         {
+            setError(ERROR_MAP_FRAMEDATA_FAILED);
             return false;
         }
 
@@ -652,6 +703,7 @@
         {
             if (!_player.init(init_data.init_data, frame_template))
             {
+                setError(ERROR_PLAYER_INIT_FAILED);
                 return false;
             }
         }
@@ -677,10 +729,10 @@
         return eq::Node::configExit();
     }
 
-    virtual void frameStart(const eq::uint128_t& frameID, const uint32_t frameNumber)
+    virtual void frameStart(const eq::uint128_t &frame_id, const uint32_t frame_number)
     {
         // Update our frame data
-        frame_data.sync(frameID);
+        frame_data.sync(frame_id);
         // Do as we're told
         if (_is_app_node)
         {
@@ -691,17 +743,37 @@
             if (frame_data.seek_to >= 0)
             {
                 _player.seek(frame_data.seek_to);
+                _player.start_frame_read();
             }
             if (frame_data.prep_frame)
             {
-                _player.read_frame();
+                _player.finish_frame_read();
             }
             if (frame_data.drop_frame)
             {
-                _player.read_frame();
+                _player.finish_frame_read();
+                _player.start_frame_read();
+            }
+        }
+        startFrame(frame_number);
+    }
+
+    virtual void frameFinish(const eq::uint128_t &, const uint32_t frame_number)
+    {
+        if (_is_app_node)
+        {
+            // Nothing to do since the config's master player already did it
+        }
+        else
+        {
+            if (frame_data.prep_frame)
+            {
+                // The frame was uploaded to texture memory.
+                // Start reading the next one asynchronously.
+                _player.start_frame_read();
             }
         }
-        startFrame(frameNumber);
+        releaseFrame(frame_number);
     }
 
 public:
@@ -751,10 +823,10 @@
     }
 
 protected:
-    virtual bool configInitGL(const eq::uint128_t& initID)
+    virtual bool configInitGL(const eq::uint128_t &init_id)
     {
         msg::dbg(HERE);
-        if (!eq::Window::configInitGL(initID))
+        if (!eq::Window::configInitGL(init_id))
         {
             return false;
         }
@@ -762,6 +834,7 @@
                     "GL_VERSION_2_1 GL_EXT_framebuffer_object"))
         {
             msg::err("This OpenGL implementation does not support OpenGL 2.1 and framebuffer objects.");
+            setError(ERROR_OPENGL_2_1_NEEDED);
             return false;
         }
 
@@ -780,7 +853,7 @@
         return eq::Window::configExitGL();
     }
 
-    virtual void frameStart(const eq::uint128_t&, const uint32_t frameNumber)
+    virtual void frameStart(const eq::uint128_t &, const uint32_t frame_number)
     {
         // Get frame data via from the node
         eq_node *node = static_cast<eq_node *>(getNode());
@@ -794,12 +867,12 @@
         {
             _video_output.activate_next_frame();
         }
-        startFrame(frameNumber);
+        startFrame(frame_number);
     }
 
-    virtual void frameFinish(const eq::uint128_t&, const uint32_t frameNumber)
+    virtual void frameFinish(const eq::uint128_t &, const uint32_t frame_number)
     {
-        releaseFrame(frameNumber);
+        releaseFrame(frame_number);
     }
 };
 
@@ -817,10 +890,10 @@
     }
 
 protected:
-    virtual void frameDraw(const eq::uint128_t& frameID)
+    virtual void frameDraw(const eq::uint128_t &frame_id)
     {
         // Let Equalizer initialize some stuff
-        eq::Channel::frameDraw(frameID);
+        eq::Channel::frameDraw(frame_id);
 
         // Get the canvas video area and the canvas channel area
         eq_node *node = static_cast<eq_node *>(getNode());
@@ -906,6 +979,7 @@
     player(player::slave), _flat_screen(flat_screen)
 {
     /* Initialize Equalizer */
+    initErrors();
     _node_factory = static_cast<void *>(new eq_node_factory);
     if (!eq::init(*argc, argv, static_cast<eq::NodeFactory *>(_node_factory)))
     {
@@ -946,6 +1020,7 @@
     config->exit();
     eq::releaseConfig(config);
     eq::exit();
+    exitErrors();
 }
 
 void player_equalizer::close()

bino-0.9.0.tar.bz2/src/player_qt.cpp -> bino-0.9.1.tar.bz2/src/player_qt.cpp Changed

@@ -1251,7 +1251,7 @@
 {
     // Application properties
     setWindowTitle(PACKAGE_NAME);
-    setWindowIcon(QIcon(":icons/appicon.png"));
+    setWindowIcon(QIcon(":logo/bino_logo_small_64x64.png"));
 
     // Load preferences
     _settings->beginGroup("Session");
@@ -1601,18 +1601,19 @@
     }
     else
     {
-        bool r = false;
         try
         {
-            r = _player->playloop_step();
+            if (!_player->playloop_step())
+            {
+                _timer->stop();
+            }
         }
         catch (std::exception &e)
         {
-            QMessageBox::critical(this, "Error", e.what());
-        }
-        if (!r)
-        {
             _timer->stop();
+            send_cmd(command::toggle_play);
+            _player->playloop_step();   // react on command
+            QMessageBox::critical(this, "Error", e.what());
         }
     }
 }
@@ -1806,7 +1807,7 @@
     dialog->setWindowTitle("About " PACKAGE_NAME);
 
     QLabel *logo = new QLabel();
-    logo->setPixmap(QPixmap(":icons/appicon.png").scaledToHeight(32, Qt::SmoothTransformation));
+    logo->setPixmap(QPixmap(":logo/bino_logo.png").scaledToHeight(128, Qt::SmoothTransformation));
     QLabel *spacer = new QLabel();
     spacer->setMinimumWidth(16);
     QLabel *title = new QLabel("The " PACKAGE_NAME " 3D video player");
@@ -1825,6 +1826,7 @@
 
     QTextBrowser *libs_text = new QTextBrowser(this);
     libs_text->setOpenExternalLinks(true);
+    libs_text->setWordWrapMode(QTextOption::NoWrap);
     QString libs_blurb = tr("<p>Platform:<ul><li>%1</li></ul></p>").arg(PLATFORM);
     libs_blurb += QString("<p>Libraries used:");
     std::vector<std::string> libs = lib_versions(true);
@@ -1835,9 +1837,25 @@
     libs_blurb += QString("</p>");
     libs_text->setText(libs_blurb);
 
+    QTextBrowser *team_text = new QTextBrowser(this);
+    team_text->setOpenExternalLinks(false);
+    team_text->setWordWrapMode(QTextOption::NoWrap);
+    QFile team_file(":AUTHORS");
+    team_file.open(QIODevice::ReadOnly | QIODevice::Text);
+    team_text->setText(team_file.readAll());
+
+    QTextBrowser *license_text = new QTextBrowser(this);
+    license_text->setOpenExternalLinks(false);
+    license_text->setWordWrapMode(QTextOption::NoWrap);
+    QFile license_file(":LICENSE");
+    license_file.open(QIODevice::ReadOnly | QIODevice::Text);
+    license_text->setText(license_file.readAll());
+
     QTabWidget *tab_widget = new QTabWidget();
     tab_widget->addTab(about_text, "About");
     tab_widget->addTab(libs_text, "Libraries");
+    tab_widget->addTab(team_text, "Team");
+    tab_widget->addTab(license_text, "License");
 
     QPushButton *ok_btn = new QPushButton("OK");
     connect(ok_btn, SIGNAL(pressed()), dialog, SLOT(accept()));

bino-0.9.0.tar.bz2/src/qt_app.cpp -> bino-0.9.1.tar.bz2/src/qt_app.cpp Changed

@@ -20,23 +20,54 @@
 
 #include "config.h"
 
+#include <cstdlib>
+
 #include <QCoreApplication>
 #include <QApplication>
+#include <QtGlobal>
+#include <QTextCodec>
 
 #include "qt_app.h"
 
 #include "msg.h"
 
 
-static int qt_argc = 1;
-static const char *qt_argv[2] = { PACKAGE_NAME, NULL };
+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));
+        QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
         QCoreApplication::setOrganizationName("Bino");
         QCoreApplication::setOrganizationDomain("bino.nongnu.org");
         QCoreApplication::setApplicationName(PACKAGE_NAME);

bino-0.9.0.tar.bz2/src/qt_app.h -> bino-0.9.1.tar.bz2/src/qt_app.h Changed

bino-0.9.0.tar.bz2/src/qt_resources.qrc -> bino-0.9.1.tar.bz2/src/qt_resources.qrc Changed

bino-0.9.0.tar.bz2/src/video_output_qt.cpp -> bino-0.9.1.tar.bz2/src/video_output_qt.cpp Changed