From: Carl Hetherington <cth@carlh.net>
Date: Sat, 26 Jan 2013 22:51:54 +0000 (+0000)
Subject: Merge master into direct-mxf.
X-Git-Tag: v2.0.48~1337^2~722
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=b1873c51b2e8265a01a8f0eced7fc3465f1677dc

Merge master into direct-mxf.
---

b1873c51b2e8265a01a8f0eced7fc3465f1677dc
diff --cc src/lib/config.h
index c41437efb,98cbf67e5..fed297ad0
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@@ -94,10 -95,10 +95,14 @@@ public
  		return _sound_processor;
  	}
  
 +	std::list<int> allowed_dcp_frame_rates () const {
 +		return _allowed_dcp_frame_rates;
 +	}
 +	
+ 	DCIMetadata default_dci_metadata () const {
+ 		return _default_dci_metadata;
+ 	}
+ 
  	/** @param n New number of local encoding threads */
  	void set_num_local_encoding_threads (int n) {
  		_num_local_encoding_threads = n;
@@@ -145,10 -146,10 +150,14 @@@
  		_tms_password = p;
  	}
  
 +	void set_allowed_dcp_frame_rates (std::list<int> const & r) {
 +		_allowed_dcp_frame_rates = r;
 +	}
 +
+ 	void set_default_dci_metadata (DCIMetadata d) {
+ 		_default_dci_metadata = d;
+ 	}
+ 	
  	void write () const;
  
  	static Config* instance ();
@@@ -180,7 -181,8 +189,9 @@@ private
  	std::string _tms_password;
  	/** Our sound processor */
  	SoundProcessor const * _sound_processor;
 +	std::list<int> _allowed_dcp_frame_rates;
+ 	/** Default DCI metadata for newly-created Films */
+ 	DCIMetadata _default_dci_metadata;
  
  	/** Singleton instance, or 0 */
  	static Config* _instance;
diff --cc src/lib/film.cc
index f6eb032fd,f5522b74a..bdc4cca73
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@@ -169,16 -171,9 +170,10 @@@ Film::Film (Film const & o
  	, _subtitle_scale    (o._subtitle_scale)
  	, _colour_lut        (o._colour_lut)
  	, _j2k_bandwidth     (o._j2k_bandwidth)
- 	, _audio_language    (o._audio_language)
- 	, _subtitle_language (o._subtitle_language)
- 	, _territory         (o._territory)
- 	, _rating            (o._rating)
- 	, _studio            (o._studio)
- 	, _facility          (o._facility)
- 	, _package_type      (o._package_type)
+ 	, _dci_metadata      (o._dci_metadata)
  	, _size              (o._size)
  	, _length            (o._length)
 +	, _dcp_intrinsic_duration (o._dcp_intrinsic_duration)
  	, _content_digest    (o._content_digest)
  	, _content_audio_streams (o._content_audio_streams)
  	, _external_audio_stream (o._external_audio_stream)
diff --cc src/wx/film_editor.cc
index 4e99bcd96,f058afa54..f274416fb
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@@ -185,12 -185,12 +185,12 @@@ FilmEditor::connect_to_widgets (
  	_top_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::top_crop_changed), 0, this);
  	_bottom_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::bottom_crop_changed), 0, this);
  	_filters_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::edit_filters_clicked), 0, this);
- 	_scaler->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::scaler_changed), 0, this);
- 	_dcp_content_type->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this);
+ 	_scaler->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::scaler_changed), 0, this);
+ 	_dcp_content_type->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_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);
  	_with_subtitles->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this);
  	_subtitle_offset->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_offset_changed), 0, this);
  	_subtitle_scale->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_scale_changed), 0, this);