X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=f306006c9872e985d78209be9e3bc1705af0d9a6;hb=6de3f68aa2bec3f8a1c35a587f56fdee5e105ed3;hp=16b34110c932b5dbef96b03f7118f0ecda286309;hpb=39c36075c62ce4c148ce14de0ae7b29d8427be2b;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 16b34110c..f306006c9 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -94,7 +94,6 @@ Film::Film (string d)
 	, _container (Config::instance()->default_container ())
 	, _scaler (Scaler::from_id ("bicubic"))
 	, _with_subtitles (false)
-	, _colour_lut (0)
 	, _j2k_bandwidth (200000000)
 	, _dci_metadata (Config::instance()->default_dci_metadata ())
 	, _dcp_video_frame_rate (24)
@@ -140,7 +139,6 @@ Film::Film (Film const & o)
 	, _container         (o._container)
 	, _scaler            (o._scaler)
 	, _with_subtitles    (o._with_subtitles)
-	, _colour_lut        (o._colour_lut)
 	, _j2k_bandwidth     (o._j2k_bandwidth)
 	, _dci_metadata      (o._dci_metadata)
 	, _dcp_video_frame_rate (o._dcp_video_frame_rate)
@@ -151,18 +149,17 @@ Film::Film (Film const & o)
 }
 
 string
-Film::video_state_identifier () const
+Film::video_identifier () const
 {
 	assert (container ());
 	LocaleGuard lg;
 
 	stringstream s;
 	s << container()->id()
-	  << "_" << _playlist->video_digest()
+	  << "_" << _playlist->video_identifier()
 	  << "_" << _dcp_video_frame_rate
 	  << "_" << scaler()->id()
-	  << "_" << j2k_bandwidth()
-	  << "_" << lexical_cast<int> (colour_lut());
+	  << "_" << j2k_bandwidth();
 
 	return s.str ();
 }
@@ -173,7 +170,7 @@ Film::info_dir () const
 {
 	boost::filesystem::path p;
 	p /= "info";
-	p /= video_state_identifier ();
+	p /= video_identifier ();
 	return dir (p.string());
 }
 
@@ -186,7 +183,7 @@ Film::internal_video_mxf_dir () const
 string
 Film::internal_video_mxf_filename () const
 {
-	return video_state_identifier() + ".mxf";
+	return video_identifier() + ".mxf";
 }
 
 string
@@ -344,7 +341,6 @@ Film::write_metadata () const
 
 	root->add_child("Scaler")->add_child_text (_scaler->id ());
 	root->add_child("WithSubtitles")->add_child_text (_with_subtitles ? "1" : "0");
-	root->add_child("ColourLUT")->add_child_text (lexical_cast<string> (_colour_lut));
 	root->add_child("J2KBandwidth")->add_child_text (lexical_cast<string> (_j2k_bandwidth));
 	_dci_metadata.as_xml (root->add_child ("DCIMetadata"));
 	root->add_child("DCPVideoFrameRate")->add_child_text (lexical_cast<string> (_dcp_video_frame_rate));
@@ -389,7 +385,6 @@ Film::read_metadata ()
 
 	_scaler = Scaler::from_id (f.string_child ("Scaler"));
 	_with_subtitles = f.bool_child ("WithSubtitles");
-	_colour_lut = f.number_child<int> ("ColourLUT");
 	_j2k_bandwidth = f.number_child<int> ("J2KBandwidth");
 	_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
 	_dcp_video_frame_rate = f.number_child<int> ("DCPVideoFrameRate");
@@ -585,16 +580,6 @@ Film::set_with_subtitles (bool w)
 	signal_changed (WITH_SUBTITLES);
 }
 
-void
-Film::set_colour_lut (int i)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_colour_lut = i;
-	}
-	signal_changed (COLOUR_LUT);
-}
-
 void
 Film::set_j2k_bandwidth (int b)
 {
@@ -685,7 +670,7 @@ Film::j2c_path (int f, bool t) const
 {
 	boost::filesystem::path p;
 	p /= "j2c";
-	p /= video_state_identifier ();
+	p /= video_identifier ();
 
 	stringstream s;
 	s.width (8);