Merge remote-tracking branch 'origin/master' into 1.0

diff --cc ChangeLog
index 5265423fc06ef30e6e858a922562412046982c30,e225fb565697a99a1a453ed0e9a483af8f918a6b..a15a44fe2b47595196af0f9a5b1db90a7bc7c49a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,7 +1,21 @@@
 +2014-07-15  Carl Hetherington  <cth@carlh.net>
 +
 +      * A variety of changes were made on the 2.0 branch
 +      but not documented in the ChangeLog.  Most sigificantly:
 +
 +      - DCP import
 +      - Creation of DCPs with proper XML subtitles
 +      - Import of .srt and .xml subtitles
 +      - Audio processing framework (with some basic processors).
 +
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add subtitle view.
 +
  2014-07-16  Carl Hetherington  <cth@carlh.net>
  
+       * Add default scaling setting to preferences (#384).
+ 
        * Version 1.72.3 released.
  
  2014-07-16  Carl Hetherington  <cth@carlh.net>

diff --cc src/lib/config.cc
index 71431ec0db63e18b172b7693bfc95398f128091d,0588f01dabf59acfe6370985520c19e39e7a4ae6..f2f25efe90af3930b817c88f9f2291fbe40921db
--- 1/src/lib/config.cc
--- 2/src/lib/config.cc
+++ b/src/lib/config.cc
@@@ -60,9 -60,10 +60,10 @@@ Config::Config (
        , _server_port_base (6192)
        , _use_any_servers (true)
        , _tms_path (".")
 -      , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
 +      , _cinema_sound_processor (CinemaSoundProcessor::from_id (N_("dolby_cp750")))
        , _allow_any_dcp_frame_rate (false)
        , _default_still_length (10)
+       , _default_scale (Ratio::from_id ("185"))
        , _default_container (Ratio::from_id ("185"))
        , _default_dcp_content_type (DCPContentType::from_isdcf_name ("TST"))
        , _default_j2k_bandwidth (100000000)

diff --cc src/lib/config.h
index 66ff662142133b6e4258b49c745b93759430252f,44936172c3a821b6c8efa96b9acd15d0552d5b58..03dd9c0feb68ac050bd9f0efa5e59b3b295e3974
--- 1/src/lib/config.h
--- 2/src/lib/config.h
+++ b/src/lib/config.h
@@@ -411,9 -422,10 +420,10 @@@ private
        ISDCFMetadata _default_isdcf_metadata;
        boost::optional<std::string> _language;
        int _default_still_length;
+       Ratio const * _default_scale;
        Ratio const * _default_container;
        DCPContentType const * _default_dcp_content_type;
 -      libdcp::XMLMetadata _dcp_metadata;
 +      dcp::XMLMetadata _dcp_metadata;
        int _default_j2k_bandwidth;
        int _default_audio_delay;
        std::vector<PresetColourConversion> _colour_conversions;

diff --cc src/lib/video_content.cc
index a2a4e6c6b3b46c452290975d5eccb2952fbaab89,15e1ca7911982b9dc811de4481f7f386e9035688..a8590ce55b4a70f23c3d6ec7519e59f3f9ee5219
--- 1/src/lib/video_content.cc
--- 2/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@@ -61,19 -58,21 +61,19 @@@ vector<VideoContentScale> VideoContentS
  VideoContent::VideoContent (shared_ptr<const Film> f)
        : Content (f)
        , _video_length (0)
 -      , _original_video_frame_rate (0)
        , _video_frame_rate (0)
        , _video_frame_type (VIDEO_FRAME_TYPE_2D)
-       , _scale (Ratio::from_id ("185"))
+       , _scale (Config::instance()->default_scale ())
  {
        setup_default_colour_conversion ();
  }
  
 -VideoContent::VideoContent (shared_ptr<const Film> f, Time s, VideoContent::Frame len)
 +VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len)
        : Content (f, s)
        , _video_length (len)
 -      , _original_video_frame_rate (0)
        , _video_frame_rate (0)
        , _video_frame_type (VIDEO_FRAME_TYPE_2D)
-       , _scale (Ratio::from_id ("185"))
+       , _scale (Config::instance()->default_scale ())
  {
        setup_default_colour_conversion ();
  }
@@@ -81,9 -80,10 +81,9 @@@
  VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
        : Content (f, p)
        , _video_length (0)
 -      , _original_video_frame_rate (0)
        , _video_frame_rate (0)
        , _video_frame_type (VIDEO_FRAME_TYPE_2D)
-       , _scale (Ratio::from_id ("185"))
+       , _scale (Config::instance()->default_scale ())
  {
        setup_default_colour_conversion ();
  }

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