#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
film->set_j2k_bandwidth (*cc.j2k_bandwidth);
}
+ int channels = 6;
+ for (auto cli_content: cc.content) {
+ if (cli_content.channel) {
+ channels = std::max(channels, static_cast<int>(*cli_content.channel) + 1);
+ }
+ }
+ if (channels % 1) {
+ ++channels;
+ }
+
+ film->set_audio_channels(channels);
+
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"))) {
auto dcp = make_shared<DCPContent>(can);
film_content_list.push_back (dcp);
- dcp->add_kdm (dcp::EncryptedKDM(dcp::file_to_string(*cli_content.kdm)));
+ if (cli_content.kdm) {
+ dcp->add_kdm (dcp::EncryptedKDM(dcp::file_to_string(*cli_content.kdm)));
+ }
+ if (cli_content.cpl) {
+ dcp->set_cpl(*cli_content.cpl);
+ }
} else {
/* I guess it's not a DCP */
film_content_list = content_factory (can);
if (jm->errors ()) {
for (auto i: jm->get()) {
if (i->finished_in_error()) {
- cerr << i->error_summary() << "\n"
- << i->error_details() << "\n";
+ cerr << i->error_summary() << "\n";
+ if (!i->error_details().empty()) {
+ cout << i->error_details() << "\n";
+ }
}
}
exit (EXIT_FAILURE);