dcp_trim -> trim

8 files changed, 60 insertions, 60 deletions

diff --git a/src/lib/check_hashes_job.cc b/src/lib/check_hashes_job.cc
index 2ad97c382..cf4e86b79 100644
--- a/src/lib/check_hashes_job.cc
+++ b/src/lib/check_hashes_job.cc
@@ -57,12 +57,12 @@ CheckHashesJob::run ()
 		throw EncodeError ("cannot check hashes of a DCP with unknown length");
 	}
 	
-	SourceFrame const N = _film->dcp_trim_start() + _film->dcp_length().get();
+	SourceFrame const N = _film->trim_start() + _film->dcp_length().get();
 	DCPFrameRate const dfr (_film->frames_per_second ());
 
 	int const inc = dfr.skip ? 2 : 1;
 	
-	for (SourceFrame i = _film->dcp_trim_start(); i < N; i += inc) {
+	for (SourceFrame i = _film->trim_start(); i < N; i += inc) {
 		string const j2k_file = _film->frame_out_path (i, false);
 		string const hash_file = _film->hash_out_path (i, false);
 
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 2934595ab..8fe03184d 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -73,7 +73,7 @@ using boost::ends_with;
 using boost::starts_with;
 using boost::optional;
 
-int const Film::state_version = 1;
+int const Film::state_version = 2;
 
 /** Construct a Film object in a given directory, reading any metadata
  *  file that exists in that directory.  An exception will be thrown if
@@ -89,8 +89,8 @@ Film::Film (string d, bool must_exist)
 	, _dcp_content_type (0)
 	, _format (0)
 	, _scaler (Scaler::from_id ("bicubic"))
-	, _dcp_trim_start (0)
-	, _dcp_trim_end (0)
+	, _trim_start (0)
+	, _trim_end (0)
 	, _dcp_ab (false)
 	, _use_content_audio (true)
 	, _audio_gain (0)
@@ -155,8 +155,8 @@ Film::Film (Film const & o)
 	, _crop              (o._crop)
 	, _filters           (o._filters)
 	, _scaler            (o._scaler)
-	, _dcp_trim_start    (o._dcp_trim_start)
-	, _dcp_trim_end      (o._dcp_trim_end)
+	, _trim_start        (o._trim_start)
+	, _trim_end          (o._trim_end)
 	, _reel_size         (o._reel_size)
 	, _dcp_ab            (o._dcp_ab)
 	, _content_audio_stream (o._content_audio_stream)
@@ -388,8 +388,8 @@ Film::write_metadata () const
 		f << "filter " << (*i)->id () << "\n";
 	}
 	f << "scaler " << _scaler->id () << "\n";
-	f << "dcp_trim_start " << _dcp_trim_start << "\n";
-	f << "dcp_trim_end " << _dcp_trim_end << "\n";
+	f << "trim_start " << _trim_start << "\n";
+	f << "trim_end " << _trim_end << "\n";
 	if (_reel_size) {
 		f << "reel_size " << _reel_size.get() << "\n";
 	}
@@ -503,10 +503,10 @@ Film::read_metadata ()
 			_filters.push_back (Filter::from_id (v));
 		} else if (k == "scaler") {
 			_scaler = Scaler::from_id (v);
-		} else if (k == "dcp_trim_start") {
-			_dcp_trim_start = atoi (v.c_str ());
-		} else if (k == "dcp_trim_end") {
-			_dcp_trim_end = atoi (v.c_str ());
+		} else if ( ((!version || version < 2) && k == "trim_start") || k == "trim_start") {
+			_trim_start = atoi (v.c_str ());
+		} else if ( ((!version || version < 2) && k == "trim_end") || k == "trim_end") {
+			_trim_end = atoi (v.c_str ());
 		} else if (k == "reel_size") {
 			_reel_size = boost::lexical_cast<uint64_t> (v);
 		} else if (k == "dcp_ab") {
@@ -706,7 +706,7 @@ Film::dcp_length () const
 		return boost::optional<int> ();
 	}
 
-	return length().get() - dcp_trim_start() - dcp_trim_end();
+	return length().get() - trim_start() - trim_end();
 }
 
 /** @return a DCI-compliant name for a DCP of this film */
@@ -1053,23 +1053,23 @@ Film::set_scaler (Scaler const * s)
 }
 
 void
-Film::set_dcp_trim_start (int t)
+Film::set_trim_start (int t)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_dcp_trim_start = t;
+		_trim_start = t;
 	}
-	signal_changed (DCP_TRIM_START);
+	signal_changed (TRIM_START);
 }
 
 void
-Film::set_dcp_trim_end (int t)
+Film::set_trim_end (int t)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_dcp_trim_end = t;
+		_trim_end = t;
 	}
-	signal_changed (DCP_TRIM_END);
+	signal_changed (TRIM_END);
 }
 
 void
@@ -1457,7 +1457,7 @@ Film::video_range () const
 		return boost::optional<pair<SourceFrame, SourceFrame> > ();
 	}
 	
