using std::make_shared;
using std::shared_ptr;
using std::string;
+using std::vector;
/** Create a Content object from an XML node.
std::shared_ptr<Content> content;
if (type == "FFmpeg") {
- /* SndfileContent is now handled by the FFmpeg code rather than by
- separate libsndfile-based code.
- */
content = make_shared<FFmpegContent>(node, version, notes);
} else if (type == "Image") {
content = make_shared<ImageContent>(node, version);
);
} else if (type == "SubRip" || type == "TextSubtitle") {
- content.reset (new StringTextFileContent(node, version));
+ content = make_shared<StringTextFileContent>(node, version, notes);
} else if (type == "DCP") {
content = make_shared<DCPContent>(node, version);
} else if (type == "DCPSubtitle") {
* @param path File or directory.
* @return Content objects.
*/
-list<shared_ptr<Content>>
+vector<shared_ptr<Content>>
content_factory (boost::filesystem::path path)
{
- list<shared_ptr<Content>> content;
+ vector<shared_ptr<Content>> content;
if (boost::filesystem::is_directory (path)) {