From: Carl Hetherington <cth@carlh.net>
Date: Sun, 7 Sep 2014 22:36:40 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~625
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=5dc2dbdb6639f8d617a40209ad603d2a38f9df2a

Merge master.
---

5dc2dbdb6639f8d617a40209ad603d2a38f9df2a
diff --cc src/lib/config.cc
index 1f5a25ae4,878fedaa4..114fc5c27
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@@ -64,10 -61,10 +64,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_scale (VideoContentScale (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 9a1808682,0639382a0..99b3eb621
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@@ -28,11 -28,10 +28,12 @@@
  #include <boost/shared_ptr.hpp>
  #include <boost/signals2.hpp>
  #include <boost/filesystem.hpp>
 +#include <dcp/metadata.h>
 +#include <dcp/certificates.h>
 +#include <dcp/signer.h>
  #include "isdcf_metadata.h"
  #include "colour_conversion.h"
 -#include "server.h"
+ #include "video_content.h"
  
  class ServerDescription;
  class Scaler;