Packman Build Service PMBS

Changes of Revision 5

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.
+
+ Makefile.am | 2 +-
+ README.Windows | 2 +-
+ pkg/w32/bino.nsi | 7 +++++++
+ pkg/w32/notes.txt | 2 +-
+ src/main.cpp | 33 ++++++++++++++++++++++++++++++++-
+ 5 files changed, 42 insertions(+), 4 deletions(-)
+
+commit b623d305602e7c335350a4689f3f555e5016cc16
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-11 06:57:18 +0200
+
+ Add gettext infrastructure and german translation.
+
+ .gitignore | 2 +
+ ABOUT-NLS | 2 +
+ Makefile.am | 4 +-
+ configure.ac | 8 +-
+ m4/gettext.m4 | 383 ++++++++++++++
+ m4/iconv.m4 | 214 ++++++++
+ m4/lib-ld.m4 | 110 ++++
+ m4/lib-link.m4 | 774 +++++++++++++++++++++++++++
+ m4/lib-prefix.m4 | 224 ++++++++
+ m4/nls.m4 | 32 ++
+ m4/po.m4 | 449 ++++++++++++++++
+ m4/progtest.m4 | 92 ++++
+ po/LINGUAS | 2 +
+ po/Makefile.in.in | 444 ++++++++++++++++
+ po/Makevars | 41 ++
+ po/POTFILES.in | 24 +
+ po/Rules-quot | 47 ++
+ po/boldquot.sed | 10 +
+ po/de.po | 1267 +++++++++++++++++++++++++++++++++++++++++++++
+ po/en@boldquot.header | 25 +
+ po/en@quot.header | 22 +
+ po/insert-header.sin | 23 +
+ po/quot.sed | 6 +
+ po/remove-potcdate.sin | 19 +
+ src/Makefile.am | 7 +-
+ src/audio_output.cpp | 35 +-
+ src/base/dbg.cpp | 9 +-
+ src/base/exc.cpp | 9 +-
+ src/base/gettext.h | 280 ++++++++++
+ src/base/opt.cpp | 25 +-
+ src/base/str.cpp | 15 +-
+ src/base/thread.cpp | 17 +-
+ src/base/timer.cpp | 19 +-
+ src/lib_versions.cpp | 11 +-
+ src/main.cpp | 195 ++++----
+ src/media_data.cpp | 11 +-
+ src/media_input.cpp | 21 +-
+ src/media_object.cpp | 69 ++-
+ src/player.cpp | 23 +-
+ src/player_equalizer.cpp | 31 +-
+ src/player_qt.cpp | 343 ++++++------
+ src/subtitle_renderer.cpp | 11 +-
+ src/video_output.cpp | 7 +-
+ src/video_output_qt.cpp | 21 +-
+ src/xgl.cpp | 38 +-
+ 45 files changed, 4996 insertions(+), 425 deletions(-)
+
+commit aab135dd4ff16e7e6598275f47491f8c52647f6c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-10 13:08:49 +0200
+
+ GUI: add big friendly OK buttons to all dialogs.
+
+ src/player_qt.cpp | 30 +++++++++++++++++++++++-------
+ 1 files changed, 23 insertions(+), 7 deletions(-)
+
+commit b0ef87212703c16eec79156d29a44249b30cc4ec
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-10 12:56:30 +0200
+
+ Media input: add total number of streams to stream names.
+ 
+ ... if more than one stream is present.
+
+ src/media_input.cpp | 12 +++++++++---
+ 1 files changed, 9 insertions(+), 3 deletions(-)
+
+commit 0b88e72509f742e3a455aeb69d6cd0ba059c8315
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-10 12:56:04 +0200
+
+ Media data: add language information to audio blobs.
+
+ src/media_data.cpp | 10 +++++++---
+ src/media_data.h | 3 +++
+ src/media_object.cpp | 5 +++++
+ 3 files changed, 15 insertions(+), 3 deletions(-)
+
+commit 496716884c7a787aedd7eb57d0e57bf59ca4b742
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-10 12:49:33 +0200
+
+ Media data: remove subtitle format from subtitle info/name.
+ 
+ The subtitle format is not part of the content description. It is just a
+ description of the data format of an individual subtitle box. So remove
+ it from the media object template and the info and name.
+
+ src/media_data.cpp | 52 ++++---------------------------------------------
+ src/media_data.h | 2 +-
+ src/media_object.cpp | 1 -
+ 3 files changed, 6 insertions(+), 49 deletions(-)
+
+commit 21756c10ba2845fdb9cfcc569e2b78c5464791da
+Author: Joe <cuchac@email.cz>
+Date: 2011-04-10 12:13:47 +0200
+
+ Media object: add support for CODEC_ID_TEXT subtitles.
+
+ src/media_object.cpp | 49 +++++++++++++++++++++++++++++++++++++++++--------
+ 1 files changed, 41 insertions(+), 8 deletions(-)
+
+commit 4c519726ca10d53c2af62e7040941281747ddd74
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-09 22:24:02 +0200
+
+ GUI: Improve remembering of per-video settings.
+
+ src/player_qt.cpp | 13 +++++++++----
+ 1 files changed, 9 insertions(+), 4 deletions(-)
+
+commit 36d569c6550bd867c0a2aea34fd8266514e84710
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-09 20:55:03 +0200
+
+ Prepend stream numbers to stream names.
+ 
+ These are independent of the media object and hopefully less confusing.
+
+ src/media_input.cpp | 21 +++++++++++++++++++++
+ 1 files changed, 21 insertions(+), 0 deletions(-)
+
+commit cc51972b9cab9a2d617774fd8d14c802a2fd48fc
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-09 20:48:18 +0200
+
+ Media data: minor improvement for audio channel names.
+
+ src/media_data.cpp | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit d53d11e305fb50e2236d10f4b0ba75bd5cc0dc26
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-09 20:36:21 +0200
+
+ Media input: remove prefixes from stream names.
+ 
+ They were confusing instead of helpful.
+
+ src/media_input.cpp | 21 ++++++---------------
+ 1 files changed, 6 insertions(+), 15 deletions(-)
+
+commit f34b1a0ee30955d4608d7249b3c4b7785deb14d0
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-09 17:57:06 +0200
+
+ Update Windows build instructions and package file.
+
+ README.Windows | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++---
+ pkg/w32/notes.txt | 2 +
+ 2 files changed, 94 insertions(+), 5 deletions(-)
+
+commit f6a8d638a6a5a8428672f89c1fac786ecd3153aa
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-09 17:45:21 +0200
+
+ Port subtitle rendering to Windows.
+
+ src/subtitle_renderer.cpp | 66 +++++++++++++++++++++++++++++++++++++++++++-
+ src/subtitle_renderer.h | 2 +
+ 2 files changed, 66 insertions(+), 2 deletions(-)
+
+commit 0aa7a523402ee10ef67c2a88f2fb850631b911ec
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-09 16:26:12 +0200
+
+ configure.ac: find iconv also in external libiconv.
+
+ configure.ac | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 62aea2db79ca63b0e86f75601a9d31b9f4995fa3
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-09 16:25:22 +0200
+
+ Do not report LibASS version.
+ 
+ The meaning of LIBASS_VERSION is entirely unclear (to me).
+
+ src/lib_versions.cpp | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 6a8a72792ad908bba30d678398e6ba6f6d4a64be
+Author: Joe <cuchac@email.cz>
+Date: 2011-04-09 15:40:51 +0200
+
+ Add subtitle character set conversion support.
+
+ src/controller.h | 2 +
+ src/media_data.cpp | 7 +++
+ src/media_data.h | 1 +
+ src/player.cpp | 8 +++
+ src/player_qt.cpp | 116 +++++++++++++++++++++++++++++++++++++++++---
+ src/player_qt.h | 5 ++
+ src/subtitle_renderer.cpp | 17 ++++++-
+ src/video_output.cpp | 1 +
+ 8 files changed, 147 insertions(+), 10 deletions(-)
+
+commit 230bd9322a8e12e4e7fcc2a69f69f5d16a6d6556
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-09 13:51:53 +0200
+
+ Re-add character set conversion to the base module str.
+ 
+ This was previously removed in 429a99371dfea98db8cf280892fa4933f888cb23 because
+ it was not used, but we will need it for subtitle character set conversion. If
+ portability problems with iconv show up, we'll deal with them then.
+
+ configure.ac | 1 +
+ src/base/str.cpp | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/base/str.h | 3 ++
+ 3 files changed, 63 insertions(+), 0 deletions(-)
+
+commit 47284673757234d79d344d87d07b298fec8a1c47
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-09 11:21:32 +0200
+
+ Add informational note to subtitle dialog.
+
+ src/player_qt.cpp | 19 +++++++++++--------
+ 1 files changed, 11 insertions(+), 8 deletions(-)
+
+commit 3409f623c0573abd7226725cc82c15d6e3c00038
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-09 11:16:44 +0200
+
+ Media object: work around FFmpeg bug w.r.t. ASS subtitle durations.
+
+ src/media_object.cpp | 22 ++++++++++++++++++++++
+ 1 files changed, 22 insertions(+), 0 deletions(-)
+
+commit 78ef2408c21f6b928ae2781afb61f1140a7ba24c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-09 11:00:40 +0200
+
+ Fix subtitle stream selection.
+
+ src/player.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 472b970807f0c22a28942b118cd24a009cb186da
+Author: Joe <cuchac@email.cz>
+Date: 2011-04-09 10:08:42 +0200
+
+ Make subtitle appearance configurable.
+
+ src/controller.h | 41 +++++-
+ src/media_data.cpp | 37 +++++-
+ src/media_data.h | 5 +
+ src/player.cpp | 65 ++++++++--
+ src/player.h | 1 +
+ src/player_qt.cpp | 326 ++++++++++++++++++++++++++++++++++++++++++++-
+ src/player_qt.h | 38 ++++++
+ src/subtitle_renderer.cpp | 52 ++++++-
+ src/subtitle_renderer.h | 12 ++-
+ src/video_output.cpp | 22 ++-
+ src/video_output.h | 3 +-
+ 11 files changed, 564 insertions(+), 38 deletions(-)
+
+commit 8c9e30133602018b538f6a76ebd32addd1ab6d62
+Author: Joe <cuchac@email.cz>
+Date: 2011-04-08 22:01:34 +0200
+
+ Make subtitle streams selectable via keyboard and GUI.
+
+ doc/bino.1 | 6 +++-
+ doc/bino.texi | 6 +++-
+ src/controller.h | 4 +++
+ src/main.cpp | 7 +++--
+ src/media_input.cpp | 9 +++++--
+ src/media_input.h | 3 +-
+ src/player.cpp | 34 +++++++++++++++++++++++++++++
+ src/player_equalizer.cpp | 8 ++++++-
+ src/player_qt.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++++-
+ src/player_qt.h | 4 +++
+ src/video_output_qt.cpp | 5 +++-
+ 11 files changed, 125 insertions(+), 15 deletions(-)
+
+commit daf0018df0afd3c12945fbb94dc6b9e074119aad
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-08 15:49:33 +0200
+
+ Video output: remove remaining references to alpha framebuffers.
+ 
+ Now that we have subtitle support, it is clear that we will not need an alpha
+ channel in the framebuffer (even if we add an on-screen-display in the future).
+
+ src/video_output_qt.cpp | 8 +-------
+ 1 files changed, 1 insertions(+), 7 deletions(-)
+
+commit b1de160f82d4517375b78065ee8c743918d82942
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-08 15:44:15 +0200
+
+ Equalizer: add support for subtitles.
+
+ src/media_data.cpp | 65 ++++++++++++++++++++++++++++++++++++++++++++++
+ src/media_data.h | 14 ++++++++--
+ src/player_equalizer.cpp | 43 ++++++++++++++++++++++++-----
+ 3 files changed, 111 insertions(+), 11 deletions(-)
+
+commit 51678d049ea56c735efba2afca8f77b65f795eba
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-08 15:30:39 +0200
+
+ Equalizer: make context current in eq_channel outside of frameDraw().
+
+ src/player_equalizer.cpp | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit a8ce1bf402c83b62ee7a3a8e15dc11a2a0f45e6c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-08 15:29:15 +0200
+
+ Equalizer: minor comment improvements.
+
+ src/player_equalizer.cpp | 7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 2ec716acf471c88e1b042bdad5147151e04fe108
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-08 15:28:02 +0200
+
+ Equalizer: move prepare_next_frame() from node to channel.
+
+ src/player_equalizer.cpp | 18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+commit 01bb1d5a6818d05d45592fd8a0b996a71dd2c34d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-08 13:53:44 +0200
+
+ Equalizer: move the video_output class from eq::Window to eq::Channel.
+ 
+ This is because some virtual functions can really only be implemented on
+ channel level (e.g. screen_pixel_aspect_ratio, video_display_width, ...).
+
+ src/player_equalizer.cpp | 112 ++++++++++++++++++++++++++-------------------
+ src/video_output.cpp | 4 +-
+ src/video_output.h | 12 +++---
+ 3 files changed, 73 insertions(+), 55 deletions(-)
+
+commit 94d8cb8d6a7125eeb0e2e24b925cb65bc1c311e5
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-08 12:18:04 +0200
+
+ Equalizer: remove unused and misleading code.
+
+ src/player_equalizer.cpp | 9 +--------
+ 1 files changed, 1 insertions(+), 8 deletions(-)
+
+commit 7bb2fe24ca145353af9efd62f9a89230ea1673a6
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-08 12:17:35 +0200
+
+ Video output: only check subtitle render size if it is valid.
+
+ src/video_output.cpp | 22 +++++++++++++---------
+ 1 files changed, 13 insertions(+), 9 deletions(-)
+
+commit 380f0057240a5d7ce8d5321ed157b509f01351d0
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-07 18:15:28 +0200
+
+ Remove forgotten debugging output.
+
+ src/video_output.cpp | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit e16200318a08af03e616dbb2a0c93c48d7bfb863
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-07 18:14:37 +0200
+
+ Fix animated subtitles: rerender subtitle for each frame.
+
+ src/media_data.h | 7 +++++
+ src/video_output.cpp | 66 ++++++++++++++++++++++++++++----------------------
+ src/video_output.h | 11 ++++----
+ 3 files changed, 50 insertions(+), 34 deletions(-)
+
+commit acdeea9c9a7937045ba09a42ff5b80ad8e67d595
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-07 17:44:52 +0200
+
+ Subtitles: update only the required part of the subtitle texture.
+ 
+ This clears the subtitle texture in GL, and uploads only the bounding box of
+ the current subtitle to the texture, which should be much faster in the common
+ case because subtitles fill only a small part of the screen.
+
+ src/subtitle_renderer.cpp | 218 +++++++++++++++++++++++++++++++++------------
+ src/subtitle_renderer.h | 45 ++++++++--
+ src/video_output.cpp | 64 +++++++++-----
+ src/video_output.h | 1 +
+ 4 files changed, 242 insertions(+), 86 deletions(-)
+
+commit 363f4efb1247bb4712f7dd184cb77cbf3dac086c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-07 07:08:20 +0200
+
+ Subtitle renderer: use video frame timestamp for rendering.
+ 
+ Using the subtitle timestamp was a hack that only worked for static subtitles.
+ Now, animated subtitles should work correctly.
+
+ src/subtitle_renderer.cpp | 8 ++++----
+ src/subtitle_renderer.h | 5 +++--
+ src/video_output.cpp | 2 +-
+ 3 files changed, 8 insertions(+), 7 deletions(-)
+
+commit 544b3ad9df33580972ae593e627f6e32f724d8d0
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-07 07:03:52 +0200
+
+ Add support for bitmap subtitles.
+ 
+ These are mainly found on DVD video.
+
+ src/media_data.cpp | 9 +++-
+ src/media_data.h | 26 ++++++++---
+ src/media_object.cpp | 20 ++++++--
+ src/subtitle_renderer.cpp | 112 ++++++++++++++++++++++++++++++++-------------
+ src/subtitle_renderer.h | 7 ++-
+ src/video_output.cpp | 19 ++++++--
+ src/video_output.h | 2 +-
+ 7 files changed, 142 insertions(+), 53 deletions(-)
+
+commit 5308c20b3f650281117c2f7df923327493c1f615
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-05 21:48:06 +0200
+
+ Subtitle renderer: use font-native hinting by default.
+
+ src/subtitle_renderer.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d3ec16e016ffc7500d10d69d4607f36cdfc7772b
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-05 21:30:35 +0200
+
+ Fix and improve subtitle rendering.
+ 
+ - Always render subtitles in video display resolution, not in video frame
+ resolution. This avoids ugly resizing of rendered text, especially
+ noticable for videos using the left-right-half or similar stereo layouts.
+ You can now even resize the video window in pause mode and see the
+ subtitle getting re-rendered so that it appears as clean as possible.
+ 
+ - Fix aspect ratio of subtitles for screens with non-square pixels.
+ 
+ - Fix overflow errors in subtitle_renderer::blend_ass_image() that
+ resulted in wrong color and alpha values.
+
+ src/Makefile.am | 2 -
+ src/subtitle_renderer.cpp | 44 +++++------
+ src/subtitle_renderer.h | 10 +-
+ src/video_output.cpp | 157 +++++++++++++++++++++++-------------
+ src/video_output.h | 14 +++-
+ src/video_output_render.fs.glsl | 36 +++++++--
+ src/video_output_subtitle.fs.glsl | 49 ------------
+ 7 files changed, 167 insertions(+), 145 deletions(-)
+
+commit 06cc1e308aaffad984f854ccf30a2a4d660eb930
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-05 06:10:10 +0200
+
+ Subtitle renderer: fix subtitle aspect ratio.
+
+ src/subtitle_renderer.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 193be6cddf702e07b9df165f71b5b9ca051d24e0
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-04 21:19:11 +0200
+
+ Video output: fix blending of subtitles.
+
+ src/video_output.cpp | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit a69f41e8d4a1ef95c8241bb582b7f560dc44c4f4
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-04 20:18:34 +0200
+
+ Video output: use shader to render subtitle.
+ 
+ This allows to convert the subtitle colors to SRGB, which is necessary because
+ we render them onto an SRGB texture.
+
+ src/Makefile.am | 2 +
+ src/video_output.cpp | 18 ++++++++++++-
+ src/video_output.h | 1 +
+ src/video_output_subtitle.fs.glsl | 49 +++++++++++++++++++++++++++++++++++++
+ 4 files changed, 68 insertions(+), 2 deletions(-)
+
+commit a716ac9c367089bbe1f2e78fa4d172ef0c42faa4
+Author: Joe <cuchac@email.cz>
+Date: 2011-04-04 19:57:11 +0200
+
+ Add appropriate copyright information.
+
+ src/main.cpp | 1 +
+ src/media_input.cpp | 2 +-
+ src/media_input.h | 2 +-
+ src/media_object.cpp | 2 +-
+ src/media_object.h | 2 +-
+ src/player.cpp | 1 +
+ src/player.h | 1 +
+ src/video_output.cpp | 1 +
+ src/video_output.h | 1 +
+ src/video_output_qt.cpp | 1 +
+ 10 files changed, 10 insertions(+), 4 deletions(-)
+
+commit d9e52fe84875df0e903bade75624b0308aaf63dd
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-04 12:59:46 +0200
+
+ Require FFmpeg >= 0.6.90-rc0.
+
+ configure.ac | 8 ++++----
+ src/media_object.cpp | 15 +++++----------
+ 2 files changed, 9 insertions(+), 14 deletions(-)
+
+commit 84b3c000f0373f0da70bdc707bd5b8add0e5b592
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-04 05:55:40 +0200
+
+ Subtitle renderer: minor fix for plain text subtitles.
+
+ src/subtitle_renderer.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit df1af1e60ae53d25138e0edfcaef8ce49fe6da44
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-04 05:43:31 +0200
+
+ Subtitle renderer: do not needlessly set parameters.
+ 
+ Unchanging parameters are now only set once during initialization,
+ and parameter defaults are not explicitly set anymore.
+
+ src/subtitle_renderer.cpp | 6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+commit 49804e30c3bfa6de741ef5a9d0d8d7d6d75b52f8
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-04 05:35:32 +0200
+
+ Subtitle renderer: fix aspect ratio of subtitles.
+ 
+ This sets the aspect ratio of subtitles to the aspect ratio of the video frame,
+ so that subtitles do not appear stretched e.g. for left-right-half videos.
+
+ src/subtitle_renderer.cpp | 11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 71b76b46c800df3c87e5f247d9211bb6b76f84e6
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-03 21:26:22 +0200
+
+ Video output: slightly simplify subtitle texture rendering.
+
+ src/video_output.cpp | 34 ++++++++++++++++------------------
+ 1 files changed, 16 insertions(+), 18 deletions(-)
+
+commit 3df15087ef08c69e1394699028c1fffd7914ee0d
+Author: Joe <cuchac@email.cz>
+Date: 2011-04-03 21:23:08 +0200
+
+ Media input: ignore subtitle streams when computing duration.
+
+ src/media_input.cpp | 9 +--------
+ 1 files changed, 1 insertions(+), 8 deletions(-)
+
+commit c50a7a25af70691dd7bbec02db9e56172f55d23e
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-03 21:20:42 +0200
+
+ Subtitle renderer: use bgra32 format, for consistency.
+
+ src/subtitle_renderer.cpp | 27 ++++++++++++++-------------
+ src/subtitle_renderer.h | 6 +++---
+ src/video_output.cpp | 2 +-
+ 3 files changed, 18 insertions(+), 17 deletions(-)
+
+commit 3bbd06f360d4446ab02bdd7dd0bfb8697f2d8f36
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-03 18:34:05 +0200
+
+ Subtitle renderer: add support for plain text subtitles.
+
+ src/subtitle_renderer.cpp | 20 +++++++++++++++++++-
+ 1 files changed, 19 insertions(+), 1 deletions(-)
+
+commit 7b7cde1b9818ef84cbbb0f555cccc60e1025461c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-03 18:10:52 +0200
+
+ Media object: avoid crash on closing an unsuccessfully opened file.
+
+ src/media_object.cpp | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 44e3ce23328d2c8ece48ce3dc204d7261c6fbc6e
+Author: Joe <cuchac@email.cz>
+Date: 2011-04-03 18:05:23 +0200
+
+ Add subtitle handling and rendering.
+
+ src/player.cpp | 70 ++++++++++++++++++++++++++++++++++++++++++++-
+ src/player.h | 8 ++++-
+ src/player_equalizer.cpp | 3 +-
+ src/video_output.cpp | 63 ++++++++++++++++++++++++++++++++++++++++-
+ src/video_output.h | 8 ++++-
+ src/video_output_qt.cpp | 2 +-
+ 6 files changed, 146 insertions(+), 8 deletions(-)
+
+commit 9c79430a307067d8057e153a2b4ec37034d28950
+Author: Joe <cuchac@email.cz>
+Date: 2011-04-03 18:03:50 +0200
+
+ Add subtitle decoding support, initially for text and ASS subtitles.
+
+ AUTHORS | 1 +
+ doc/bino.1 | 6 +-
+ doc/bino.texi | 5 +-
+ src/main.cpp | 8 +-
+ src/media_input.cpp | 139 +++++++++++++++++-
+ src/media_input.h | 38 +++++-
+ src/media_object.cpp | 413 ++++++++++++++++++++++++++++++++++++++++++++++----
+ src/media_object.h | 34 +++-
+ 8 files changed, 594 insertions(+), 50 deletions(-)
+
+commit bed1064c5e6a691018763c941f2d94e4ddfa391b
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-03 18:01:16 +0200
+
+ Add subtitle media data type.
+
+ src/media_data.cpp | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/media_data.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 108 insertions(+), 1 deletions(-)
+
+commit 97a71015d6d13491c4e5e4ca2b8757889beb13c5
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-04-03 17:58:36 +0200
+
+ Add subtitle renderer based on LibASS.
+
+ configure.ac | 9 ++
+ src/Makefile.am | 5 +-
+ src/lib_versions.cpp | 24 ++++++
+ src/subtitle_renderer.cpp | 201 +++++++++++++++++++++++++++++++++++++++++++++
+ src/subtitle_renderer.h | 55 ++++++++++++
+ 5 files changed, 292 insertions(+), 2 deletions(-)
+
+commit ae512c212521e2caf8feb77a74a354870cc71205
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-03-31 06:38:14 +0200
+
+ Fix aspect ratio in hdmi-frame-pack output mode.
+
+ src/video_output.cpp | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 64a2d1b31018322516b8191e909f7c50f92a0eeb
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-03-29 14:49:23 +0200
+
+ Equalizer: enable mouse-based seeking.
+ 
+ The click position relative to the canvas is used to determine the destination
+ position in the stream.
+
+ src/player_equalizer.cpp | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 6b0b455b809b9f08f550df7e5ec29a95f31f8800
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-03-22 06:53:35 +0100
+
+ Equalizer: never change the viewport provided by Equalizer.
+
+ src/player_equalizer.cpp | 2 +-
+ src/video_output.cpp | 16 +++++++++-------
+ src/video_output.h | 9 ++++-----
+ 3 files changed, 14 insertions(+), 13 deletions(-)
+
+commit af263aa69c6152660747c4bfa9e123bcd9cb2318
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-03-21 21:07:16 +0100
+
+ Documentation: improve documentation of hdmi-frame-pack mode.
+ 
+ This adds a link to Daniel Fratzscher's description of the configuration of
+ HDMI frame pack mode on GNU/Linux.
+
+ doc/bino.texi | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 6b893a1e78592e502ccaff0cbf4c6bb4d4c3d32f
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-03-21 21:00:37 +0100
+
+ Fix viewports for separate-view output modes.
+ 
+ The output modes left_right, left_right_half, top_bottom, top_bottom_half, and
+ hdmi_frame_pack now use viewports that split aspect ratio borders equally
+ between the two views.
+
+ src/player_equalizer.cpp | 6 ++-
+ src/video_output.cpp | 164 +++++++++++++++++++++++++++------------------
+ src/video_output.h | 6 +-
+ 3 files changed, 106 insertions(+), 70 deletions(-)
+
+commit 6958295b09f35c6d2151984ed19c17e75cb21cb4
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-03-18 18:20:32 +0100
+
+ Add output mode hdmi-frame-pack.
+ 
+ This mode has left view top, right view bottom, plus a number of blank lines
+ separating the two. It is intended for forced HDMI 3D frame packing modes
+ 720p-3D and 1080p-3D.
+
+ doc/bino.1 | 4 +++
+ doc/bino.texi | 4 +++
+ src/main.cpp | 2 +
+ src/media_data.cpp | 7 +++++
+ src/media_data.h | 1 +
+ src/player_qt.cpp | 61 +++++++++++++++++++++++++++----------------------
+ src/video_output.cpp | 29 +++++++++++++++++++++--
+ 7 files changed, 78 insertions(+), 30 deletions(-)
+
+commit c025d2e67a533d27f1ffe33f6d5edd78307f68bb
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-03-18 09:22:37 +0100
+
+ Improve Qt video area resizing.
+
+ src/video_output_qt.cpp | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 90a267884946886a860a633632cdbf086e793f2c
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-03-14 20:48:13 +0100
+
+ Update credits.
+
+ AUTHORS | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 71e5c7f3ee4295373eb9d7eee4a717aaa003082d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2011-03-10 20:06:55 +0100
+
+ Fix aspect ratio calculations for multi-monitor desktops.
+ 
+ This reverts the aspect ratio handling to the 0.8.1 version, to fix wrong
+ aspect ratios on multi-monitor desktops on Windows. Reported and diagnosed by
+ Jordanis Kiriakidis.
+
+ src/player_equalizer.cpp | 3 +--
+ src/video_output.cpp | 14 --------------
+ src/video_output.h | 5 +----
+ src/video_output_qt.cpp | 21 ++++++++++++---------
+ src/video_output_qt.h | 3 +--
+ 5 files changed, 15 insertions(+), 31 deletions(-)
+
+commit 1bae185ccbb12a166788cdb8d70ea158e5e08dea
+Author: Jürgen Löb <juergen.loeb@main-host.de>
+Date: 2011-03-08 19:34:33 +0100
+
+ Disable alpha in the GL format.
+ 
+ This avoids problems with OpenGL implementations that do not support alpha with
+ quad-buffer contexts.
+
+ src/video_output_qt.cpp | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
 commit 0a703cc26bdc6773b96dd8d5be27904fc2f6ad9c
 Author: Martin Lambers <marlam@marlam.de>
 Date: 2011-03-05 10:30:51 +0100

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
 generated by GNU Autoconf 2.67. Invocation command line was
 
 $ $0 $@
@@ -2283,6 +2360,7 @@
 >$cache_file
 fi
 
+gt_needs="$gt_needs "
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -4453,7 +4531,7 @@
 
 # Define the identity of the package.
 PACKAGE='bino'
- VERSION='0.9.2'
+ VERSION='0.9.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5797,6 +5875,2160 @@
 
 
 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+ # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then :
+ enableval=$enable_nls; USE_NLS=$enableval
+else
+ USE_NLS=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+
+
+
+
+ GETTEXT_MACRO_VERSION=0.18
+
+
+
+
+# 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 "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case "$MSGFMT" in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; 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..." >&5
+ if $ac_dir/$ac_word --statistics /dev/null >&5 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); then
+ ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
+ ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GMSGFMT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+ ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+ 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
+
+ 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
+
+
+
+# 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 "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case "$XGETTEXT" in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; 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..." >&5
+ if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 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); then
+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+ ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ rm -f messages.po
+
+ 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
+
+
+
+# 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 "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case "$MSGMERGE" in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; 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..." >&5
+ if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
+ ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+ test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
+ ;;
+esac
+fi
+MSGMERGE="$ac_cv_path_MSGMERGE"
+if test "$MSGMERGE" != ":"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$localedir" || localedir='${datadir}/locale'
+
+
+ test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+
+
+ ac_config_commands="$ac_config_commands po-directories"
+
+
+
+ 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"
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+ with_gnu_ld=no
+fi
+
+# 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.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
+ 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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if test "${acl_cv_path_LD+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ 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
+fi
+
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${acl_cv_prog_gnu_ld+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ # 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
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
+if test "${acl_cv_rpath+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ 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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
+ 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"
+ # Check whether --enable-rpath was given.
+if test "${enable_rpath+set}" = set; then :
+ enableval=$enable_rpath; :
+else
+ enable_rpath=yes
+fi
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ # Double quotes because CXXCPP needs to be expanded
+ for CXXCPP in "$CXX -E" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		 Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+ break
+fi
+
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+ CXXCPP=$ac_cv_prog_CXXCPP
+else
+ ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		 Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
+fi
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+
+
+ acl_libdirstem=lib
+ acl_libdirstem2=
+ case "$host_os" in
+ solaris*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
+$as_echo_n "checking for 64-bit host... " >&6; }
+if test "${gl_cv_solaris_64bit+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#ifdef _LP64
+sixtyfour bits
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
+ gl_cv_solaris_64bit=yes
+else
+ gl_cv_solaris_64bit=no
+fi
+rm -f conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
+$as_echo "$gl_cv_solaris_64bit" >&6; }
+ 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
+ ;;
+ *)
+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test -n "$searchpath"; then
+ acl_save_IFS="${IFS= 	}"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+ */../ | */.. )
+ # Better ignore directories of this form. They are misleading.
+ ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib64 ) acl_libdirstem=lib64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$acl_save_IFS"
+ fi
+ ;;
+ esac
+ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+
+
+
+
+
+
+
+
+
+
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+
+# Check whether --with-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then :
+ withval=$with_libiconv_prefix;
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ if test "$acl_libdirstem2" != "$acl_libdirstem" \
+ && ! test -d "$withval/$acl_libdirstem"; then
+ additional_libdir="$withval/$acl_libdirstem2"
+ fi
+ fi
+ fi
+
+fi
+
+ LIBICONV=
+ LTLIBICONV=
+ INCICONV=
+ LIBICONV_PREFIX=
+ HAVE_LIBICONV=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='iconv '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
+ if test -n "$acl_shlibext"; then
+ shrext=".$acl_shlibext" # typically: shrext=.so
+ else
+ shrext=
+ fi
+ if test $use_additional = yes; then
+ dir="$additional_libdir"
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "$enable_rpath" = no \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$acl_hardcode_direct" = yes; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+ fi
+ if test "$acl_hardcode_minus_L" != no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+ if test "$name" = 'iconv'; then
+ LIBICONV_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
+ */$acl_libdirstem2 | */$acl_libdirstem2/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+ if test "$name" = 'iconv'; then
+ LIBICONV_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ 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
+ for x in $CPPFLAGS $INCICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; 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
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$acl_hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+ done
+ fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
+if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <CoreFoundation/CFPreferences.h>
+int
+main ()
+{
+CFPreferencesCopyAppValue(NULL, NULL)
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ gt_cv_func_CFPreferencesCopyAppValue=yes
+else
+ gt_cv_func_CFPreferencesCopyAppValue=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+
+$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
+if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <CoreFoundation/CFLocale.h>
+int
+main ()
+{
+CFLocaleCopyCurrent();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ gt_cv_func_CFLocaleCopyCurrent=yes
+else
+ gt_cv_func_CFLocaleCopyCurrent=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+
+$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+
+ 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
+
+
+
+
+
+
+ LIBINTL=
+ LTLIBINTL=
+ POSUB=
+
+ 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"
+
+ if test "$USE_NLS" = "yes"; then
+ gt_use_preinstalled_gnugettext=no
+
+
+ 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
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+'
+ 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
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+$as_echo_n "checking for GNU gettext in libc... " >&6; }
+if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
+int
+main ()
+{
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ eval "$gt_func_gnugettext_libc=yes"
+else
+ eval "$gt_func_gnugettext_libc=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$gt_func_gnugettext_libc
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+
+
+
+
+
+ am_save_CPPFLAGS="$CPPFLAGS"
+
+ for element in $INCICONV; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if test "${am_cv_func_iconv+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ am_cv_lib_iconv=yes
+ am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$am_save_LIBS"
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
+ if test "$am_cv_func_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+$as_echo_n "checking for working iconv... " >&6; }
+if test "${am_cv_func_iconv_works+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ am_save_LIBS="$LIBS"
+ if test $am_cv_lib_iconv = yes; then
+ LIBS="$LIBS $LIBICONV"
+ fi
+ if test "$cross_compiling" = yes; then :
+ case "$host_os" in
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#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;
+}
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"; then :
+ am_cv_func_iconv_works=yes
+else
+ am_cv_func_iconv_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ LIBS="$am_save_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+$as_echo "$am_cv_func_iconv_works" >&6; }
+ 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
+
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
+ else
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
+ fi
+
+
+
+
+
+
+
+
+
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+
+# Check whether --with-libintl-prefix was given.
+if test "${with_libintl_prefix+set}" = set; then :
+ withval=$with_libintl_prefix;
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ if test "$acl_libdirstem2" != "$acl_libdirstem" \
+ && ! test -d "$withval/$acl_libdirstem"; then
+ additional_libdir="$withval/$acl_libdirstem2"
+ fi
+ fi
+ fi
+
+fi
+
+ LIBINTL=
+ LTLIBINTL=
+ INCINTL=
+ LIBINTL_PREFIX=
+ HAVE_LIBINTL=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='intl '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
+ if test -n "$acl_shlibext"; then
+ shrext=".$acl_shlibext" # typically: shrext=.so
+ else
+ shrext=
+ fi
+ if test $use_additional = yes; then
+ dir="$additional_libdir"
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "$enable_rpath" = no \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$acl_hardcode_direct" = yes; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ else
+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
+ fi
+ if test "$acl_hardcode_minus_L" != no; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ else
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
+ else
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+ if test "$name" = 'intl'; then
+ LIBINTL_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
+ */$acl_libdirstem2 | */$acl_libdirstem2/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+ if test "$name" = 'intl'; then
+ LIBINTL_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ 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
+ for x in $CPPFLAGS $INCINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; 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
+ haveit=
+ for x in $LDFLAGS $LIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$acl_hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
+ done
+ fi
+
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+$as_echo_n "checking for GNU gettext in libintl... " >&6; }
+if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $INCINTL"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBINTL"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#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 *);
+int
+main ()
+{
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ eval "$gt_func_gnugettext_libintl=yes"
+else
+ eval "$gt_func_gnugettext_libintl=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
+ LIBS="$LIBS $LIBICONV"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#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 *);
+int
+main ()
+{
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ LIBINTL="$LIBINTL $LIBICONV"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+ eval "$gt_func_gnugettext_libintl=yes"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"
+fi
+eval ac_res=\$$gt_func_gnugettext_libintl
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ fi
+
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+ && test "$PACKAGE" != gettext-runtime \
+ && test "$PACKAGE" != gettext-tools; }; then
+ gt_use_preinstalled_gnugettext=yes
+ else
+ LIBINTL=
+ LTLIBINTL=
+ INCINTL=
+ fi
+
+
+
+ if test -n "$INTL_MACOSX_LIBS"; then
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+ fi
+ fi
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+
+ else
+ USE_NLS=no
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+$as_echo_n "checking whether to use NLS... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+ if test "$USE_NLS" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+$as_echo_n "checking where the gettext function comes from... " >&6; }
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+ gt_source="external libintl"
+ else
+ gt_source="libc"
+ fi
+ else
+ gt_source="included intl directory"
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+$as_echo "$gt_source" >&6; }
+ fi
+
+ if test "$USE_NLS" = "yes"; then
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+$as_echo_n "checking how to link with libintl... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+$as_echo "$LIBINTL" >&6; }
+
+ for element in $INCINTL; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
+
+ fi
+
+
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+
+ fi
+
+ POSUB=po
+ fi
+
+
+
+ INTLLIBS="$LIBINTL"
+
+
+
+
+
+
+
+
 
 
 
@@ -5933,12 +8165,12 @@
 pkg_cv_libavformat_CFLAGS="$libavformat_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.64.2 libavcodec libavutil\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavformat >= 52.64.2 libavcodec libavutil") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.104.0 libavcodec\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libavformat >= 52.104.0 libavcodec") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_libavformat_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 52.64.2 libavcodec libavutil" 2>/dev/null`
+ pkg_cv_libavformat_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 52.104.0 libavcodec" 2>/dev/null`
 else
 pkg_failed=yes
 fi
@@ -5949,12 +8181,12 @@
 pkg_cv_libavformat_LIBS="$libavformat_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.64.2 libavcodec libavutil\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavformat >= 52.64.2 libavcodec libavutil") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.104.0 libavcodec\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libavformat >= 52.104.0 libavcodec") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_libavformat_LIBS=`$PKG_CONFIG --libs "libavformat >= 52.64.2 libavcodec libavutil" 2>/dev/null`
+ pkg_cv_libavformat_LIBS=`$PKG_CONFIG --libs "libavformat >= 52.104.0 libavcodec" 2>/dev/null`
 else
 pkg_failed=yes
 fi
@@ -5974,9 +8206,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 libavformat_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavformat >= 52.64.2 libavcodec libavutil" 2>&1`
+	 libavformat_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavformat >= 52.104.0 libavcodec" 2>&1`
 else
-	 libavformat_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavformat >= 52.64.2 libavcodec libavutil" 2>&1`
+	 libavformat_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavformat >= 52.104.0 libavcodec" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libavformat_PKG_ERRORS" >&5
@@ -5994,12 +8226,12 @@
 	HAVE_LIBAVFORMAT=1
 fi
 if test "$HAVE_LIBAVFORMAT" != "1"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: library libavformat >= 52.64.2 not found:" >&5
-$as_echo "$as_me: WARNING: library libavformat >= 52.64.2 not found:" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: library libavformat >= 52.104.0 not found:" >&5
+$as_echo "$as_me: WARNING: library libavformat >= 52.104.0 not found:" >&2;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $libavformat_PKG_ERRORS" >&5
 $as_echo "$as_me: WARNING: $libavformat_PKG_ERRORS" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libavformat is provided by FFmpeg; Debian package: libavformat-dev" >&5
