projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move 'show in file manager' code to cross_*
[dcpomatic.git]
/
src
/
lib
/
dcp_subtitle.cc
diff --git
a/src/lib/dcp_subtitle.cc
b/src/lib/dcp_subtitle.cc
index f9aa7e0d9f103da6f38d54f5e35621c23c3b6731..0943a6b08721c49c0c0132acb90273cd14901d6c 100644
(file)
--- a/
src/lib/dcp_subtitle.cc
+++ b/
src/lib/dcp_subtitle.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,6
+18,7
@@
*/
*/
+
#include "dcp_subtitle.h"
#include "exceptions.h"
#include "compose.hpp"
#include "dcp_subtitle.h"
#include "exceptions.h"
#include "compose.hpp"
@@
-26,9
+27,12
@@
#include "i18n.h"
#include "i18n.h"
-using std::string;
+
using std::exception;
using std::exception;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::string;
+using std::make_shared;
+
shared_ptr<dcp::SubtitleAsset>
DCPSubtitle::load (boost::filesystem::path file) const
shared_ptr<dcp::SubtitleAsset>
DCPSubtitle::load (boost::filesystem::path file) const
@@
-38,21
+42,21
@@
DCPSubtitle::load (boost::filesystem::path file) const
string smpte_error;
try {
string smpte_error;
try {
- sc
.reset (new dcp::InteropSubtitleAsset (file)
);
+ sc
= make_shared<dcp::InteropSubtitleAsset>(file
);
} catch (exception& e) {
interop_error = e.what ();
}
if (!sc) {
try {
} catch (exception& e) {
interop_error = e.what ();
}
if (!sc) {
try {
- sc
.reset (new dcp::SMPTESubtitleAsset (file)
);
+ sc
= make_shared<dcp::SMPTESubtitleAsset>(file
);
} catch (exception& e) {
smpte_error = e.what();
}
}
if (!sc) {
} catch (exception& e) {
smpte_error = e.what();
}
}
if (!sc) {
- throw FileError
(String::compose
(_("Could not read subtitles (%1 / %2)"), interop_error, smpte_error), file);
+ throw FileError
(String::compose
(_("Could not read subtitles (%1 / %2)"), interop_error, smpte_error), file);
}
return sc;
}
return sc;