std::shared_ptr

[dcpomatic.git] / src / tools / dcpomatic_create.cc

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index f1df658c3626b6cf4406b755a5786dafc4a5572b..568dfa56c74c130e1c58c544b6c0ce47863ae764 100644 (file)
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -50,8 +50,8 @@ using std::cout;
 using std::cerr;
 using std::list;
 using std::exception;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 
 class SimpleSignalManager : public SignalManager
@@ -76,7 +76,7 @@ main (int argc, char* argv[])
        }
 
        if (cc.version) {
-               cerr << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
+               cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
                exit (EXIT_SUCCESS);
        }
 
@@ -96,14 +96,17 @@ main (int argc, char* argv[])
                }
                film->set_name (cc.name);
 
-               film->set_container (cc.container_ratio);
+               if (cc.container_ratio) {
+                       film->set_container (cc.container_ratio);
+               }
                film->set_dcp_content_type (cc.dcp_content_type);
                film->set_interop (cc.standard == dcp::INTEROP);
                film->set_use_isdcf_name (!cc.no_use_isdcf_name);
-               film->set_signed (!cc.no_sign);
                film->set_encrypted (cc.encrypt);
                film->set_three_d (cc.threed);
-               film->set_resolution (cc.fourk ? RESOLUTION_4K : RESOLUTION_2K);
+               if (cc.fourk) {
+                       film->set_resolution (RESOLUTION_4K);
+               }
                if (cc.j2k_bandwidth) {
                        film->set_j2k_bandwidth (*cc.j2k_bandwidth);
                }
@@ -124,14 +127,13 @@ main (int argc, char* argv[])
                        }
 
                        while (jm->work_to_do ()) {
-                               dcpomatic_sleep (1);
+                               dcpomatic_sleep_seconds (1);
                        }
 
                        while (signal_manager->ui_idle() > 0) {}
 
                        BOOST_FOREACH (shared_ptr<Content> j, content) {
                                if (j->video) {
-                                       j->video->set_scale (VideoContentScale(cc.content_ratio));
                                        j->video->set_frame_type (i.frame_type);
                                }
                        }