#include "content_view.h"
#include "wx_util.h"
-#include "lib/dcpomatic_assert.h"
#include "lib/config.h"
-#include "lib/dcp_content.h"
#include "lib/content_factory.h"
+#include "lib/cross.h"
+#include "lib/dcp_content.h"
+#include "lib/dcpomatic_assert.h"
#include "lib/examine_content_job.h"
#include "lib/job_manager.h"
-#include "lib/cross.h"
#include <dcp/exceptions.h>
+#include <dcp/warnings.h>
#include <boost/filesystem.hpp>
#include <boost/optional.hpp>
+LIBDCP_DISABLE_WARNINGS
#include <wx/progdlg.h>
+LIBDCP_ENABLE_WARNINGS
using std::cout;
shared_ptr<Content> content;
if (is_directory(i) && (is_regular_file(i / "ASSETMAP") || is_regular_file(i / "ASSETMAP.xml"))) {
content.reset (new DCPContent(i));
- } else if (i.path().extension() == ".mp4" || i.path().extension() == ".ecinema") {
- content = content_factory(i).front();
+ } else if (i.path().extension() == ".mp4") {
+ auto all_content = content_factory(i);
+ if (!all_content.empty()) {
+ content = all_content.front();
+ }
}
if (content) {