From: Carl Hetherington <cth@carlh.net>
Date: Wed, 16 Jul 2014 16:02:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 1.0
X-Git-Tag: v2.0.48~716
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=1f82930e73679d6aec5223caa255f564339a1a2a

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

1f82930e73679d6aec5223caa255f564339a1a2a
diff --cc ChangeLog
index 5265423fc,e225fb565..a15a44fe2
--- a/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 71431ec0d,0588f01da..f2f25efe9
--- a/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 66ff66214,44936172c..03dd9c0fe
--- a/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 a2a4e6c6b,15e1ca791..a8590ce55
--- a/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 ();
  }