-$as_echo "$as_me: WARNING: libavformat is provided by FFmpeg; Debian package: libavformat-dev" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libavformat >= 52.104.0 is provided by FFmpeg >= 0.6.90-rc0" >&5
+$as_echo "$as_me: WARNING: libavformat >= 52.104.0 is provided by FFmpeg >= 0.6.90-rc0" >&2;}
 fi
 
 pkg_failed=no
@@ -6010,12 +8242,12 @@
 pkg_cv_libswscale_CFLAGS="$libswscale_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale >= 0.11.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libswscale >= 0.11.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale >= 0.13.0 libavutil\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libswscale >= 0.13.0 libavutil") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_libswscale_CFLAGS=`$PKG_CONFIG --cflags "libswscale >= 0.11.0" 2>/dev/null`
+ pkg_cv_libswscale_CFLAGS=`$PKG_CONFIG --cflags "libswscale >= 0.13.0 libavutil" 2>/dev/null`
 else
 pkg_failed=yes
 fi
@@ -6026,12 +8258,12 @@
 pkg_cv_libswscale_LIBS="$libswscale_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale >= 0.11.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libswscale >= 0.11.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale >= 0.13.0 libavutil\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libswscale >= 0.13.0 libavutil") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_libswscale_LIBS=`$PKG_CONFIG --libs "libswscale >= 0.11.0" 2>/dev/null`
+ pkg_cv_libswscale_LIBS=`$PKG_CONFIG --libs "libswscale >= 0.13.0 libavutil" 2>/dev/null`
 else
 pkg_failed=yes
 fi
@@ -6051,9 +8283,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 libswscale_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libswscale >= 0.11.0" 2>&1`
+	 libswscale_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libswscale >= 0.13.0 libavutil" 2>&1`
 else
