projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated nl_NL translation from Rob van Nieuwkerk.
[dcpomatic.git]
/
src
/
lib
/
dcp_subtitle.cc
diff --git
a/src/lib/dcp_subtitle.cc
b/src/lib/dcp_subtitle.cc
index 17874c27eca9520f50a3bee4a2c2e12d812a095b..be64937809765486e8bbed8689476d1e1375726c 100644
(file)
--- a/
src/lib/dcp_subtitle.cc
+++ b/
src/lib/dcp_subtitle.cc
@@
-19,35
+19,27
@@
#include "dcp_subtitle.h"
#include "exceptions.h"
#include "dcp_subtitle.h"
#include "exceptions.h"
-#include <dcp/interop_subtitle_
conten
t.h>
-#include <dcp/smpte_subtitle_
conten
t.h>
+#include <dcp/interop_subtitle_
asse
t.h>
+#include <dcp/smpte_subtitle_
asse
t.h>
#include "i18n.h"
using boost::shared_ptr;
#include "i18n.h"
using boost::shared_ptr;
-shared_ptr<dcp::Subtitle
Conten
t>
+shared_ptr<dcp::Subtitle
Asse
t>
DCPSubtitle::load (boost::filesystem::path file) const
{
DCPSubtitle::load (boost::filesystem::path file) const
{
- shared_ptr<dcp::Subtitle
Conten
t> sc;
-
+ shared_ptr<dcp::Subtitle
Asse
t> sc;
+
try {
try {
- sc.reset (new dcp::InteropSubtitle
Conten
t (file));
+ sc.reset (new dcp::InteropSubtitle
Asse
t (file));
} catch (...) {
} catch (...) {
-
- }
- if (!sc) {
- try {
- sc.reset (new dcp::SMPTESubtitleContent (file, true));
- } catch (...) {
-
- }
}
if (!sc) {
try {
}
if (!sc) {
try {
- sc.reset (new dcp::SMPTESubtitle
Content (file, fals
e));
+ sc.reset (new dcp::SMPTESubtitle
Asset (fil
e));
} catch (...) {
}
} catch (...) {
}