Packman Build Service PMBS

bino.changes Changed

bino.spec Changed

bino-0.9.3.tar.bz2/ABOUT-NLS Added

bino-0.9.2.tar.bz2/AUTHORS -> bino-0.9.3.tar.bz2/AUTHORS Changed

bino-0.9.2.tar.bz2/ChangeLog -> bino-0.9.3.tar.bz2/ChangeLog Changed

@@ -1,3 +1,996 @@
+commit b40f31c9bbd0137598afbebbb52400115d7fa423
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-16 13:00:43 +0200
+
+ Windows: add czech translation to installer.
+
+ pkg/w32/bino.nsi | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 7fb3f343d9d853892bc7ce864eb5e2d9b678ac48
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-16 12:56:43 +0200
+
+ Bump version to 0.9.3.
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 720fc76c5159fe82bc2a1bf5ae31c14eb990ba9d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-16 12:53:14 +0200
+
+ configure.ac: make message about required FFmpeg version more helpful.
+
+ configure.ac | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 54e6932039230c7e1c7fa450f725b89434f21318
+Author: Joe <cuchac@email.cz>
+Date: 2011-04-16 12:40:57 +0200
+
+ Add czech translation.
+
+ po/LINGUAS | 1 +
+ po/cs.po | 1302 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 1303 insertions(+), 0 deletions(-)
+
+commit 6a861d3642b7a38c07ec9fa09d8e582d1c6064c7
+Author: Frédéric Devernay <frederic.devernay@inrialpes.fr>
+Date: 2011-04-16 12:08:24 +0200
+
+ Mac OS X: improve packaging.
+ 
+ - install translations in the mac app (and install *all* help files too)
+ - try to guess if we're an application, and return the right localedir
+
+ Makefile.am | 3 ++-
+ src/main.cpp | 44 ++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 46 insertions(+), 1 deletions(-)
+
+commit 67250f19783f16fdff4933064aa631425f360f13
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-16 10:52:43 +0200
+
+ Fix interpretation of parallax adjustment.
+ 
+ The meaning of negative / positive parallax was swapped.
+
+ src/video_output_render.fs.glsl | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 97c8ecb7aee790819df443415bb1e01b446ca16a
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-13 21:10:31 +0200
+
+ Update de.po.
+
+ po/de.po | 35 ++++++++++++++++++++++++-----------
+ 1 files changed, 24 insertions(+), 11 deletions(-)
+
+commit 50ed387c68e26737c27ba389a4ee9ec9209ac315
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-13 21:05:24 +0200
+
+ Add documentation for translators.
+
+ ABOUT-NLS | 19 +++++++++++++++++--
+ 1 files changed, 17 insertions(+), 2 deletions(-)
+
+commit e4ee0200b647893bea534387893e949ed5df7cd0
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-13 20:56:34 +0200
+
+ Documentation: document the --subtitle-* options.
+
+ doc/bino.1 | 12 ++++++++++++
+ doc/bino.texi | 12 ++++++++++++
+ 2 files changed, 24 insertions(+), 0 deletions(-)
+
+commit e96e4ec6e9236853ba4239217c6f59e534984570
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-13 20:55:58 +0200
+
+ Documentation: update documentation of input file handling.
+
+ doc/bino.1 | 8 +++++---
+ doc/bino.texi | 8 +++++---
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+commit dff490c1aaee412f31118a9b0a00269a6b1346da
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-13 20:39:31 +0200
+
+ Add --subtitle-parallax option, for completeness.
+
+ src/main.cpp | 42 +++++++++++++++++++++++-------------------
+ 1 files changed, 23 insertions(+), 19 deletions(-)
+
+commit 52e0e9e9aa4d0124218fe176249fe5f38c209e9c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-12 22:12:39 +0200
+
+ Add command line options for subtitle settings.
+
+ src/base/opt.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/main.cpp | 31 +++++++++++++++++++++++++++--
+ 2 files changed, 86 insertions(+), 3 deletions(-)
+
+commit df93eb314286f566b16fdd5d4c9e70a2dfde014e
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-12 21:23:44 +0200
+
+ Fix GUI translation for utf-8 locales.
+ 
+ This corrects e7dfd62c9ed2625f18080d26de2f4f15e536fbc0.
+
+ src/qt_app.cpp | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit fa8243868b6b6aeee2df5e08509bc0ae85e45423
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-12 21:14:35 +0200
+
+ Update de.po.
+
+ po/de.po | 261 +++++++++++++++++++++++++++++++++-----------------------------
+ 1 files changed, 140 insertions(+), 121 deletions(-)
+
+commit 882cd1fd34a48acdb905614ccd720fd3507e087b
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-12 21:13:58 +0200
+
+ Make messages more translator-friendly.
+
+ src/base/dbg.cpp | 1 +
+ src/base/thread.cpp | 2 +-
+ src/main.cpp | 18 ++++++++++--------
+ src/media_data.cpp | 6 ++++--
+ src/media_input.cpp | 18 +++++++++---------
+ src/media_object.cpp | 10 +++++-----
+ src/player_equalizer.cpp | 7 +++----
+ src/player_qt.cpp | 9 ++++++---
+ 8 files changed, 39 insertions(+), 32 deletions(-)
+
+commit 69a632079aed5bc59cb228c9341dbff6e1b409f4
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-12 07:13:38 +0200
+
+ base/msg: add message functions with indentation level.
+
+ src/base/msg.cpp | 334 +++++++++++++++++++++++++++++++++++++++++++++++++-----
+ src/base/msg.h | 30 +++++
+ 2 files changed, 337 insertions(+), 27 deletions(-)
+
+commit cd26e53a5dcfd0d2b239a56a3baf306d609df424
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-11 21:14:39 +0200
+
+ Cleanup and document the localedir() function.
+
+ src/main.cpp | 26 +++++++++++++-------------
+ 1 files changed, 13 insertions(+), 13 deletions(-)
+
+commit 18f1befdb11f64f7046fb1e29fcecde380a432cb
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-11 12:02:06 +0200
+
+ Move gettext.h from src to src/base.
+
+ src/Makefile.am | 3 +--
+ src/base/Makefile.am | 3 ++-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit e7dfd62c9ed2625f18080d26de2f4f15e536fbc0
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-11 09:15:18 +0200
+
+ Fix GUI translation for non-utf8 locales.
+
+ src/player_qt.cpp | 2 +-
+ src/qt_app.cpp | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit d565754a0e376f0f04b62cdd45205a64d9518807
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-11 07:29:40 +0200
+
+ Windows: enable translations.
+

bino-0.9.2.tar.bz2/Makefile.am -> bino-0.9.3.tar.bz2/Makefile.am Changed

@@ -6,7 +6,9 @@
 # permitted in any medium without royalty provided the copyright notice and this
 # notice are preserved. This file is offered as-is, without any warranty.
 
-SUBDIRS = src doc
+SUBDIRS = po src doc
+
+ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = README.MacOSX README.Windows
 
@@ -27,7 +29,7 @@
 if HAVE_MAKENSIS
 package-w32:
 	TMPDIR="`mktemp -d`" && \
-	$(MAKE) install-strip prefix="$$TMPDIR" bindir="$$TMPDIR" docdir="$$TMPDIR" && \
+	$(MAKE) install-strip prefix="$$TMPDIR" bindir="$$TMPDIR" docdir="$$TMPDIR" localedir="$$TMPDIR" && \
 	cp $(top_srcdir)/pkg/w32/bino.nsi "$$TMPDIR" && \
 	cp $(top_srcdir)/pkg/w32/notes.txt "$$TMPDIR" && \
 	cp $(top_srcdir)/COPYING "$$TMPDIR" && \
@@ -47,7 +49,8 @@
 	$(INSTALL) -m 755 src/bino "$$BINO_APP/Contents/MacOS/Bino" && \
 	$(INSTALL) -m 644 $(top_srcdir)/pkg/macosx/Bino.icns "$$BINO_APP/Contents/Resources" && \
 	$(INSTALL) -m 644 $(top_srcdir)/pkg/macosx/Info.plist "$$BINO_APP/Contents" && \
-	$(INSTALL) -m 644 doc/bino.html "$$BINO_APP/Contents/Resources/Bino Help" && \
+	$(MAKE) -C doc install-dist_docDATA docdir="$$BINO_APP/Contents/Resources/Bino Help" && \
+	$(MAKE) -C po install-strip localedir="$$BINO_APP/Contents/Resources/locale" && \
 	macdeployqt "$$BINO_APP" && \
 	rm -rf Bino.app && \
 	ditto "$$BINO_APP" Bino.app && \

bino-0.9.2.tar.bz2/Makefile.in -> bino-0.9.3.tar.bz2/Makefile.in Changed

@@ -46,11 +46,16 @@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure $(top_srcdir)/pkg/macosx/Info.plist.in \
-	AUTHORS COPYING ChangeLog INSTALL NEWS build-aux/config.guess \
-	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
-	build-aux/install-sh build-aux/mdate-sh build-aux/missing
+	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS \
+	build-aux/config.guess build-aux/config.rpath \
+	build-aux/config.sub build-aux/depcomp build-aux/install-sh \
+	build-aux/mdate-sh build-aux/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -131,6 +136,7 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -141,20 +147,32 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MAKENSIS = @MAKENSIS@
 MKDIR_P = @MKDIR_P@
 MOC = @MOC@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -167,13 +185,18 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
 RANLIB = @RANLIB@
 RCC = @RCC@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -210,6 +233,8 @@
 install_sh = @install_sh@
 libEqualizer_CFLAGS = @libEqualizer_CFLAGS@
 libEqualizer_LIBS = @libEqualizer_LIBS@
+libass_CFLAGS = @libass_CFLAGS@
+libass_LIBS = @libass_LIBS@
 libavformat_CFLAGS = @libavformat_CFLAGS@
 libavformat_LIBS = @libavformat_LIBS@
 libdir = @libdir@
@@ -243,7 +268,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = src doc
+SUBDIRS = po src doc
+ACLOCAL_AMFLAGS = -I m4
 
 # Make a W32 installer using NSIS
 
@@ -753,7 +779,7 @@
 	TAR_OPTIONS='--owner=0 --group=0 --numeric-owner --mode=u+rw,go+r-w' $(MAKE) dist-xz
 @HAVE_MAKENSIS_TRUE@package-w32:
 @HAVE_MAKENSIS_TRUE@	TMPDIR="`mktemp -d`" && \
-@HAVE_MAKENSIS_TRUE@	$(MAKE) install-strip prefix="$$TMPDIR" bindir="$$TMPDIR" docdir="$$TMPDIR" && \
+@HAVE_MAKENSIS_TRUE@	$(MAKE) install-strip prefix="$$TMPDIR" bindir="$$TMPDIR" docdir="$$TMPDIR" localedir="$$TMPDIR" && \
 @HAVE_MAKENSIS_TRUE@	cp $(top_srcdir)/pkg/w32/bino.nsi "$$TMPDIR" && \
 @HAVE_MAKENSIS_TRUE@	cp $(top_srcdir)/pkg/w32/notes.txt "$$TMPDIR" && \
 @HAVE_MAKENSIS_TRUE@	cp $(top_srcdir)/COPYING "$$TMPDIR" && \
@@ -769,7 +795,8 @@
 	$(INSTALL) -m 755 src/bino "$$BINO_APP/Contents/MacOS/Bino" && \
 	$(INSTALL) -m 644 $(top_srcdir)/pkg/macosx/Bino.icns "$$BINO_APP/Contents/Resources" && \
 	$(INSTALL) -m 644 $(top_srcdir)/pkg/macosx/Info.plist "$$BINO_APP/Contents" && \
-	$(INSTALL) -m 644 doc/bino.html "$$BINO_APP/Contents/Resources/Bino Help" && \
+	$(MAKE) -C doc install-dist_docDATA docdir="$$BINO_APP/Contents/Resources/Bino Help" && \
+	$(MAKE) -C po install-strip localedir="$$BINO_APP/Contents/Resources/locale" && \
 	macdeployqt "$$BINO_APP" && \
 	rm -rf Bino.app && \
 	ditto "$$BINO_APP" Bino.app && \

bino-0.9.2.tar.bz2/README.Windows -> bino-0.9.3.tar.bz2/README.Windows Changed

@@ -5,13 +5,19 @@
 Mingw-cross-env not only provides a recent version of gcc as a cross compiler,
 but also all required libraries, and the nsis package to build an installer.
 
-The following is known to work with Mingw-cross-env 2.19 (in preparation of
-release) installed in /path/to/mce:
+The following is known to work with Mingw-cross-env 2.20 installed in
+/path/to/mce:
+
+0. Update some Mingw-cross-env packages
+
+ LibASS and FFmpeg are too old or not yet available in Mingw-cross-env. This
+ will likely be fixed in a future version. In the meantime, please copy the
+ files libass.mk and ffmpeg.mk (attached below) into /path/to/mce/src.
 
 1. Build the required libraries in Mingw-cross-env:
 
 $ cd /path/to/mce
- $ make pthreads glew ffmpeg openal qt
+ $ make gettext pthreads ffmpeg libass openal glew qt
 
 If you want to build a Bino installer later, you need to build nsis, too:
 $ make nsis
@@ -38,5 +44,86 @@
 c:\<path_to_bino>\doc\bino.html
 c:\<path_to_bino>\doc\<image_files...>
 
-Note that you might want to use a newer FFmpeg version than the one shipped
-with Mingw-cross-env for best results.
+8<---- libass.mk -------------------------------------------------------------
+
+PKG := libass
+$(PKG)_IGNORE :=
+$(PKG)_VERSION := 0.9.11
+$(PKG)_CHECKSUM := 6f69f6c4474c649de4fd7913b050bfd4cf8110cb
+$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_WEBSITE := http://code.google.com/p/libass/
+$(PKG)_URL := http://libass.googlecode.com/files/$($(PKG)_FILE)
+$(PKG)_DEPS := gcc freetype fontconfig
+
+define $(PKG)_UPDATE
+ wget -q -O- 'http://code.google.com/p/libass/downloads/list?sort=-uploaded' | \
+ $(SED) -n 's,.*libass-$[0-9][^<]*$\.tar.bz2,\1,p' | \
+ head -1
+endef
+
+define $(PKG)_BUILD
+ cd '$(1)' && ./configure \
+ --host='$(TARGET)' \
+ --prefix='$(PREFIX)/$(TARGET)' \
+ --disable-shared \
+	--disable-png \
+	--disable-enca \
+	--enable-fontconfig
+ $(MAKE) -C '$(1)' -j '$(JOBS)'
+ $(MAKE) -C '$(1)' -j 1 install
+
+ '$(TARGET)-gcc' \
+ -W -Wall -Werror -ansi -pedantic \
+ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libass.exe' \
+ `'$(TARGET)-pkg-config' libass --cflags --libs`
+endef
+
+8<---- ffmpeg.mk -------------------------------------------------------------
+
+PKG := ffmpeg
+$(PKG)_IGNORE :=
+$(PKG)_VERSION := 0.6.90-rc0
+$(PKG)_CHECKSUM := a5c898a220a7f2220a49a37c44d273d1775d081c
+$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_WEBSITE := http://www.ffmpeg.org/
+$(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE)
+$(PKG)_DEPS := gcc bzip2 lame libvpx opencore-amr sdl speex theora vorbis x264 xvidcore zlib
+
+define $(PKG)_UPDATE
+ wget -q -O- 'http://www.ffmpeg.org/download.html' | \
+ $(SED) -n 's,.*ffmpeg-$[0-9][^>]*$\.tar.*,\1,p' | \
+ head -1
+endef
+
+define $(PKG)_BUILD
+ cd '$(1)' && ./configure \
+ --cross-prefix='$(TARGET)'- \
+ --enable-cross-compile \
+ --arch=i686 \
+ --target-os=mingw32 \
+ --prefix='$(PREFIX)/$(TARGET)' \
+ --disable-shared \
+ --disable-debug \
+ --disable-doc \
+ --enable-memalign-hack \
+ --enable-gpl \
+ --enable-version3 \
+ --disable-nonfree \
+ --enable-postproc \
+ --enable-libspeex \
+ --enable-libtheora \
+ --enable-libvorbis \
+ --enable-libmp3lame \
+ --enable-libxvid \
+ --disable-libfaac \
+ --enable-libopencore-amrnb \
+ --enable-libopencore-amrwb \
+ --enable-libx264 \
+ --enable-libvpx \
+ --disable-pthreads \
+ --enable-w32threads
+ $(MAKE) -C '$(1)' -j '$(JOBS)'
+ $(MAKE) -C '$(1)' -j 1 install
+endef

bino-0.9.2.tar.bz2/aclocal.m4 -> bino-0.9.3.tar.bz2/aclocal.m4 Changed

@@ -19,6 +19,58 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
+# intlmacosx.m4 serial 3 (gettext-0.18)
+dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+ dnl Check for API introduced in MacOS X 10.2.
+ AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+ [gt_cv_func_CFPreferencesCopyAppValue],
+ [gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
+ [CFPreferencesCopyAppValue(NULL, NULL)],
+ [gt_cv_func_CFPreferencesCopyAppValue=yes],
+ [gt_cv_func_CFPreferencesCopyAppValue=no])
+ LIBS="$gt_save_LIBS"])
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+ AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
+ [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+ fi
+ dnl Check for API introduced in MacOS X 10.3.
+ AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
+ [gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
+ [gt_cv_func_CFLocaleCopyCurrent=yes],
+ [gt_cv_func_CFLocaleCopyCurrent=no])
+ LIBS="$gt_save_LIBS"])
+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+ AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
+ [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+ fi
+ INTL_MACOSX_LIBS=
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+ fi
+ AC_SUBST([INTL_MACOSX_LIBS])
+])
+
 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
 # serial 1 (pkg-config-0.24)
 # 
@@ -1151,3 +1203,11 @@
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/gettext.m4])
+m4_include([m4/iconv.m4])
+m4_include([m4/lib-ld.m4])
+m4_include([m4/lib-link.m4])
+m4_include([m4/lib-prefix.m4])
+m4_include([m4/nls.m4])
+m4_include([m4/po.m4])
+m4_include([m4/progtest.m4])

bino-0.9.2.tar.bz2/config.h.in -> bino-0.9.3.tar.bz2/config.h.in Changed

@@ -3,16 +3,38 @@
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
 
+/* Define to 1 if translation of program messages to the user's native
+ language is requested. */
+#undef ENABLE_NLS
+
 /* Define to 1 if you have the `backtrace' function. */
 #undef HAVE_BACKTRACE
 
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+ CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+ the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
 /* Define to 1 if you have the `clock_gettime' function. */
 #undef HAVE_CLOCK_GETTIME
 
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
+#undef HAVE_DCGETTEXT
+
 /* Define to 1 if you have the declaration of `optreset', and to 0 if you
 don't. */
 #undef HAVE_DECL_OPTRESET
 
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Define if you have the iconv() function and it works. */
+#undef HAVE_ICONV
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H

bino-0.9.2.tar.bz2/configure -> bino-0.9.3.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for Bino 0.9.2.
+# Generated by GNU Autoconf 2.67 for Bino 0.9.3.
 #
 # 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.2'
-PACKAGE_STRING='Bino 0.9.2'
+PACKAGE_VERSION='0.9.3'
+PACKAGE_STRING='Bino 0.9.3'
 PACKAGE_BUGREPORT='bino-list@nongnu.org'
 PACKAGE_URL='http://bino.nongnu.org/'
 
@@ -594,6 +594,7 @@
 # include <unistd.h>
 #endif"
 
+gt_needs=
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
@@ -612,6 +613,8 @@
 libqtopengl_CFLAGS
 libopenal_LIBS
 libopenal_CFLAGS
+libass_LIBS
+libass_CFLAGS
 libswscale_LIBS
 libswscale_CFLAGS
 libavformat_LIBS
@@ -619,6 +622,24 @@
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
+POSUB
+LTLIBINTL
+LIBINTL
+INTLLIBS
+LTLIBICONV
+LIBICONV
+INTL_MACOSX_LIBS
+CXXCPP
+XGETTEXT_EXTRA_OPTIONS
+MSGMERGE
+XGETTEXT_015
+XGETTEXT
+GMSGFMT_015
+MSGFMT_015
+GMSGFMT
+MSGFMT
+GETTEXT_MACRO_VERSION
+USE_NLS
 W32_FALSE
 W32_TRUE
 HAVE_MAKENSIS_FALSE
@@ -733,6 +754,11 @@
 enable_dependency_tracking
 enable_silent_rules
 enable_debug
+enable_nls
+with_gnu_ld
+enable_rpath
+with_libiconv_prefix
+with_libintl_prefix
 with_equalizer
 '
 ac_precious_vars='build_alias
@@ -747,6 +773,7 @@
 CXX
 CXXFLAGS
 CCC
+CXXCPP
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
@@ -754,6 +781,8 @@
 libavformat_LIBS
 libswscale_CFLAGS
 libswscale_LIBS
+libass_CFLAGS
+libass_LIBS
 libopenal_CFLAGS
 libopenal_LIBS
 libqtopengl_CFLAGS
