Partial attempt at cleanup of naming straight vs DCI.

6 files changed, 31 insertions, 27 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 541d96f1e..ce83b1324 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -467,8 +467,7 @@ Film::signal_changed (Property p)
 void
 Film::make_dcp (bool transcode, int freq)
 {
-	string const t = name ();
-	if (t.find ("/") != string::npos) {
+	if (dcp_name().find ("/") != string::npos) {
 		throw BadSettingError ("name", "cannot contain slashes");
 	}
 	
@@ -692,13 +691,6 @@ Film::thumb_subtitle (int n) const
 }
 
 void
-Film::set_dci_name_prefix (string v)
-{
-	_state.dci_name_prefix = v;
-	signal_changed (DCI_METADATA);
-}
-
-void
 Film::set_audio_language (string v)
 {
 	_state.audio_language = v;
diff --git a/src/lib/film.h b/src/lib/film.h
index 9eb39fd64..a1cf26bc6 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -71,6 +71,11 @@ public:
 		return _state.name;
 	}
 
+	/** @return name to give the DCP */
+	std::string dcp_name () const {
+		return _state.dcp_name ();
+	}
+
 	bool use_dci_name () const {
 		return _state.use_dci_name;
 	}
@@ -164,7 +169,6 @@ public:
 	void set_with_subtitles (bool);
 	void set_subtitle_offset (int);
 	void set_subtitle_scale (float);
-	void set_dci_name_prefix (std::string);
 	void set_audio_language (std::string);
 	void set_subtitle_language (std::string);
 	void set_territory (std::string);
@@ -207,10 +211,6 @@ public:
 		return _state.has_subtitles;
 	}
 
-	std::string dci_name_prefix () const {
-		return _state.dci_name_prefix;
-	}
-
 	std::string audio_language () const {
 		return _state.audio_language;
 	}
diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc
index 862d69d7d..e39e14da8 100644
--- a/src/lib/film_state.cc
+++ b/src/lib/film_state.cc
@@ -100,7 +100,6 @@ FilmState::write_metadata (ofstream& f) const
 	f << "audio_sample_format " << audio_sample_format_to_string (audio_sample_format) << "\n";
 	f << "content_digest " << content_digest << "\n";
 	f << "has_subtitles " << has_subtitles << "\n";
-	f << "dci_name_prefix " << dci_name_prefix << "\n";
 	f << "audio_language " << audio_language << "\n";
 	f << "subtitle_language " << subtitle_language << "\n";
 	f << "territory " << territory << "\n";
