X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcreate_cli.h;h=782aaf97478d10e01063c0373229657af1fd0583;hb=37b29fdf9028e6848470a19d189697fc58278990;hp=9cd7905368a7bdb66092af9470845a6c8372da7a;hpb=5f206d32ff60148ab72b35d5823f56bdbb7f50bf;p=dcpomatic.git

diff --git a/src/lib/create_cli.h b/src/lib/create_cli.h
index 9cd790536..782aaf974 100644
--- a/src/lib/create_cli.h
+++ b/src/lib/create_cli.h
@@ -19,7 +19,7 @@
 */
 
 
-#include "types.h"
+#include "video_frame_type.h"
 #include <dcp/types.h>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
@@ -27,8 +27,11 @@
 
 
 class DCPContentType;
+class Film;
 class Ratio;
 
+struct create_cli_test;
+
 
 class CreateCLI
 {
@@ -39,26 +42,37 @@ public:
 		boost::filesystem::path path;
 		VideoFrameType frame_type;
 		boost::optional<dcp::Channel> channel;
+		boost::optional<float> gain;
+		boost::optional<boost::filesystem::path> kdm;
+		boost::optional<std::string> cpl;
 	};
 
 	bool version;
-	std::string name;
-	boost::optional<std::string> template_name;
-	bool encrypt;
-	bool threed;
-	DCPContentType const * dcp_content_type;
 	boost::optional<int> dcp_frame_rate;
-	Ratio const * container_ratio;
-	int still_length;
-	dcp::Standard standard;
-	bool no_use_isdcf_name;
+	boost::optional<int> still_length;
 	boost::optional<boost::filesystem::path> config_dir;
 	boost::optional<boost::filesystem::path> output_dir;
 	boost::optional<std::string> error;
 	std::vector<Content> content;
-	bool fourk;
-	boost::optional<int> j2k_bandwidth;
+
+	std::shared_ptr<Film> make_film() const;
 
 private:
+	friend struct ::create_cli_test;
+
+	boost::optional<std::string> _template_name;
+	std::string _name;
+	Ratio const* _container_ratio = nullptr;
+	bool _no_encrypt = false;
+	bool _encrypt = false;
+	bool _twod = false;
+	bool _threed = false;
+	DCPContentType const* _dcp_content_type = nullptr;
+	boost::optional<dcp::Standard> _standard;
+	bool _no_use_isdcf_name = false;
+	bool _twok = false;
+	bool _fourk = false;
+	boost::optional<int> _j2k_bandwidth;
+
 	static std::string _help;
 };