@@ -1306,7 +1335,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.2 to adapt to many kinds of systems.
+\`configure' configures Bino 0.9.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1377,7 +1406,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of Bino 0.9.2:";;
+ short | recursive ) echo "Configuration of Bino 0.9.3:";;
 esac
 cat <<\_ACEOF
 
@@ -1391,10 +1420,17 @@
 --enable-silent-rules less verbose build output (undo: `make V=1')
 --disable-silent-rules verbose build output (undo: `make V=0')
 --enable-debug Enable debugging checks. Disabled by default.
+ --disable-nls do not use Native Language Support
+ --disable-rpath do not hardcode runtime library paths
 
 Optional Packages:
 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-gnu-ld assume the C compiler uses GNU ld default=no
+ --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
+ --without-libiconv-prefix don't search for libiconv in includedir and libdir
+ --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
+ --without-libintl-prefix don't search for libintl in includedir and libdir
 --with-equalizer Enable multi-display support via Equalizer (disabled
 by default)
 
@@ -1409,6 +1445,7 @@
 CPP C preprocessor
 CXX C++ compiler command
 CXXFLAGS C++ compiler flags
+ CXXCPP C++ preprocessor
 PKG_CONFIG path to pkg-config utility
 PKG_CONFIG_PATH
 directories to add to pkg-config's search path
@@ -1422,6 +1459,9 @@
 C compiler flags for libswscale, overriding pkg-config
 libswscale_LIBS
 linker flags for libswscale, overriding pkg-config
+ libass_CFLAGS
+ C compiler flags for libass, overriding pkg-config
+ libass_LIBS linker flags for libass, overriding pkg-config
 libopenal_CFLAGS
 C compiler flags for libopenal, overriding pkg-config
 libopenal_LIBS
@@ -1508,7 +1548,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-Bino configure 0.9.2
+Bino configure 0.9.3
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1999,11 +2039,48 @@
 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_cxx_check_func
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_cpp
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Bino $as_me 0.9.2, which was
+It was created by Bino $as_me 0.9.3, which was

bino-0.9.2.tar.bz2/configure.ac -> bino-0.9.3.tar.bz2/configure.ac Changed

@@ -22,7 +22,7 @@
 
 dnl Autotools init stuff
 AC_PREREQ([2.65])
-AC_INIT([Bino], [0.9.2], [bino-list@nongnu.org], [bino], [http://bino.nongnu.org/])
+AC_INIT([Bino], [0.9.3], [bino-list@nongnu.org], [bino], [http://bino.nongnu.org/])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
@@ -73,6 +73,9 @@
 AC_SEARCH_LIBS([pthread_create], [pthread])
 AC_CHECK_FUNCS([backtrace clock_gettime sigaction vasprintf])
 
+dnl Gettext
+AM_GNU_GETTEXT([external])
+
 dnl pkg-config (required to detect libraries)
 PKG_PROG_PKG_CONFIG([])
 if test -z "$PKG_CONFIG"; then
@@ -82,20 +85,28 @@
 fi
 
 dnl FFmpeg
-PKG_CHECK_MODULES([libavformat], [libavformat >= 52.64.2 libavcodec libavutil], [HAVE_LIBAVFORMAT=1], [HAVE_LIBAVFORMAT=0])
+PKG_CHECK_MODULES([libavformat], [libavformat >= 52.104.0 libavcodec], [HAVE_LIBAVFORMAT=1], [HAVE_LIBAVFORMAT=0])
 if test "$HAVE_LIBAVFORMAT" != "1"; then
-    AC_MSG_WARN([library libavformat >= 52.64.2 not found:])
+    AC_MSG_WARN([library libavformat >= 52.104.0 not found:])
     AC_MSG_WARN([$libavformat_PKG_ERRORS])
-    AC_MSG_WARN([libavformat is provided by FFmpeg; Debian package: libavformat-dev])
+    AC_MSG_WARN([libavformat >= 52.104.0 is provided by FFmpeg >= 0.6.90-rc0])
 fi
-PKG_CHECK_MODULES([libswscale], [libswscale >= 0.11.0], [HAVE_LIBSWSCALE=1], [HAVE_LIBSWSCALE=0])
+PKG_CHECK_MODULES([libswscale], [libswscale >= 0.13.0 libavutil], [HAVE_LIBSWSCALE=1], [HAVE_LIBSWSCALE=0])
 if test "$HAVE_LIBSWSCALE" != "1"; then
-    AC_MSG_WARN([library libswscale >= 0.11.0 not found:])
+    AC_MSG_WARN([library libswscale >= 0.13.0 not found:])
     AC_MSG_WARN([$libswscale_PKG_ERRORS])
-    AC_MSG_WARN([libswscale is provided by FFmpeg; Debian package: libswscale-dev])
+    AC_MSG_WARN([libswscale >= 0.13.0 is provided by FFmpeg >= 0.6.90-rc0])
 fi
 AC_CHECK_FUNCS([sysconf])
 
+dnl libass
+PKG_CHECK_MODULES([libass], [libass >= 0.9.9], [HAVE_LIBASS=1], [HAVE_LIBASS=0])
+if test "$HAVE_LIBASS" != "1"; then
+    AC_MSG_WARN([library libass not found:])
+    AC_MSG_WARN([$libopenal_PKG_ERRORS])
+    AC_MSG_WARN([libass is provided by LibASS; Debian package: libass-dev])
+fi
+
 dnl OpenAL
 PKG_CHECK_MODULES([libopenal], [openal >= 0.0], [HAVE_LIBOPENAL=1], [HAVE_LIBOPENAL=0])
 if test "$HAVE_LIBOPENAL" != "1"; then
@@ -146,6 +157,7 @@
 dnl Check if all libraries were found
 if test "$HAVE_LIBAVFORMAT" != "1" \
     -o "$HAVE_LIBSWSCALE" != "1" \
+    -o "$HAVE_LIBASS" != "1" \
     -o "$HAVE_LIBOPENAL" != "1" \
     -o "$HAVE_LIBQTOPENGL" != "1" \
     -o $ "$equalizer" = "yes" -a "$HAVE_LIBEQUALIZER" != "1" $ \
@@ -155,6 +167,7 @@
 
 dnl Output
 AC_CONFIG_FILES([Makefile	\
+	po/Makefile.in		\
 	src/base/Makefile	\
 	src/Makefile		\
 	doc/Makefile		\

bino-0.9.2.tar.bz2/doc/Makefile.in -> bino-0.9.3.tar.bz2/doc/Makefile.in Changed

@@ -40,7 +40,11 @@
 	$(srcdir)/Makefile.in $(srcdir)/stamp-vti \
 	$(srcdir)/version.texi
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -108,6 +112,7 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -118,20 +123,32 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MAKENSIS = @MAKENSIS@
 MKDIR_P = @MKDIR_P@
 MOC = @MOC@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -144,13 +161,18 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
 RANLIB = @RANLIB@
 RCC = @RCC@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -187,6 +209,8 @@
 install_sh = @install_sh@
 libEqualizer_CFLAGS = @libEqualizer_CFLAGS@
 libEqualizer_LIBS = @libEqualizer_LIBS@
+libass_CFLAGS = @libass_CFLAGS@
+libass_LIBS = @libass_LIBS@
 libavformat_CFLAGS = @libavformat_CFLAGS@
 libavformat_LIBS = @libavformat_LIBS@
 libdir = @libdir@

bino-0.9.2.tar.bz2/doc/bino.1 -> bino-0.9.3.tar.bz2/doc/bino.1 Changed

@@ -7,19 +7,21 @@
 .\" Copying and distribution of this file, with or without modification, are
 .\" permitted in any medium without royalty provided the copyright notice and this
 .\" notice are preserved. This file is offered as-is, without any warranty.
-.TH Bino 1 2011-02
+.TH Bino 1 2011-04
 .SH NAME
 Bino - a 3D video player with multi-display support.
 .SH SYNOPSIS
 .B bino
-[option...] [file-0] [file-1] [file-2]
+[option...] [file...]
 .SH DESCRIPTION
 Bino plays stereoscopic videos, also known as 3D videos. Such videos have
 separate views for the left and right eye and thus allow depth perception
 through stereopsis.
 .br
-The input streams can be in any number of input files. The files are decoded
-with the \fBFFmpeg\fP libraries, so URLs are supported.
+All input files are combined into one media source, so you can have video,
+audio, and subtitle streams in separate files. The files are decoded with
+the \fBFFmpeg\fP libraries, so URLs and other special constructs are
+supported.
 .IP "\-\-help"
 Print help.
 .IP "\-\-version"
@@ -34,6 +36,8 @@
 Select video stream (1-n, depending on the input).
 .IP "\-a|\-\-audio=\fISTREAM\fP"
 Select audio stream (1-n, depending on the input).
+.IP "\-s|\-\-subtitle=\fISTREAM\fP"
+Select subtitle stream (1-n, depending on the input).
 .IP "\-i|\-\-input=\fITYPE\fP"
 Select input type.
 .RS
@@ -114,6 +118,10 @@
 Left view even columns, right view odd columns.
 .IP "\fIcheckerboard\fP"
 Left and right view in checkerboard pattern.
+.IP "\fIhdmi\-frame\-pack\fP"
+HDMI frame packing mode (left top, right bottom, plus extra blank lines
+separating the two views). This mode is only necessary if you are forcing your
+display into the corresponding HDMI 3D mode.
 .IP "\fIred\-cyan\-monochrome\fP"
 Red/cyan anaglyph, monochrome method.
 .IP "\fIred\-cyan\-half\-color\fP"
@@ -153,12 +161,24 @@
 otherwise \fIred\-cyan\-dubois\fP. The default for mono input is
 \fImono\-left\fP.
 .RE
-.IP "\-s|\-\-swap\-eyes"
+.IP "\-S|\-\-swap\-eyes"
 Swap left/right view.
 .IP "\-f|\-\-fullscreen"
 Fullscreen.
 .IP "\-c|\-\-center"
 Center window on screen.
+.IP "\-\-subtitle\-encoding=\fIENC\fP"
+Set subtitle encoding.
+.IP "\-\-subtitle\-font=\fIFONT\fP"
+Set subtitle font name.
+.IP "\-\-subtitle\-size=\fIN\fP"
+Set subtitle font size.
+.IP "\-\-subtitle\-scale=\fIS\fP"
+Set subtitle scale factor.
+.IP "\-\-subtitle\-color=\fICOLOR\fP"
+Set subtitle color, in [AA]RRGGBB format.
+.IP "\-\-subtitle\-parallax=\fIVAL\fP"
+Subtitle parallax adjustment (-1 to +1).
 .IP "\-P|\-\-parallax=\fIVAL\fP"
 Parallax adjustment (-1 to +1).
 .IP "\-C|\-\-crosstalk=\fIVAL\fP"
@@ -177,12 +197,14 @@
 Toggle fullscreen.
 .IP "c"
 Center window.
-.IP "s"
-Swap left/right view.
+.IP "e"
+Swap left/right eye.
 .IP "v"
 Cycle through available video streams.
 .IP "a"
 Cycle through available audio streams.
+.IP "s"
+Cycle through available subtitle streams.
 .IP "1, 2"
 Adjust contrast.
 .IP "3, 4"

bino-0.9.2.tar.bz2/doc/bino.html -> bino-0.9.3.tar.bz2/doc/bino.html Changed

@@ -1,14 +1,14 @@
 <html lang="en">
 <head>
-<title>Bino 0.9.2</title>
+<title>Bino 0.9.3</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="Bino 0.9.2">
+<meta name="description" content="Bino 0.9.3">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 </style>
 </head>
 <body>
-<h1 class="settitle">Bino 0.9.2</h1>
+<h1 class="settitle">Bino 0.9.3</h1>
 <div class="node">
 <a name="Top"></a>
 <hr>
@@ -45,8 +45,8 @@
 
 <h2 class="unnumbered">Bino</h2>
 
-This manual was last updated 5 March 2011 for version
-0.9.2 of Bino.
+This manual was last updated 13 April 2011 for version
+0.9.3 of Bino.
 
 Copyright &copy; 2011
 Martin Lambers (<a href="mailto:marlam@marlam.de">marlam@marlam.de</a>),
@@ -90,8 +90,10 @@
 separate views for the left and right eye and thus allow depth perception
 through stereopsis.
 
- The input streams can be in any number of input files. The files are decoded
-with the <a href="http://ffmpeg.org/">FFmpeg</a> libraries, so URLs are supported.
+ All input files are combined into one media source, so you can have video,
+audio, and subtitle streams in separate files. The files are decoded with the
+<a href="http://ffmpeg.org/">FFmpeg</a> libraries, so URLs and other special
+constructs are supported.
 
 Bino supports a wide variety of stereoscopic input layouts and display
 techniques.
@@ -108,7 +110,7 @@
 <h2 class="chapter">2 Invocation</h2>
 
 Synopsis:
-<code>bino [</code><var>option</var><code>...] [</code><var>file-0</var><code>] [</code><var>file-1</var><code>] [</code><var>file-2</var><code>]</code>
+<code>bino [</code><var>option</var><code>...] [</code><var>file</var><code>...]</code>
 
 <dl>
 <dt>&lsquo;<samp>--help</samp>&rsquo;<dd>Print help. 
@@ -119,11 +121,18 @@
 <var>quiet</var>. 
 <dt>&lsquo;<samp>-v</samp>&rsquo;<dt>&lsquo;<samp>--video=<var>STREAM</var></samp>&rsquo;<dd>Select video stream (1-n, depending on the input). 
 <dt>&lsquo;<samp>-a</samp>&rsquo;<dt>&lsquo;<samp>--audio=<var>STREAM</var></samp>&rsquo;<dd>Select audio stream (1-n, depending on the input). 
+ <dt>&lsquo;<samp>-s</samp>&rsquo;<dt>&lsquo;<samp>--subtitle=<var>STREAM</var></samp>&rsquo;<dd>Select subtitle stream (1-n, depending on the input). 
 <dt>&lsquo;<samp>-i</samp>&rsquo;<dt>&lsquo;<samp>--input=<var>TYPE</var></samp>&rsquo;<dd>Select input type. See <a href="#Input-Layouts">Input Layouts</a>. 
 <dt>&lsquo;<samp>-o</samp>&rsquo;<dt>&lsquo;<samp>--output=<var>TYPE</var></samp>&rsquo;<dd>Select output type. See <a href="#Output-Techniques">Output Techniques</a>. 
- <dt>&lsquo;<samp>-s</samp>&rsquo;<dt>&lsquo;<samp>--swap-eyes</samp>&rsquo;<dd>Swap left/right view. 
+ <dt>&lsquo;<samp>-S</samp>&rsquo;<dt>&lsquo;<samp>--swap-eyes</samp>&rsquo;<dd>Swap left/right view. 
 <dt>&lsquo;<samp>-f</samp>&rsquo;<dt>&lsquo;<samp>--fullscreen</samp>&rsquo;<dd>Fullscreen. 
 <dt>&lsquo;<samp>-c</samp>&rsquo;<dt>&lsquo;<samp>--center</samp>&rsquo;<dd>Center window on screen. 
+ <dt>&lsquo;<samp>--subtitle-encoding=<var>ENC</var></samp>&rsquo;<dd>Set subtitle encoding. 
+ <dt>&lsquo;<samp>--subtitle-font=<var>FONT</var></samp>&rsquo;<dd>Set subtitle font name. 
+ <dt>&lsquo;<samp>--subtitle-size=<var>N</var></samp>&rsquo;<dd>Set subtitle font size. 
+ <dt>&lsquo;<samp>--subtitle-scale=<var>S</var></samp>&rsquo;<dd>Set subtitle scale factor. 
+ <dt>&lsquo;<samp>--subtitle-color=<var>COLOR</var></samp>&rsquo;<dd>Set subtitle color, in [AA]RRGGBB format. 
+ <dt>&lsquo;<samp>--subtitle-parallax=<var>VAL</var></samp>&rsquo;<dd>Subtitle parallax adjustment (-1 to +1). 
 <dt>&lsquo;<samp>-P</samp>&rsquo;<dt>&lsquo;<samp>--parallax=<var>VAL</var></samp>&rsquo;<dd>Parallax adjustment (-1 to +1). 
 <dt>&lsquo;<samp>-C</samp>&rsquo;<dt>&lsquo;<samp>--crosstalk=<var>VAL</var></samp>&rsquo;<dd>Crosstalk leak level (0 to 1). Comma-separated values for the R,G,B channels. 
 <dt>&lsquo;<samp>-G</samp>&rsquo;<dt>&lsquo;<samp>--ghostbust=<var>VAL</var></samp>&rsquo;<dd>Amount of crosstalk ghostbusting to apply (0 to 1). 
@@ -186,6 +195,11 @@
 <dt><var>even-odd-rows</var><dd>Left view even rows, right view odd rows. 
 <dt><var>even-odd-columns</var><dd>Left view even columns, right view odd columns. 
 <dt><var>checkerboard</var><dd>Left and right view in checkerboard pattern. 
+ <dt><var>hdmi-frame-pack</var><dd>HDMI frame packing mode (left top, right bottom, plus extra blank lines
+separating the two views). This mode is only necessary if you are forcing your
+display into the corresponding HDMI 3D mode. A description how to do this on
+GNU/Linux can be found in
+<a href="http://lists.nongnu.org/archive/html/bino-list/2011-03/msg00033.html">this post to the Bino mailing list</a>. 
 <dt><var>red-cyan-monochrome</var><dd>Red/cyan anaglyph, monochrome method. 
 <dt><var>red-cyan-half-color</var><dd>Red/cyan anaglyph, half color method. 
 <dt><var>red-cyan-full-color</var><dd>Red/cyan anaglyph, full color method. 
@@ -260,9 +274,10 @@
 <dt><kbd>p</kbd> <dt><kbd>SPACE</kbd><dd>Pause / unpause. 
 <dt><kbd>f</kbd><dd>Toggle fullscreen. 
 <dt><kbd>c</kbd><dd>Center window. 
- <dt><kbd>s</kbd><dd>Swap left/right view. 
+ <dt><kbd>e</kbd><dd>Swap left/right eye. 
 <dt><kbd>v</kbd><dd>Cycle through available video streams. 
 <dt><kbd>a</kbd><dd>Cycle through available audio streams. 
+ <dt><kbd>a</kbd><dd>Cycle through available subtitle streams. 
 <dt><kbd>1</kbd> <dt><kbd>2</kbd><dd>Adjust contrast. 
 <dt><kbd>3</kbd> <dt><kbd>4</kbd><dd>Adjust brightness. 
 <dt><kbd>5</kbd> <dt><kbd>6</kbd><dd>Adjust hue.

bino-0.9.2.tar.bz2/doc/bino.info -> bino-0.9.3.tar.bz2/doc/bino.info Changed

@@ -1,7 +1,7 @@
 This is ../../sources/bino/doc/bino.info, produced by makeinfo version
 4.13 from ../../sources/bino/doc/bino.texi.
 
-This manual was last updated 5 March 2011 for version 0.9.2 of Bino.
+This manual was last updated 13 April 2011 for version 0.9.3 of Bino.
 
 Copyright (C) 2011 Martin Lambers (<marlam@marlam.de>), Stefan
 Eilemann (<eile@eyescale.ch>), Frédéric Devernay
@@ -23,7 +23,7 @@
 Bino
 ****
 
-This manual was last updated 5 March 2011 for version 0.9.2 of Bino.
+This manual was last updated 13 April 2011 for version 0.9.3 of Bino.
 
 Copyright (C) 2011 Martin Lambers (<marlam@marlam.de>), Stefan
 Eilemann (<eile@eyescale.ch>), Frédéric Devernay
@@ -57,9 +57,10 @@
 videos have separate views for the left and right eye and thus allow
 depth perception through stereopsis.
 
- The input streams can be in any number of input files. The files are
-decoded with the FFmpeg (http://ffmpeg.org/) libraries, so URLs are
-supported.
+ All input files are combined into one media source, so you can have
+video, audio, and subtitle streams in separate files. The files are
+decoded with the FFmpeg (http://ffmpeg.org/) libraries, so URLs and
+other special constructs are supported.
 
 Bino supports a wide variety of stereoscopic input layouts and
 display techniques.
@@ -70,7 +71,7 @@
 2 Invocation
 ************
 
-Synopsis: `bino [OPTION...] [FILE-0] [FILE-1] [FILE-2]'
+Synopsis: `bino [OPTION...] [FILE...]'
 
 `--help'
 Print help.
@@ -95,6 +96,10 @@
 `--audio=STREAM'
 Select audio stream (1-n, depending on the input).
 
+`-s'
+`--subtitle=STREAM'
+ Select subtitle stream (1-n, depending on the input).
+
 `-i'
 `--input=TYPE'
 Select input type. *Note Input Layouts::.
@@ -103,7 +108,7 @@
 `--output=TYPE'
 Select output type. *Note Output Techniques::.
 
-`-s'
+`-S'
 `--swap-eyes'
 Swap left/right view.
 
@@ -115,6 +120,24 @@
 `--center'
 Center window on screen.
 
+`--subtitle-encoding=ENC'
+ Set subtitle encoding.
+
+`--subtitle-font=FONT'
+ Set subtitle font name.
+
+`--subtitle-size=N'
+ Set subtitle font size.
+
+`--subtitle-scale=S'
+ Set subtitle scale factor.
+
+`--subtitle-color=COLOR'
+ Set subtitle color, in [AA]RRGGBB format.
+
+`--subtitle-parallax=VAL'
+ Subtitle parallax adjustment (-1 to +1).
+
 `-P'
 `--parallax=VAL'
 Parallax adjustment (-1 to +1).
@@ -218,6 +241,14 @@
 CHECKERBOARD
 Left and right view in checkerboard pattern.
 
+HDMI-FRAME-PACK
+ HDMI frame packing mode (left top, right bottom, plus extra blank
+ lines separating the two views). This mode is only necessary if
+ you are forcing your display into the corresponding HDMI 3D mode.
+ A description how to do this on GNU/Linux can be found in this
+ post to the Bino mailing list
+ (http://lists.nongnu.org/archive/html/bino-list/2011-03/msg00033.html).
+
 RED-CYAN-MONOCHROME
 Red/cyan anaglyph, monochrome method.
 
@@ -354,8 +385,8 @@
 `c'
 Center window.
 
-`s'
- Swap left/right view.
+`e'
+ Swap left/right eye.
 
 `v'
 Cycle through available video streams.
@@ -363,6 +394,9 @@
 `a'
 Cycle through available audio streams.
 
+`a'
+ Cycle through available subtitle streams.
+
 `1'
 
 `2'
@@ -766,15 +800,15 @@
 
 &#x1f;
 Tag Table:
-Node: Top&#x7f;767
-Node: Overview&#x7f;1521
-Node: Invocation&#x7f;2088
-Node: Input Layouts&#x7f;3354
-Node: Output Techniques&#x7f;4588
-Node: File Name Conventions&#x7f;6601
-Node: Interactive Control&#x7f;7450
-Node: Crosstalk Ghostbusting&#x7f;8516
-Node: Multi Display Support&#x7f;10596
+Node: Top&#x7f;768
+Node: Overview&#x7f;1523
+Node: Invocation&#x7f;2187
+Node: Input Layouts&#x7f;3879
+Node: Output Techniques&#x7f;5113
+Node: File Name Conventions&#x7f;7534
+Node: Interactive Control&#x7f;8383
+Node: Crosstalk Ghostbusting&#x7f;9500
+Node: Multi Display Support&#x7f;11580
 &#x1f;
 End Tag Table

bino-0.9.2.tar.bz2/doc/bino.texi -> bino-0.9.3.tar.bz2/doc/bino.texi Changed

@@ -72,8 +72,10 @@
 separate views for the left and right eye and thus allow depth perception
 through stereopsis.
 
-The input streams can be in any number of input files. The files are decoded
-with the @url{http://ffmpeg.org/,FFmpeg} libraries, so URLs are supported.
+All input files are combined into one media source, so you can have video,
+audio, and subtitle streams in separate files. The files are decoded with the
+@url{http://ffmpeg.org/,FFmpeg}  libraries, so URLs and other special
+constructs are supported.
 
 Bino supports a wide variety of stereoscopic input layouts and display
 techniques.
@@ -82,7 +84,7 @@
 @chapter Invocation
 
 Synopsis:
-@code{bino [@var{option}@dots{}] [@var{file-0}] [@var{file-1}] [@var{file-2}]}
+@code{bino [@var{option}@dots{}] [@var{file}@dots{}]}
 
 @table @samp
 @item --help
@@ -103,13 +105,16 @@
 @item -a
 @itemx --audio=@var{STREAM}
 Select audio stream (1-n, depending on the input).
+@item -s
+@itemx --subtitle=@var{STREAM}
+Select subtitle stream (1-n, depending on the input).
 @item -i
 @itemx --input=@var{TYPE}
 Select input type. @xref{Input Layouts}.
 @item -o
 @itemx --output=@var{TYPE}
 Select output type. @xref{Output Techniques}.
-@item -s
+@item -S
 @itemx --swap-eyes
 Swap left/right view.
 @item -f
@@ -118,6 +123,18 @@
 @item -c
 @itemx --center
 Center window on screen.
+@item --subtitle-encoding=@var{ENC}
+Set subtitle encoding.
+@item --subtitle-font=@var{FONT}
+Set subtitle font name.
+@item --subtitle-size=@var{N}
+Set subtitle font size.
+@item --subtitle-scale=@var{S}
+Set subtitle scale factor.
+@item --subtitle-color=@var{COLOR}
+Set subtitle color, in [AA]RRGGBB format.
+@item --subtitle-parallax=@var{VAL}
+Subtitle parallax adjustment (-1 to +1).
 @item -P
 @itemx --parallax=@var{VAL}
 Parallax adjustment (-1 to +1).
@@ -194,6 +211,12 @@
 Left view even columns, right view odd columns.
 @item checkerboard
 Left and right view in checkerboard pattern.
+@item hdmi-frame-pack
+HDMI frame packing mode (left top, right bottom, plus extra blank lines
+separating the two views). This mode is only necessary if you are forcing your
+display into the corresponding HDMI 3D mode. A description how to do this on
+GNU/Linux can be found in
+@url{http://lists.nongnu.org/archive/html/bino-list/2011-03/msg00033.html,this post to the Bino mailing list}.
 @item red-cyan-monochrome
 Red/cyan anaglyph, monochrome method.
 @item red-cyan-half-color
@@ -296,12 +319,14 @@
 Toggle fullscreen.
 @item c
 Center window.
-@item s
-Swap left/right view.
+@item e
+Swap left/right eye.
 @item v
 Cycle through available video streams.
 @item a
 Cycle through available audio streams.
+@item a
+Cycle through available subtitle streams.
 @item 1
 @item 2
 Adjust contrast.

bino-0.9.2.tar.bz2/doc/stamp-vti -> bino-0.9.3.tar.bz2/doc/stamp-vti Changed

bino-0.9.2.tar.bz2/doc/version.texi -> bino-0.9.3.tar.bz2/doc/version.texi Changed

bino-0.9.3.tar.bz2/m4 Added

bino-0.9.3.tar.bz2/m4/gettext.m4 Added

@@ -0,0 +1,383 @@
+# gettext.m4 serial 63 (gettext-0.18)
+dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
+dnl default (if it is not specified or empty) is 'no-libtool'.
+dnl INTLSYMBOL should be 'external' for packages with no intl directory,
+dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
+dnl If INTLSYMBOL is 'use-libtool', then a libtool library
+dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl depending on --{enable,disable}-{shared,static} and on the presence of
+dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
+dnl $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl implementations (in libc or libintl) without the ngettext() function
+dnl will be ignored. If NEEDSYMBOL is specified and is
+dnl 'need-formatstring-macros', then GNU gettext implementations that don't
+dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl INTLDIR is used to find the intl libraries. If empty,
+dnl the value `$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl and used.
+dnl Catalog format: GNU --> install in $(datadir)
+dnl Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl Catalog format: GNU --> install in $(datadir)
+dnl Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl Catalog format: none
+dnl Catalog extension: none
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_GNU_GETTEXT],
+[
+ dnl Argument checking.
+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+ ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
+ [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+])])])])
+ define([gt_included_intl],
+ ifelse([$1], [external],
+ ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
+ [yes]))
+ define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+ gt_NEEDS_INIT
+ AM_GNU_GETTEXT_NEED([$2])
+
+ AC_REQUIRE([AM_PO_SUBDIRS])dnl
+ ifelse(gt_included_intl, yes, [
+ AC_REQUIRE([AM_INTL_SUBDIR])dnl
+ ])
+
+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+
+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
+ dnl Ideally we would do this search only after the
+ dnl if test "$USE_NLS" = "yes"; then
+ dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+ dnl the configure script would need to contain the same shell code
+ dnl again, outside any 'if'. There are two solutions:
+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+ dnl documented, we avoid it.
+ ifelse(gt_included_intl, yes, , [
+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+ ])
+
+ dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+ gt_INTL_MACOSX
+
+ dnl Set USE_NLS.
+ AC_REQUIRE([AM_NLS])
+
+ ifelse(gt_included_intl, yes, [
+ BUILD_INCLUDED_LIBINTL=no
+ USE_INCLUDED_LIBINTL=no
+ ])
+ LIBINTL=
+ LTLIBINTL=
+ POSUB=
+
+ dnl Add a version number to the cache macros.
+ case " $gt_needs " in
+ *" need-formatstring-macros "*) gt_api_version=3 ;;
+ *" need-ngettext "*) gt_api_version=2 ;;
+ *) gt_api_version=1 ;;
+ esac
+ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+ dnl If we use NLS figure out what method
+ if test "$USE_NLS" = "yes"; then
+ gt_use_preinstalled_gnugettext=no
+ ifelse(gt_included_intl, yes, [
+ AC_MSG_CHECKING([whether included gettext is requested])
+ AC_ARG_WITH([included-gettext],
+ [ --with-included-gettext use the GNU gettext library included here],
+ nls_cv_force_use_gnu_gettext=$withval,
+ nls_cv_force_use_gnu_gettext=no)
+ AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
+
+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+ ])
+ dnl User does not insist on using GNU NLS library. Figure out what
+ dnl to use. If GNU gettext is available we use this. Else we have
+ dnl to fall back to GNU NLS library.
+
+ if test $gt_api_version -ge 3; then
+ gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+'
+ else
+ gt_revision_test_code=
+ fi
+ if test $gt_api_version -ge 2; then
+ gt_expression_test_code=' + * ngettext ("", "", 0)'
+ else
+ gt_expression_test_code=
+ fi
+
+ AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+ [AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;],
+ [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
+ [eval "$gt_func_gnugettext_libc=yes"],
+ [eval "$gt_func_gnugettext_libc=no"])])
+
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
+ ifelse(gt_included_intl, yes, , [
+ AM_ICONV_LINK
+ ])
+ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+ dnl even if libiconv doesn't exist.
+ AC_LIB_LINKFLAGS_BODY([intl])
+ AC_CACHE_CHECK([for GNU gettext in libintl],
+ [$gt_func_gnugettext_libintl],
+ [gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $INCINTL"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBINTL"
+ dnl Now see whether libintl exists and does not depend on libiconv.
+ AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+ [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+ [eval "$gt_func_gnugettext_libintl=yes"],
+ [eval "$gt_func_gnugettext_libintl=no"])
+ dnl Now see whether libintl exists and depends on libiconv.
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then

bino-0.9.3.tar.bz2/m4/iconv.m4 Added

@@ -0,0 +1,214 @@
+# iconv.m4 serial 11 (gettext-0.18.1)
+dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
+[
+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+
+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+ dnl accordingly.
+ AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+ dnl those with the standalone portable GNU libiconv installed).
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+ dnl accordingly.
+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+
+ dnl Add $INCICONV to CPPFLAGS before performing the following checks,
+ dnl because if the user has installed libiconv and not disabled its use
+ dnl via --without-libiconv-prefix, he wants to use it. The first
+ dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+ am_save_CPPFLAGS="$CPPFLAGS"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+ AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+ [am_cv_func_iconv=yes])
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+ AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+ [am_cv_lib_iconv=yes]
+ [am_cv_func_iconv=yes])
+ LIBS="$am_save_LIBS"
+ fi
+ ])
+ if test "$am_cv_func_iconv" = yes; then
+ AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
+ dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
+ am_save_LIBS="$LIBS"
+ if test $am_cv_lib_iconv = yes; then
+ LIBS="$LIBS $LIBICONV"
+ fi
+ AC_TRY_RUN([
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+ /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+ returns. */
+ {
+ iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+ if (cd_utf8_to_88591 != (iconv_t)(-1))
+ {
+ static const char input[] = "\342\202\254"; /* EURO SIGN */
+ char buf[10];
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_utf8_to_88591,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res == 0)
+ return 1;
+ }
+ }
+ /* Test against Solaris 10 bug: Failures are not distinguishable from
+ successful returns. */
+ {
+ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+ if (cd_ascii_to_88591 != (iconv_t)(-1))
+ {
+ static const char input[] = "\263";
+ char buf[10];
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_ascii_to_88591,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res == 0)
+ return 1;
+ }
+ }
+#if 0 /* This bug could be worked around by the caller. */
+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
+ {
+ iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+ if (cd_88591_to_utf8 != (iconv_t)(-1))
+ {
+ static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+ char buf[50];
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_88591_to_utf8,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if ((int)res > 0)
+ return 1;
+ }
+ }
+#endif
+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+ provided. */
+ if (/* Try standardized names. */
+ iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+ /* Try IRIX, OSF/1 names. */
+ && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+ /* Try AIX names. */
+ && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+ /* Try HP-UX names. */
+ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+ return 1;
+ return 0;
+}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
+ [case "$host_os" in
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac])
+ LIBS="$am_save_LIBS"
+ ])
+ case "$am_cv_func_iconv_works" in
+ *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+ *) am_func_iconv=yes ;;
+ esac
+ else
+ am_func_iconv=no am_cv_lib_iconv=no
+ fi
+ if test "$am_func_iconv" = yes; then
+ AC_DEFINE([HAVE_ICONV], [1],
+ [Define if you have the iconv() function and it works.])
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ AC_MSG_CHECKING([how to link with libiconv])
+ AC_MSG_RESULT([$LIBICONV])
+ else
+ dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
+ dnl either.
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
+ fi
+ AC_SUBST([LIBICONV])
+ AC_SUBST([LTLIBICONV])
+])
+
+dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
+dnl avoid warnings like
+dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
+dnl This is tricky because of the way 'aclocal' is implemented:
+dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
+dnl Otherwise aclocal's initial scan pass would miss the macro definition.
+dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
+dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
+dnl warnings.
+m4_define([gl_iconv_AC_DEFUN],
+ m4_version_prereq([2.64],
+ [[AC_DEFUN_ONCE(
+ [$1], [$2])]],
+ [[AC_DEFUN(
+ [$1], [$2])]]))
+gl_iconv_AC_DEFUN([AM_ICONV],
+[
+ AM_ICONV_LINK
+ if test "$am_cv_func_iconv" = yes; then
+ AC_MSG_CHECKING([for iconv declaration])
+ AC_CACHE_VAL([am_cv_proto_iconv], [
+ AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"

bino-0.9.3.tar.bz2/m4/lib-ld.m4 Added

@@ -0,0 +1,110 @@
+# lib-ld.m4 serial 4 (gettext-0.18)
+dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
+
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ acl_cv_prog_gnu_ld=yes ;;
+*)
+ acl_cv_prog_gnu_ld=no ;;
+esac])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-1.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ AC_MSG_CHECKING([for ld used by GCC])
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [[\\/]* | [A-Za-z]:[\\/]*)]
+ [re_direlt='/[^/][^/]*/\.\./']
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ AC_MSG_CHECKING([for GNU ld])
+else
+ AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL([acl_cv_path_LD],
+[if test -z "$LD"; then
+ IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ acl_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ *GNU* | *'with BFD'*)
+ test "$with_gnu_ld" != no && break ;;
+ *)
+ test "$with_gnu_ld" != yes && break ;;
+ esac
+ fi
+ done
+ IFS="$ac_save_ifs"
+else
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+ AC_MSG_RESULT([$LD])
+else
+ AC_MSG_RESULT([no])
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])

bino-0.9.3.tar.bz2/m4/lib-link.m4 Added

@@ -0,0 +1,774 @@
+# lib-link.m4 serial 21 (gettext-0.18)
+dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_PREREQ([2.54])
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+  dnl results of this search when this library appears as a dependency.
+  HAVE_LIB[]NAME=yes
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. The missing-message
+dnl defaults to 'no' and may contain additional hints for the user.
+dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
+dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed lib[]Name and not disabled its use
+  dnl via --without-lib[]Name-prefix, he wants to use it.
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+    ac_save_LIBS="$LIBS"
+    dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
+    dnl because these -l options might require -L options that are present in
+    dnl LIBS. -l options benefit only from the -L options listed before it.
+    dnl Otherwise, add it to the front of LIBS, because it may be a static
+    dnl library that depends on another static library that is present in LIBS.
+    dnl Static libraries benefit only from the static libraries listed after
+    dnl it.
+    case " $LIB[]NAME" in
+      *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
+      *)       LIBS="$LIB[]NAME $LIBS" ;;
+    esac
+    AC_TRY_LINK([$3], [$4],
+      [ac_cv_lib[]Name=yes],
+      [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
+    LIBS="$ac_save_LIBS"
+  ])
+  if test "$ac_cv_lib[]Name" = yes; then
+    HAVE_LIB[]NAME=yes
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
+    AC_MSG_CHECKING([how to link with lib[]$1])
+    AC_MSG_RESULT([$LIB[]NAME])
+  else
+    HAVE_LIB[]NAME=no
+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+    dnl $INC[]NAME either.
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    LIB[]NAME=
+    LTLIB[]NAME=
+    LIB[]NAME[]_PREFIX=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl   acl_libext,
+dnl   acl_shlibext,
+dnl   acl_hardcode_libdir_flag_spec,
+dnl   acl_hardcode_libdir_separator,
+dnl   acl_hardcode_direct,
+dnl   acl_hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+  ])
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE([rpath],
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
+])
+
+dnl AC_LIB_FROMPACKAGE(name, package)
+dnl declares that libname comes from the given package. The configure file
+dnl will then not have a --with-libname-prefix option but a
+dnl --with-package-prefix option. Several libraries can come from the same
+dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
+dnl macro call that searches for libname.
+AC_DEFUN([AC_LIB_FROMPACKAGE],
+[
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  define([acl_frompackage_]NAME, [$2])
+  popdef([NAME])
+  pushdef([PACK],[$2])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  define([acl_libsinpackage_]PACKUP,
+    m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
+  popdef([PACKUP])
+  popdef([PACK])
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
+  dnl Autoconf >= 2.61 supports dots in --with options.
+  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_ARG_WITH(P_A_C_K[-prefix],
+[[  --with-]]P_A_C_K[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
+  --without-]]P_A_C_K[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
+[
+    if test "X$withval" = "Xno"; then

bino-0.9.3.tar.bz2/m4/lib-prefix.m4 Added

@@ -0,0 +1,224 @@
+# lib-prefix.m4 serial 7 (gettext-0.18)
+dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ AC_LIB_ARG_WITH([lib-prefix],
+[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+ --without-lib-prefix don't search for libraries in includedir and libdir],
+[
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ fi
+ fi
+])
+ if test $use_additional = yes; then
+ dnl Potentially add $additional_includedir to $CPPFLAGS.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/include,
+ dnl 2. if it's already present in $CPPFLAGS,
+ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ for x in $CPPFLAGS; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ dnl Really add $additional_includedir to $CPPFLAGS.
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ dnl Potentially add $additional_libdir to $LDFLAGS.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/lib,
+ dnl 2. if it's already present in $LDFLAGS,
+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+ haveit=
+ for x in $LDFLAGS; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LDFLAGS.
+ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+ dnl Unfortunately, prefix and exec_prefix get only finally determined
+ dnl at the end of configure.
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
+ else
+ acl_final_prefix="$prefix"
+ fi
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ $1
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_PREPARE_MULTILIB creates
+dnl - a variable acl_libdirstem, containing the basename of the libdir, either
+dnl "lib" or "lib64" or "lib/64",
+dnl - a variable acl_libdirstem2, as a secondary possible value for
+dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
+dnl "lib/amd64".
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+ dnl There is no formal standard regarding lib and lib64.
+ dnl On glibc systems, the current practice is that on a system supporting
+ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+ dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
+ dnl the compiler's default mode by looking at the compiler's library search
+ dnl path. If at least one of its elements ends in /lib64 or points to a
+ dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
+ dnl Otherwise we use the default, namely "lib".
+ dnl On Solaris systems, the current practice is that on a system supporting
+ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+ dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
+ dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ acl_libdirstem=lib
+ acl_libdirstem2=
+ case "$host_os" in
+ solaris*)
+ dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
+ dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
+ dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
+ dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
+ dnl symlink is missing, so we set acl_libdirstem2 too.
+ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
+ [AC_EGREP_CPP([sixtyfour bits], [
+#ifdef _LP64
+sixtyfour bits
+#endif
+ ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
+ ])
+ if test $gl_cv_solaris_64bit = yes; then
+ acl_libdirstem=lib/64
+ case "$host_cpu" in
+ sparc*) acl_libdirstem2=lib/sparcv9 ;;
+ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+ esac
+ fi

bino-0.9.3.tar.bz2/m4/nls.m4 Added

@@ -0,0 +1,32 @@
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+ AC_ARG_ENABLE([nls],
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+ AC_MSG_RESULT([$USE_NLS])
+ AC_SUBST([USE_NLS])
+])

bino-0.9.3.tar.bz2/m4/po.m4 Added

@@ -0,0 +1,449 @@
+# po.m4 serial 17 (gettext-0.18)
+dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+ AC_REQUIRE([AM_NLS])dnl
+
+ dnl Release version of the gettext macros. This is used to ensure that
+ dnl the gettext macros and po/Makefile.in.in are in sync.
+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+
+ dnl Perform the following tests also if --disable-nls has been given,
+ dnl because they are needed for "make dist" to work.
+
+ dnl Search for GNU msgfmt in the PATH.
+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+ dnl The second test excludes FreeBSD msgfmt.
+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+ :)
+ AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
+
+ dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+ case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+ *) MSGFMT_015=$MSGFMT ;;
+ esac
+changequote([,])dnl
+ AC_SUBST([MSGFMT_015])
+changequote(,)dnl
+ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+ *) GMSGFMT_015=$GMSGFMT ;;
+ esac
+changequote([,])dnl
+ AC_SUBST([GMSGFMT_015])
+
+ dnl Search for GNU xgettext 0.12 or newer in the PATH.
+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+ dnl The second test excludes FreeBSD xgettext.
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+ :)
+ dnl Remove leftover from FreeBSD xgettext call.
+ rm -f messages.po
+
+ dnl Test whether it is GNU xgettext >= 0.15.
+changequote(,)dnl
+ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+ *) XGETTEXT_015=$XGETTEXT ;;
+ esac
+changequote([,])dnl
+ AC_SUBST([XGETTEXT_015])
+
+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
+
+ dnl Installation directories.
+ dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+ dnl have to define it here, so that it can be used in po/Makefile.
+ test -n "$localedir" || localedir='${datadir}/locale'
+ AC_SUBST([localedir])
+
+ dnl Support for AM_XGETTEXT_OPTION.
+ test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+ AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
+ AC_CONFIG_COMMANDS([po-directories], [[
+ for ac_file in $CONFIG_FILES; do
+ # Support "outfile[:infile[:infile...]]"
+ case "$ac_file" in
+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+ esac
+ # PO directories have a Makefile.in generated from Makefile.in.in.
+ case "$ac_file" in */Makefile.in)
+ # Adjust a relative srcdir.
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+ # In autoconf-2.13 it is called $ac_given_srcdir.
+ # In autoconf-2.50 it is called $srcdir.
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+ case "$ac_given_srcdir" in
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+ /*) top_srcdir="$ac_given_srcdir" ;;
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+ # Treat a directory as a PO directory if and only if it has a
+ # POTFILES.in file. This allows packages to have multiple PO
+ # directories under different names or in different locations.
+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+ rm -f "$ac_dir/POTFILES"
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
+ POMAKEFILEDEPS="POTFILES.in"
+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+ # on $ac_dir but don't depend on user-specified configuration
+ # parameters.
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+ # The LINGUAS file contains the set of available languages.
+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+ fi
+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ else
+ # The set of available languages was given in configure.in.
+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+ fi
+ # Compute POFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+ # Compute UPDATEPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+ # Compute DUMMYPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+ # Compute GMOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+ case "$ac_given_srcdir" in
+ .) srcdirpre= ;;
+ *) srcdirpre='$(srcdir)/' ;;
+ esac
+ POFILES=
+ UPDATEPOFILES=
+ DUMMYPOFILES=
+ GMOFILES=
+ for lang in $ALL_LINGUAS; do
+ POFILES="$POFILES $srcdirpre$lang.po"
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+ done
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
+ # environment variable.
+ INST_LINGUAS=
+ if test -n "$ALL_LINGUAS"; then
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "$LINGUAS"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
+ fi
+ done
+ fi
+ CATALOGS=
+ if test -n "$INST_LINGUAS"; then
+ for lang in $INST_LINGUAS; do
+ CATALOGS="$CATALOGS $lang.gmo"
+ done
+ fi
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+ if test -f "$f"; then
+ case "$f" in
+ *.orig | *.bak | *~) ;;

bino-0.9.3.tar.bz2/m4/progtest.m4 Added

@@ -0,0 +1,92 @@
+# progtest.m4 serial 6 (gettext-0.18)
+dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+AC_PREREQ([2.50])
+
+# Search path for a program which passes the given test.
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
+else
+ ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL([ac_cv_path_$1],
+[case "[$]$1" in
+ [[\\/]]* | ?:[[\\/]]*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
+ if [$3]; then
+ ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+ ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+ AC_MSG_RESULT([$][$1])
+else
+ AC_MSG_RESULT([no])
+fi
+AC_SUBST([$1])dnl
+])

bino-0.9.2.tar.bz2/pkg/w32/bino.nsi -> bino-0.9.3.tar.bz2/pkg/w32/bino.nsi Changed

bino-0.9.2.tar.bz2/pkg/w32/notes.txt -> bino-0.9.3.tar.bz2/pkg/w32/notes.txt Changed

bino-0.9.3.tar.bz2/po Added

bino-0.9.3.tar.bz2/po/LINGUAS Added

bino-0.9.3.tar.bz2/po/Makefile.in.in Added

@@ -0,0 +1,444 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+#
+# This file can be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.18
+GETTEXT_MACRO_VERSION = 0.18
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+SHELL = /bin/sh
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+localedir = @localedir@
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+	@echo "$(MSGFMT) -c -o $@ $<"; \
+	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+	@lang=`echo $* | sed -e 's,.*/,,'`; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
+
+
+all: check-macro-version all-@USE_NLS@
+
+all-yes: stamp-po
+all-no:
+
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+check-macro-version:
+	@test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+	 || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+	 exit 1; \
+	 }
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	 test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	 echo "touch stamp-po" && \
+	 echo timestamp > stamp-poT && \
+	 mv stamp-poT stamp-po; \
+	}
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
+	 package_gnu='GNU '; \
+	else \
+	 package_gnu=''; \
+	fi; \
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	 msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	 msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
+	case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+	 $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	 --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	 --files-from=$(srcdir)/POTFILES.in \
+	 --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	 --msgid-bugs-address="$$msgid_bugs_address" \
+	 ;; \
+	 *) \
+	 $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	 --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	 --files-from=$(srcdir)/POTFILES.in \
+	 --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	 --package-name="$${package_gnu}@PACKAGE@" \
+	 --package-version='@VERSION@' \
+	 --msgid-bugs-address="$$msgid_bugs_address" \
+	 ;; \
+	esac
+	test ! -f $(DOMAIN).po || { \
+	 if test -f $(srcdir)/$(DOMAIN).pot; then \
+	 sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+	 sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+	 if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+	 rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+	 else \
+	 rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+	 mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	 fi; \
+	 else \
+	 mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	 fi; \
+	}
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+	$(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	 echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+	 cd $(srcdir) \
+	 && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \

bino-0.9.3.tar.bz2/po/Makevars Added

@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = The Bino developers
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = bino-list@nongnu.org
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =

bino-0.9.3.tar.bz2/po/POTFILES.in Added

bino-0.9.3.tar.bz2/po/Rules-quot Added

@@ -0,0 +1,47 @@
+# Special Makefile rules for English message catalogs with quotation marks.
+
+DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
+
+.SUFFIXES: .insert-header .po-update-en
+
+en@quot.po-create:
+	$(MAKE) en@quot.po-update
+en@boldquot.po-create:
+	$(MAKE) en@boldquot.po-update
+
+en@quot.po-update: en@quot.po-update-en
+en@boldquot.po-update: en@boldquot.po-update-en
+
+.insert-header.po-update-en:
+	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	ll=`echo $$lang | sed -e 's/@.*//'`; \
+	LC_ALL=C; export LC_ALL; \
+	cd $(srcdir); \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "creation of $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+en@quot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
+
+en@boldquot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
+
+mostlyclean: mostlyclean-quot
+mostlyclean-quot:
+	rm -f *.insert-header

bino-0.9.3.tar.bz2/po/bino.pot Added

@@ -0,0 +1,1170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The Bino developers
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: bino 0.9.3\n"
+"Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
+"POT-Creation-Date: 2011-04-16 13:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/base/dbg.cpp:50
+#, c-format
+msgid "Caught signal %d (%s). Aborting."
+msgstr ""
+
+#: src/base/dbg.cpp:58
+msgid "Unexpected exception."
+msgstr ""
+
+#. TRANSLATORS: %s will be a mail address.
+#: src/base/dbg.cpp:146
+#, c-format
+msgid "Report bugs to <%s>."
+msgstr ""
+
+#: src/base/exc.cpp:54 src/base/exc.cpp:72 src/base/exc.cpp:106
+#, c-format
+msgid "Exception: %s"
+msgstr ""
+
+#: src/base/opt.cpp:151
+#, c-format
+msgid "Invalid option %s."
+msgstr ""
+
+#: src/base/opt.cpp:155
+#, c-format
+msgid "Option --%s does not take an argument."
+msgstr ""
+
+#: src/base/opt.cpp:160
+#, c-format
+msgid "Invalid option -%c."
+msgstr ""
+
+#: src/base/opt.cpp:169
+#, c-format
+msgid "Option --%s requires an argument."
+msgstr ""
+
+#: src/base/opt.cpp:174
+#, c-format
+msgid "Option -%c requires an argument."
+msgstr ""
+
+#: src/base/opt.cpp:195
+#, c-format
+msgid "Invalid argument for -%c."
+msgstr ""
+
+#: src/base/opt.cpp:199
+#, c-format
+msgid "Invalid argument for --%s."
+msgstr ""
+
+#: src/base/opt.cpp:218
+#, c-format
+msgid "Option --%s (-%c) is mandatory."
+msgstr ""
+
+#: src/base/opt.cpp:222
+#, c-format
+msgid "Option --%s is mandatory."
+msgstr ""
+
+#: src/base/opt.cpp:236
+msgid "Too few arguments."
+msgstr ""
+
+#: src/base/opt.cpp:241
+msgid "Too many arguments."
+msgstr ""
+
+#: src/base/str.cpp:209
+#, c-format
+msgid "Cannot convert string to %s."
+msgstr ""
+
+#: src/base/str.cpp:378 src/base/str.cpp:396 src/base/str.cpp:406
+#: src/base/str.cpp:417
+#, c-format
+msgid "Cannot convert %s to %s."
+msgstr ""
+
+#: src/base/thread.cpp:40 src/base/thread.cpp:51
+#, c-format
+msgid "Cannot initialize mutex: %s"
+msgstr ""
+
+#: src/base/thread.cpp:65
+#, c-format
+msgid "Cannot lock mutex: %s"
+msgstr ""
+
+#: src/base/thread.cpp:79
+#, c-format
+msgid "Cannot unlock mutex: %s"
+msgstr ""
+
+#: src/base/thread.cpp:128
+msgid "Unknown exception."
+msgstr ""
+
+#: src/base/thread.cpp:142
+#, c-format
+msgid "Cannot create thread: %s"
+msgstr ""
+
+#: src/base/thread.cpp:157
+#, c-format
+msgid "Cannot join with thread: %s"
+msgstr ""
+
+#: src/base/timer.cpp:52 src/base/timer.cpp:64 src/base/timer.cpp:78
+msgid "Cannot get time."
+msgstr ""
+
+#: src/audio_output.cpp:63
+msgid "No OpenAL device available."
+msgstr ""
+
+#: src/audio_output.cpp:68
+msgid "No OpenAL context available."
+msgstr ""
+
+#: src/audio_output.cpp:79
+msgid "Cannot create OpenAL buffers."
+msgstr ""
+
+#: src/audio_output.cpp:88
+msgid "Cannot create OpenAL source."
+msgstr ""
+
+#: src/audio_output.cpp:101
+msgid "Cannot set OpenAL source parameters."
+msgstr ""
+
+#: src/audio_output.cpp:155
+msgid "Cannot check OpenAL source state."
+msgstr ""
+
+#: src/audio_output.cpp:162
+msgid "Cannot restart OpenAL source playback."
+msgstr ""
+
+#: src/audio_output.cpp:315
+#, c-format
+msgid "No OpenAL format available for audio data format %s."
+msgstr ""
+
+#: src/audio_output.cpp:342
+msgid "Cannot buffer initial OpenAL data."
+msgstr ""
+
+#: src/audio_output.cpp:356
+msgid "Cannot buffer OpenAL data."
+msgstr ""
+
+#: src/audio_output.cpp:381
+msgid "Cannot start OpenAL source playback."
+msgstr ""
+
+#: src/audio_output.cpp:395
+msgid "Cannot pause OpenAL source playback."
+msgstr ""
+
+#: src/audio_output.cpp:404
+msgid "Cannot unpause OpenAL source playback."
+msgstr ""
+
+#: src/audio_output.cpp:413
+msgid "Cannot stop OpenAL source playback."
+msgstr ""
+
+#: src/audio_output.cpp:424
+msgid "Cannot unqueue OpenAL source buffers."
+msgstr ""
+
+#: src/lib_versions.cpp:85 src/lib_versions.cpp:118 src/lib_versions.cpp:157
+#: src/media_data.cpp:392 src/media_data.cpp:415 src/media_data.cpp:453

bino-0.9.3.tar.bz2/po/boldquot.sed Added

bino-0.9.3.tar.bz2/po/cs.gmo Added

bino-0.9.3.tar.bz2/po/cs.po Added

@@ -0,0 +1,1302 @@
+# Copyright (C) 2011 The Bino developers
+# This file is distributed under the same license as the Bino package.
+# Joe <cuchac@email.cz>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bino 0.9.2\n"
+"Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
+"POT-Creation-Date: 2011-04-16 13:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Joe <cuchac@email.cz>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
+"X-Language: cs_CZ\n"
+"X-Source-Language: C\n"
+
+#: src/base/dbg.cpp:50
+#, c-format
+msgid "Caught signal %d (%s). Aborting."
+msgstr "Obdržn signál %d (%s). Ukončuji se."
+
+#: src/base/dbg.cpp:58
+msgid "Unexpected exception."
+msgstr "Neočekávaná výjimka."
+
+#. TRANSLATORS: %s will be a mail address.
+#: src/base/dbg.cpp:146
+#, c-format
+msgid "Report bugs to <%s>."
+msgstr "Chyby hlaste na <%s>."
+
+#: src/base/exc.cpp:54 src/base/exc.cpp:72 src/base/exc.cpp:106
+#, c-format
+msgid "Exception: %s"
+msgstr "Výjimka: %s"
+
+#: src/base/opt.cpp:151
+#, c-format
+msgid "Invalid option %s."
+msgstr "Neplatná operace %s."
+
+#: src/base/opt.cpp:155
+#, c-format
+msgid "Option --%s does not take an argument."
+msgstr "Volba --%s nepřijímá žádný argument."
+
+#: src/base/opt.cpp:160
+#, c-format
+msgid "Invalid option -%c."
+msgstr "Neplatná volba -%c."
+
+#: src/base/opt.cpp:169
+#, c-format
+msgid "Option --%s requires an argument."
+msgstr "Volba --%s vyžaduje argument."
+
+#: src/base/opt.cpp:174
+#, c-format
+msgid "Option -%c requires an argument."
+msgstr "Volba -%c vyžaduje argument."
+
+#: src/base/opt.cpp:195
+#, c-format
+msgid "Invalid argument for -%c."
+msgstr "Neplatný argument pro -%c."
+
+#: src/base/opt.cpp:199
+#, c-format
+msgid "Invalid argument for --%s."
+msgstr "Neplatný argument pro --%s."
+
+#: src/base/opt.cpp:218
+#, c-format
+msgid "Option --%s (-%c) is mandatory."
+msgstr "Volba --%s (-%c) je povinná."
+
+#: src/base/opt.cpp:222
+#, c-format
+msgid "Option --%s is mandatory."
+msgstr "Volba --%s je povinná."
+
+#: src/base/opt.cpp:236
+msgid "Too few arguments."
+msgstr "Příliš málo parametrů."
+
+#: src/base/opt.cpp:241
+msgid "Too many arguments."
+msgstr "Příliš mnoho parametrů."
+
+#: src/base/str.cpp:209
+#, c-format
+msgid "Cannot convert string to %s."
+msgstr "Nelze převést text do %s."
+
+#: src/base/str.cpp:378 src/base/str.cpp:396 src/base/str.cpp:406
+#: src/base/str.cpp:417
+#, c-format
+msgid "Cannot convert %s to %s."
+msgstr "Nelze převést %s to %s."
+
+#: src/base/thread.cpp:40 src/base/thread.cpp:51
+#, c-format
+msgid "Cannot initialize mutex: %s"
+msgstr "Nelze inicializovat mutex: %s"
+
+#: src/base/thread.cpp:65
+#, c-format
+msgid "Cannot lock mutex: %s"
+msgstr "Nelze zavřít mutex: %s"
+
+#: src/base/thread.cpp:79
+#, c-format
+msgid "Cannot unlock mutex: %s"
+msgstr "Nelze otevřít mutex: %s"
+
+#: src/base/thread.cpp:128
+msgid "Unknown exception."
+msgstr "Neznámá výjimka."
+
+#: src/base/thread.cpp:142
+#, c-format
+msgid "Cannot create thread: %s"
+msgstr "Nelze vytvořit vlákno: %s"
+
+#: src/base/thread.cpp:157
+#, c-format
+msgid "Cannot join with thread: %s"
+msgstr "Nelze se spojit s vláknem: %s"
+
+#: src/base/timer.cpp:52 src/base/timer.cpp:64 src/base/timer.cpp:78
+msgid "Cannot get time."
+msgstr "Nelze získat aktuální čas."
+
+#: src/audio_output.cpp:63
+msgid "No OpenAL device available."
+msgstr "Není k dispozici žádné OpenAL zařízení."
+
+#: src/audio_output.cpp:68
+msgid "No OpenAL context available."
+msgstr "Není k dispozici žádný OpenAL kontext."
+
+#: src/audio_output.cpp:79
+msgid "Cannot create OpenAL buffers."
+msgstr "Nelze vytvořit OpenAL buffer."
+
+#: src/audio_output.cpp:88
+msgid "Cannot create OpenAL source."
+msgstr "Nelze vytvořit OpenAL zdroj."
+
+#: src/audio_output.cpp:101
+msgid "Cannot set OpenAL source parameters."
+msgstr "Nelze nastavit parametry OpenAL."
+
+#: src/audio_output.cpp:155
+msgid "Cannot check OpenAL source state."
+msgstr "Nelze ověřit stav OpenAL zdroje."
+
+#: src/audio_output.cpp:162
+msgid "Cannot restart OpenAL source playback."
+msgstr "Nelze znovu spustit přehrávání OpeanAL zdroje."
+
+#: src/audio_output.cpp:315
+#, c-format
+msgid "No OpenAL format available for audio data format %s."
+msgstr "Neexistuje vhodný OpenAL format pro daný audio formát %s."
+
+#: src/audio_output.cpp:342
+msgid "Cannot buffer initial OpenAL data."
+msgstr "Nelze načíst počáteční data OpenAL."
+
+#: src/audio_output.cpp:356
+msgid "Cannot buffer OpenAL data."
+msgstr "Nelze načíst OpenAL data."
+
+#: src/audio_output.cpp:381
+msgid "Cannot start OpenAL source playback."
+msgstr "Nelze začít přehrávat OpeanAL zdroj."
+
+#: src/audio_output.cpp:395
+msgid "Cannot pause OpenAL source playback."
+msgstr "Nelze přerušit přehrávání OpeanAL zdroje."
+
+#: src/audio_output.cpp:404
+msgid "Cannot unpause OpenAL source playback."
+msgstr "Nelze pokračovat v přehrávání OpeanAL zdroje."
+
+#: src/audio_output.cpp:413
+msgid "Cannot stop OpenAL source playback."
+msgstr "Nelze zastavit přehrávání OpeanAL zdroje."
+
+#: src/audio_output.cpp:424
+msgid "Cannot unqueue OpenAL source buffers."
+msgstr "Nelze odpojit buffery OpeanAL zdroje."
+
+#: src/lib_versions.cpp:85 src/lib_versions.cpp:118 src/lib_versions.cpp:157

bino-0.9.3.tar.bz2/po/de.gmo Added

bino-0.9.3.tar.bz2/po/de.po Added

@@ -0,0 +1,1299 @@
+# Copyright (C) 2011 The Bino developers
+# This file is distributed under the same license as the Bino package.
+# Martin Lambers <marlam@marlam.de>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bino 0.9.2\n"
+"Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
+"POT-Creation-Date: 2011-04-16 13:02+0200\n"
+"PO-Revision-Date: 2011-04-10 17:23+0200\n"
+"Last-Translator: Martin Lambers <marlam@marlam.de>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/base/dbg.cpp:50
+#, c-format
+msgid "Caught signal %d (%s). Aborting."
+msgstr "Signal %d (%s) erhalten. Breche ab."
+
+#: src/base/dbg.cpp:58
+msgid "Unexpected exception."
+msgstr "Unerwartete Ausnahme."
+
+#. TRANSLATORS: %s will be a mail address.
+#: src/base/dbg.cpp:146
+#, c-format
+msgid "Report bugs to <%s>."
+msgstr "Melde Fehler an <%s>."
+
+#: src/base/exc.cpp:54 src/base/exc.cpp:72 src/base/exc.cpp:106
+#, c-format
+msgid "Exception: %s"
+msgstr "Ausnahme: %s"
+
+#: src/base/opt.cpp:151
+#, c-format
+msgid "Invalid option %s."
+msgstr "Ungültige Option %s."
+
+#: src/base/opt.cpp:155
+#, c-format
+msgid "Option --%s does not take an argument."
+msgstr "Option --%s akzeptiert kein Argument."
+
+#: src/base/opt.cpp:160
+#, c-format
+msgid "Invalid option -%c."
+msgstr "Ungültige Option -%c."
+
+#: src/base/opt.cpp:169
+#, c-format
+msgid "Option --%s requires an argument."
+msgstr "Option --%s benötigt ein Argument."
+
+#: src/base/opt.cpp:174
+#, c-format
+msgid "Option -%c requires an argument."
+msgstr "Option -%c benötigt ein Argument."
+
+#: src/base/opt.cpp:195
+#, c-format
+msgid "Invalid argument for -%c."
+msgstr "Ungültiges Argument für -%c."
+
+#: src/base/opt.cpp:199
+#, c-format
+msgid "Invalid argument for --%s."
+msgstr "Ungültiges Argument für --%s."
+
+#: src/base/opt.cpp:218
+#, c-format
+msgid "Option --%s (-%c) is mandatory."
+msgstr "Option --%s (-%c) wird benötigt."
+
+#: src/base/opt.cpp:222
+#, c-format
+msgid "Option --%s is mandatory."
+msgstr "Option --%s wird benötigt."
+
+#: src/base/opt.cpp:236
+msgid "Too few arguments."
+msgstr "Zu wenige Argumente."
+
+#: src/base/opt.cpp:241
+msgid "Too many arguments."
+msgstr "Zu viele Argumente."
+
+#: src/base/str.cpp:209
+#, c-format
+msgid "Cannot convert string to %s."
+msgstr "Kann Zeichenkette nicht zu %s konvertieren."
+
+#: src/base/str.cpp:378 src/base/str.cpp:396 src/base/str.cpp:406
+#: src/base/str.cpp:417
+#, c-format
+msgid "Cannot convert %s to %s."
+msgstr "Kann %s nicht zu %s konvertieren."
+
+#: src/base/thread.cpp:40 src/base/thread.cpp:51
+#, c-format
+msgid "Cannot initialize mutex: %s"
+msgstr "Kann Mutex nicht initialisieren: %s"
+
+#: src/base/thread.cpp:65
+#, c-format
+msgid "Cannot lock mutex: %s"
+msgstr "Kann Mutex nicht sichern: %s"
+
+#: src/base/thread.cpp:79
+#, c-format
+msgid "Cannot unlock mutex: %s"
+msgstr "Kann Mutex nicht entsichern: %s"
+
+#: src/base/thread.cpp:128
+msgid "Unknown exception."
+msgstr "Unbekannte Ausnahme."
+
+#: src/base/thread.cpp:142
+#, c-format
+msgid "Cannot create thread: %s"
+msgstr "Kann Thread nicht erzeugen: %s"
+
+#: src/base/thread.cpp:157
+#, c-format
+msgid "Cannot join with thread: %s"
+msgstr "Kann nicht auf Thread warten: %s"
+
+#: src/base/timer.cpp:52 src/base/timer.cpp:64 src/base/timer.cpp:78
+msgid "Cannot get time."
+msgstr "Kann Zeit nicht abfragen."
+
+#: src/audio_output.cpp:63
+msgid "No OpenAL device available."
+msgstr "Kein OpenAL Gerät verfügbar."
+
+#: src/audio_output.cpp:68
+msgid "No OpenAL context available."
+msgstr "Kein OpenAL Kontext verfügbar."
+
+#: src/audio_output.cpp:79
+msgid "Cannot create OpenAL buffers."
+msgstr "Kann OpenAL Puffer nicht erzeugen."
+
+#: src/audio_output.cpp:88
+msgid "Cannot create OpenAL source."
+msgstr "Kann OpenAL Quelle nicht erzeugen."
+
+#: src/audio_output.cpp:101
+msgid "Cannot set OpenAL source parameters."
+msgstr "Kann OpenAL Quellenparameter nicht setzen."
+
+#: src/audio_output.cpp:155
+msgid "Cannot check OpenAL source state."
+msgstr "Kann OpenAL Quellenzustand nicht abfragen."
+
+#: src/audio_output.cpp:162
+msgid "Cannot restart OpenAL source playback."
+msgstr "Kann das Abspielen der OpenAL Quelle nicht neu starten."
+
+#: src/audio_output.cpp:315
+#, c-format
+msgid "No OpenAL format available for audio data format %s."
+msgstr "Kein OpenAL Format vorhanden für das Audioformat %s."
+
+#: src/audio_output.cpp:342
+msgid "Cannot buffer initial OpenAL data."
+msgstr "Kann initiale OpenAL Daten nicht puffern."
+
+#: src/audio_output.cpp:356
+msgid "Cannot buffer OpenAL data."
+msgstr "Kann OpenAL Daten nicht puffern."
+
+#: src/audio_output.cpp:381
+msgid "Cannot start OpenAL source playback."
+msgstr "Kann das Abspielen der OpenAL Quelle nicht starten."
+
+#: src/audio_output.cpp:395
+msgid "Cannot pause OpenAL source playback."
+msgstr "Kann das Abspielen der OpenAL Quelle nicht unterbrechen."
+
+#: src/audio_output.cpp:404
+msgid "Cannot unpause OpenAL source playback."
+msgstr "Kann das Abspielen der OpenAL Quelle nicht fortsetzen."
+
+#: src/audio_output.cpp:413
+msgid "Cannot stop OpenAL source playback."
+msgstr "Kann das Abspielen der OpenAL Quelle nicht stoppen."
+
+#: src/audio_output.cpp:424
+msgid "Cannot unqueue OpenAL source buffers."
+msgstr "Kann OpenAL Quellenpuffer nicht aus Warteschlange entfernen."
+
+#: src/lib_versions.cpp:85 src/lib_versions.cpp:118 src/lib_versions.cpp:157
+#: src/media_data.cpp:392 src/media_data.cpp:415 src/media_data.cpp:453
+#: src/media_data.cpp:458
+msgid "unknown"

bino-0.9.3.tar.bz2/po/en@boldquot.header Added

@@ -0,0 +1,25 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#

bino-0.9.3.tar.bz2/po/en@quot.header Added

@@ -0,0 +1,22 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#

bino-0.9.3.tar.bz2/po/insert-header.sin Added

bino-0.9.3.tar.bz2/po/quot.sed Added

bino-0.9.3.tar.bz2/po/remove-potcdate.sin Added

bino-0.9.3.tar.bz2/po/stamp-po Added

bino-0.9.2.tar.bz2/src/Makefile.am -> bino-0.9.3.tar.bz2/src/Makefile.am Changed

bino-0.9.2.tar.bz2/src/Makefile.in -> bino-0.9.3.tar.bz2/src/Makefile.in Changed

@@ -52,7 +52,11 @@
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -65,19 +69,20 @@
 	media_object.cpp media_input.h media_input.cpp controller.h \
 	controller.cpp video_output.h video_output.cpp \
 	video_output_qt.h video_output_qt.cpp xgl.h xgl.cpp \
-	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 logo/bino_logo.ico
+	subtitle_renderer.h subtitle_renderer.cpp audio_output.h \
+	audio_output.cpp player.h player.cpp player_qt.h player_qt.cpp \
+	qt_app.h qt_app.cpp lib_versions.h lib_versions.cpp main.cpp \
+	player_equalizer.h player_equalizer.cpp logo/bino_logo.ico
 @HAVE_LIBEQUALIZER_TRUE@am__objects_1 = player_equalizer.$(OBJEXT)
 am__dirstamp = $(am__leading_dot)dirstamp
 @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) \
-	audio_output.$(OBJEXT) player.$(OBJEXT) player_qt.$(OBJEXT) \
-	qt_app.$(OBJEXT) lib_versions.$(OBJEXT) main.$(OBJEXT) \
-	$(am__objects_1) $(am__objects_2)
+	subtitle_renderer.$(OBJEXT) audio_output.$(OBJEXT) \
+	player.$(OBJEXT) player_qt.$(OBJEXT) qt_app.$(OBJEXT) \
+	lib_versions.$(OBJEXT) main.$(OBJEXT) $(am__objects_1) \
+	$(am__objects_2)
 nodist_bino_OBJECTS = qt_resources-rcc.$(OBJEXT) \
 	player_qt-moc.$(OBJEXT) video_output_qt-moc.$(OBJEXT)
 bino_OBJECTS = $(am_bino_OBJECTS) $(nodist_bino_OBJECTS)
@@ -87,6 +92,7 @@
 bino_DEPENDENCIES = $(top_builddir)/src/base/libbase.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_3)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -176,30 +182,43 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@ -DDOCDIR=\"$(docdir)\"
+DEFS = @DEFS@ -DDOCDIR=\"$(docdir)\" -DLOCALEDIR=\"$(localedir)\"
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MAKENSIS = @MAKENSIS@
 MKDIR_P = @MKDIR_P@
 MOC = @MOC@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -212,13 +231,18 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
 RANLIB = @RANLIB@
 RCC = @RCC@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -255,6 +279,8 @@
 install_sh = @install_sh@
 libEqualizer_CFLAGS = @libEqualizer_CFLAGS@
 libEqualizer_LIBS = @libEqualizer_LIBS@
+libass_CFLAGS = @libass_CFLAGS@
+libass_LIBS = @libass_LIBS@
 libavformat_CFLAGS = @libavformat_CFLAGS@
 libavformat_LIBS = @libavformat_LIBS@
 libdir = @libdir@
@@ -293,9 +319,10 @@
 	media_object.cpp media_input.h media_input.cpp controller.h \
 	controller.cpp video_output.h video_output.cpp \
 	video_output_qt.h video_output_qt.cpp xgl.h xgl.cpp \
-	audio_output.h audio_output.cpp player.h player.cpp \
-	player_qt.h player_qt.cpp qt_app.h qt_app.cpp lib_versions.h \
-	lib_versions.cpp main.cpp $(am__append_1) $(am__append_6)
+	subtitle_renderer.h subtitle_renderer.cpp audio_output.h \
+	audio_output.cpp player.h player.cpp player_qt.h player_qt.cpp \
+	qt_app.h qt_app.cpp lib_versions.h lib_versions.cpp main.cpp \
+	$(am__append_1) $(am__append_6)
 EXTRA_DIST = \
 	qt_resources.qrc \
 	logo/README \
@@ -332,11 +359,13 @@
 BUILT_SOURCES = $(nodist_bino_SOURCES)
 CLEANFILES = $(BUILT_SOURCES)
 AM_CPPFLAGS = -I$(top_srcdir)/src/base $(libavformat_CFLAGS) \
-	$(libswscale_CFLAGS) $(libopenal_CFLAGS) $(libglew_CFLAGS) \
-	$(libqtopengl_CFLAGS) $(am__append_2) $(am__append_4)
-bino_LDADD = $(top_builddir)/src/base/libbase.a $(libavformat_LIBS) \
-	$(libswscale_LIBS) $(libopenal_LIBS) $(libglew_LIBS) \
-	$(libqtopengl_LIBS) $(am__append_3) $(am__append_5)
+	$(libswscale_CFLAGS) $(libass_CFLAGS) $(libopenal_CFLAGS) \
+	$(libglew_CFLAGS) $(libqtopengl_CFLAGS) $(am__append_2) \
+	$(am__append_4)
+bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) \
+	$(libavformat_LIBS) $(libswscale_LIBS) $(libass_LIBS) \
+	$(libopenal_LIBS) $(libglew_LIBS) $(libqtopengl_LIBS) \
+	$(am__append_3) $(am__append_5)
 moc_verbose = $(moc_verbose_$(V))
 moc_verbose_ = $(moc_verbose_$(AM_DEFAULT_VERBOSITY))
 moc_verbose_0 = @echo "  MOC   " $@;
@@ -447,6 +476,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player_qt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qt_app.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qt_resources-rcc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subtitle_renderer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_output.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_output_qt-moc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_output_qt.Po@am__quote@

bino-0.9.2.tar.bz2/src/audio_output.cpp -> bino-0.9.3.tar.bz2/src/audio_output.cpp Changed

@@ -23,6 +23,9 @@
 
 #include <limits>
 
+#include "gettext.h"
+#define _(string) gettext(string)
+
 #include "audio_output.h"
 #include "lib_versions.h"
 
@@ -57,12 +60,12 @@
 {
 if (!(_device = alcOpenDevice(NULL)))
 {
- throw exc("No OpenAL device available.");
+ throw exc(_("No OpenAL device available."));
 }
 if (!(_context = alcCreateContext(_device, NULL)))
 {
 alcCloseDevice(_device);
- throw exc("No OpenAL context available.");
+ throw exc(_("No OpenAL context available."));
 }
 alcMakeContextCurrent(_context);
 set_openal_versions();
@@ -73,7 +76,7 @@
 alcMakeContextCurrent(NULL);
 alcDestroyContext(_context);
 alcCloseDevice(_device);
- throw exc("Cannot create OpenAL buffers.");
+ throw exc(_("Cannot create OpenAL buffers."));
 }
 alGenSources(1, &_source);
 if (alGetError() != AL_NO_ERROR)
@@ -82,7 +85,7 @@
 alcMakeContextCurrent(NULL);
 alcDestroyContext(_context);
 alcCloseDevice(_device);
- throw exc("Cannot create OpenAL source.");
+ throw exc(_("Cannot create OpenAL source."));
 }
 /* Comment from alffmpeg.c:
 * "Set parameters so mono sources won't distance attenuate" */
@@ -95,7 +98,7 @@
 alcMakeContextCurrent(NULL);
 alcDestroyContext(_context);
 alcCloseDevice(_device);
- throw exc("Cannot set OpenAL source parameters.");
+ throw exc(_("Cannot set OpenAL source parameters."));
 }
 _state = 0;
 _initialized = true;
@@ -149,14 +152,14 @@
 alGetSourcei(_source, AL_SOURCE_STATE, &_state);
 if (alGetError() != AL_NO_ERROR)
 {
- throw exc("Cannot check OpenAL source state.");
+ throw exc(_("Cannot check OpenAL source state."));
 }
 if (_state != AL_PLAYING)
 {
 alSourcePlay(_source);
 if (alGetError() != AL_NO_ERROR)
 {
- throw exc("Cannot restart OpenAL source playback.");
+ throw exc(_("Cannot restart OpenAL source playback."));
 }
 }
 if (need_data)
@@ -309,8 +312,8 @@
 }
 if (format == 0)
 {
- throw exc(std::string("No OpenAL format available for audio data ")
- + "(" + blob.format_name() + ").");
+ throw exc(str::asprintf(_("No OpenAL format available for "
+ "audio data format %s."), blob.format_name().c_str()));
 }
 return format;
 }
@@ -336,7 +339,7 @@
 }
 if (alGetError() != AL_NO_ERROR)
 {
- throw exc("Cannot buffer initial OpenAL data.");
+ throw exc(_("Cannot buffer initial OpenAL data."));
 }
 }
 else if (blob.size > 0)
@@ -350,7 +353,7 @@
 alSourceQueueBuffers(_source, 1, &buf);
 if (alGetError() != AL_NO_ERROR)
 {
- throw exc("Cannot buffer OpenAL data.");
+ throw exc(_("Cannot buffer OpenAL data."));
 }
 // Update the time spent on all past buffers
 int64_t current_buffer_samples = _buffer_size / _buffer_channels[0] * 8 / _buffer_sample_bits[0];
@@ -375,7 +378,7 @@
 alGetSourcei(_source, AL_SOURCE_STATE, &_state);
 if (alGetError() != AL_NO_ERROR)
 {
- throw exc("Cannot start OpenAL source playback.");
+ throw exc(_("Cannot start OpenAL source playback."));
 }
 _past_time = 0;
 _last_timestamp = 0;
@@ -389,7 +392,7 @@
 alSourcePause(_source);
 if (alGetError() != AL_NO_ERROR)
 {
- throw exc("Cannot pause OpenAL source playback.");
+ throw exc(_("Cannot pause OpenAL source playback."));
 }
 }
 
@@ -398,7 +401,7 @@
 alSourcePlay(_source);
 if (alGetError() != AL_NO_ERROR)
 {
- throw exc("Cannot unpause OpenAL source playback.");
+ throw exc(_("Cannot unpause OpenAL source playback."));
 }
 }
 
@@ -407,7 +410,7 @@
 alSourceStop(_source);
 if (alGetError() != AL_NO_ERROR)
 {
- throw exc("Cannot stop OpenAL source playback.");
+ throw exc(_("Cannot stop OpenAL source playback."));
 }
 // flush all buffers and reset the state
 ALint processed_buffers;
@@ -418,7 +421,7 @@
 alSourceUnqueueBuffers(_source, 1, &buf);
 if (alGetError() != AL_NO_ERROR)
 {
- throw exc("Cannot unqueue OpenAL source buffers.");
+ throw exc(_("Cannot unqueue OpenAL source buffers."));
 }
 alGetSourcei(_source, AL_BUFFERS_PROCESSED, &processed_buffers);
 }

bino-0.9.2.tar.bz2/src/base/Makefile.am -> bino-0.9.3.tar.bz2/src/base/Makefile.am Changed

bino-0.9.2.tar.bz2/src/base/Makefile.in -> bino-0.9.3.tar.bz2/src/base/Makefile.in Changed

@@ -45,7 +45,11 @@
 subdir = src/base
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -113,6 +117,7 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -123,20 +128,32 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MAKENSIS = @MAKENSIS@
 MKDIR_P = @MKDIR_P@
 MOC = @MOC@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -149,13 +166,18 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
 RANLIB = @RANLIB@
 RCC = @RCC@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -192,6 +214,8 @@
 install_sh = @install_sh@
 libEqualizer_CFLAGS = @libEqualizer_CFLAGS@
 libEqualizer_LIBS = @libEqualizer_LIBS@
+libass_CFLAGS = @libass_CFLAGS@
+libass_LIBS = @libass_LIBS@
 libavformat_CFLAGS = @libavformat_CFLAGS@
 libavformat_LIBS = @libavformat_LIBS@
 libdir = @libdir@
@@ -236,7 +260,8 @@
 	timer.h timer.cpp \
 	s11n.h s11n.cpp \
 	blob.h \
-	thread.h thread.cpp
+	thread.h thread.cpp \
+	gettext.h
 
 all: all-am

bino-0.9.2.tar.bz2/src/base/dbg.cpp -> bino-0.9.3.tar.bz2/src/base/dbg.cpp Changed

bino-0.9.2.tar.bz2/src/base/exc.cpp -> bino-0.9.3.tar.bz2/src/base/exc.cpp Changed

bino-0.9.3.tar.bz2/src/base/gettext.h Added

@@ -0,0 +1,280 @@
+/* Convenience header for conditional use of GNU <libintl.h>.
+ Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009 Free Software Foundation, Inc.
+
+ 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, 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ USA. */
+
+#ifndef _LIBGETTEXT_H
+#define _LIBGETTEXT_H 1
+
+/* NLS can be disabled through the configure --disable-nls option. */
+#if ENABLE_NLS
+
+/* Get declarations of GNU message catalog functions. */
+# include <libintl.h>
+
+/* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by
+ the gettext() and ngettext() macros. This is an alternative to calling
+ textdomain(), and is useful for libraries. */
+# ifdef DEFAULT_TEXT_DOMAIN
+# undef gettext
+# define gettext(Msgid) \
+ dgettext (DEFAULT_TEXT_DOMAIN, Msgid)
+# undef ngettext
+# define ngettext(Msgid1, Msgid2, N) \
+ dngettext (DEFAULT_TEXT_DOMAIN, Msgid1, Msgid2, N)
+# endif
+
+#else
+
+/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
+ chokes if dcgettext is defined as a macro. So include it now, to make
+ later inclusions of <locale.h> a NOP. We don't include <libintl.h>
+ as well because people using "gettext.h" will not include <libintl.h>,
+ and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
+ is OK. */
+#if defined(__sun)
+# include <locale.h>
+#endif
+
+/* Many header files from the libstdc++ coming with g++ 3.3 or newer include
+ <libintl.h>, which chokes if dcgettext is defined as a macro. So include
+ it now, to make later inclusions of <libintl.h> a NOP. */
+#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
+# include <cstdlib>
+# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
+# include <libintl.h>
+# endif
+#endif
+
+/* Disabled NLS.
+ The casts to 'const char *' serve the purpose of producing warnings
+ for invalid uses of the value returned from these functions.
+ On pre-ANSI systems without 'const', the config.h file is supposed to
+ contain "#define const". */
+# undef gettext
+# define gettext(Msgid) ((const char *) (Msgid))
+# undef dgettext
+# define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid))
+# undef dcgettext
+# define dcgettext(Domainname, Msgid, Category) \
+ ((void) (Category), dgettext (Domainname, Msgid))
+# undef ngettext
+# define ngettext(Msgid1, Msgid2, N) \
+ ((N) == 1 \
+ ? ((void) (Msgid2), (const char *) (Msgid1)) \
+ : ((void) (Msgid1), (const char *) (Msgid2)))
+# undef dngettext
+# define dngettext(Domainname, Msgid1, Msgid2, N) \
+ ((void) (Domainname), ngettext (Msgid1, Msgid2, N))
+# undef dcngettext
+# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+ ((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N))
+# undef textdomain
+# define textdomain(Domainname) ((const char *) (Domainname))
+# undef bindtextdomain
+# define bindtextdomain(Domainname, Dirname) \
+ ((void) (Domainname), (const char *) (Dirname))
+# undef bind_textdomain_codeset
+# define bind_textdomain_codeset(Domainname, Codeset) \
+ ((void) (Domainname), (const char *) (Codeset))
+
+#endif
+
+/* A pseudo function call that serves as a marker for the automated
+ extraction of messages, but does not call gettext(). The run-time
+ translation is done at a different place in the code.
+ The argument, String, should be a literal string. Concatenated strings
+ and other string expressions won't work.
+ The macro's expansion is not parenthesized, so that it is suitable as
+ initializer for static 'char[]' or 'const char[]' variables. */
+#define gettext_noop(String) String
+
+/* The separator between msgctxt and msgid in a .mo file. */
+#define GETTEXT_CONTEXT_GLUE "\004"
+
+/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a
+ MSGID. MSGCTXT and MSGID must be string literals. MSGCTXT should be
+ short and rarely need to change.
+ The letter 'p' stands for 'particular' or 'special'. */
+#ifdef DEFAULT_TEXT_DOMAIN
+# define pgettext(Msgctxt, Msgid) \
+ pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+#else
+# define pgettext(Msgctxt, Msgid) \
+ pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+#endif
+#define dpgettext(Domainname, Msgctxt, Msgid) \
+ pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \
+ pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category)
+#ifdef DEFAULT_TEXT_DOMAIN
+# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
+ npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
+#else
+# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
+ npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
+#endif
+#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+ npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
+#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
+ npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category)
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+pgettext_aux (const char *domain,
+ const char *msg_ctxt_id, const char *msgid,
+ int category)
+{
+ const char *translation = dcgettext (domain, msg_ctxt_id, category);
+ if (translation == msg_ctxt_id)
+ return msgid;
+ else
+ return translation;
+}
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+npgettext_aux (const char *domain,
+ const char *msg_ctxt_id, const char *msgid,
+ const char *msgid_plural, unsigned long int n,
+ int category)
+{
+ const char *translation =
+ dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+ if (translation == msg_ctxt_id || translation == msgid_plural)
+ return (n == 1 ? msgid : msgid_plural);
+ else
+ return translation;
+}
+
+/* The same thing extended for non-constant arguments. Here MSGCTXT and MSGID
+ can be arbitrary expressions. But for string literals these macros are
+ less efficient than those above. */
+
+#include <string.h>
+
+#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
+ (((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \
+ /* || __STDC_VERSION__ >= 199901L */ )
+
+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+#include <stdlib.h>
+#endif
+
+#define pgettext_expr(Msgctxt, Msgid) \
+ dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
+#define dpgettext_expr(Domainname, Msgctxt, Msgid) \
+ dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif

bino-0.9.2.tar.bz2/src/base/msg.cpp -> bino-0.9.3.tar.bz2/src/base/msg.cpp Changed

@@ -125,18 +125,18 @@
 }
 }
 
- void msg(level_t level, const std::string &s)
+ void msg(int indent, level_t level, const std::string &s)
 {
 if (level < _level)
 {
 return;
 }
 
- std::string out = prefix(level) + s.c_str() + '\n';
+ std::string out = prefix(level) + std::string(indent, ' ') + s.c_str() + '\n';
 std::fputs(out.c_str(), _file);
 }
 
- void msg(level_t level, const char *format, ...)
+ void msg(int indent, level_t level, const char *format, ...)
 {
 if (level < _level)
 {
@@ -148,17 +148,17 @@
 va_start(args, format);
 s = str::vasprintf(format, args);
 va_end(args);
- msg(level, s);
+ msg(indent, level, s);
 }
 
- void msg_txt(level_t level, const std::string &s)
+ void msg_txt(int indent, level_t level, const std::string &s)
 {
 if (level < _level)
 {
 return;
 }
 
- std::string pfx = prefix(level);
+ std::string pfx = prefix(level) + std::string(indent, ' ');
 int pfx_len = pfx.length();
 std::string text(s);
 
@@ -226,6 +226,56 @@
 std::fputs(out.c_str(), _file);
 }
 
+ void msg_txt(int indent, level_t level, const char *format, ...)
+ {
+ if (level < _level)
+ {
+ return;
+ }
+
+ std::string s;
+ va_list args;
+ va_start(args, format);
+ s = str::vasprintf(format, args);
+ va_end(args);
+ msg_txt(indent, level, s);
+ }
+
+ void msg(level_t level, const std::string &s)
+ {
+ if (level < _level)
+ {
+ return;
+ }
+
+ msg(0, level, s);
+ }
+
+ void msg(level_t level, const char *format, ...)
+ {
+ if (level < _level)
+ {
+ return;
+ }
+
+ std::string s;
+ va_list args;
+ va_start(args, format);
+ s = str::vasprintf(format, args);
+ va_end(args);
+ msg(0, level, s);
+ }
+
+ void msg_txt(level_t level, const std::string &s)
+ {
+ if (level < _level)
+ {
+ return;
+ }
+
+ msg_txt(0, level, s);
+ }
+
 void msg_txt(level_t level, const char *format, ...)
 {
 if (level < _level)
@@ -238,7 +288,57 @@
 va_start(args, format);
 s = str::vasprintf(format, args);
 va_end(args);
- msg_txt(level, s);
+ msg_txt(0, level, s);
+ }
+
+ void dbg(int indent, const std::string &s)
+ {
+ if (DBG < _level)
+ {
+ return;
+ }
+
+ msg(indent, DBG, s);
+ }
+
+ void dbg(int indent, const char *format, ...)
+ {
+ if (DBG < _level)
+ {
+ return;
+ }
+
+ std::string s;
+ va_list args;
+ va_start(args, format);
+ s = str::vasprintf(format, args);
+ va_end(args);
+ msg(indent, DBG, s);
+ }
+
+ void dbg_txt(int indent, const std::string &s)
+ {
+ if (DBG < _level)
+ {
+ return;
+ }
+
+ msg_txt(indent, DBG, s);
+ }
+
+ void dbg_txt(int indent, const char *format, ...)
+ {
+ if (DBG < _level)
+ {
+ return;
+ }
+
+ std::string s;
+ va_list args;
+ va_start(args, format);
+ s = str::vasprintf(format, args);
+ va_end(args);
+ msg_txt(indent, DBG, s);
 }
 
 void dbg(const std::string &s)
@@ -248,7 +348,7 @@
 return;
 }
 
- msg(DBG, s);
+ msg(0, DBG, s);
 }
 
 void dbg(const char *format, ...)
@@ -263,7 +363,7 @@
 va_start(args, format);
 s = str::vasprintf(format, args);
 va_end(args);
- msg(DBG, s);
+ msg(0, DBG, s);
 }
 
 void dbg_txt(const std::string &s)
@@ -273,7 +373,7 @@
 return;
 }
 
- msg_txt(DBG, s);
+ msg_txt(0, DBG, s);
 }
 
 void dbg_txt(const char *format, ...)
@@ -288,7 +388,57 @@
 va_start(args, format);
 s = str::vasprintf(format, args);
 va_end(args);
- msg_txt(DBG, s);
+ msg_txt(0, DBG, s);
+ }
+
+ void inf(int indent, const std::string &s)
+ {
+ if (INF < _level)
+ {
+ return;
+ }

bino-0.9.2.tar.bz2/src/base/msg.h -> bino-0.9.3.tar.bz2/src/base/msg.h Changed

@@ -66,31 +66,61 @@
 
     /* Print messages */
 
+    void msg(int indent, level_t level, const std::string &s);
+    void msg(int indent, level_t level, const char *format, ...) MSG_AFP(3, 4);
+    void msg_txt(int indent, level_t level, const std::string &s);
+    void msg_txt(int indent, level_t level, const char *format, ...) MSG_AFP(3, 4);
+
     void msg(level_t level, const std::string &s);
     void msg(level_t level, const char *format, ...) MSG_AFP(2, 3);
     void msg_txt(level_t level, const std::string &s);
     void msg_txt(level_t level, const char *format, ...) MSG_AFP(2, 3);
 
+    void dbg(int indent, const std::string &s);
+    void dbg(int indent, const char *format, ...) MSG_AFP(2, 3);
+    void dbg_txt(int indent, const std::string &s);
+    void dbg_txt(int indent, const char *format, ...) MSG_AFP(2, 3);
+
     void dbg(const std::string &s);
     void dbg(const char *format, ...) MSG_AFP(1, 2);
     void dbg_txt(const std::string &s);
     void dbg_txt(const char *format, ...) MSG_AFP(1, 2);
 
+    void inf(int indent, const std::string &s);
+    void inf(int indent, const char *format, ...) MSG_AFP(2, 3);
+    void inf_txt(int indent, const std::string &s);
+    void inf_txt(int indent, const char *format, ...) MSG_AFP(2, 3);
+
     void inf(const std::string &s);
     void inf(const char *format, ...) MSG_AFP(1, 2);
     void inf_txt(const std::string &s);
     void inf_txt(const char *format, ...) MSG_AFP(1, 2);
 
+    void wrn(int indent, const std::string &s);
+    void wrn(int indent, const char *format, ...) MSG_AFP(2, 3);
+    void wrn_txt(int indent, const std::string &s);
+    void wrn_txt(int indent, const char *format, ...) MSG_AFP(2, 3);
+
     void wrn(const std::string &s);
     void wrn(const char *format, ...) MSG_AFP(1, 2);
     void wrn_txt(const std::string &s);
     void wrn_txt(const char *format, ...) MSG_AFP(1, 2);
 
+    void err(int indent, const std::string &s);
+    void err(int indent, const char *format, ...) MSG_AFP(2, 3);
+    void err_txt(int indent, const std::string &s);
+    void err_txt(int indent, const char *format, ...) MSG_AFP(2, 3);
+
     void err(const std::string &s);
     void err(const char *format, ...) MSG_AFP(1, 2);
     void err_txt(const std::string &s);
     void err_txt(const char *format, ...) MSG_AFP(1, 2);
 
+    void req(int indent, const std::string &s);
+    void req(int indent, const char *format, ...) MSG_AFP(2, 3);
+    void req_txt(int indent, const std::string &s);
+    void req_txt(int indent, const char *format, ...) MSG_AFP(2, 3);
+
     void req(const std::string &s);
     void req(const char *format, ...) MSG_AFP(1, 2);
     void req_txt(const std::string &s);

bino-0.9.2.tar.bz2/src/base/opt.cpp -> bino-0.9.3.tar.bz2/src/base/opt.cpp Changed

@@ -24,6 +24,9 @@
 #include <limits>
 #include <cstring>
 
+#include "gettext.h"
+#define _(string) gettext(string)
+
 #include <getopt.h>
 #undef no_argument
 #undef required_argument
@@ -145,16 +148,16 @@
 {
 if (optopt == 0)
 {
- msg::err("Invalid option %s", argv[optind - 1]);
+ msg::err(_("Invalid option %s."), argv[optind - 1]);
 }
 else if (optopt >= optval_base)
 {
- msg::err("Option --%s does not take an argument",
+ msg::err(_("Option --%s does not take an argument."),
 options[optopt - optval_base]->longname().c_str());
 }
 else
 {
- msg::err("Invalid option -%c", optopt);
+ msg::err(_("Invalid option -%c."), optopt);
 }
 error = true;
 break;
@@ -163,12 +166,12 @@
 {
 if (optopt >= optval_base)
 {
- msg::err("Option --%s requires an argument",
+ msg::err(_("Option --%s requires an argument."),
 options[optopt - optval_base]->longname().c_str());
 }
 else
 {
- msg::err("Option -%c requires an argument", optopt);
+ msg::err(_("Option -%c requires an argument."), optopt);
 }
 error = true;
 break;
@@ -189,11 +192,11 @@
 {
 if (option_shortname)
 {
- msg::err("Invalid argument for -%c", options[optval]->shortname());
+ msg::err(_("Invalid argument for -%c."), options[optval]->shortname());
 }
 else
 {
- msg::err("Invalid argument for --%s", options[optval]->longname().c_str());
+ msg::err(_("Invalid argument for --%s."), options[optval]->longname().c_str());
 }
 error = true;
 }
@@ -212,11 +215,11 @@
 {
 if (options[i]->shortname() != '\0')
 {
- msg::err("Option --%s (-%c) is mandatory", options[i]->longname().c_str(), options[i]->shortname());
+ msg::err(_("Option --%s (-%c) is mandatory."), options[i]->longname().c_str(), options[i]->shortname());
 }
 else
 {
- msg::err("Option --%s is mandatory", options[i]->longname().c_str());
+ msg::err(_("Option --%s is mandatory."), options[i]->longname().c_str());
 }
 error = true;
 /* Do not break the loop. Print an error message for every missing option. */
@@ -230,12 +233,12 @@
 {
 if (args < min_arguments)
 {
- msg::err("Too few arguments");
+ msg::err(_("Too few arguments."));
 error = true;
 }
 else if (max_arguments >= 0 && args > max_arguments)
 {
- msg::err("Too many arguments");
+ msg::err(_("Too many arguments."));
 error = true;
 }
 }

bino-0.9.2.tar.bz2/src/base/opt.h -> bino-0.9.3.tar.bz2/src/base/opt.h Changed

@@ -25,6 +25,8 @@
 #include <vector>
 #include <string>
 #include <cctype>
+#include <cstdio>
+#include <stdint.h>
 
 
 /**
@@ -650,6 +652,62 @@
 return _values;
 }
 };
+
+ /**
+ * \brief An option type for colors.
+ *
+ * This option type accepts colors in the format [AA]RRGGBB. If the alpha
+ * part is omitted, it is set to 255.
+ * Color values are returned in uint32_t BGRA format.
+ */
+ class color : public option
+ {
+ private:
+ uint32_t _default_value;
+ std::vector<uint32_t> _values;
+
+ public:
+ color(const std::string &longname, char shortname, option_policy policy,
+ uint32_t default_value = 0u)
+ : option(longname, shortname, policy),
+ _default_value(default_value)
+ {
+ }
+
+ virtual enum argument_policy argument_policy() const
+ {
+ return required_argument;
+ }
+
+ virtual bool parse_argument(const std::string &argument)
+ {
+ unsigned int a = 255u, r, g, b;
+ if (argument.length() != 8 && argument.length() != 6)
+ {
+ return false;
+ }
+ else if (argument.length() == 8 && std::sscanf(argument.c_str(), "%2x%2x%2x%2x", &a, &r, &g, &b) != 4)
+ {
+ return false;
+ }
+ else if (argument.length() == 6 && std::sscanf(argument.c_str(), "%2x%2x%2x", &r, &g, &b) != 3)
+ {
+ return false;
+ }
+ _values.push_back((a << 24u) | (r << 16u) | (g << 8u) | b);
+ return true;
+ }
+
+ uint32_t value() const
+ {
+ return (_values.size() > 0 ? _values.back() : _default_value);
+ }
+
+ const std::vector<uint32_t> &values() const
+ {
+ return _values;
+ }
+ };
 }
 
 #endif

bino-0.9.2.tar.bz2/src/base/str.cpp -> bino-0.9.3.tar.bz2/src/base/str.cpp Changed

@@ -28,6 +28,11 @@
 #include <limits>
 #include <sstream>
 
+#include <iconv.h>
+
+#include "gettext.h"
+#define _(string) gettext(string)
+
 #include "dbg.h"
 #include "msg.h"
 
@@ -194,14 +199,14 @@
 /* Convert a string to one of the basic data types */
 
 template<typename T>
- static inline T _to(const std::string &s, const std::string &name)
+ static inline T _to(const std::string &s, const char *name)
 {
 std::istringstream is(s);
 T v;
 is >> v;
 if (is.fail() || !is.eof())
 {
- throw exc(std::string("Cannot convert '") + sanitize(s) + "' to " + name, EINVAL);
+ throw exc(str::asprintf(_("Cannot convert string to %s."), name), EINVAL);
 }
 return v;
 }
@@ -357,4 +362,61 @@
 return str::asprintf("%.1f mm", length * 1000.0);
 }
 }
+
+ /* Convert a string from one character set to another */
+
+ std::string convert(const std::string &src, const std::string &from_charset, const std::string &to_charset)
+ {
+ if (from_charset.compare(to_charset) == 0)
+ {
+ return src;
+ }
+
+ iconv_t cd = iconv_open(to_charset.c_str(), from_charset.c_str());
+ if (cd == reinterpret_cast<iconv_t>(static_cast<size_t>(-1)))
+ {
+ throw exc(str::asprintf(_("Cannot convert %s to %s."), from_charset.c_str(), to_charset.c_str()), errno);
+ }
+
+ size_t inbytesleft = src.length() + 1;
+ const char *inbuf = src.c_str();
+ size_t outbytesleft = inbytesleft;
+ if (outbytesleft >= std::numeric_limits<size_t>::max() / 4)
+ {
+ outbytesleft = std::numeric_limits<size_t>::max();
+ }
+ else
+ {
+ outbytesleft = outbytesleft * 4;
+ }
+ char *orig_outbuf = static_cast<char *>(malloc(outbytesleft));
+ if (!orig_outbuf)
+ {
+ iconv_close(cd);
+ throw exc(str::asprintf(_("Cannot convert %s to %s."), from_charset.c_str(), to_charset.c_str()), ENOMEM);
+ }
+ char *outbuf = orig_outbuf;
+
+ size_t s = iconv(cd, const_cast<char **>(&inbuf), &inbytesleft, &outbuf, &outbytesleft);
+ int saved_errno = errno;
+ iconv_close(cd);
+ if (s == static_cast<size_t>(-1))
+ {
+ free(orig_outbuf);
+ throw exc(str::asprintf(_("Cannot convert %s to %s."), from_charset.c_str(), to_charset.c_str()), saved_errno);
+ }
+
+ std::string dst;
+ try
+ {
+ dst.assign(orig_outbuf);
+ }
+ catch (std::exception &e)
+ {
+ free(orig_outbuf);
+ throw exc(str::asprintf(_("Cannot convert %s to %s."), from_charset.c_str(), to_charset.c_str()), ENOMEM);
+ }
+ free(orig_outbuf);
+ return dst;
+ }
 }

bino-0.9.2.tar.bz2/src/base/str.h -> bino-0.9.3.tar.bz2/src/base/str.h Changed

bino-0.9.2.tar.bz2/src/base/thread.cpp -> bino-0.9.3.tar.bz2/src/base/thread.cpp Changed

@@ -23,6 +23,9 @@
 #include <cstring>
 #include <pthread.h>
 
+#include "gettext.h"
+#define _(string) gettext(string)
+
 #include "dbg.h"
 #include "thread.h"
 
@@ -34,7 +37,7 @@
 int e = pthread_mutex_init(&_mutex, NULL);
 if (e != 0)
 {
- throw exc(std::string("Cannot initialize mutex: ") + std::strerror(e), e);
+ throw exc(str::asprintf(_("Cannot initialize mutex: %s"), std::strerror(e)), e);
 }
 }
 
@@ -45,7 +48,7 @@
 int e = pthread_mutex_init(&_mutex, NULL);
 if (e != 0)
 {
- throw exc(std::string("Cannot initialize mutex: ") + std::strerror(e), e);
+ throw exc(str::asprintf(_("Cannot initialize mutex: %s"), std::strerror(e)), e);
 }
 }
 
@@ -59,7 +62,7 @@
 int e = pthread_mutex_lock(&_mutex);
 if (e != 0)
 {
- throw exc(std::string("Cannot lock mutex: ") + std::strerror(e), e);
+ throw exc(str::asprintf(_("Cannot lock mutex: %s"), std::strerror(e)), e);
 }
 }
 
@@ -73,7 +76,7 @@
 int e = pthread_mutex_unlock(&_mutex);
 if (e != 0)
 {
- throw exc(std::string("Cannot unlock mutex: ") + std::strerror(e), e);
+ throw exc(str::asprintf(_("Cannot unlock mutex: %s"), std::strerror(e)), e);
 }
 }
 
@@ -122,7 +125,7 @@
 }
 catch (...)
 {
- t->__exception = exc("Unknown exception");
+ t->__exception = exc(_("Unknown exception."));
 }
 t->__running = false;
 return NULL;
@@ -136,7 +139,7 @@
 int e = pthread_create(&__thread_id, NULL, __run, this);
 if (e != 0)
 {
- throw exc(std::string("Cannot create thread: ") + std::strerror(e), e);
+ throw exc(str::asprintf(_("Cannot create thread: %s"), std::strerror(e)), e);
 }
 __joinable = true;
 }
@@ -151,7 +154,7 @@
 if (e != 0)
 {
 __wait_mutex.unlock();
- throw exc(std::string("Cannot join with thread: ") + std::strerror(e), e);
+ throw exc(str::asprintf(_("Cannot join with thread: %s"), std::strerror(e)), e);
 }
 }
 __wait_mutex.unlock();

bino-0.9.2.tar.bz2/src/base/timer.cpp -> bino-0.9.3.tar.bz2/src/base/timer.cpp Changed

@@ -25,6 +25,9 @@
 # include <sys/time.h>
 #endif
 
+#include "gettext.h"
+#define _(string) gettext(string)
+
 #include "exc.h"
 #include "timer.h"
 
@@ -46,13 +49,7 @@
 : CLOCK_THREAD_CPUTIME_ID, &time);
 if (r != 0)
 {
- throw exc(std::string("Cannot get ")
- + std::string(
- t == realtime ? "real"
- : t == monotonic ? "monotonic"
- : t == process_cpu ? "process CPU"
- : "thread CPU")
- + std::string(" time"), errno);
+ throw exc(_("Cannot get time."), errno);
 }
 return static_cast<int64_t>(time.tv_sec) * 1000000 + time.tv_nsec / 1000;
 
@@ -64,9 +61,7 @@
 int r = gettimeofday(&tv, NULL);
 if (r != 0)
 {
- throw exc(std::string("Cannot get ")
- + std::string(t == realtime ? "real" : "monotonic")
- + std::string(" time"), errno);
+ throw exc(_("Cannot get time."), errno);
 }
 return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
 }
@@ -80,9 +75,7 @@
 }
 else
 {
- throw exc(std::string("Cannot get ")
- + std::string("thread CPU")
- + std::string(" time"), ENOSYS);
+ throw exc(_("Cannot get time."), ENOSYS);
 }
 
 #endif

bino-0.9.2.tar.bz2/src/controller.h -> bino-0.9.3.tar.bz2/src/controller.h Changed

@@ -3,6 +3,7 @@
 *
 * Copyright (C) 2010-2011
 * Martin Lambers <marlam@marlam.de>
+ * Joe <cuchac@email.cz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -23,6 +24,7 @@
 
 #include <string>
 #include <sstream>
+#include <stdint.h>
 
 #include "s11n.h"
 
@@ -53,6 +55,8 @@
 set_video_stream, // int
 cycle_audio_stream, // no parameters
 set_audio_stream, // int
+ cycle_subtitle_stream, // no parameters
+ set_subtitle_stream, // int
 set_stereo_layout, // video_frame::stereo_layout, bool
 set_stereo_mode, // parameters::stereo_mode, bool
 toggle_stereo_mode_swap, // no parameters
@@ -66,13 +70,20 @@
 set_hue, // float (absolute value)
 adjust_saturation, // float (relative adjustment)
 set_saturation, // float (absolute value)
- seek, // float (relative adjustment)
- set_pos, // float (absolute position)
 adjust_parallax, // float (relative adjustment)
 set_parallax, // float (absolute value)
 set_crosstalk, // 3 floats (absolute values)
 adjust_ghostbust, // float (relative adjustment)
- set_ghostbust // float (absolute value)
+ set_ghostbust, // float (absolute value)
+ set_subtitle_encoding, // string (encoding name)
+ set_subtitle_font, // string (font name)
+ set_subtitle_size, // int
+ set_subtitle_scale, // float
+ set_subtitle_color, // uint64_t
+ adjust_subtitle_parallax, // float (relative adjustment)
+ set_subtitle_parallax, // float (absolute value)
+ seek, // float (relative adjustment)
+ set_pos // float (absolute position)
 };
 
 type type;
@@ -116,6 +127,7 @@
 pause, // bool
 video_stream, // int
 audio_stream, // int
+ subtitle_stream, // int
 stereo_layout, // video_frame::stereo_layout, bool
 stereo_mode, // parameters::stereo_mode, bool
 stereo_mode_swap, // bool
@@ -125,10 +137,16 @@
 brightness, // float
 hue, // float
 saturation, // float
- pos, // float
 parallax, // float
 crosstalk, // 3 floats
- ghostbust // float
+ ghostbust, // float
+ subtitle_encoding, // string
+ subtitle_font, // string
+ subtitle_size, // int
+ subtitle_scale, // float
+ subtitle_color, // uint64_t
+ subtitle_parallax, // float
+ pos // float
 };
 
 type type;
@@ -173,9 +191,26 @@
 current = ossc.str();
 }
 
+ notification(enum type t, uint64_t p, uint64_t c) :
+ type(t)
+ {
+ std::ostringstream ossp;
+ s11n::save(ossp, p);
+ previous = ossp.str();
+ std::ostringstream ossc;
+ s11n::save(ossc, c);
+ current = ossc.str();
+ }
+
 notification(enum type t, const std::string &p, const std::string &c) :
- type(t), previous(p), current(c)
+ type(t)
 {
+ std::ostringstream ossp;
+ s11n::save(ossp, p);
+ previous = ossp.str();
+ std::ostringstream ossc;
+ s11n::save(ossc, c);
+ current = ossc.str();
 }
 };

bino-0.9.2.tar.bz2/src/lib_versions.cpp -> bino-0.9.3.tar.bz2/src/lib_versions.cpp Changed

@@ -28,6 +28,8 @@
 #include <libswscale/swscale.h>
 }
 
+#include <ass/ass.h>
+
 #ifdef __APPLE__
 # include <OpenAL/al.h>
 # include <OpenAL/alc.h>
@@ -44,12 +46,16 @@
 #include <eq/eq.h>
 #endif
 
+#include "gettext.h"
+#define _(string) gettext(string)
+
 #include "qt_app.h"
 
 #include "str.h"
 
 
 static std::vector<std::string> ffmpeg_v;
+static std::vector<std::string> libass_v;
 static std::vector<std::string> openal_v;
 static std::vector<std::string> opengl_v;
 static std::vector<std::string> glew_v;
@@ -72,6 +78,14 @@
 }
 }
 
+static void libass_versions()
+{
+ if (libass_v.size() == 0)
+ {
+ libass_v.push_back(_("unknown"));
+ }
+}
+
 void set_openal_versions()
 {
 if (openal_v.size() == 0)
@@ -101,7 +115,7 @@
 }
 if (openal_v.size() == 0)
 {
- openal_v.push_back("unknown");
+ openal_v.push_back(_("unknown"));
 }
 }
 }
@@ -140,7 +154,7 @@
 }
 if (opengl_v.size() == 0)
 {
- opengl_v.push_back("unknown");
+ opengl_v.push_back(_("unknown"));
 }
 }
 }
@@ -164,7 +178,7 @@
 static_cast<int>(eq::Version::getMinor()),
 static_cast<int>(eq::Version::getPatch())));
 #else
- equalizer_v.push_back("not used");
+ equalizer_v.push_back(_("not used"));
 #endif
 }
 }
@@ -180,6 +194,7 @@
 std::vector<std::string> lib_versions(bool html)
 {
 ffmpeg_versions();
+ libass_versions();
 openal_versions();
 opengl_versions();
 glew_versions();
@@ -196,6 +211,12 @@
 v.push_back(std::string(" ") + ffmpeg_v[i]);
 }
 v.push_back("</li>");
+ v.push_back("<li><a href=\"http://code.google.com/p/libass/\">LibASS</a>");
+ for (size_t i = 0; i < libass_v.size(); i++)
+ {
+ v.push_back(std::string(" ") + libass_v[i]);
+ }
+ v.push_back("</li>");
 v.push_back("<li><a href=\"http://kcat.strangesoft.net/openal.html\">OpenAL</a>");
 for (size_t i = 0; i < openal_v.size(); i++)
 {
@@ -235,6 +256,11 @@
 {
 v.push_back(std::string(" ") + ffmpeg_v[i]);
 }
+ v.push_back("LibASS:");
+ for (size_t i = 0; i < libass_v.size(); i++)
+ {
+ v.push_back(std::string(" ") + libass_v[i]);
+ }
 v.push_back("OpenAL:");
 for (size_t i = 0; i < openal_v.size(); i++)
 {

bino-0.9.2.tar.bz2/src/main.cpp -> bino-0.9.3.tar.bz2/src/main.cpp Changed

@@ -5,6 +5,7 @@
 * Martin Lambers <marlam@marlam.de>
 * Stefan Eilemann <eile@eyescale.ch>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+ * Joe <cuchac@email.cz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -23,6 +24,19 @@
 #include "config.h"
 
 #include <cstring>
+#include <limits>
+#include <locale.h>
+
+#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+# include <windows.h>
+#endif
+
+#ifdef __APPLE__
+# include <mach-o/dyld.h> // for _NSGetExecutablePath()
+#endif
+
+#include "gettext.h"
+#define _(string) gettext(string)
 
 #include "dbg.h"
 #include "msg.h"
@@ -37,9 +51,81 @@
 #include "lib_versions.h"
 
 
+/* Return the directory containing our locale data (translated messages). */
+static const char *localedir()
+{
+#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+ /* Windows: D/../locale, where D contains the program binary. If something
+ * goes wrong, we fall back to "..\\locale", which at least works if the
+ * current directory contains the program binary. */
+ static const char *rel_locale = "..\\locale";
+ static char buffer[MAX_PATH + 10]; // leave space to append rel_locale
+ DWORD v = GetModuleFileName(NULL, buffer, MAX_PATH);
+ if (v == 0 || v >= MAX_PATH)
+ {
+ return rel_locale;
+ }
+ char *backslash = strrchr(buffer, '\\');
+ if (!backslash)
+ {
+ return rel_locale;
+ }
+ strcpy(backslash + 1, "..\\locale");
+ return buffer;
+#else
+# ifdef __APPLE__
+ try
+ {
+ static char buffer[PATH_MAX];
+ uint32_t buffersize = sizeof(buffer);
+ int32_t check = _NSGetExecutablePath(buffer, &buffersize);
+ if (check != 0)
+ {
+ throw 0;
+ }
+ char *pch = std::strrchr(buffer, '/');
+ if (pch == NULL)
+ {
+ throw 0;
+ }
+ *pch = 0;
+ pch = std::strrchr(buffer, '/');
+ if (pch == NULL)
+ {
+ throw 0;
+ }
+ // check that I'm an application
+ if (std::strncmp(pch, "/MacOS", 6) != 0)
+ {
+ throw 0;
+ }
+ const char *subdir = "/Resources/locale";
+ size_t subdirlen = std::strlen(subdir) + 1;
+ // check that there's enough room left
+ if (sizeof(buffer) - (buffer-pch) <= subdirlen)
+ {
+ throw 0;
+ }
+ std::strncpy(pch, subdir, subdirlen);
+ return buffer;
+ }
+ catch (...)
+ {
+ }
+# endif
+ /* GNU/Linux and others: fixed directory defined by LOCALEDIR */
+ return LOCALEDIR;
+#endif
+}
+
 int main(int argc, char *argv[])
 {
- /* Initialization */
+ /* Initialization: gettext */
+ setlocale(LC_ALL, "");
+ bindtextdomain(PACKAGE, localedir());
+ textdomain(PACKAGE);
+
+ /* Initialization: messages */
 char *program_name = strrchr(argv[0], '/');
 program_name = program_name ? program_name + 1 : argv[0];
 msg::set_level(msg::INF);
@@ -83,6 +169,8 @@
 options.push_back(&video);
 opt::val<int> audio("audio", 'a', opt::optional, 1, 999, 1);
 options.push_back(&audio);
+ opt::val<int> subtitle("subtitle", 's', opt::optional, 0, 999, 0);
+ options.push_back(&subtitle);
 std::vector<std::string> video_output_modes;
 video_output_modes.push_back("mono-left");
 video_output_modes.push_back("mono-right");
@@ -93,6 +181,7 @@
 video_output_modes.push_back("even-odd-rows");
 video_output_modes.push_back("even-odd-columns");
 video_output_modes.push_back("checkerboard");
+ video_output_modes.push_back("hdmi-frame-pack");
 video_output_modes.push_back("red-cyan-monochrome");
 video_output_modes.push_back("red-cyan-half-color");
 video_output_modes.push_back("red-cyan-full-color");
@@ -112,20 +201,33 @@
 video_output_modes.push_back("equalizer-3d");
 opt::val<std::string> video_output_mode("output", 'o', opt::optional, video_output_modes, "");
 options.push_back(&video_output_mode);
+ opt::flag swap_eyes("swap-eyes", 'S', opt::optional);
+ options.push_back(&swap_eyes);
 opt::flag fullscreen("fullscreen", 'f', opt::optional);
 options.push_back(&fullscreen);
 opt::flag center("center", 'c', opt::optional);
 options.push_back(&center);
- opt::flag swap_eyes("swap-eyes", 's', opt::optional);
- options.push_back(&swap_eyes);
- opt::flag benchmark("benchmark", 'b', opt::optional);
- options.push_back(&benchmark);
+ opt::val<std::string> subtitle_encoding("subtitle-encoding", '\0', opt::optional, parameters().subtitle_encoding);
+ options.push_back(&subtitle_encoding);
+ opt::val<std::string> subtitle_font("subtitle-font", '\0', opt::optional, parameters().subtitle_font);
+ options.push_back(&subtitle_font);
+ opt::val<int> subtitle_size("subtitle-size", '\0', opt::optional, 1, 999, parameters().subtitle_size);
+ options.push_back(&subtitle_size);
+ opt::val<float> subtitle_scale("subtitle-scale", '\0', opt::optional, 0.0f, false,
+ std::numeric_limits<float>::max(), true, parameters().subtitle_scale);
+ options.push_back(&subtitle_scale);
+ opt::color subtitle_color("subtitle-color", '\0', opt::optional);
+ options.push_back(&subtitle_color);
+ opt::val<float> subtitle_parallax("subtitle-parallax", '\0', opt::optional, -1.0f, +1.0f, parameters().subtitle_parallax);
+ options.push_back(&subtitle_parallax);
 opt::val<float> parallax("parallax", 'P', opt::optional, -1.0f, +1.0f, parameters().parallax);
 options.push_back(&parallax);
 opt::tuple<float> crosstalk("crosstalk", 'C', opt::optional, 0.0f, 1.0f, std::vector<float>(3, parameters().crosstalk_r), 3);
 options.push_back(&crosstalk);
 opt::val<float> ghostbust("ghostbust", 'G', opt::optional, 0.0f, 1.0f, parameters().ghostbust);
 options.push_back(&ghostbust);
+ opt::flag benchmark("benchmark", 'b', opt::optional);
+ options.push_back(&benchmark);
 // Accept some Equalizer options. These are passed to Equalizer for interpretation.
 opt::val<std::string> eq_server("eq-server", '\0', opt::optional);
 options.push_back(&eq_server);
@@ -154,101 +256,112 @@
 set_qt_argv(argc, argv);
 if (version.value())
 {
- msg::req("%s version %s", PACKAGE_NAME, VERSION);
- msg::req(" Copyright (C) 2011 the Bino developers.");
- msg::req(" This is free software. You may redistribute copies of it");
- msg::req(" under the terms of the GNU General Public License.");
- msg::req(" There is NO WARRANTY, to the extent permitted by law.");
- msg::req("Platform:");
- msg::req(" %s", PLATFORM);
- msg::req("Libraries used:");
+ msg::req(_("%s version %s"), PACKAGE_NAME, VERSION);
+ msg::req(4, _("Copyright (C) 2011 the Bino developers."));
+ msg::req_txt(4, _("This is free software. You may redistribute copies of it "
+ "under the terms of the GNU General Public License. "
+ "There is NO WARRANTY, to the extent permitted by law."));
+ msg::req(_("Platform:"));
+ msg::req(4, "%s", PLATFORM);
+ msg::req(_("Libraries used:"));
 std::vector<std::string> v = lib_versions(false);
 for (size_t i = 0; i < v.size(); i++)
 {
- msg::req(" %s", v[i].c_str());
+ msg::req(4, "%s", v[i].c_str());
 }
 }
 if (help.value())
 {
- msg::req_txt(
- "Usage:\n"
- " %s [option...] [file0] [file1] [file2]\n"
- "\n"
- "Options:\n"

bino-0.9.2.tar.bz2/src/media_data.cpp -> bino-0.9.3.tar.bz2/src/media_data.cpp Changed

@@ -3,6 +3,7 @@
 *
 * Copyright (C) 2010-2011
 * Martin Lambers <marlam@marlam.de>
+ * Joe <joe@wpj.cz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -24,6 +25,9 @@
 #include <cstring>
 #include <cmath>
 
+#include "gettext.h"
+#define _(string) gettext(string)
+
 #include "media_data.h"
 
 #include "str.h"
@@ -255,7 +259,8 @@
 
 std::string video_frame::format_info() const
 {
- return str::asprintf("%dx%d, %.3g:1", raw_width, raw_height, aspect_ratio);
+ /* TRANSLATORS: This is a very short string describing the video size and aspect ratio. */
+ return str::asprintf(_("%dx%d, %.3g:1"), raw_width, raw_height, aspect_ratio);
 }
 
 static int next_multiple_of_4(int x)
@@ -370,6 +375,7 @@
 }
 
 audio_blob::audio_blob() :
+ language(),
 channels(-1),
 rate(-1),
 sample_format(u8),
@@ -381,7 +387,10 @@
 
 std::string audio_blob::format_info() const
 {
- return str::asprintf("%d channels, %g kHz, %d bit", channels, rate / 1e3f, sample_bits());
+ /* TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits. */
+ return str::asprintf(_("%s, %d ch., %g kHz, %d bit"),
+ language.empty() ? _("unknown") : language.c_str(),
+ channels, rate / 1e3f, sample_bits());
 }
 
 std::string audio_blob::format_name() const
@@ -402,7 +411,9 @@
 sample_format_name = "d64";
 break;
 }
- return str::asprintf("%d-%d-%s", channels, rate, sample_format_name);
+ return str::asprintf("%s-%d-%d-%s",
+ language.empty() ? _("unknown") : language.c_str(),
+ channels, rate, sample_format_name);
 }
 
 int audio_blob::sample_bits() const
@@ -426,6 +437,92 @@
 return bits;
 }
 
+subtitle_box::subtitle_box() :
+ language(),
+ format(text),
+ style(),
+ str(),
+ images(),
+ presentation_start_time(std::numeric_limits<int64_t>::min()),
+ presentation_stop_time(std::numeric_limits<int64_t>::min())
+{
+}
+
+std::string subtitle_box::format_info() const
+{
+ return (language.empty() ? _("unknown") : language);
+}
+
+std::string subtitle_box::format_name() const
+{
+ return (language.empty() ? _("unknown") : language);
+}
+
+void subtitle_box::image_t::save(std::ostream &os) const
+{
+ s11n::save(os, w);
+ s11n::save(os, h);
+ s11n::save(os, x);
+ s11n::save(os, y);
+ s11n::save(os, palette.size());
+ if (palette.size() > 0)
+ {
+ s11n::save(os, static_cast<const void *>(&(palette[0])), palette.size() * sizeof(uint8_t));
+ }
+ s11n::save(os, data.size());
+ if (data.size() > 0)
+ {
+ s11n::save(os, static_cast<const void *>(&(data[0])), data.size() * sizeof(uint8_t));
+ }
+ s11n::save(os, linesize);
+}
+
+void subtitle_box::image_t::load(std::istream &is)
+{
+ size_t s;
+ s11n::load(is, w);
+ s11n::load(is, h);
+ s11n::load(is, x);
+ s11n::load(is, y);
+ s11n::load(is, s);
+ palette.resize(s);
+ if (palette.size() > 0)
+ {
+ s11n::load(is, static_cast<void *>(&(palette[0])), palette.size() * sizeof(uint8_t));
+ }
+ s11n::load(is, s);
+ data.resize(s);
+ if (data.size() > 0)
+ {
+ s11n::load(is, static_cast<void *>(&(data[0])), data.size() * sizeof(uint8_t));
+ }
+ s11n::load(is, linesize);
+}
+
+void subtitle_box::save(std::ostream &os) const
+{
+ s11n::save(os, language);
+ s11n::save(os, static_cast<int>(format));
+ s11n::save(os, style);
+ s11n::save(os, str);
+ s11n::save(os, images);
+ s11n::save(os, presentation_start_time);
+ s11n::save(os, presentation_stop_time);
+}
+
+void subtitle_box::load(std::istream &is)
+{
+ s11n::load(is, language);
+ int x;
+ s11n::load(is, x);
+ format = static_cast<format_t>(x);
+ s11n::load(is, style);
+ s11n::load(is, str);
+ s11n::load(is, images);
+ s11n::load(is, presentation_start_time);
+ s11n::load(is, presentation_stop_time);
+}
+
 parameters::parameters() :
 stereo_mode(stereo),
 stereo_mode_swap(false),
@@ -437,7 +534,13 @@
 contrast(std::numeric_limits<float>::quiet_NaN()),
 brightness(std::numeric_limits<float>::quiet_NaN()),
 hue(std::numeric_limits<float>::quiet_NaN()),
- saturation(std::numeric_limits<float>::quiet_NaN())
+ saturation(std::numeric_limits<float>::quiet_NaN()),
+ subtitle_encoding(1, '\0'),
+ subtitle_font(1, '\0'),
+ subtitle_size(std::numeric_limits<int>::min()),
+ subtitle_scale(-1.0f),
+ subtitle_color(std::numeric_limits<uint64_t>::max()),
+ subtitle_parallax(std::numeric_limits<float>::quiet_NaN())
 {
 }
 
@@ -479,6 +582,30 @@
 {
 saturation = 0.0f;
 }
+ if (subtitle_encoding.length() == 1 && subtitle_encoding[0] == '\0')
+ {
+ subtitle_encoding = "";
+ }
+ if (subtitle_font.length() == 1 && subtitle_font[0] == '\0')
+ {
+ subtitle_font = "";
+ }
+ if (subtitle_size < -1)
+ {
+ subtitle_size = -1;
+ }
+ if (!std::isfinite(subtitle_scale) || subtitle_scale < 0.0f)
+ {
+ subtitle_scale = -1.0f;
+ }
+ if (subtitle_color > std::numeric_limits<uint32_t>::max())
+ {
+ subtitle_color = std::numeric_limits<uint64_t>::max();
+ }
+ if (!std::isfinite(subtitle_parallax) || subtitle_parallax < -1.0f || subtitle_parallax > +1.0f)
+ {
+ subtitle_parallax = 0.0f;
+ }
 }
 
 std::string parameters::stereo_mode_to_string(stereo_mode_t stereo_mode, bool stereo_mode_swap)
@@ -516,6 +643,9 @@
 case checkerboard:

bino-0.9.2.tar.bz2/src/media_data.h -> bino-0.9.3.tar.bz2/src/media_data.h Changed

@@ -3,6 +3,7 @@
 *
 * Copyright (C) 2010-2011
 * Martin Lambers <marlam@marlam.de>
+ * Joe <joe@wpj.cz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -130,9 +131,12 @@
 d64 // double
 } sample_format_t;
 
+ // Description of the content
+ std::string language; // Language information (empty if unknown)
 int channels; // 1 (mono), 2 (stereo), 4 (quad), 6 (5:1), 7 (6:1), or 8 (7:1)
 int rate; // Samples per second
 sample_format_t sample_format; // Sample format
+
 // The data. Note that an audio blob does not own the data stored in these pointers,
 // so it does not free them on destruction.
 void *data; // Pointer to the data
@@ -157,6 +161,82 @@
 int sample_bits() const;
 };
 
+class subtitle_box : public s11n
+{
+public:
+ // Format
+ typedef enum
+ {
+ ass, // Advanced SubStation Alpha (ASS) format
+ text, // UTF-8 text
+ image // Image in BGRA32 format, with box coordinates
+ } format_t;
+
+ // Image data
+ class image_t : public s11n
+ {
+ public:
+ int w, h; // Dimensions
+ int x, y; // Position w.r.t. the video frame
+ std::vector<uint8_t> palette; // Palette, with R,G,B,A components for each palette entry.
+ std::vector<uint8_t> data; // Bitmap using the palette
+ size_t linesize; // Size of one bitmap line (may differ from width)
+
+ void save(std::ostream &os) const;
+ void load(std::istream &is);
+ };
+
+ // Description of the content
+ std::string language; // Language information (empty if unknown)
+
+ // Data
+ format_t format; // Subtitle data format
+ std::string style; // Style info (only if format is ass)
+ std::string str; // Event text (only if format ass or text)
+ std::vector<image_t> images; // Images. These need to be alpha-blended.
+
+ // Presentation time information
+ int64_t presentation_start_time; // Presentation timestamp
+ int64_t presentation_stop_time; // End of presentation timestamp
+
+ // Constructor, Destructor
+ subtitle_box();
+
+ // Comparison. This assumes that two subtitle boxes are identical when they
+ // have the same presentation times.
+ bool operator==(const subtitle_box &box) const
+ {
+ return (presentation_start_time == box.presentation_start_time
+ && presentation_stop_time == box.presentation_stop_time);
+ }
+ bool operator!=(const subtitle_box &box) const
+ {
+ return !operator==(box);
+ }
+
+ // Does this box contain valid data?
+ bool is_valid() const
+ {
+ return (((format == ass || format == text) && !str.empty())
+ || (format == image && !images.empty()));
+ }
+
+ // Does this box stay constant during its complete presentation time?
+ // (ASS subtitles may be animated and thus need to be rerendered when the clock changes)
+ bool is_constant() const
+ {
+ return (format != ass);
+ }
+
+ // Return a string describing the format
+ std::string format_info() const; // Human readable information
+ std::string format_name() const; // Short code
+
+ // Serialization
+ void save(std::ostream &os) const;
+ void load(std::istream &is);
+};
+
 class parameters : public s11n
 {
 public:
@@ -173,6 +253,7 @@
 even_odd_rows, // Left view even rows, right view odd rows
 even_odd_columns, // Left view even columns, right view odd columns
 checkerboard, // Checkerboard pattern
+ hdmi_frame_pack, // HDMI Frame packing (top-bottom separated by 1/49 height)
 red_cyan_monochrome, // Red/cyan anaglyph, monochrome method
 red_cyan_half_color, // Red/cyan anaglyph, half color method
 red_cyan_full_color, // Red/cyan anaglyph, full color method
@@ -200,13 +281,19 @@
 float brightness; // Brightness adjustment, -1 .. +1
 float hue; // Hue adjustment, -1 .. +1
 float saturation; // Saturation adjustment, -1 .. +1
+ std::string subtitle_encoding; // Subtitle encoding, empty means keep default
+ std::string subtitle_font; // Subtitle font name, empty means keep default
+ int subtitle_size; // Subtitle point size, -1 means keep default
+ float subtitle_scale; // Scale factor
+ uint64_t subtitle_color; // Subtitle color in uint32_t bgra32 format, > UINT32_MAX means keep default
+ float subtitle_parallax; // Subtitle parallax adjustment, -1 .. +1
 
 // Constructor
 parameters();
 
 // Set all uninitialised values to their defaults
 void set_defaults();
- 
+
 // Convert the stereo mode to and from a string representation
 static std::string stereo_mode_to_string(stereo_mode_t stereo_mode, bool stereo_mode_swap);
 static void stereo_mode_from_string(const std::string &s, stereo_mode_t &stereo_mode, bool &stereo_mode_swap);

bino-0.9.2.tar.bz2/src/media_input.cpp -> bino-0.9.3.tar.bz2/src/media_input.cpp Changed

@@ -4,6 +4,7 @@
 * Copyright (C) 2010-2011
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <frederic.devernay@inrialpes.fr>
+ * Joe <cuchac@email.cz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -23,6 +24,9 @@
 
 #include <limits>
 
+#include "gettext.h"
+#define _(string) gettext(string)
+
 #include "dbg.h"
 #include "exc.h"
 #include "msg.h"
@@ -32,9 +36,9 @@
 
 
 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)
+ _active_video_stream(-1), _active_audio_stream(-1), _active_subtitle_stream(-1),
+ _have_active_video_read(false), _have_active_audio_read(false), _have_active_subtitle_read(false),
+ _last_audio_data_size(0), _initial_skip(0), _duration(-1)
 {
 }
 
@@ -76,6 +80,23 @@
 }
 }
 
+void media_input::get_subtitle_stream(int stream, int &media_object, int &media_object_subtitle_stream) const
+{
+ assert(stream < subtitle_streams());
+
+ for (size_t i = 0; i < _media_objects.size(); i++)
+ {
+ if (_media_objects[i].subtitle_streams() < stream + 1)
+ {
+ stream -= _media_objects[i].subtitle_streams();
+ continue;
+ }
+ media_object = i;
+ media_object_subtitle_stream = stream;
+ break;
+ }
+}
+
 // Get the basename of an URL (just the file name, without leading paths)
 static std::string basename(const std::string &url)
 {
@@ -118,33 +139,61 @@
 // Gather metadata
 for (size_t i = 0; i < _media_objects.size(); i++)
 {
- std::string pfx = (_media_objects.size() == 1 ? "" : str::from(i + 1) + " - ");
+ // Note that we may have multiple identical tag names in our metadata
 for (size_t j = 0; j < _media_objects[i].tags(); j++)
 {
- _tag_names.push_back(pfx + _media_objects[i].tag_name(j));
- _tag_values.push_back(pfx + _media_objects[i].tag_value(j));
+ _tag_names.push_back(_media_objects[i].tag_name(j));
+ _tag_values.push_back(_media_objects[i].tag_value(j));
 }
 }
 
 // Gather streams and stream names
 for (size_t i = 0; i < _media_objects.size(); i++)
 {
- std::string pfx = (_media_objects.size() == 1 ? "" : str::from(i + 1) + " - ");
 for (int j = 0; j < _media_objects[i].video_streams(); j++)
 {
- std::string pfx2 = (_media_objects[i].video_streams() == 1 ? "" : str::from(j + 1) + " - ");
- _video_stream_names.push_back(pfx + pfx2
- + _media_objects[i].video_frame_template(j).format_info());
+ _video_stream_names.push_back(_media_objects[i].video_frame_template(j).format_info());
+ }
+ }
+ if (_video_stream_names.size() > 1)
+ {
+ for (size_t i = 0; i < _video_stream_names.size(); i++)
+ {
+ _video_stream_names[i].insert(0,
+ std::string(1, '#') + str::from(i + 1) + '/'
+ + str::from(_video_stream_names.size()) + ": ");
 }
 }
 for (size_t i = 0; i < _media_objects.size(); i++)
 {
- std::string pfx = (_media_objects.size() == 1 ? "" : str::from(i + 1) + " - ");
 for (int j = 0; j < _media_objects[i].audio_streams(); j++)
 {
- std::string pfx2 = (_media_objects[i].audio_streams() == 1 ? "" : str::from(j + 1) + " - ");
- _audio_stream_names.push_back(pfx + pfx2
- + _media_objects[i].audio_blob_template(j).format_info());
+ _audio_stream_names.push_back(_media_objects[i].audio_blob_template(j).format_info());
+ }
+ }
+ if (_audio_stream_names.size() > 1)
+ {
+ for (size_t i = 0; i < _audio_stream_names.size(); i++)
+ {
+ _audio_stream_names[i].insert(0,
+ std::string(1, '#') + str::from(i + 1) + '/'
+ + str::from(_audio_stream_names.size()) + ": ");
+ }
+ }
+ for (size_t i = 0; i < _media_objects.size(); i++)
+ {
+ for (int j = 0; j < _media_objects[i].subtitle_streams(); j++)
+ {
+ _subtitle_stream_names.push_back(_media_objects[i].subtitle_box_template(j).format_info());
+ }
+ }
+ if (_subtitle_stream_names.size() > 1)
+ {
+ for (size_t i = 0; i < _subtitle_stream_names.size(); i++)
+ {
+ _subtitle_stream_names[i].insert(0,
+ std::string(1, '#') + str::from(i + 1) + '/'
+ + str::from(_subtitle_stream_names.size()) + ": ");
 }
 }
 
@@ -168,8 +217,9 @@
 _duration = d;
 }
 }
+ // Ignore subtitle stream duration; it seems unreliable and is not important anyway.
 }
- 
+
 // Skip advertisement in 3dtv.at movies. Only works for single media objects.
 try { _initial_skip = str::to<int64_t>(tag_value("StereoscopicSkip")); } catch (...) { }
 
@@ -227,34 +277,48 @@
 select_audio_stream(_active_audio_stream);
 }
 
+ // Set active subtitle stream
+ _active_subtitle_stream = -1; // no subtitles by default
+
 // Print summary
- msg::inf("Input:");
+ msg::inf(_("Input:"));
 for (int i = 0; i < video_streams(); i++)
 {
 int o, s;
 get_video_stream(i, o, s);
- msg::inf(" Video %s: %s", video_stream_name(i).c_str(),
+ msg::inf(4, _("Video %s: %s"), video_stream_name(i).c_str(),
 _media_objects[o].video_frame_template(s).format_name().c_str());
 }
 if (video_streams() == 0)
 {
- msg::inf(" No video.");
+ msg::inf(4, _("No video."));
 }
 for (int i = 0; i < audio_streams(); i++)
 {
 int o, s;
 get_audio_stream(i, o, s);
- msg::inf(" Audio %s: %s", audio_stream_name(i).c_str(), 
+ msg::inf(4, _("Audio %s: %s"), audio_stream_name(i).c_str(),
 _media_objects[o].audio_blob_template(s).format_name().c_str());
 }
 if (audio_streams() == 0)
 {
- msg::inf(" No audio.");
+ msg::inf(4, _("No audio."));
 }
- msg::inf(" Duration: %g seconds", duration() / 1e6f);
+ for (int i = 0; i < subtitle_streams(); i++)
+ {
+ int o, s;
+ get_subtitle_stream(i, o, s);
+ msg::inf(4, _("Subtitle %s: %s"), subtitle_stream_name(i).c_str(),
+ _media_objects[o].subtitle_box_template(s).format_name().c_str());
+ }
+ if (subtitle_streams() == 0)
+ {
+ msg::inf(4, _("No subtitle."));
+ }
+ msg::inf(4, _("Duration: %g seconds"), duration() / 1e6f);
 if (video_streams() > 0)
 {
- msg::inf(" Stereo layout: %s", video_frame::stereo_layout_to_string(
+ msg::inf(4, _("Stereo layout: %s"), video_frame::stereo_layout_to_string(
 video_frame_template().stereo_layout, video_frame_template().stereo_layout_swap).c_str());
 }
 }
@@ -328,6 +392,12 @@
 return _audio_blob;
 }
 
+const subtitle_box &media_input::subtitle_box_template() const

bino-0.9.2.tar.bz2/src/media_input.h -> bino-0.9.3.tar.bz2/src/media_input.h Changed

@@ -3,6 +3,7 @@
 *
 * Copyright (C) 2010-2011
 * Martin Lambers <marlam@marlam.de>
+ * Joe <cuchac@email.cz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -37,12 +38,15 @@
 
 std::vector<std::string> _video_stream_names; // Descriptions of available video streams
 std::vector<std::string> _audio_stream_names; // Descriptions of available audio streams
+ std::vector<std::string> _subtitle_stream_names; // Descriptions of available subtitle streams
 
 bool _supports_stereo_layout_separate; // Does this input support the stereo layout 'separate_streams'?
 int _active_video_stream; // The video stream that is currently active.
 int _active_audio_stream; // The audio stream that is currently active.
+ int _active_subtitle_stream; // The subtitle stream that is currently active.
 bool _have_active_video_read; // Whether a video frame read was started.
 bool _have_active_audio_read; // Whether a audio blob read was started.
+ bool _have_active_subtitle_read; // Whether a subtitle box read was started.
 size_t _last_audio_data_size; // Size of last audio blob read
 
 int64_t _initial_skip; // Initial portion of input to skip, in microseconds.
@@ -50,10 +54,12 @@
 
 video_frame _video_frame; // Video frame template for currently active video stream.
 audio_blob _audio_blob; // Audio blob template for currently active audio stream.
+ subtitle_box _subtitle_box; // Subtitle box template for currently active subtitle stream.
 
 // Find the media object and its stream index for a given video or audio stream number.
 void get_video_stream(int stream, int &media_object, int &media_object_video_stream) const;
 void get_audio_stream(int stream, int &media_object, int &media_object_audio_stream) const;
+ void get_subtitle_stream(int stream, int &media_object, int &media_object_subtitle_stream) const;
 
 public:
 
@@ -89,6 +95,12 @@
 return _audio_stream_names.size();
 }
 
+ // Number of subtitle streams in this input.
+ int subtitle_streams() const
+ {
+ return _subtitle_stream_names.size();
+ }
+
 // Name of the given video stream.
 const std::string &video_stream_name(int video_stream) const
 {
@@ -101,6 +113,12 @@
 return _audio_stream_names[audio_stream];
 }
 
+ // Name of the given subtitle stream.
+ const std::string &subtitle_stream_name(int subtitle_stream) const
+ {
+ return _subtitle_stream_names[subtitle_stream];
+ }
+
 // Initial portion of the input to skip.
 int64_t initial_skip() const
 {
@@ -126,11 +144,16 @@
 // that contains all properties but no actual data.
 const audio_blob &audio_blob_template() const;
 
+ // Information about the active subtitle stream, in the form of a subtitle box
+ // that contains all properties but no actual data.
+ const subtitle_box &subtitle_box_template() const;
+
 /*
- * Access video and audio data
+ * Access media data
 */
 
- /* Set the active video and audio streams. */
+ /* Set the active media streams.
+ * For subtitle streams, -1 selects no subtitle stream. */
 int selected_video_stream() const
 {
 return _active_video_stream;
@@ -141,6 +164,11 @@
 return _active_audio_stream;
 }
 void select_audio_stream(int audio_stream);
+ int selected_subtitle_stream() const
+ {
+ return _active_subtitle_stream;
+ }
+ void select_subtitle_stream(int subtitle_stream);
 
 /* Check whether a stereo layout is supported by this input. */
 bool stereo_layout_is_supported(video_frame::stereo_layout_t layout, bool swap) const;
@@ -161,6 +189,13 @@
 * An invalid blob means that EOF was reached. */
 audio_blob finish_audio_blob_read();
 
+ /* Start to read a subtitle box from the active stream asynchronously
+ * (in a separate thread). */
+ void start_subtitle_box_read();
+ /* Wait for the subtitle data reading to finish, and return the box.
+ * An invalid box means that EOF was reached. */
+ subtitle_box finish_subtitle_box_read();
+
 /* Return the last position in microseconds, of the last packet that was read in an
 * active stream. If the position is unkown, the minimum possible value is returned. */
 int64_t tell();

bino-0.9.2.tar.bz2/src/media_object.cpp -> bino-0.9.3.tar.bz2/src/media_object.cpp Changed

@@ -4,6 +4,7 @@
 * Copyright (C) 2010-2011
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <frederic.devernay@inrialpes.fr>
+ * Joe <cuchac@email.cz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -41,6 +42,9 @@
 # include <windows.h>
 #endif
 
+#include "gettext.h"
+#define _(string) gettext(string)
+
 #include "dbg.h"
 #include "blob.h"
 #include "exc.h"
@@ -113,6 +117,27 @@
 }
 };
 
+// The subtitle decode thread.
+// This thread reads packets from its packet queue and decodes them to subtitle boxes.
+class subtitle_decode_thread : public thread
+{
+private:
+ std::string _url;
+ struct ffmpeg_stuff *_ffmpeg;
+ int _subtitle_stream;
+ subtitle_box _box;
+
+ int64_t handle_timestamp(int64_t timestamp);
+
+public:
+ subtitle_decode_thread(const std::string &url, struct ffmpeg_stuff *ffmpeg, int subtitle_stream);
+ void run();
+ const subtitle_box &box()
+ {
+ return _box;
+ }
+};
+
 
 // Hide the FFmpeg stuff so that their messy header files cannot cause problems
 // in other source files.
@@ -153,6 +178,16 @@
 std::vector<blob> audio_blobs;
 std::vector<std::vector<unsigned char> > audio_buffers;
 std::vector<int64_t> audio_last_timestamps;
+
+ std::vector<int> subtitle_streams;
+ std::vector<AVCodecContext *> subtitle_codec_ctxs;
+ std::vector<subtitle_box> subtitle_box_templates;
+ std::vector<AVCodec *> subtitle_codecs;
+ std::vector<std::deque<AVPacket> > subtitle_packet_queues;
+ std::vector<mutex> subtitle_packet_queue_mutexes;
+ std::vector<subtitle_decode_thread> subtitle_decode_threads;
+ std::vector<std::deque<subtitle_box> > subtitle_box_buffers;
+ std::vector<int64_t> subtitle_last_timestamps;
 };
 
 // Use one decoding thread per processor for video decoding.
@@ -259,6 +294,25 @@
 return timestamp;
 }
 
+// Get a stream duration
+static int64_t stream_duration(AVStream *stream, AVFormatContext *format)
+{
+ // Try to get duration from the stream first. If that fails, fall back to
+ // the value provided by the container.
+ int64_t duration = stream->duration;
+ if (duration > 0)
+ {
+ AVRational time_base = stream->time_base;
+ return duration * 1000000 * time_base.num / time_base.den;
+ }
+ else
+ {
+ duration = format->duration;
+ return duration * 1000000 / AV_TIME_BASE;
+ }
+}
+
+
 media_object::media_object() : _ffmpeg(NULL)
 {
 av_register_all();
@@ -517,14 +571,18 @@
 AVCodecContext *audio_codec_ctx = _ffmpeg->audio_codec_ctxs[index];
 audio_blob &audio_blob_template = _ffmpeg->audio_blob_templates[index];
 
+ AVMetadataTag *tag = av_metadata_get(audio_stream->metadata, "language", NULL, AV_METADATA_IGNORE_SUFFIX);
+ if (tag)
+ {
+ audio_blob_template.language = tag->value;
+ }
 if (audio_codec_ctx->channels < 1
 || audio_codec_ctx->channels > 8
 || audio_codec_ctx->channels == 3
 || audio_codec_ctx->channels == 5)
 {
- throw exc(_url + " audio stream " + str::from(audio_stream)
- + ": Cannot handle audio with "
- + str::from(audio_codec_ctx->channels) + " channels.");
+ throw exc(str::asprintf(_("%s audio stream %d: Cannot handle audio with %d channels."),
+ _url.c_str(), index + 1, audio_codec_ctx->channels));
 }
 audio_blob_template.channels = audio_codec_ctx->channels;
 audio_blob_template.rate = audio_codec_ctx->sample_rate;
@@ -546,11 +604,21 @@
 }
 else
 {
- throw exc(_url + " audio stream " + str::from(audio_stream)
- + ": Cannot handle audio with sample format "
- + str::from(static_cast<int>(audio_codec_ctx->sample_fmt)) + ".");
- // XXX: Once widely available, use av_get_sample_fmt_name(audio_codec_ctx->sample_fmt)
- // in this error message.
+ throw exc(str::asprintf(_("%s audio stream %d: Cannot handle audio with sample format %s."),
+ _url.c_str(), index + 1, av_get_sample_fmt_name(audio_codec_ctx->sample_fmt)));
+ }
+}
+
+void media_object::set_subtitle_box_template(int index)
+{
+ AVStream *subtitle_stream = _ffmpeg->format_ctx->streams[_ffmpeg->subtitle_streams[index]];
+ //AVCodecContext *subtitle_codec_ctx = _ffmpeg->subtitle_codec_ctxs[index];
+ subtitle_box &subtitle_box_template = _ffmpeg->subtitle_box_templates[index];
+
+ AVMetadataTag *tag = av_metadata_get(subtitle_stream->metadata, "language", NULL, AV_METADATA_IGNORE_SUFFIX);
+ if (tag)
+ {
+ subtitle_box_template.language = tag->value;
 }
 }
 
@@ -565,13 +633,15 @@
 
 if ((e = av_open_input_file(&_ffmpeg->format_ctx, _url.c_str(), NULL, 0, NULL)) != 0)
 {
- throw exc(_url + ": " + my_av_strerror(e));
+ throw exc(str::asprintf(_("%s: %s"),
+ _url.c_str(), my_av_strerror(e).c_str()));
 }
 if ((e = av_find_stream_info(_ffmpeg->format_ctx)) < 0)
 {
- throw exc(_url + ": Cannot read stream info: " + my_av_strerror(e));
+ throw exc(str::asprintf(_("%s: Cannot read stream info: %s"),
+ _url.c_str(), my_av_strerror(e).c_str()));
 }
- dump_format(_ffmpeg->format_ctx, 0, _url.c_str(), 0);
+ av_dump_format(_ffmpeg->format_ctx, 0, _url.c_str(), 0);
 
 /* Metadata */
 AVMetadataTag *tag = NULL;
@@ -596,22 +666,21 @@
 _ffmpeg->video_codec_ctxs.push_back(_ffmpeg->format_ctx->streams[i]->codec);
 if (_ffmpeg->video_codec_ctxs[j]->width < 1 || _ffmpeg->video_codec_ctxs[j]->height < 1)
 {
- throw exc(_url + " stream " + str::from(i) + ": Invalid frame size.");
- }
- _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;
+ throw exc(str::asprintf(_("%s video stream %d: Invalid frame size."),
+ _url.c_str(), j + 1));
 }
 _ffmpeg->video_codecs.push_back(avcodec_find_decoder(_ffmpeg->video_codec_ctxs[j]->codec_id));
 if (!_ffmpeg->video_codecs[j])
 {
- throw exc(_url + " stream " + str::from(i) + ": Unsupported video codec.");
+ throw exc(str::asprintf(_("%s video stream %d: Unsupported video codec."),
+ _url.c_str(), j + 1));
 }
+ _ffmpeg->video_codec_ctxs[j]->thread_count = video_decoding_threads();
 if ((e = avcodec_open(_ffmpeg->video_codec_ctxs[j], _ffmpeg->video_codecs[j])) < 0)
 {
 _ffmpeg->video_codecs[j] = NULL;
- throw exc(_url + " stream " + str::from(i) + ": Cannot open video codec: " + my_av_strerror(e));
+ throw exc(str::asprintf(_("%s video stream %d: Cannot open video codec: %s"),
+ _url.c_str(), j + 1, my_av_strerror(e).c_str()));
 }
 // Determine frame template.
 _ffmpeg->video_frame_templates.push_back(video_frame());
@@ -638,13 +707,15 @@
 }
 avpicture_fill(reinterpret_cast<AVPicture *>(_ffmpeg->video_out_frames[j]), _ffmpeg->video_buffers[j],
 PIX_FMT_BGRA, _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height);
- _ffmpeg->video_img_conv_ctxs.push_back(sws_getContext(
+ // Call sws_getCachedContext(NULL, ...) instead of sws_getContext(...) just to avoid a deprecation warning.
+ _ffmpeg->video_img_conv_ctxs.push_back(sws_getCachedContext(NULL,
 _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height, _ffmpeg->video_codec_ctxs[j]->pix_fmt,
 _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height, PIX_FMT_BGRA,
 SWS_POINT, NULL, NULL, NULL));
 if (!_ffmpeg->video_img_conv_ctxs[j])
 {
- throw exc(_url + " stream " + str::from(i) + ": Cannot initialize conversion context.");

bino-0.9.2.tar.bz2/src/media_object.h -> bino-0.9.3.tar.bz2/src/media_object.h Changed

@@ -3,6 +3,7 @@
 *
 * Copyright (C) 2010-2011
 * Martin Lambers <marlam@marlam.de>
+ * Joe <cuchac@email.cz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -39,11 +40,13 @@
 // from the given streams
 void set_video_frame_template(int video_stream);
 void set_audio_blob_template(int audio_stream);
+ void set_subtitle_box_template(int subtitle_stream);
 
 // The threaded implementation can access private members
 friend class read_thread;
 friend class video_decode_thread;
 friend class audio_decode_thread;
+ friend class subtitle_decode_thread;
 
 public:
 
@@ -65,13 +68,15 @@
 const std::string &tag_value(size_t i) const;
 const std::string &tag_value(const std::string &tag_name) const;
 
- /* Get the number of video and audio streams in the file. */
+ /* Get the number of media streams in the file. */
 int video_streams() const;
 int audio_streams() const;
+ int subtitle_streams() const;
 
- /* Activate a video or audio stream for usage. Inactive streams will not be accessible. */
+ /* Activate a media stream for usage. Inactive streams will not be accessible. */
 void video_stream_set_active(int video_stream, bool active);
 void audio_stream_set_active(int audio_stream, bool active);
+ void subtitle_stream_set_active(int subtitle_stream, bool active);
 
 /* Get information about video streams. */
 // Return a video frame with all properties filled in (but without any data).
@@ -89,10 +94,17 @@
 // Note that this is only a hint; the properties of actual audio blobs may differ!
 const audio_blob &audio_blob_template(int audio_stream) const;
 // Audio stream duration in microseconds.
- int64_t audio_duration(int video_stream) const;
+ int64_t audio_duration(int audio_stream) const;
+
+ /* Get information about subtitle streams. */
+ // Return a subtitle box with all properties filled in (but without any data).
+ // Note that this is only a hint; the properties of actual subtitle boxes may differ!
+ const subtitle_box &subtitle_box_template(int subtitle_stream) const;
+ // Subtitle stream duration in microseconds.
+ int64_t subtitle_duration(int subtitle_stream) const;
 
 /*
- * Access video and audio data
+ * Access media data
 */
 
 /* Start to read a video frame asynchronously (in a separate thread). */
@@ -107,16 +119,22 @@
 * An invalid blob means that EOF was reached. */
 audio_blob finish_audio_blob_read(int audio_stream);
 
+ /* Start to read a subtitle box asynchronously (in a separate thread). */
+ void start_subtitle_box_read(int subtitle_stream);
+ /* Wait for the subtitle box reading to finish, and return the box.
+ * An invalid box means that EOF was reached. */
+ subtitle_box finish_subtitle_box_read(int subtitle_stream);
+
 /* Return the last position in microseconds, of the last packet that was read in any
 * stream. If the position is unkown, the minimum possible value is returned. */
 int64_t tell();
 
 /* Seek to the given position in microseconds. This affects all streams.
 * Make sure that the position is not out of range!
- * The real position after seeking is only revealed after reading the next video frame
- * or audio blob. This position may differ from the requested position for various
- * reasons (seeking is only possible to keyframes, seeking is not supported by the
- * stream, ...) */
+ * The real position after seeking is only revealed after reading the next video frame,
+ * audio blob, or subtitle box. This position may differ from the requested position
+ * for various reasons (seeking is only possible to keyframes, seeking is not supported
+ * by the stream, ...) */
 void seek(int64_t pos);
 
 /*

bino-0.9.2.tar.bz2/src/player.cpp -> bino-0.9.3.tar.bz2/src/player.cpp Changed

@@ -4,6 +4,7 @@
 * Copyright (C) 2010-2011
 * Martin Lambers <marlam@marlam.de>
 * Alexey Osipov <lion-simba@pridelands.ru>
+ * Joe <cuchac@email.cz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -24,6 +25,9 @@
 #include <vector>
 #include <unistd.h>
 
+#include "gettext.h"
+#define _(string) gettext(string)
+
 #include "exc.h"
 #include "str.h"
 #include "msg.h"
@@ -42,6 +46,7 @@
 urls(),
 video_stream(0),
 audio_stream(0),
+ subtitle_stream(-1),
 benchmark(false),
 fullscreen(false),
 center(false),
@@ -65,6 +70,7 @@
 s11n::save(os, urls);
 s11n::save(os, video_stream);
 s11n::save(os, audio_stream);
+ s11n::save(os, subtitle_stream);
 s11n::save(os, benchmark);
 s11n::save(os, fullscreen);
 s11n::save(os, center);
@@ -85,6 +91,7 @@
 s11n::load(is, urls);
 s11n::load(is, video_stream);
 s11n::load(is, audio_stream);
+ s11n::load(is, subtitle_stream);
 s11n::load(is, benchmark);
 s11n::load(is, fullscreen);
 s11n::load(is, center);
@@ -155,7 +162,7 @@
 if (_video_output)
 {
 _video_output->exit_fullscreen();
- _video_output->prepare_next_frame(video_frame());
+ _video_output->prepare_next_frame(video_frame(), subtitle_box());
 _video_output->activate_next_frame();
 }
 notify(notification::play, true, false);
@@ -175,7 +182,7 @@
 {
 if (global_player)
 {
- throw exc("Cannot create a second master player.");
+ throw exc(_("Cannot create a second master player."));
 }
 global_player = this;
 }
@@ -192,29 +199,37 @@
 _media_input->open(init_data.urls);
 if (_media_input->video_streams() == 0)
 {
- throw exc("No video streams found.");
+ throw exc(_("No video streams found."));
 }
 if (init_data.stereo_layout_override)
 {
 if (!_media_input->stereo_layout_is_supported(init_data.stereo_layout, init_data.stereo_layout_swap))
 {
- throw exc("Cannot set requested stereo layout: incompatible media.");
+ throw exc(_("Cannot set requested stereo layout: incompatible media."));
 }
 _media_input->set_stereo_layout(init_data.stereo_layout, init_data.stereo_layout_swap);
 }
 if (_media_input->video_streams() < init_data.video_stream + 1)
 {
- throw exc(str::asprintf("Video stream %d not found.", init_data.video_stream + 1));
+ throw exc(str::asprintf(_("Video stream %d not found."), init_data.video_stream + 1));
 }
 _media_input->select_video_stream(init_data.video_stream);
 if (_media_input->audio_streams() > 0 && _media_input->audio_streams() < init_data.audio_stream + 1)
 {
- throw exc(str::asprintf("Audio stream %d not found.", init_data.audio_stream + 1));
+ throw exc(str::asprintf(_("Audio stream %d not found."), init_data.audio_stream + 1));
 }
 if (_media_input->audio_streams() > 0)
 {
 _media_input->select_audio_stream(init_data.audio_stream);
 }
+ if (_media_input->subtitle_streams() > 0 && _media_input->subtitle_streams() < init_data.subtitle_stream + 1)
+ {
+ throw exc(str::asprintf(_("Subtitle stream %d not found."), init_data.subtitle_stream + 1));
+ }
+ if (_media_input->subtitle_streams() > 0 && init_data.subtitle_stream >= 0)
+ {
+ _media_input->select_subtitle_stream(init_data.subtitle_stream);
+ }
 
 // Create audio output
 if (_media_input->audio_streams() > 0 && !_benchmark)
@@ -279,6 +294,16 @@
 }
 }
 
+void player::set_current_subtitle_box()
+{
+ _current_subtitle_box = subtitle_box();
+ if (_next_subtitle_box.is_valid()
+ && _next_subtitle_box.presentation_start_time < _video_pos + _media_input->video_frame_duration())
+ {
+ _current_subtitle_box = _next_subtitle_box;
+ }
+}
+
 int64_t player::step(bool *more_steps, int64_t *seek_to, bool *prep_frame, bool *drop_frame, bool *display_frame)
 {
 *more_steps = false;
@@ -304,6 +329,21 @@
 return 0;
 }
 _video_pos = _video_frame.presentation_time;
+ if (_media_input->selected_subtitle_stream() >= 0)
+ {
+ do
+ {
+ _media_input->start_subtitle_box_read();
+ _next_subtitle_box = _media_input->finish_subtitle_box_read();
+ if (!_next_subtitle_box.is_valid())
+ {
+ msg::dbg("Empty subtitle stream.");
+ stop_playback();
+ return 0;
+ }
+ }
+ while (_next_subtitle_box.presentation_stop_time < _video_pos);
+ }
 if (_audio_output)
 {
 _media_input->start_audio_blob_read(_audio_output->required_initial_data_size());
@@ -342,6 +382,7 @@
 _first_frame = true;
 *more_steps = true;
 *prep_frame = true;
+ set_current_subtitle_box();
 return 0;
 }
 }
@@ -380,16 +421,33 @@
 _seek_request = 0;
 _set_pos_request = -1.0f;
 _media_input->seek(*seek_to);
+ _next_subtitle_box = subtitle_box();
+ _current_subtitle_box = subtitle_box();
 
 _media_input->start_video_frame_read();
 _video_frame = _media_input->finish_video_frame_read();
 if (!_video_frame.is_valid())
 {
- msg::wrn("Seeked to end of video?!");
+ msg::dbg("Seeked to end of video?!");
 stop_playback();
 return 0;
 }
 _video_pos = _video_frame.presentation_time;
+ if (_media_input->selected_subtitle_stream() >= 0)
+ {
+ do
+ {
+ _media_input->start_subtitle_box_read();
+ _next_subtitle_box = _media_input->finish_subtitle_box_read();
+ if (!_next_subtitle_box.is_valid())
+ {
+ msg::dbg("Seeked to end of subtitle?!");
+ stop_playback();
+ return 0;
+ }
+ }
+ while (_next_subtitle_box.presentation_stop_time < _video_pos);
+ }
 if (_audio_output)
 {
 _audio_output->stop();
@@ -397,7 +455,7 @@
 audio_blob blob = _media_input->finish_audio_blob_read();
 if (!blob.is_valid())
 {
- msg::wrn("Seeked to end of audio?!");
+ msg::dbg("Seeked to end of audio?!");
 stop_playback();
 return 0;
 }
@@ -420,6 +478,7 @@
 _previous_frame_dropped = false;
 *more_steps = true;
 *prep_frame = true;
+ set_current_subtitle_box();
 return 0;
 }

bino-0.9.2.tar.bz2/src/player.h -> bino-0.9.3.tar.bz2/src/player.h Changed

@@ -4,6 +4,7 @@
 * Copyright (C) 2010-2011
 * Martin Lambers <marlam@marlam.de>
 * Alexey Osipov <lion-simba@pridelands.ru>
+ * Joe <cuchac@email.cz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -44,6 +45,7 @@
 std::vector<std::string> urls; // Input media objects
 int video_stream; // Selected video stream
 int audio_stream; // Selected audio stream
+ int subtitle_stream; // Selected subtitle stream
 bool benchmark; // Benchmark mode?
 bool fullscreen; // Make video fullscreen?
 bool center; // Center video on screen?
@@ -132,6 +134,9 @@
 // Normalize an input position to [0,1]
 float normalize_pos(int64_t pos);
 
+ // Set the current subtitle from the next subtitle
+ void set_current_subtitle_box();
+
 // Reset the play state
 void reset_playstate();
 
@@ -139,8 +144,10 @@
 void stop_playback();
 
 protected:
- // The current video frame
+ // The current video frame and subtitle
 video_frame _video_frame;
+ subtitle_box _current_subtitle_box;
+ subtitle_box _next_subtitle_box;
 
 // Create video and audio output (overridable by subclasses)
 virtual video_output *create_video_output();
@@ -167,6 +174,7 @@
 void notify(enum notification::type t, bool p, bool c) { notify(notification(t, p, c)); }
 void notify(enum notification::type t, int p, int c) { notify(notification(t, p, c)); }
 void notify(enum notification::type t, float p, float c) { notify(notification(t, p, c)); }
+ void notify(enum notification::type t, uint64_t p, uint64_t c) { notify(notification(t, p, c)); }
 void notify(enum notification::type t, const std::string &p, const std::string &c) { notify(notification(t, p, c)); }
 
 public:

bino-0.9.2.tar.bz2/src/player_equalizer.cpp -> bino-0.9.3.tar.bz2/src/player_equalizer.cpp Changed

@@ -23,9 +23,13 @@
 
 #include <sstream>
 #include <cmath>
+#include <cstdlib>
 
 #include <eq/eq.h>
 
+#include "gettext.h"
+#define _(string) gettext(string)
+
 #include "dbg.h"
 #include "msg.h"
 #include "s11n.h"
@@ -63,7 +67,6 @@
 {
 private:
 bool _is_master;
- bool _first_step;
 
 protected:
 video_output *create_video_output()
@@ -79,7 +82,7 @@
 }
 
 public:
- player_eq_node() : player(player::slave), _is_master(false), _first_step(true)
+ player_eq_node() : player(player::slave), _is_master(false)
 {
 }
 
@@ -111,54 +114,62 @@
 start_frame_read();
 }
 
- void start_frame_read() // Only called on slave nodes
+ 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
+ void finish_frame_read()
 {
+ // Only called on slave nodes
 _video_frame = get_media_input_nonconst().finish_video_frame_read();
 if (!_video_frame.is_valid())
 {
- msg::err("Reading input frame failed.");
+ msg::err(_("Reading input frame failed."));
 abort();
 }
 }
 
- void prepare_next_frame(video_output *vo)
+ void step(bool *more_steps, int64_t *seek_to, bool *prep_frame, bool *drop_frame, bool *display_frame)
 {
- vo->prepare_next_frame(_video_frame);
+ // Only called on the master node
+ player::step(more_steps, seek_to, prep_frame, drop_frame, display_frame);
 }
 
- void step(bool *more_steps, int64_t *seek_to, bool *prep_frame, bool *drop_frame, bool *display_frame)
+ const video_frame &get_video_frame()
 {
- if (!_is_master && _first_step)
- {
- // The master player reads a video frame; do the same on slave players to keep sync
- start_frame_read();
- _first_step = false;
- }
- player::step(more_steps, seek_to, prep_frame, drop_frame, display_frame);
+ return _video_frame;
+ }
+
+ const subtitle_box &get_subtitle()
+ {
+ return _current_subtitle_box;
 }
 };
 
 /*
- * video_output_eq_window
+ * video_output_eq_channel
 *
- * Implementation of video_output for eq_window.
+ * Implementation of video_output for eq_channel.
 *
 * Much of the video_output interface is not relevant for Equalizer, and thus
 * is implemented with simple stub functions.
 */
 
-class video_output_eq_window : public video_output
+class video_output_eq_channel : public video_output
 {
 private:
- eq::Window *_wnd;
+ eq::Channel *_channel;
+ const float _canvas_width;
+ const float _canvas_height;
+ const float _canvas_video_area_w;
+ const float _canvas_video_area_h;
 
 protected:
- void make_context_current() { _wnd->makeCurrent(); }
+ int video_display_width() { return screen_width() * _canvas_video_area_w; }
+ int video_display_height() { return screen_height() * _canvas_video_area_h; }
+ void make_context_current() { _channel->getWindow()->makeCurrent(); }
 bool context_is_stereo() { return false; }
 void recreate_context(bool) { }
 void trigger_update() { }
@@ -166,12 +177,16 @@
 
 public:
 bool supports_stereo() const { return false; }
- int screen_width() { return 0; }
- int screen_height() { return 0; }
- float screen_aspect_ratio() { return 0.0f; }
- int width() { return 0; }
- int height() { return 0; }
- float aspect_ratio() { return 0.0f; }
+ int screen_width() { return _channel->getPixelViewport().w / _channel->getViewport().w; }
+ int screen_height() { return _channel->getPixelViewport().h / _channel->getViewport().h; }
+ float screen_pixel_aspect_ratio()
+ {
+ float pixels_per_unit_x = _channel->getPixelViewport().w / (_canvas_width * _channel->getViewport().w);
+ float pixels_per_unit_y = _channel->getPixelViewport().h / (_canvas_height * _channel->getViewport().h);
+ return pixels_per_unit_y / pixels_per_unit_x;
+ }
+ int width() { return _channel->getPixelViewport().w; }
+ int height() { return _channel->getPixelViewport().h; }
 int pos_x() { return 0; }
 int pos_y() { return 0; }
 void center() { }
@@ -183,14 +198,25 @@
 void receive_notification(const notification &) { }
 
 public:
- video_output_eq_window(eq::Window *wnd) : video_output(false), _wnd(wnd)
+ video_output_eq_channel(eq::Channel *channel,
+ float canvas_width, float canvas_height,
+ float canvas_video_area_w, float canvas_video_area_h) :
+ video_output(false),
+ _channel(channel),
+ _canvas_width(canvas_width),
+ _canvas_height(canvas_height),
+ _canvas_video_area_w(canvas_video_area_w),
+ _canvas_video_area_h(canvas_video_area_h)
 {
 }
 
 void display_current_frame(bool mono_right_instead_of_left,
 float x, float y, float w, float h, const GLint viewport[4])
 {
- video_output::display_current_frame(mono_right_instead_of_left, x, y, w, h, viewport);
+ GLint vp[2][4];
+ std::memcpy(vp[0], viewport, 4 * sizeof(int));
+ std::memcpy(vp[1], viewport, 4 * sizeof(int));
+ video_output::display_current_frame(true, mono_right_instead_of_left, x, y, w, h, vp);
 }
 };
 
@@ -214,10 +240,10 @@
 
 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" },
+ { 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!
 };
 
@@ -249,6 +275,8 @@
 eq::uint128_t frame_data_id;
 player_init_data init_data;
 bool flat_screen;
+ float canvas_width;
+ float canvas_height;
 struct { float x, y, w, h, d; } canvas_video_area;
 
 eq_init_data() : init_data()
@@ -278,6 +306,8 @@
 s11n::save(oss, frame_data_id.low());
 s11n::save(oss, init_data);
 s11n::save(oss, flat_screen);
+ s11n::save(oss, canvas_width);
+ s11n::save(oss, canvas_height);
 s11n::save(oss, canvas_video_area.x);
 s11n::save(oss, canvas_video_area.y);
 s11n::save(oss, canvas_video_area.w);
@@ -295,6 +325,8 @@
 s11n::load(iss, frame_data_id.low());
 s11n::load(iss, init_data);
 s11n::load(iss, flat_screen);

bino-0.9.2.tar.bz2/src/player_qt.cpp -> bino-0.9.3.tar.bz2/src/player_qt.cpp Changed

@@ -4,6 +4,7 @@
 * Copyright (C) 2010-2011
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+ * Joe <cuchac@email.cz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -21,6 +22,8 @@
 
 #include "config.h"
 
+#include <limits>
+
 #include <QCoreApplication>
 #include <QApplication>
 #include <QMainWindow>
@@ -47,6 +50,14 @@
 #include <QStandardItemModel>
 #include <QTextBrowser>
 #include <QTabWidget>
+#include <QList>
+#include <QTextCodec>
+#include <QRegExp>
+#include <QMap>
+#include <QColorDialog>
+
+#include "gettext.h"
+#define _(string) gettext(string)
 
 #include "player_qt.h"
 #include "qt_app.h"
@@ -121,87 +132,91 @@
 QWidget(parent), _settings(settings), _player(player), _lock(false)
 {
 QGridLayout *layout0 = new QGridLayout;
- QLabel *video_label = new QLabel("Video:");
- video_label->setToolTip(
- "Select the video stream.");
+ QLabel *video_label = new QLabel(_("Video:"));
+ video_label->setToolTip(_("Select the video stream."));
 layout0->addWidget(video_label, 0, 0);
 _video_combobox = new QComboBox(this);
 _video_combobox->setToolTip(video_label->toolTip());
 connect(_video_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(video_changed()));
 layout0->addWidget(_video_combobox, 0, 1);
- QLabel *audio_label = new QLabel("Audio:");
- audio_label->setToolTip(
- "Select the audio stream.");
+ QLabel *audio_label = new QLabel(_("Audio:"));
+ audio_label->setToolTip(_("Select the audio stream."));
 layout0->addWidget(audio_label, 0, 2);
 _audio_combobox = new QComboBox(this);
 _audio_combobox->setToolTip(audio_label->toolTip());
 connect(_audio_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(audio_changed()));
 layout0->addWidget(_audio_combobox, 0, 3);
+ QLabel *subtitle_label = new QLabel(_("Subtitle:"));
+ subtitle_label->setToolTip(_("Select the subtitle stream."));
+ layout0->addWidget(subtitle_label, 0, 4);
+ _subtitle_combobox = new QComboBox(this);
+ _subtitle_combobox->setToolTip(subtitle_label->toolTip());
+ connect(_subtitle_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(subtitle_changed()));
+ layout0->addWidget(_subtitle_combobox, 0, 5);
 layout0->setColumnStretch(1, 1);
 layout0->setColumnStretch(3, 1);
+ layout0->setColumnStretch(5, 1);
 
 QGridLayout *layout1 = new QGridLayout;
- QLabel *input_label = new QLabel("Input:");
- input_label->setToolTip(
- "Set the 3D layout of the video stream.");
+ QLabel *input_label = new QLabel(_("Input:"));
+ input_label->setToolTip(_("Set the 3D layout of the video stream."));
 layout1->addWidget(input_label, 0, 0);
 _input_combobox = new QComboBox(this);
 _input_combobox->setToolTip(input_label->toolTip());
- _input_combobox->addItem("2D");
- _input_combobox->addItem("Separate streams, left first");
- _input_combobox->addItem("Separate streams, right first");
- _input_combobox->addItem("Top/bottom");
- _input_combobox->addItem("Top/bottom, half height");
- _input_combobox->addItem("Bottom/top");
- _input_combobox->addItem("Bottom/top, half height");
- _input_combobox->addItem("Left/right");
- _input_combobox->addItem("Left/right, half width");
- _input_combobox->addItem("Right/left");
- _input_combobox->addItem("Right/left, half width");
- _input_combobox->addItem("Even/odd rows");
- _input_combobox->addItem("Odd/even rows");
+ _input_combobox->addItem(_("2D"));
+ _input_combobox->addItem(_("Separate streams, left first"));
+ _input_combobox->addItem(_("Separate streams, right first"));
+ _input_combobox->addItem(_("Top/bottom"));
+ _input_combobox->addItem(_("Top/bottom, half height"));
+ _input_combobox->addItem(_("Bottom/top"));
+ _input_combobox->addItem(_("Bottom/top, half height"));
+ _input_combobox->addItem(_("Left/right"));
+ _input_combobox->addItem(_("Left/right, half width"));
+ _input_combobox->addItem(_("Right/left"));
+ _input_combobox->addItem(_("Right/left, half width"));
+ _input_combobox->addItem(_("Even/odd rows"));
+ _input_combobox->addItem(_("Odd/even rows"));
 connect(_input_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(input_changed()));
 layout1->addWidget(_input_combobox, 0, 1);
 layout1->setColumnStretch(1, 1);
 
 QGridLayout *layout2 = new QGridLayout;
- QLabel *output_label = new QLabel("Output:");
- output_label->setToolTip(
- "Set the 3D output type for your display.");
+ QLabel *output_label = new QLabel(_("Output:"));
+ output_label->setToolTip(_("Set the 3D output type for your display."));
 layout2->addWidget(output_label, 0, 0);
 _output_combobox = new QComboBox(this);
 _output_combobox->setToolTip(output_label->toolTip());
- _output_combobox->addItem("Left view");
- _output_combobox->addItem("Right view");
- _output_combobox->addItem("OpenGL stereo");
- _output_combobox->addItem("Top/bottom");
- _output_combobox->addItem("Top/bottom, half height");
- _output_combobox->addItem("Left/right");
- _output_combobox->addItem("Left/right, half width");
- _output_combobox->addItem("Even/odd rows");
- _output_combobox->addItem("Even/odd columns");
- _output_combobox->addItem("Checkerboard pattern");
- _output_combobox->addItem("Red/cyan glasses, monochrome method");
- _output_combobox->addItem("Red/cyan glasses, half-color method");
- _output_combobox->addItem("Red/cyan glasses, full-color method");
- _output_combobox->addItem("Red/cyan glasses, high-quality Dubois method");
- _output_combobox->addItem("Green/magenta glasses, monochrome method");
- _output_combobox->addItem("Green/magenta glasses, half-color method");
- _output_combobox->addItem("Green/magenta glasses, full-color method");
- _output_combobox->addItem("Green/magenta glasses, high-quality Dubois method");
- _output_combobox->addItem("Amber/blue glasses, monochrome method");
- _output_combobox->addItem("Amber/blue glasses, half-color method");
- _output_combobox->addItem("Amber/blue glasses, full-color method");
- _output_combobox->addItem("Amber/blue glasses, high-quality Dubois method");
- _output_combobox->addItem("Red/green glasses, monochrome method");
- _output_combobox->addItem("Red/blue glasses, monochrome method");
+ _output_combobox->addItem(_("Left view"));
+ _output_combobox->addItem(_("Right view"));
+ _output_combobox->addItem(_("OpenGL stereo"));
+ _output_combobox->addItem(_("Top/bottom"));
+ _output_combobox->addItem(_("Top/bottom, half height"));
+ _output_combobox->addItem(_("Left/right"));
+ _output_combobox->addItem(_("Left/right, half width"));
+ _output_combobox->addItem(_("Even/odd rows"));
+ _output_combobox->addItem(_("Even/odd columns"));
+ _output_combobox->addItem(_("Checkerboard pattern"));
+ _output_combobox->addItem(_("HDMI frame packing mode"));
+ _output_combobox->addItem(_("Red/cyan glasses, monochrome method"));
+ _output_combobox->addItem(_("Red/cyan glasses, half-color method"));
+ _output_combobox->addItem(_("Red/cyan glasses, full-color method"));
+ _output_combobox->addItem(_("Red/cyan glasses, high-quality Dubois method"));
+ _output_combobox->addItem(_("Green/magenta glasses, monochrome method"));
+ _output_combobox->addItem(_("Green/magenta glasses, half-color method"));
+ _output_combobox->addItem(_("Green/magenta glasses, full-color method"));
+ _output_combobox->addItem(_("Green/magenta glasses, high-quality Dubois method"));
+ _output_combobox->addItem(_("Amber/blue glasses, monochrome method"));
+ _output_combobox->addItem(_("Amber/blue glasses, half-color method"));
+ _output_combobox->addItem(_("Amber/blue glasses, full-color method"));
+ _output_combobox->addItem(_("Amber/blue glasses, high-quality Dubois method"));
+ _output_combobox->addItem(_("Red/green glasses, monochrome method"));
+ _output_combobox->addItem(_("Red/blue glasses, monochrome method"));
 connect(_output_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(output_changed()));
 layout2->addWidget(_output_combobox, 0, 1);
 layout2->setColumnStretch(1, 1);
- _swap_checkbox = new QCheckBox("Swap left/right");
- _swap_checkbox->setToolTip(
- "Swap the left and right view. "
- "Use this if the 3D effect seems wrong.");
+ _swap_checkbox = new QCheckBox(_("Swap left/right"));
+ _swap_checkbox->setToolTip(_("Swap the left and right view. "
+ "Use this if the 3D effect seems wrong."));
 connect(_swap_checkbox, SIGNAL(stateChanged(int)), this, SLOT(swap_changed()));
 layout2->addWidget(_swap_checkbox, 0, 2);
 
@@ -211,14 +226,33 @@
 layout->addLayout(layout2, 2, 0);
 setLayout(layout);
 
- // Align the input and output labels
- output_label->setMinimumSize(output_label->minimumSizeHint());
- input_label->setMinimumSize(output_label->minimumSizeHint());
- audio_label->setMinimumSize(output_label->minimumSizeHint());
- video_label->setMinimumSize(output_label->minimumSizeHint());
+ // Align the labels
+ int minw = input_label->minimumSizeHint().width();
+ if (output_label->minimumSizeHint().width() > minw)
+ {
+ minw = output_label->minimumSizeHint().width();
+ }
+ if (video_label->minimumSizeHint().width() > minw)
+ {
+ minw = video_label->minimumSizeHint().width();
+ }
+ if (audio_label->minimumSizeHint().width() > minw)
+ {
+ minw = audio_label->minimumSizeHint().width();
+ }

bino-0.9.2.tar.bz2/src/player_qt.h -> bino-0.9.3.tar.bz2/src/player_qt.h Changed

@@ -4,6 +4,7 @@
 * Copyright (C) 2010-2011
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+ * Joe <cuchac@email.cz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -30,6 +31,7 @@
 #include <QDoubleSpinBox>
 #include <QSpinBox>
 #include <QCheckBox>
+#include <QFontComboBox>
 #include <QTimer>
 #include <QSettings>
 #include <QDialog>
@@ -73,6 +75,7 @@
 const player_qt_internal *_player;
 QComboBox *_video_combobox;
 QComboBox *_audio_combobox;
+ QComboBox *_subtitle_combobox;
 QComboBox *_input_combobox;
 QComboBox *_output_combobox;
 QCheckBox *_swap_checkbox;
@@ -84,6 +87,7 @@
 private slots:
 void video_changed();
 void audio_changed();
+ void subtitle_changed();
 void input_changed();
 void output_changed();
 void swap_changed();
@@ -96,6 +100,7 @@
 
 int get_video_stream();
 int get_audio_stream();
+ int get_subtitle_stream();
 void get_stereo_layout(video_frame::stereo_layout_t &stereo_layout, bool &stereo_layout_swap);
 void get_stereo_mode(parameters::stereo_mode_t &stereo_mode, bool &stereo_mode_swap);
 
@@ -196,6 +201,42 @@
 virtual void receive_notification(const notification &note);
 };
 
+class subtitle_dialog: public QDialog, public controller
+{
+ Q_OBJECT
+
+private:
+ parameters *_params;
+ bool _lock;
+ QCheckBox *_encoding_checkbox;
+ QComboBox *_encoding_combobox;
+ QCheckBox *_font_checkbox;
+ QFontComboBox *_font_combobox;
+ QCheckBox *_size_checkbox;
+ QSpinBox *_size_spinbox;
+ QCheckBox *_scale_checkbox;
+ QDoubleSpinBox *_scale_spinbox;
+ QCheckBox *_color_checkbox;
+ QPushButton *_color_button;
+ QColor _color;
+
+ QList<QTextCodec *> find_codecs();
+ void set_color_button(uint32_t c);
+
+private slots:
+ void color_button_pressed();
+ void encoding_changed();
+ void font_changed();
+ void size_changed();
+ void scale_changed();
+ void color_changed();
+
+public:
+ subtitle_dialog(parameters *params, QWidget *parent);
+
+ virtual void receive_notification(const notification &note);
+};
+
 class stereoscopic_dialog : public QDialog, public controller
 {
 Q_OBJECT
@@ -204,12 +245,16 @@
 bool _lock;
 QDoubleSpinBox *_p_spinbox;
 QSlider *_p_slider;
+ QDoubleSpinBox *_sp_spinbox;
+ QSlider *_sp_slider;
 QDoubleSpinBox *_g_spinbox;
 QSlider *_g_slider;
 
 private slots:
 void p_slider_changed(int val);
 void p_spinbox_changed(double val);
+ void sp_slider_changed(int val);
+ void sp_spinbox_changed(double val);
 void g_slider_changed(int val);
 void g_spinbox_changed(double val);
 
@@ -231,6 +276,7 @@
 controls_widget *_controls_widget;
 color_dialog *_color_dialog;
 crosstalk_dialog *_crosstalk_dialog;
+ subtitle_dialog *_subtitle_dialog;
 stereoscopic_dialog *_stereoscopic_dialog;
 player_qt_internal *_player;
 QTimer *_timer;
@@ -249,6 +295,7 @@
 void file_open_url();
 void preferences_colors();
 void preferences_crosstalk();
+ void preferences_subtitle();
 void preferences_stereoscopic();
 void help_manual();
 void help_website();

bino-0.9.2.tar.bz2/src/qt_app.cpp -> bino-0.9.3.tar.bz2/src/qt_app.cpp Changed

bino-0.9.3.tar.bz2/src/subtitle_renderer.cpp Added

@@ -0,0 +1,488 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * Copyright (C) 2011
+ * Martin Lambers <marlam@marlam.de>
+ * Joe <cuchac@email.cz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <vector>
+#include <limits>
+#include <cstring>
+#include <cstdio>
+#include <stdint.h>
+
+#include <GL/glew.h>
+
+#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+# include <windows.h>
+#endif
+
+extern "C"
+{
+#include <ass/ass.h>
+}
+
+#include "gettext.h"
+#define _(string) gettext(string)
+
+#include "exc.h"
+#include "str.h"
+#include "blob.h"
+#include "msg.h"
+
+#include "subtitle_renderer.h"
+
+
+subtitle_renderer::subtitle_renderer() :
+ _ass_initialized(false),
+ _fontconfig_conffile(NULL),
+ _ass_library(NULL),
+ _ass_renderer(NULL),
+ _ass_track(NULL)
+{
+}
+
+subtitle_renderer::~subtitle_renderer()
+{
+ if (_ass_track)
+ {
+ ass_free_track(_ass_track);
+ }
+ if (_ass_renderer)
+ {
+ ass_renderer_done(_ass_renderer);
+ }
+ if (_ass_library)
+ {
+ ass_library_done(_ass_library);
+ }
+ if (_fontconfig_conffile)
+ {
+ (void)std::remove(_fontconfig_conffile);
+ }
+}
+
+bool subtitle_renderer::render_to_display_size(const subtitle_box &box) const
+{
+ return (box.format != subtitle_box::image);
+}
+
+void subtitle_renderer::prerender(const subtitle_box &box, int64_t timestamp,
+ const parameters &params,
+ int width, int height, float pixel_aspect_ratio,
+ int &bb_x, int &bb_y, int &bb_w, int &bb_h)
+{
+ _fmt = box.format;
+ switch (_fmt)
+ {
+ case subtitle_box::text:
+ case subtitle_box::ass:
+ init_ass();
+ prerender_ass(box, timestamp, params, width, height, pixel_aspect_ratio);
+ break;
+ case subtitle_box::image:
+ prerender_img(box);
+ break;
+ }
+ bb_x = _bb_x;
+ bb_y = _bb_y;
+ bb_w = _bb_w;
+ bb_h = _bb_h;
+}
+
+void subtitle_renderer::render(uint32_t *bgra32_buffer)
+{
+ switch (_fmt)
+ {
+ case subtitle_box::text:
+ case subtitle_box::ass:
+ render_ass(bgra32_buffer);
+ break;
+ case subtitle_box::image:
+ render_img(bgra32_buffer);
+ break;
+ }
+}
+
+const char *subtitle_renderer::get_fontconfig_conffile()
+{
+#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+ /* Fontconfig annoyingly requires a configuration file, but there is no
+ * default location for it on Windows. So we just create a temporary one.
+ * Note that due to lack of mkstemp() on Windows, this code has race
+ * conditions. Note also that if something goes wrong and we return NULL
+ * here, the application will likely crash when we try to render a subtitle. */
+ char tmppathname[MAX_PATH];
+ static char tmpfilename[MAX_PATH];
+ FILE *f;
+ DWORD ret;
+ ret = GetTempPath(MAX_PATH, tmppathname);
+ if (ret > MAX_PATH || ret == 0)
+ return NULL;
+ if (GetTempFileName(tmppathname, "fonts_conf", 0, tmpfilename) == 0)
+ return NULL;
+ if (!(f = fopen(tmpfilename, "w")))
+ return NULL;
+ fprintf(f,
+ "<?xml version=\"1.0\"?>\n"
+ "<!DOCTYPE fontconfig SYSTEM \"fonts.dtd\">\n"
+ "<fontconfig>\n"
+ "<dir>WINDOWSFONTDIR</dir>\n"
+ "<dir>~/.fonts</dir>\n"
+ "<cachedir>WINDOWSTEMPDIR_FONTCONFIG_CACHE</cachedir>\n"
+ "<cachedir>~/.fontconfig</cachedir>\n"
+ "<config>\n"
+ "<blank>\n"
+ "<int>0x0020</int> <int>0x00A0</int> <int>0x00AD</int> <int>0x034F</int> <int>0x0600</int>\n"
+ "<int>0x0601</int> <int>0x0602</int> <int>0x0603</int> <int>0x06DD</int> <int>0x070F</int>\n"
+ "<int>0x115F</int> <int>0x1160</int> <int>0x1680</int> <int>0x17B4</int> <int>0x17B5</int>\n"
+ "<int>0x180E</int> <int>0x2000</int> <int>0x2001</int> <int>0x2002</int> <int>0x2003</int>\n"
+ "<int>0x2004</int> <int>0x2005</int> <int>0x2006</int> <int>0x2007</int> <int>0x2008</int>\n"
+ "<int>0x2009</int> <int>0x200A</int> <int>0x200B</int> <int>0x200C</int> <int>0x200D</int>\n"
+ "<int>0x200E</int> <int>0x200F</int> <int>0x2028</int> <int>0x2029</int> <int>0x202A</int>\n"
+ "<int>0x202B</int> <int>0x202C</int> <int>0x202D</int> <int>0x202E</int> <int>0x202F</int>\n"
+ "<int>0x205F</int> <int>0x2060</int> <int>0x2061</int> <int>0x2062</int> <int>0x2063</int>\n"
+ "<int>0x206A</int> <int>0x206B</int> <int>0x206C</int> <int>0x206D</int> <int>0x206E</int>\n"
+ "<int>0x206F</int> <int>0x2800</int> <int>0x3000</int> <int>0x3164</int> <int>0xFEFF</int>\n"
+ "<int>0xFFA0</int> <int>0xFFF9</int> <int>0xFFFA</int> <int>0xFFFB</int>\n"
+ "</blank>\n"
+ "<rescan><int>30</int></rescan>\n"
+ "</config>\n"
+ "</fontconfig>\n");
+ fclose(f);
+ return tmpfilename;
+#else
+ return NULL;
+#endif
+}
+
+static void libass_msg_callback(int level, const char *fmt, va_list args, void *)
+{
+ msg::level_t l;
+ switch (level)
+ {
+ default:
+ case 0:
+ l = msg::ERR;
+ break;
+ case 1:
+ l = msg::ERR;
+ break;
+ case 2:
+ l = msg::WRN;
+ break;
+ case 3:
+ l = msg::WRN;
+ break;
+ case 4:
+ l = msg::WRN;
+ break;
+ case 5:
+ l = msg::INF;
+ break;
+ case 6:

bino-0.9.3.tar.bz2/src/subtitle_renderer.h Added

@@ -0,0 +1,102 @@
+/*
+ * This file is part of bino, a 3D video player.
+ *
+ * Copyright (C) 2011
+ * Martin Lambers <marlam@marlam.de>
+ * Joe <cuchac@email.cz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SUBTITLE_RENDERER_H
+#define SUBTITLE_RENDERER_H
+
+#include <vector>
+
+#include <GL/glew.h>
+
+extern "C"
+{
+#include <ass/ass.h>
+}
+
+#include "media_data.h"
+
+
+class subtitle_renderer
+{
+private:
+ // Static ASS data
+ bool _ass_initialized;
+ const char *_fontconfig_conffile;
+ ASS_Library *_ass_library;
+ ASS_Renderer *_ass_renderer;
+
+ // Dynamic data (changes with each subtitle)
+ subtitle_box::format_t _fmt;
+ ASS_Track *_ass_track;
+ ASS_Image *_ass_img;
+ const subtitle_box *_img_box;
+ int _bb_x, _bb_y, _bb_w, _bb_h;
+
+ // ASS helper functions
+ const char *get_fontconfig_conffile();
+ void init_ass();
+ void blend_ass_image(const ASS_Image *img, uint32_t *buf);
+ void set_ass_parameters(const parameters &params);
+
+ // Rendering ASS and text subtitles
+ void prerender_ass(const subtitle_box &box, int64_t timestamp,
+ const parameters &params,
+ int width, int height, float pixel_aspect_ratio);
+ void render_ass(uint32_t *bgra32_buffer);
+
+ // Rendering bitmap subtitles
+ void prerender_img(const subtitle_box &box);
+ void render_img(uint32_t *bgra32_buffer);
+
+public:
+ subtitle_renderer();
+ ~subtitle_renderer();
+
+ /*
+ * To render a subtitle, the following steps are necessary:
+ * 1. Call render_to_display_size() to determine if the subtitle
+ * overlay image should have display size or video frame size.
+ * 2. Call prerender() to determine the bounding box inside the
+ * overlay image that the subtitle will occupy.
+ * 3. Clear the overlay image, and allocate a BGRA32 buffer for
+ * the bounding box.
+ * 4. Call render() to draw the subtitle into the buffer.
+ * 5. Update the overlay image with the subtitle bounding box
+ * image from the buffer.
+ */
+
+ // Return true if the subtitle should be rendered in display resolution.
+ // Return false if the subtitle should be rendered in video frame resolution.
+ bool render_to_display_size(const subtitle_box &box) const;
+
+ // Prerender the subtitle, to determine the bounding box it will occupy.
+ // The bounding box is relative to the given subtitle overlay size (width and height).
+ void prerender(const subtitle_box &box, int64_t timestamp,
+ const parameters &params,
+ int width, int height, float pixel_aspect_ratio,
+ int &bb_x, int &bb_y, int &bb_w, int &bb_h);
+
+ // Render the prerendered subtitle into the given BGRA32 buffer, which must
+ // have the dimensions of the bounding box that was previously computed.
+ void render(uint32_t *bgra32_buffer);
+};
+
+#endif

bino-0.9.2.tar.bz2/src/video_output.cpp -> bino-0.9.3.tar.bz2/src/video_output.cpp Changed

@@ -4,6 +4,7 @@
 * Copyright (C) 2010-2011
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <frederic.devernay@inrialpes.fr>
+ * Joe <cuchac@email.cz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -21,11 +22,15 @@
 
 #include "config.h"
 
+#include <limits>
 #include <cstdlib>
 #include <cmath>
 
 #include <GL/glew.h>
 
+#include "gettext.h"
+#define _(string) gettext(string)
+
 #include "exc.h"
 #include "msg.h"
 #include "str.h"
@@ -88,6 +93,7 @@
 _srgb_textures_are_broken = std::getenv("SRGB_TEXTURES_ARE_BROKEN");
 
 _input_pbo = 0;
+ _input_fbo = 0;
 _active_index = 1;
 for (int i = 0; i < 2; i++)
 {
@@ -99,10 +105,15 @@
 _input_bgra32_tex[i][j] = 0;
 }
 _color_srgb_tex[i] = 0;
+ _input_subtitle_tex[i] = 0;
+ _input_subtitle_width[i] = -1;
+ _input_subtitle_height[i] = -1;
+ _input_subtitle_time[i] = std::numeric_limits<int64_t>::min();
 }
 _color_prg = 0;
 _color_fbo = 0;
 _render_prg = 0;
+ _render_dummy_tex = 0;
 _render_mask_tex = 0;
 }
 
@@ -134,20 +145,6 @@
 }
 }
 
-float video_output::screen_pixel_aspect_ratio()
-{
- float screen_pixel_ar = screen_aspect_ratio()
- * static_cast<float>(screen_height()) / static_cast<float>(screen_width());
- if (std::fabs(screen_pixel_ar - 1.0f) < 0.03f)
- {
- // This screen most probably has square pixels, and the difference to 1.0
- // is only due to slightly inaccurate measurements and rounding. Force
- // 1.0 so that the user gets expected results.
- screen_pixel_ar = 1.0f;
- }
- return screen_pixel_ar;
-}
-
 void video_output::set_suitable_size(int w, int h, float ar, parameters::stereo_mode_t stereo_mode)
 {
 int width = w;
@@ -156,7 +153,8 @@
 {
 w *= 2;
 }
- else if (stereo_mode == parameters::top_bottom)
+ else if (stereo_mode == parameters::top_bottom
+ || stereo_mode == parameters::hdmi_frame_pack)
 {
 h *= 2;
 }
@@ -165,7 +163,8 @@
 {
 aspect_ratio /= 2.0f;
 }
- else if (stereo_mode == parameters::top_bottom)
+ else if (stereo_mode == parameters::top_bottom
+ || stereo_mode == parameters::hdmi_frame_pack)
 {
 aspect_ratio *= 2.0f;
 }
@@ -194,6 +193,7 @@
 {
 assert(xgl::CheckError(HERE));
 glGenBuffers(1, &_input_pbo);
+ glGenFramebuffersEXT(1, &_input_fbo);
 if (frame.layout == video_frame::bgra32)
 {
 for (int i = 0; i < (frame.stereo_layout == video_frame::mono ? 1 : 2); i++)
@@ -277,6 +277,8 @@
 assert(xgl::CheckError(HERE));
 glDeleteBuffers(1, &_input_pbo);
 _input_pbo = 0;
+ glDeleteFramebuffersEXT(1, &_input_fbo);
+ _input_fbo = 0;
 for (int i = 0; i < 2; i++)
 {
 if (_input_yuv_y_tex[index][i] != 0)
@@ -299,6 +301,15 @@
 glDeleteTextures(1, &(_input_bgra32_tex[index][i]));
 _input_bgra32_tex[index][i] = 0;
 }
+ if (_input_subtitle_tex[i] != 0)
+ {
+ glDeleteTextures(1, &(_input_subtitle_tex[i]));
+ _input_subtitle_tex[i] = 0;
+ }
+ _input_subtitle_box[i] = subtitle_box();
+ _input_subtitle_width[i] = -1;
+ _input_subtitle_height[i] = -1;
+ _input_subtitle_time[i] = std::numeric_limits<int64_t>::min();
 }
 _input_yuv_chroma_width_divisor[index] = 0;
 _input_yuv_chroma_height_divisor[index] = 0;
@@ -311,7 +322,7 @@
 return (x / 4 + (x % 4 == 0 ? 0 : 1)) * 4;
 }
 
-void video_output::prepare_next_frame(const video_frame &frame)
+void video_output::prepare_next_frame(const video_frame &frame, const subtitle_box &subtitle)
 {
 assert(xgl::CheckError(HERE));
 int index = (_active_index == 0 ? 1 : 0);
@@ -325,8 +336,8 @@
 {
 input_deinit(index);
 input_init(index, frame);
- _frame[index] = frame;
 }
+ _frame[index] = frame;
 int bytes_per_pixel = (frame.layout == video_frame::bgra32 ? 4 : 1);
 GLenum format = (frame.layout == video_frame::bgra32 ? GL_BGRA : GL_LUMINANCE);
 GLenum type = (frame.layout == video_frame::bgra32 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE);
@@ -361,7 +372,7 @@
 void *pboptr = glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
 if (!pboptr)
 {
- msg::err("Cannot create a PBO buffer.");
+ msg::err(_("Cannot create a PBO buffer."));
 abort();
 }
 assert(reinterpret_cast<uintptr_t>(pboptr) % 4 == 0);
@@ -380,6 +391,120 @@
 }
 }
 assert(xgl::CheckError(HERE));
+ // In the common case, the video display width and height do not change
+ // between preparing a frame and rendering it, so it is benefical to update
+ // to subtitle texture in this function (because other threads can do other
+ // work in parallel).
+ update_subtitle_tex(index, frame, subtitle, _params);
+}
+
+int video_output::video_display_width()
+{
+ assert(_viewport[0][2] > 0);
+ return _viewport[0][2];
+}
+
+int video_output::video_display_height()
+{
+ assert(_viewport[0][3] > 0);
+ return _viewport[0][3];
+}
+
+void video_output::update_subtitle_tex(int index, const video_frame &frame, const subtitle_box &subtitle, const parameters &params)
+{
+ assert(xgl::CheckError(HERE));
+ int width = 0;
+ int height = 0;
+ if (subtitle.is_valid())
+ {
+ if (_subtitle_renderer.render_to_display_size(subtitle))
+ {
+ width = video_display_width();
+ height = video_display_height();
+ }
+ else
+ {
+ width = frame.width;
+ height = frame.height;
+ }
+ }
+ if (subtitle.is_valid()
+ && (subtitle != _input_subtitle_box[index]
+ || (!subtitle.is_constant() && frame.presentation_time != _input_subtitle_time[index])
+ || width != _input_subtitle_width[index]
+ || height != _input_subtitle_height[index]
+ || params.subtitle_encoding != _input_subtitle_params.subtitle_encoding
+ || params.subtitle_font != _input_subtitle_params.subtitle_font
+ || params.subtitle_size != _input_subtitle_params.subtitle_size
+ || (params.subtitle_scale < _input_subtitle_params.subtitle_scale

bino-0.9.2.tar.bz2/src/video_output.h -> bino-0.9.3.tar.bz2/src/video_output.h Changed

@@ -4,6 +4,7 @@
 * Copyright (C) 2010-2011
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+ * Joe <cuchac@email.cz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -28,12 +29,14 @@
 #include <GL/glew.h>
 
 #include "media_data.h"
+#include "subtitle_renderer.h"
 #include "controller.h"
 
 
 class video_output : public controller
 {
 private:
+ subtitle_renderer _subtitle_renderer;
 bool _initialized;
 bool _srgb_textures_are_broken; // XXX: Hack: work around broken SRGB texture implementations
 
@@ -47,13 +50,20 @@
 parameters _params; // current parameters for display
 // Step 1: input of video data
 GLuint _input_pbo; // pixel-buffer object for texture uploading
+ GLuint _input_fbo; // frame-buffer object for texture clearing
 GLuint _input_yuv_y_tex[2][2]; // for yuv formats: y component
 GLuint _input_yuv_u_tex[2][2]; // for yuv formats: u component
 GLuint _input_yuv_v_tex[2][2]; // for yuv formats: v component
 GLuint _input_bgra32_tex[2][2]; // for bgra32 format
+ GLuint _input_subtitle_tex[2]; // for subtitles
+ subtitle_box _input_subtitle_box[2];// the subtitle box currently stored in the texture
+ int _input_subtitle_width[2]; // the width of the current subtitle texture
+ int _input_subtitle_height[2]; // the height of the current subtitle texture
+ int64_t _input_subtitle_time[2]; // the timestamp of the current subtitle texture
+ parameters _input_subtitle_params; // the parameters of the current subtitle texture
 int _input_yuv_chroma_width_divisor[2]; // for yuv formats: chroma subsampling
 int _input_yuv_chroma_height_divisor[2]; // for yuv formats: chroma subsampling
- // Step 2: rendering
+ // Step 2: color space conversion and color correction
 video_frame _color_last_frame; // last frame for this step; used for reinitialization check
 GLuint _color_prg; // color space transformation, color adjustment
 GLuint _color_fbo; // framebuffer object to render into the sRGB texture
@@ -61,9 +71,10 @@
 // Step 3: rendering
 parameters _render_last_params; // last params for this step; used for reinitialization check
 GLuint _render_prg; // reads sRGB texture, renders according to _params[_active_index]
+ GLuint _render_dummy_tex; // an empty subtitle texture
 GLuint _render_mask_tex; // for the masking modes even-odd-{rows,columns}, checkerboard
- // OpenGL Viewport for drawing the video frame
- GLint _viewport[4];
+ // OpenGL viewports for drawing the two views of the video frame
+ GLint _viewport[2][4];
 
 private:
 // Step 1: initialize/deinitialize, and check if reinitialization is necessary
@@ -78,10 +89,18 @@
 void render_init();
 void render_deinit();
 bool render_is_compatible();
- // Compute screen pixel aspect ratio
- float screen_pixel_aspect_ratio();
+
+ // Update the subtitle texture with the given subtitle and according to the
+ // current video display width and height.
+ void update_subtitle_tex(int index, const video_frame &frame, const subtitle_box &subtitle, const parameters &params);
 
 protected:
+ // Get total size of the video display area. For single window output, this
+ // is the same as the current viewport. The Equalizer video output can override
+ // this function.
+ virtual int video_display_width();
+ virtual int video_display_height();
+
 virtual void make_context_current() = 0; // Make sure our OpenGL context is current
 virtual bool context_is_stereo() = 0; // Is our current OpenGL context a stereo context?
 virtual void recreate_context(bool stereo) = 0; // Recreate an OpenGL context and make it current
@@ -93,15 +112,14 @@
 bool need_redisplay_on_move(); // Whether we need to redisplay if the video area moved
 
 /* Display the current frame.
- * First version: This version is used by Equalizer, which needs to set some special properties.
- * Second version: This version is called by the player which knows the current params.
- * Third version: This version is used to redisplay the current frame, e.g. for repaint events.
+ * The first version is used by Equalizer, which needs to set some special properties.
+ * The second version is for everyone else.
 * TODO: This function needs to handle interlaced frames! */
- void display_current_frame(bool mono_right_instead_of_left,
- float x, float y, float w, float h, const GLint viewport[4]);
+ void display_current_frame(bool keep_viewport, bool mono_right_instead_of_left,
+ float x, float y, float w, float h, const GLint viewport[2][4]);
 void display_current_frame()
 {
- display_current_frame(false, -1.0f, -1.0f, 2.0f, 2.0f, _viewport);
+ display_current_frame(false, false, -1.0f, -1.0f, 2.0f, 2.0f, _viewport);
 }
 
 public:
@@ -123,12 +141,11 @@
 /* Get screen properties (fixed) */
 virtual int screen_width() = 0; // in pixels
 virtual int screen_height() = 0; // in pixels
- virtual float screen_aspect_ratio() = 0; // refers to actual ar (pixels may be non-square)
+ virtual float screen_pixel_aspect_ratio() = 0; // the aspect ratio of a pixel on screen
 
 /* Get current video area properties */
 virtual int width() = 0; // in pixels
 virtual int height() = 0; // in pixels
- virtual float aspect_ratio() = 0; // refers to actual ar (pixels may be non-square)
 virtual int pos_x() = 0; // in pixels
 virtual int pos_y() = 0; // in pixels
 
@@ -145,7 +162,7 @@
 virtual void process_events() = 0;
 
 /* Prepare a new frame for display. */
- void prepare_next_frame(const video_frame &frame);
+ void prepare_next_frame(const video_frame &frame, const subtitle_box &subtitle);
 /* Switch to the next frame (make it the current one) */
 void activate_next_frame();
 /* Set display parameters. */

bino-0.9.2.tar.bz2/src/video_output_qt.cpp -> bino-0.9.3.tar.bz2/src/video_output_qt.cpp Changed

@@ -4,6 +4,7 @@
 * Copyright (C) 2010-2011
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <frederic.devernay@inrialpes.fr>
+ * Joe <cuchac@email.cz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -38,6 +39,9 @@
 #include <QMessageBox>
 #include <QPalette>
 
+#include "gettext.h"
+#define _(string) gettext(string)
+
 #include "exc.h"
 #include "msg.h"
 #include "str.h"
@@ -77,9 +81,9 @@
 }
 catch (std::exception &e)
 {
- QMessageBox::critical(this, "Error", e.what());
+ QMessageBox::critical(this, _("Error"), e.what());
 // Disable further output and stop the player
- _vo->prepare_next_frame(video_frame());
+ _vo->prepare_next_frame(video_frame(), subtitle_box());
 _vo->activate_next_frame();
 _vo->send_cmd(command::toggle_play);
 }
@@ -108,7 +112,7 @@
 case Qt::Key_Q:
 _vo->send_cmd(command::toggle_play);
 break;
- case Qt::Key_S:
+ case Qt::Key_E:
 _vo->send_cmd(command::toggle_stereo_mode_swap);
 break;
 case Qt::Key_F:
@@ -127,6 +131,9 @@
 case Qt::Key_A:
 _vo->send_cmd(command::cycle_audio_stream);
 break;
+ case Qt::Key_S:
+ _vo->send_cmd(command::cycle_subtitle_stream);
+ break;
 case Qt::Key_1:
 _vo->send_cmd(command::adjust_contrast, -0.05f);
 break;
@@ -248,7 +255,6 @@
 {
 _container_widget = new video_container_widget(NULL);
 }
- _format.setAlpha(true);
 _format.setDoubleBuffer(true);
 if (!benchmark)
 {
@@ -282,18 +288,18 @@
 GLenum err = glewInit();
 if (err != GLEW_OK)
 {
- throw exc(std::string("Cannot initialize GLEW: ")
- + reinterpret_cast<const char *>(glewGetErrorString(err)));
+ throw exc(str::asprintf(_("Cannot initialize GLEW: %s"),
+ reinterpret_cast<const char *>(glewGetErrorString(err))));
 }
 if (!glewIsSupported("GL_VERSION_2_1 GL_EXT_framebuffer_object"))
 {
- throw exc(std::string("This OpenGL implementation does not support "
- "OpenGL 2.1 and framebuffer objects."));
+ throw exc(std::string(_("This OpenGL implementation does not support "
+ "OpenGL 2.1 and framebuffer objects.")));
 }
 }
 catch (std::exception &e)
 {
- QMessageBox::critical(_widget, "Error", e.what());
+ QMessageBox::critical(_widget, _("Error"), e.what());
 abort();
 }
 video_output::init();
@@ -320,8 +326,7 @@
 {
 _widget = new video_output_qt_widget(this, _format, _container_widget);
 QObject::connect(_container_widget, SIGNAL(move_event()), _widget, SLOT(move_event()));
- if ((_format.alpha() && !_widget->format().alpha())
- || (_format.doubleBuffer() && !_widget->format().doubleBuffer())
+ if ((_format.doubleBuffer() && !_widget->format().doubleBuffer())
 || (_format.stereo() && !_widget->format().stereo()))
 {
 try
@@ -329,17 +334,17 @@
 if (_format.stereo())
 {
 // Common failure: display does not support quad buffered stereo
- throw exc("The display does not support OpenGL stereo mode.");
+ throw exc(_("The display does not support OpenGL stereo mode."));
 }
 else
 {
 // Should never happen
- throw exc("Cannot set GL context format.");
+ throw exc(_("Cannot set OpenGL context format."));
 }
 }
 catch (std::exception &e)
 {
- QMessageBox::critical(_widget, "Error", e.what());
+ QMessageBox::critical(_widget, _("Error"), e.what());
 abort();
 }
 }
@@ -384,7 +389,10 @@
 {
 _container_widget->set_recommended_size(w, h);
 _container_widget->updateGeometry();
- _container_widget->window()->adjustSize();
+ if (!_container_is_external)
+ {
+ _container_widget->adjustSize();
+ }
 }
 
 void video_output_qt::mouse_set_pos(float dest)
@@ -428,10 +436,19 @@
 return QApplication::desktop()->screenGeometry().height();
 }
 
-float video_output_qt::screen_aspect_ratio()
+float video_output_qt::screen_pixel_aspect_ratio()
 {
- return static_cast<float>(QApplication::desktop()->widthMM())
- / static_cast<float>(QApplication::desktop()->heightMM());
+ float screen_pixel_ar =
+ static_cast<float>(QApplication::desktop()->logicalDpiY())
+ / static_cast<float>(QApplication::desktop()->logicalDpiX());
+ if (std::fabs(screen_pixel_ar - 1.0f) < 0.03f)
+ {
+ // This screen most probably has square pixels, and the difference to 1.0
+ // is only due to slightly inaccurate measurements and rounding. Force
+ // 1.0 so that the user gets expected results.
+ screen_pixel_ar = 1.0f;
+ }
+ return screen_pixel_ar;
 }
 
 int video_output_qt::width()
@@ -444,12 +461,6 @@
 return _widget->height();
 }
 
-float video_output_qt::aspect_ratio()
-{
- return static_cast<float>(_widget->widthMM())
- / static_cast<float>(_widget->heightMM());
-}
-
 int video_output_qt::pos_x()
 {
 return _widget->mapToGlobal(QPoint(0, 0)).x();

bino-0.9.2.tar.bz2/src/video_output_qt.h -> bino-0.9.3.tar.bz2/src/video_output_qt.h Changed

bino-0.9.2.tar.bz2/src/video_output_render.fs.glsl -> bino-0.9.3.tar.bz2/src/video_output_render.fs.glsl Changed

@@ -45,6 +45,9 @@
 uniform sampler2D rgb_r;
 uniform float parallax;
 
+uniform sampler2D subtitle;
+uniform float subtitle_parallax;
+
 #if defined(mode_onechannel)
 uniform float channel;  // 0.0 for left, 1.0 for right
 #endif
@@ -104,12 +107,27 @@
 
 vec3 tex_l(vec2 texcoord)
 {
-    return texture2D(rgb_l, texcoord - vec2(parallax, 0.0)).rgb;
+    return texture2D(rgb_l, texcoord + vec2(parallax, 0.0)).rgb;
 }
 
 vec3 tex_r(vec2 texcoord)
 {
-    return texture2D(rgb_r, texcoord + vec2(parallax, 0.0)).rgb;
+    return texture2D(rgb_r, texcoord - vec2(parallax, 0.0)).rgb;
+}
+
+vec4 sub_l(vec2 texcoord)
+{
+    return texture2D(subtitle, vec2(texcoord.x + subtitle_parallax, 1.0 - texcoord.y));
+}
+
+vec4 sub_r(vec2 texcoord)
+{
+    return texture2D(subtitle, vec2(texcoord.x - subtitle_parallax, 1.0 - texcoord.y));
+}
+
+vec3 blend_subtitle(vec3 rgb, vec4 sub)
+{
+    return mix(rgb, sub.rgb, sub.a);
 }
 
 void main()
@@ -118,9 +136,9 @@
 
 #if defined(mode_onechannel)
 
-    vec3 rgbc_l = tex_l(gl_TexCoord[0].xy);
-    vec3 rgbc_r = tex_r(gl_TexCoord[0].xy);
-    srgb = rgb_to_srgb(ghostbust(mix(rgbc_l, rgbc_r, channel), mix(rgbc_r, rgbc_l, channel)));
+    vec3 l = blend_subtitle(tex_l(gl_TexCoord[0].xy), sub_l(gl_TexCoord[0].xy));
+    vec3 r = blend_subtitle(tex_r(gl_TexCoord[0].xy), sub_r(gl_TexCoord[0].xy));
+    srgb = rgb_to_srgb(ghostbust(mix(l, r, channel), mix(r, l, channel)));
 
 #elif defined(mode_even_odd_rows) || defined(mode_even_odd_columns) || defined(mode_checkerboard)
 
@@ -169,7 +187,9 @@
     vec3 rgb4_r = tex_r(gl_TexCoord[0].xy + vec2(0.0, step_y));
     vec3 rgbc_r = (rgb0_r + rgb1_r + 4.0 * rgb2_r + rgb3_r + rgb4_r) / 8.0;
 # endif
-    srgb = rgb_to_srgb(ghostbust(mix(rgbc_r, rgbc_l, m), mix(rgbc_l, rgbc_r, m)));
+    vec3 rgbcs_l = blend_subtitle(rgbc_l, sub_l(gl_TexCoord[0].xy));
+    vec3 rgbcs_r = blend_subtitle(rgbc_r, sub_r(gl_TexCoord[0].xy));
+    srgb = rgb_to_srgb(ghostbust(mix(rgbcs_r, rgbcs_l, m), mix(rgbcs_l, rgbcs_r, m)));
 
 #elif defined(mode_red_cyan_dubois) || defined(mode_green_magenta_dubois) || defined(mode_amber_blue_dubois)
 
@@ -178,8 +198,8 @@
     // This method depends on the characteristics of the display device and the anaglyph glasses.
     // According to the author, the matrices below are intended to be applied to linear RGB values,
     // and are designed for CRT displays.
-    vec3 l = tex_l(gl_TexCoord[0].xy);
-    vec3 r = tex_r(gl_TexCoord[0].xy);
+    vec3 l = blend_subtitle(tex_l(gl_TexCoord[0].xy), sub_l(gl_TexCoord[0].xy));
+    vec3 r = blend_subtitle(tex_r(gl_TexCoord[0].xy), sub_r(gl_TexCoord[0].xy));
 # if defined(mode_red_cyan_dubois)
     // Source of this matrix: http://www.site.uottawa.ca/~edubois/anaglyph/LeastSquaresHowToPhotoshop.pdf
     mat3 m0 = mat3(
@@ -215,8 +235,8 @@
 
 #else // lower quality anaglyph methods
 
-    vec3 l = rgb_to_srgb(tex_l(gl_TexCoord[0].xy));
-    vec3 r = rgb_to_srgb(tex_r(gl_TexCoord[0].xy));
+    vec3 l = rgb_to_srgb(blend_subtitle(tex_l(gl_TexCoord[0].xy), sub_l(gl_TexCoord[0].xy)));
+    vec3 r = rgb_to_srgb(blend_subtitle(tex_r(gl_TexCoord[0].xy), sub_r(gl_TexCoord[0].xy)));
 # if defined(mode_red_cyan_monochrome)
     srgb = vec3(srgb_to_lum(l), srgb_to_lum(r), srgb_to_lum(r));
 # elif defined(mode_red_cyan_half_color)

bino-0.9.2.tar.bz2/src/xgl.cpp -> bino-0.9.3.tar.bz2/src/xgl.cpp Changed

@@ -24,6 +24,9 @@
 
 #include <GL/glew.h>
 
+#include "gettext.h"
+#define _(string) gettext(string)
+
 #include "dbg.h"
 #include "exc.h"
 #include "str.h"
@@ -194,7 +197,7 @@
 break;
 }
 std::string pfx = (where.length() > 0 ? where + ": " : "");
- throw exc(pfx + "OpenGL FBO error " + errstr + ".");
+ throw exc(pfx + str::asprintf(_("OpenGL FBO error %s."), errstr.c_str()));
 return false;
 }
 return true;
@@ -211,7 +214,7 @@
 if (e != GL_NO_ERROR)
 {
 std::string pfx = (where.length() > 0 ? where + ": " : "");
- throw exc(pfx + "OpenGL error " + str::asprintf("0x%04X.", static_cast<unsigned int>(e)));
+ throw exc(pfx + str::asprintf(_("OpenGL error 0x%04X."), static_cast<unsigned int>(e)));
 // Don't use gluErrorString(e) here to avoid depending on libGLU just for this
 return false;
 }
@@ -243,11 +246,20 @@
 type == GL_VERTEX_SHADER ? "vertex" : type == GL_GEOMETRY_SHADER_EXT ? "geometry" : "fragment",
 name.c_str());
 
+ // XXX: Work around a bad bad bug in the free OpenGL drivers for ATI cards on Ubuntu
+ // 10.10: the compilation of shader source depends on the locale, and gives wrong
+ // results e.g. in de_DE.UTF-8. So we backup the locale, set it to "C", and restore
+ // the backup after compilation.
+ std::string locale_backup = setlocale(LC_ALL, NULL);
+ setlocale(LC_ALL, "C");
+
 GLuint shader = glCreateShader(type);
 const GLchar *glsrc = src.c_str();
 glShaderSource(shader, 1, &glsrc, NULL);
 glCompileShader(shader);
 
+ setlocale(LC_ALL, locale_backup.c_str());
+
 std::string log;
 GLint e, l;
 glGetShaderiv(shader, GL_COMPILE_STATUS, &e);
@@ -267,18 +279,22 @@
 
 if (e == GL_TRUE && log.length() > 0)
 {
- msg::wrn("OpenGL %s shader '%s': compiler warning:",
- type == GL_VERTEX_SHADER ? "vertex" : type == GL_GEOMETRY_SHADER_EXT ? "geometry" : "fragment",
+ msg::wrn(_("OpenGL %s '%s': compiler warning:"),
+ type == GL_VERTEX_SHADER ? _("vertex shader")
+ : type == GL_GEOMETRY_SHADER_EXT ? _("geometry shader")
+ : _("fragment shader"),
 name.c_str());
 msg::wrn_txt("%s", log.c_str());
 }
 else if (e != GL_TRUE)
 {
- std::string when = str::asprintf("OpenGL %s shader '%s': compilation failed.",
- type == GL_VERTEX_SHADER ? "vertex" : type == GL_GEOMETRY_SHADER_EXT ? "geometry" : "fragment",
+ std::string when = str::asprintf(_("OpenGL %s '%s': compilation failed."),
+ type == GL_VERTEX_SHADER ? _("vertex shader")
+ : type == GL_GEOMETRY_SHADER_EXT ? _("geometry shader")
+ : _("fragment shader"),
 name.c_str());
- std::string what = str::asprintf("\n%s", log.length() > 0 ? log.c_str() : "unknown error");
- throw exc(when + ": " + what);
+ std::string what = str::asprintf("\n%s", log.length() > 0 ? log.c_str() : _("unknown error"));
+ throw exc(str::asprintf(_("%s: %s"), when.c_str(), what.c_str()));
 }
 return shader;
 }
@@ -338,13 +354,13 @@
 
 if (e == GL_TRUE && log.length() > 0)
 {
- msg::wrn("OpenGL program '%s': linker warning:", name.c_str());
+ msg::wrn(_("OpenGL program '%s': linker warning:"), name.c_str());
 msg::wrn_txt("%s", log.c_str());
 }
 else if (e != GL_TRUE)
 {
- std::string when = str::asprintf("OpenGL program '%s': linking failed.", name.c_str());
- std::string what = str::asprintf("\n%s", log.length() > 0 ? log.c_str() : "unknown error");
+ std::string when = str::asprintf(_("OpenGL program '%s': linking failed."), name.c_str());
+ std::string what = str::asprintf("\n%s", log.length() > 0 ? log.c_str() : _("unknown error"));
 throw exc(when + ": " + what);
 }
 }

Changes of Revision 5