From 42a122334d594b824c666e5263168386a76801cc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 7 Jul 2014 13:21:42 +0100 Subject: Initial hack to support 12-bit colour. --- src/lib/dcp_video_frame.cc | 2 +- src/lib/image.cc | 2 ++ src/lib/player_video_frame.cc | 4 ++-- src/lib/player_video_frame.h | 5 ++++- src/wx/film_viewer.cc | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index 09b909696..c8f8c3cc5 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -127,7 +127,7 @@ DCPVideoFrame::encode_locally () } shared_ptr xyz = libdcp::rgb_to_xyz ( - _frame->image(), + _frame->image(AV_PIX_FMT_RGB48BE), in_lut, libdcp::GammaLUT::cache.get (16, 1 / _frame->colour_conversion().output_gamma), matrix diff --git a/src/lib/image.cc b/src/lib/image.cc index f340637dc..1c6c02979 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -320,6 +320,8 @@ Image::make_black () case PIX_FMT_ABGR: case PIX_FMT_BGRA: case PIX_FMT_RGB555LE: + case PIX_FMT_RGB48LE: + case PIX_FMT_RGB48BE: memset (data()[0], 0, lines(0) * stride()[0]); break; diff --git a/src/lib/player_video_frame.cc b/src/lib/player_video_frame.cc index 94760e495..63ddc637b 100644 --- a/src/lib/player_video_frame.cc +++ b/src/lib/player_video_frame.cc @@ -84,7 +84,7 @@ PlayerVideoFrame::set_subtitle (shared_ptr image, Position pos } shared_ptr -PlayerVideoFrame::image () const +PlayerVideoFrame::image (AVPixelFormat pixel_format) const { shared_ptr im = _in->image (); @@ -106,7 +106,7 @@ PlayerVideoFrame::image () const break; } - shared_ptr out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler, PIX_FMT_RGB24, false); + shared_ptr out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler, pixel_format, false); Position const container_offset ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.width) / 2); diff --git a/src/lib/player_video_frame.h b/src/lib/player_video_frame.h index b085cb609..6a6868292 100644 --- a/src/lib/player_video_frame.h +++ b/src/lib/player_video_frame.h @@ -18,6 +18,9 @@ */ #include +extern "C" { +#include +} #include "types.h" #include "position.h" #include "colour_conversion.h" @@ -40,7 +43,7 @@ public: void set_subtitle (boost::shared_ptr, Position); - boost::shared_ptr image () const; + boost::shared_ptr image (AVPixelFormat) const; void add_metadata (xmlpp::Node* node) const; void send_binary (boost::shared_ptr socket) const; diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index ed1a2ce41..112736b67 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -295,7 +295,7 @@ FilmViewer::process_video (shared_ptr pvf, Time t) return; } - _frame = pvf->image (); + _frame = pvf->image (PIX_FMT_RGB24); _got_frame = true; set_position_text (t); -- cgit v1.2.3 From 30661f2b8c2da1022c2cebbec62c3e15cabde5b1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 10:39:19 +0100 Subject: Attempt to fix schroot build on Centos 7. --- wscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index 09066583a..d9d410ae2 100644 --- a/wscript +++ b/wscript @@ -28,7 +28,8 @@ def static_ffmpeg(conf): conf.check_cfg(package='libavfilter', args='--cflags', uselib_store='AVFILTER', mandatory=True) conf.env.STLIB_AVFILTER = ['avfilter', 'swresample'] conf.check_cfg(package='libavcodec', args='--cflags', uselib_store='AVCODEC', mandatory=True) - conf.env.STLIB_AVCODEC = ['avcodec'] + # lzma link is needed by Centos 7, at least + conf.env.STLIB_AVCODEC = ['avcodec', 'lzma'] conf.env.LIB_AVCODEC = ['z'] conf.check_cfg(package='libavutil', args='--cflags', uselib_store='AVUTIL', mandatory=True) conf.env.STLIB_AVUTIL = ['avutil'] -- cgit v1.2.3 From b2da30977904a932fa55f1a69fa1372dad124e37 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 10:54:16 +0100 Subject: Fix previous. --- wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index 784cb777e..897517b4f 100644 --- a/wscript +++ b/wscript @@ -29,8 +29,8 @@ def static_ffmpeg(conf): conf.env.STLIB_AVFILTER = ['avfilter', 'swresample'] conf.check_cfg(package='libavcodec', args='--cflags', uselib_store='AVCODEC', mandatory=True) # lzma link is needed by Centos 7, at least - conf.env.STLIB_AVCODEC = ['avcodec', 'lzma'] - conf.env.LIB_AVCODEC = ['z'] + conf.env.STLIB_AVCODEC = ['avcodec'] + conf.env.LIB_AVCODEC = ['z', 'lzma'] conf.check_cfg(package='libavutil', args='--cflags', uselib_store='AVUTIL', mandatory=True) conf.env.STLIB_AVUTIL = ['avutil'] conf.check_cfg(package='libswscale', args='--cflags', uselib_store='SWSCALE', mandatory=True) -- cgit v1.2.3 From 3537c56d30582cbd9b5e87704cfa7d3d362343b3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 11:03:31 +0100 Subject: Don't build tests on Centos 7 either. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscript b/cscript index 5b9c3669b..665d39108 100644 --- a/cscript +++ b/cscript @@ -172,7 +172,7 @@ def build(target, options): if target.version == '6.5': cmd += ' --target-centos-6 --disable-tests' elif target.version == '7': - cmd += ' --target-centos-7' + cmd += ' --target-centos-7 --disable-tests' target.command(cmd) target.command('./waf') -- cgit v1.2.3 From 016a98b18d01276a1e603885a25785e7389f14d9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 14:42:29 +0100 Subject: Supporter. --- src/wx/about_dialog.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 58f299723..49e245318 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -161,6 +161,7 @@ AboutDialog::AboutDialog (wxWindow* parent) supported_by.Add (wxT ("Wolfram Weber")); supported_by.Add (wxT ("Frank de Wulf")); supported_by.Add (wxT ("Pavel Zhdanko")); + supported_by.Add (wxT ("Daniel Židek")); add_section (_("Supported by"), supported_by); wxArrayString tested_by; -- cgit v1.2.3 From 0f4cb98a8233c86dc4ed46cab6152cae44e64533 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 16:38:38 +0100 Subject: Bump libdcp version. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cscript b/cscript index 665d39108..50f615681 100644 --- a/cscript +++ b/cscript @@ -157,7 +157,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '2dffa11'), - ('libdcp', '2001bef5b3a6256eedf1cada4977a3ba8a3732cd')) + ('libdcp', 'v0.98.0')) def build(target, options): cmd = './waf configure --prefix=%s' % target.directory diff --git a/wscript b/wscript index 897517b4f..2849d5759 100644 --- a/wscript +++ b/wscript @@ -59,7 +59,7 @@ def dynamic_openjpeg(conf): conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.2', mandatory=True) def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh): - conf.check_cfg(package='libdcp', atleast_version='0.96', args='--cflags', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.98', args='--cflags', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp'] conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt'] -- cgit v1.2.3 From 2a80f3002d2c72fd69e3acd65562ab8e3cc6deac Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 16:39:01 +0100 Subject: pot merge. --- src/lib/po/de_DE.po | 2 +- src/lib/po/es_ES.po | 2 +- src/lib/po/fr_FR.po | 2 +- src/lib/po/it_IT.po | 2 +- src/lib/po/nl_NL.po | 2 +- src/lib/po/sv_SE.po | 2 +- src/tools/po/de_DE.po | 2 +- src/tools/po/es_ES.po | 2 +- src/tools/po/fr_FR.po | 2 +- src/tools/po/it_IT.po | 2 +- src/tools/po/nl_NL.po | 4 ++-- src/tools/po/sv_SE.po | 2 +- src/wx/po/de_DE.po | 6 +++--- src/wx/po/es_ES.po | 6 +++--- src/wx/po/fr_FR.po | 6 +++--- src/wx/po/it_IT.po | 6 +++--- src/wx/po/nl_NL.po | 6 +++--- src/wx/po/sv_SE.po | 6 +++--- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po index db084cb3e..071f582ce 100644 --- a/src/lib/po/de_DE.po +++ b/src/lib/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-07-13 02:32+0100\n" "Last-Translator: Carsten Kurz\n" "Language-Team: LANGUAGE \n" diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po index fe5615e1e..3aa8c19fa 100644 --- a/src/lib/po/es_ES.po +++ b/src/lib/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: LIBDCPOMATIC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-04-20 10:12-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po index 8f26f336a..0242c63e7 100644 --- a/src/lib/po/fr_FR.po +++ b/src/lib/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-07-14 12:04+0100\n" "Last-Translator: Grégoire AUSINA \n" "Language-Team: \n" diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po index d4760b9d5..0ddbc4a9a 100644 --- a/src/lib/po/it_IT.po +++ b/src/lib/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-02-03 10:48+0100\n" "Last-Translator: William Fanelli \n" "Language-Team: \n" diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po index 09f14e1ac..857aa12d4 100644 --- a/src/lib/po/nl_NL.po +++ b/src/lib/po/nl_NL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-09-04 20:34+0100\n" "Last-Translator: Cherif Ben Brahim \n" "Language-Team: UniversalDV \n" diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po index 32843da7a..d4b773c2e 100644 --- a/src/lib/po/sv_SE.po +++ b/src/lib/po/sv_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-01-19 08:59+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po index 24ed468a8..ba09e24da 100644 --- a/src/tools/po/de_DE.po +++ b/src/tools/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-07-13 03:04+0100\n" "Last-Translator: Carsten Kurz\n" "Language-Team: LANGUAGE \n" diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po index f6d2e4439..e37d375e0 100644 --- a/src/tools/po/es_ES.po +++ b/src/tools/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCPOMATIC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-04-20 10:21-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po index 86994dc71..75eed5623 100644 --- a/src/tools/po/fr_FR.po +++ b/src/tools/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-07-14 10:43+0100\n" "Last-Translator: Grégoire AUSINA \n" "Language-Team: \n" diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po index 56b050df0..07b348c13 100644 --- a/src/tools/po/it_IT.po +++ b/src/tools/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-02-03 09:36+0100\n" "Last-Translator: William Fanelli \n" "Language-Team: \n" diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po index f6d076d69..c77c54b95 100644 --- a/src/tools/po/nl_NL.po +++ b/src/tools/po/nl_NL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-09-04 20:29+0100\n" "Last-Translator: Cherif Ben Brahim \n" "Language-Team: UniversalDV \n" @@ -52,7 +52,7 @@ msgstr "&Help" msgid "&Jobs" msgstr "&Projecten" -#: src/tools/dcpomatic.cc: +#: src/tools/dcpomatic.cc:631 msgid "&Make DCP\tCtrl-M" msgstr "&Maak een DCP\tCtrl-M" diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po index 50bf29c9f..fbe64370f 100644 --- a/src/tools/po/sv_SE.po +++ b/src/tools/po/sv_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-01-19 08:59+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po index 324f266cc..c488cab4b 100644 --- a/src/wx/po/de_DE.po +++ b/src/wx/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-07-13 03:08+0100\n" "Last-Translator: Carsten Kurz\n" "Language-Team: LANGUAGE \n" @@ -968,7 +968,7 @@ msgstr "Untertitel Sprache (z.B. EN)" msgid "Subtitles" msgstr "Untertitel" -#: src/wx/about_dialog.cc:164 +#: src/wx/about_dialog.cc:165 msgid "Supported by" msgstr "Unterstützt durch" @@ -992,7 +992,7 @@ msgstr "Gebiet (z.B. UK)" msgid "Test version " msgstr "Test Version" -#: src/wx/about_dialog.cc:209 +#: src/wx/about_dialog.cc:210 msgid "Tested by" msgstr "Getestet von" diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po index 3d99cd3da..88754e0a6 100644 --- a/src/wx/po/es_ES.po +++ b/src/wx/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libdcpomatic-wx\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-04-20 12:06-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" @@ -980,7 +980,7 @@ msgstr "Idioma del subtítulo (ej. EN)" msgid "Subtitles" msgstr "Subtítulos" -#: src/wx/about_dialog.cc:164 +#: src/wx/about_dialog.cc:165 msgid "Supported by" msgstr "Soportado por" @@ -1005,7 +1005,7 @@ msgstr "Territorio (ej. ES)" msgid "Test version " msgstr "Versión en prueba" -#: src/wx/about_dialog.cc:209 +#: src/wx/about_dialog.cc:210 msgid "Tested by" msgstr "Comprobado por" diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po index 79c18feb2..75fc5754a 100644 --- a/src/wx/po/fr_FR.po +++ b/src/wx/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-07-14 11:27+0100\n" "Last-Translator: Grégoire AUSINA \n" "Language-Team: \n" @@ -967,7 +967,7 @@ msgstr "Langue de sous-titres (ex. FR)" msgid "Subtitles" msgstr "Sous-titres" -#: src/wx/about_dialog.cc:164 +#: src/wx/about_dialog.cc:165 msgid "Supported by" msgstr "Soutenu par" @@ -991,7 +991,7 @@ msgstr "Territoire (ex. FR)" msgid "Test version " msgstr "Version test" -#: src/wx/about_dialog.cc:209 +#: src/wx/about_dialog.cc:210 msgid "Tested by" msgstr "Testé par" diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po index 569f49975..320d15e0c 100644 --- a/src/wx/po/it_IT.po +++ b/src/wx/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-02-03 10:46+0100\n" "Last-Translator: William Fanelli \n" "Language-Team: \n" @@ -990,7 +990,7 @@ msgstr "Lingua dei Sottotitoli (es. FR)" msgid "Subtitles" msgstr "Sottotitoli" -#: src/wx/about_dialog.cc:164 +#: src/wx/about_dialog.cc:165 msgid "Supported by" msgstr "" @@ -1016,7 +1016,7 @@ msgstr "Nazione (es. UK)" msgid "Test version " msgstr "Versione di test" -#: src/wx/about_dialog.cc:209 +#: src/wx/about_dialog.cc:210 msgid "Tested by" msgstr "" diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po index 3df5b839d..a59f204af 100644 --- a/src/wx/po/nl_NL.po +++ b/src/wx/po/nl_NL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-09-04 20:17+0100\n" "Last-Translator: Cherif Ben Brahim \n" "Language-Team: UniversalDV \n" @@ -977,7 +977,7 @@ msgstr "Ondertitel Taal (vb NL)" msgid "Subtitles" msgstr "Ondertitels" -#: src/wx/about_dialog.cc:164 +#: src/wx/about_dialog.cc:165 msgid "Supported by" msgstr "Ondersteund door" @@ -1001,7 +1001,7 @@ msgstr "Grondgebied (vb NL)" msgid "Test version " msgstr "Test Versie" -#: src/wx/about_dialog.cc:209 +#: src/wx/about_dialog.cc:210 msgid "Tested by" msgstr "Getest door" diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po index 7a75403ab..81fa8c4b3 100644 --- a/src/wx/po/sv_SE.po +++ b/src/wx/po/sv_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-01-19 09:14+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" @@ -1002,7 +1002,7 @@ msgstr "Undertextspråk (ex. SV)" msgid "Subtitles" msgstr "Undertexter" -#: src/wx/about_dialog.cc:164 +#: src/wx/about_dialog.cc:165 msgid "Supported by" msgstr "Stöd från" @@ -1027,7 +1027,7 @@ msgstr "Område (ex. SV)" msgid "Test version " msgstr "Testversion" -#: src/wx/about_dialog.cc:209 +#: src/wx/about_dialog.cc:210 #, fuzzy msgid "Tested by" msgstr "Översatt av" -- cgit v1.2.3 From 0202ea7a480480e53391c991c1f9565d632bc944 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 16:40:17 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82ee2675e..99192f4cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-16 Carl Hetherington + + * Version 1.75.0 released. + 2014-10-14 Carl Hetherington * Version 1.74.3 released. diff --git a/debian/changelog b/debian/changelog index efd8fd73d..57f506c3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.74.3-1) UNRELEASED; urgency=low +dcpomatic (1.75.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -189,8 +189,9 @@ dcpomatic (1.74.3-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Tue, 14 Oct 2014 18:38:17 +0100 + -- Carl Hetherington Thu, 16 Oct 2014 16:40:17 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 2849d5759..ea936d08d 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.74.3devel' +VERSION = '1.75.0' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 61ba36e642cca1efe5e1e5352d995df351e97e91 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 16:40:17 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index ea936d08d..80c385c75 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.75.0' +VERSION = '1.75.0devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 784440c45ee7469890a15ed612018eb66c2152dc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 16:46:56 +0100 Subject: Bump libdcp for 12bit merge. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscript b/cscript index 50f615681..9f0e3edf7 100644 --- a/cscript +++ b/cscript @@ -157,7 +157,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '2dffa11'), - ('libdcp', 'v0.98.0')) + ('libdcp', 'd5accd6')) def build(target, options): cmd = './waf configure --prefix=%s' % target.directory -- cgit v1.2.3 From d4c08424fb84da0bec20e9d008d2a70998130ba0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 16:48:12 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 99192f4cc..dc6f7cafb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-16 Carl Hetherington + + * Version 1.75.1 released. + 2014-10-16 Carl Hetherington * Version 1.75.0 released. diff --git a/debian/changelog b/debian/changelog index 57f506c3c..43e14527d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.75.0-1) UNRELEASED; urgency=low +dcpomatic (1.75.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -190,8 +190,9 @@ dcpomatic (1.75.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Thu, 16 Oct 2014 16:40:17 +0100 + -- Carl Hetherington Thu, 16 Oct 2014 16:48:12 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 80c385c75..183f57bed 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.75.0devel' +VERSION = '1.75.1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From cd5eb714ecbcb63ff9d31fbe83a60e15050e32d3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 16:48:12 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 183f57bed..eb80b9efc 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.75.1' +VERSION = '1.75.1devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 49a5dd1b69c4bb7ed27ba0e23b2161fe4521f775 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 18:57:18 +0100 Subject: Fix build. --- test/play_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/play_test.cc b/test/play_test.cc index 067f772ff..bbf70781a 100644 --- a/test/play_test.cc +++ b/test/play_test.cc @@ -51,7 +51,7 @@ public: { Video v; v.content = _player->_last_video; - v.image = i->image (); + v.image = i->image (PIX_FMT_RGB24); v.time = t; _queue.push_front (v); } -- cgit v1.2.3 From 8d6131917eec82a1d6f697e39cf7eee7c688e58a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 18:57:29 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc6f7cafb..e8972aa2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-16 Carl Hetherington + + * Version 1.75.2 released. + 2014-10-16 Carl Hetherington * Version 1.75.1 released. diff --git a/debian/changelog b/debian/changelog index 43e14527d..6a86870a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.75.1-1) UNRELEASED; urgency=low +dcpomatic (1.75.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -191,8 +191,9 @@ dcpomatic (1.75.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Thu, 16 Oct 2014 16:48:12 +0100 + -- Carl Hetherington Thu, 16 Oct 2014 18:57:29 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index eb80b9efc..875e39e0b 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.75.1devel' +VERSION = '1.75.2' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From d11fa8639d52d2fd673724d21882268116da3458 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 18:57:29 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 875e39e0b..786ff4287 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.75.2' +VERSION = '1.75.2devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 734340b52d30cb2dde9aa9e81c77277b261b128e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 18 Oct 2014 22:18:15 +0100 Subject: Fix build on Debian unstable which now has GraphicsMagick rather than ImageMagick. --- src/lib/image_examiner.cc | 2 ++ src/lib/image_proxy.cc | 4 ++++ src/lib/util.cc | 5 +++++ src/tools/wscript | 2 +- src/wx/wscript | 1 - test/image_test.cc | 14 ++++++++++++++ wscript | 10 +++++++++- 7 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc index 4ff324f68..7058ea3b2 100644 --- a/src/lib/image_examiner.cc +++ b/src/lib/image_examiner.cc @@ -38,7 +38,9 @@ ImageExaminer::ImageExaminer (shared_ptr film, shared_ptrpath(0).string()); _video_size = libdcp::Size (image->columns(), image->rows()); delete image; diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc index 3aba6cf7c..3851f88e7 100644 --- a/src/lib/image_proxy.cc +++ b/src/lib/image_proxy.cc @@ -156,7 +156,11 @@ MagickImageProxy::image () const /* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */ uint8_t* p = _image->data()[0]; for (int i = 0; i < size.height; ++i) { +#ifdef DCPOMATIC_IMAGE_MAGICK using namespace MagickCore; +#else + using namespace MagickLib; +#endif magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p); p += _image->stride()[0]; } diff --git a/src/lib/util.cc b/src/lib/util.cc index 290dd20ef..2e9ca66b2 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -43,7 +43,12 @@ #endif #include #include +#ifdef DCPOMATIC_IMAGE_MAGICK #include +#else +#include +#include +#endif #include #include #include diff --git a/src/tools/wscript b/src/tools/wscript index c4ea1530f..ac270af70 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -11,7 +11,7 @@ def configure(conf): def build(bld): for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm', 'dcpomatic_create']: obj = bld(features = 'cxx cxxprogram') - obj.uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS QUICKMAIL' + obj.uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC QUICKMAIL' obj.includes = ['..'] obj.use = ['libdcpomatic'] obj.source = '%s.cc' % t diff --git a/src/wx/wscript b/src/wx/wscript index 8bf2451c2..071050069 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -64,7 +64,6 @@ def configure(conf): 'wx_gtk2u_adv-3.0', 'wx_gtk2u_core-3.0', 'wx_baseu_xml-3.0', 'wx_baseu-3.0'] conf.env.LIB_WXWIDGETS = ['tiff', 'SM', 'dl', 'jpeg', 'png', 'X11', 'expat'] if conf.env.TARGET_DEBIAN and conf.env.DEBIAN_UNSTABLE: - conf.env.LIB_WXWIDGETS.append('Xxf86vm') conf.env.LIB_WXWIDGETS.append('Xext') conf.env.LIB_WXWIDGETS.append('X11') diff --git a/test/image_test.cc b/test/image_test.cc index 51ad49ebf..5662c729b 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -174,16 +174,24 @@ read_file (string file) boost::shared_ptr image (new Image (PIX_FMT_RGB24, size, true)); +#ifdef DCPOMATIC_IMAGE_MAGICK using namespace MagickCore; +#endif uint8_t* p = image->data()[0]; for (int y = 0; y < size.height; ++y) { uint8_t* q = p; for (int x = 0; x < size.width; ++x) { Magick::Color c = magick_image.pixelColor (x, y); +#ifdef DCPOMATIC_IMAGE_MAGICK *q++ = c.redQuantum() * 255 / QuantumRange; *q++ = c.greenQuantum() * 255 / QuantumRange; *q++ = c.blueQuantum() * 255 / QuantumRange; +#else + *q++ = c.redQuantum() * 255 / MaxRGB; + *q++ = c.greenQuantum() * 255 / MaxRGB; + *q++ = c.blueQuantum() * 255 / MaxRGB; +#endif } p += image->stride()[0]; } @@ -195,14 +203,20 @@ static void write_file (shared_ptr image, string file) { +#ifdef DCPOMATIC_IMAGE_MAGICK using namespace MagickCore; +#endif Magick::Image magick_image (Magick::Geometry (image->size().width, image->size().height), Magick::Color (0, 0, 0)); uint8_t*p = image->data()[0]; for (int y = 0; y < image->size().height; ++y) { uint8_t* q = p; for (int x = 0; x < image->size().width; ++x) { +#ifdef DCPOMATIC_IMAGE_MAGICK Magick::Color c (q[0] * QuantumRange / 256, q[1] * QuantumRange / 256, q[2] * QuantumRange / 256); +#else + Magick::Color c (q[0] * MaxRGB / 256, q[1] * MaxRGB / 256, q[2] * MaxRGB / 256); +#endif magick_image.pixelColor (x, y, c); q += 3; } diff --git a/wscript b/wscript index eb80b9efc..f5d1a1c34 100644 --- a/wscript +++ b/wscript @@ -1,6 +1,8 @@ import subprocess import os import sys +import distutils +import distutils.spawn APPNAME = 'dcpomatic' VERSION = '1.75.1devel' @@ -322,7 +324,13 @@ def configure(conf): # Dependencies which are always dynamically linked conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True) conf.check_cfg(package='glib-2.0', args='--cflags --libs', uselib_store='GLIB', mandatory=True) - conf.check_cfg(package= '', path=conf.options.magickpp_config, args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True) + if distutils.spawn.find_executable(conf.options.magickpp_config): + conf.check_cfg(package='', path=conf.options.magickpp_config, args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True) + conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK') + else: + conf.check_cfg(package='GraphicsMagick++', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True) + conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_GRAPHICS_MAGICK') + conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True) conf.check_cc(fragment=""" -- cgit v1.2.3 From 55ef8d01e1260c81abd60ad4cf7b615de1bd65a2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 18 Oct 2014 23:30:19 +0100 Subject: Fix previous. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index efbf69eaa..cac9ee077 100644 --- a/wscript +++ b/wscript @@ -328,7 +328,7 @@ def configure(conf): conf.check_cfg(package='', path=conf.options.magickpp_config, args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True) conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK') else: - conf.check_cfg(package='GraphicsMagick++', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True) + conf.check_cfg(package='GraphicsMagick++', args='--cxxflags --libs', uselib_store='MAGICK', mandatory=True) conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_GRAPHICS_MAGICK') conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True) -- cgit v1.2.3 From 5ea0218b0eb8ead10433e3308b12f5e6b4af2102 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 18 Oct 2014 23:39:19 +0100 Subject: Fix previous properly. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index cac9ee077..88cb2d539 100644 --- a/wscript +++ b/wscript @@ -328,7 +328,7 @@ def configure(conf): conf.check_cfg(package='', path=conf.options.magickpp_config, args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True) conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK') else: - conf.check_cfg(package='GraphicsMagick++', args='--cxxflags --libs', uselib_store='MAGICK', mandatory=True) + conf.check_cfg(package='GraphicsMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=True) conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_GRAPHICS_MAGICK') conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True) -- cgit v1.2.3 From b9c5d508e441b1b899060c5fb147f7ce9ae70dbd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 18 Oct 2014 23:57:57 +0100 Subject: More attempts to fix previous. --- cscript | 1 - 1 file changed, 1 deletion(-) diff --git a/cscript b/cscript index 9f0e3edf7..495d7723a 100644 --- a/cscript +++ b/cscript @@ -8,7 +8,6 @@ deb_build_depends = {'debhelper': '8.0.0', 'pkg-config': '0.26', 'libssh-dev': '0.5.2', 'libsndfile1-dev': '1.0.25', - 'libmagick++-dev': '8:6.6.9.7', 'libgtk2.0-dev': '2.24.10'} deb_depends = dict() -- cgit v1.2.3 From 2c23a1bdd3c3d757d3640a4ad1b44a727b5a8663 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 Oct 2014 15:31:52 +0100 Subject: Munge version. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 88cb2d539..ee1f88804 100644 --- a/wscript +++ b/wscript @@ -5,7 +5,7 @@ import distutils import distutils.spawn APPNAME = 'dcpomatic' -VERSION = '1.75.2devel' +VERSION = '1.76.1devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 45af2ebbfc3f38a7acc0bb17b7fb44ce0904bb88 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 Oct 2014 17:35:24 +0100 Subject: Add simple note about resampling to the audio panel. --- ChangeLog | 5 +++++ src/wx/audio_panel.cc | 44 ++++++++++++++++++++++++++++++++++++++++---- src/wx/audio_panel.h | 4 +++- 3 files changed, 48 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8972aa2c..4e1485ae6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-10-19 Carl Hetherington + + * Add simple note of what audio resampling + will be done to the audio panel. + 2014-10-16 Carl Hetherington * Version 1.75.2 released. diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index 917775181..118db7880 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -81,11 +81,20 @@ AudioPanel::AudioPanel (FilmEditor* e) add_label_to_grid_bag_sizer (grid, this, _("Stream"), true, wxGBPosition (r, 0)); _stream = new wxChoice (this, wxID_ANY); grid->Add (_stream, wxGBPosition (r, 1)); - _description = add_label_to_grid_bag_sizer (grid, this, "", false, wxGBPosition (r, 3)); + _stream_description = add_label_to_grid_bag_sizer (grid, this, "", false, wxGBPosition (r, 3)); ++r; _mapping = new AudioMappingView (this); _sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6); + ++r; + + _description = new wxStaticText (this, wxID_ANY, wxT (" \n"), wxDefaultPosition, wxDefaultSize); + _sizer->Add (_description, 0, wxALL, 12); + wxFont font = _description->GetFont(); + font.SetStyle (wxFONTSTYLE_ITALIC); + font.SetPointSize (font.GetPointSize() - 1); + _description->SetFont (font); + ++r; _gain->wrapped()->SetRange (-60, 60); _gain->wrapped()->SetDigits (1); @@ -108,6 +117,9 @@ AudioPanel::film_changed (Film::Property property) _mapping->set_channels (_editor->film()->audio_channels ()); _sizer->Layout (); break; + case Film::VIDEO_FRAME_RATE: + setup_description (); + break; default: break; } @@ -127,6 +139,8 @@ AudioPanel::film_content_changed (int property) if (property == AudioContentProperty::AUDIO_MAPPING) { _mapping->set (acs ? acs->audio_mapping () : AudioMapping ()); _sizer->Layout (); + } else if (property == AudioContentProperty::AUDIO_FRAME_RATE) { + setup_description (); } else if (property == FFmpegContentProperty::AUDIO_STREAM) { setup_stream_description (); _mapping->set (acs ? acs->audio_mapping () : AudioMapping ()); @@ -219,19 +233,40 @@ AudioPanel::stream_changed () setup_stream_description (); } +void +AudioPanel::setup_description () +{ + AudioContentList ac = _editor->selected_audio_content (); + if (ac.size () != 1) { + _description->SetLabel (""); + return; + } + + shared_ptr acs = ac.front (); + if (acs->content_audio_frame_rate() != acs->output_audio_frame_rate ()) { + _description->SetLabel (wxString::Format ( + _("Audio will be resampled from %.3fkHz to %.3fkHz."), + acs->content_audio_frame_rate() / 1000.0, + acs->output_audio_frame_rate() / 1000.0 + )); + } else { + _description->SetLabel (_("Audio will not be resampled.")); + } +} + void AudioPanel::setup_stream_description () { FFmpegContentList fc = _editor->selected_ffmpeg_content (); if (fc.size() != 1) { - _description->SetLabel (""); + _stream_description->SetLabel (""); return; } shared_ptr fcs = fc.front (); if (!fcs->audio_stream ()) { - _description->SetLabel (wxT ("")); + _stream_description->SetLabel (wxT ("")); } else { wxString s; if (fcs->audio_channels() == 1) { @@ -240,7 +275,7 @@ AudioPanel::setup_stream_description () s << fcs->audio_channels() << wxT (" ") << _("channels"); } s << wxT (", ") << fcs->content_audio_frame_rate() << _("Hz"); - _description->SetLabel (s); + _stream_description->SetLabel (s); } } @@ -270,6 +305,7 @@ AudioPanel::content_selection_changed () _mapping->Enable (sel.size() == 1); film_content_changed (AudioContentProperty::AUDIO_MAPPING); + film_content_changed (AudioContentProperty::AUDIO_FRAME_RATE); film_content_changed (FFmpegContentProperty::AUDIO_STREAM); film_content_changed (FFmpegContentProperty::AUDIO_STREAMS); } diff --git a/src/wx/audio_panel.h b/src/wx/audio_panel.h index 2ba5a9ffc..fa18415bd 100644 --- a/src/wx/audio_panel.h +++ b/src/wx/audio_panel.h @@ -42,6 +42,7 @@ private: void show_clicked (); void stream_changed (); void mapping_changed (AudioMapping); + void setup_description (); void setup_stream_description (); ContentSpinCtrlDouble* _gain; @@ -49,7 +50,8 @@ private: wxButton* _show; ContentSpinCtrl* _delay; wxChoice* _stream; - wxStaticText* _description; + wxStaticText* _stream_description; AudioMappingView* _mapping; + wxStaticText* _description; AudioDialog* _audio_dialog; }; -- cgit v1.2.3 From 06bc61102add8d307cb53cc7798044d8477f010d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 Oct 2014 22:02:11 +0100 Subject: Give an error in dcpomatic_cli if a content file is not found. --- src/tools/dcpomatic_cli.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 5cb05e11d..23ca938d4 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -139,6 +139,17 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } + ContentList content = film->content (); + for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) { + vector paths = (*i)->paths (); + for (vector::const_iterator j = paths.begin(); j != paths.end(); ++j) { + if (!boost::filesystem::exists (*j)) { + cerr << argv[0] << ": content file " << *j << " not found.\n"; + exit (EXIT_FAILURE); + } + } + } + cout << "\nMaking DCP for " << film->name() << "\n"; film->make_dcp (); -- cgit v1.2.3 From e74b8e1d737deb9979a279d94c909d95f9999995 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 20 Oct 2014 22:39:16 +0100 Subject: Data must be passed to libdcp xyz conversion as little-endian. --- src/lib/dcp_video_frame.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index 057ed0fae..fac247aeb 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -125,7 +125,7 @@ DCPVideoFrame::encode_locally () } shared_ptr xyz = libdcp::rgb_to_xyz ( - _frame->image(AV_PIX_FMT_RGB48BE), + _frame->image(AV_PIX_FMT_RGB48LE), in_lut, libdcp::GammaLUT::cache.get (16, 1 / _frame->colour_conversion().output_gamma), matrix -- cgit v1.2.3 From 53376a4c1c2fe992e17fa80c3d81a19c565a01be Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 20 Oct 2014 22:50:32 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e1485ae6..5bb0711b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Carl Hetherington + + * Version 1.76.2 released. + 2014-10-19 Carl Hetherington * Add simple note of what audio resampling diff --git a/debian/changelog b/debian/changelog index 6a86870a9..05d8e42bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.75.2-1) UNRELEASED; urgency=low +dcpomatic (1.76.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -192,8 +192,9 @@ dcpomatic (1.75.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Thu, 16 Oct 2014 18:57:29 +0100 + -- Carl Hetherington Mon, 20 Oct 2014 22:50:32 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index ee1f88804..93c1491a9 100644 --- a/wscript +++ b/wscript @@ -5,7 +5,7 @@ import distutils import distutils.spawn APPNAME = 'dcpomatic' -VERSION = '1.76.1devel' +VERSION = '1.76.2' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 5c8599593ee8b3ef05d5c55c5f0885a2d8bfb9d2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 20 Oct 2014 22:50:32 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 93c1491a9..62b47d9a4 100644 --- a/wscript +++ b/wscript @@ -5,7 +5,7 @@ import distutils import distutils.spawn APPNAME = 'dcpomatic' -VERSION = '1.76.2' +VERSION = '1.76.2devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3