projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't seek during timeline drags.
[dcpomatic.git]
/
src
/
lib
/
content_factory.cc
diff --git
a/src/lib/content_factory.cc
b/src/lib/content_factory.cc
index 9429f1c469b86950517907fe96f34a92e3eaf8fe..077ef529ece8d9282292110e78e1522eda5eeb3a 100644
(file)
--- a/
src/lib/content_factory.cc
+++ b/
src/lib/content_factory.cc
@@
-26,9
+26,9
@@
#include "audio_content.h"
#include "image_content.h"
#include "atmos_mxf_content.h"
#include "audio_content.h"
#include "image_content.h"
#include "atmos_mxf_content.h"
-#include "
text_caption
_file_content.h"
+#include "
string_text
_file_content.h"
#include "dcp_content.h"
#include "dcp_content.h"
-#include "dcp_
text
_content.h"
+#include "dcp_
subtitle
_content.h"
#include "util.h"
#include "ffmpeg_audio_stream.h"
#include "video_mxf_content.h"
#include "util.h"
#include "ffmpeg_audio_stream.h"
#include "video_mxf_content.h"
@@
-88,11
+88,11
@@
content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l
);
} else if (type == "SubRip" || type == "TextSubtitle") {
);
} else if (type == "SubRip" || type == "TextSubtitle") {
- content.reset (new
TextCaption
FileContent (film, node, version));
+ content.reset (new
StringText
FileContent (film, node, version));
} else if (type == "DCP") {
content.reset (new DCPContent (film, node, version));
} else if (type == "DCPSubtitle") {
} else if (type == "DCP") {
content.reset (new DCPContent (film, node, version));
} else if (type == "DCPSubtitle") {
- content.reset (new DCP
Text
Content (film, node, version));
+ content.reset (new DCP
Subtitle
Content (film, node, version));
} else if (type == "VideoMXF") {
content.reset (new VideoMXFContent (film, node, version));
} else if (type == "AtmosMXF") {
} else if (type == "VideoMXF") {
content.reset (new VideoMXFContent (film, node, version));
} else if (type == "AtmosMXF") {
@@
-210,16
+210,16
@@
content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
if (valid_image_file (path)) {
single.reset (new ImageContent (film, path));
} else if (ext == ".srt" || ext == ".ssa" || ext == ".ass") {
if (valid_image_file (path)) {
single.reset (new ImageContent (film, path));
} else if (ext == ".srt" || ext == ".ssa" || ext == ".ass") {
- single.reset (new
TextCaption
FileContent (film, path));
+ single.reset (new
StringText
FileContent (film, path));
} else if (ext == ".xml") {
cxml::Document doc;
doc.read_file (path);
if (doc.root_name() == "DCinemaSecurityMessage") {
throw KDMAsContentError ();
}
} else if (ext == ".xml") {
cxml::Document doc;
doc.read_file (path);
if (doc.root_name() == "DCinemaSecurityMessage") {
throw KDMAsContentError ();
}
- single.reset (new DCP
Text
Content (film, path));
+ single.reset (new DCP
Subtitle
Content (film, path));
} else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) {
} else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) {
- single.reset (new DCP
Text
Content (film, path));
+ single.reset (new DCP
Subtitle
Content (film, path));
} else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) {
single.reset (new VideoMXFContent (film, path));
} else if (ext == ".mxf" && AtmosMXFContent::valid_mxf (path)) {
} else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) {
single.reset (new VideoMXFContent (film, path));
} else if (ext == ".mxf" && AtmosMXFContent::valid_mxf (path)) {