Merge master into direct-mxf.

diff --cc src/lib/config.cc
Simple merge

diff --cc src/lib/config.h
index c41437efbe290f6aacad37ec5387fd21dc4d99db,98cbf67e576b3da04bdb648496ce154bc1d81177..fed297ad00f91018029f3b51b214bbf3b46c3bfd
--- 1/src/lib/config.h
--- 2/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 f6eb032fd7e7b0c4f98df7ea969d4140ec72b32c,f5522b74a1add591d2829cc2e00b4c0e5176d09a..bdc4cca734d7075fc58bfaa52b46c2046f368bdd
--- 1/src/lib/film.cc
--- 2/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/lib/film.h
Simple merge

diff --cc src/lib/format.cc
Simple merge

diff --cc src/lib/subtitle.cc
Simple merge

diff --cc src/lib/wscript
Simple merge

diff --cc src/wx/film_editor.cc
index 4e99bcd960da73a6ce9fe99b40c065ab7c98baf4,f058afa54d21463f955a35e510bbbfd505735a50..f274416fb6225cfa4b3f42fd93b8b06b7e8c1d29
--- 1/src/wx/film_editor.cc
--- 2/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);

diff --cc src/wx/film_editor.h
Simple merge

diff --cc src/wx/film_viewer.cc
Simple merge