-	return make_pair (dcp_trim_start(), dcp_trim_start() + dcp_length().get());
+	return make_pair (trim_start(), trim_start() + dcp_length().get());
 }
 
 boost::optional<pair<int64_t, int64_t> >
diff --git a/src/lib/film.h b/src/lib/film.h
index 6c27af3ab..4cecf663c 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -120,8 +120,8 @@ public:
 		CROP,
 		FILTERS,
 		SCALER,
-		DCP_TRIM_START,
-		DCP_TRIM_END,
+		TRIM_START,
+		TRIM_END,
 		REEL_SIZE,
 		DCP_AB,
 		CONTENT_AUDIO_STREAM,
@@ -197,14 +197,14 @@ public:
 		return _scaler;
 	}
 
-	SourceFrame dcp_trim_start () const {
+	SourceFrame trim_start () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
-		return _dcp_trim_start;
+		return _trim_start;
 	}
 
-	SourceFrame dcp_trim_end () const {
+	SourceFrame trim_end () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
-		return _dcp_trim_end;
+		return _trim_end;
 	}
 
 	boost::optional<uint64_t> reel_size () const {
@@ -365,8 +365,8 @@ public:
 	void set_bottom_crop (int);
 	void set_filters (std::vector<Filter const *>);
 	void set_scaler (Scaler const *);
-	void set_dcp_trim_start (int);
-	void set_dcp_trim_end (int);
+	void set_trim_start (int);
+	void set_trim_end (int);
 	void set_reel_size (uint64_t);
 	void unset_reel_size ();
 	void set_dcp_ab (bool);
@@ -448,9 +448,9 @@ private:
 	/** Scaler algorithm to use */
 	Scaler const * _scaler;
 	/** Frames to trim off the start of the DCP */
-	int _dcp_trim_start;
+	int _trim_start;
 	/** Frames to trim off the end of the DCP */
-	int _dcp_trim_end;
+	int _trim_end;
 	/** Approximate target reel size in bytes; if not set, use a single reel */
 	boost::optional<uint64_t> _reel_size;
 	/** true to create an A/B comparison DCP, where the left half of the image
diff --git a/src/lib/make_dcp_job.cc b/src/lib/make_dcp_job.cc
index efc2f05d5..fcb10069d 100644
--- a/src/lib/make_dcp_job.cc
+++ b/src/lib/make_dcp_job.cc
@@ -63,7 +63,7 @@ MakeDCPJob::j2c_path (int f, int offset) const
 {
 	DCPFrameRate dfr (_film->frames_per_second());
 	int const mult = dfr.skip ? 2 : 1;
-	SourceFrame const s = ((f + offset) * mult) + _film->dcp_trim_start();
+	SourceFrame const s = ((f + offset) * mult) + _film->trim_start();
 	return _film->frame_out_path (s, false);
 }
 
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 23a3d9fe8..c9792ed2e 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -120,6 +120,6 @@ TranscodeJob::remaining_time () const
 	}
 
 	/* We assume that dcp_length() is valid, if it is set */
-	SourceFrame const left = _film->dcp_trim_start() + _film->dcp_length().get() - _encoder->video_frame();
+	SourceFrame const left = _film->trim_start() + _film->dcp_length().get() - _encoder->video_frame();
 	return left / fps;
 }
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 17c40c83d..f83518b88 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -140,11 +140,11 @@ FilmEditor::make_film_panel ()
 		video_control (add_label_to_sizer (_film_sizer, _film_panel, "Trim frames"));
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 		video_control (add_label_to_sizer (s, _film_panel, "Start"));
-		_dcp_trim_start = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-		s->Add (video_control (_dcp_trim_start));
+		_trim_start = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+		s->Add (video_control (_trim_start));
 		video_control (add_label_to_sizer (s, _film_panel, "End"));
-		_dcp_trim_end = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-		s->Add (video_control (_dcp_trim_end));
+		_trim_end = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+		s->Add (video_control (_trim_end));
 
 		_film_sizer->Add (s);
 	}
@@ -202,8 +202,8 @@ FilmEditor::connect_to_widgets ()
 	_dcp_content_type->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this);
 	_dcp_ab->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::dcp_ab_toggled), 0, this);
 	_still_duration->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::still_duration_changed), 0, this);
-	_dcp_trim_start->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::dcp_trim_start_changed), 0, this);
-	_dcp_trim_end->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::dcp_trim_end_changed), 0, this);
+	_trim_start->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::trim_start_changed), 0, this);
+	_trim_end->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::trim_end_changed), 0, this);
 	_multiple_reels->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::multiple_reels_toggled), 0, this);
 	_reel_size->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::reel_size_changed), 0, this);
 	_with_subtitles->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this);
@@ -304,8 +304,8 @@ FilmEditor::make_video_panel ()
 	_right_crop->SetRange (0, 1024);
 	_bottom_crop->SetRange (0, 1024);
 	_still_duration->SetRange (1, 60 * 60);
