X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcreate_cli.cc;h=819f17f6ea87b43966be130c851388e71354e350;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=b670282b4717a0bfcbc3988b391a55cd1f5d1bcb;hpb=4edc14c8b1410e24f68b510cc14409b96c0338a3;p=dcpomatic.git diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc index b670282b4..819f17f6e 100644 --- a/src/lib/create_cli.cc +++ b/src/lib/create_cli.cc @@ -79,9 +79,8 @@ CreateCLI::CreateCLI (int argc, char* argv[]) , dcp_content_type (0) , container_ratio (0) , still_length (10) - , standard (dcp::SMPTE) + , standard (dcp::Standard::SMPTE) , no_use_isdcf_name (false) - , no_sign (false) , fourk (false) { string dcp_content_type_string = "TST"; @@ -92,7 +91,7 @@ CreateCLI::CreateCLI (int argc, char* argv[]) string config_dir_string; string output_dir_string; int j2k_bandwidth_int = 0; - VideoFrameType next_frame_type = VIDEO_FRAME_TYPE_2D; + auto next_frame_type = VideoFrameType::TWO_D; int i = 1; while (i < argc) { @@ -113,15 +112,13 @@ CreateCLI::CreateCLI (int argc, char* argv[]) encrypt = claimed = true; } else if (a == "--no-use-isdcf-name") { no_use_isdcf_name = claimed = true; - } else if (a == "--no-sign") { - no_sign = claimed = true; } else if (a == "--threed") { threed = claimed = true; } else if (a == "--left-eye") { - next_frame_type = VIDEO_FRAME_TYPE_3D_LEFT; + next_frame_type = VideoFrameType::THREE_D_LEFT; claimed = true; } else if (a == "--right-eye") { - next_frame_type = VIDEO_FRAME_TYPE_3D_RIGHT; + next_frame_type = VideoFrameType::THREE_D_RIGHT; claimed = true; } else if (a == "--fourk") { fourk = true; @@ -148,7 +145,7 @@ CreateCLI::CreateCLI (int argc, char* argv[]) c.path = a; c.frame_type = next_frame_type; content.push_back (c); - next_frame_type = VIDEO_FRAME_TYPE_2D; + next_frame_type = VideoFrameType::TWO_D; } } @@ -194,6 +191,10 @@ CreateCLI::CreateCLI (int argc, char* argv[]) return; } + if (standard_string == "interop") { + standard = dcp::Standard::INTEROP; + } + if (content.empty()) { error = String::compose("%1: no content specified", argv[0]); return;