Cleanup: make some variables private.

2 files changed, 16 insertions, 19 deletions

diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc
index 03a199258..0ad728faf 100644
--- a/src/lib/create_cli.cc
+++ b/src/lib/create_cli.cc
@@ -124,14 +124,6 @@ argument_option (
 
 CreateCLI::CreateCLI (int argc, char* argv[])
 	: version (false)
-	, encrypt (false)
-	, threed (false)
-	, dcp_content_type (nullptr)
-	, container_ratio (nullptr)
-	, standard (dcp::Standard::SMPTE)
-	, no_use_isdcf_name (false)
-	, twok (false)
-	, fourk (false)
 {
 	string dcp_content_type_string = "TST";
 	string container_ratio_string;
diff --git a/src/lib/create_cli.h b/src/lib/create_cli.h
index f6fe1860b..f88cdb8e4 100644
--- a/src/lib/create_cli.h
+++ b/src/lib/create_cli.h
@@ -30,6 +30,8 @@ class DCPContentType;
 class Film;
 class Ratio;
 
+struct create_cli_test;
+
 
 class CreateCLI
 {
@@ -46,26 +48,29 @@ public:
 	};
 
 	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;
 	boost::optional<int> still_length;
-	dcp::Standard standard;
-	bool no_use_isdcf_name;
 	boost::optional<boost::filesystem::path> config_dir;
 	boost::optional<boost::filesystem::path> output_dir;
 	boost::optional<std::string> error;
 	std::vector<Content> content;
-	bool twok;
-	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 encrypt = false;
+	bool threed = false;
+	DCPContentType const * dcp_content_type = nullptr;
+	dcp::Standard standard = dcp::Standard::SMPTE;
+	bool no_use_isdcf_name = false;
+	bool twok = false;
+	bool fourk = false;
+	boost::optional<int> j2k_bandwidth;
+
 	static std::string _help;
 };