From 546e9b703d0a792a75e2f5fffb064191c791d240 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 21 Jan 2015 19:37:16 +0000 Subject: Fix recognition of MXF-wrapped subtitle content vs audio/video. --- ChangeLog | 5 +++++ cscript | 2 +- src/lib/content_factory.cc | 12 +++--------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf61112da..d437647ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-01-21 Carl Hetherington + + * Fix differentiation between MXF-wrapped subtitles + and video/audio content. + 2015-01-20 Carl Hetherington * Version 2.0.35 released. diff --git a/cscript b/cscript index 2486e18a2..2fcfe454d 100644 --- a/cscript +++ b/cscript @@ -156,7 +156,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', 'f69bb08'), - ('libdcp', '5b519d9'), + ('libdcp', 'a8d0450'), ('libsub', 'f66b11f')) def build(target, options): diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index ed00639a0..f4d9fe4e9 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -29,6 +29,7 @@ #include "dcp_subtitle_content.h" #include "util.h" #include +#include using std::string; using std::list; @@ -86,15 +87,8 @@ content_factory (shared_ptr film, boost::filesystem::path path) content.reset (new SubRipContent (film, path)); } else if (ext == ".xml") { content.reset (new DCPSubtitleContent (film, path)); - } else if (ext == ".mxf") { - /* Try to read this .mxf as a subtitle file; if we fail, we fall back - to using FFmpeg below. - */ - try { - content.reset (new DCPSubtitleContent (film, path)); - } catch (...) { - - } + } else if (ext == ".mxf" && dcp::SMPTESubtitleContent::valid_mxf (path)) { + content.reset (new DCPSubtitleContent (film, path)); } if (!content) { -- cgit v1.2.3 From ce0cdb04406f4cc78e15f5073b777dd24f908f9e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 21 Jan 2015 19:37:44 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d437647ed..717fcc528 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-01-21 Carl Hetherington + + * Version 2.0.36 released. + 2015-01-21 Carl Hetherington * Fix differentiation between MXF-wrapped subtitles diff --git a/debian/changelog b/debian/changelog index 28d0195f7..f9dad6546 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (2.0.35-1) UNRELEASED; urgency=low +dcpomatic (2.0.36-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -214,8 +214,9 @@ dcpomatic (2.0.35-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Tue, 20 Jan 2015 14:51:23 +0000 + -- Carl Hetherington Wed, 21 Jan 2015 19:37:44 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index f2c408075..42a94cc1a 100644 --- a/wscript +++ b/wscript @@ -5,7 +5,7 @@ import distutils import distutils.spawn APPNAME = 'dcpomatic' -VERSION = '2.0.35devel' +VERSION = '2.0.36' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From c1f235f5aeb65cb42c5346419807ac5bb7d6406a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 21 Jan 2015 19:37:44 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 42a94cc1a..d24353370 100644 --- a/wscript +++ b/wscript @@ -5,7 +5,7 @@ import distutils import distutils.spawn APPNAME = 'dcpomatic' -VERSION = '2.0.36' +VERSION = '2.0.36devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3