@@ -189,8 +188,6 @@ FilmState::read_metadata (string k, string v)
 		content_digest = v;
 	} else if (k == "has_subtitles") {
 		has_subtitles = (v == "1");
-	} else if (k == "dci_name_prefix") {
-		dci_name_prefix = v;
 	} else if (k == "audio_language") {
 		audio_language = v;
 	} else if (k == "subtitle_language") {
@@ -362,7 +359,8 @@ string
 FilmState::dci_name () const
 {
 	stringstream d;
-	d << dci_name_prefix << "_";
+
+	d << name << "_";
 
 	if (dcp_content_type) {
 		d << dcp_content_type->dci_name() << "_";
@@ -419,3 +417,16 @@ FilmState::dci_name () const
 
 	return d.str ();
 }
+
+/** @return name to give the DCP */
+string
+FilmState::dcp_name () const
+{
+	if (use_dci_name) {
+		return dci_name ();
+	}
+
+	return name;
+}
+
+	       
diff --git a/src/lib/film_state.h b/src/lib/film_state.h
index 83ae2c594..01bcdfd5c 100644
--- a/src/lib/film_state.h
+++ b/src/lib/film_state.h
@@ -95,6 +95,8 @@ public:
 	int dcp_length () const;
 	std::string dci_name () const;
 
+	std::string dcp_name () const;
+
 	/** Complete path to directory containing the film metadata;
 	    must not be relative.
 	*/
@@ -141,7 +143,6 @@ public:
 	float subtitle_scale;
 
 	/* DCI naming stuff */
-	std::string dci_name_prefix;
 	std::string audio_language;
 	std::string subtitle_language;
 	std::string territory;
diff --git a/src/lib/make_dcp_job.cc b/src/lib/make_dcp_job.cc
index b42a38429..efd35ba44 100644
--- a/src/lib/make_dcp_job.cc
+++ b/src/lib/make_dcp_job.cc
@@ -70,7 +70,7 @@ MakeDCPJob::wav_path (libdcp::Channel c) const
 void
 MakeDCPJob::run ()
 {
-	string const dcp_path = _fs->dir (_fs->name);
+	string const dcp_path = _fs->dir (_fs->dcp_name());
 
 	/* Remove any old DCP */
 	filesystem::remove_all (dcp_path);
@@ -85,17 +85,17 @@ MakeDCPJob::run ()
 		break;
 	}
 	
-	libdcp::DCP dcp (_fs->dir (_fs->name));
+	libdcp::DCP dcp (_fs->dir (_fs->dcp_name()));
 	dcp.Progress.connect (sigc::mem_fun (*this, &MakeDCPJob::dcp_progress));
 
-	shared_ptr<libdcp::CPL> cpl (new libdcp::CPL (_fs->dir (_fs->name), _fs->name, _fs->dcp_content_type->libdcp_kind (), frames, rint (_fs->frames_per_second)));
+	shared_ptr<libdcp::CPL> cpl (new libdcp::CPL (_fs->dir (_fs->dcp_name()), _fs->dcp_name(), _fs->dcp_content_type->libdcp_kind (), frames, rint (_fs->frames_per_second)));
 	dcp.add_cpl (cpl);
 
 	descend (0.9);
 	shared_ptr<libdcp::MonoPictureAsset> pa (
 		new libdcp::MonoPictureAsset (
 			sigc::mem_fun (*this, &MakeDCPJob::j2c_path),
-			_fs->dir (_fs->name),
+			_fs->dir (_fs->dcp_name()),
 			"video.mxf",
 			&dcp.Progress,
 			rint (_fs->frames_per_second),
@@ -114,7 +114,7 @@ MakeDCPJob::run ()
 		sa.reset (
 			new libdcp::SoundAsset (
 				sigc::mem_fun (*this, &MakeDCPJob::wav_path),
-				_fs->dir (_fs->name),
+				_fs->dir (_fs->dcp_name()),
 				"audio.mxf",
 				&dcp.Progress,
 				rint (_fs->frames_per_second),
diff --git a/src/lib/scp_dcp_job.cc b/src/lib/scp_dcp_job.cc
index 90122cea7..300a8fe33 100644
--- a/src/lib/scp_dcp_job.cc
+++ b/src/lib/scp_dcp_job.cc
@@ -140,12 +140,12 @@ SCPDCPJob::run ()
 		throw NetworkError (String::compose ("Could not start SCP session (%1)", ssh_get_error (ss.session)));
 	}
 	
-	r = ssh_scp_push_directory (sc.scp, _fs->name.c_str(), S_IRWXU);
+	r = ssh_scp_push_directory (sc.scp, _fs->dcp_name().c_str(), S_IRWXU);
 	if (r != SSH_OK) {
-		throw NetworkError (String::compose ("Could not create remote directory %1 (%2)", _fs->name, ssh_get_error (ss.session)));
+		throw NetworkError (String::compose ("Could not create remote directory %1 (%2)", _fs->dcp_name(), ssh_get_error (ss.session)));
 	}
 	
-	string const dcp_dir = _fs->dir (_fs->name);
+	string const dcp_dir = _fs->dir (_fs->dcp_name());
 	
 	boost::uintmax_t bytes_to_transfer = 0;
 	for (filesystem::directory_iterator i = filesystem::directory_iterator (dcp_dir); i != filesystem::directory_iterator(); ++i) {