projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow specification of the CPL ID to use in a DCP with _create (#2302).
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_create.cc
diff --git
a/src/tools/dcpomatic_create.cc
b/src/tools/dcpomatic_create.cc
index e4452b19a431229beac4d9b08aca1303af67213c..62428b1a24484990e287d8f147f59e3e5d84b829 100644
(file)
--- a/
src/tools/dcpomatic_create.cc
+++ b/
src/tools/dcpomatic_create.cc
@@
-45,6
+45,7
@@
#include <stdexcept>
#include <string>
#include <stdexcept>
#include <string>
+
using std::cerr;
using std::cout;
using std::dynamic_pointer_cast;
using std::cerr;
using std::cout;
using std::dynamic_pointer_cast;
@@
-53,15
+54,17
@@
using std::list;
using std::make_shared;
using std::shared_ptr;
using std::string;
using std::make_shared;
using std::shared_ptr;
using std::string;
+using std::vector;
using boost::optional;
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().
*/
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
};
int
@@
-117,10
+120,17
@@
main (int argc, char* argv[])
for (auto cli_content: cc.content) {
auto const can = boost::filesystem::canonical (cli_content.path);
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"))) {
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);
+ 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);
} else {
/* I guess it's not a DCP */
film_content_list = content_factory (can);
@@
-169,8
+179,10
@@
main (int argc, char* argv[])
if (jm->errors ()) {
for (auto i: jm->get()) {
if (i->finished_in_error()) {
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);
}
}
exit (EXIT_FAILURE);