#include <stdexcept>
#include <string>
+
using std::cerr;
using std::cout;
using std::dynamic_pointer_cast;
using std::make_shared;
using std::shared_ptr;
using std::string;
+using std::vector;
using boost::optional;
+
class SimpleSignalManager : public SignalManager
{
public:
/* Do nothing in this method so that UI events happen in our thread
when we call SignalManager::ui_idle().
*/
- void wake_ui () {}
+ void wake_ui () override {}
};
int
for (auto cli_content: cc.content) {
auto const can = boost::filesystem::canonical (cli_content.path);
- list<shared_ptr<Content>> film_content_list;
+ vector<shared_ptr<Content>> film_content_list;
if (boost::filesystem::exists (can / "ASSETMAP") || (boost::filesystem::exists (can / "ASSETMAP.xml"))) {
- film_content_list.push_back (make_shared<DCPContent>(can));
+ auto dcp = make_shared<DCPContent>(can);
+ film_content_list.push_back (dcp);
+ dcp->add_kdm (dcp::EncryptedKDM(dcp::file_to_string(*cli_content.kdm)));
} else {
/* I guess it's not a DCP */
film_content_list = content_factory (can);