-	_dcp_trim_start->SetRange (0, 100);
-	_dcp_trim_end->SetRange (0, 100);
+	_trim_start->SetRange (0, 100);
+	_trim_end->SetRange (0, 100);
 	_j2k_bandwidth->SetRange (50, 250);
 }
 
@@ -661,8 +661,8 @@ FilmEditor::film_changed (Film::Property p)
 		} 
 		_length->SetLabel (std_to_wx (s.str ()));
 		if (_film->length()) {
-			_dcp_trim_start->SetRange (0, _film->length().get());
-			_dcp_trim_end->SetRange (0, _film->length().get());
+			_trim_start->SetRange (0, _film->length().get());
+			_trim_end->SetRange (0, _film->length().get());
 		}
 		break;
 	case Film::DCP_CONTENT_TYPE:
@@ -675,11 +675,11 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::SCALER:
 		checked_set (_scaler, Scaler::as_index (_film->scaler ()));
 		break;
-	case Film::DCP_TRIM_START:
-		checked_set (_dcp_trim_start, _film->dcp_trim_start());
+	case Film::TRIM_START:
+		checked_set (_trim_start, _film->trim_start());
 		break;
-	case Film::DCP_TRIM_END:
-		checked_set (_dcp_trim_end, _film->dcp_trim_end());
+	case Film::TRIM_END:
+		checked_set (_trim_end, _film->trim_end());
 		break;
 	case Film::REEL_SIZE:
 		if (_film->reel_size()) {
@@ -811,8 +811,8 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::CROP);
 	film_changed (Film::FILTERS);
 	film_changed (Film::SCALER);
-	film_changed (Film::DCP_TRIM_START);
-	film_changed (Film::DCP_TRIM_END);
+	film_changed (Film::TRIM_START);
+	film_changed (Film::TRIM_END);
 	film_changed (Film::REEL_SIZE);
 	film_changed (Film::DCP_AB);
 	film_changed (Film::CONTENT_AUDIO_STREAM);
@@ -856,8 +856,8 @@ FilmEditor::set_things_sensitive (bool s)
 	_scaler->Enable (s);
 	_audio_stream->Enable (s);
 	_dcp_content_type->Enable (s);
-	_dcp_trim_start->Enable (s);
-	_dcp_trim_end->Enable (s);
+	_trim_start->Enable (s);
+	_trim_end->Enable (s);
 	_multiple_reels->Enable (s);
 	_reel_size->Enable (s);
 	_dcp_ab->Enable (s);
@@ -974,23 +974,23 @@ FilmEditor::still_duration_changed (wxCommandEvent &)
 }
 
 void
-FilmEditor::dcp_trim_start_changed (wxCommandEvent &)
+FilmEditor::trim_start_changed (wxCommandEvent &)
 {
 	if (!_film) {
 		return;
 	}
 
-	_film->set_dcp_trim_start (_dcp_trim_start->GetValue ());
+	_film->set_trim_start (_trim_start->GetValue ());
 }
 
 void
-FilmEditor::dcp_trim_end_changed (wxCommandEvent &)
+FilmEditor::trim_end_changed (wxCommandEvent &)
 {
 	if (!_film) {
 		return;
 	}
 
-	_film->set_dcp_trim_end (_dcp_trim_end->GetValue ());
+	_film->set_trim_end (_trim_end->GetValue ());
 }
 
 void
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 34e67eef1..323aead95 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -63,8 +63,8 @@ private:
 	void content_changed (wxCommandEvent &);
 	void trust_content_header_changed (wxCommandEvent &);
 	void format_changed (wxCommandEvent &);
-	void dcp_trim_start_changed (wxCommandEvent &);
-	void dcp_trim_end_changed (wxCommandEvent &);
+	void trim_start_changed (wxCommandEvent &);
+	void trim_end_changed (wxCommandEvent &);
 	void multiple_reels_toggled (wxCommandEvent &);
 	void reel_size_changed (wxCommandEvent &);
 	void dcp_content_type_changed (wxCommandEvent &);
@@ -168,8 +168,8 @@ private:
 	/** The Film's duration for still sources */
 	wxSpinCtrl* _still_duration;
 
-	wxSpinCtrl* _dcp_trim_start;
-	wxSpinCtrl* _dcp_trim_end;
+	wxSpinCtrl* _trim_start;
+	wxSpinCtrl* _trim_end;
 	wxCheckBox* _multiple_reels;
 	wxSpinCtrl* _reel_size;
 	/** Selector to generate an A/B comparison DCP */
diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index b03c6b32c..c34922ec4 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -93,7 +93,7 @@ PropertiesDialog::frames_already_encoded () const
 	
 	if (_film->dcp_length()) {
 		/* XXX: encoded_frames() should check which frames have been encoded */
-		u << " (" << ((_film->encoded_frames() - _film->dcp_trim_start()) * 100 / _film->dcp_length().get()) << "%)";
+		u << " (" << ((_film->encoded_frames() - _film->trim_start()) * 100 / _film->dcp_length().get()) << "%)";
 	}
 	return u.str ();
 }