diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-08 14:25:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-08 14:25:10 +0100 |
| commit | f07623551706b849190c84059bac455088f8eb1e (patch) | |
| tree | 81360f73c4a52702921270c605087d0c5f03e42e /src/lib/dcp_subtitle.cc | |
| parent | 5665f1503d751391768bd7ed5894f2ecd63ea8fc (diff) | |
Adapt for changes to libdcp API.
Diffstat (limited to 'src/lib/dcp_subtitle.cc')
| -rw-r--r-- | src/lib/dcp_subtitle.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/dcp_subtitle.cc b/src/lib/dcp_subtitle.cc index 17874c27e..66cee4ad8 100644 --- a/src/lib/dcp_subtitle.cc +++ b/src/lib/dcp_subtitle.cc @@ -19,27 +19,27 @@ #include "dcp_subtitle.h" #include "exceptions.h" -#include <dcp/interop_subtitle_content.h> -#include <dcp/smpte_subtitle_content.h> +#include <dcp/interop_subtitle_asset.h> +#include <dcp/smpte_subtitle_asset.h> #include "i18n.h" using boost::shared_ptr; -shared_ptr<dcp::SubtitleContent> +shared_ptr<dcp::SubtitleAsset> DCPSubtitle::load (boost::filesystem::path file) const { - shared_ptr<dcp::SubtitleContent> sc; + shared_ptr<dcp::SubtitleAsset> sc; try { - sc.reset (new dcp::InteropSubtitleContent (file)); + sc.reset (new dcp::InteropSubtitleAsset (file)); } catch (...) { } if (!sc) { try { - sc.reset (new dcp::SMPTESubtitleContent (file, true)); + sc.reset (new dcp::SMPTESubtitleAsset (file, true)); } catch (...) { } @@ -47,7 +47,7 @@ DCPSubtitle::load (boost::filesystem::path file) const if (!sc) { try { - sc.reset (new dcp::SMPTESubtitleContent (file, false)); + sc.reset (new dcp::SMPTESubtitleAsset (file, false)); } catch (...) { } |