-	 libswscale_PKG_ERRORS=`$PKG_CONFIG --print-errors "libswscale >= 0.11.0" 2>&1`
+	 libswscale_PKG_ERRORS=`$PKG_CONFIG --print-errors "libswscale >= 0.13.0 libavutil" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libswscale_PKG_ERRORS" >&5
@@ -6071,12 +8303,12 @@
 	HAVE_LIBSWSCALE=1
 fi
 if test "$HAVE_LIBSWSCALE" != "1"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: library libswscale >= 0.11.0 not found:" >&5
-$as_echo "$as_me: WARNING: library libswscale >= 0.11.0 not found:" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: library libswscale >= 0.13.0 not found:" >&5
+$as_echo "$as_me: WARNING: library libswscale >= 0.13.0 not found:" >&2;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $libswscale_PKG_ERRORS" >&5
 $as_echo "$as_me: WARNING: $libswscale_PKG_ERRORS" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libswscale is provided by FFmpeg; Debian package: libswscale-dev" >&5
-$as_echo "$as_me: WARNING: libswscale is provided by FFmpeg; Debian package: libswscale-dev" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libswscale >= 0.13.0 is provided by FFmpeg >= 0.6.90-rc0" >&5
+$as_echo "$as_me: WARNING: libswscale >= 0.13.0 is provided by FFmpeg >= 0.6.90-rc0" >&2;}
 fi
 for ac_func in sysconf
 do :
@@ -6092,6 +8324,84 @@
 
 
 pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libass" >&5
+$as_echo_n "checking for libass... " >&6; }
+
+if test -n "$libass_CFLAGS"; then
+ pkg_cv_libass_CFLAGS="$libass_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libass >= 0.9.9\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libass >= 0.9.9") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_libass_CFLAGS=`$PKG_CONFIG --cflags "libass >= 0.9.9" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$libass_LIBS"; then
+ pkg_cv_libass_LIBS="$libass_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libass >= 0.9.9\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libass >= 0.9.9") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_libass_LIBS=`$PKG_CONFIG --libs "libass >= 0.9.9" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+	 libass_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libass >= 0.9.9" 2>&1`
+ else
+	 libass_PKG_ERRORS=`$PKG_CONFIG --print-errors "libass >= 0.9.9" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$libass_PKG_ERRORS" >&5
+
+	HAVE_LIBASS=0
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_LIBASS=0
+else
+	libass_CFLAGS=$pkg_cv_libass_CFLAGS
+	libass_LIBS=$pkg_cv_libass_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_LIBASS=1
+fi
+if test "$HAVE_LIBASS" != "1"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: library libass not found:" >&5
+$as_echo "$as_me: WARNING: library libass not found:" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $libopenal_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $libopenal_PKG_ERRORS" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libass is provided by LibASS; Debian package: libass-dev" >&5
+$as_echo "$as_me: WARNING: libass is provided by LibASS; Debian package: libass-dev" >&2;}
+fi
+
+
+pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libopenal" >&5
 $as_echo_n "checking for libopenal... " >&6; }
 
@@ -6632,6 +8942,7 @@
 
 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" $ \
@@ -6639,7 +8950,7 @@
 as_fn_error $? "One or more libraries were not found. See messages above." "$LINENO" 5
 fi
 
-ac_config_files="$ac_config_files Makefile src/base/Makefile src/Makefile doc/Makefile pkg/macosx/Info.plist"
+ac_config_files="$ac_config_files Makefile po/Makefile.in src/base/Makefile src/Makefile doc/Makefile pkg/macosx/Info.plist"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -7180,7 +9491,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Bino $as_me 0.9.2, which was
+This file was extended by Bino $as_me 0.9.3, which was
 generated by GNU Autoconf 2.67. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
@@ -7247,7 +9558,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Bino config.status 0.9.2
+Bino config.status 0.9.3
 configured by $0, generated by GNU Autoconf 2.67,
 with options \\"\$ac_cs_config\\"
 
@@ -7367,6 +9678,13 @@
 # INIT-COMMANDS
 #
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+ # from automake < 1.5.
+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
+ LINGUAS="${LINGUAS-%UNSET%}"
+
 
 _ACEOF
 
@@ -7378,7 +9696,9 @@
 case $ac_config_target in
 "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
 "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
 "src/base/Makefile") CONFIG_FILES="$CONFIG_FILES src/base/Makefile" ;;
 "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
 "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
@@ -8070,6 +10390,119 @@
 done
 }
 ;;
+ "po-directories":C)
+ 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 | *~) ;;
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
+ esac
+ fi
+ done
+ fi
+ ;;
+ esac
+ done ;;
 
 esac
 done # for ac_tag

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
+ LIBS="$LIBS $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 ("")],
+ [LIBINTL="$LIBINTL $LIBICONV"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+ eval "$gt_func_gnugettext_libintl=yes"
+ ])
+ fi
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"])
+ fi
+
+ dnl If an already present or preinstalled GNU gettext() is found,
+ dnl use it. But if this macro is used in GNU gettext, and GNU
+ dnl gettext is already preinstalled in libintl, we update this
+ dnl libintl. (Cf. the install rule in intl/Makefile.in.)
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+ && test "$PACKAGE" != gettext-runtime \
+ && test "$PACKAGE" != gettext-tools; }; then
+ gt_use_preinstalled_gnugettext=yes
+ else
+ dnl Reset the values set by searching for libintl.
+ LIBINTL=
+ LTLIBINTL=
+ INCINTL=
+ fi
+
+ ifelse(gt_included_intl, yes, [
+ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+ dnl GNU gettext is not found in the C library.
+ dnl Fall back on included GNU gettext library.
+ nls_cv_use_gnu_gettext=yes
+ fi
+ fi
+
+ if test "$nls_cv_use_gnu_gettext" = "yes"; then
+ dnl Mark actions used to generate GNU NLS library.
+ BUILD_INCLUDED_LIBINTL=yes
+ USE_INCLUDED_LIBINTL=yes
+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+ fi
+
+ CATOBJEXT=
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ dnl Mark actions to use GNU gettext tools.
+ CATOBJEXT=.gmo
+ fi
+ ])
+
+ if test -n "$INTL_MACOSX_LIBS"; then
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ dnl Some extra flags are needed during linking.
+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+ fi
+ fi
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ AC_DEFINE([ENABLE_NLS], [1],
+ [Define to 1 if translation of program messages to the user's native language
+ is requested.])
+ else
+ USE_NLS=no
+ fi
+ fi
+
+ AC_MSG_CHECKING([whether to use NLS])
+ AC_MSG_RESULT([$USE_NLS])
+ if test "$USE_NLS" = "yes"; then
+ AC_MSG_CHECKING([where the gettext function comes from])
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+ gt_source="external libintl"
+ else
+ gt_source="libc"
+ fi
+ else
+ gt_source="included intl directory"
+ fi
+ AC_MSG_RESULT([$gt_source])
+ fi
+
+ if test "$USE_NLS" = "yes"; then
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+ AC_MSG_CHECKING([how to link with libintl])
+ AC_MSG_RESULT([$LIBINTL])
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+ fi
+
+ dnl For backward compatibility. Some packages may be using this.
+ AC_DEFINE([HAVE_GETTEXT], [1],
+ [Define if the GNU gettext() function is already present or preinstalled.])
+ AC_DEFINE([HAVE_DCGETTEXT], [1],
+ [Define if the GNU dcgettext() function is already present or preinstalled.])
+ fi
+
+ dnl We need to process the po/ directory.
+ POSUB=po
+ fi
+
+ ifelse(gt_included_intl, yes, [
+ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+ dnl to 'yes' because some of the testsuite requires it.
+ if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
+ BUILD_INCLUDED_LIBINTL=yes
+ fi
+
+ dnl Make all variables we use known to autoconf.
+ AC_SUBST([BUILD_INCLUDED_LIBINTL])
+ AC_SUBST([USE_INCLUDED_LIBINTL])
+ AC_SUBST([CATOBJEXT])
+
+ dnl For backward compatibility. Some configure.ins may be using this.
+ nls_cv_header_intl=
+ nls_cv_header_libgt=
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ DATADIRNAME=share
+ AC_SUBST([DATADIRNAME])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INSTOBJEXT=.mo
+ AC_SUBST([INSTOBJEXT])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ GENCAT=gencat
+ AC_SUBST([GENCAT])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLOBJS=
+ if test "$USE_INCLUDED_LIBINTL" = yes; then
+ INTLOBJS="\$(GETTOBJS)"
+ fi
+ AC_SUBST([INTLOBJS])
+
+ dnl Enable libtool support if the surrounding package wishes it.
+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+ AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
+ ])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLLIBS="$LIBINTL"
+ AC_SUBST([INTLLIBS])
+
+ dnl Make all documented variables known to autoconf.
+ AC_SUBST([LIBINTL])
+ AC_SUBST([LTLIBINTL])
+ AC_SUBST([POSUB])
+])
+
+
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
+[
+ m4_divert_text([DEFAULTS], [gt_needs=])
+ m4_define([gt_NEEDS_INIT], [])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
+[
+ m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])

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"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+ AC_MSG_RESULT([
+ $am_cv_proto_iconv])
+ AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
+ [Define as const if the declaration of iconv() needs const.])
+ fi
+])

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
+      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"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
+      fi
+    fi
+])
+  dnl Search the library and its dependencies in $additional_libdir and
+  dnl $LDFLAGS. Using breadth-first-seach.
+  LIB[]NAME=
+  LTLIB[]NAME=
+  INC[]NAME=
+  LIB[]NAME[]_PREFIX=
+  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
+  dnl computed. So it has to be reset here.
+  HAVE_LIB[]NAME=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='$1 $2'
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+        dnl or AC_LIB_HAVE_LINKFLAGS call.
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          else
+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+            dnl that this library doesn't exist. So just drop it.
+            :
+          fi
+        else
+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
+          found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+            dnl The same code as in the loop below:
+            dnl First look for a shared library.
+            if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+            dnl Then look for a static library.
+            if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIB[]NAME; do
+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  dnl First look for a shared library.
+                  if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                  dnl Then look for a static library.
+                  if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+            dnl Found the library.
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+              dnl Linking with a shared library. We attempt to hardcode its
+              dnl directory into the executable's runpath, unless it's the
+              dnl standard /usr/lib.
+              if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                dnl No hardcoding is needed.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+              else
+                dnl Use an explicit option to hardcode DIR into the resulting
+                dnl binary.
+                dnl Potentially add DIR to ltrpathdirs.
+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                dnl The hardcoding into $LIBNAME is system dependent.
+                if test "$acl_hardcode_direct" = yes; then
+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+                  dnl resulting binary.
+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                    dnl Use an explicit option to hardcode DIR into the resulting
+                    dnl binary.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                    dnl Rely on "-L$found_dir".
+                    dnl But don't add it if it's already contained in the LDFLAGS
+                    dnl or the already constructed $LIBNAME
+                    haveit=
+                    for x in $LDFLAGS $LIB[]NAME; do
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    else
+                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
+                      dnl here, because this doesn't fit in flags passed to the
+                      dnl compiler. So give up. No hardcoding. This affects only
+                      dnl very old systems.
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                dnl Linking with a static library.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+              else
+                dnl We shouldn't come here, but anyway it's good to have a
+                dnl fallback.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+              fi
+            fi
+            dnl Assume the include files are nearby.
+            additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+              dnl Potentially add $additional_includedir to $INCNAME.
+              dnl But don't add it
+              dnl   1. if it's the standard /usr/include,
+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+              dnl   3. if it's already present in $CPPFLAGS or the already
+              dnl      constructed $INCNAME,
+              dnl   4. if it doesn't exist as a directory.
+              if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                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
+                  for x in $CPPFLAGS $INC[]NAME; 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 -d "$additional_includedir"; then
+                      dnl Really add $additional_includedir to $INCNAME.
+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+            dnl Look for dependencies.
+            if test -n "$found_la"; then
+              dnl Read the .la file. It defines the variables
+              dnl dlname, library_names, old_library, dependency_libs, current,
+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
+              save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+              dnl We use only dependency_libs.
+              for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+                    dnl But don't add it
+                    dnl   1. if it's the standard /usr/lib,
+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+                    dnl   3. if it's already present in $LDFLAGS or the already
+                    dnl      constructed $LIBNAME,
+                    dnl   4. if it doesn't exist as a directory.
+                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; 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
+                        haveit=
+                        for x in $LDFLAGS $LIB[]NAME; 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 -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LIBNAME.
+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIB[]NAME; 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 -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LTLIBNAME.
+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                    dnl Handle this in the next round.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                    dnl Handle this in the next round. Throw away the .la's
+                    dnl directory; it is already contained in a preceding -L
+                    dnl option.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                    dnl Most likely an immediate library name.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+            dnl Didn't find the library; assume it is in the system directories
+            dnl known to the linker and runtime loader. (All the system
+            dnl directories known to the linker should also be known to the
+            dnl runtime loader, otherwise the system is severely misconfigured.)
+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+      dnl Weird platform: only the last -rpath option counts, the user must
+      dnl pass all path elements in one option. We can arrange that for a
+      dnl single library, but not when more than one $LIBNAMEs are used.
+      alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+    else
+      dnl The -rpath options are cumulative.
+      for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+    dnl When using libtool, the option that works for both libraries and
+    dnl executables is -R. The -R options are cumulative.
+    for found_dir in $ltrpathdirs; do
+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+    done
+  fi
+  popdef([P_A_C_K])
+  popdef([PACKLIBS])
+  popdef([PACKUP])
+  popdef([PACK])
+  popdef([NAME])
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+  for element in [$2]; do
+    haveit=
+    for x in $[$1]; do
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      [$1]="${[$1]}${[$1]:+ }$element"
+    fi
+  done
+])
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+[
+  AC_REQUIRE([AC_LIB_RPATH])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  $1=
+  if test "$enable_rpath" != no; then
+    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+      dnl Use an explicit option to hardcode directories into the resulting
+      dnl binary.
+      rpathdirs=
+      next=
+      for opt in $2; do
+        if test -n "$next"; then
+          dir="$next"
+          dnl No need to hardcode the standard /usr/lib.
+          if test "X$dir" != "X/usr/$acl_libdirstem" \
+             && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+            rpathdirs="$rpathdirs $dir"
+          fi
+          next=
+        else
+          case $opt in
+            -L) next=yes ;;
+            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+                 dnl No need to hardcode the standard /usr/lib.
+                 if test "X$dir" != "X/usr/$acl_libdirstem" \
+                    && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+                   rpathdirs="$rpathdirs $dir"
+                 fi
+                 next= ;;
+            *) next= ;;
+          esac
+        fi
+      done
+      if test "X$rpathdirs" != "X"; then
+        if test -n ""$3""; then
+          dnl libtool is used for linking. Use -R options.
+          for dir in $rpathdirs; do
+            $1="${$1}${$1:+ }-R$dir"
+          done
+        else
+          dnl The linker is used for linking directly.
+          if test -n "$acl_hardcode_libdir_separator"; then
+            dnl Weird platform: only the last -rpath option counts, the user
+            dnl must pass all path elements in one option.
+            alldirs=
+            for dir in $rpathdirs; do
+              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
+            done
+            acl_save_libdir="$libdir"
+            libdir="$alldirs"
+            eval flag=\"$acl_hardcode_libdir_flag_spec\"
+            libdir="$acl_save_libdir"
+            $1="$flag"
+          else
+            dnl The -rpath options are cumulative.
+            for dir in $rpathdirs; do
+              acl_save_libdir="$libdir"
+              libdir="$dir"
+              eval flag=\"$acl_hardcode_libdir_flag_spec\"
+              libdir="$acl_save_libdir"
+              $1="${$1}${$1:+ }$flag"
+            done
+          fi
+        fi
+      fi
+    fi
+  fi
+  AC_SUBST([$1])
+])

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
+ ;;
+ *)
+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test -n "$searchpath"; then
+ acl_save_IFS="${IFS= 	}"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+ */../ | */.. )
+ # Better ignore directories of this form. They are misleading.
+ ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib64 ) acl_libdirstem=lib64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$acl_save_IFS"
+ fi
+ ;;
+ esac
+ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+])

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 | *~) ;;
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
+ esac
+ fi
+ done
+ fi
+ ;;
+ esac
+ done]],
+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+ # from automake < 1.5.
+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
+ LINGUAS="${LINGUAS-%UNSET%}"
+ ])
+])
+
+dnl Postprocesses a Makefile in a directory containing PO files.
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+[
+ # When this code is run, in config.status, two variables have already been
+ # set:
+ # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+ # - LINGUAS is the value of the environment variable LINGUAS at configure
+ # time.
+
+changequote(,)dnl
+ # 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
+
+ # Find a way to echo strings without interpreting backslash.
+ if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+ gt_echo='echo'
+ else
+ if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+ gt_echo='printf %s\n'
+ else
+ echo_func () {
+ cat <<EOT
+$*
+EOT
+ }
+ gt_echo='echo_func'
+ fi
+ fi
+
+ # A sed script that extracts the value of VARIABLE from a Makefile.
+ sed_x_variable='
+# Test if the hold space is empty.
+x
+s/P/P/
+x
+ta
+# Yes it was empty. Look if we have the expected variable definition.
+/^[	 ]*VARIABLE[	 ]*=/{
+ # Seen the first line of the variable definition.
+ s/^[	 ]*VARIABLE[	 ]*=//
+ ba
+}
+bd
+:a
+# Here we are processing a line from the variable definition.
+# Remove comment, more precisely replace it with a space.
+s/#.*$/ /
+# See if the line ends in a backslash.
+tb
+:b
+s/\\$//
+# Print the line, without the trailing backslash.
+p
+tc
+# There was no trailing backslash. The end of the variable definition is
+# reached. Clear the hold space.
+s/^.*$//
+x
+bd
+:c
+# A trailing backslash means that the variable definition continues in the
+# next line. Put a nonempty string into the hold space to indicate this.
+s/^.*$/P/
+x
+:d
+'
+changequote([,])dnl
+
+ # Set POTFILES to the value of the Makefile variable POTFILES.
+ sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
+ POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+ # Compute POTFILES_DEPS as
+ # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+ POTFILES_DEPS=
+ for file in $POTFILES; do
+ POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+ done
+ POMAKEFILEDEPS=""
+
+ 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
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+ # The LINGUAS file contains the set of available languages.
+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ else
+ # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+ sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
+ ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+ fi
+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ # 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)
+ # Compute PROPERTIESFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
+ # Compute CLASSFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
+ # Compute QMFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+ # Compute MSGFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+ # Compute RESOURCESDLLFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
+ case "$ac_given_srcdir" in
+ .) srcdirpre= ;;
+ *) srcdirpre='$(srcdir)/' ;;
+ esac
+ POFILES=
+ UPDATEPOFILES=
+ DUMMYPOFILES=
+ GMOFILES=
+ PROPERTIESFILES=
+ CLASSFILES=
+ QMFILES=
+ MSGFILES=
+ RESOURCESDLLFILES=
+ 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"
+ PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+ CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+ QMFILES="$QMFILES $srcdirpre$lang.qm"
+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+ MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+ RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+ 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=
+ JAVACATALOGS=
+ QTCATALOGS=
+ TCLCATALOGS=
+ CSHARPCATALOGS=
+ if test -n "$INST_LINGUAS"; then
+ for lang in $INST_LINGUAS; do
+ CATALOGS="$CATALOGS $lang.gmo"
+ JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+ QTCATALOGS="$QTCATALOGS $lang.qm"
+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+ TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+ CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+ done
+ fi
+
+ sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+ if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+ # Add dependencies that cannot be formulated as a simple suffix rule.
+ for lang in $ALL_LINGUAS; do
+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+ cat >> "$ac_file.tmp" <<EOF
+$frobbedlang.msg: $lang.po
+	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+ done
+ fi
+ if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+ # Add dependencies that cannot be formulated as a simple suffix rule.
+ for lang in $ALL_LINGUAS; do
+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+ cat >> "$ac_file.tmp" <<EOF
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+ done
+ fi
+ if test -n "$POMAKEFILEDEPS"; then
+ cat >> "$ac_file.tmp" <<EOF
+Makefile: $POMAKEFILEDEPS
+EOF
+ fi
+ mv "$ac_file.tmp" "$ac_file"
+])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+ XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+ AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+ XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])

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].*) \
+	 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+	 *) \
+	 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+	 esac; \
+	 }; \
+	else \
+	 $(MAKE) $${lang}.po-create; \
+	fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	 $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	 for file in $(DISTFILES.common) Makevars.template; do \
+	 $(INSTALL_DATA) $(srcdir)/$$file \
+			 $(DESTDIR)$(gettextsrcdir)/$$file; \
+	 done; \
+	 for file in Makevars; do \
+	 rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	 done; \
+	else \
+	 : ; \
+	fi
+install-data-no: all
+install-data-yes: all
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	 cat=`basename $$cat`; \
+	 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	 dir=$(localedir)/$$lang/LC_MESSAGES; \
+	 $(mkdir_p) $(DESTDIR)$$dir; \
+	 if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+	 $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+	 echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+	 for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	 if test -n "$$lc"; then \
+	 if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	 link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	 mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	 (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	 for file in *; do \
+	 if test -f $$file; then \
+	 ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	 fi; \
+	 done); \
+	 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	 else \
+	 if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	 :; \
+	 else \
+	 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	 fi; \
+	 fi; \
+	 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	 ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	 ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	 cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	 echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+	 fi; \
+	 done; \
+	done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	 $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	else \
+	 : ; \
+	fi
+installdirs-data-no:
+installdirs-data-yes:
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	 cat=`basename $$cat`; \
+	 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	 dir=$(localedir)/$$lang/LC_MESSAGES; \
+	 $(mkdir_p) $(DESTDIR)$$dir; \
+	 for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	 if test -n "$$lc"; then \
+	 if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	 link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	 mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	 (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	 for file in *; do \
+	 if test -f $$file; then \
+	 ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	 fi; \
+	 done); \
+	 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	 else \
+	 if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	 :; \
+	 else \
+	 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	 fi; \
+	 fi; \
+	 fi; \
+	 done; \
+	done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	 for file in $(DISTFILES.common) Makevars.template; do \
+	 rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	 done; \
+	else \
+	 : ; \
+	fi
+uninstall-data-no:
+uninstall-data-yes:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	 cat=`basename $$cat`; \
+	 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	 for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+	 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	 done; \
+	done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+	rm -f remove-potcdate.sed
+	rm -f stamp-poT
+	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+	rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+	$(MAKE) update-po
+	@$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	 dists="$$dists Makevars.template"; \
+	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	 dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
+	if test -f $(srcdir)/ChangeLog; then \
+	 dists="$$dists ChangeLog"; \
+	fi; \
+	for i in 0 1 2 3 4 5 6 7 8 9; do \
+	 if test -f $(srcdir)/ChangeLog.$$i; then \
+	 dists="$$dists ChangeLog.$$i"; \
+	 fi; \
+	done; \
+	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+	for file in $$dists; do \
+	 if test -f $$file; then \
+	 cp -p $$file $(distdir) || exit 1; \
+	 else \
+	 cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+	 fi; \
+	done
+
+update-po: Makefile
+	$(MAKE) $(DOMAIN).pot-update
+	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+	$(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+	exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	cd $(srcdir); \
+	if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	 $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	 *) \
+	 $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	 esac; \
+	 }; 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 "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	 exit 1; \
+	 fi; \
+	 fi; \
+	else \
+	 echo "msgmerge for $$lang.po failed!" 1>&2; \
+	 rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+	@:
+
+# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
+# because execution permission bits may not work on the current file system.
+# Use @SHELL@, which is the shell determined by autoconf for the use by its
+# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+	cd $(top_builddir) \
+	 && @SHELL@ ./config.status $(subdir)/$@.in po-directories
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

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
+#: src/media_data.cpp:458
+msgid "unknown"
+msgstr ""
+
+#: src/lib_versions.cpp:181
+msgid "not used"
+msgstr ""
+
+#: src/main.cpp:259
+#, c-format
+msgid "%s version %s"
+msgstr ""
+
+#: src/main.cpp:260
+msgid "Copyright (C) 2011 the Bino developers."
+msgstr ""
+
+#: src/main.cpp:261
+msgid ""
+"This is free software. You may redistribute copies of it under the terms of "
+"the GNU General Public License. There is NO WARRANTY, to the extent "
+"permitted by law."
+msgstr ""
+
+#: src/main.cpp:264 src/player_qt.cpp:2337
+msgid "Platform:"
+msgstr ""
+
+#: src/main.cpp:266 src/player_qt.cpp:2338
+msgid "Libraries used:"
+msgstr ""
+
+#. TRANSLATORS: This is the --help text. Translate only the description,
+#. not the option names. Please keep a proper indentation with spaces, and
+#. keep the line length limited.
+#: src/main.cpp:278
+#, c-format
+msgid ""
+"Usage:\n"
+" %s [option...] [file...]\n"
+"\n"
+"Options:\n"
+" --help Print help.\n"
+" --version Print version.\n"
+" -n|--no-gui Do not use the GUI, just show a plain window.\n"
+" -l|--log-level=LEVEL Set log level (debug/info/warning/error/quiet).\n"
+" -v|--video=STREAM Select video stream (1-n, depending on input).\n"
+" -a|--audio=STREAM Select audio stream (1-n, depending on input).\n"
+" -s|--subtitle=STREAM Select subtitle stream (0-n, depending on "
+"input).\n"
+" -i|--input=TYPE Select input type (default autodetect):\n"
+" mono Single view.\n"
+" separate-left-right Left/right separate streams, left first.\n"
+" separate-right-left Left/right separate streams, right first.\n"
+" top-bottom Left top, right bottom.\n"
+" top-bottom-half Left top, right bottom, half height.\n"
+" bottom-top Left bottom, right top.\n"
+" bottom-top-half Left bottom, right top, half height.\n"
+" left-right Left left, right right.\n"
+" left-right-half Left left, right right, half width.\n"
+" right-left Left right, right left.\n"
+" right-left-half Left right, right left, half width.\n"
+" even-odd-rows Left even rows, right odd rows.\n"
+" odd-even-rows Left odd rows, right even rows.\n"
+" -o|--output=TYPE Select output type:\n"
+" mono-left Only left.\n"
+" mono-right Only right.\n"
+" top-bottom Left top, right bottom.\n"
+" top-bottom-half Left top, right bottom, half height.\n"
+" left-right Left left, right right.\n"
+" left-right-half Left left, right right, half width.\n"
+" even-odd-rows Left even rows, right odd rows.\n"
+" even-odd-columns Left even columns, right odd columns.\n"
+" checkerboard Left and right in checkerboard pattern.\n"
+" hdmi-frame-pack HDMI frame packing mode.\n"
+" red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
+" red-cyan-half-color Red/cyan anaglyph, half color method.\n"
+" red-cyan-full-color Red/cyan anaglyph, full color method.\n"
+" red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
+" green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
+" green-magenta-half-color Green/magenta anaglyph, half color method.\n"
+" green-magenta-full-color Green/magenta anaglyph, full color method.\n"
+" green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
+" amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
+" amber-blue-half-color Amber/blue anaglyph, half color method.\n"
+" amber-blue-full-color Amber/blue anaglyph, full color method.\n"
+" amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
+" red-green-monochrome Red/green anaglyph, monochrome method.\n"
+" red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
+" stereo OpenGL quad-buffered stereo.\n"
+" equalizer Multi-display via Equalizer (2D setup).\n"
+" equalizer-3d Multi-display via Equalizer (3D setup).\n"
+" -S|--swap-eyes Swap left/right view.\n"
+" -f|--fullscreen Fullscreen.\n"
+" -c|--center Center window on screen.\n"
+" --subtitle-encoding=ENC Set subtitle encoding.\n"
+" --subtitle-font=FONT Set subtitle font name.\n"
+" --subtitle-size=N Set subtitle font size.\n"
+" --subtitle-scale=S Set subtitle scale factor.\n"
+" --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
+" --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
+" -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
+" -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-separated\n"
+" values for the R,G,B channels.\n"
+" -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
+" -b|--benchmark Benchmark mode (no audio, show fps).\n"
+"\n"
+"Interactive control:\n"
+" q or ESC Quit.\n"
+" p or SPACE Pause / unpause.\n"
+" f Toggle fullscreen.\n"
+" c Center window.\n"
+" e Swap left/right eye.\n"
+" v Cycle through available video streams.\n"
+" a Cycle through available audio streams.\n"
+" s Cycle through available subtitle streams.\n"
+" 1, 2 Adjust contrast.\n"
+" 3, 4 Adjust brightness.\n"
+" 5, 6 Adjust hue.\n"
+" 7, 8 Adjust saturation.\n"
+" <, > Adjust parallax.\n"
+" (, ) Adjust ghostbusting.\n"
+" left, right Seek 10 seconds backward / forward.\n"
+" up, down Seek 1 minute backward / forward.\n"
+" page up, page down Seek 10 minutes backward / forward.\n"
+" Mouse click Seek according to horizontal click position."
+msgstr ""
+
+#: src/main.cpp:476
+msgid "Benchmark mode: audio and time synchronization disabled."
+msgstr ""
+
+#: src/main.cpp:488
+msgid "This version of Bino was compiled without support for Equalizer."
+msgstr ""
+
+#: src/main.cpp:505
+msgid "No video to play."
+msgstr ""
+
+#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
+#: src/media_data.cpp:263
+#, c-format
+msgid "%dx%d, %.3g:1"
+msgstr ""
+
+#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
+#: src/media_data.cpp:391
+#, c-format
+msgid "%s, %d ch., %g kHz, %d bit"
+msgstr ""
+
+#: src/media_input.cpp:284 src/player_qt.cpp:161
+msgid "Input:"
+msgstr ""
+
+#: src/media_input.cpp:289
+#, c-format
+msgid "Video %s: %s"
+msgstr ""
+
+#: src/media_input.cpp:294
+msgid "No video."
+msgstr ""
+
+#: src/media_input.cpp:300
+#, c-format
+msgid "Audio %s: %s"
+msgstr ""
+
+#: src/media_input.cpp:305
+msgid "No audio."
+msgstr ""
+
+#: src/media_input.cpp:311
+#, c-format
+msgid "Subtitle %s: %s"
+msgstr ""
+
+#: src/media_input.cpp:316
+msgid "No subtitle."
+msgstr ""
+
+#: src/media_input.cpp:318
+#, c-format
+msgid "Duration: %g seconds"
+msgstr ""
+
+#: src/media_input.cpp:321
+#, c-format
+msgid "Stereo layout: %s"
+msgstr ""
+
+#: src/media_object.cpp:584
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with %d channels."
+msgstr ""
+
+#: src/media_object.cpp:607
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with sample format %s."
+msgstr ""
+
+#: src/media_object.cpp:636 src/media_object.cpp:1094 src/xgl.cpp:297
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: src/media_object.cpp:641
+#, c-format
+msgid "%s: Cannot read stream info: %s"
+msgstr ""
+
+#: src/media_object.cpp:669
+#, c-format
+msgid "%s video stream %d: Invalid frame size."
+msgstr ""
+
+#: src/media_object.cpp:675
+#, c-format
+msgid "%s video stream %d: Unsupported video codec."
+msgstr ""
+
+#: src/media_object.cpp:682
+#, c-format
+msgid "%s video stream %d: Cannot open video codec: %s"
+msgstr ""
+
+#: src/media_object.cpp:717
+#, c-format
+msgid "%s video stream %d: Cannot initialize conversion context."
+msgstr ""
+
+#: src/media_object.cpp:738
+#, c-format
+msgid "%s audio stream %d: Unsupported audio codec."
+msgstr ""
+
+#: src/media_object.cpp:744
+#, c-format
+msgid "%s audio stream %d: Cannot open audio codec: %s"
+msgstr ""
+
+#: src/media_object.cpp:777
+#, c-format
+msgid "%s subtitle stream %d: Unsupported subtitle codec."
+msgstr ""
+
+#: src/media_object.cpp:783
+#, c-format
+msgid "%s subtitle stream %d: Cannot open subtitle codec: %s"
+msgstr ""
+
+#: src/media_object.cpp:808
+#, c-format
+msgid "Video stream %d: %s / %s, %g seconds"
+msgstr ""
+
+#: src/media_object.cpp:812
+#, c-format
+msgid "Using up to %d threads for decoding."
+msgstr ""
+
+#: src/media_object.cpp:817
+#, c-format
+msgid "Audio stream %d: %s / %s, %g seconds"
+msgstr ""
+
+#: src/media_object.cpp:824
+#, c-format
+msgid "Subtitle stream %d: %s / %s, %g seconds"
+msgstr ""
+
+#: src/media_object.cpp:831
+msgid "No usable streams."
+msgstr ""
+
+#: src/media_object.cpp:1110 src/media_object.cpp:1140
+#: src/media_object.cpp:1170
+#, c-format
+msgid "%s: Cannot duplicate packet."
+msgstr ""
+
+#: src/media_object.cpp:1647
+#, c-format
+msgid "%s: Seeking failed."
+msgstr ""
+
+#: src/player.cpp:185
+msgid "Cannot create a second master player."
+msgstr ""
+
+#: src/player.cpp:202
+msgid "No video streams found."
+msgstr ""
+
+#: src/player.cpp:208
+msgid "Cannot set requested stereo layout: incompatible media."
+msgstr ""
+
+#: src/player.cpp:214
+#, c-format
+msgid "Video stream %d not found."
+msgstr ""
+
+#: src/player.cpp:219
+#, c-format
+msgid "Audio stream %d not found."
+msgstr ""
+
+#: src/player.cpp:227
+#, c-format
+msgid "Subtitle stream %d not found."
+msgstr ""
+
+#: src/player.cpp:618
+#, c-format
+msgid "Video: delay %g seconds; dropping next frame."
+msgstr ""
+
+#: src/player.cpp:630
+#, c-format
+msgid "FPS: %.2f"
+msgstr ""
+
+#: src/player_equalizer.cpp:129
+msgid "Reading input frame failed."
+msgstr ""
+
+#: src/player_equalizer.cpp:243
+msgid "Init data mapping failed."
+msgstr ""
+
+#: src/player_equalizer.cpp:244
+msgid "Frame data mapping failed."
+msgstr ""
+
+#: src/player_equalizer.cpp:245
+msgid "Video player initialization failed."
+msgstr ""
+
+#: src/player_equalizer.cpp:246
+msgid "Need at least OpenGL 2.1."
+msgstr ""
+
+#: src/player_equalizer.cpp:447
+msgid "No canvas in Equalizer configuration."
+msgstr ""
+
+#: src/player_equalizer.cpp:481
+msgid "Equalizer canvas:"
+msgstr ""
+
+#: src/player_equalizer.cpp:482
+#, c-format
+msgid "%gx%g, aspect ratio %g:1"
+msgstr ""
+
+#: src/player_equalizer.cpp:483
+#, c-format
+msgid "Area for %g:1 video: [ %g %g %g %g @ %g ]"
+msgstr ""
+
+#: src/player_equalizer.cpp:896 src/video_output_qt.cpp:296
+msgid ""
+"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
+"objects."
+msgstr ""
+
+#: src/player_equalizer.cpp:1062
+msgid "Equalizer initialization failed."
+msgstr ""
+
+#: src/player_equalizer.cpp:1070
+msgid "Cannot get equalizer configuration."
+msgstr ""
+
+#: src/player_equalizer.cpp:1084
+msgid "Equalizer configuration initialization failed."
+msgstr ""
+
+#: src/player_qt.cpp:135
+msgid "Video:"
+msgstr ""
+
+#: src/player_qt.cpp:136
+msgid "Select the video stream."
+msgstr ""
+
+#: src/player_qt.cpp:142
+msgid "Audio:"
+msgstr ""
+
+#: src/player_qt.cpp:143
+msgid "Select the audio stream."
+msgstr ""
+
+#: src/player_qt.cpp:149
+msgid "Subtitle:"
+msgstr ""
+
+#: src/player_qt.cpp:150
+msgid "Select the subtitle stream."
+msgstr ""
+
+#: src/player_qt.cpp:162
+msgid "Set the 3D layout of the video stream."
+msgstr ""
+
+#: src/player_qt.cpp:166
+msgid "2D"
+msgstr ""
+
+#: src/player_qt.cpp:167
+msgid "Separate streams, left first"
+msgstr ""
+
+#: src/player_qt.cpp:168
+msgid "Separate streams, right first"
+msgstr ""
+
+#: src/player_qt.cpp:169 src/player_qt.cpp:192
+msgid "Top/bottom"
+msgstr ""
+
+#: src/player_qt.cpp:170 src/player_qt.cpp:193
+msgid "Top/bottom, half height"
+msgstr ""
+
+#: src/player_qt.cpp:171
+msgid "Bottom/top"
+msgstr ""
+
+#: src/player_qt.cpp:172
+msgid "Bottom/top, half height"
+msgstr ""
+
+#: src/player_qt.cpp:173 src/player_qt.cpp:194
+msgid "Left/right"
+msgstr ""
+
+#: src/player_qt.cpp:174 src/player_qt.cpp:195
+msgid "Left/right, half width"
+msgstr ""
+
+#: src/player_qt.cpp:175
+msgid "Right/left"
+msgstr ""
+
+#: src/player_qt.cpp:176
+msgid "Right/left, half width"
+msgstr ""
+
+#: src/player_qt.cpp:177 src/player_qt.cpp:196
+msgid "Even/odd rows"
+msgstr ""
+
+#: src/player_qt.cpp:178
+msgid "Odd/even rows"
+msgstr ""
+
+#: src/player_qt.cpp:184
+msgid "Output:"
+msgstr ""
+
+#: src/player_qt.cpp:185
+msgid "Set the 3D output type for your display."
+msgstr ""
+
+#: src/player_qt.cpp:189
+msgid "Left view"
+msgstr ""
+
+#: src/player_qt.cpp:190
+msgid "Right view"
+msgstr ""
+
+#: src/player_qt.cpp:191
+msgid "OpenGL stereo"
+msgstr ""
+
+#: src/player_qt.cpp:197
+msgid "Even/odd columns"
+msgstr ""
+
+#: src/player_qt.cpp:198
+msgid "Checkerboard pattern"
+msgstr ""
+
+#: src/player_qt.cpp:199
+msgid "HDMI frame packing mode"
+msgstr ""
+
+#: src/player_qt.cpp:200
+msgid "Red/cyan glasses, monochrome method"
+msgstr ""
+
+#: src/player_qt.cpp:201
+msgid "Red/cyan glasses, half-color method"
+msgstr ""
+
+#: src/player_qt.cpp:202
+msgid "Red/cyan glasses, full-color method"
+msgstr ""
+
+#: src/player_qt.cpp:203
+msgid "Red/cyan glasses, high-quality Dubois method"
+msgstr ""
+
+#: src/player_qt.cpp:204
+msgid "Green/magenta glasses, monochrome method"
+msgstr ""
+
+#: src/player_qt.cpp:205
+msgid "Green/magenta glasses, half-color method"
+msgstr ""
+
+#: src/player_qt.cpp:206
+msgid "Green/magenta glasses, full-color method"
+msgstr ""
+
+#: src/player_qt.cpp:207
+msgid "Green/magenta glasses, high-quality Dubois method"
+msgstr ""
+
+#: src/player_qt.cpp:208
+msgid "Amber/blue glasses, monochrome method"
+msgstr ""
+
+#: src/player_qt.cpp:209
+msgid "Amber/blue glasses, half-color method"
+msgstr ""
+
+#: src/player_qt.cpp:210
+msgid "Amber/blue glasses, full-color method"
+msgstr ""
+
+#: src/player_qt.cpp:211
+msgid "Amber/blue glasses, high-quality Dubois method"
+msgstr ""
+
+#: src/player_qt.cpp:212
+msgid "Red/green glasses, monochrome method"
+msgstr ""
+
+#: src/player_qt.cpp:213
+msgid "Red/blue glasses, monochrome method"
+msgstr ""
+
+#: src/player_qt.cpp:217
+msgid "Swap left/right"
+msgstr ""
+
+#: src/player_qt.cpp:218
+msgid ""
+"Swap the left and right view. Use this if the 3D effect seems wrong."
+msgstr ""
+
+#: src/player_qt.cpp:485
+msgid "Off"
+msgstr ""
+
+#: src/player_qt.cpp:719
+msgid ""
+"This slider shows the progress during video playback, and can be used to "
+"seek in the video."
+msgstr ""
+
+#: src/player_qt.cpp:726
+msgid "Play."
+msgstr ""
+
+#: src/player_qt.cpp:730
+msgid "Pause."
+msgstr ""
+
+#: src/player_qt.cpp:734
+msgid "Stop."
+msgstr ""
+
+#: src/player_qt.cpp:739
+msgid ""
+"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
+"f key."
+msgstr ""
+
+#: src/player_qt.cpp:744
+msgid "Center the video area on your screen."
+msgstr ""
+
+#: src/player_qt.cpp:749
+msgid "Seek backward 10 minutes."
+msgstr ""
+
+#: src/player_qt.cpp:753
+msgid "Seek backward 1 minute."
+msgstr ""
+
+#: src/player_qt.cpp:757
+msgid "Seek backward 10 seconds."
+msgstr ""
+
+#: src/player_qt.cpp:761
+msgid "Seek forward 10 seconds."
+msgstr ""
+
+#: src/player_qt.cpp:765
+msgid "Seek forward 1 minute."
+msgstr ""
+
+#: src/player_qt.cpp:769
+msgid "Seek forward 10 minutes."
+msgstr ""
+
+#: src/player_qt.cpp:941
+msgid "Display Color Adjustments"
+msgstr ""
+
+#: src/player_qt.cpp:943
+msgid "Contrast:"
+msgstr ""
+
+#: src/player_qt.cpp:954
+msgid "Brightness:"
+msgstr ""
+
+#: src/player_qt.cpp:965
+msgid "Hue:"
+msgstr ""
+
+#: src/player_qt.cpp:976
+msgid "Saturation:"
+msgstr ""
+
+#: src/player_qt.cpp:988 src/player_qt.cpp:1147 src/player_qt.cpp:1266
+#: src/player_qt.cpp:1565 src/player_qt.cpp:2193 src/player_qt.cpp:2367
+msgid "OK"
+msgstr ""
+
+#: src/player_qt.cpp:1118
+msgid "Display Crosstalk Calibration"
+msgstr ""
+
+#. TRANSLATORS: Please keep the lines short using where necessary.
+#: src/player_qt.cpp:1121
+msgid ""
+"Please read the manual to find out how to measure the crosstalk "
+"levels of your display."
+msgstr ""
+
+#: src/player_qt.cpp:1125
+msgid "Red:"
+msgstr ""
+
+#: src/player_qt.cpp:1132
+msgid "Green:"
+msgstr ""
+
+#: src/player_qt.cpp:1139
+msgid "Blue:"
+msgstr ""
+
+#: src/player_qt.cpp:1208
+msgid "Subtitle Settings"
+msgstr ""
+
+#: src/player_qt.cpp:1210
+msgid "These settings apply to soft subtitles, but not to bitmaps."
+msgstr ""
+
+#: src/player_qt.cpp:1212
+msgid "Encoding:"
+msgstr ""
+
+#: src/player_qt.cpp:1213
+msgid "Set the subtitle character set encoding."
+msgstr ""
+
+#: src/player_qt.cpp:1227
+msgid "Override font:"
+msgstr ""
+
+#: src/player_qt.cpp:1228
+msgid "Override the subtitle font family."
+msgstr ""
+
+#: src/player_qt.cpp:1236
+msgid "Override font size:"
+msgstr ""
+
+#: src/player_qt.cpp:1237
+msgid "Override the subtitle font size."
+msgstr ""
+
+#: src/player_qt.cpp:1246
+msgid "Override scale factor:"
+msgstr ""
+
+#: src/player_qt.cpp:1247
+msgid "Override the subtitle scale factor."
+msgstr ""
+
+#: src/player_qt.cpp:1257
+msgid "Override color:"
+msgstr ""
+
+#: src/player_qt.cpp:1258
+msgid "Override the subtitle color."
+msgstr ""
+
+#: src/player_qt.cpp:1514
+msgid "Stereoscopic Video Settings"
+msgstr ""
+
+#: src/player_qt.cpp:1516
+msgid "Parallax:"
+msgstr ""
+
+#: src/player_qt.cpp:1517
+msgid ""
+"Adjust parallax, from -1 to +1. This changes the separation of left and "
+"right view, and thus the perceived distance of the scene."
+msgstr ""
+
+#: src/player_qt.cpp:1532
+msgid "Subtitle parallax:"
+msgstr ""
+
+#: src/player_qt.cpp:1533
+msgid ""
+"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
+"distance of the subtitles."
+msgstr ""
+
+#: src/player_qt.cpp:1548
+msgid "Ghostbusting:"
+msgstr ""
+
+#: src/player_qt.cpp:1549
+msgid ""
+"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
+"does not work with anaglyph glasses."
+msgstr ""
+
+#: src/player_qt.cpp:1753
+msgid "&File"
+msgstr ""
+
+#: src/player_qt.cpp:1754
+msgid "&Open..."
+msgstr ""
+
+#: src/player_qt.cpp:1758
+msgid "Open &URL..."
+msgstr ""
+
+#: src/player_qt.cpp:1762
+msgid "&Quit..."
+msgstr ""
+
+#: src/player_qt.cpp:1766
+msgid "&Preferences"
+msgstr ""
+
+#: src/player_qt.cpp:1767
+msgid "Display &Color Adjustments..."
+msgstr ""
+
+#: src/player_qt.cpp:1770
+msgid "Display Cross&talk Calibration..."
+msgstr ""
+
+#: src/player_qt.cpp:1774
+msgid "&Subtitle Settings..."
+msgstr ""
+
+#: src/player_qt.cpp:1778
+msgid "Stereoscopic Video Settings..."
+msgstr ""
+
+#: src/player_qt.cpp:1781
+msgid "&Help"
+msgstr ""
+
+#: src/player_qt.cpp:1782
+msgid "&Manual..."
+msgstr ""
+
+#: src/player_qt.cpp:1786
+msgid "&Website..."
+msgstr ""
+
+#: src/player_qt.cpp:1789
+msgid "&Keyboard Shortcuts"
+msgstr ""
+
+#: src/player_qt.cpp:1792
+msgid "&About"
+msgstr ""
+
+#: src/player_qt.cpp:1846 src/player_qt.cpp:2269 src/player_qt.cpp:2277
+#: src/video_output_qt.cpp:84 src/video_output_qt.cpp:302
+#: src/video_output_qt.cpp:347
+msgid "Error"
+msgstr ""
+
+#: src/player_qt.cpp:2170
+msgid "Open files"
+msgstr ""
+
+#: src/player_qt.cpp:2189
+msgid "Open URL"
+msgstr ""
+
+#: src/player_qt.cpp:2190
+msgid "URL:"
+msgstr ""
+
+#: src/player_qt.cpp:2194
+msgid "Cancel"
+msgstr ""
+
+#: src/player_qt.cpp:2269
+msgid "Cannot open manual."
+msgstr ""
+
+#: src/player_qt.cpp:2277
+msgid "Cannot open website."
+msgstr ""
+
+#: src/player_qt.cpp:2283
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#. TRANSLATORS: This is a HTML table, shown under Help->Keyboard Shortcuts.
+#. Please make sure that your translation formats properly.
+#: src/player_qt.cpp:2286
+msgid ""
+"Keyboard control: (Click into the video area to give it the keyboard "
+"focus if necessary.)<table><tr><td>q or ESC</td><td>Stop</td></tr><tr><td>p "
+"or SPACE</td><td>Pause / unpause</td></tr><tr><td>f</td><td>Toggle "
+"fullscreen</td></tr><tr><td>c</td><td>Center window</td></tr><tr><td>e</"
+"td><td>Swap left/right eye</td></tr><tr><td>v</td><td>Cycle through "
+"available video streams</td></tr><tr><td>a</td><td>Cycle through available "
+"audio streams</td></tr><tr><td>s</td><td>Cycle through available subtitle "
+"streams</td></tr><tr><td>1, 2</td><td>Adjust contrast</td></tr><tr><td>3, 4</"
+"td><td>Adjust brightness</td></tr><tr><td>5, 6</td><td>Adjust hue</td></"
+"tr><tr><td>7, 8</td><td>Adjust saturation</td></tr><tr><td>&lt;, &gt;</"
+"td><td>Adjust parallax</td></tr><tr><td>(, )</td><td>Adjust ghostbusting</"
+"td></tr><tr><td>left, right</td><td>Seek 10 seconds backward / forward</td></"
+"tr><tr><td>up, down</td><td>Seek 1 minute backward / forward</td></"
+"tr><tr><td>page up, page down</td><td>Seek 10 minutes backward / forward</"
+"td></tr></table>"
+msgstr ""
+
+#: src/player_qt.cpp:2314
+#, c-format
+msgid "About %s"
+msgstr ""
+
+#: src/player_qt.cpp:2320
+#, c-format
+msgid "The %s 3D video player"
+msgstr ""
+
+#: src/player_qt.cpp:2325
+#, c-format
+msgid ""
+"%s version %s.Copyright (C) 2011 the Bino developers.This "
+"is free software. You may redistribute copies of it under the terms of the "
+"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
+"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
+"\"%s\">%s</a> for more information on this software."
+msgstr ""
+
+#: src/player_qt.cpp:2362
+msgid "About"
+msgstr ""
+
+#: src/player_qt.cpp:2363
+msgid "Libraries"
+msgstr ""
+
+#: src/player_qt.cpp:2364
+msgid "Team"
+msgstr ""
+
+#: src/player_qt.cpp:2365
+msgid "License"
+msgstr ""
+
+#: src/subtitle_renderer.cpp:217
+msgid "Cannot initialize LibASS."
+msgstr ""
+
+#: src/subtitle_renderer.cpp:224
+msgid "Cannot initialize LibASS renderer."
+msgstr ""
+
+#: src/subtitle_renderer.cpp:317
+msgid "Cannot initialize LibASS track."
+msgstr ""
+
+#: src/subtitle_renderer.cpp:328
+#, c-format
+msgid "Subtitle character set conversion failed: %s"
+msgstr ""
+
+#: src/video_output.cpp:375 src/video_output.cpp:485
+msgid "Cannot create a PBO buffer."
+msgstr ""
+
+#: src/video_output_qt.cpp:291
+#, c-format
+msgid "Cannot initialize GLEW: %s"
+msgstr ""
+
+#: src/video_output_qt.cpp:337
+msgid "The display does not support OpenGL stereo mode."
+msgstr ""
+
+#: src/video_output_qt.cpp:342
+msgid "Cannot set OpenGL context format."
+msgstr ""
+
+#: src/xgl.cpp:200
+#, c-format
+msgid "OpenGL FBO error %s."
+msgstr ""
+
+#: src/xgl.cpp:217
+#, c-format
+msgid "OpenGL error 0x%04X."
+msgstr ""
+
+#: src/xgl.cpp:282
+#, c-format
+msgid "OpenGL %s '%s': compiler warning:"
+msgstr ""
+
+#: src/xgl.cpp:283 src/xgl.cpp:292
+msgid "vertex shader"
+msgstr ""
+
+#: src/xgl.cpp:284 src/xgl.cpp:293
+msgid "geometry shader"
+msgstr ""
+
+#: src/xgl.cpp:285 src/xgl.cpp:294
+msgid "fragment shader"
+msgstr ""
+
+#: src/xgl.cpp:291
+#, c-format
+msgid "OpenGL %s '%s': compilation failed."
+msgstr ""
+
+#: src/xgl.cpp:296 src/xgl.cpp:363
+msgid "unknown error"
+msgstr ""
+
+#: src/xgl.cpp:357
+#, c-format
+msgid "OpenGL program '%s': linker warning:"
+msgstr ""
+
+#: src/xgl.cpp:362
+#, c-format
+msgid "OpenGL program '%s': linking failed."
+msgstr ""

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
+#: src/media_data.cpp:392 src/media_data.cpp:415 src/media_data.cpp:453
+#: src/media_data.cpp:458
+msgid "unknown"
+msgstr "neznámá"
+
+#: src/lib_versions.cpp:181
+msgid "not used"
+msgstr "nevyužívá se"
+
+#: src/main.cpp:259
+#, c-format
+msgid "%s version %s"
+msgstr "%s verze %s"
+
+#: src/main.cpp:260
+msgid "Copyright (C) 2011 the Bino developers."
+msgstr "Copyright (C) 2011 Bino vývojáři."
+
+#: src/main.cpp:261
+msgid ""
+"This is free software. You may redistribute copies of it under the terms of "
+"the GNU General Public License. There is NO WARRANTY, to the extent "
+"permitted by law."
+msgstr ""
+"Tento program je svobodný software. Můžete jej šířit a modifikovat podle "
+"ustanovení GNU General Public License.Tento program je rozšiřován v naději, "
+"že bude užitečný, avšak BEZ JAKÉKOLI ZÁRUKY; neposkytují se ani odvozené "
+"záruky PRODEJNOSTI anebo VHODNOSTI PRO URČITÝ ÚČEL."
+
+#: src/main.cpp:264 src/player_qt.cpp:2337
+msgid "Platform:"
+msgstr "Platforma:"
+
+#: src/main.cpp:266 src/player_qt.cpp:2338
+msgid "Libraries used:"
+msgstr "Použité knihovny:"
+
+#. TRANSLATORS: This is the --help text. Translate only the description,
+#. not the option names. Please keep a proper indentation with spaces, and
+#. keep the line length limited.
+#: src/main.cpp:278
+#, c-format
+msgid ""
+"Usage:\n"
+" %s [option...] [file...]\n"
+"\n"
+"Options:\n"
+" --help Print help.\n"
+" --version Print version.\n"
+" -n|--no-gui Do not use the GUI, just show a plain window.\n"
+" -l|--log-level=LEVEL Set log level (debug/info/warning/error/quiet).\n"
+" -v|--video=STREAM Select video stream (1-n, depending on input).\n"
+" -a|--audio=STREAM Select audio stream (1-n, depending on input).\n"
+" -s|--subtitle=STREAM Select subtitle stream (0-n, depending on "
+"input).\n"
+" -i|--input=TYPE Select input type (default autodetect):\n"
+" mono Single view.\n"
+" separate-left-right Left/right separate streams, left first.\n"
+" separate-right-left Left/right separate streams, right first.\n"
+" top-bottom Left top, right bottom.\n"
+" top-bottom-half Left top, right bottom, half height.\n"
+" bottom-top Left bottom, right top.\n"
+" bottom-top-half Left bottom, right top, half height.\n"
+" left-right Left left, right right.\n"
+" left-right-half Left left, right right, half width.\n"
+" right-left Left right, right left.\n"
+" right-left-half Left right, right left, half width.\n"
+" even-odd-rows Left even rows, right odd rows.\n"
+" odd-even-rows Left odd rows, right even rows.\n"
+" -o|--output=TYPE Select output type:\n"
+" mono-left Only left.\n"
+" mono-right Only right.\n"
+" top-bottom Left top, right bottom.\n"
+" top-bottom-half Left top, right bottom, half height.\n"
+" left-right Left left, right right.\n"
+" left-right-half Left left, right right, half width.\n"
+" even-odd-rows Left even rows, right odd rows.\n"
+" even-odd-columns Left even columns, right odd columns.\n"
+" checkerboard Left and right in checkerboard pattern.\n"
+" hdmi-frame-pack HDMI frame packing mode.\n"
+" red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
+" red-cyan-half-color Red/cyan anaglyph, half color method.\n"
+" red-cyan-full-color Red/cyan anaglyph, full color method.\n"
+" red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
+" green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
+" green-magenta-half-color Green/magenta anaglyph, half color method.\n"
+" green-magenta-full-color Green/magenta anaglyph, full color method.\n"
+" green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
+" amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
+" amber-blue-half-color Amber/blue anaglyph, half color method.\n"
+" amber-blue-full-color Amber/blue anaglyph, full color method.\n"
+" amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
+" red-green-monochrome Red/green anaglyph, monochrome method.\n"
+" red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
+" stereo OpenGL quad-buffered stereo.\n"
+" equalizer Multi-display via Equalizer (2D setup).\n"
+" equalizer-3d Multi-display via Equalizer (3D setup).\n"
+" -S|--swap-eyes Swap left/right view.\n"
+" -f|--fullscreen Fullscreen.\n"
+" -c|--center Center window on screen.\n"
+" --subtitle-encoding=ENC Set subtitle encoding.\n"
+" --subtitle-font=FONT Set subtitle font name.\n"
+" --subtitle-size=N Set subtitle font size.\n"
+" --subtitle-scale=S Set subtitle scale factor.\n"
+" --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
+" --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
+" -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
+" -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-separated\n"
+" values for the R,G,B channels.\n"
+" -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
+" -b|--benchmark Benchmark mode (no audio, show fps).\n"
+"\n"
+"Interactive control:\n"
+" q or ESC Quit.\n"
+" p or SPACE Pause / unpause.\n"
+" f Toggle fullscreen.\n"
+" c Center window.\n"
+" e Swap left/right eye.\n"
+" v Cycle through available video streams.\n"
+" a Cycle through available audio streams.\n"
+" s Cycle through available subtitle streams.\n"
+" 1, 2 Adjust contrast.\n"
+" 3, 4 Adjust brightness.\n"
+" 5, 6 Adjust hue.\n"
+" 7, 8 Adjust saturation.\n"
+" <, > Adjust parallax.\n"
+" (, ) Adjust ghostbusting.\n"
+" left, right Seek 10 seconds backward / forward.\n"
+" up, down Seek 1 minute backward / forward.\n"
+" page up, page down Seek 10 minutes backward / forward.\n"
+" Mouse click Seek according to horizontal click position."
+msgstr ""
+"Použití:\n"
+" %s [volba...] [soubor...]\n"
+"\n"
+"Options:\n"
+" --help Vytiskni nápovědu.\n"
+" --version Vytiskni verzi.\n"
+" -n|--no-gui Nepoužívej grafické rozhraní, pouze zobraz holé "
+"okno.\n"
+" -l|--log-level=LEVEL Co se bude logovat (debug/info/warning/error/"
+"quiet).\n"
+" -v|--video=STREAM Vyber video stopu(1-n, záleží na vstupu).\n"
+" -a|--audio=STREAM Vyber zvukovou stopu (1-n, záleží na vstupu).\n"
+" -s|--subtitle=STREAM Vyber stopu titulků (0-n, záleží na vstupu).\n"
+" -i|--input=TYPE Vyber vstupní formát (výchozí je automatická "
+"detekce):\n"
+" mono Jeden obraz.\n"
+" separate-left-right Oddělená levá/pravá stopa, levá první.\n"
+" separate-right-left Oddělená levá/pravá stopa, pravá první.\n"
+" top-bottom Levá nahoře, pravá dole.\n"
+" top-bottom-half Levá nahoře, pravá dole, poloviční výška.\n"
+" bottom-top Left dole, pravá nahoře.\n"
+" bottom-top-half Left dole, pravá nahoře, poloviční výška.\n"
+" left-right Levá nalevo, pravá napravo.\n"
+" left-right-half Levá nalevo, pravá napravo, poloviční šířka.\n"
+" right-left Levá napravo, pravá nalevo.\n"
+" right-left-half Levá napravo, pravá nalevo, poloviční šířka.\n"
+" even-odd-rows Levá sudé řádky, pravá liché.\n"
+" odd-even-rows Levá liché řádky, pravá sudé.\n"
+" -o|--output=TYPE Vyber výstupní formát:\n"
+" mono-left Pouze levá.\n"
+" mono-right Pouze pravá.\n"
+" top-bottom Levá nahoře, pravá dole.\n"
+" top-bottom-half Levá nahoře, pravá dole, poloviční výška.\n"
+" left-right Levá nalevo, pravá napravo.\n"
+" left-right-half Levá nalevo, pravá napravo, poloviční šířka.\n"
+" even-odd-rows Levá sudé řádky, pravá liché.\n"
+" even-odd-columns Levá sudé sloupce, pravá liché.\n"
+" checkerboard Levý a pravý v šachovnici.\n"
+" hdmi-frame-pack HDMI režim.\n"
+" red-cyan-monochrome Červená/modrá anaglyf, stupně šedi.\n"
+" red-cyan-half-color Červená/modrá anaglyf, polotóny.\n"
+" red-cyan-full-color Červená/modrá anaglyf, plné tóny.\n"
+" red-cyan-dubois Červená/modrá anaglyf, Dubois.\n"
+" green-magenta-monochrome Zelená/fialová anaglyf, stupně šedi.\n"
+" green-magenta-half-color Zelená/fialová anaglyf, polotóny.\n"
+" green-magenta-full-color Zelená/fialová anaglyf, plné tóny.\n"
+" green-magenta-dubois Zelená/fialová anaglyf, Dubois.\n"
+" amber-blue-monochrome Žlutá/modrá anaglyf, stupně šedi.\n"
+" amber-blue-half-color Žlutá/modrá anaglyf, polotóny.\n"
+" amber-blue-full-color Žlutá/modrá anaglyf, plné tóny.\n"
+" amber-blue-dubois Žlutá/modrá anaglyf, Dubois.\n"
+" red-green-monochrome Červená/zelená anaglyf, stupně šedi.\n"
+" red-blue-monochrome Červená/modrá anaglyf, stupně šedi.\n"
+" stereo OpenGL quad-buffered stereo.\n"
+" equalizer Více monitorů použitím Equalizer (2D scéna).\n"
+" equalizer-3d Více monitorů použitím Equalizer (3D scéna).\n"
+" -S|--swap-eyes Prohoď levou/pravou.\n"
+" -f|--fullscreen Celá obrazovka.\n"
+" -c|--center Vycentruj okno na středu monitoru.\n"
+" --subtitle-encoding=ENC Nastav kódování titulků.\n"
+" --subtitle-font=FONT Nastav písmo titulků.\n"
+" --subtitle-size=N Nastav velikost titulků.\n"
+" --subtitle-scale=S Nastav škálovací poměr titulků.\n"
+" --subtitle-color=COLOR Nastav barvu titulků, ve formátu [AA]RRGGBB.\n"
+" --subtitle-parallax=VAL Nastav parallax titulků (-1 až +1).\n"
+" -P|--parallax=VAL Nastv parallax (-1 až +1).\n"
+" -C|--crosstalk=VAL Crosstalk (0 až 1); oddělený středníky\n"
+" hodnoty pro kanály R,G,B.\n"
+" -G|--ghostbust=VAL Ghostbusting (0 to 1).\n"
+" -b|--benchmark Test výkonu (bez zvuk, zobrazuje fps).\n"
+"\n"
+"Interaktivní ovládání:\n"
+" q nebo ESC Ukončit.\n"
+" p nebo MEZERA Pozastav / pokračuj.\n"
+" f Přepni na celou obrazovku.\n"
+" c Vycentruj okno.\n"
+" e Prohoď levé/pravé oko.\n"
+" v Procházej dostupné video stopy.\n"
+" a Procházej dostupné zvukové stopy.\n"
+" s Procházej dostupné titulky.\n"
+" 1, 2 Uprav kontrast.\n"
+" 3, 4 Uprav jas.\n"
+" 5, 6 Uprav odstín.\n"
+" 7, 8 Uprav sytost.\n"
+" <, > Uprav parallax.\n"
+" (, ) Uprav ghostbusting.\n"
+" levá, pravá Přeskoč 10 sekund dopředu / zpět.\n"
+" nahoru, dolů Přeskoč 1 minutu dopředu / zpět.\n"
+" page up, page down Přeskoč 10 minut dopředu / zpět.\n"
+" Stisk myši Přeskoč vzhledem k horizontální pozici myši."
+
+#: src/main.cpp:476
+msgid "Benchmark mode: audio and time synchronization disabled."
+msgstr "Testovací režim, synchronizace zvuku a času je vypnuta."
+
+#: src/main.cpp:488
+msgid "This version of Bino was compiled without support for Equalizer."
+msgstr "Tato verze Bina byla zkompilována bez podpory knihovny Equalizer."
+
+#: src/main.cpp:505
+msgid "No video to play."
+msgstr "Nenalezeno žádné video."
+
+#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
+#: src/media_data.cpp:263
+#, c-format
+msgid "%dx%d, %.3g:1"
+msgstr "%dx%d, %.3g:1"
+
+#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
+#: src/media_data.cpp:391
+#, c-format
+msgid "%s, %d ch., %g kHz, %d bit"
+msgstr "%s, %d ch., %g kHz, %d bit"
+
+#: src/media_input.cpp:284 src/player_qt.cpp:161
+msgid "Input:"
+msgstr "Vstup:"
+
+#: src/media_input.cpp:289
+#, c-format
+msgid "Video %s: %s"
+msgstr "Video %s: %s"
+
+#: src/media_input.cpp:294
+msgid "No video."
+msgstr "Žádná video stopa."
+
+#: src/media_input.cpp:300
+#, c-format
+msgid "Audio %s: %s"
+msgstr "Zvuk %s: %s"
+
+#: src/media_input.cpp:305
+msgid "No audio."
+msgstr "Žádná zvuková stopa."
+
+#: src/media_input.cpp:311
+#, c-format
+msgid "Subtitle %s: %s"
+msgstr "Titulky %s: %s"
+
+#: src/media_input.cpp:316
+msgid "No subtitle."
+msgstr "Žádné titulky."
+
+#: src/media_input.cpp:318
+#, c-format
+msgid "Duration: %g seconds"
+msgstr "Délka: %g sekund"
+
+#: src/media_input.cpp:321
+#, c-format
+msgid "Stereo layout: %s"
+msgstr "Stereo režim: %s"
+
+#: src/media_object.cpp:584
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with %d channels."
+msgstr "%s zvuková stopa %d: Nemohu přehrát zvukovou stopu s %d kanály."
+
+#: src/media_object.cpp:607
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with sample format %s."
+msgstr "%s zvuková stopa %d: Nemohu přehrát zvukovou stopu ve formátu %s."
+
+#: src/media_object.cpp:636 src/media_object.cpp:1094 src/xgl.cpp:297
+#, c-format
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: src/media_object.cpp:641
+#, c-format
+msgid "%s: Cannot read stream info: %s"
+msgstr "%s: Nemohu přečíst informace o stopě: %s"
+
+#: src/media_object.cpp:669
+#, c-format
+msgid "%s video stream %d: Invalid frame size."
+msgstr "%s video stopa %d: Špatná velikost obrazu."
+
+#: src/media_object.cpp:675
+#, c-format
+msgid "%s video stream %d: Unsupported video codec."
+msgstr "%s video stopa %d: Nepodporovaný kodek videa."
+
+#: src/media_object.cpp:682
+#, c-format
+msgid "%s video stream %d: Cannot open video codec: %s"
+msgstr "%s video stopa %d: Nemohu otevřít kodek videa: %s"
+
+#: src/media_object.cpp:717
+#, c-format
+msgid "%s video stream %d: Cannot initialize conversion context."
+msgstr "%s video stopa %d: Nemohu vytvořit conversion context."
+
+#: src/media_object.cpp:738
+#, c-format
+msgid "%s audio stream %d: Unsupported audio codec."
+msgstr "%s zvuková stopa %d: Nepodporovaný kodek audia."
+
+#: src/media_object.cpp:744
+#, c-format
+msgid "%s audio stream %d: Cannot open audio codec: %s"
+msgstr "%s zvuková stopa %d: Nemohu otevřít kodek zvuku: %s"
+
+#: src/media_object.cpp:777
+#, c-format
+msgid "%s subtitle stream %d: Unsupported subtitle codec."
+msgstr "%s stopa titulků %d: Nepodporovaný kodek titulků."
+
+#: src/media_object.cpp:783
+#, c-format
+msgid "%s subtitle stream %d: Cannot open subtitle codec: %s"
+msgstr "%s stopa titulků %d: Nemohu otevřít kodek titulků: %s"
+
+#: src/media_object.cpp:808
+#, c-format
+msgid "Video stream %d: %s / %s, %g seconds"
+msgstr "Video stopa %d: %s / %s, %g sekund"
+
+#: src/media_object.cpp:812
+#, c-format
+msgid "Using up to %d threads for decoding."
+msgstr "Využívám až %d vláken pro dekódování."
+
+#: src/media_object.cpp:817
+#, c-format
+msgid "Audio stream %d: %s / %s, %g seconds"
+msgstr "Zvuková stopa %d: %s / %s, %g sekund"
+
+#: src/media_object.cpp:824
+#, c-format
+msgid "Subtitle stream %d: %s / %s, %g seconds"
+msgstr "Titulky %d: %s / %s, %g sekund"
+
+#: src/media_object.cpp:831
+msgid "No usable streams."
+msgstr "Žádná použitelná stopa."
+
+#: src/media_object.cpp:1110 src/media_object.cpp:1140
+#: src/media_object.cpp:1170
+#, c-format
+msgid "%s: Cannot duplicate packet."
+msgstr "%s: Nemohu duplikovat paket."
+
+#: src/media_object.cpp:1647
+#, c-format
+msgid "%s: Seeking failed."
+msgstr "%s: Vyhledávání selhalo."
+
+#: src/player.cpp:185
+msgid "Cannot create a second master player."
+msgstr "Nemohu vytvořit druhů hlavní přehrávač."
+
+#: src/player.cpp:202
+msgid "No video streams found."
+msgstr "Nebyly nalezeny žádné video stopy."
+
+#: src/player.cpp:208
+msgid "Cannot set requested stereo layout: incompatible media."
+msgstr "Nemohu nastavit požadovaný stereo formát: nekompatibilní vstup."
+
+#: src/player.cpp:214
+#, c-format
+msgid "Video stream %d not found."
+msgstr "Video stopa %d nebyla nalezena."
+
+#: src/player.cpp:219
+#, c-format
+msgid "Audio stream %d not found."
+msgstr "Zvuková stopa %d nebyla nalezena."
+
+#: src/player.cpp:227
+#, c-format
+msgid "Subtitle stream %d not found."
+msgstr "Stopa titulků %d nebyla nalezena."
+
+#: src/player.cpp:618
+#, c-format
+msgid "Video: delay %g seconds; dropping next frame."
+msgstr "Video: zpoždění %g sekund; zahazuji následující snímek."
+
+#: src/player.cpp:630
+#, c-format
+msgid "FPS: %.2f"
+msgstr "FPS: %.2f"
+
+#: src/player_equalizer.cpp:129
+msgid "Reading input frame failed."
+msgstr "Selhalo čtení snímku."
+
+#: src/player_equalizer.cpp:243
+msgid "Init data mapping failed."
+msgstr "Počáteční mapování dat selhalo."
+
+#: src/player_equalizer.cpp:244
+msgid "Frame data mapping failed."
+msgstr "Mapování dat snímku selhalo."
+
+#: src/player_equalizer.cpp:245
+msgid "Video player initialization failed."
+msgstr "Nepodařilo se inicializovat přehrávač videa."
+
+#: src/player_equalizer.cpp:246
+msgid "Need at least OpenGL 2.1."
+msgstr "Je vyžadováno alespon OpenGL 2.1."
+
+#: src/player_equalizer.cpp:447
+msgid "No canvas in Equalizer configuration."
+msgstr "V konfiguraci Equalizeru není nastaveno plátno."
+
+#: src/player_equalizer.cpp:481
+msgid "Equalizer canvas:"
+msgstr "Plátno Equalizeru:"
+
+#: src/player_equalizer.cpp:482
+#, c-format
+msgid "%gx%g, aspect ratio %g:1"
+msgstr "%gx%g, poměr stran %g:1"
+
+#: src/player_equalizer.cpp:483
+#, c-format
+msgid "Area for %g:1 video: [ %g %g %g %g @ %g ]"
+msgstr "Oblast pro %g:1 video: [ %g %g %g %g @ %g ]"
+
+#: src/player_equalizer.cpp:896 src/video_output_qt.cpp:296
+msgid ""
+"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
+"objects."
+msgstr "OpenGL nepodporuje verzi 2.1 a framebuffer objekty."
+
+#: src/player_equalizer.cpp:1062
+msgid "Equalizer initialization failed."
+msgstr "Chyba inicializace Equalizeru."
+
+#: src/player_equalizer.cpp:1070
+msgid "Cannot get equalizer configuration."
+msgstr "Nelze získat nastavení Equalizeru."
+
+#: src/player_equalizer.cpp:1084
+msgid "Equalizer configuration initialization failed."
+msgstr "Nelze získat nastavení Equalizeru."
+
+#: src/player_qt.cpp:135
+msgid "Video:"
+msgstr "Video:"
+
+#: src/player_qt.cpp:136
+msgid "Select the video stream."
+msgstr "Vyber video stopu."
+
+#: src/player_qt.cpp:142
+msgid "Audio:"
+msgstr "Zvuk:"
+
+#: src/player_qt.cpp:143
+msgid "Select the audio stream."
+msgstr "Vyber zvukovou stopu."
+
+#: src/player_qt.cpp:149
+msgid "Subtitle:"
+msgstr "Titulky:"
+
+#: src/player_qt.cpp:150
+msgid "Select the subtitle stream."
+msgstr "Vyber stopu titulků."
+
+#: src/player_qt.cpp:162
+msgid "Set the 3D layout of the video stream."
+msgstr "Nastav 3D formát videa."
+
+#: src/player_qt.cpp:166
+msgid "2D"
+msgstr "2D"
+
+#: src/player_qt.cpp:167
+msgid "Separate streams, left first"
+msgstr "Oddělené stopy, levá první"
+
+#: src/player_qt.cpp:168
+msgid "Separate streams, right first"
+msgstr "Oddělené stopy, pravá první"
+
+#: src/player_qt.cpp:169 src/player_qt.cpp:192
+msgid "Top/bottom"
+msgstr "Nahoře/Dole"
+
+#: src/player_qt.cpp:170 src/player_qt.cpp:193
+msgid "Top/bottom, half height"
+msgstr "Nahoře/Dole, poloviční výška"
+
+#: src/player_qt.cpp:171
+msgid "Bottom/top"
+msgstr "Dole/Nahoře"
+
+#: src/player_qt.cpp:172
+msgid "Bottom/top, half height"
+msgstr "Dole/Nahoře, poloviční výška"
+
+#: src/player_qt.cpp:173 src/player_qt.cpp:194
+msgid "Left/right"
+msgstr "Levá/Pravá"
+
+#: src/player_qt.cpp:174 src/player_qt.cpp:195
+msgid "Left/right, half width"
+msgstr "Levá/Pravá, poloviční šířka"
+
+#: src/player_qt.cpp:175
+msgid "Right/left"
+msgstr "Pravá/Levá"
+
+#: src/player_qt.cpp:176
+msgid "Right/left, half width"
+msgstr "Pravá/Levá, poloviční šířka"
+
+#: src/player_qt.cpp:177 src/player_qt.cpp:196
+msgid "Even/odd rows"
+msgstr "Sudé/Liché řádky"
+
+#: src/player_qt.cpp:178
+msgid "Odd/even rows"
+msgstr "Liché/Sudé řádky"
+
+#: src/player_qt.cpp:184
+msgid "Output:"
+msgstr "Výstup:"
+
+#: src/player_qt.cpp:185
+msgid "Set the 3D output type for your display."
+msgstr "Nastav 3D formát výstupu vašeho monitoru."
+
+#: src/player_qt.cpp:189
+msgid "Left view"
+msgstr "Levý obraz"
+
+#: src/player_qt.cpp:190
+msgid "Right view"
+msgstr "Pravý obraz"
+
+#: src/player_qt.cpp:191
+msgid "OpenGL stereo"
+msgstr "OpenGL stereo"
+
+#: src/player_qt.cpp:197
+msgid "Even/odd columns"
+msgstr "Sudé/Liché sloupce"
+
+#: src/player_qt.cpp:198
+msgid "Checkerboard pattern"
+msgstr "Šachovnice"
+
+#: src/player_qt.cpp:199
+msgid "HDMI frame packing mode"
+msgstr "HDMI režim"
+
+#: src/player_qt.cpp:200
+msgid "Red/cyan glasses, monochrome method"
+msgstr "Červené/modré brýle, stupně šedi"
+
+#: src/player_qt.cpp:201
+msgid "Red/cyan glasses, half-color method"
+msgstr "Červené/modré brýle, polotóny"
+
+#: src/player_qt.cpp:202
+msgid "Red/cyan glasses, full-color method"
+msgstr "Červené/modré brýle, plné tóny"
+
+#: src/player_qt.cpp:203
+msgid "Red/cyan glasses, high-quality Dubois method"
+msgstr "Červené/modré brýle, kvalitní Dubois metoda"
+
+#: src/player_qt.cpp:204
+msgid "Green/magenta glasses, monochrome method"
+msgstr "Zelené/fialové brýle, stupně šedi"
+
+#: src/player_qt.cpp:205
+msgid "Green/magenta glasses, half-color method"
+msgstr "Zelené/fialové brýle, polotóny"
+
+#: src/player_qt.cpp:206
+msgid "Green/magenta glasses, full-color method"
+msgstr "Zelené/fialové brýle, plné tóny"
+
+#: src/player_qt.cpp:207
+msgid "Green/magenta glasses, high-quality Dubois method"
+msgstr "Zelené/fialové brýle, kvalitní Dubois metoda"
+
+#: src/player_qt.cpp:208
+msgid "Amber/blue glasses, monochrome method"
+msgstr "Žluté/modré brýle, stupně šedi"
+
+#: src/player_qt.cpp:209
+msgid "Amber/blue glasses, half-color method"
+msgstr "Žluté/modré brýle, polotóny"
+
+#: src/player_qt.cpp:210
+msgid "Amber/blue glasses, full-color method"
+msgstr "Žluté/modré brýle, plné tóny"
+
+#: src/player_qt.cpp:211
+msgid "Amber/blue glasses, high-quality Dubois method"
+msgstr "Žluté/modré brýle, kvalitní Dubois metoda"
+
+#: src/player_qt.cpp:212
+msgid "Red/green glasses, monochrome method"
+msgstr "Červené/zelené brýle, stupně šedi"
+
+#: src/player_qt.cpp:213
+msgid "Red/blue glasses, monochrome method"
+msgstr "Červené/modré brýle, stupně šedi"
+
+#: src/player_qt.cpp:217
+msgid "Swap left/right"
+msgstr "Prohoď levou/pravou"
+
+#: src/player_qt.cpp:218
+msgid ""
+"Swap the left and right view. Use this if the 3D effect seems wrong."
+msgstr ""
+"Prohoď levou a pravou. Použijte, pokud je 3D efekt špatný (obrácený)"
+
+#: src/player_qt.cpp:485
+msgid "Off"
+msgstr "Žádné"
+
+#: src/player_qt.cpp:719
+msgid ""
+"This slider shows the progress during video playback, and can be used to "
+"seek in the video."
+msgstr ""
+"Tento posuvník zobrazuje pozici přehrávaného videa, můžete ho použít pro "
+"vyhledávání ve videu."
+
+#: src/player_qt.cpp:726
+msgid "Play."
+msgstr "Spustit."
+
+#: src/player_qt.cpp:730
+msgid "Pause."
+msgstr "Pozastav."
+
+#: src/player_qt.cpp:734
+msgid "Stop."
+msgstr "Zastav."
+
+#: src/player_qt.cpp:739
+msgid ""
+"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
+"f key."
+msgstr ""
+"Přepni do režimu celé obrazovky. Tento režim můžete ukončit stiskem "
+"tlačítka f"
+
+#: src/player_qt.cpp:744
+msgid "Center the video area on your screen."
+msgstr "Vycentruj video na středu obrazovky."
+
+#: src/player_qt.cpp:749
+msgid "Seek backward 10 minutes."
+msgstr "Přeskoč 10 minut zpět."
+
+#: src/player_qt.cpp:753
+msgid "Seek backward 1 minute."
+msgstr "Přeskoč 1 minutu zpět."
+
+#: src/player_qt.cpp:757
+msgid "Seek backward 10 seconds."
+msgstr "Přeskoč 10 vteřin zpět."
+
+#: src/player_qt.cpp:761
+msgid "Seek forward 10 seconds."
+msgstr "Přeskoč 10 vteřin dopředu."
+
+#: src/player_qt.cpp:765
+msgid "Seek forward 1 minute."
+msgstr "Přeskoč 1 minutu dopředu."
+
+#: src/player_qt.cpp:769
+msgid "Seek forward 10 minutes."
+msgstr "Přeskoč 10 minut dopředu."
+
+#: src/player_qt.cpp:941
+msgid "Display Color Adjustments"
+msgstr "Zobraz nastavení barev"
+
+#: src/player_qt.cpp:943
+msgid "Contrast:"
+msgstr "Kontrast:"
+
+#: src/player_qt.cpp:954
+msgid "Brightness:"
+msgstr "Jas:"
+
+#: src/player_qt.cpp:965
+msgid "Hue:"
+msgstr "Odstín:"
+
+#: src/player_qt.cpp:976
+msgid "Saturation:"
+msgstr "Sytost:"
+
+#: src/player_qt.cpp:988 src/player_qt.cpp:1147 src/player_qt.cpp:1266
+#: src/player_qt.cpp:1565 src/player_qt.cpp:2193 src/player_qt.cpp:2367
+msgid "OK"
+msgstr "OK"
+
+#: src/player_qt.cpp:1118
+msgid "Display Crosstalk Calibration"
+msgstr "Zobra Crosstalk kalibraci"
+
+#. TRANSLATORS: Please keep the lines short using where necessary.
+#: src/player_qt.cpp:1121
+msgid ""
+"Please read the manual to find out how to measure the crosstalk "
+"levels of your display."
+msgstr ""
+"Přečtěte si prosím v manuálu jak změřit nastavení crosstalku pro "
+"váš monitor."
+
+#: src/player_qt.cpp:1125
+msgid "Red:"
+msgstr "Červená:"
+
+#: src/player_qt.cpp:1132
+msgid "Green:"
+msgstr "Zelená:"
+
+#: src/player_qt.cpp:1139
+msgid "Blue:"
+msgstr "Modrá:"
+
+#: src/player_qt.cpp:1208
+msgid "Subtitle Settings"
+msgstr "Nastavení titulků"
+
+#: src/player_qt.cpp:1210
+msgid "These settings apply to soft subtitles, but not to bitmaps."
+msgstr ""
+"Toto nastavení se aplikuje titulky v textové podobě, ne na obrázkové."
+
+#: src/player_qt.cpp:1212
+msgid "Encoding:"
+msgstr "Kódování:"
+
+#: src/player_qt.cpp:1213
+msgid "Set the subtitle character set encoding."
+msgstr "Nastaví znakovou stránku titulků."
+
+#: src/player_qt.cpp:1227
+msgid "Override font:"
+msgstr "Vynutit font:"
+
+#: src/player_qt.cpp:1228
+msgid "Override the subtitle font family."
+msgstr "Vynutí font titulků."
+
+#: src/player_qt.cpp:1236
+msgid "Override font size:"
+msgstr "Vynutit velikost fontu:"
+
+#: src/player_qt.cpp:1237
+msgid "Override the subtitle font size."
+msgstr "Vynutí velikost titulků."
+
+#: src/player_qt.cpp:1246
+msgid "Override scale factor:"
+msgstr "Vynutit zvětšení:"
+
+#: src/player_qt.cpp:1247
+msgid "Override the subtitle scale factor."
+msgstr "Vynutí zvětšní titulků."
+
+#: src/player_qt.cpp:1257
+msgid "Override color:"
+msgstr "Vynutit barvu:"
+
+#: src/player_qt.cpp:1258
+msgid "Override the subtitle color."
+msgstr "Vynutí barvu titulků."
+
+#: src/player_qt.cpp:1514
+msgid "Stereoscopic Video Settings"
+msgstr "Nastavení 3D obrazu"
+
+#: src/player_qt.cpp:1516
+msgid "Parallax:"
+msgstr "Parallax:"
+
+#: src/player_qt.cpp:1517
+msgid ""
+"Adjust parallax, from -1 to +1. This changes the separation of left and "
+"right view, and thus the perceived distance of the scene."
+msgstr ""
+"Upraví parallax, od -1 do +1. Změní vzdálenost levého a pravého obrazu a "
+"tím nastaví hloubku vnímání 3D scény."
+
+#: src/player_qt.cpp:1532
+msgid "Subtitle parallax:"
+msgstr "Parallax titulků:"
+
+#: src/player_qt.cpp:1533
+msgid ""
+"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
+"distance of the subtitles."
+msgstr ""
+"Upraví parallax titulků, od -1 do +1. Změní vnímanou vzdálenost titulků.</"
+"p>"
+
+#: src/player_qt.cpp:1548
+msgid "Ghostbusting:"
+msgstr "Ghostbusting:"
+
+#: src/player_qt.cpp:1549
+msgid ""
+"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
+"does not work with anaglyph glasses."
+msgstr ""
+"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
+"does not work with anaglyph glasses."
+
+#: src/player_qt.cpp:1753
+msgid "&File"
+msgstr "&Soubor"
+
+#: src/player_qt.cpp:1754
+msgid "&Open..."
+msgstr "&Otevřít..."
+
+#: src/player_qt.cpp:1758
+msgid "Open &URL..."
+msgstr "Otevřít &URL..."
+
+#: src/player_qt.cpp:1762
+msgid "&Quit..."
+msgstr "&Ukončit..."
+
+#: src/player_qt.cpp:1766
+msgid "&Preferences"
+msgstr "&Nastavení"
+
+#: src/player_qt.cpp:1767
+msgid "Display &Color Adjustments..."
+msgstr "Nastavení &barev..."
+
+#: src/player_qt.cpp:1770
+msgid "Display Cross&talk Calibration..."
+msgstr "Nastavení &Crosstalku..."
+
+#: src/player_qt.cpp:1774
+msgid "&Subtitle Settings..."
+msgstr "Nastavení &Titulků..."
+
+#: src/player_qt.cpp:1778
+msgid "Stereoscopic Video Settings..."
+msgstr "Nastavení 3D videa..."
+
+#: src/player_qt.cpp:1781
+msgid "&Help"
+msgstr "&Nápověda"
+
+#: src/player_qt.cpp:1782
+msgid "&Manual..."
+msgstr "&Manuál..."
+
+#: src/player_qt.cpp:1786
+msgid "&Website..."
+msgstr "&Webová stránka..."
+
+#: src/player_qt.cpp:1789
+msgid "&Keyboard Shortcuts"
+msgstr "&Klávesové zkratky"
+
+#: src/player_qt.cpp:1792
+msgid "&About"
+msgstr "&O Binu"
+
+#: src/player_qt.cpp:1846 src/player_qt.cpp:2269 src/player_qt.cpp:2277
+#: src/video_output_qt.cpp:84 src/video_output_qt.cpp:302
+#: src/video_output_qt.cpp:347
+msgid "Error"
+msgstr "Chyba"
+
+#: src/player_qt.cpp:2170
+msgid "Open files"
+msgstr "Otevři soubory"
+
+#: src/player_qt.cpp:2189
+msgid "Open URL"
+msgstr "Otevři URL"
+
+#: src/player_qt.cpp:2190
+msgid "URL:"
+msgstr "URL:"
+
+#: src/player_qt.cpp:2194
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: src/player_qt.cpp:2269
+msgid "Cannot open manual."
+msgstr "Nemohu otevřít manál."
+
+#: src/player_qt.cpp:2277
+msgid "Cannot open website."
+msgstr "Nemohu otevřít webovou stránku."
+
+#: src/player_qt.cpp:2283
+msgid "Keyboard Shortcuts"
+msgstr "Klávesové zkratky"
+
+#. TRANSLATORS: This is a HTML table, shown under Help->Keyboard Shortcuts.
+#. Please make sure that your translation formats properly.
+#: src/player_qt.cpp:2286
+msgid ""
+"Keyboard control: (Click into the video area to give it the keyboard "
+"focus if necessary.)<table><tr><td>q or ESC</td><td>Stop</td></tr><tr><td>p "
+"or SPACE</td><td>Pause / unpause</td></tr><tr><td>f</td><td>Toggle "
+"fullscreen</td></tr><tr><td>c</td><td>Center window</td></tr><tr><td>e</"
+"td><td>Swap left/right eye</td></tr><tr><td>v</td><td>Cycle through "
+"available video streams</td></tr><tr><td>a</td><td>Cycle through available "
+"audio streams</td></tr><tr><td>s</td><td>Cycle through available subtitle "
+"streams</td></tr><tr><td>1, 2</td><td>Adjust contrast</td></tr><tr><td>3, 4</"
+"td><td>Adjust brightness</td></tr><tr><td>5, 6</td><td>Adjust hue</td></"
+"tr><tr><td>7, 8</td><td>Adjust saturation</td></tr><tr><td>&lt;, &gt;</"
+"td><td>Adjust parallax</td></tr><tr><td>(, )</td><td>Adjust ghostbusting</"
+"td></tr><tr><td>left, right</td><td>Seek 10 seconds backward / forward</td></"
+"tr><tr><td>up, down</td><td>Seek 1 minute backward / forward</td></"
+"tr><tr><td>page up, page down</td><td>Seek 10 minutes backward / forward</"
+"td></tr></table>"
+msgstr ""
+"Ovládání klávesnicí: (Je nutné kliknout do oblasti vide, aby přijímala "
+"příkazy z klávesnice.)<table><tr><td>q nebo ESC</td><td>Ukončit</td></"
+"tr><tr><td>p nebo MEZERA</td><td>Pozastav / pokračuj</td></tr><tr><td>f</"
+"td><td>Přepni na celou obrazovku</td></tr><tr><td>c</td><td>Vycentruj okno</"
+"td></tr><tr><td>e</td><td>Prohoď levé/pravé oko</td></tr><tr><td>v</"
+"td><td>Procházej dostupné video stopy</td></tr><tr><td>a</td><td>Procházej "
+"dostupné zvukové stopy</td></tr><tr><td>s</td><td>Procházej dostupné "
+"titulky</td></tr><tr><td>1, 2</td><td>Uprav kontrast</td></tr><tr><td>3, 4</"
+"td><td>Uprav jas</td></tr><tr><td>5, 6</td><td>Uprav odstín</td></"
+"tr><tr><td>7, 8</td><td>Uprav sytost</td></tr><tr><td>&lt;, &gt;</"
+"td><td>Uprav parallax</td></tr><tr><td>(, )</td><td>Uprav ghostbusting</td></"
+"tr><tr><td>left, right</td><td>Přeskoč 10 sekund dopředu / zpět</td></"
+"tr><tr><td>up, down</td><td>Přeskoč 1 minutu dopředu / zpět</td></"
+"tr><tr><td>page up, page down</td><td>Přeskoč 10 minut dopředu / zpět</td></"
+"tr></table>"
+
+#: src/player_qt.cpp:2314
+#, c-format
+msgid "About %s"
+msgstr "O pragramu %s"
+
+#: src/player_qt.cpp:2320
+#, c-format
+msgid "The %s 3D video player"
+msgstr "%s 3D video přehrávač"
+
+#: src/player_qt.cpp:2325
+#, c-format
+msgid ""
+"%s version %s.Copyright (C) 2011 the Bino developers.This "
+"is free software. You may redistribute copies of it under the terms of the "
+"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
+"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
+"\"%s\">%s</a> for more information on this software."
+msgstr ""
+"%s verze %s.Copyright (C) 2011 Bino vývojáři.Tento program "
+"je svobodný software. Můžete jej šířit a modifikovat podle ustanovení <a "
+"href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</a>."
+"Tento program je rozšiřován v naději, že bude užitečný, avšak BEZ JAKÉKOLI "
+"ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI anebo VHODNOSTI PRO "
+"URČITÝ ÚČEL.Navštivte <a href=\"%s\">%s</a> pro více informací o "
+"tomto software."
+
+#: src/player_qt.cpp:2362
+msgid "About"
+msgstr "O programu"
+
+#: src/player_qt.cpp:2363
+msgid "Libraries"
+msgstr "Knihovny"
+
+#: src/player_qt.cpp:2364
+msgid "Team"
+msgstr "Tým"
+
+#: src/player_qt.cpp:2365
+msgid "License"
+msgstr "Licence"
+
+#: src/subtitle_renderer.cpp:217
+msgid "Cannot initialize LibASS."
+msgstr "Nemohu inicializovat LibASS."
+
+#: src/subtitle_renderer.cpp:224
+msgid "Cannot initialize LibASS renderer."
+msgstr "Nemohu inicializovat vykreslování LibASS."
+
+#: src/subtitle_renderer.cpp:317
+msgid "Cannot initialize LibASS track."
+msgstr "Nemohu inicializovat LibASS stopu."
+
+#: src/subtitle_renderer.cpp:328
+#, c-format
+msgid "Subtitle character set conversion failed: %s"
+msgstr "Konverze kódování titulků selhala: %s"
+
+#: src/video_output.cpp:375 src/video_output.cpp:485
+msgid "Cannot create a PBO buffer."
+msgstr "Nemohu vytvořit PBO buffer."
+
+#: src/video_output_qt.cpp:291
+#, c-format
+msgid "Cannot initialize GLEW: %s"
+msgstr "Nemohu inicializovat GLEW: %s"
+
+#: src/video_output_qt.cpp:337
+msgid "The display does not support OpenGL stereo mode."
+msgstr "Stereo OpenGL režim není podporován."
+
+#: src/video_output_qt.cpp:342
+msgid "Cannot set OpenGL context format."
+msgstr "Nemohu nastavit OpenGL formát."
+
+#: src/xgl.cpp:200
+#, c-format
+msgid "OpenGL FBO error %s."
+msgstr "Chyba FBO %s."
+
+#: src/xgl.cpp:217
+#, c-format
+msgid "OpenGL error 0x%04X."
+msgstr "OpenGL chyba 0x%04X."
+
+#: src/xgl.cpp:282
+#, c-format
+msgid "OpenGL %s '%s': compiler warning:"
+msgstr "OpenGL %s '%s': varování při kompilaci:"
+
+#: src/xgl.cpp:283 src/xgl.cpp:292
+msgid "vertex shader"
+msgstr "vertex shader"
+
+#: src/xgl.cpp:284 src/xgl.cpp:293
+msgid "geometry shader"
+msgstr "geometry shader"
+
+#: src/xgl.cpp:285 src/xgl.cpp:294
+msgid "fragment shader"
+msgstr "fragment shader"
+
+#: src/xgl.cpp:291
+#, c-format
+msgid "OpenGL %s '%s': compilation failed."
+msgstr "OpenGL %s '%s': selhala kompilace."
+
+#: src/xgl.cpp:296 src/xgl.cpp:363
+msgid "unknown error"
+msgstr "neznámá chyba"
+
+#: src/xgl.cpp:357
+#, c-format
+msgid "OpenGL program '%s': linker warning:"
+msgstr "OpenGL program '%s': varování linkeru:"
+
+#: src/xgl.cpp:362
+#, c-format
+msgid "OpenGL program '%s': linking failed."
+msgstr "OpenGL program '%s': selhalo linkování."

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"
+msgstr "unbekannt"
+
+#: src/lib_versions.cpp:181
+msgid "not used"
+msgstr "nicht benutzt"
+
+#: src/main.cpp:259
+#, c-format
+msgid "%s version %s"
+msgstr "%s Version %s"
+
+#: src/main.cpp:260
+msgid "Copyright (C) 2011 the Bino developers."
+msgstr "Copyright (C) 2011 Bino Entwickler."
+
+#: src/main.cpp:261
+msgid ""
+"This is free software. You may redistribute copies of it under the terms of "
+"the GNU General Public License. There is NO WARRANTY, to the extent "
+"permitted by law."
+msgstr ""
+"Dies ist freie Software. Du kannst Kopien davon verteilen unter den "
+"Bedingungen der GNU General Public License. Es gibt keine Garantie."
+
+#: src/main.cpp:264 src/player_qt.cpp:2337
+msgid "Platform:"
+msgstr "Plattform:"
+
+#: src/main.cpp:266 src/player_qt.cpp:2338
+msgid "Libraries used:"
+msgstr "Benutzte Bibliotheken:"
+
+#. TRANSLATORS: This is the --help text. Translate only the description,
+#. not the option names. Please keep a proper indentation with spaces, and
+#. keep the line length limited.
+#: src/main.cpp:278
+#, c-format
+msgid ""
+"Usage:\n"
+" %s [option...] [file...]\n"
+"\n"
+"Options:\n"
+" --help Print help.\n"
+" --version Print version.\n"
+" -n|--no-gui Do not use the GUI, just show a plain window.\n"
+" -l|--log-level=LEVEL Set log level (debug/info/warning/error/quiet).\n"
+" -v|--video=STREAM Select video stream (1-n, depending on input).\n"
+" -a|--audio=STREAM Select audio stream (1-n, depending on input).\n"
+" -s|--subtitle=STREAM Select subtitle stream (0-n, depending on "
+"input).\n"
+" -i|--input=TYPE Select input type (default autodetect):\n"
+" mono Single view.\n"
+" separate-left-right Left/right separate streams, left first.\n"
+" separate-right-left Left/right separate streams, right first.\n"
+" top-bottom Left top, right bottom.\n"
+" top-bottom-half Left top, right bottom, half height.\n"
+" bottom-top Left bottom, right top.\n"
+" bottom-top-half Left bottom, right top, half height.\n"
+" left-right Left left, right right.\n"
+" left-right-half Left left, right right, half width.\n"
+" right-left Left right, right left.\n"
+" right-left-half Left right, right left, half width.\n"
+" even-odd-rows Left even rows, right odd rows.\n"
+" odd-even-rows Left odd rows, right even rows.\n"
+" -o|--output=TYPE Select output type:\n"
+" mono-left Only left.\n"
+" mono-right Only right.\n"
+" top-bottom Left top, right bottom.\n"
+" top-bottom-half Left top, right bottom, half height.\n"
+" left-right Left left, right right.\n"
+" left-right-half Left left, right right, half width.\n"
+" even-odd-rows Left even rows, right odd rows.\n"
+" even-odd-columns Left even columns, right odd columns.\n"
+" checkerboard Left and right in checkerboard pattern.\n"
+" hdmi-frame-pack HDMI frame packing mode.\n"
+" red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
+" red-cyan-half-color Red/cyan anaglyph, half color method.\n"
+" red-cyan-full-color Red/cyan anaglyph, full color method.\n"
+" red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
+" green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
+" green-magenta-half-color Green/magenta anaglyph, half color method.\n"
+" green-magenta-full-color Green/magenta anaglyph, full color method.\n"
+" green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
+" amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
+" amber-blue-half-color Amber/blue anaglyph, half color method.\n"
+" amber-blue-full-color Amber/blue anaglyph, full color method.\n"
+" amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
+" red-green-monochrome Red/green anaglyph, monochrome method.\n"
+" red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
+" stereo OpenGL quad-buffered stereo.\n"
+" equalizer Multi-display via Equalizer (2D setup).\n"
+" equalizer-3d Multi-display via Equalizer (3D setup).\n"
+" -S|--swap-eyes Swap left/right view.\n"
+" -f|--fullscreen Fullscreen.\n"
+" -c|--center Center window on screen.\n"
+" --subtitle-encoding=ENC Set subtitle encoding.\n"
+" --subtitle-font=FONT Set subtitle font name.\n"
+" --subtitle-size=N Set subtitle font size.\n"
+" --subtitle-scale=S Set subtitle scale factor.\n"
+" --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
+" --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
+" -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
+" -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-separated\n"
+" values for the R,G,B channels.\n"
+" -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
+" -b|--benchmark Benchmark mode (no audio, show fps).\n"
+"\n"
+"Interactive control:\n"
+" q or ESC Quit.\n"
+" p or SPACE Pause / unpause.\n"
+" f Toggle fullscreen.\n"
+" c Center window.\n"
+" e Swap left/right eye.\n"
+" v Cycle through available video streams.\n"
+" a Cycle through available audio streams.\n"
+" s Cycle through available subtitle streams.\n"
+" 1, 2 Adjust contrast.\n"
+" 3, 4 Adjust brightness.\n"
+" 5, 6 Adjust hue.\n"
+" 7, 8 Adjust saturation.\n"
+" <, > Adjust parallax.\n"
+" (, ) Adjust ghostbusting.\n"
+" left, right Seek 10 seconds backward / forward.\n"
+" up, down Seek 1 minute backward / forward.\n"
+" page up, page down Seek 10 minutes backward / forward.\n"
+" Mouse click Seek according to horizontal click position."
+msgstr ""
+"Benutzung:\n"
+" %s [Option...] [Datei...]\n"
+"\n"
+"Optionen:\n"
+" --help Zeige Hilfe.\n"
+" --version Zeige Version.\n"
+" -n|--no-gui Starte ohne GUI, zeige nur ein Video Fenster.\n"
+" -l|--log-level=LEVEL Setze Loglevel (debug/info/warning/error/quiet).\n"
+" -v|--video=STREAM Wähle Videokanal (1-n, je nach Eingabe).\n"
+" -a|--audio=STREAM Wähle Audiokanal (1-n, je nach Eingabe).\n"
+" -s|--subtitle=STREAM Wähle Untertitelkanal (0-n, je nach Eingabe).\n"
+" -i|--input=TYPE Wähle Eingabetyp (sonst automatisch detektiert):\n"
+" mono Einzelne Sicht.\n"
+" separate-left-right Links/rechts getrennte Kanäle, links zuerst.\n"
+" separate-right-left Links/rechts getrennte Kanäle, rechts zuerst.\n"
+" top-bottom Links oben, rechts unten.\n"
+" top-bottom-half Links oben, rechts unten, halbe Höhe.\n"
+" bottom-top Links unten, rechts oben.\n"
+" bottom-top-half Links unten, rechts oben, halbe Höhe.\n"
+" left-right Links links, rechts rechts.\n"
+" left-right-half Links links, rechts rechts, halbe Breite.\n"
+" right-left Links rechts, rechts links.\n"
+" right-left-half Links rechts, rechts links, halbe Breite.\n"
+" even-odd-rows Links gerade Zeilen, rechts ungerade Zeilen.\n"
+" odd-even-rows Links ungerade Zeilen, rechts gerade Zeilen.\n"
+" -o|--output=TYPE Wähle Ausgabemodus:\n"
+" mono-left Nur links.\n"
+" mono-right Nur rechts.\n"
+" top-bottom Links oben, rechts unten.\n"
+" top-bottom-half Links oben, rechts unten, halbe Höhe.\n"
+" left-right Links links, rechts rechts.\n"
+" left-right-half Links links, rechts rechts, halbe Breite.\n"
+" even-odd-rows Links gerade Zeilen, rechts ungerade Zeilen.\n"
+" even-odd-columns Links gerade Spalten, rechts ungerade Spalten.\n"
+" checkerboard Links und rechts im Schachbrettmuster.\n"
+" hdmi-frame-pack HDMI Framepacking modus.\n"
+" red-cyan-monochrome Rot/cyan Anaglyphe, monochrome Methode.\n"
+" red-cyan-half-color Rot/cyan Anaglyphe, Halbfarbenmethode.\n"
+" red-cyan-full-color Rot/cyan Anaglyphe, Vollfarbenmethode.\n"
+" red-cyan-dubois Rot/cyan Anaglyphe, Dubois-Methode.\n"
+" green-magenta-monochrome Grün/magenta Anaglyphe, monochrome Methode.\n"
+" green-magenta-half-color Grün/magenta Anaglyphe, Halbfarbenmethode.\n"
+" green-magenta-full-color Grün/magenta Anaglyphe, Vollfarbenmethode.\n"
+" green-magenta-dubois Grün/magenta Anaglyphe, Dubois-Methode.\n"
+" amber-blue-monochrome Orange/blau Anaglyphe, monochrome Methode.\n"
+" amber-blue-half-color Orange/blau Anaglyphe, Halbfarbenmethode.\n"
+" amber-blue-full-color Orange/blau Anaglyphe, Vollfarbenmethode.\n"
+" amber-blue-dubois Orange/blau Anaglyphe, Dubois-Methode.\n"
+" red-green-monochrome Rot/grün Anaglyphe, monochrome Methode.\n"
+" red-blue-monochrome Rot/blau Anaglyphe, monochrome Methode.\n"
+" stereo OpenGL Vierfachpuffer Stereo.\n"
+" equalizer Multidisplay via Equalizer (2D Konfiguration).\n"
+" equalizer-3d Multidisplay via Equalizer (3D Konfiguration).\n"
+" -S|--swap-eyes Tausche linke/rechte Ansicht.\n"
+" -f|--fullscreen Vollbild.\n"
+" -c|--center Zentriere Fenster auf Bildschirm.\n"
+" --subtitle-encoding=ENC Setze Zeichensatz für Untertitel.\n"
+" --subtitle-font=FONT Setze Schriftart für Untertitel.\n"
+" --subtitle-size=N Setze Schriftgröße für Untertitel.\n"
+" --subtitle-scale=S Setze Skalierungsfaktor für Untertitel.\n"
+" --subtitle-color=COLOR Setze Farbe für Untertitel, im [AA]RRGGBB "
+"Format.\n"
+" --subtitle-parallax=VAL Untertitel-Parallaxenjustierung (-1 bis +1).\n"
+" -P|--parallax=VAL Parallaxenjustierung (-1 bis +1).\n"
+" -C|--crosstalk=VAL Crosstalk-Level (0 bis 1); kamma-getrennte\n"
+" Werte für die R,G,B Kanäle.\n"
+" -G|--ghostbust=VAL Crosstalk-Verringerungsfaktor (0 bis 1).\n"
+" -b|--benchmark Benchmarkmodus (kein Audio, zeige FPS).\n"
+"\n"
+"Interaktion:\n"
+" q oder ESC Beenden.\n"
+" p oder Leertaste Pause / weiter.\n"
+" f Schalte Vollbildmodus um.\n"
+" c Zentriere Fenster.\n"
+" e Tausche links/rechts.\n"
+" v Schalte zum nächsten Videokanal.\n"
+" a Schalte zum nächsten Audiokanal.\n"
+" s Schalte zum nächsten Untertitelkanal.\n"
+" 1, 2 Justiere Kontrast.\n"
+" 3, 4 Justiere Helligkeit.\n"
+" 5, 6 Justiere Farbton.\n"
+" 7, 8 Justiere Farbsättigung.\n"
+" <, > Justiere Parallaxe.\n"
+" (, ) Justiere Crosstalk-Verringerungsfaktor.\n"
+" links, rechts Spule 10 Sekunden zurück / vor.\n"
+" hoch, runter Spule 1 Minute zurück / vor.\n"
+" Seite rauf, Seite runter Spule 10 Minuten zurück / vor.\n"
+" Mausklick Spule zur Stelle der horizontalen Klickposition."
+
+#: src/main.cpp:476
+msgid "Benchmark mode: audio and time synchronization disabled."
+msgstr "Benchmark Modus: Audio und Videosynchronisation deaktiviert."
+
+#: src/main.cpp:488
+msgid "This version of Bino was compiled without support for Equalizer."
+msgstr ""
+"Diese Version von Bino wurde ohne Unterstützung für Equalizer erstellt."
+
+#: src/main.cpp:505
+msgid "No video to play."
+msgstr "Kein Video abzuspielen."
+
+#. TRANSLATORS: This is a very short string describing the video size and aspect ratio.
+#: src/media_data.cpp:263
+#, c-format
+msgid "%dx%d, %.3g:1"
+msgstr "%dx%d, %.3g:1"
+
+#. TRANSLATORS: This is a very short string describing the audio language, channels, frequency, and bits.
+#: src/media_data.cpp:391
+#, c-format
+msgid "%s, %d ch., %g kHz, %d bit"
+msgstr "%s, %d Kan., %g kHz, %d bit"
+
+#: src/media_input.cpp:284 src/player_qt.cpp:161
+msgid "Input:"
+msgstr "Eingabe:"
+
+#: src/media_input.cpp:289
+#, c-format
+msgid "Video %s: %s"
+msgstr "Video %s: %s"
+
+#: src/media_input.cpp:294
+msgid "No video."
+msgstr "Kein Video."
+
+#: src/media_input.cpp:300
+#, c-format
+msgid "Audio %s: %s"
+msgstr "Audio %s: %s"
+
+#: src/media_input.cpp:305
+msgid "No audio."
+msgstr "Kein Audio."
+
+#: src/media_input.cpp:311
+#, c-format
+msgid "Subtitle %s: %s"
+msgstr "Untertitel %s: %s"
+
+#: src/media_input.cpp:316
+msgid "No subtitle."
+msgstr "Kein Untertitel."
+
+#: src/media_input.cpp:318
+#, c-format
+msgid "Duration: %g seconds"
+msgstr "Dauer: %g Sekunden"
+
+#: src/media_input.cpp:321
+#, c-format
+msgid "Stereo layout: %s"
+msgstr "Stereolayout: %s"
+
+#: src/media_object.cpp:584
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with %d channels."
+msgstr "%s Audiokanal %d: Kann Audiodaten mit %d Kanälen nicht benutzen."
+
+#: src/media_object.cpp:607
+#, c-format
+msgid "%s audio stream %d: Cannot handle audio with sample format %s."
+msgstr "%s Audiokanal %d: Kann Audiodaten mit Sampleformat %s nicht benutzen."
+
+#: src/media_object.cpp:636 src/media_object.cpp:1094 src/xgl.cpp:297
+#, c-format
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: src/media_object.cpp:641
+#, c-format
+msgid "%s: Cannot read stream info: %s"
+msgstr "%s: Kann Informationen über Kanal nicht lesen: %s"
+
+#: src/media_object.cpp:669
+#, c-format
+msgid "%s video stream %d: Invalid frame size."
+msgstr "%s Videokanal %d: Ungültige Bildgröße."
+
+#: src/media_object.cpp:675
+#, c-format
+msgid "%s video stream %d: Unsupported video codec."
+msgstr "%s Videokanal %d: Videocodec nicht unterstützt."
+
+#: src/media_object.cpp:682
+#, c-format
+msgid "%s video stream %d: Cannot open video codec: %s"
+msgstr "%s Videokanal %d: Kann Videocodec nicht öffnen: %s"
+
+#: src/media_object.cpp:717
+#, c-format
+msgid "%s video stream %d: Cannot initialize conversion context."
+msgstr "%s Videokanal %d: Kann Konvertierungskontext nicht initialisieren."
+
+#: src/media_object.cpp:738
+#, c-format
+msgid "%s audio stream %d: Unsupported audio codec."
+msgstr "%s Audiokanal %d: Audiocodec nicht unterstützt."
+
+#: src/media_object.cpp:744
+#, c-format
+msgid "%s audio stream %d: Cannot open audio codec: %s"
+msgstr "%s Audiokanal %d: Kann Audiocodec nicht öffnen: %s"
+
+#: src/media_object.cpp:777
+#, c-format
+msgid "%s subtitle stream %d: Unsupported subtitle codec."
+msgstr "%s Untertitelkanal %d: Untertitelcodec nicht unterstützt."
+
+#: src/media_object.cpp:783
+#, c-format
+msgid "%s subtitle stream %d: Cannot open subtitle codec: %s"
+msgstr "%s Untertitelkanal %d: Kann Untertitelcodec nicht öffnen: %s"
+
+#: src/media_object.cpp:808
+#, c-format
+msgid "Video stream %d: %s / %s, %g seconds"
+msgstr "Videokanal %d: %s / %s, %g Sekunden"
+
+#: src/media_object.cpp:812
+#, c-format
+msgid "Using up to %d threads for decoding."
+msgstr "Benutze bis zu %d Threads zum dekodieren."
+
+#: src/media_object.cpp:817
+#, c-format
+msgid "Audio stream %d: %s / %s, %g seconds"
+msgstr "Audiokanal %d: %s / %s, %g Sekunden"
+
+#: src/media_object.cpp:824
+#, c-format
+msgid "Subtitle stream %d: %s / %s, %g seconds"
+msgstr "Untertitelkanal %d: %s / %s, %g Sekunden"
+
+#: src/media_object.cpp:831
+msgid "No usable streams."
+msgstr "Keine nutzbaren Kanäle."
+
+#: src/media_object.cpp:1110 src/media_object.cpp:1140
+#: src/media_object.cpp:1170
+#, c-format
+msgid "%s: Cannot duplicate packet."
+msgstr "%s: Kann Paket nicht duplizieren."
+
+#: src/media_object.cpp:1647
+#, c-format
+msgid "%s: Seeking failed."
+msgstr "%s: Positionsänderung fehlgeschlagen."
+
+#: src/player.cpp:185
+msgid "Cannot create a second master player."
+msgstr "Kann keinen zweiten Master-Player erzeugen."
+
+#: src/player.cpp:202
+msgid "No video streams found."
+msgstr "Keine Videokanäle gefunden."
+
+#: src/player.cpp:208
+msgid "Cannot set requested stereo layout: incompatible media."
+msgstr "Kann Stereolayout nicht setzen: inkompatible Daten."
+
+#: src/player.cpp:214
+#, c-format
+msgid "Video stream %d not found."
+msgstr "Videokanal %d nicht gefunden."
+
+#: src/player.cpp:219
+#, c-format
+msgid "Audio stream %d not found."
+msgstr "Audiokanal %d nicht gefunden."
+
+#: src/player.cpp:227
+#, c-format
+msgid "Subtitle stream %d not found."
+msgstr "Untertitelkanal %d nicht gefunden."
+
+#: src/player.cpp:618
+#, c-format
+msgid "Video: delay %g seconds; dropping next frame."
+msgstr "Video: %g Sekunden zu spät; überspringe nächstes Bild."
+
+#: src/player.cpp:630
+#, c-format
+msgid "FPS: %.2f"
+msgstr "FPS: %.2f"
+
+#: src/player_equalizer.cpp:129
+msgid "Reading input frame failed."
+msgstr "Lesen des Eingabebildes fehlgeschlagen."
+
+#: src/player_equalizer.cpp:243
+msgid "Init data mapping failed."
+msgstr "Zuordnung von InitData fehlgeschlagen."
+
+#: src/player_equalizer.cpp:244
+msgid "Frame data mapping failed."
+msgstr "Zuordnung von FrameData fehlgeschlagen."
+
+#: src/player_equalizer.cpp:245
+msgid "Video player initialization failed."
+msgstr "Videoplayer-Initialisierung fehlgeschlagen."
+
+#: src/player_equalizer.cpp:246
+msgid "Need at least OpenGL 2.1."
+msgstr "Benötige mindestens OpenGL 2.1."
+
+#: src/player_equalizer.cpp:447
+msgid "No canvas in Equalizer configuration."
+msgstr "Kein canvas in Equalizer Konfiguration."
+
+#: src/player_equalizer.cpp:481
+msgid "Equalizer canvas:"
+msgstr "Equalizer canvas:"
+
+#: src/player_equalizer.cpp:482
+#, c-format
+msgid "%gx%g, aspect ratio %g:1"
+msgstr "%gx%g, Seitenverhältnis %g:1"
+
+#: src/player_equalizer.cpp:483
+#, c-format
+msgid "Area for %g:1 video: [ %g %g %g %g @ %g ]"
+msgstr "Bereich für %g:1 Video: [ %g %g %g %g @ %g ]"
+
+#: src/player_equalizer.cpp:896 src/video_output_qt.cpp:296
+msgid ""
+"This OpenGL implementation does not support OpenGL 2.1 and framebuffer "
+"objects."
+msgstr ""
+"Diese OpenGL Implementierung unterstützt nicht OpenGL 2.1 und "
+"Framebufferobjekte."
+
+#: src/player_equalizer.cpp:1062
+msgid "Equalizer initialization failed."
+msgstr "Equalizer-Initialisierung fehlgeschlagen."
+
+#: src/player_equalizer.cpp:1070
+msgid "Cannot get equalizer configuration."
+msgstr "Kann Equalizer Konfiguration nicht bekommen."
+
+#: src/player_equalizer.cpp:1084
+msgid "Equalizer configuration initialization failed."
+msgstr "Kann Equalizer Konfiguration nicht initialisieren."
+
+#: src/player_qt.cpp:135
+msgid "Video:"
+msgstr "Video:"
+
+#: src/player_qt.cpp:136
+msgid "Select the video stream."
+msgstr "Auswahl des Videokanals."
+
+#: src/player_qt.cpp:142
+msgid "Audio:"
+msgstr "Audio:"
+
+#: src/player_qt.cpp:143
+msgid "Select the audio stream."
+msgstr "Auswahl des Videokanals."
+
+#: src/player_qt.cpp:149
+msgid "Subtitle:"
+msgstr "Untertitel:"
+
+#: src/player_qt.cpp:150
+msgid "Select the subtitle stream."
+msgstr "Auswahl des Untertitelkanals."
+
+#: src/player_qt.cpp:162
+msgid "Set the 3D layout of the video stream."
+msgstr "Auswahl des Stereolayouts des Videokanals."
+
+#: src/player_qt.cpp:166
+msgid "2D"
+msgstr "2D"
+
+#: src/player_qt.cpp:167
+msgid "Separate streams, left first"
+msgstr "Getrennte Kanäle, links zuerst"
+
+#: src/player_qt.cpp:168
+msgid "Separate streams, right first"
+msgstr "Getrennte Kanäle, rechts zuerst"
+
+#: src/player_qt.cpp:169 src/player_qt.cpp:192
+msgid "Top/bottom"
+msgstr "Oben/unten"
+
+#: src/player_qt.cpp:170 src/player_qt.cpp:193
+msgid "Top/bottom, half height"
+msgstr "Oben/unten, halbe Höhe"
+
+#: src/player_qt.cpp:171
+msgid "Bottom/top"
+msgstr "Unten/oben"
+
+#: src/player_qt.cpp:172
+msgid "Bottom/top, half height"
+msgstr "Unten/oben, halbe Höhe"
+
+#: src/player_qt.cpp:173 src/player_qt.cpp:194
+msgid "Left/right"
+msgstr "Links/rechts"
+
+#: src/player_qt.cpp:174 src/player_qt.cpp:195
+msgid "Left/right, half width"
+msgstr "Links/rechts, halbe Breite"
+
+#: src/player_qt.cpp:175
+msgid "Right/left"
+msgstr "Rechst/links"
+
+#: src/player_qt.cpp:176
+msgid "Right/left, half width"
+msgstr "Rechts/links, halbe Breite"
+
+#: src/player_qt.cpp:177 src/player_qt.cpp:196
+msgid "Even/odd rows"
+msgstr "Gerade/ungerade Zeilen"
+
+#: src/player_qt.cpp:178
+msgid "Odd/even rows"
+msgstr "Ungerade/gerade Zeilen"
+
+#: src/player_qt.cpp:184
+msgid "Output:"
+msgstr "Ausgabe:"
+
+#: src/player_qt.cpp:185
+msgid "Set the 3D output type for your display."
+msgstr "Auswahl des 3D Ausgabetyps für das Ausgabegerät."
+
+#: src/player_qt.cpp:189
+msgid "Left view"
+msgstr "Linke Sicht"
+
+#: src/player_qt.cpp:190
+msgid "Right view"
+msgstr "Rechte Sicht"
+
+#: src/player_qt.cpp:191
+msgid "OpenGL stereo"
+msgstr "OpenGL Stereo"
+
+#: src/player_qt.cpp:197
+msgid "Even/odd columns"
+msgstr "Gerade/ungerade Spalten"
+
+#: src/player_qt.cpp:198
+msgid "Checkerboard pattern"
+msgstr "Schachbrettmuster"
+
+#: src/player_qt.cpp:199
+msgid "HDMI frame packing mode"
+msgstr "HDMI Framepacking Modus"
+
+#: src/player_qt.cpp:200
+msgid "Red/cyan glasses, monochrome method"
+msgstr "Rot/cyan Brillen, monochrome Methode"
+
+#: src/player_qt.cpp:201
+msgid "Red/cyan glasses, half-color method"
+msgstr "Rot/cyan Brillen, Halbfarbenmethode"
+
+#: src/player_qt.cpp:202
+msgid "Red/cyan glasses, full-color method"
+msgstr "Rot/cyan Brillen, Vollfarbenmethode"
+
+#: src/player_qt.cpp:203
+msgid "Red/cyan glasses, high-quality Dubois method"
+msgstr "Rot/cyan Brillen, hochwertige Dubois-Methode"
+
+#: src/player_qt.cpp:204
+msgid "Green/magenta glasses, monochrome method"
+msgstr "Grün/magenta Brillen, monochrome Methode"
+
+#: src/player_qt.cpp:205
+msgid "Green/magenta glasses, half-color method"
+msgstr "Grün/magenta Brillen, Halbfarbenmethode"
+
+#: src/player_qt.cpp:206
+msgid "Green/magenta glasses, full-color method"
+msgstr "Grün/magenta Brillen, Vollfarbenmethode"
+
+#: src/player_qt.cpp:207
+msgid "Green/magenta glasses, high-quality Dubois method"
+msgstr "Grün/magenta Brillen, hochwertige Dubois-Methode"
+
+#: src/player_qt.cpp:208
+msgid "Amber/blue glasses, monochrome method"
+msgstr "Orange/blau Brillen, monochrome Methode"
+
+#: src/player_qt.cpp:209
+msgid "Amber/blue glasses, half-color method"
+msgstr "Orange/blau Brillen, Halbfarbenmethode"
+
+#: src/player_qt.cpp:210
+msgid "Amber/blue glasses, full-color method"
+msgstr "Orange/blau Brillen, Vollfarbenmethode"
+
+#: src/player_qt.cpp:211
+msgid "Amber/blue glasses, high-quality Dubois method"
+msgstr "Orange/blau Brillen, hochwertige Dubois-Methode"
+
+#: src/player_qt.cpp:212
+msgid "Red/green glasses, monochrome method"
+msgstr "Rot/grün Brillen, monochrome Methode"
+
+#: src/player_qt.cpp:213
+msgid "Red/blue glasses, monochrome method"
+msgstr "Rot/blau Brillen, monochrome Methode"
+
+#: src/player_qt.cpp:217
+msgid "Swap left/right"
+msgstr "Tausche links/rechts"
+
+#: src/player_qt.cpp:218
+msgid ""
+"Swap the left and right view. Use this if the 3D effect seems wrong."
+msgstr ""
+"Vertauschung von linker und rechter Sicht (falls der 3D Effekt falsch "
+"wirkt)."
+
+#: src/player_qt.cpp:485
+msgid "Off"
+msgstr "Aus"
+
+#: src/player_qt.cpp:719
+msgid ""
+"This slider shows the progress during video playback, and can be used to "
+"seek in the video."
+msgstr ""
+"Dieser Gleiter zeigt der Fortschritt beim Abspielen an, und kann zum Vor- "
+"und Zurückspulen benutzt werden."
+
+#: src/player_qt.cpp:726
+msgid "Play."
+msgstr "Abspielen."
+
+#: src/player_qt.cpp:730
+msgid "Pause."
+msgstr "Pause."
+
+#: src/player_qt.cpp:734
+msgid "Stop."
+msgstr "Stopp."
+
+#: src/player_qt.cpp:739
+msgid ""
+"Switch to fullscreen mode. You can leave fullscreen mode by pressing the "
+"f key."
+msgstr ""
+"Zum Vollbildmodus schalten. Der Vollbildmodus kann mit der Taste f "
+"verlassen werden."
+
+#: src/player_qt.cpp:744
+msgid "Center the video area on your screen."
+msgstr "Zentrierung des Videos in der Mitte des Bildschirms."
+
+#: src/player_qt.cpp:749
+msgid "Seek backward 10 minutes."
+msgstr "10 Minuten zurückspulen."
+
+#: src/player_qt.cpp:753
+msgid "Seek backward 1 minute."
+msgstr "1 Minute zurückspulen."
+
+#: src/player_qt.cpp:757
+msgid "Seek backward 10 seconds."
+msgstr "10 Sekunden zurückspulen."
+
+#: src/player_qt.cpp:761
+msgid "Seek forward 10 seconds."
+msgstr "10 Sekunden vorspulen."
+
+#: src/player_qt.cpp:765
+msgid "Seek forward 1 minute."
+msgstr "1 Minute vorspulen."
+
+#: src/player_qt.cpp:769
+msgid "Seek forward 10 minutes."
+msgstr "10 Minuten vorspulen."
+
+#: src/player_qt.cpp:941
+msgid "Display Color Adjustments"
+msgstr "Bildschirmfarbenjustierung"
+
+#: src/player_qt.cpp:943
+msgid "Contrast:"
+msgstr "Kontrast:"
+
+#: src/player_qt.cpp:954
+msgid "Brightness:"
+msgstr "Helligkeit:"
+
+#: src/player_qt.cpp:965
+msgid "Hue:"
+msgstr "Farbton:"
+
+#: src/player_qt.cpp:976
+msgid "Saturation:"
+msgstr "Farbsättigung:"
+
+#: src/player_qt.cpp:988 src/player_qt.cpp:1147 src/player_qt.cpp:1266
+#: src/player_qt.cpp:1565 src/player_qt.cpp:2193 src/player_qt.cpp:2367
+msgid "OK"
+msgstr "OK"
+
+#: src/player_qt.cpp:1118
+msgid "Display Crosstalk Calibration"
+msgstr "Bildschirm-Crosstalk Kalibrierung"
+
+#. TRANSLATORS: Please keep the lines short using where necessary.
+#: src/player_qt.cpp:1121
+msgid ""
+"Please read the manual to find out how to measure the crosstalk "
+"levels of your display."
+msgstr ""
+"Bitte lese das Handbuch um herauszufinden wie Crosstalk-Level für "
+"Deinen Bildschirm gemessen werden."
+
+#: src/player_qt.cpp:1125
+msgid "Red:"
+msgstr "Rot:"
+
+#: src/player_qt.cpp:1132
+msgid "Green:"
+msgstr "Grün:"
+
+#: src/player_qt.cpp:1139
+msgid "Blue:"
+msgstr "Blau:"
+
+#: src/player_qt.cpp:1208
+msgid "Subtitle Settings"
+msgstr "Einstellungen für Untertitel"
+
+#: src/player_qt.cpp:1210
+msgid "These settings apply to soft subtitles, but not to bitmaps."
+msgstr ""
+"Diese Einstellungen gelten für Text-Untertitel, nicht für Bild-Untertitel."
+""
+
+#: src/player_qt.cpp:1212
+msgid "Encoding:"
+msgstr "Zeichensatz:"
+
+#: src/player_qt.cpp:1213
+msgid "Set the subtitle character set encoding."
+msgstr "Auswahl des Untertitelzeichensatzes."
+
+#: src/player_qt.cpp:1227
+msgid "Override font:"
+msgstr "Setze Schriftart:"
+
+#: src/player_qt.cpp:1228
+msgid "Override the subtitle font family."
+msgstr "Auswahl der Schriftart des Untertitels."
+
+#: src/player_qt.cpp:1236
+msgid "Override font size:"
+msgstr "Setze Schriftgröße:"
+
+#: src/player_qt.cpp:1237
+msgid "Override the subtitle font size."
+msgstr "Auswahl der Schriftgröße des Untertitels."
+
+#: src/player_qt.cpp:1246
+msgid "Override scale factor:"
+msgstr "Setze Skalierungsfaktor:"
+
+#: src/player_qt.cpp:1247
+msgid "Override the subtitle scale factor."
+msgstr "Auswahl des Skalierungsfaktors des Untertitels."
+
+#: src/player_qt.cpp:1257
+msgid "Override color:"
+msgstr "Setze Farbe:"
+
+#: src/player_qt.cpp:1258
+msgid "Override the subtitle color."
+msgstr "Auswahl der Farbe des Untertitels."
+
+#: src/player_qt.cpp:1514
+msgid "Stereoscopic Video Settings"
+msgstr "Einstellungen für stereoskopische Videos"
+
+#: src/player_qt.cpp:1516
+msgid "Parallax:"
+msgstr "Parallaxe:"
+
+#: src/player_qt.cpp:1517
+msgid ""
+"Adjust parallax, from -1 to +1. This changes the separation of left and "
+"right view, and thus the perceived distance of the scene."
+msgstr ""
+"Justierung der Parallaxe, von -1 bis +1. Dies ändert die Separierung von "
+"linker und rechter Sicht und damit den wahrgenommenen Abstand der Szene."
+
+#: src/player_qt.cpp:1532
+msgid "Subtitle parallax:"
+msgstr "Untertitelparallaxe:"
+
+#: src/player_qt.cpp:1533
+msgid ""
+"Adjust subtitle parallax, from -1 to +1. This changes the perceived "
+"distance of the subtitles."
+msgstr ""
+"Justierung der Untertitelparallaxe, von -1 bis +1. Dies ändert den "
+"wahrgenommenen Abstand der Untertitel."
+
+#: src/player_qt.cpp:1548
+msgid "Ghostbusting:"
+msgstr "Crosstalk-Verringerungsfaktor:"
+
+#: src/player_qt.cpp:1549
+msgid ""
+"Set the amount of crosstalk ghostbusting, from 0 to 1. You need to set "
+"the crosstalk levels of your display first. Note that crosstalk ghostbusting "
+"does not work with anaglyph glasses."
+msgstr ""
+"Auswahl des Faktors der Verringerung von Crosstalk, von 0 bis 1. Zuerst "
+"müssen die Crosstalk-Level des Bildschirms gesetzt werden. Crosstalk-"
+"Verringerung funktioniert nicht mit Anaglyphenbrillen."
+
+#: src/player_qt.cpp:1753
+msgid "&File"
+msgstr "&Datei"
+
+#: src/player_qt.cpp:1754
+msgid "&Open..."
+msgstr "&Öffnen..."
+
+#: src/player_qt.cpp:1758
+msgid "Open &URL..."
+msgstr "Öffne &URL..."
+
+#: src/player_qt.cpp:1762
+msgid "&Quit..."
+msgstr "&Beenden..."
+
+#: src/player_qt.cpp:1766
+msgid "&Preferences"
+msgstr "&Einstellungen"
+
+#: src/player_qt.cpp:1767
+msgid "Display &Color Adjustments..."
+msgstr "Bildschirm&farben..."
+
+#: src/player_qt.cpp:1770
+msgid "Display Cross&talk Calibration..."
+msgstr "Bildschirm-Crosstalk..."
+
+#: src/player_qt.cpp:1774
+msgid "&Subtitle Settings..."
+msgstr "&Untertitel..."
+
+#: src/player_qt.cpp:1778
+msgid "Stereoscopic Video Settings..."
+msgstr "&Stereoskopische Videos..."
+
+#: src/player_qt.cpp:1781
+msgid "&Help"
+msgstr "&Hilfe"
+
+#: src/player_qt.cpp:1782
+msgid "&Manual..."
+msgstr "&Handbuch..."
+
+#: src/player_qt.cpp:1786
+msgid "&Website..."
+msgstr "&Webseite..."
+
+#: src/player_qt.cpp:1789
+msgid "&Keyboard Shortcuts"
+msgstr "&Tastaturkürzel"
+
+#: src/player_qt.cpp:1792
+msgid "&About"
+msgstr "&Über"
+
+#: src/player_qt.cpp:1846 src/player_qt.cpp:2269 src/player_qt.cpp:2277
+#: src/video_output_qt.cpp:84 src/video_output_qt.cpp:302
+#: src/video_output_qt.cpp:347
+msgid "Error"
+msgstr "Fehler"
+
+#: src/player_qt.cpp:2170
+msgid "Open files"
+msgstr "Dateien öffnen"
+
+#: src/player_qt.cpp:2189
+msgid "Open URL"
+msgstr "Öffne URL"
+
+#: src/player_qt.cpp:2190
+msgid "URL:"
+msgstr "URL:"
+
+#: src/player_qt.cpp:2194
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: src/player_qt.cpp:2269
+msgid "Cannot open manual."
+msgstr "Kann Handbuch nicht öffnen."
+
+#: src/player_qt.cpp:2277
+msgid "Cannot open website."
+msgstr "Kann Webseite nicht öffnen."
+
+#: src/player_qt.cpp:2283
+msgid "Keyboard Shortcuts"
+msgstr "Tastaturkürzel"
+
+#. TRANSLATORS: This is a HTML table, shown under Help->Keyboard Shortcuts.
+#. Please make sure that your translation formats properly.
+#: src/player_qt.cpp:2286
+msgid ""
+"Keyboard control: (Click into the video area to give it the keyboard "
+"focus if necessary.)<table><tr><td>q or ESC</td><td>Stop</td></tr><tr><td>p "
+"or SPACE</td><td>Pause / unpause</td></tr><tr><td>f</td><td>Toggle "
+"fullscreen</td></tr><tr><td>c</td><td>Center window</td></tr><tr><td>e</"
+"td><td>Swap left/right eye</td></tr><tr><td>v</td><td>Cycle through "
+"available video streams</td></tr><tr><td>a</td><td>Cycle through available "
+"audio streams</td></tr><tr><td>s</td><td>Cycle through available subtitle "
+"streams</td></tr><tr><td>1, 2</td><td>Adjust contrast</td></tr><tr><td>3, 4</"
+"td><td>Adjust brightness</td></tr><tr><td>5, 6</td><td>Adjust hue</td></"
+"tr><tr><td>7, 8</td><td>Adjust saturation</td></tr><tr><td>&lt;, &gt;</"
+"td><td>Adjust parallax</td></tr><tr><td>(, )</td><td>Adjust ghostbusting</"
+"td></tr><tr><td>left, right</td><td>Seek 10 seconds backward / forward</td></"
+"tr><tr><td>up, down</td><td>Seek 1 minute backward / forward</td></"
+"tr><tr><td>page up, page down</td><td>Seek 10 minutes backward / forward</"
+"td></tr></table>"
+msgstr ""
+"Tastatursteuerung: (Klicke in den Videobereich um den Tastaturfokus zu "
+"setzen, falls nötig.)<table><tr><td>q oder ESC</td><td>Stopp</td></"
+"tr><tr><td>p oder Leertaste</td><td>Pause / weiter</td></tr><tr><td>f</"
+"td><td>Schalte Vollbildmodus um</td></tr><tr><td>c</td><td>Zentriere "
+"Fenster</td></tr><tr><td>e</td><td>Tausche links/rechts</td></tr><tr><td>v</"
+"td><td>Schalte zum nächsten Videokanal</td></tr><tr><td>a</td><td>Schalte "
+"zum nächsten Audiokanal</td></tr><tr><td>s</td><td>Schalte zum nächsten "
+"Untertitelkanal</td></tr><tr><td>1, 2</td><td>Justiere Kontrast</td></"
+"tr><tr><td>3, 4</td><td>Justiere Helligkeit</td></tr><tr><td>5, 6</"
+"td><td>Justiere Farbton</td></tr><tr><td>7, 8</td><td>Justiere "
+"Farbsättigung</td></tr><tr><td>&lt;, &gt;</td><td>Justiere Parallaxe</td></"
+"tr><tr><td>(, )</td><td>Justiere Crosstalk-Verringerung</td></"
+"tr><tr><td>links, rechts</td><td>Spule 10 Sekunden zurück / vor</td></"
+"tr><tr><td>hoch, runter</td><td>Spule 1 Minute zurück / vor</td></"
+"tr><tr><td>Seite rauf, Seite runter</td><td>Spule 10 Minuten zurück / vor</"
+"td></tr></table>"
+
+#: src/player_qt.cpp:2314
+#, c-format
+msgid "About %s"
+msgstr "Über %s"
+
+#: src/player_qt.cpp:2320
+#, c-format
+msgid "The %s 3D video player"
+msgstr "%s - 3D Videospieler"
+
+#: src/player_qt.cpp:2325
+#, c-format
+msgid ""
+"%s version %s.Copyright (C) 2011 the Bino developers.This "
+"is free software. You may redistribute copies of it under the terms of the "
+"<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
+"a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
+"\"%s\">%s</a> for more information on this software."
+msgstr ""
+"%s Version %s.Copyright (C) 2011 Die Bino Entwickler.Dies "
+"ist freie Software. Du kannst Kopien davon verteilen unter den Bedingungen "
+"der <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public "
+"License</a>. Es gibt keine Garantie.Siehe <a href=\"%s\">%s</a> für "
+"mehr Informationen über diese Software."
+
+#: src/player_qt.cpp:2362
+msgid "About"
+msgstr "Über"
+
+#: src/player_qt.cpp:2363
+msgid "Libraries"
+msgstr "Bibliotheken"
+
+#: src/player_qt.cpp:2364
+msgid "Team"
+msgstr "Team"
+
+#: src/player_qt.cpp:2365
+msgid "License"
+msgstr "Lizenz"
+
+#: src/subtitle_renderer.cpp:217
+msgid "Cannot initialize LibASS."
+msgstr "Kann LibASS nicht initialisieren."
+
+#: src/subtitle_renderer.cpp:224
+msgid "Cannot initialize LibASS renderer."
+msgstr "Kann LibASS-Renderer nicht initialisieren."
+
+#: src/subtitle_renderer.cpp:317
+msgid "Cannot initialize LibASS track."
+msgstr "Kann LibASS-Spur nicht initialisieren."
+
+#: src/subtitle_renderer.cpp:328
+#, c-format
+msgid "Subtitle character set conversion failed: %s"
+msgstr "Untertitel-Zeichensatzkonvertierung fehlgeschlagen: %s"
+
+#: src/video_output.cpp:375 src/video_output.cpp:485
+msgid "Cannot create a PBO buffer."
+msgstr "Kann keinen PBO Puffer erzeugen."
+
+#: src/video_output_qt.cpp:291
+#, c-format
+msgid "Cannot initialize GLEW: %s"
+msgstr "Kann GLEW nicht initialisieren: %s"
+
+#: src/video_output_qt.cpp:337
+msgid "The display does not support OpenGL stereo mode."
+msgstr "Dieses Gerät unterstützt kein OpenGL Stereo."
+
+#: src/video_output_qt.cpp:342
+msgid "Cannot set OpenGL context format."
+msgstr "Kann OpenGL Kontextformat nicht setzen."
+
+#: src/xgl.cpp:200
+#, c-format
+msgid "OpenGL FBO error %s."
+msgstr "OpenGL FBO Fehler: %s"
+
+#: src/xgl.cpp:217
+#, c-format
+msgid "OpenGL error 0x%04X."
+msgstr "OpenGL Fehler 0x%04X."
+
+#: src/xgl.cpp:282
+#, c-format
+msgid "OpenGL %s '%s': compiler warning:"
+msgstr "OpenGL %s '%s': Compilerwarnung:"
+
+#: src/xgl.cpp:283 src/xgl.cpp:292
+msgid "vertex shader"
+msgstr "Vertexshader"
+
+#: src/xgl.cpp:284 src/xgl.cpp:293
+msgid "geometry shader"
+msgstr "Geometryshader"
+
+#: src/xgl.cpp:285 src/xgl.cpp:294
+msgid "fragment shader"
+msgstr "Fragmentshader"
+
+#: src/xgl.cpp:291
+#, c-format
+msgid "OpenGL %s '%s': compilation failed."
+msgstr "OpenGL %s '%s': Compilieren fehlgeschlagen."
+
+#: src/xgl.cpp:296 src/xgl.cpp:363
+msgid "unknown error"
+msgstr "unbekannter Fehler"
+
+#: src/xgl.cpp:357
+#, c-format
+msgid "OpenGL program '%s': linker warning:"
+msgstr "OpenGL Programm '%s': Linkerwarnung:"
+
+#: src/xgl.cpp:362
+#, c-format
+msgid "OpenGL program '%s': linking failed."
+msgstr "OpenGL Programm '%s': Linken fehlgeschlagen."

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
+#endif
+static const char *
+dcpgettext_expr (const char *domain,
+ const char *msgctxt, const char *msgid,
+ int category)
+{
+ size_t msgctxt_len = strlen (msgctxt) + 1;
+ size_t msgid_len = strlen (msgid) + 1;
+ const char *translation;
+#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+ char msg_ctxt_id[msgctxt_len + msgid_len];
+#else
+ char buf[1024];
+ char *msg_ctxt_id =
+ (msgctxt_len + msgid_len <= sizeof (buf)
+ ? buf
+ : (char *) malloc (msgctxt_len + msgid_len));
+ if (msg_ctxt_id != NULL)
+#endif
+ {
+ memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+ msg_ctxt_id[msgctxt_len - 1] = '\004';
+ memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+ translation = dcgettext (domain, msg_ctxt_id, category);
+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+ if (msg_ctxt_id != buf)
+ free (msg_ctxt_id);
+#endif
+ if (translation != msg_ctxt_id)
+ return translation;
+ }
+ return msgid;
+}
+
+#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
+ dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+ dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+dcnpgettext_expr (const char *domain,
+ const char *msgctxt, const char *msgid,
+ const char *msgid_plural, unsigned long int n,
+ int category)
+{
+ size_t msgctxt_len = strlen (msgctxt) + 1;
+ size_t msgid_len = strlen (msgid) + 1;
+ const char *translation;
+#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+ char msg_ctxt_id[msgctxt_len + msgid_len];
+#else
+ char buf[1024];
+ char *msg_ctxt_id =
+ (msgctxt_len + msgid_len <= sizeof (buf)
+ ? buf
+ : (char *) malloc (msgctxt_len + msgid_len));
+ if (msg_ctxt_id != NULL)
+#endif
+ {
+ memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+ msg_ctxt_id[msgctxt_len - 1] = '\004';
+ memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+ translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+ if (msg_ctxt_id != buf)
+ free (msg_ctxt_id);
+#endif
+ if (!(translation == msg_ctxt_id || translation == msgid_plural))
+ return translation;
+ }
+ return (n == 1 ? msgid : msgid_plural);
+}
+
+#endif /* _LIBGETTEXT_H */

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;
+ }
+
+ msg(indent, INF, s);
+ }
+
+ void inf(int indent, const char *format, ...)
+ {
+ if (INF < _level)
+ {
+ return;
+ }
+
+ std::string s;
+ va_list args;
+ va_start(args, format);
+ s = str::vasprintf(format, args);
+ va_end(args);
+ msg(indent, INF, s);
+ }
+
+ void inf_txt(int indent, const std::string &s)
+ {
+ if (INF < _level)
+ {
+ return;
+ }
+
+ msg_txt(indent, INF, s);
+ }
+
+ void inf_txt(int indent, const char *format, ...)
+ {
+ if (INF < _level)
+ {
+ return;
+ }
+
+ std::string s;
+ va_list args;
+ va_start(args, format);
+ s = str::vasprintf(format, args);
+ va_end(args);
+ msg_txt(indent, INF, s);
 }
 
 void inf(const std::string &s)
@@ -298,7 +448,7 @@
 return;
 }
 
- msg(INF, s);
+ msg(0, INF, s);
 }
 
 void inf(const char *format, ...)
@@ -313,7 +463,7 @@
 va_start(args, format);
 s = str::vasprintf(format, args);
 va_end(args);
- msg(INF, s);
+ msg(0, INF, s);
 }
 
 void inf_txt(const std::string &s)
@@ -323,7 +473,7 @@
 return;
 }
 
- msg_txt(INF, s);
+ msg_txt(0, INF, s);
 }
 
 void inf_txt(const char *format, ...)
@@ -338,7 +488,57 @@
 va_start(args, format);
 s = str::vasprintf(format, args);
 va_end(args);
- msg_txt(INF, s);
+ msg_txt(0, INF, s);
+ }
+
+ void wrn(int indent, const std::string &s)
+ {
+ if (WRN < _level)
+ {
+ return;
+ }
+
+ msg(indent, WRN, s);
+ }
+
+ void wrn(int indent, const char *format, ...)
+ {
+ if (WRN < _level)
+ {
+ return;
+ }
+
+ std::string s;
+ va_list args;
+ va_start(args, format);
+ s = str::vasprintf(format, args);
+ va_end(args);
+ msg(indent, WRN, s);
+ }
+
+ void wrn_txt(int indent, const std::string &s)
+ {
+ if (WRN < _level)
+ {
+ return;
+ }
+
+ msg_txt(indent, WRN, s);
+ }
+
+ void wrn_txt(int indent, const char *format, ...)
+ {
+ if (WRN < _level)
+ {
+ return;
+ }
+
+ std::string s;
+ va_list args;
+ va_start(args, format);
+ s = str::vasprintf(format, args);
+ va_end(args);
+ msg_txt(indent, WRN, s);
 }
 
 void wrn(const std::string &s)
@@ -348,7 +548,7 @@
 return;
 }
 
- msg(WRN, s);
+ msg(0, WRN, s);
 }
 
 void wrn(const char *format, ...)
@@ -363,7 +563,7 @@
 va_start(args, format);
 s = str::vasprintf(format, args);
 va_end(args);
- msg(WRN, s);
+ msg(0, WRN, s);
 }
 
 void wrn_txt(const std::string &s)
@@ -373,7 +573,7 @@
 return;
 }
 
- msg_txt(WRN, s);
+ msg_txt(0, WRN, s);
 }
 
 void wrn_txt(const char *format, ...)
@@ -388,7 +588,57 @@
 va_start(args, format);
 s = str::vasprintf(format, args);
 va_end(args);
- msg_txt(WRN, s);
+ msg_txt(0, WRN, s);
+ }
+
+ void err(int indent, const std::string &s)
+ {
+ if (ERR < _level)
+ {
+ return;
+ }
+
+ msg(indent, ERR, s);
+ }
+
+ void err(int indent, const char *format, ...)
+ {
+ if (ERR < _level)
+ {
+ return;
+ }
+
+ std::string s;
+ va_list args;
+ va_start(args, format);
+ s = str::vasprintf(format, args);
+ va_end(args);
+ msg(indent, ERR, s);
+ }
+
+ void err_txt(int indent, const std::string &s)
+ {
+ if (ERR < _level)
+ {
+ return;
+ }
+
+ msg_txt(indent, ERR, s);
+ }
+
+ void err_txt(int indent, const char *format, ...)
+ {
+ if (ERR < _level)
+ {
+ return;
+ }
+
+ std::string s;
+ va_list args;
+ va_start(args, format);
+ s = str::vasprintf(format, args);
+ va_end(args);
+ msg_txt(indent, ERR, s);
 }
 
 void err(const std::string &s)
@@ -398,7 +648,7 @@
 return;
 }
 
- msg(ERR, s);
+ msg(0, ERR, s);
 }
 
 void err(const char *format, ...)
@@ -413,7 +663,7 @@
 va_start(args, format);
 s = str::vasprintf(format, args);
 va_end(args);
- msg(ERR, s);
+ msg(0, ERR, s);
 }
 
 void err_txt(const std::string &s)
@@ -423,7 +673,7 @@
 return;
 }
 
- msg_txt(ERR, s);
+ msg_txt(0, ERR, s);
 }
 
 void err_txt(const char *format, ...)
@@ -438,12 +688,42 @@
 va_start(args, format);
 s = str::vasprintf(format, args);
 va_end(args);
- msg_txt(ERR, s);
+ msg_txt(0, ERR, s);
+ }
+
+ void req(int indent, const std::string &s)
+ {
+ msg(indent, REQ, s);
+ }
+
+ void req(int indent, const char *format, ...)
+ {
+ std::string s;
+ va_list args;
+ va_start(args, format);
+ s = str::vasprintf(format, args);
+ va_end(args);
+ msg(indent, REQ, s);
+ }
+
+ void req_txt(int indent, const std::string &s)
+ {
+ msg_txt(indent, REQ, s);
+ }
+
+ void req_txt(int indent, const char *format, ...)
+ {
+ std::string s;
+ va_list args;
+ va_start(args, format);
+ s = str::vasprintf(format, args);
+ va_end(args);
+ msg_txt(indent, REQ, s);
 }
 
 void req(const std::string &s)
 {
- msg(REQ, s);
+ msg(0, REQ, s);
 }
 
 void req(const char *format, ...)
@@ -453,12 +733,12 @@
 va_start(args, format);
 s = str::vasprintf(format, args);
 va_end(args);
- msg(REQ, s);
+ msg(0, REQ, s);
 }
 
 void req_txt(const std::string &s)
 {
- msg_txt(REQ, s);
+ msg_txt(0, REQ, s);
 }
 
 void req_txt(const char *format, ...)
@@ -468,6 +748,6 @@
 va_start(args, format);
 s = str::vasprintf(format, args);
 va_end(args);
- msg_txt(REQ, s);
+ msg_txt(0, REQ, s);
 }
 }

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"
- " --help Print help.\n"
- " --version Print version.\n"
- " -n|--no-gui Do not use the GUI, just show a plain window.\n"
- " -l|--log-level=LEVEL Set log level (debug/info/warning/error/quiet).\n"
- " -v|--video=STREAM Select video stream (1-n, depending on input).\n"
- " -a|--audio=STREAM Select audio stream (1-n, depending on input).\n"
- " -i|--input=TYPE Select input type (default autodetect):\n"
- " mono Single view.\n"
- " separate-left-right Left/right separate streams, left first.\n"
- " separate-right-left Left/right separate streams, right first.\n"
- " top-bottom Left top, right bottom.\n"
- " top-bottom-half Left top, right bottom, half height.\n"
- " bottom-top Left bottom, right top.\n"
- " bottom-top-half Left bottom, right top, half height.\n"
- " left-right Left left, right right.\n"
- " left-right-half Left left, right right, half width.\n"
- " right-left Left right, right left.\n"
- " right-left-half Left right, right left, half width.\n"
- " even-odd-rows Left even rows, right odd rows.\n"
- " odd-even-rows Left odd rows, right even rows.\n"
- " -o|--output=TYPE Select output type:\n"
- " mono-left Only left.\n"
- " mono-right Only right.\n"
- " top-bottom Left top, right bottom.\n"
- " top-bottom-half Left top, right bottom, half height.\n"
- " left-right Left left, right right.\n"
- " left-right-half Left left, right right, half width.\n"
- " even-odd-rows Left even rows, right odd rows.\n"
- " even-odd-columns Left even columns, right odd columns.\n"
- " checkerboard Left and right in checkerboard pattern.\n"
- " red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
- " red-cyan-half-color Red/cyan anaglyph, half color method.\n"
- " red-cyan-full-color Red/cyan anaglyph, full color method.\n"
- " red-cyan-dubois Red/cyan anaglyph, Dubois method (default).\n"
- " green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
- " green-magenta-half-color Green/magenta anaglyph, half color method.\n"
- " green-magenta-full-color Green/magenta anaglyph, full color method.\n"
- " green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
- " amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
- " amber-blue-half-color Amber/blue anaglyph, half color method.\n"
- " amber-blue-full-color Amber/blue anaglyph, full color method.\n"
- " amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
- " red-green-monochrome Red/green anaglyph, monochrome method.\n"
- " red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
- " stereo OpenGL quad-buffered stereo.\n"
- " equalizer Multi-display via Equalizer (2D setup).\n"
- " equalizer-3d Multi-display via Equalizer (3D setup).\n"
- " -s|--swap-eyes Swap left/right view.\n"
- " -f|--fullscreen Fullscreen.\n"
- " -c|--center Center window on screen.\n"
- " -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
- " -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-separated\n"
- " values for the R,G,B channels.\n"
- " -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
- " -b|--benchmark Benchmark mode (no audio, show fps).\n"
- "\n"
- "Interactive control:\n"
- " q or ESC Quit.\n"
- " p or SPACE Pause / unpause.\n"
- " f Toggle fullscreen.\n"
- " c Center window.\n"
- " s Swap left/right view.\n"
- " v Cycle through available video streams.\n"
- " a Cycle through available audio streams.\n"
- " 1, 2 Adjust contrast.\n"
- " 3, 4 Adjust brightness.\n"
- " 5, 6 Adjust hue.\n"
- " 7, 8 Adjust saturation.\n"
- " <, > Adjust parallax.\n"
- " (, ) Adjust ghostbusting.\n"
- " left, right Seek 10 seconds backward / forward.\n"
- " up, down Seek 1 minute backward / forward.\n"
- " page up, page down Seek 10 minutes backward / forward.\n"
- " Mouse click Seek according to horizontal click position.",
+ /* TRANSLATORS: This is the --help text. Translate only the description,
+ not the option names. Please keep a proper indentation with spaces, and
+ keep the line length limited. */
+ msg::req_txt(_("Usage:\n"
+ " %s [option...] [file...]\n"
+ "\n"
+ "Options:\n"
+ " --help Print help.\n"
+ " --version Print version.\n"
+ " -n|--no-gui Do not use the GUI, just show a plain window.\n"
+ " -l|--log-level=LEVEL Set log level (debug/info/warning/error/quiet).\n"
+ " -v|--video=STREAM Select video stream (1-n, depending on input).\n"
+ " -a|--audio=STREAM Select audio stream (1-n, depending on input).\n"
+ " -s|--subtitle=STREAM Select subtitle stream (0-n, depending on input).\n"
+ " -i|--input=TYPE Select input type (default autodetect):\n"
+ " mono Single view.\n"
+ " separate-left-right Left/right separate streams, left first.\n"
+ " separate-right-left Left/right separate streams, right first.\n"
+ " top-bottom Left top, right bottom.\n"
+ " top-bottom-half Left top, right bottom, half height.\n"
+ " bottom-top Left bottom, right top.\n"
+ " bottom-top-half Left bottom, right top, half height.\n"
+ " left-right Left left, right right.\n"
+ " left-right-half Left left, right right, half width.\n"
+ " right-left Left right, right left.\n"
+ " right-left-half Left right, right left, half width.\n"
+ " even-odd-rows Left even rows, right odd rows.\n"
+ " odd-even-rows Left odd rows, right even rows.\n"
+ " -o|--output=TYPE Select output type:\n"
+ " mono-left Only left.\n"
+ " mono-right Only right.\n"
+ " top-bottom Left top, right bottom.\n"
+ " top-bottom-half Left top, right bottom, half height.\n"
+ " left-right Left left, right right.\n"
+ " left-right-half Left left, right right, half width.\n"
+ " even-odd-rows Left even rows, right odd rows.\n"
+ " even-odd-columns Left even columns, right odd columns.\n"
+ " checkerboard Left and right in checkerboard pattern.\n"
+ " hdmi-frame-pack HDMI frame packing mode.\n"
+ " red-cyan-monochrome Red/cyan anaglyph, monochrome method.\n"
+ " red-cyan-half-color Red/cyan anaglyph, half color method.\n"
+ " red-cyan-full-color Red/cyan anaglyph, full color method.\n"
+ " red-cyan-dubois Red/cyan anaglyph, Dubois method.\n"
+ " green-magenta-monochrome Green/magenta anaglyph, monochrome method.\n"
+ " green-magenta-half-color Green/magenta anaglyph, half color method.\n"
+ " green-magenta-full-color Green/magenta anaglyph, full color method.\n"
+ " green-magenta-dubois Green/magenta anaglyph, Dubois method.\n"
+ " amber-blue-monochrome Amber/blue anaglyph, monochrome method.\n"
+ " amber-blue-half-color Amber/blue anaglyph, half color method.\n"
+ " amber-blue-full-color Amber/blue anaglyph, full color method.\n"
+ " amber-blue-dubois Amber/blue anaglyph, Dubois method.\n"
+ " red-green-monochrome Red/green anaglyph, monochrome method.\n"
+ " red-blue-monochrome Red/blue anaglyph, monochrome method.\n"
+ " stereo OpenGL quad-buffered stereo.\n"
+ " equalizer Multi-display via Equalizer (2D setup).\n"
+ " equalizer-3d Multi-display via Equalizer (3D setup).\n"
+ " -S|--swap-eyes Swap left/right view.\n"
+ " -f|--fullscreen Fullscreen.\n"
+ " -c|--center Center window on screen.\n"
+ " --subtitle-encoding=ENC Set subtitle encoding.\n"
+ " --subtitle-font=FONT Set subtitle font name.\n"
+ " --subtitle-size=N Set subtitle font size.\n"
+ " --subtitle-scale=S Set subtitle scale factor.\n"
+ " --subtitle-color=COLOR Set subtitle color, in [AA]RRGGBB format.\n"
+ " --subtitle-parallax=VAL Subtitle parallax adjustment (-1 to +1).\n"
+ " -P|--parallax=VAL Parallax adjustment (-1 to +1).\n"
+ " -C|--crosstalk=VAL Crosstalk leak level (0 to 1); comma-separated\n"
+ " values for the R,G,B channels.\n"
+ " -G|--ghostbust=VAL Amount of ghostbusting to apply (0 to 1).\n"
+ " -b|--benchmark Benchmark mode (no audio, show fps).\n"
+ "\n"
+ "Interactive control:\n"
+ " q or ESC Quit.\n"
+ " p or SPACE Pause / unpause.\n"
+ " f Toggle fullscreen.\n"
+ " c Center window.\n"
+ " e Swap left/right eye.\n"
+ " v Cycle through available video streams.\n"
+ " a Cycle through available audio streams.\n"
+ " s Cycle through available subtitle streams.\n"
+ " 1, 2 Adjust contrast.\n"
+ " 3, 4 Adjust brightness.\n"
+ " 5, 6 Adjust hue.\n"
+ " 7, 8 Adjust saturation.\n"
+ " <, > Adjust parallax.\n"
+ " (, ) Adjust ghostbusting.\n"
+ " left, right Seek 10 seconds backward / forward.\n"
+ " up, down Seek 1 minute backward / forward.\n"
+ " page up, page down Seek 10 minutes backward / forward.\n"
+ " Mouse click Seek according to horizontal click position."),
 program_name);
 }
 if (version.value() || help.value())
@@ -304,6 +417,7 @@
 init_data.urls = arguments;
 init_data.video_stream = video.value() - 1;
 init_data.audio_stream = audio.value() - 1;
+ init_data.subtitle_stream = subtitle.value() - 1;
 if (input_mode.value() == "")
 {
 init_data.stereo_layout_override = false;
@@ -339,19 +453,28 @@
 parameters::stereo_mode_from_string(video_output_mode.value(), init_data.stereo_mode, init_data.stereo_mode_swap);
 init_data.stereo_mode_swap = swap_eyes.value();
 }
+ init_data.params.stereo_mode_swap = swap_eyes.value();
 init_data.fullscreen = fullscreen.value();
 init_data.center = center.value();
- init_data.benchmark = benchmark.value();
- if (init_data.benchmark)
+ init_data.params.subtitle_encoding = subtitle_encoding.value();
+ init_data.params.subtitle_font = subtitle_font.value();
+ init_data.params.subtitle_size = subtitle_size.value();
+ init_data.params.subtitle_scale = subtitle_scale.value();
+ if (!subtitle_color.values().empty())
 {
- msg::inf("Benchmark mode: audio and time synchronization disabled.");
+ init_data.params.subtitle_color = subtitle_color.value();
 }
+ init_data.params.subtitle_parallax = subtitle_parallax.value();
 init_data.params.parallax = parallax.value();
 init_data.params.crosstalk_r = crosstalk.value()[0];
 init_data.params.crosstalk_g = crosstalk.value()[1];
 init_data.params.crosstalk_b = crosstalk.value()[2];
 init_data.params.ghostbust = ghostbust.value();
- init_data.params.stereo_mode_swap = swap_eyes.value();
+ init_data.benchmark = benchmark.value();
+ if (init_data.benchmark)
+ {
+ msg::inf(_("Benchmark mode: audio and time synchronization disabled."));
+ }
 
 int retval = 0;
 player *player = NULL;
@@ -362,7 +485,7 @@
 #if HAVE_LIBEQUALIZER
 player = new class player_equalizer(&argc, argv, equalizer_flat_screen);
 #else
- throw exc("This version of Bino was compiled without support for Equalizer.");
+ throw exc(_("This version of Bino was compiled without support for Equalizer."));
 #endif
 }
 else if (!no_gui.value())
@@ -379,7 +502,7 @@
 {
 if (arguments.size() == 0)
 {
- throw exc("No video to play.");
+ throw exc(_("No video to play."));
 }
 player = new class player();
 }

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:
 s = "checkerboard";
 break;
+ case hdmi_frame_pack:
+ s = "hdmi-frame-pack";
+ break;
 case red_cyan_monochrome:
 s = "red-cyan-monochrome";
 break;
@@ -620,6 +750,10 @@
 {
 stereo_mode = checkerboard;
 }
+ else if (t == "hdmi-frame-pack")
+ {
+ stereo_mode = hdmi_frame_pack;
+ }
 else if (t == "red-cyan-monochrome")
 {
 stereo_mode = red_cyan_monochrome;
@@ -696,6 +830,12 @@
 s11n::save(os, brightness);
 s11n::save(os, hue);
 s11n::save(os, saturation);
+ s11n::save(os, subtitle_encoding);
+ s11n::save(os, subtitle_font);
+ s11n::save(os, subtitle_size);
+ s11n::save(os, subtitle_scale);
+ s11n::save(os, subtitle_color);
+ s11n::save(os, subtitle_parallax);
 }
 
 void parameters::load(std::istream &is)
@@ -713,4 +853,10 @@
 s11n::load(is, brightness);
 s11n::load(is, hue);
 s11n::load(is, saturation);
+ s11n::load(is, subtitle_encoding);
+ s11n::load(is, subtitle_font);
+ s11n::load(is, subtitle_size);
+ s11n::load(is, subtitle_scale);
+ s11n::load(is, subtitle_color);
+ s11n::load(is, subtitle_parallax);
 }

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

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.");
+ throw exc(str::asprintf(_("%s video stream %d: Cannot initialize conversion context."),
+ _url.c_str(), j + 1));
 }
 }
 else
@@ -664,12 +735,14 @@
 _ffmpeg->audio_codecs.push_back(avcodec_find_decoder(_ffmpeg->audio_codec_ctxs[j]->codec_id));
 if (!_ffmpeg->audio_codecs[j])
 {
- throw exc(_url + " stream " + str::from(i) + ": Unsupported audio codec.");
+ throw exc(str::asprintf(_("%s audio stream %d: Unsupported audio codec."),
+ _url.c_str(), j + 1));
 }
 if ((e = avcodec_open(_ffmpeg->audio_codec_ctxs[j], _ffmpeg->audio_codecs[j])) < 0)
 {
 _ffmpeg->audio_codecs[j] = NULL;
- throw exc(_url + " stream " + str::from(i) + ": Cannot open audio codec: " + my_av_strerror(e));
+ throw exc(str::asprintf(_("%s audio stream %d: Cannot open audio codec: %s"),
+ _url.c_str(), j + 1, my_av_strerror(e).c_str()));
 }
 _ffmpeg->audio_blob_templates.push_back(audio_blob());
 set_audio_blob_template(j);
@@ -685,36 +758,77 @@
 _ffmpeg->audio_buffers.push_back(std::vector<unsigned char>());
 _ffmpeg->audio_last_timestamps.push_back(std::numeric_limits<int64_t>::min());
 }
+ else if (_ffmpeg->format_ctx->streams[i]->codec->codec_type == CODEC_TYPE_SUBTITLE)
+ {
+ _ffmpeg->subtitle_streams.push_back(i);
+ int j = _ffmpeg->subtitle_streams.size() - 1;
+ msg::dbg(_url + " stream " + str::from(i) + " is subtitle stream " + str::from(j) + ".");
+ _ffmpeg->subtitle_codec_ctxs.push_back(_ffmpeg->format_ctx->streams[i]->codec);
+ if (_ffmpeg->subtitle_codec_ctxs[j]->codec_id == CODEC_ID_TEXT)
+ {
+ // CODEC_ID_TEXT does not have any decoder; it is just UTF-8 text in the packet data.
+ _ffmpeg->subtitle_codecs.push_back(NULL);
+ }
+ else
+ {
+ _ffmpeg->subtitle_codecs.push_back(avcodec_find_decoder(_ffmpeg->subtitle_codec_ctxs[j]->codec_id));
+ if (!_ffmpeg->subtitle_codecs[j])
+ {
+ throw exc(str::asprintf(_("%s subtitle stream %d: Unsupported subtitle codec."),
+ _url.c_str(), j + 1));
+ }
+ if ((e = avcodec_open(_ffmpeg->subtitle_codec_ctxs[j], _ffmpeg->subtitle_codecs[j])) < 0)
+ {
+ _ffmpeg->subtitle_codecs[j] = NULL;
+ throw exc(str::asprintf(_("%s subtitle stream %d: Cannot open subtitle codec: %s"),
+ _url.c_str(), j + 1, my_av_strerror(e).c_str()));
+ }
+ }
+ _ffmpeg->subtitle_box_templates.push_back(subtitle_box());
+ set_subtitle_box_template(j);
+ _ffmpeg->subtitle_decode_threads.push_back(subtitle_decode_thread(_url, _ffmpeg, j));
+ _ffmpeg->subtitle_box_buffers.push_back(std::deque<subtitle_box>());
+ _ffmpeg->subtitle_last_timestamps.push_back(std::numeric_limits<int64_t>::min());
+ }
 else
 {
- msg::dbg(_url + " stream " + str::from(i) + " contains neither video nor audio.");
+ msg::dbg(_url + " stream " + str::from(i) + " contains neither video nor audio nor subtitles.");
 }
 }
 _ffmpeg->video_packet_queues.resize(video_streams());
 _ffmpeg->audio_packet_queues.resize(audio_streams());
+ _ffmpeg->subtitle_packet_queues.resize(subtitle_streams());
 _ffmpeg->video_packet_queue_mutexes.resize(video_streams());
 _ffmpeg->audio_packet_queue_mutexes.resize(audio_streams());
+ _ffmpeg->subtitle_packet_queue_mutexes.resize(subtitle_streams());
 
 msg::inf(_url + ":");
 for (int i = 0; i < video_streams(); i++)
 {
- msg::inf(" Video stream %d: %s / %s, %g seconds", i,
+ msg::inf(4, _("Video stream %d: %s / %s, %g seconds"), i,
 video_frame_template(i).format_info().c_str(),
 video_frame_template(i).format_name().c_str(),
 video_duration(i) / 1e6f);
- msg::inf(" Using up to %d threads for decoding.",
+ msg::inf(8, _("Using up to %d threads for decoding."),
 _ffmpeg->video_codec_ctxs.at(i)->thread_count);
 }
 for (int i = 0; i < audio_streams(); i++)
 {
- msg::inf(" Audio stream %d: %s / %s, %g seconds", i,
+ msg::inf(4, _("Audio stream %d: %s / %s, %g seconds"), i,
 audio_blob_template(i).format_info().c_str(),
 audio_blob_template(i).format_name().c_str(),
 audio_duration(i) / 1e6f);
 }
- if (video_streams() == 0 && audio_streams() == 0)
+ for (int i = 0; i < subtitle_streams(); i++)
+ {
+ msg::inf(4, _("Subtitle stream %d: %s / %s, %g seconds"), i,
+ subtitle_box_template(i).format_info().c_str(),
+ subtitle_box_template(i).format_name().c_str(),
+ subtitle_duration(i) / 1e6f);
+ }
+ if (video_streams() == 0 && audio_streams() == 0 && subtitle_streams() == 0)
 {
- msg::inf(" No usable streams.");
+ msg::inf(4, _("No usable streams."));
 }
 }
 
@@ -753,14 +867,19 @@
 return empty;
 }
 
+int media_object::video_streams() const
+{
+ return _ffmpeg->video_streams.size();
+}
+
 int media_object::audio_streams() const
 {
 return _ffmpeg->audio_streams.size();
 }
 
-int media_object::video_streams() const
+int media_object::subtitle_streams() const
 {
- return _ffmpeg->video_streams.size();
+ return _ffmpeg->subtitle_streams.size();
 }
 
 void media_object::video_stream_set_active(int index, bool active)
@@ -776,6 +895,10 @@
 {
 _ffmpeg->audio_decode_threads[i].finish();
 }
+ for (size_t i = 0; i < _ffmpeg->subtitle_streams.size(); i++)
+ {
+ _ffmpeg->subtitle_decode_threads[i].finish();
+ }
 // Stop reading packets
 _ffmpeg->reader->finish();
 // Set status
@@ -798,6 +921,10 @@
 {
 _ffmpeg->audio_decode_threads[i].finish();
 }
+ for (size_t i = 0; i < _ffmpeg->subtitle_streams.size(); i++)
+ {
+ _ffmpeg->subtitle_decode_threads[i].finish();
+ }
 // Stop reading packets
 _ffmpeg->reader->finish();
 // Set status
@@ -816,6 +943,32 @@
 _ffmpeg->reader->start();
 }
 
+void media_object::subtitle_stream_set_active(int index, bool active)
+{
+ assert(index >= 0);
+ assert(index < subtitle_streams());
+ // Stop decoder threads
+ for (size_t i = 0; i < _ffmpeg->video_streams.size(); i++)
+ {
+ _ffmpeg->video_decode_threads[i].finish();
+ }
+ for (size_t i = 0; i < _ffmpeg->audio_streams.size(); i++)
+ {
+ _ffmpeg->audio_decode_threads[i].finish();
+ }
+ for (size_t i = 0; i < _ffmpeg->subtitle_streams.size(); i++)
+ {
+ _ffmpeg->subtitle_decode_threads[i].finish();
+ }
+ // Stop reading packets
+ _ffmpeg->reader->finish();
+ // Set status
+ _ffmpeg->format_ctx->streams[_ffmpeg->subtitle_streams.at(index)]->discard =
+ (active ? AVDISCARD_DEFAULT : AVDISCARD_ALL);
+ // Restart reader
+ _ffmpeg->reader->start();
+}
+
 const video_frame &media_object::video_frame_template(int video_stream) const
 {
 assert(video_stream >= 0);
@@ -841,19 +994,9 @@
 {
 assert(index >= 0);
 assert(index < video_streams());
- // Try to get duration from the Codec first. If that fails, fall back to
- // the value provided by the container.
- int64_t duration = _ffmpeg->format_ctx->streams[_ffmpeg->video_streams.at(index)]->duration;
- if (duration > 0)
- {
- AVRational time_base = _ffmpeg->format_ctx->streams[_ffmpeg->video_streams.at(index)]->time_base;
- return duration * 1000000 * time_base.num / time_base.den;
- }
- else
- {
- duration = _ffmpeg->format_ctx->duration;
- return duration * 1000000 / AV_TIME_BASE;
- }
+ return stream_duration(
+ _ffmpeg->format_ctx->streams[_ffmpeg->video_streams.at(index)],
+ _ffmpeg->format_ctx);
 }
 
 const audio_blob &media_object::audio_blob_template(int audio_stream) const
@@ -867,19 +1010,25 @@
 {
 assert(index >= 0);
 assert(index < audio_streams());
- // Try to get duration from the Codec first. If that fails, fall back to
- // the value provided by the container.
- int64_t duration = _ffmpeg->format_ctx->streams[_ffmpeg->audio_streams.at(index)]->duration;
- if (duration > 0)
- {
- AVRational time_base = _ffmpeg->format_ctx->streams[_ffmpeg->audio_streams.at(index)]->time_base;
- return duration * 1000000 * time_base.num / time_base.den;
- }
- else
- {
- duration = _ffmpeg->format_ctx->duration;
- return duration * 1000000 / AV_TIME_BASE;
- }
+ return stream_duration(
+ _ffmpeg->format_ctx->streams[_ffmpeg->audio_streams.at(index)],
+ _ffmpeg->format_ctx);
+}
+
+const subtitle_box &media_object::subtitle_box_template(int subtitle_stream) const
+{
+ assert(subtitle_stream >= 0);
+ assert(subtitle_stream < subtitle_streams());
+ return _ffmpeg->subtitle_box_templates.at(subtitle_stream);
+}
+
+int64_t media_object::subtitle_duration(int index) const
+{
+ assert(index >= 0);
+ assert(index < subtitle_streams());
+ return stream_duration(
+ _ffmpeg->format_ctx->streams[_ffmpeg->subtitle_streams.at(index)],
+ _ffmpeg->format_ctx);
 }
 
 read_thread::read_thread(const std::string &url, struct ffmpeg_stuff *ffmpeg) :
@@ -894,6 +1043,7 @@
 // We need another packet if the number of queued packets for an active stream is below a threshold.
 const size_t video_stream_low_threshold = 2; // Often, 1 packet results in one video frame
 const size_t audio_stream_low_threshold = 5; // Often, 3-4 packets are needed for one buffer fill
+ const size_t subtitle_stream_low_threshold = 1; // Just a guess
 bool need_another_packet = false;
 for (size_t i = 0; !need_another_packet && i < _ffmpeg->video_streams.size(); i++)
 {
@@ -913,6 +1063,15 @@
 _ffmpeg->audio_packet_queue_mutexes[i].unlock();
 }
 }
+ for (size_t i = 0; !need_another_packet && i < _ffmpeg->subtitle_streams.size(); i++)
+ {
+ if (_ffmpeg->format_ctx->streams[_ffmpeg->subtitle_streams[i]]->discard == AVDISCARD_DEFAULT)
+ {
+ _ffmpeg->subtitle_packet_queue_mutexes[i].lock();
+ need_another_packet = _ffmpeg->subtitle_packet_queues[i].size() < subtitle_stream_low_threshold;
+ _ffmpeg->subtitle_packet_queue_mutexes[i].unlock();
+ }
+ }
 if (!need_another_packet)
 {
 msg::dbg(_url + ": No need to read more packets.");
@@ -932,7 +1091,7 @@
 }
 else
 {
- throw exc(_url + ": " + my_av_strerror(e));
+ throw exc(str::asprintf(_("%s: %s"), _url.c_str(), my_av_strerror(e).c_str()));
 }
 }
 // Put the packet in the right queue.
@@ -948,7 +1107,7 @@
 // interdependencies. We would mess up decoding.
 if (av_dup_packet(&packet) < 0)
 {
- throw exc(_url + ": Cannot duplicate packet.");
+ throw exc(str::asprintf(_("%s: Cannot duplicate packet."), _url.c_str()));
 }
 _ffmpeg->video_packet_queue_mutexes[i].lock();
 _ffmpeg->video_packet_queues[i].push_back(packet);
@@ -978,7 +1137,7 @@
 if (av_dup_packet(&packet) < 0)
 {
 _ffmpeg->audio_packet_queue_mutexes[i].unlock();
- throw exc(_url + ": Cannot duplicate packet.");
+ throw exc(str::asprintf(_("%s: Cannot duplicate packet."), _url.c_str()));
 }
 _ffmpeg->audio_packet_queues[i].push_back(packet);
 packet_queued = true;
@@ -989,6 +1148,36 @@
 _ffmpeg->audio_packet_queue_mutexes[i].unlock();
 }
 }
+ for (size_t i = 0; i < _ffmpeg->subtitle_streams.size() && !packet_queued; i++)
+ {
+ if (packet.stream_index == _ffmpeg->subtitle_streams[i])
+ {
+ _ffmpeg->subtitle_packet_queue_mutexes[i].lock();
+ if (_ffmpeg->subtitle_packet_queues[i].empty()
+ && _ffmpeg->subtitle_last_timestamps[i] == std::numeric_limits<int64_t>::min()
+ && packet.dts == static_cast<int64_t>(AV_NOPTS_VALUE))
+ {
+ // We have no packet in the queue and no last timestamp, probably
+ // because we just seeked. We want a packet with a timestamp.
+ msg::dbg(_url + ": subtitle stream " + str::from(i)
+ + ": dropping packet because it has no timestamp");
+ }
+ else
+ {
+ if (av_dup_packet(&packet) < 0)
+ {
+ _ffmpeg->subtitle_packet_queue_mutexes[i].unlock();
+ throw exc(str::asprintf(_("%s: Cannot duplicate packet."), _url.c_str()));
+ }
+ _ffmpeg->subtitle_packet_queues[i].push_back(packet);
+ packet_queued = true;
+ msg::dbg(_url + ": "
+ + str::from(_ffmpeg->subtitle_packet_queues[i].size())
+ + " packets queued in subtitle stream " + str::from(i) + ".");
+ }
+ _ffmpeg->subtitle_packet_queue_mutexes[i].unlock();
+ }
+ }
 if (!packet_queued)
 {
 av_free_packet(&packet);
@@ -1084,13 +1273,13 @@
 }
 else if (_ffmpeg->video_last_timestamps[_video_stream] != std::numeric_limits<int64_t>::min())
 {
- msg::wrn(_url + ": video stream " + str::from(_video_stream)
+ msg::dbg(_url + ": video stream " + str::from(_video_stream)
 + ": no timestamp available, using a questionable guess");
 _frame.presentation_time = _ffmpeg->video_last_timestamps[_video_stream];
 }
 else
 {
- msg::wrn(_url + ": video stream " + str::from(_video_stream)
+ msg::dbg(_url + ": video stream " + str::from(_video_stream)
 + ": no timestamp available, using a bad guess");
 _frame.presentation_time = _ffmpeg->pos;
 }
@@ -1200,7 +1389,7 @@
 _ffmpeg->audio_buffers[_audio_stream].resize(old_size + tmpbuf_size);
 memcpy(&(_ffmpeg->audio_buffers[_audio_stream][old_size]), _ffmpeg->audio_tmpbufs[_audio_stream], tmpbuf_size);
 }
- 
+
 av_free_packet(&packet);
 }
 }
@@ -1210,7 +1399,7 @@
 }
 if (timestamp == std::numeric_limits<int64_t>::min())
 {
- msg::wrn(_url + ": audio stream " + str::from(_audio_stream)
+ msg::dbg(_url + ": audio stream " + str::from(_audio_stream)
 + ": no timestamp available, using a bad guess");
 timestamp = _ffmpeg->pos;
 }
@@ -1237,6 +1426,194 @@
 return _ffmpeg->audio_decode_threads[audio_stream].blob();
 }
 
+subtitle_decode_thread::subtitle_decode_thread(const std::string &url, struct ffmpeg_stuff *ffmpeg, int subtitle_stream) :
+ _url(url), _ffmpeg(ffmpeg), _subtitle_stream(subtitle_stream), _box()
+{
+}
+
+int64_t subtitle_decode_thread::handle_timestamp(int64_t timestamp)
+{
+ int64_t ts = timestamp_helper(_ffmpeg->subtitle_last_timestamps[_subtitle_stream], timestamp);
+ _ffmpeg->pos = ts;
+ return ts;
+}
+
+void subtitle_decode_thread::run()
+{
+ if (_ffmpeg->subtitle_box_buffers[_subtitle_stream].empty())
+ {
+ // Read more subtitle data
+ AVPacket packet, tmppacket;
+ bool empty;
+ do
+ {
+ _ffmpeg->subtitle_packet_queue_mutexes[_subtitle_stream].lock();
+ empty = _ffmpeg->subtitle_packet_queues[_subtitle_stream].empty();
+ _ffmpeg->subtitle_packet_queue_mutexes[_subtitle_stream].unlock();
+ if (empty)
+ {
+ if (_ffmpeg->reader->eof())
+ {
+ _box = subtitle_box();
+ return;
+ }
+ msg::dbg(_url + ": subtitle stream " + str::from(_subtitle_stream) + ": need to wait for packets...");
+ _ffmpeg->reader->start();
+ _ffmpeg->reader->finish();
+ }
+ }
+ while (empty);
+ _ffmpeg->subtitle_packet_queue_mutexes[_subtitle_stream].lock();
+ packet = _ffmpeg->subtitle_packet_queues[_subtitle_stream].front();
+ _ffmpeg->subtitle_packet_queues[_subtitle_stream].pop_front();
+ _ffmpeg->subtitle_packet_queue_mutexes[_subtitle_stream].unlock();
+ _ffmpeg->reader->start(); // Refill the packet queue
+
+ // Decode subtitle data
+ int64_t timestamp = packet.pts * 1000000
+ * _ffmpeg->format_ctx->streams[_ffmpeg->subtitle_streams[_subtitle_stream]]->time_base.num
+ / _ffmpeg->format_ctx->streams[_ffmpeg->subtitle_streams[_subtitle_stream]]->time_base.den;
+ AVSubtitle subtitle;
+ int got_subtitle;
+ tmppacket = packet;
+
+ // CODEC_ID_TEXT does not have any decoder; it is just UTF-8 text in the packet data.
+ if (_ffmpeg->subtitle_codec_ctxs[_subtitle_stream]->codec_id == CODEC_ID_TEXT)
+ {
+ int64_t duration = packet.convergence_duration * 1000000
+ * _ffmpeg->format_ctx->streams[_ffmpeg->subtitle_streams[_subtitle_stream]]->time_base.num
+ / _ffmpeg->format_ctx->streams[_ffmpeg->subtitle_streams[_subtitle_stream]]->time_base.den;
+
+ // Put it in the subtitle buffer
+ subtitle_box box = _ffmpeg->subtitle_box_templates[_subtitle_stream];
+ box.presentation_start_time = timestamp;
+ box.presentation_stop_time = timestamp + duration;
+
+ box.format = subtitle_box::text;
+ box.str = reinterpret_cast<const char *>(packet.data);
+
+ _ffmpeg->subtitle_box_buffers[_subtitle_stream].push_back(box);
+
+ tmppacket.size = 0;
+ }
+
+ while (tmppacket.size > 0)
+ {
+ int len = avcodec_decode_subtitle2(_ffmpeg->subtitle_codec_ctxs[_subtitle_stream],
+ &subtitle, &got_subtitle, &tmppacket);
+ if (len < 0)
+ {
+ tmppacket.size = 0;
+ break;
+ }
+ tmppacket.data += len;
+ tmppacket.size -= len;
+ if (!got_subtitle)
+ {
+ continue;
+ }
+ // Put it in the subtitle buffer
+ subtitle_box box = _ffmpeg->subtitle_box_templates[_subtitle_stream];
+ box.presentation_start_time = timestamp + subtitle.start_display_time * 1000;
+ box.presentation_stop_time = box.presentation_start_time + subtitle.end_display_time * 1000;
+ if (subtitle.num_rects > 0 && subtitle.rects[0]->type == SUBTITLE_ASS
+ && subtitle.start_display_time == subtitle.end_display_time)
+ {
+ // XXX As of 20110409, FFmpeg does not properly set the duration of ASS subtitles.
+ // This is a temporary workaround that can be removed once a fixed version of
+ // FFmpeg can be assumed. See http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/130619
+ int start_hour, start_min, start_sec, start_hsec;
+ int end_hour, end_min, end_sec, end_hsec;
+ if (sscanf(subtitle.rects[0]->ass, "%*[^,],%d:%d:%d%*c%d,%d:%d:%d%*c%d",
+ &start_hour, &start_min, &start_sec, &start_hsec,
+ &end_hour, &end_min, &end_sec, &end_hsec) == 8)
+ {
+ start_min += 60 * start_hour;
+ start_sec += 60 * start_min;
+ start_hsec += start_sec * 100;
+ end_min += 60 * end_hour;
+ end_sec += 60 * end_min;
+ end_hsec += end_sec * 100;
+ int64_t duration_ms = (end_hsec - start_hsec) * 10;
+ box.presentation_stop_time = box.presentation_start_time + duration_ms * 1000;
+ }
+ }
+ for (unsigned int i = 0; i < subtitle.num_rects; i++)
+ {
+ AVSubtitleRect *rect = subtitle.rects[i];
+ switch (rect->type)
+ {
+ case SUBTITLE_BITMAP:
+ box.format = subtitle_box::image;
+ box.images.push_back(subtitle_box::image_t());
+ box.images.back().w = rect->w;
+ box.images.back().h = rect->h;
+ box.images.back().x = rect->x;
+ box.images.back().y = rect->y;
+ box.images.back().palette.resize(4 * rect->nb_colors);
+ std::memcpy(&(box.images.back().palette[0]), rect->pict.data[1],
+ box.images.back().palette.size());
+ box.images.back().linesize = rect->pict.linesize[0];
+ box.images.back().data.resize(box.images.back().h * box.images.back().linesize);
+ std::memcpy(&(box.images.back().data[0]), rect->pict.data[0],
+ box.images.back().data.size() * sizeof(uint8_t));
+ break;
+ case SUBTITLE_TEXT:
+ box.format = subtitle_box::text;
+ if (!box.str.empty())
+ {
+ box.str += '\n';
+ }
+ box.str += rect->text;
+ break;
+ case SUBTITLE_ASS:
+ box.format = subtitle_box::ass;
+ box.style = std::string(reinterpret_cast<const char *>(
+ _ffmpeg->subtitle_codec_ctxs[_subtitle_stream]->subtitle_header),
+ _ffmpeg->subtitle_codec_ctxs[_subtitle_stream]->subtitle_header_size);
+ if (!box.str.empty())
+ {
+ box.str += '\n';
+ }
+ box.str += rect->ass;
+ break;
+ case SUBTITLE_NONE:
+ // Should never happen, but make sure we have a valid subtitle box anyway.
+ box.format = subtitle_box::text;
+ box.str = ' ';
+ break;
+ }
+ }
+ _ffmpeg->subtitle_box_buffers[_subtitle_stream].push_back(box);
+ avsubtitle_free(&subtitle);
+ }
+
+ av_free_packet(&packet);
+ }
+ if (_ffmpeg->subtitle_box_buffers[_subtitle_stream].empty())
+ {
+ _box = subtitle_box();
+ return;
+ }
+ _box = _ffmpeg->subtitle_box_buffers[_subtitle_stream].front();
+ _ffmpeg->subtitle_box_buffers[_subtitle_stream].pop_front();
+}
+
+void media_object::start_subtitle_box_read(int subtitle_stream)
+{
+ assert(subtitle_stream >= 0);
+ assert(subtitle_stream < subtitle_streams());
+ _ffmpeg->subtitle_decode_threads[subtitle_stream].start();
+}
+
+subtitle_box media_object::finish_subtitle_box_read(int subtitle_stream)
+{
+ assert(subtitle_stream >= 0);
+ assert(subtitle_stream < subtitle_streams());
+ _ffmpeg->subtitle_decode_threads[subtitle_stream].finish();
+ return _ffmpeg->subtitle_decode_threads[subtitle_stream].box();
+}
+
 int64_t media_object::tell()
 {
 return _ffmpeg->pos;
@@ -1255,6 +1632,10 @@
 {
 _ffmpeg->audio_decode_threads[i].finish();
 }
+ for (size_t i = 0; i < _ffmpeg->subtitle_streams.size(); i++)
+ {
+ _ffmpeg->subtitle_decode_threads[i].finish();
+ }
 // Stop reading packets
 _ffmpeg->reader->finish();
 // Seek
@@ -1263,7 +1644,7 @@
 dest_pos < _ffmpeg->pos ? AVSEEK_FLAG_BACKWARD : 0);
 if (e < 0)
 {
- msg::err(_url + ": Seeking failed.");
+ msg::err(_("%s: Seeking failed."), _url.c_str());
 }
 // Throw away all queued packets
 for (size_t i = 0; i < _ffmpeg->video_streams.size(); i++)
@@ -1285,6 +1666,20 @@
 }
 _ffmpeg->audio_packet_queues[i].clear();
 }
+ for (size_t i = 0; i < _ffmpeg->subtitle_streams.size(); i++)
+ {
+ if (_ffmpeg->format_ctx->streams[_ffmpeg->subtitle_streams[i]]->codec->codec_id != CODEC_ID_TEXT)
+ {
+ // CODEC_ID_TEXT has no decoder, so we cannot flush its buffers
+ avcodec_flush_buffers(_ffmpeg->format_ctx->streams[_ffmpeg->subtitle_streams[i]]->codec);
+ }
+ _ffmpeg->subtitle_box_buffers[i].clear();
+ for (size_t j = 0; j < _ffmpeg->subtitle_packet_queues[i].size(); j++)
+ {
+ av_free_packet(&_ffmpeg->subtitle_packet_queues[i][j]);
+ }
+ _ffmpeg->subtitle_packet_queues[i].clear();
+ }
 // The next read request must update the position
 for (size_t i = 0; i < _ffmpeg->video_streams.size(); i++)
 {
@@ -1294,6 +1689,10 @@
 {
 _ffmpeg->audio_last_timestamps[i] = std::numeric_limits<int64_t>::min();
 }
+ for (size_t i = 0; i < _ffmpeg->subtitle_streams.size(); i++)
+ {
+ _ffmpeg->subtitle_last_timestamps[i] = std::numeric_limits<int64_t>::min();
+ }
 _ffmpeg->pos = std::numeric_limits<int64_t>::min();
 // Restart packet reading
 _ffmpeg->reader->reset();
@@ -1305,14 +1704,18 @@
 try
 {
 // Stop decoder threads
- for (size_t i = 0; i < _ffmpeg->video_streams.size(); i++)
+ for (size_t i = 0; i < _ffmpeg->video_decode_threads.size(); i++)
 {
 _ffmpeg->video_decode_threads[i].finish();
 }
- for (size_t i = 0; i < _ffmpeg->audio_streams.size(); i++)
+ for (size_t i = 0; i < _ffmpeg->audio_decode_threads.size(); i++)
 {
 _ffmpeg->audio_decode_threads[i].finish();
 }
+ for (size_t i = 0; i < _ffmpeg->subtitle_decode_threads.size(); i++)
+ {
+ _ffmpeg->subtitle_decode_threads[i].finish();
+ }
 // Stop reading packets
 _ffmpeg->reader->finish();
 }
@@ -1347,7 +1750,7 @@
 if (_ffmpeg->video_packet_queues[i].size() > 0)
 {
 msg::dbg(_url + ": " + str::from(_ffmpeg->video_packet_queues[i].size())
- + " unprocessed video packets in video stream " + str::from(i));
+ + " unprocessed packets in video stream " + str::from(i));
 }
 for (size_t j = 0; j < _ffmpeg->video_packet_queues[i].size(); j++)
 {
@@ -1370,7 +1773,7 @@
 if (_ffmpeg->audio_packet_queues[i].size() > 0)
 {
 msg::dbg(_url + ": " + str::from(_ffmpeg->audio_packet_queues[i].size())
- + " unprocessed audio packets in audio stream " + str::from(i));
+ + " unprocessed packets in audio stream " + str::from(i));
 }
 for (size_t j = 0; j < _ffmpeg->audio_packet_queues[i].size(); j++)
 {
@@ -1381,6 +1784,25 @@
 {
 av_free(_ffmpeg->audio_tmpbufs[i]);
 }
+ for (size_t i = 0; i < _ffmpeg->subtitle_codec_ctxs.size(); i++)
+ {
+ if (i < _ffmpeg->subtitle_codecs.size() && _ffmpeg->subtitle_codecs[i])
+ {
+ avcodec_close(_ffmpeg->subtitle_codec_ctxs[i]);
+ }
+ }
+ for (size_t i = 0; i < _ffmpeg->subtitle_packet_queues.size(); i++)
+ {
+ if (_ffmpeg->subtitle_packet_queues[i].size() > 0)
+ {
+ msg::dbg(_url + ": " + str::from(_ffmpeg->subtitle_packet_queues[i].size())
+ + " unprocessed packets in subtitle stream " + str::from(i));
+ }
+ for (size_t j = 0; j < _ffmpeg->subtitle_packet_queues[i].size(); j++)
+ {
+ av_free_packet(&_ffmpeg->subtitle_packet_queues[i][j]);
+ }
+ }
 if (_ffmpeg->format_ctx)
 {
 av_close_input_file(_ffmpeg->format_ctx);

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;
 }
 else if (_pause_request)
@@ -462,6 +521,18 @@
 _first_frame = false;
 }
 _video_pos = _video_frame.presentation_time;
+ if (_media_input->selected_subtitle_stream() >= 0)
+ {
+ // TODO: start subtitle reading asynchronously to use benefits of multithreading
+ while (_next_subtitle_box.is_valid()
+ && _next_subtitle_box.presentation_stop_time < _video_pos)
+ {
+ _media_input->start_subtitle_box_read();
+ _next_subtitle_box = _media_input->finish_subtitle_box_read();
+ // If the box is invalid, we reached the end of the subtitle stream.
+ // Ignore this and let audio/video continue.
+ }
+ }
 if (!_audio_output)
 {
 _master_time_start += (_video_pos - _master_time_pos);
@@ -478,6 +549,7 @@
 else if (!_pause_request)
 {
 *prep_frame = true;
+ set_current_subtitle_box();
 }
 *more_steps = true;
 return 0;
@@ -543,7 +615,7 @@
 _drop_next_frame = false;
 if (_master_time_current - _video_pos > _media_input->video_frame_duration() * 75 / 100 && !_benchmark)
 {
- msg::wrn("Video: delay %g seconds; dropping next frame.", (_master_time_current - _video_pos) / 1e6f);
+ msg::wrn(_("Video: delay %g seconds; dropping next frame."), (_master_time_current - _video_pos) / 1e6f);
 _drop_next_frame = true;
 }
 if (!_previous_frame_dropped)
@@ -555,7 +627,7 @@
 if (_frames_shown == 100) //show fps each 100 frames
 {
 int64_t now = timer::get_microseconds(timer::monotonic);
- msg::inf("FPS: %.2f", static_cast<float>(_frames_shown) / ((now - _fps_mark_time) / 1e6f));
+ msg::inf(_("FPS: %.2f"), static_cast<float>(_frames_shown) / ((now - _fps_mark_time) / 1e6f));
 _fps_mark_time = now;
 _frames_shown = 0;
 }
@@ -600,7 +672,7 @@
 }
 if (prep_frame)
 {
- _video_output->prepare_next_frame(_video_frame);
+ _video_output->prepare_next_frame(_video_frame, _current_subtitle_box);
 }
 else if (drop_frame)
 {
@@ -736,6 +808,38 @@
 }
 }
 break;
+ case command::cycle_subtitle_stream:
+ if (_media_input->subtitle_streams() > 1)
+ {
+ int oldstream = _media_input->selected_subtitle_stream();
+ int newstream = oldstream + 1;
+ if (newstream >= _media_input->subtitle_streams())
+ {
+ newstream = -1;
+ }
+ _media_input->select_subtitle_stream(newstream);
+ notify(notification::subtitle_stream, oldstream, newstream);
+ _seek_request = -1; // Get position right
+ }
+ break;
+ case command::set_subtitle_stream:
+ if (_media_input->subtitle_streams() > 0)
+ {
+ int oldstream = _media_input->selected_subtitle_stream();
+ int newstream;
+ s11n::load(p, newstream);
+ if (newstream < -1 || newstream >= _media_input->subtitle_streams())
+ {
+ newstream = -1;
+ }
+ if (newstream != oldstream)
+ {
+ _media_input->select_subtitle_stream(newstream);
+ notify(notification::subtitle_stream, oldstream, newstream);
+ _seek_request = -1; // Get position right
+ }
+ }
+ break;
 case command::set_stereo_layout:
 {
 int stereo_layout;
@@ -835,16 +939,6 @@
 parameters_changed = true;
 notify(notification::saturation, oldval, _params.saturation);
 break;
- case command::seek:
- s11n::load(p, param);
- _seek_request = param * 1e6f;
- /* notify when request is fulfilled */
- break;
- case command::set_pos:
- s11n::load(p, param);
- _set_pos_request = param;
- /* notify when request is fulfilled */
- break;
 case command::adjust_parallax:
 s11n::load(p, param);
 oldval = _params.parallax;
@@ -893,6 +987,69 @@
 parameters_changed = true;
 notify(notification::ghostbust, oldval, _params.ghostbust);
 break;
+ case command::set_subtitle_encoding:
+ {
+ std::string oldenc = _params.subtitle_encoding;
+ s11n::load(p, _params.subtitle_encoding);
+ parameters_changed = true;
+ notify(notification::subtitle_encoding, oldenc, _params.subtitle_encoding);
+ break;
+ }
+ case command::set_subtitle_font:
+ {
+ std::string oldfont = _params.subtitle_font;
+ s11n::load(p, _params.subtitle_font);
+ parameters_changed = true;
+ notify(notification::subtitle_font, oldfont, _params.subtitle_font);
+ break;
+ }
+ case command::set_subtitle_size:
+ {
+ int oldval = _params.subtitle_size;
+ s11n::load(p, _params.subtitle_size);
+ parameters_changed = true;
+ notify(notification::subtitle_size, oldval, _params.subtitle_size);
+ break;
+ }
+ case command::set_subtitle_scale:
+ s11n::load(p, param);
+ oldval = _params.subtitle_scale;
+ _params.subtitle_scale = std::max(param, 0.0f);
+ parameters_changed = true;
+ notify(notification::subtitle_scale, oldval, _params.subtitle_scale);
+ break;
+ case command::set_subtitle_color:
+ {
+ uint64_t oldval = _params.subtitle_color;
+ s11n::load(p, _params.subtitle_color);
+ parameters_changed = true;
+ notify(notification::subtitle_color, oldval, _params.subtitle_color);
+ break;
+ }
+ case command::adjust_subtitle_parallax:
+ s11n::load(p, param);
+ oldval = _params.subtitle_parallax;
+ _params.subtitle_parallax = std::max(std::min(_params.subtitle_parallax + param, 1.0f), -1.0f);
+ parameters_changed = true;
+ notify(notification::parallax, oldval, _params.subtitle_parallax);
+ break;
+ case command::set_subtitle_parallax:
+ s11n::load(p, param);
+ oldval = _params.subtitle_parallax;
+ _params.subtitle_parallax = std::max(std::min(param, 1.0f), -1.0f);
+ parameters_changed = true;
+ notify(notification::subtitle_parallax, oldval, _params.subtitle_parallax);
+ break;
+ case command::seek:
+ s11n::load(p, param);
+ _seek_request = param * 1e6f;
+ /* notify when request is fulfilled */
+ break;
+ case command::set_pos:
+ s11n::load(p, param);
+ _set_pos_request = param;
+ /* notify when request is fulfilled */
+ break;
 }
 
 if (parameters_changed && _video_output)

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

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);
+ s11n::load(iss, canvas_width);
+ s11n::load(iss, canvas_height);
 s11n::load(iss, canvas_video_area.x);
 s11n::load(iss, canvas_video_area.y);
 s11n::load(iss, canvas_video_area.w);
@@ -310,6 +342,7 @@
 class eq_frame_data : public co::Object
 {
 public:
+ subtitle_box subtitle;
 parameters params;
 int64_t seek_to;
 bool prep_frame;
@@ -318,8 +351,12 @@
 
 public:
 eq_frame_data() :
- params(), seek_to(0),
- prep_frame(false), drop_frame(false), display_frame(false)
+ subtitle(),
+ params(),
+ seek_to(0),
+ prep_frame(false),
+ drop_frame(false),
+ display_frame(false)
 {
 }
 
@@ -332,6 +369,7 @@
 virtual void getInstanceData(co::DataOStream &os)
 {
 std::ostringstream oss;
+ s11n::save(oss, subtitle);
 s11n::save(oss, params);
 s11n::save(oss, seek_to);
 s11n::save(oss, prep_frame);
@@ -345,6 +383,7 @@
 std::string s;
 is >> s;
 std::istringstream iss(s);
+ s11n::load(iss, subtitle);
 s11n::load(iss, params);
 s11n::load(iss, seek_to);
 s11n::load(iss, prep_frame);
@@ -405,12 +444,14 @@
 // Find region of canvas to use, depending on the video aspect ratio
 if (getCanvases().size() < 1)
 {
- msg::err("No canvas in Equalizer configuration.");
+ msg::err(_("No canvas in Equalizer configuration."));
 return false;
 }
 float canvas_w = getCanvases()[0]->getWall().getWidth();
 float canvas_h = getCanvases()[0]->getWall().getHeight();
 float canvas_aspect_ratio = canvas_w / canvas_h;
+ _eq_init_data.canvas_width = canvas_w;
+ _eq_init_data.canvas_height = canvas_h;
 _eq_init_data.canvas_video_area.w = 1.0f;
 _eq_init_data.canvas_video_area.h = 1.0f;
 
@@ -437,9 +478,10 @@
 _eq_init_data.canvas_video_area.x = -0.5f * _eq_init_data.canvas_video_area.w;
 _eq_init_data.canvas_video_area.y = -0.5f * _eq_init_data.canvas_video_area.h;
 }
- msg::inf("Equalizer canvas:");
- msg::inf(" %gx%g, aspect ratio %g:1", canvas_w, canvas_h, canvas_w / canvas_h);
- msg::inf(" Area for %g:1 video: [ %g %g %g %g @ %g ]", frame_template.aspect_ratio,
+ msg::inf(_("Equalizer canvas:"));
+ msg::inf(4, _("%gx%g, aspect ratio %g:1"), canvas_w, canvas_h, canvas_w / canvas_h);
+ msg::inf(4, _("Area for %g:1 video: [ %g %g %g %g @ %g ]"),
+ frame_template.aspect_ratio,
 _eq_init_data.canvas_video_area.x, _eq_init_data.canvas_video_area.y,
 _eq_init_data.canvas_video_area.w, _eq_init_data.canvas_video_area.h,
 _eq_init_data.canvas_video_area.d);
@@ -475,6 +517,7 @@
 this->exit();
 }
 // Update the video state for all (it might have changed via handleEvent())
+ _eq_frame_data.subtitle = _player.get_subtitle();
 _eq_frame_data.params = _player.get_parameters();
 // Commit the updated frame data
 const eq::uint128_t version = _eq_frame_data.commit();
@@ -495,7 +538,7 @@
 case 'q':
 _controller.send_cmd(command::toggle_play);
 break;
- case 's':
+ case 'e':
 _controller.send_cmd(command::toggle_stereo_mode_swap);
 break;
 case 'f':
@@ -520,6 +563,12 @@
 * the change via frame data. */
 //_controller.send_cmd(command::cycle_audio_stream);
 break;
+ case 's':
+ /* TODO: cycling subtitle streams is currently not supported with Equalizer.
+ * We would have to cycle the streams in all node players, and thus communicate
+ * the change via frame data. */
+ //_controller.send_cmd(command::cycle_subtitle_stream);
+ break;
 case '1':
 _controller.send_cmd(command::adjust_contrast, -0.05f);
 break;
@@ -576,6 +625,16 @@
 break;
 }
 }
+ else if (event->data.type == eq::Event::CHANNEL_POINTER_BUTTON_RELEASE)
+ {
+ float event_px = event->data.pointerButtonRelease.x; // Event position in pixels
+ float channel_pw = event->data.context.pvp.w; // Channel width in pixels
+ float event_x = event_px / channel_pw; // Event position relative to channel
+ // Event position relative to destination view (which seems to be the same as the canvas?)
+ float dest = event->data.context.vp.x + event_x * event->data.context.vp.w;
+ dest = std::min(std::max(dest, 0.0f), 1.0f); // Clamp to [0,1] - just to be sure
+ _controller.send_cmd(command::set_pos, dest); // Seek to this position
+ }
 return true;
 }
 
@@ -786,16 +845,16 @@
 }
 
 public:
- void prepare_next_frame(video_output *vo)
+ const video_frame &get_video_frame()
 {
 if (_is_app_node)
 {
 eq_config *config = static_cast<eq_config *>(getConfig());
- config->player()->prepare_next_frame(vo);
+ return config->player()->get_video_frame();
 }
 else
 {
- _player.prepare_next_frame(vo);
+ return _player.get_video_frame();
 }
 }
 };
@@ -818,17 +877,9 @@
 
 class eq_window : public eq::Window
 {
-private:
- video_output_eq_window _video_output;
-
 public:
- eq_window(eq::Pipe *parent) : eq::Window(parent), _video_output(this)
- {
- }
-
- void display(bool mono_right_instead_of_left, float x, float y, float w, float h, const int viewport[4])
+ eq_window(eq::Pipe *parent) : eq::Window(parent)
 {
- _video_output.display_current_frame(mono_right_instead_of_left, x, y, w, h, viewport);
 }
 
 protected:
@@ -842,7 +893,7 @@
 if (!glewContextIsSupported(const_cast<GLEWContext *>(glewGetContext()),
 "GL_VERSION_2_1 GL_EXT_framebuffer_object"))
 {
- msg::err("This OpenGL implementation does not support OpenGL 2.1 and framebuffer objects.");
+ msg::err(_("This OpenGL implementation does not support OpenGL 2.1 and framebuffer objects."));
 setError(ERROR_OPENGL_2_1_NEEDED);
 return false;
 }
@@ -857,32 +908,8 @@
 virtual bool configExitGL()
 {
 msg::dbg(HERE);
- _video_output.deinit();
- msg::dbg(HERE);
 return eq::Window::configExitGL();
 }
-
- virtual void frameStart(const eq::uint128_t &, const uint32_t frame_number)
- {
- // Get frame data via from the node
- eq_node *node = static_cast<eq_node *>(getNode());
- _video_output.set_parameters(node->frame_data.params);
- // Do as we're told
- if (node->frame_data.prep_frame)
- {
- node->prepare_next_frame(&_video_output);
- }
- if (node->frame_data.display_frame)
- {
- _video_output.activate_next_frame();
- }
- startFrame(frame_number);
- }
-
- virtual void frameFinish(const eq::uint128_t &, const uint32_t frame_number)
- {
- releaseFrame(frame_number);
- }
 };
 
 /*
@@ -892,13 +919,30 @@
 class eq_channel : public eq::Channel
 {
 private:
+ video_output_eq_channel _video_output;
 
 public:
- eq_channel(eq::Window *parent) : eq::Channel(parent)
+ eq_channel(eq::Window *parent) :
+ eq::Channel(parent),
+ _video_output(this,
+ static_cast<eq_node *>(getNode())->init_data.canvas_width,
+ static_cast<eq_node *>(getNode())->init_data.canvas_height,
+ static_cast<eq_node *>(getNode())->init_data.canvas_video_area.w,
+ static_cast<eq_node *>(getNode())->init_data.canvas_video_area.h)
 {
 }
 
 protected:
+
+ virtual bool configExit()
+ {
+ msg::dbg(HERE);
+ getWindow()->makeCurrent();
+ _video_output.deinit();
+ msg::dbg(HERE);
+ return eq::Channel::configExit();
+ }
+
 virtual void frameDraw(const eq::uint128_t &frame_id)
 {
 // Let Equalizer initialize some stuff
@@ -939,11 +983,34 @@
 // Display
 glEnable(GL_TEXTURE_2D);
 glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
- eq_window *window = static_cast<eq_window *>(getWindow());
 bool mono_right_instead_of_left = (getEye() == eq::EYE_RIGHT);
 GLint viewport[4];
 glGetIntegerv(GL_VIEWPORT, viewport);
- window->display(mono_right_instead_of_left, quad_x, quad_y, quad_w, quad_h, viewport);
+ _video_output.display_current_frame(mono_right_instead_of_left, quad_x, quad_y, quad_w, quad_h, viewport);
+ }
+
+ virtual void frameStart(const eq::uint128_t &, const uint32_t frame_number)
+ {
+ // Get frame data via from the node
+ eq_node *node = static_cast<eq_node *>(getNode());
+ _video_output.set_parameters(node->frame_data.params);
+ // Do as we're told
+ if (node->frame_data.prep_frame)
+ {
+ getWindow()->makeCurrent();
+ _video_output.prepare_next_frame(node->get_video_frame(), node->frame_data.subtitle);
+ }
+ if (node->frame_data.display_frame)
+ {
+ getWindow()->makeCurrent();
+ _video_output.activate_next_frame();
+ }
+ startFrame(frame_number);
+ }
+
+ virtual void frameFinish(const eq::uint128_t &, const uint32_t frame_number)
+ {
+ releaseFrame(frame_number);
 }
 };
 
@@ -992,7 +1059,7 @@
 _node_factory = static_cast<void *>(new eq_node_factory);
 if (!eq::init(*argc, argv, static_cast<eq::NodeFactory *>(_node_factory)))
 {
- throw exc("Equalizer initialization failed.");
+ throw exc(_("Equalizer initialization failed."));
 }
 /* Get a configuration */
 _config = static_cast<void *>(eq::getConfig(*argc, argv));
@@ -1000,7 +1067,7 @@
 // eq::getConfig() does not return on other nodes.
 if (!_config)
 {
- throw exc("Cannot get equalizer configuration.");
+ throw exc(_("Cannot get equalizer configuration."));
 }
 }
 
@@ -1014,7 +1081,7 @@
 eq_config *config = static_cast<eq_config *>(_config);
 if (!config->init(init_data, _flat_screen))
 {
- throw exc("Equalizer configuration initialization failed.");
+ throw exc(_("Equalizer configuration initialization failed."));
 }
 }

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();
+ }
+ if (subtitle_label->minimumSizeHint().width() > minw)
+ {
+ minw = subtitle_label->minimumSizeHint().width();
+ }
+ input_label->setMinimumSize(QSize(minw, input_label->minimumSizeHint().height()));
+ output_label->setMinimumSize(QSize(minw, output_label->minimumSizeHint().height()));
+ video_label->setMinimumSize(QSize(minw, video_label->minimumSizeHint().height()));
+ audio_label->setMinimumSize(QSize(minw, audio_label->minimumSizeHint().height()));
+ subtitle_label->setMinimumSize(QSize(minw, subtitle_label->minimumSizeHint().height()));
 
 _video_combobox->setEnabled(false);
 _audio_combobox->setEnabled(false);
+ _subtitle_combobox->setEnabled(false);
 _input_combobox->setEnabled(false);
 _output_combobox->setEnabled(false);
 _swap_checkbox->setEnabled(false);
@@ -292,48 +326,51 @@
 case parameters::checkerboard:
 _output_combobox->setCurrentIndex(9);
 break;
- case parameters::red_cyan_monochrome:
+ case parameters::hdmi_frame_pack:
 _output_combobox->setCurrentIndex(10);
 break;
- case parameters::red_cyan_half_color:
+ case parameters::red_cyan_monochrome:
 _output_combobox->setCurrentIndex(11);
 break;
- case parameters::red_cyan_full_color:
+ case parameters::red_cyan_half_color:
 _output_combobox->setCurrentIndex(12);
 break;
- case parameters::red_cyan_dubois:
+ case parameters::red_cyan_full_color:
 _output_combobox->setCurrentIndex(13);
 break;
- case parameters::green_magenta_monochrome:
+ case parameters::red_cyan_dubois:
 _output_combobox->setCurrentIndex(14);
 break;
- case parameters::green_magenta_half_color:
+ case parameters::green_magenta_monochrome:
 _output_combobox->setCurrentIndex(15);
 break;
- case parameters::green_magenta_full_color:
+ case parameters::green_magenta_half_color:
 _output_combobox->setCurrentIndex(16);
 break;
- case parameters::green_magenta_dubois:
+ case parameters::green_magenta_full_color:
 _output_combobox->setCurrentIndex(17);
 break;
- case parameters::amber_blue_monochrome:
+ case parameters::green_magenta_dubois:
 _output_combobox->setCurrentIndex(18);
 break;
- case parameters::amber_blue_half_color:
+ case parameters::amber_blue_monochrome:
 _output_combobox->setCurrentIndex(19);
 break;
- case parameters::amber_blue_full_color:
+ case parameters::amber_blue_half_color:
 _output_combobox->setCurrentIndex(20);
 break;
- case parameters::amber_blue_dubois:
+ case parameters::amber_blue_full_color:
 _output_combobox->setCurrentIndex(21);
 break;
- case parameters::red_green_monochrome:
+ case parameters::amber_blue_dubois:
 _output_combobox->setCurrentIndex(22);
 break;
- case parameters::red_blue_monochrome:
+ case parameters::red_green_monochrome:
 _output_combobox->setCurrentIndex(23);
 break;
+ case parameters::red_blue_monochrome:
+ _output_combobox->setCurrentIndex(24);
+ break;
 }
 _swap_checkbox->setChecked(stereo_mode_swap);
 }
@@ -357,6 +394,14 @@
 }
 }
 
+void in_out_widget::subtitle_changed()
+{
+ if (!_lock)
+ {
+ send_cmd(command::set_subtitle_stream, _subtitle_combobox->currentIndex() - 1);
+ }
+}
+
 void in_out_widget::input_changed()
 {
 video_frame::stereo_layout_t stereo_layout;
@@ -420,11 +465,13 @@
 _lock = true;
 _video_combobox->setEnabled(have_valid_input);
 _audio_combobox->setEnabled(have_valid_input);
+ _subtitle_combobox->setEnabled(have_valid_input);
 _input_combobox->setEnabled(have_valid_input);
 _output_combobox->setEnabled(have_valid_input);
 _swap_checkbox->setEnabled(have_valid_input);
 _video_combobox->clear();
 _audio_combobox->clear();
+ _subtitle_combobox->clear();
 if (have_valid_input)
 {
 for (int i = 0; i < _player->get_media_input().video_streams(); i++)
@@ -435,8 +482,14 @@
 {
 _audio_combobox->addItem(_player->get_media_input().audio_stream_name(i).c_str());
 }
+ _subtitle_combobox->addItem(_("Off"));
+ for (int i = 0; i < _player->get_media_input().subtitle_streams(); i++)
+ {
+ _subtitle_combobox->addItem(_player->get_media_input().subtitle_stream_name(i).c_str());
+ }
 _video_combobox->setCurrentIndex(init_data.video_stream);
 _audio_combobox->setCurrentIndex(init_data.audio_stream);
+ _subtitle_combobox->setCurrentIndex(init_data.subtitle_stream + 1);
 // Disable unsupported input modes
 for (int i = 0; i < _input_combobox->count(); i++)
 {
@@ -473,6 +526,11 @@
 return _audio_combobox->currentIndex();
 }
 
+int in_out_widget::get_subtitle_stream()
+{
+ return _subtitle_combobox->currentIndex() - 1;
+}
+
 void in_out_widget::get_stereo_layout(video_frame::stereo_layout_t &stereo_layout, bool &stereo_layout_swap)
 {
 switch (_input_combobox->currentIndex())
@@ -567,45 +625,48 @@
 stereo_mode = parameters::checkerboard;
 break;
 case 10:
- stereo_mode = parameters::red_cyan_monochrome;
+ stereo_mode = parameters::hdmi_frame_pack;
 break;
 case 11:
- stereo_mode = parameters::red_cyan_half_color;
+ stereo_mode = parameters::red_cyan_monochrome;
 break;
 case 12:
- stereo_mode = parameters::red_cyan_full_color;
+ stereo_mode = parameters::red_cyan_half_color;
 break;
 case 13:
- stereo_mode = parameters::red_cyan_dubois;
+ stereo_mode = parameters::red_cyan_full_color;
 break;
 case 14:
- stereo_mode = parameters::green_magenta_monochrome;
+ stereo_mode = parameters::red_cyan_dubois;
 break;
 case 15:
- stereo_mode = parameters::green_magenta_half_color;
+ stereo_mode = parameters::green_magenta_monochrome;
 break;
 case 16:
- stereo_mode = parameters::green_magenta_full_color;
+ stereo_mode = parameters::green_magenta_half_color;
 break;
 case 17:
- stereo_mode = parameters::green_magenta_dubois;
+ stereo_mode = parameters::green_magenta_full_color;
 break;
 case 18:
- stereo_mode = parameters::amber_blue_monochrome;
+ stereo_mode = parameters::green_magenta_dubois;
 break;
 case 19:
- stereo_mode = parameters::amber_blue_half_color;
+ stereo_mode = parameters::amber_blue_monochrome;
 break;
 case 20:
- stereo_mode = parameters::amber_blue_full_color;
+ stereo_mode = parameters::amber_blue_half_color;
 break;
 case 21:
- stereo_mode = parameters::amber_blue_dubois;
+ stereo_mode = parameters::amber_blue_full_color;
 break;
 case 22:
- stereo_mode = parameters::red_green_monochrome;
+ stereo_mode = parameters::amber_blue_dubois;
 break;
 case 23:
+ stereo_mode = parameters::red_green_monochrome;
+ break;
+ case 24:
 stereo_mode = parameters::red_blue_monochrome;
 break;
 }
@@ -632,6 +693,12 @@
 _audio_combobox->setCurrentIndex(stream);
 _lock = false;
 break;
+ case notification::subtitle_stream:
+ s11n::load(current, stream);
+ _lock = true;
+ _subtitle_combobox->setCurrentIndex(stream + 1);
+ _lock = false;
+ break;
 case notification::stereo_mode_swap:
 s11n::load(current, flag);
 _lock = true;
@@ -649,60 +716,57 @@
 {
 QGridLayout *layout = new QGridLayout;
 _seek_slider = new QSlider(Qt::Horizontal);
- _seek_slider->setToolTip(
- "This slider shows the progress during video playback, "
- "and can be used to seek in the video.");
+ _seek_slider->setToolTip(_("This slider shows the progress during video playback, "
+ "and can be used to seek in the video."));
 _seek_slider->setRange(0, 2000);
 _seek_slider->setTracking(false);
 connect(_seek_slider, SIGNAL(valueChanged(int)), this, SLOT(seek_slider_changed()));
 layout->addWidget(_seek_slider, 0, 0, 1, 13);
 _play_button = new QPushButton(QIcon(":icons/play.png"), "");
- _play_button->setToolTip("Play.");
+ _play_button->setToolTip(_("Play."));
 connect(_play_button, SIGNAL(pressed()), this, SLOT(play_pressed()));
 layout->addWidget(_play_button, 1, 0);
 _pause_button = new QPushButton(QIcon(":icons/pause.png"), "");
- _pause_button->setToolTip("Pause.");
+ _pause_button->setToolTip(_("Pause."));
 connect(_pause_button, SIGNAL(pressed()), this, SLOT(pause_pressed()));
 layout->addWidget(_pause_button, 1, 1);
 _stop_button = new QPushButton(QIcon(":icons/stop.png"), "");
- _stop_button->setToolTip("Stop.");
+ _stop_button->setToolTip(_("Stop."));
 connect(_stop_button, SIGNAL(pressed()), this, SLOT(stop_pressed()));
 layout->addWidget(_stop_button, 1, 2);
 layout->addWidget(new QWidget, 1, 3);
 _fullscreen_button = new QPushButton(QIcon(":icons/fullscreen.png"), "");
- _fullscreen_button->setToolTip(
- "Switch to fullscreen mode. "
- "You can leave fullscreen mode by pressing the f key.");
+ _fullscreen_button->setToolTip(_("Switch to fullscreen mode. "
+ "You can leave fullscreen mode by pressing the f key."));
 connect(_fullscreen_button, SIGNAL(pressed()), this, SLOT(fullscreen_pressed()));
 layout->addWidget(_fullscreen_button, 1, 4);
 _center_button = new QPushButton(QIcon(":icons/center.png"), "");
- _center_button->setToolTip(
- "Center the video area on your screen.");
+ _center_button->setToolTip(_("Center the video area on your screen."));
 connect(_center_button, SIGNAL(pressed()), this, SLOT(center_pressed()));
 layout->addWidget(_center_button, 1, 5);
 layout->addWidget(new QWidget, 1, 6);
 _bbb_button = new QPushButton(QIcon(":icons/bbb.png"), "");
- _bbb_button->setToolTip("Seek backward 10 minutes.");
+ _bbb_button->setToolTip(_("Seek backward 10 minutes."));
 connect(_bbb_button, SIGNAL(pressed()), this, SLOT(bbb_pressed()));
 layout->addWidget(_bbb_button, 1, 7);
 _bb_button = new QPushButton(QIcon(":icons/bb.png"), "");
- _bb_button->setToolTip("Seek backward 1 minute.");
+ _bb_button->setToolTip(_("Seek backward 1 minute."));
 connect(_bb_button, SIGNAL(pressed()), this, SLOT(bb_pressed()));
 layout->addWidget(_bb_button, 1, 8);
 _b_button = new QPushButton(QIcon(":icons/b.png"), "");
- _b_button->setToolTip("Seek backward 10 seconds.");
+ _b_button->setToolTip(_("Seek backward 10 seconds."));
 connect(_b_button, SIGNAL(pressed()), this, SLOT(b_pressed()));
 layout->addWidget(_b_button, 1, 9);
 _f_button = new QPushButton(QIcon(":icons/f.png"), "");
- _f_button->setToolTip("Seek forward 10 seconds.");
+ _f_button->setToolTip(_("Seek forward 10 seconds."));
 connect(_f_button, SIGNAL(pressed()), this, SLOT(f_pressed()));
 layout->addWidget(_f_button, 1, 10);
 _ff_button = new QPushButton(QIcon(":icons/ff.png"), "");
- _ff_button->setToolTip("Seek forward 1 minute.");
+ _ff_button->setToolTip(_("Seek forward 1 minute."));
 connect(_ff_button, SIGNAL(pressed()), this, SLOT(ff_pressed()));
 layout->addWidget(_ff_button, 1, 11);
 _fff_button = new QPushButton(QIcon(":icons/fff.png"), "");
- _fff_button->setToolTip("Seek forward 10 minutes.");
+ _fff_button->setToolTip(_("Seek forward 10 minutes."));
 connect(_fff_button, SIGNAL(pressed()), this, SLOT(fff_pressed()));
 layout->addWidget(_fff_button, 1, 12);
 layout->setRowStretch(0, 0);
@@ -874,9 +938,9 @@
 _lock(false)
 {
 setModal(false);
- setWindowTitle("Display Color Adjustments");
+ setWindowTitle(_("Display Color Adjustments"));
 
- QLabel *c_label = new QLabel("Contrast:");
+ QLabel *c_label = new QLabel(_("Contrast:"));
 _c_slider = new QSlider(Qt::Horizontal);
 _c_slider->setRange(-1000, 1000);
 _c_slider->setValue(params.contrast * 1000.0f);
@@ -887,7 +951,7 @@
 _c_spinbox->setDecimals(2);
 _c_spinbox->setSingleStep(0.01);
 connect(_c_spinbox, SIGNAL(valueChanged(double)), this, SLOT(c_spinbox_changed(double)));
- QLabel *b_label = new QLabel("Brightness:");
+ QLabel *b_label = new QLabel(_("Brightness:"));
 _b_slider = new QSlider(Qt::Horizontal);
 _b_slider->setRange(-1000, 1000);
 _b_slider->setValue(params.brightness * 1000.0f);
@@ -898,7 +962,7 @@
 _b_spinbox->setDecimals(2);
 _b_spinbox->setSingleStep(0.01);
 connect(_b_spinbox, SIGNAL(valueChanged(double)), this, SLOT(b_spinbox_changed(double)));
- QLabel *h_label = new QLabel("Hue:");
+ QLabel *h_label = new QLabel(_("Hue:"));
 _h_slider = new QSlider(Qt::Horizontal);
 _h_slider->setRange(-1000, 1000);
 _h_slider->setValue(params.hue * 1000.0f);
@@ -909,7 +973,7 @@
 _h_spinbox->setDecimals(2);
 _h_spinbox->setSingleStep(0.01);
 connect(_h_spinbox, SIGNAL(valueChanged(double)), this, SLOT(h_spinbox_changed(double)));
- QLabel *s_label = new QLabel("Saturation:");
+ QLabel *s_label = new QLabel(_("Saturation:"));
 _s_slider = new QSlider(Qt::Horizontal);
 _s_slider->setRange(-1000, 1000);
 _s_slider->setValue(params.saturation * 1000.0f);
@@ -921,6 +985,9 @@
 _s_spinbox->setSingleStep(0.01);
 connect(_s_spinbox, SIGNAL(valueChanged(double)), this, SLOT(s_spinbox_changed(double)));
 
+ QPushButton *ok_button = new QPushButton(_("OK"));
+ connect(ok_button, SIGNAL(pressed()), this, SLOT(close()));
+
 QGridLayout *layout = new QGridLayout;
 layout->addWidget(c_label, 0, 0);
 layout->addWidget(_c_slider, 0, 1);
@@ -934,6 +1001,7 @@
 layout->addWidget(s_label, 3, 0);
 layout->addWidget(_s_slider, 3, 1);
 layout->addWidget(_s_spinbox, 3, 2);
+ layout->addWidget(ok_button, 4, 0, 1, 3);
 setLayout(layout);
 }
 
@@ -1047,28 +1115,28 @@
 _lock(false), _params(params)
 {
 setModal(false);
- setWindowTitle("Display Crosstalk Calibration");
+ setWindowTitle(_("Display Crosstalk Calibration"));
 
- QLabel *rtfm_label = new QLabel(
- "Please read the manual to find out "
- "how to measure the crosstalk levels "
- "of your display.");
+ /* TRANSLATORS: Please keep the lines short using where necessary. */
+ QLabel *rtfm_label = new QLabel(_("Please read the manual to find out "
+ "how to measure the crosstalk levels "
+ "of your display."));
 
- QLabel *r_label = new QLabel("Red:");
+ QLabel *r_label = new QLabel(_("Red:"));
 _r_spinbox = new QDoubleSpinBox();
 _r_spinbox->setRange(0.0, +1.0);
 _r_spinbox->setValue(params->crosstalk_r);
 _r_spinbox->setDecimals(2);
 _r_spinbox->setSingleStep(0.01);
 connect(_r_spinbox, SIGNAL(valueChanged(double)), this, SLOT(spinbox_changed()));
- QLabel *g_label = new QLabel("Green:");
+ QLabel *g_label = new QLabel(_("Green:"));
 _g_spinbox = new QDoubleSpinBox();
 _g_spinbox->setRange(0.0, +1.0);
 _g_spinbox->setValue(params->crosstalk_g);
 _g_spinbox->setDecimals(2);
 _g_spinbox->setSingleStep(0.01);
 connect(_g_spinbox, SIGNAL(valueChanged(double)), this, SLOT(spinbox_changed()));
- QLabel *b_label = new QLabel("Blue:");
+ QLabel *b_label = new QLabel(_("Blue:"));
 _b_spinbox = new QDoubleSpinBox();
 _b_spinbox->setRange(0.0, +1.0);
 _b_spinbox->setValue(params->crosstalk_b);
@@ -1076,14 +1144,18 @@
 _b_spinbox->setSingleStep(0.01);
 connect(_b_spinbox, SIGNAL(valueChanged(double)), this, SLOT(spinbox_changed()));
 
+ QPushButton *ok_button = new QPushButton(_("OK"));
+ connect(ok_button, SIGNAL(pressed()), this, SLOT(close()));
+
 QGridLayout *layout = new QGridLayout;
- layout->addWidget(rtfm_label, 0, 0, 2, 3);
- layout->addWidget(r_label, 3, 0);
- layout->addWidget(_r_spinbox, 3, 1);
- layout->addWidget(g_label, 4, 0);
- layout->addWidget(_g_spinbox, 4, 1);
- layout->addWidget(b_label, 5, 0);
- layout->addWidget(_b_spinbox, 5, 1);
+ layout->addWidget(rtfm_label, 0, 0, 1, 2);
+ layout->addWidget(r_label, 2, 0);
+ layout->addWidget(_r_spinbox, 2, 1);
+ layout->addWidget(g_label, 3, 0);
+ layout->addWidget(_g_spinbox, 3, 1);
+ layout->addWidget(b_label, 4, 0);
+ layout->addWidget(_b_spinbox, 4, 1);
+ layout->addWidget(ok_button, 5, 0, 1, 2);
 setLayout(layout);
 }
 
@@ -1129,16 +1201,321 @@
 }
 
 
+subtitle_dialog::subtitle_dialog(parameters *params, QWidget *parent) : QDialog(parent),
+ _params(params), _lock(false)
+{
+ setModal(false);
+ setWindowTitle(_("Subtitle Settings"));
+
+ QLabel *info_label = new QLabel(_("These settings apply to soft subtitles, but not to bitmaps."));
+
+ _encoding_checkbox = new QCheckBox(_("Encoding:"));
+ _encoding_checkbox->setToolTip(_("Set the subtitle character set encoding."));
+ _encoding_checkbox->setChecked(params->subtitle_encoding != "");
+ connect(_encoding_checkbox, SIGNAL(stateChanged(int)), this, SLOT(encoding_changed()));
+ _encoding_combobox = new QComboBox();
+ _encoding_combobox->setToolTip(_encoding_checkbox->toolTip());
+ QList<QTextCodec *> codecs = find_codecs();
+ foreach (QTextCodec *codec, codecs)
+ {
+ _encoding_combobox->addItem(codec->name(), codec->mibEnum());
+ }
+ _encoding_combobox->setCurrentIndex(_encoding_combobox->findText(
+ params->subtitle_encoding == "" ? "UTF-8" : params->subtitle_encoding.c_str()));
+ connect(_encoding_combobox, SIGNAL(currentIndexChanged(int)), this, SLOT(encoding_changed()));
+
+ _font_checkbox = new QCheckBox(_("Override font:"));
+ _font_checkbox->setToolTip(_("Override the subtitle font family."));
+ _font_checkbox->setChecked(params->subtitle_font != "");
+ connect(_font_checkbox, SIGNAL(stateChanged(int)), this, SLOT(font_changed()));
+ _font_combobox = new QFontComboBox();
+ _font_combobox->setToolTip(_font_checkbox->toolTip());
+ _font_combobox->setCurrentFont(QFont(QString(params->subtitle_font == "" ? "sans-serif" : params->subtitle_font.c_str())));
+ connect(_font_combobox, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(font_changed()));
+
+ _size_checkbox = new QCheckBox(_("Override font size:"));
+ _size_checkbox->setToolTip(_("Override the subtitle font size."));
+ _size_checkbox->setChecked(params->subtitle_size > 0);
+ connect(_size_checkbox, SIGNAL(stateChanged(int)), this, SLOT(size_changed()));
+ _size_spinbox = new QSpinBox();
+ _size_spinbox->setToolTip(_size_checkbox->toolTip());
+ _size_spinbox->setRange(1, 999);
+ _size_spinbox->setValue(params->subtitle_size <= 0 ? 12 : params->subtitle_size);
+ connect(_size_spinbox, SIGNAL(valueChanged(int)), this, SLOT(size_changed()));
+
+ _scale_checkbox = new QCheckBox(_("Override scale factor:"));
+ _scale_checkbox->setToolTip(_("Override the subtitle scale factor."));
+ _scale_checkbox->setChecked(params->subtitle_scale >= 0.0f);
+ connect(_scale_checkbox, SIGNAL(stateChanged(int)), this, SLOT(scale_changed()));
+ _scale_spinbox = new QDoubleSpinBox();
+ _scale_spinbox->setToolTip(_scale_checkbox->toolTip());
+ _scale_spinbox->setRange(0.01, 100.0);
+ _scale_spinbox->setSingleStep(0.1);
+ _scale_spinbox->setValue(params->subtitle_scale < 0.0f ? 1.0f : params->subtitle_scale);
+ connect(_scale_spinbox, SIGNAL(valueChanged(double)), this, SLOT(scale_changed()));
+
+ _color_checkbox = new QCheckBox(_("Override color:"));
+ _color_checkbox->setToolTip(_("Override the subtitle color."));
+ _color_checkbox->setChecked(params->subtitle_color <= std::numeric_limits<uint32_t>::max());
+ connect(_color_checkbox, SIGNAL(stateChanged(int)), this, SLOT(color_changed()));
+ _color_button = new QPushButton();
+ _color_button->setToolTip(_color_checkbox->toolTip());
+ set_color_button(params->subtitle_color > std::numeric_limits<uint32_t>::max() ? 0xffffffu : params->subtitle_color);
+ connect(_color_button, SIGNAL(pressed()), this, SLOT(color_button_pressed()));
+
+ QPushButton *ok_button = new QPushButton(_("OK"));
+ connect(ok_button, SIGNAL(pressed()), this, SLOT(close()));
+
+ QGridLayout *layout = new QGridLayout;
+ layout->addWidget(info_label, 0, 0, 1, 2);
+ layout->addWidget(_encoding_checkbox, 1, 0);
+ layout->addWidget(_encoding_combobox, 1, 1);
+ layout->addWidget(_font_checkbox, 2, 0);
+ layout->addWidget(_font_combobox, 2, 1);
+ layout->addWidget(_size_checkbox, 3, 0);
+ layout->addWidget(_size_spinbox, 3, 1);
+ layout->addWidget(_scale_checkbox, 4, 0);
+ layout->addWidget(_scale_spinbox, 4, 1);
+ layout->addWidget(_color_checkbox, 5, 0);
+ layout->addWidget(_color_button, 5, 1);
+ layout->addWidget(ok_button, 6, 0, 1, 2);
+ setLayout(layout);
+}
+
+QList<QTextCodec *> subtitle_dialog::find_codecs()
+{
+ QMap<QString, QTextCodec *> codec_map;
+ QRegExp iso8859_regexp("ISO[- ]8859-([0-9]+).*");
+
+ foreach (int mib, QTextCodec::availableMibs())
+ {
+ QTextCodec *codec = QTextCodec::codecForMib(mib);
+
+ QString sort_key = codec->name().toUpper();
+ int rank;
+
+ if (sort_key.startsWith("UTF-8"))
+ {
+ rank = 1;
+ }
+ else if (sort_key.startsWith("UTF-16"))
+ {
+ rank = 2;
+ }
+ else if (iso8859_regexp.exactMatch(sort_key))
+ {
+ if (iso8859_regexp.cap(1).size() == 1)
+ {
+ rank = 3;
+ }
+ else
+ {
+ rank = 4;
+ }
+ }
+ else
+ {
+ rank = 5;
+ }
+ sort_key.prepend(QChar('0' + rank));
+
+ codec_map.insert(sort_key, codec);
+ }
+ return codec_map.values();
+}
+
+void subtitle_dialog::set_color_button(uint32_t c)
+{
+ int r = (c >> 16u) & 0xffu;
+ int g = (c >> 8u) & 0xffu;
+ int b = c & 0xffu;
+ _color = QColor(r, g, b);
+ QPixmap pm(64, 64);
+ pm.fill(_color);
+ _color_button->setIcon(QIcon(pm));
+}
+
+void subtitle_dialog::color_button_pressed()
+{
+ _color = QColorDialog::getColor(_color, this);
+ QPixmap pm(64, 64);
+ pm.fill(_color);
+ _color_button->setIcon(QIcon(pm));
+ color_changed();
+}
+
+void subtitle_dialog::encoding_changed()
+{
+ if (!_lock)
+ {
+ std::string encoding = _encoding_checkbox->isChecked()
+ ? _encoding_combobox->currentText().toStdString() : "";
+ std::ostringstream v;
+ s11n::save(v, encoding);
+ send_cmd(command::set_subtitle_encoding, v.str());
+ /* Also set in init data, because this must also work in the absence of a player
+ * that interpretes the above command (i.e. when no video is currently playing). */
+ _params->subtitle_encoding = encoding;
+ }
+}
+
+void subtitle_dialog::font_changed()
+{
+ if (!_lock)
+ {
+ std::string font = _font_checkbox->isChecked()
+ ? _font_combobox->currentFont().family().toLocal8Bit().constData()
+ : "";
+ std::ostringstream v;
+ s11n::save(v, font);
+ send_cmd(command::set_subtitle_font, v.str());
+ /* Also set in init data, because this must also work in the absence of a player
+ * that interpretes the above command (i.e. when no video is currently playing). */
+ _params->subtitle_font = font;
+ }
+}
+
+void subtitle_dialog::size_changed()
+{
+ if (!_lock)
+ {
+ int size = _size_checkbox->isChecked() ? _size_spinbox->value() : -1;
+ std::ostringstream v;
+ s11n::save(v, size);
+ send_cmd(command::set_subtitle_size, v.str());
+ /* Also set in init data, because this must also work in the absence of a player
+ * that interpretes the above command (i.e. when no video is currently playing). */
+ _params->subtitle_size = size;
+ }
+}
+
+void subtitle_dialog::scale_changed()
+{
+ if (!_lock)
+ {
+ float scale = _scale_checkbox->isChecked() ? _scale_spinbox->value() : -1.0f;
+ std::ostringstream v;
+ s11n::save(v, scale);
+ send_cmd(command::set_subtitle_scale, v.str());
+ /* Also set in init data, because this must also work in the absence of a player
+ * that interpretes the above command (i.e. when no video is currently playing). */
+ _params->subtitle_scale = scale;
+ }
+}
+
+void subtitle_dialog::color_changed()
+{
+ if (!_lock)
+ {
+ uint64_t color;
+ if (_color_checkbox->isChecked())
+ {
+ unsigned int a = _color.alpha();
+ unsigned int r = _color.red();
+ unsigned int g = _color.green();
+ unsigned int b = _color.blue();
+ color = (a << 24u) | (r << 16u) | (g << 8u) | b;
+ }
+ else
+ {
+ color = std::numeric_limits<uint64_t>::max();
+ }
+ std::ostringstream v;
+ s11n::save(v, color);
+ send_cmd(command::set_subtitle_color, v.str());
+ /* Also set in init data, because this must also work in the absence of a player
+ * that interpretes the above command (i.e. when no video is currently playing). */
+ _params->subtitle_color = color;
+ }
+}
+
+void subtitle_dialog::receive_notification(const notification &note)
+{
+ std::istringstream current(note.current);
+
+ switch (note.type)
+ {
+ case notification::subtitle_encoding:
+ {
+ std::string encoding;
+ s11n::load(current, encoding);
+ _lock = true;
+ _encoding_checkbox->setChecked(encoding != "");
+ if (encoding != "")
+ {
+ _encoding_combobox->setCurrentIndex(_encoding_combobox->findText(encoding.c_str()));
+ }
+ _lock = false;
+ }
+ break;
+ case notification::subtitle_font:
+ {
+ std::string font;
+ s11n::load(current, font);
+ _lock = true;
+ _font_checkbox->setChecked(font != "");
+ if (font != "")
+ {
+ _font_combobox->setCurrentFont(QFont(QString(font.c_str())));
+ }
+ _lock = false;
+ }
+ break;
+ case notification::subtitle_size:
+ {
+ int size;
+ s11n::load(current, size);
+ _lock = true;
+ _size_checkbox->setChecked(size > 0);
+ if (size > 0)
+ {
+ _size_spinbox->setValue(size);
+ }
+ _lock = false;
+ }
+ break;
+ case notification::subtitle_scale:
+ {
+ float scale;
+ s11n::load(current, scale);
+ _lock = true;
+ _scale_checkbox->setChecked(scale >= 0.0f);
+ if (scale >= 0.0f)
+ {
+ _scale_spinbox->setValue(scale);
+ }
+ _lock = false;
+ }
+ break;
+ case notification::subtitle_color:
+ {
+ uint64_t color;
+ s11n::load(current, color);
+ _lock = true;
+ _color_checkbox->setChecked(color <= std::numeric_limits<uint32_t>::max());
+ if (color <= std::numeric_limits<uint32_t>::max())
+ {
+ set_color_button(color);
+ }
+ _lock = false;
+ }
+ break;
+ default:
+ /* not handled */
+ break;
+ }
+}
+
+
 stereoscopic_dialog::stereoscopic_dialog(const parameters &params, QWidget *parent) : QDialog(parent),
 _lock(false)
 {
 setModal(false);
- setWindowTitle("Stereoscopic Video Settings");
+ setWindowTitle(_("Stereoscopic Video Settings"));
 
- QLabel *p_label = new QLabel("Parallax:");
- p_label->setToolTip(
- "Adjust parallax, from -1 to +1. This changes the separation of left and right view, "
- "and thus moves the point where both lines of sight meet.");
+ QLabel *p_label = new QLabel(_("Parallax:"));
+ p_label->setToolTip(_("Adjust parallax, from -1 to +1. This changes the separation of left and right view, "
+ "and thus the perceived distance of the scene."));
 _p_slider = new QSlider(Qt::Horizontal);
 _p_slider->setToolTip(p_label->toolTip());
 _p_slider->setRange(-1000, 1000);
@@ -1151,11 +1528,27 @@
 _p_spinbox->setDecimals(2);
 _p_spinbox->setSingleStep(0.01);
 connect(_p_spinbox, SIGNAL(valueChanged(double)), this, SLOT(p_spinbox_changed(double)));
- QLabel *g_label = new QLabel("Ghostbusting:");
- g_label->setToolTip(
- "Set the amount of crosstalk ghostbusting, from 0 to 1. "
- "You need to set the crosstalk levels of your display first. "
- "Note that crosstalk ghostbusting does not work with anaglyph glasses.");
+
+ QLabel *sp_label = new QLabel(_("Subtitle parallax:"));
+ sp_label->setToolTip(_("Adjust subtitle parallax, from -1 to +1. This changes the perceived distance "
+ "of the subtitles."));
+ _sp_slider = new QSlider(Qt::Horizontal);
+ _sp_slider->setToolTip(sp_label->toolTip());
+ _sp_slider->setRange(-1000, 1000);
+ _sp_slider->setValue(params.subtitle_parallax * 1000.0f);
+ connect(_sp_slider, SIGNAL(valueChanged(int)), this, SLOT(sp_slider_changed(int)));
+ _sp_spinbox = new QDoubleSpinBox();
+ _sp_spinbox->setToolTip(sp_label->toolTip());
+ _sp_spinbox->setRange(-1.0, +1.0);
+ _sp_spinbox->setValue(params.subtitle_parallax);
+ _sp_spinbox->setDecimals(2);
+ _sp_spinbox->setSingleStep(0.01);
+ connect(_sp_spinbox, SIGNAL(valueChanged(double)), this, SLOT(sp_spinbox_changed(double)));
+
+ QLabel *g_label = new QLabel(_("Ghostbusting:"));
+ g_label->setToolTip(_("Set the amount of crosstalk ghostbusting, from 0 to 1. "
+ "You need to set the crosstalk levels of your display first. "
+ "Note that crosstalk ghostbusting does not work with anaglyph glasses."));
 _g_slider = new QSlider(Qt::Horizontal);
 _g_slider->setToolTip(g_label->toolTip());
 _g_slider->setRange(0, 1000);
@@ -1169,13 +1562,20 @@
 _g_spinbox->setSingleStep(0.01);
 connect(_g_spinbox, SIGNAL(valueChanged(double)), this, SLOT(g_spinbox_changed(double)));
 
+ QPushButton *ok_button = new QPushButton(_("OK"));
+ connect(ok_button, SIGNAL(pressed()), this, SLOT(close()));
+
 QGridLayout *layout = new QGridLayout;
 layout->addWidget(p_label, 0, 0);
 layout->addWidget(_p_slider, 0, 1);
 layout->addWidget(_p_spinbox, 0, 2);
- layout->addWidget(g_label, 1, 0);
- layout->addWidget(_g_slider, 1, 1);
- layout->addWidget(_g_spinbox, 1, 2);
+ layout->addWidget(sp_label, 1, 0);
+ layout->addWidget(_sp_slider, 1, 1);
+ layout->addWidget(_sp_spinbox, 1, 2);
+ layout->addWidget(g_label, 2, 0);
+ layout->addWidget(_g_slider, 2, 1);
+ layout->addWidget(_g_spinbox, 2, 2);
+ layout->addWidget(ok_button, 3, 0, 1, 3);
 setLayout(layout);
 }
 
@@ -1195,6 +1595,22 @@
 }
 }
 
+void stereoscopic_dialog::sp_slider_changed(int val)
+{
+ if (!_lock)
+ {
+ send_cmd(command::set_subtitle_parallax, val / 1000.0f);
+ }
+}
+
+void stereoscopic_dialog::sp_spinbox_changed(double val)
+{
+ if (!_lock)
+ {
+ send_cmd(command::set_subtitle_parallax, static_cast<float>(val));
+ }
+}
+
 void stereoscopic_dialog::g_slider_changed(int val)
 {
 if (!_lock)
@@ -1225,6 +1641,13 @@
 _p_spinbox->setValue(value);
 _lock = false;
 break;
+ case notification::subtitle_parallax:
+ s11n::load(current, value);
+ _lock = true;
+ _sp_slider->setValue(value * 1000.0f);
+ _sp_spinbox->setValue(value);
+ _lock = false;
+ break;
 case notification::ghostbust:
 s11n::load(current, value);
 _lock = true;
@@ -1243,6 +1666,7 @@
 _settings(settings),
 _color_dialog(NULL),
 _crosstalk_dialog(NULL),
+ _subtitle_dialog(NULL),
 _stereoscopic_dialog(NULL),
 _player(NULL),
 _init_data(init_data),
@@ -1283,6 +1707,27 @@
 {
 _init_data.params.crosstalk_b = _settings->value("crosstalk_b", QString("0")).toFloat();
 }
+ if (_init_data.params.subtitle_encoding.length() == 1 && _init_data.params.subtitle_encoding[0] == '\0')
+ {
+ _init_data.params.subtitle_encoding = _settings->value("subtitle-encoding", QString(1, '\0')).toString().toLocal8Bit().constData();
+ }
+ if (_init_data.params.subtitle_font.length() == 1 && _init_data.params.subtitle_font[0] == '\0')
+ {
+ _init_data.params.subtitle_font = _settings->value("subtitle-font", QString(1, '\0')).toString().toLocal8Bit().constData();
+ }
+ if (_init_data.params.subtitle_size < 0)
+ {
+ _init_data.params.subtitle_size = _settings->value("subtitle-size", QString("-1")).toInt();
+ }
+ if (_init_data.params.subtitle_scale < 0.0f)
+ {
+ _init_data.params.subtitle_scale = _settings->value("subtitle-scale", QString("-1")).toFloat();
+ }
+ if (_init_data.params.subtitle_color > std::numeric_limits<uint32_t>::max())
+ {
+ _init_data.params.subtitle_color = _settings->value("subtitle-color",
+ QString(str::from(std::numeric_limits<uint64_t>::max()).c_str())).toULongLong();
+ }
 _settings->endGroup();
 _init_data.params.set_defaults();
 
@@ -1305,46 +1750,46 @@
 setCentralWidget(central_widget);
 
 // Menus
- QMenu *file_menu = menuBar()->addMenu(tr("&File"));
- QAction *file_open_act = new QAction(tr("&Open..."), this);
+ QMenu *file_menu = menuBar()->addMenu(_("&File"));
+ QAction *file_open_act = new QAction(_("&Open..."), this);
 file_open_act->setShortcut(QKeySequence::Open);
 connect(file_open_act, SIGNAL(triggered()), this, SLOT(file_open()));
 file_menu->addAction(file_open_act);
- QAction *file_open_url_act = new QAction(tr("Open &URL..."), this);
+ QAction *file_open_url_act = new QAction(_("Open &URL..."), this);
 connect(file_open_url_act, SIGNAL(triggered()), this, SLOT(file_open_url()));
 file_menu->addAction(file_open_url_act);
 file_menu->addSeparator();
- QAction *file_quit_act = new QAction(tr("&Quit..."), this);
-#if QT_VERSION >= 0x040600
+ QAction *file_quit_act = new QAction(_("&Quit..."), this);
 file_quit_act->setShortcut(QKeySequence::Quit);
-#else
- file_quit_act->setShortcut(tr("Ctrl+Q"));
-#endif
 connect(file_quit_act, SIGNAL(triggered()), this, SLOT(close()));
 file_menu->addAction(file_quit_act);
- QMenu *preferences_menu = menuBar()->addMenu(tr("&Preferences"));
- QAction *preferences_colors_act = new QAction(tr("Display &Color Adjustments..."), this);
+ QMenu *preferences_menu = menuBar()->addMenu(_("&Preferences"));
+ QAction *preferences_colors_act = new QAction(_("Display &Color Adjustments..."), this);
 connect(preferences_colors_act, SIGNAL(triggered()), this, SLOT(preferences_colors()));
 preferences_menu->addAction(preferences_colors_act);
- QAction *preferences_crosstalk_act = new QAction(tr("Display Cross&talk Calibration..."), this);
+ QAction *preferences_crosstalk_act = new QAction(_("Display Cross&talk Calibration..."), this);
 connect(preferences_crosstalk_act, SIGNAL(triggered()), this, SLOT(preferences_crosstalk()));
 preferences_menu->addAction(preferences_crosstalk_act);
 preferences_menu->addSeparator();
- QAction *preferences_stereoscopic_act = new QAction(tr("Stereoscopic Video Settings..."), this);
+ QAction *preferences_subtitle_act = new QAction(_("&Subtitle Settings..."), this);
+ connect(preferences_subtitle_act, SIGNAL(triggered()), this, SLOT(preferences_subtitle()));
+ preferences_menu->addAction(preferences_subtitle_act);
+ preferences_menu->addSeparator();
+ QAction *preferences_stereoscopic_act = new QAction(_("Stereoscopic Video Settings..."), this);
 connect(preferences_stereoscopic_act, SIGNAL(triggered()), this, SLOT(preferences_stereoscopic()));
 preferences_menu->addAction(preferences_stereoscopic_act);
- QMenu *help_menu = menuBar()->addMenu(tr("&Help"));
- QAction *help_manual_act = new QAction(tr("&Manual..."), this);
+ QMenu *help_menu = menuBar()->addMenu(_("&Help"));
+ QAction *help_manual_act = new QAction(_("&Manual..."), this);
 help_manual_act->setShortcut(QKeySequence::HelpContents);
 connect(help_manual_act, SIGNAL(triggered()), this, SLOT(help_manual()));
 help_menu->addAction(help_manual_act);
- QAction *help_website_act = new QAction(tr("&Website..."), this);
+ QAction *help_website_act = new QAction(_("&Website..."), this);
 connect(help_website_act, SIGNAL(triggered()), this, SLOT(help_website()));
 help_menu->addAction(help_website_act);
- QAction *help_keyboard_act = new QAction(tr("&Keyboard Shortcuts"), this);
+ QAction *help_keyboard_act = new QAction(_("&Keyboard Shortcuts"), this);
 connect(help_keyboard_act, SIGNAL(triggered()), this, SLOT(help_keyboard()));
 help_menu->addAction(help_keyboard_act);
- QAction *help_about_act = new QAction(tr("&About"), this);
+ QAction *help_about_act = new QAction(_("&About"), this);
 connect(help_about_act, SIGNAL(triggered()), this, SLOT(help_about()));
 help_menu->addAction(help_about_act);
 
@@ -1398,7 +1843,7 @@
 }
 catch (std::exception &e)
 {
- QMessageBox::critical(this, "Error", e.what());
+ QMessageBox::critical(this, _("Error"), e.what());
 return false;
 }
 adjustSize();
@@ -1424,15 +1869,22 @@
 _in_out_widget->get_stereo_layout(_init_data.stereo_layout, _init_data.stereo_layout_swap);
 _init_data.video_stream = _in_out_widget->get_video_stream();
 _init_data.audio_stream = std::max(0, _in_out_widget->get_audio_stream());
+ _init_data.subtitle_stream = std::max(-1, _in_out_widget->get_subtitle_stream());
 _init_data.stereo_mode_override = true;
 _in_out_widget->get_stereo_mode(_init_data.stereo_mode, _init_data.stereo_mode_swap);
 if (!open_player())
 {
 _stop_request = true;
 }
- // Remember the input settings of this video, using an SHA1 hash of its filename.
+ // Remember the settings of this video
 _settings->beginGroup("Video/" + current_file_hash());
 _settings->setValue("stereo-layout", QString(video_frame::stereo_layout_to_string(_init_data.stereo_layout, _init_data.stereo_layout_swap).c_str()));
+ _settings->setValue("video-stream", QVariant(_init_data.video_stream).toString());
+ _settings->setValue("audio-stream", QVariant(_init_data.audio_stream).toString());
+ _settings->setValue("subtitle-stream", QVariant(_init_data.subtitle_stream).toString());
+ _settings->setValue("parallax", QVariant(_init_data.params.parallax).toString());
+ _settings->setValue("ghostbust", QVariant(_init_data.params.ghostbust).toString());
+ _settings->setValue("subtitle-parallax", QVariant(_init_data.params.subtitle_parallax).toString());
 _settings->endGroup();
 // Remember the 2D or 3D video output mode.
 _settings->setValue((_init_data.stereo_layout == video_frame::mono ? "Session/2d-stereo-mode" : "Session/3d-stereo-mode"),
@@ -1465,6 +1917,13 @@
 _settings->endGroup();
 break;
 
+ case notification::subtitle_stream:
+ s11n::load(current, _init_data.subtitle_stream);
+ _settings->beginGroup("Video/" + current_file_hash());
+ _settings->setValue("subtitle-stream", QVariant(_init_data.subtitle_stream).toString());
+ _settings->endGroup();
+ break;
+
 case notification::contrast:
 s11n::load(current, _init_data.params.contrast);
 break;
@@ -1506,6 +1965,33 @@
 _settings->endGroup();
 break;
 
+ case notification::subtitle_encoding:
+ s11n::load(current, _init_data.params.subtitle_encoding);
+ break;
+
+ case notification::subtitle_font:
+ s11n::load(current, _init_data.params.subtitle_font);
+ break;
+
+ case notification::subtitle_size:
+ s11n::load(current, _init_data.params.subtitle_size);
+ break;
+
+ case notification::subtitle_scale:
+ s11n::load(current, _init_data.params.subtitle_scale);
+ break;
+
+ case notification::subtitle_color:
+ s11n::load(current, _init_data.params.subtitle_color);
+ break;
+
+ case notification::subtitle_parallax:
+ s11n::load(current, _init_data.params.subtitle_parallax);
+ _settings->beginGroup("Video/" + current_file_hash());
+ _settings->setValue("subtitle-parallax", QVariant(_init_data.params.subtitle_parallax).toString());
+ _settings->endGroup();
+ break;
+
 case notification::pause:
 case notification::stereo_layout:
 case notification::stereo_mode:
@@ -1563,6 +2049,11 @@
 _settings->setValue("crosstalk_r", QVariant(_init_data.params.crosstalk_r).toString());
 _settings->setValue("crosstalk_g", QVariant(_init_data.params.crosstalk_g).toString());
 _settings->setValue("crosstalk_b", QVariant(_init_data.params.crosstalk_b).toString());
+ _settings->setValue("subtitle-encoding", QVariant(_init_data.params.subtitle_encoding.c_str()).toString());
+ _settings->setValue("subtitle-font", QVariant(_init_data.params.subtitle_font.c_str()).toString());
+ _settings->setValue("subtitle-size", QVariant(_init_data.params.subtitle_size).toString());
+ _settings->setValue("subtitle-scale", QVariant(_init_data.params.subtitle_scale).toString());
+ _settings->setValue("subtitle-color", QVariant(static_cast<qulonglong>(_init_data.params.subtitle_color)).toString());
 _settings->endGroup();
 event->accept();
 }
@@ -1632,23 +2123,25 @@
 }
 if (open_player())
 {
+ // Get the settings for this video
 _settings->beginGroup("Video/" + current_file_hash());
- // Get stereo layout for this video
 QString layout_fallback = QString(video_frame::stereo_layout_to_string(
 _player->get_media_input().video_frame_template().stereo_layout,
 _player->get_media_input().video_frame_template().stereo_layout_swap).c_str());
 QString layout_name = _settings->value("stereo-layout", layout_fallback).toString();
 video_frame::stereo_layout_from_string(layout_name.toStdString(), _init_data.stereo_layout, _init_data.stereo_layout_swap);
 _init_data.stereo_layout_override = true;
- // Get output parameters for this video
 _init_data.video_stream = QVariant(_settings->value("video-stream", QVariant(_init_data.video_stream)).toString()).toInt();
 _init_data.video_stream = std::max(0, std::min(_init_data.video_stream, _player->get_media_input().video_streams() - 1));
 _init_data.audio_stream = QVariant(_settings->value("audio-stream", QVariant(_init_data.audio_stream)).toString()).toInt();
 _init_data.audio_stream = std::max(0, std::min(_init_data.audio_stream, _player->get_media_input().audio_streams() - 1));
+ _init_data.subtitle_stream = QVariant(_settings->value("subtitle-stream", QVariant(_init_data.subtitle_stream)).toString()).toInt();
+ _init_data.subtitle_stream = std::max(-1, std::min(_init_data.subtitle_stream, _player->get_media_input().subtitle_streams() - 1));
 _init_data.params.parallax = QVariant(_settings->value("parallax", QVariant(_init_data.params.parallax)).toString()).toFloat();
 _init_data.params.ghostbust = QVariant(_settings->value("ghostbust", QVariant(_init_data.params.ghostbust)).toString()).toFloat();
- // Get stereo mode for this video
+ _init_data.params.subtitle_parallax = QVariant(_settings->value("subtitle-parallax", QVariant(_init_data.params.parallax)).toString()).toFloat();
 _settings->endGroup();
+ // Get stereo mode
 QString mode_fallback = QString(parameters::stereo_mode_to_string(
 _player->get_parameters().stereo_mode,
 _player->get_parameters().stereo_mode_swap).c_str());
@@ -1674,7 +2167,7 @@
 {
 QFileDialog *file_dialog = new QFileDialog(this);
 file_dialog->setDirectory(_settings->value("Session/file-open-dir", QDir::currentPath()).toString());
- file_dialog->setWindowTitle("Open files");
+ file_dialog->setWindowTitle(_("Open files"));
 file_dialog->setAcceptMode(QFileDialog::AcceptOpen);
 file_dialog->setFileMode(QFileDialog::ExistingFiles);
 if (!file_dialog->exec())
@@ -1693,12 +2186,12 @@
 void main_window::file_open_url()
 {
 QDialog *url_dialog = new QDialog(this);
- url_dialog->setWindowTitle("Open URL");
- QLabel *url_label = new QLabel("URL:");
+ url_dialog->setWindowTitle(_("Open URL"));
+ QLabel *url_label = new QLabel(_("URL:"));
 QLineEdit *url_edit = new QLineEdit("");
 url_edit->setMinimumWidth(256);
- QPushButton *ok_btn = new QPushButton("OK");
- QPushButton *cancel_btn = new QPushButton("Cancel");
+ QPushButton *ok_btn = new QPushButton(_("OK"));
+ QPushButton *cancel_btn = new QPushButton(_("Cancel"));
 connect(ok_btn, SIGNAL(pressed()), url_dialog, SLOT(accept()));
 connect(cancel_btn, SIGNAL(pressed()), url_dialog, SLOT(reject()));
 QGridLayout *layout = new QGridLayout();
@@ -1739,6 +2232,17 @@
 _crosstalk_dialog->activateWindow();
 }
 
+void main_window::preferences_subtitle()
+{
+ if (!_subtitle_dialog)
+ {
+ _subtitle_dialog = new subtitle_dialog(&_init_data.params, this);
+ }
+ _subtitle_dialog->show();
+ _subtitle_dialog->raise();
+ _subtitle_dialog->activateWindow();
+}
+
 void main_window::preferences_stereoscopic()
 {
 if (!_stereoscopic_dialog)
@@ -1762,7 +2266,7 @@
 #endif
 if (!QDesktopServices::openUrl(manual_url))
 {
- QMessageBox::critical(this, "Error", "Cannot open manual");
+ QMessageBox::critical(this, _("Error"), _("Cannot open manual."));
 }
 }
 
@@ -1770,23 +2274,26 @@
 {
 if (!QDesktopServices::openUrl(QUrl(PACKAGE_URL)))
 {
- QMessageBox::critical(this, "Error", "Cannot open website");
+ QMessageBox::critical(this, _("Error"), _("Cannot open website."));
 }
 }
 
 void main_window::help_keyboard()
 {
- QMessageBox::information(this, tr("Keyboard Shortcuts"), tr(
- "Keyboard control: "
+ QMessageBox::information(this, _("Keyboard Shortcuts"),
+ /* TRANSLATORS: This is a HTML table, shown under Help->Keyboard Shortcuts.
+ Please make sure that your translation formats properly. */
+ _("Keyboard control: "
 "(Click into the video area to give it the keyboard focus if necessary.)"
 "<table>"
 "<tr><td>q or ESC</td><td>Stop</td></tr>"
 "<tr><td>p or SPACE</td><td>Pause / unpause</td></tr>"
 "<tr><td>f</td><td>Toggle fullscreen</td></tr>"
 "<tr><td>c</td><td>Center window</td></tr>"
- "<tr><td>s</td><td>Swap left/right view</td></tr>"
+ "<tr><td>e</td><td>Swap left/right eye</td></tr>"
 "<tr><td>v</td><td>Cycle through available video streams</td></tr>"
 "<tr><td>a</td><td>Cycle through available audio streams</td></tr>"
+ "<tr><td>s</td><td>Cycle through available subtitle streams</td></tr>"
 "<tr><td>1, 2</td><td>Adjust contrast</td></tr>"
 "<tr><td>3, 4</td><td>Adjust brightness</td></tr>"
 "<tr><td>5, 6</td><td>Adjust hue</td></tr>"
@@ -1804,31 +2311,31 @@
 {
 QDialog *dialog = new QDialog(this);
 dialog->setModal(true);
- dialog->setWindowTitle("About " PACKAGE_NAME);
+ dialog->setWindowTitle(str::asprintf(_("About %s"), PACKAGE_NAME).c_str());
 
 QLabel *logo = new QLabel();
 logo->setPixmap(QPixmap(":logo/bino_logo.png").scaledToHeight(128, Qt::SmoothTransformation));
 QLabel *spacer = new QLabel();
 spacer->setMinimumWidth(16);
- QLabel *title = new QLabel("The " PACKAGE_NAME " 3D video player");
+ QLabel *title = new QLabel(str::asprintf(_("The %s 3D video player"), PACKAGE_NAME).c_str());
 
 QTextBrowser *about_text = new QTextBrowser(this);
 about_text->setOpenExternalLinks(true);
- about_text->setText(tr(
- "%1 version %2."
- "Copyright (C) 2011 the Bino developers."
- "This is free software. You may redistribute copies of it "
- "under the terms of the <a href=\"http://www.gnu.org/licenses/gpl.html\">"
- "GNU General Public License</a>. "
- "There is NO WARRANTY, to the extent permitted by law."
- "See <a href=\"%3\">%3</a> for more information on this software.")
- .arg(PACKAGE_NAME).arg(VERSION).arg(PACKAGE_URL));
+ about_text->setText(str::asprintf(_(
+ "%s version %s."
+ "Copyright (C) 2011 the Bino developers."
+ "This is free software. You may redistribute copies of it "
+ "under the terms of the <a href=\"http://www.gnu.org/licenses/gpl.html\">"
+ "GNU General Public License</a>. "
+ "There is NO WARRANTY, to the extent permitted by law."
+ "See <a href=\"%s\">%s</a> for more information on this software."),
+ PACKAGE_NAME, VERSION, PACKAGE_URL, PACKAGE_URL).c_str());
 
 QTextBrowser *libs_text = new QTextBrowser(this);
 libs_text->setOpenExternalLinks(true);
 libs_text->setWordWrapMode(QTextOption::NoWrap);
- QString libs_blurb = tr("Platform:<ul><li>%1</li></ul>").arg(PLATFORM);
- libs_blurb += QString("Libraries used:");
+ QString libs_blurb = QString(str::asprintf("%s<ul><li>%s</li></ul>", _("Platform:"), PLATFORM).c_str());
+ libs_blurb += QString("") + QString(_("Libraries used:"));
 std::vector<std::string> libs = lib_versions(true);
 for (size_t i = 0; i < libs.size(); i++)
 {
@@ -1842,7 +2349,7 @@
 team_text->setWordWrapMode(QTextOption::NoWrap);
 QFile team_file(":AUTHORS");
 team_file.open(QIODevice::ReadOnly | QIODevice::Text);
- team_text->setText(team_file.readAll());
+ team_text->setText(QTextCodec::codecForName("UTF-8")->toUnicode(team_file.readAll()));
 
 QTextBrowser *license_text = new QTextBrowser(this);
 license_text->setOpenExternalLinks(false);
@@ -1852,12 +2359,12 @@
 license_text->setText(license_file.readAll());
 
 QTabWidget *tab_widget = new QTabWidget();
- tab_widget->addTab(about_text, "About");
- tab_widget->addTab(libs_text, "Libraries");
- tab_widget->addTab(team_text, "Team");
- tab_widget->addTab(license_text, "License");
+ tab_widget->addTab(about_text, _("About"));
+ tab_widget->addTab(libs_text, _("Libraries"));
+ tab_widget->addTab(team_text, _("Team"));
+ tab_widget->addTab(license_text, _("License"));
 
- QPushButton *ok_btn = new QPushButton("OK");
+ QPushButton *ok_btn = new QPushButton(_("OK"));
 connect(ok_btn, SIGNAL(pressed()), dialog, SLOT(accept()));
 
 QGridLayout *layout = new QGridLayout();

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

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:
+ l = msg::DBG;
+ break;
+ case 7:
+ l = msg::DBG;
+ break;
+ }
+ std::string s = str::vasprintf(fmt, args);
+ msg::msg(l, std::string("LibASS: ") + s);
+}
+
+void subtitle_renderer::init_ass()
+{
+ if (!_ass_initialized)
+ {
+ _ass_library = ass_library_init();
+ if (!_ass_library)
+ {
+ throw exc(_("Cannot initialize LibASS."));
+ }
+ ass_set_message_cb(_ass_library, libass_msg_callback, NULL);
+ ass_set_extract_fonts(_ass_library, 1);
+ _ass_renderer = ass_renderer_init(_ass_library);
+ if (!_ass_renderer)
+ {
+ throw exc(_("Cannot initialize LibASS renderer."));
+ }
+ ass_set_hinting(_ass_renderer, ASS_HINTING_NATIVE);
+ _fontconfig_conffile = get_fontconfig_conffile();
+ ass_set_fonts(_ass_renderer, NULL, "sans-serif", 1, _fontconfig_conffile, 1);
+ _ass_initialized = true;
+ }
+}
+
+void subtitle_renderer::blend_ass_image(const ASS_Image *img, uint32_t *buf)
+{
+ const unsigned int R = (img->color >> 24u) & 0xffu;
+ const unsigned int G = (img->color >> 16u) & 0xffu;
+ const unsigned int B = (img->color >> 8u) & 0xffu;
+ const unsigned int A = 255u - (img->color & 0xffu);
+
+ unsigned char *src = img->bitmap;
+ for (int src_y = 0; src_y < img->h; src_y++)
+ {
+ int dst_y = src_y + img->dst_y - _bb_y;
+ if (dst_y >= _bb_h)
+ {
+ break;
+ }
+ for (int src_x = 0; src_x < img->w; src_x++)
+ {
+ unsigned int a = src[src_x] * A / 255u;
+ int dst_x = src_x + img->dst_x - _bb_x;
+ if (dst_x >= _bb_w)
+ {
+ break;
+ }
+ uint32_t oldval = buf[dst_y * _bb_w + dst_x];
+ // XXX: The BGRA layout used here may be wrong on big endian system
+ uint32_t newval = std::min(a + (oldval >> 24u), 255u) << 24u
+ | ((a * R + (255u - a) * ((oldval >> 16u) & 0xffu)) / 255u) << 16u
+ | ((a * G + (255u - a) * ((oldval >> 8u) & 0xffu)) / 255u) << 8u
+ | ((a * B + (255u - a) * ((oldval ) & 0xffu)) / 255u);
+ buf[dst_y * _bb_w + dst_x] = newval;
+ }
+ src += img->stride;
+ }
+}
+
+void subtitle_renderer::set_ass_parameters(const parameters &params)
+{
+ std::vector<std::string> overrides;
+ overrides.clear();
+ if (params.subtitle_font != "")
+ {
+ overrides.push_back(std::string("Default.Fontname=") + params.subtitle_font);
+ }
+ if (params.subtitle_size > 0)
+ {
+ overrides.push_back(std::string("Default.Fontsize=") + str::from(params.subtitle_size));
+ }
+ if (params.subtitle_color <= std::numeric_limits<uint32_t>::max())
+ {
+ unsigned int color = params.subtitle_color;
+ unsigned int a = 255u - ((color >> 24u) & 0xffu);
+ unsigned int r = (color >> 16u) & 0xffu;
+ unsigned int g = (color >> 8u) & 0xffu;
+ unsigned int b = color & 0xffu;
+ std::string color_str = str::asprintf("&H%02x%02x%02x%02x", a, b, g, r);
+ overrides.push_back(std::string("Default.PrimaryColour=") + color_str);
+ overrides.push_back(std::string("Default.SecondaryColour=") + color_str);
+ }
+ const char *ass_overrides[overrides.size() + 1];
+ for (size_t i = 0; i < overrides.size(); i++)
+ {
+ ass_overrides[i] = ::strdup(overrides[i].c_str());
+ }
+ ass_overrides[overrides.size()] = NULL;
+ ass_set_style_overrides(_ass_library, const_cast<char **>(ass_overrides));
+ ass_set_font_scale(_ass_renderer, (params.subtitle_scale >= 0.0f ? params.subtitle_scale : 1.0));
+ ass_process_force_style(_ass_track);
+}
+
+void subtitle_renderer::prerender_ass(const subtitle_box &box, int64_t timestamp,
+ const parameters &params, int width, int height, float pixel_aspect_ratio)
+{
+ // Set basic parameters
+ ass_set_frame_size(_ass_renderer, width, height);
+ ass_set_aspect_ratio(_ass_renderer, 1.0, pixel_aspect_ratio);
+
+ // Put subtitle data into ASS track
+ if (_ass_track)
+ {
+ ass_free_track(_ass_track);
+ }
+ _ass_track = ass_new_track(_ass_library);
+ if (!_ass_track)
+ {
+ throw exc(_("Cannot initialize LibASS track."));
+ }
+ std::string conv_str = box.str;
+ if (params.subtitle_encoding != "")
+ {
+ try
+ {
+ conv_str = str::convert(box.str, params.subtitle_encoding, "UTF-8");
+ }
+ catch (std::exception &e)
+ {
+ msg::err(_("Subtitle character set conversion failed: %s"), e.what());
+ conv_str = std::string("Dialogue: 0,0:00:00.00,9:59:59.99,") + e.what();
+ }
+ }
+ if (box.format == subtitle_box::ass)
+ {
+ ass_process_codec_private(_ass_track, const_cast<char *>(box.style.c_str()), box.style.length());
+ ass_process_data(_ass_track, const_cast<char *>(conv_str.c_str()), conv_str.length());
+ }
+ else
+ {
+ std::string style =
+ "[Script Info]\n"
+ "ScriptType: v4.00+\n"
+ "\n"
+ "[V4+ Styles]\n"
+ "Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, "
+ "OutlineColour, BackColour, Bold, Italic, Underline, BorderStyle, "
+ "Outline, Shadow, Alignment, MarginL, MarginR, MarginV, AlphaLevel, Encoding\n"
+ "Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,1,1,0,2,10,10,10,0,0\n"
+ "\n"
+ "[Events]\n"
+ "Format: Layer, Start, End, Text\n"
+ "\n";
+ std::string str = "Dialogue: 0,0:00:00.00,9:59:59.99," + conv_str;
+ ass_process_codec_private(_ass_track, const_cast<char *>(style.c_str()), style.length());
+ ass_process_data(_ass_track, const_cast<char *>(str.c_str()), str.length());
+ }
+ set_ass_parameters(params);
+
+ // Render subtitle
+ _ass_img = ass_render_frame(_ass_renderer, _ass_track, timestamp / 1000, NULL);
+
+ // Determine bounding box
+ int min_x = width;
+ int max_x = -1;
+ int min_y = height;
+ int max_y = -1;
+ ASS_Image *img = _ass_img;
+ while (img && img->w > 0 && img->h > 0)
+ {
+ if (img->dst_x < min_x)
+ min_x = img->dst_x;
+ if (img->dst_x + img->w - 1 > max_x)
+ max_x = img->dst_x + img->w - 1;
+ if (img->dst_y < min_y)
+ min_y = img->dst_y;
+ if (img->dst_y + img->h - 1 > max_y)
+ max_y = img->dst_y + img->h - 1;
+ img = img->next;
+ }
+ if (max_x < 0)
+ {
+ _bb_x = 0;
+ _bb_y = 0;
+ _bb_w = 0;
+ _bb_h = 0;
+ }
+ else
+ {
+ _bb_x = min_x;
+ _bb_w = max_x - min_x + 1;
+ _bb_y = min_y;
+ _bb_h = max_y - min_y + 1;
+ }
+}
+
+void subtitle_renderer::render_ass(uint32_t *bgra32_buffer)
+{
+ if (_bb_w > 0 && _bb_h > 0)
+ {
+ std::memset(bgra32_buffer, 0, _bb_w * _bb_h * sizeof(uint32_t));
+ ASS_Image *img = _ass_img;
+ while (img && img->w > 0 && img->h > 0)
+ {
+ blend_ass_image(img, bgra32_buffer);
+ img = img->next;
+ }
+ }
+}
+
+void subtitle_renderer::prerender_img(const subtitle_box &box)
+{
+ _img_box = &box;
+ // Determine bounding box
+ int min_x = std::numeric_limits<int>::max();
+ int max_x = -1;
+ int min_y = std::numeric_limits<int>::max();
+ int max_y = -1;
+ for (size_t i = 0; i < box.images.size(); i++)
+ {
+ const subtitle_box::image_t &img = box.images[i];
+ if (img.x < min_x)
+ min_x = img.x;
+ if (img.x + img.w - 1 > max_x)
+ max_x = img.x + img.w - 1;
+ if (img.y < min_y)
+ min_y = img.y;
+ if (img.y + img.h - 1 > max_y)
+ max_y = img.y + img.h - 1;
+ }
+ if (max_x < 0)
+ {
+ _bb_x = 0;
+ _bb_y = 0;
+ _bb_w = 0;
+ _bb_h = 0;
+ }
+ else
+ {
+ _bb_x = min_x;
+ _bb_w = max_x - min_x + 1;
+ _bb_y = min_y;
+ _bb_h = max_y - min_y + 1;
+ }
+}
+
+void subtitle_renderer::render_img(uint32_t *bgra32_buffer)
+{
+ if (_bb_w <= 0 || _bb_h <= 0)
+ {
+ return;
+ }
+
+ std::memset(bgra32_buffer, 0, _bb_w * _bb_h * sizeof(uint32_t));
+ for (size_t i = 0; i < _img_box->images.size(); i++)
+ {
+ const subtitle_box::image_t &img = _img_box->images[i];
+ const uint8_t *src = &(img.data[0]);
+ for (int src_y = 0; src_y < img.h; src_y++)
+ {
+ int dst_y = src_y + img.y - _bb_y;
+ if (dst_y >= _bb_h)
+ {
+ break;
+ }
+ for (int src_x = 0; src_x < img.w; src_x++)
+ {
+ int dst_x = src_x + img.x - _bb_x;
+ if (dst_x >= _bb_w)
+ {
+ break;
+ }
+ int palette_index = src[src_x];
+ uint32_t palette_entry = reinterpret_cast<const uint32_t *>(&(img.palette[0]))[palette_index];
+ unsigned int A = (palette_entry >> 24u);
+ unsigned int R = (palette_entry >> 16u) & 0xffu;
+ unsigned int G = (palette_entry >> 8u) & 0xffu;
+ unsigned int B = palette_entry & 0xffu;
+ uint32_t oldval = bgra32_buffer[dst_y * _bb_w + dst_x];
+ // XXX: The BGRA layout used here may be wrong on big endian system
+ uint32_t newval = std::min(A + (oldval >> 24u), 255u) << 24u
+ | ((A * R + (255u - A) * ((oldval >> 16u) & 0xffu)) / 255u) << 16u
+ | ((A * G + (255u - A) * ((oldval >> 8u) & 0xffu)) / 255u) << 8u
+ | ((A * B + (255u - A) * ((oldval ) & 0xffu)) / 255u);
+ bgra32_buffer[dst_y * _bb_w + dst_x] = newval;
+ }
+ src += img.linesize;
+ }
+ }
+}

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

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

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

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