_film->set_container (Ratio::from_id("185"));
BOOST_FOREACH (shared_ptr<Content> i, _film->content()) {
- /* This DCP has been examined and loaded */
-
shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(i);
- DCPOMATIC_ASSERT (dcp);
- if (dcp->needs_kdm()) {
+ if (dcp && dcp->needs_kdm()) {
optional<dcp::EncryptedKDM> kdm;
#ifdef DCPOMATIC_VARIANT_SWAROOP
kdm = get_kdm_from_url (dcp);
}
}
- BOOST_FOREACH (shared_ptr<TextContent> j, dcp->text) {
+ BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
j->set_use (true);
}
- if (dcp->video) {
- Ratio const * r = Ratio::nearest_from_ratio(dcp->video->size().ratio());
+ if (i->video) {
+ Ratio const * r = Ratio::nearest_from_ratio(i->video->size().ratio());
if (r->id() == "239") {
/* Any scope content means we use scope */
_film->set_container(r);
}
/* Any 3D content means we use 3D mode */
- if (dcp->three_d()) {
+ if (i->video && i->video->frame_type() != VIDEO_FRAME_TYPE_2D) {
_film->set_three_d (true);
}
}
if (_film->content().size() == 1) {
/* Offer a CPL menu */
shared_ptr<DCPContent> first = dynamic_pointer_cast<DCPContent>(_film->content().front());
- DCPOMATIC_ASSERT (first);
- DCPExaminer ex (first);
- int id = ID_view_cpl;
- BOOST_FOREACH (shared_ptr<dcp::CPL> i, ex.cpls()) {
- wxMenuItem* j = _cpl_menu->AppendRadioItem(
- id,
- wxString::Format("%s (%s)", std_to_wx(i->annotation_text()).data(), std_to_wx(i->id()).data())
- );
- j->Check(!first->cpl() || i->id() == *first->cpl());
- ++id;
+ if (first) {
+ DCPExaminer ex (first);
+ int id = ID_view_cpl;
+ BOOST_FOREACH (shared_ptr<dcp::CPL> i, ex.cpls()) {
+ wxMenuItem* j = _cpl_menu->AppendRadioItem(
+ id,
+ wxString::Format("%s (%s)", std_to_wx(i->annotation_text()).data(), std_to_wx(i->id()).data())
+ );
+ j->Check(!first->cpl() || i->id() == *first->cpl());
+ ++id;
+ }
}
}
}
#include "lib/dcp_content.h"
#include "lib/job.h"
#include "lib/examine_content_job.h"
+#include "lib/content_factory.h"
#include "lib/cross.h"
#include <dcp/dcp.h>
#include <dcp/cpl.h>
film_changed ();
setup_sensitivity ();
- update_dcp_directory ();
+ update_content_directory ();
JobManager::instance()->ActiveJobsChanged.connect (
bind (&Controls::active_jobs_changed, this, _2)
Controls::config_changed (int property)
{
if (property == Config::PLAYER_CONTENT_DIRECTORY) {
- update_dcp_directory ();
+ update_content_directory ();
} else {
setup_sensitivity ();
}
{
_content_view->Show (s);
if (s) {
- update_dcp_directory ();
+ update_content_directory ();
}
_spl_view->Show (s);
_log->Show (s);
}
void
-Controls::update_dcp_directory ()
+Controls::update_content_directory ()
{
if (!_content_view->IsShown()) {
return;
return;
}
- wxProgressDialog progress (_("DCP-o-matic"), _("Reading DCP directory"));
+ wxProgressDialog progress (_("DCP-o-matic"), _("Reading content directory"));
JobManager* jm = JobManager::instance ();
for (directory_iterator i = directory_iterator(*dir); i != directory_iterator(); ++i) {
try {
+ shared_ptr<Content> content;
if (is_directory(*i) && (is_regular_file(*i / "ASSETMAP") || is_regular_file(*i / "ASSETMAP.xml"))) {
- shared_ptr<DCPContent> content (new DCPContent(_film, *i));
+ content.reset (new DCPContent(_film, *i));
+ } else if (i->path().extension() == ".mp4") {
+ content = content_factory(_film, *i).front();
+ }
+
+ if (content) {
jm->add (shared_ptr<Job>(new ExamineContentJob(_film, content)));
while (jm->work_to_do()) {
if (!progress.Pulse()) {
void started ();
void stopped ();
void film_changed ();
- void update_dcp_directory ();
- void dcp_directory_changed ();
+ void update_content_directory ();
void config_changed (int property);
typedef std::pair<boost::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;