From: Carl Hetherington <cth@carlh.net>
Date: Tue, 4 Dec 2012 19:51:03 +0000 (+0000)
Subject: Merge master.
X-Git-Tag: v2.0.48~1509
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=288e7e64e9be84b8dbe11f5acb490e64a29d9378

Merge master.
---

288e7e64e9be84b8dbe11f5acb490e64a29d9378
diff --cc ChangeLog
index 7d73e186f,0b5a52b51..f507f90eb
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,15 +1,28 @@@
 +2012-11-15  Carl Hetherington  <cth@carlh.net>
 +
 +	* Default to using a DCI name.
 +
 +	* Support for using external sound files instead
 +	of the ones in the video source.
 +
 +2012-11-14  Carl Hetherington  <cth@carlh.net>
 +
 +	* Rearrange the GUI a bit to tidy things up.
 +
 +	* Some internal reorganisation.
 +
+ 2012-12-03  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 0.58 released.
+ 
+ 2012-12-03  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* DVD-o-matic and its dependencies rebuilt with
+ 	a newer mingw toolchain and with -O2 rather than
+ 	-O3 to (hopefully) improve reliability on Windows.
+ 
+ 	* Fixed problems with 7.1 audio.
+ 
  2012-11-10  Carl Hetherington  <cth@carlh.net>
  
  	* Version 0.57 released.
diff --cc src/lib/encoder.h
index 68a5f6139,20ec8fb16..b12bd0d48
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@@ -55,9 -53,10 +55,10 @@@ class Encoder : public VideoSink, publi
  {
  public:
  	Encoder (boost::shared_ptr<const Film> f, boost::shared_ptr<const Options> o);
+ 	virtual ~Encoder () {}
  
  	/** Called to indicate that a processing run is about to begin */
 -	virtual void process_begin (int64_t audio_channel_layout) = 0;
 +	virtual void process_begin () {}
  
  	/** Call with a frame of video.
  	 *  @param i Video frame image.
diff --cc src/lib/util.cc
index bb33eb431,6179eedac..b69581eba
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@@ -281,20 -236,8 +237,12 @@@ dvdomatic_setup (
  	SoundProcessor::setup_sound_processors ();
  
  	ui_thread = this_thread::get_id ();
- 
- #ifdef DVDOMATIC_POSIX	
- 	struct sigaction sa;
- 	sa.sa_flags = SA_SIGINFO;
- 	sigemptyset (&sa.sa_mask);
- 	sa.sa_sigaction = sigchld_handler;
- 	sigaction (SIGCHLD, &sa, 0);
- #endif	
  }
  
 +/** @param start Start position for the crop within the image.
 + *  @param size Size of the cropped area.
 + *  @return FFmpeg crop filter string.
 + */
  string
  crop_string (Position start, Size size)
  {
diff --cc src/lib/wscript
index 942975b32,2d31e09a2..0d3c7d99d
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@@ -41,10 -36,8 +41,9 @@@ def build(bld)
  		 log.cc
  		 lut.cc
  		 make_dcp_job.cc
 +                 matcher.cc
                   scp_dcp_job.cc
  		 scaler.cc
-                  screen.cc
  		 server.cc
                   sound_processor.cc
                   stream.cc
@@@ -55,11 -49,6 +54,8 @@@
                   ui_signaller.cc
  		 util.cc
  		 version.cc
 +                 video_decoder.cc
 +                 video_source.cc
  		 """
  
-     if not bld.env.DISABLE_PLAYER:
-         obj.source += " player.cc player_manager.cc"
- 
      obj.target = 'dvdomatic'
diff --cc src/wx/film_editor.cc
index f2831d75a,67cd17d4a..396958719
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@@ -35,10 -34,7 +35,9 @@@
  #include "lib/ab_transcode_job.h"
  #include "lib/job_manager.h"
  #include "lib/filter.h"
- #include "lib/screen.h"
  #include "lib/config.h"
 +#include "lib/ffmpeg_decoder.h"
 +#include "lib/external_audio_decoder.h"
  #include "filter_dialog.h"
  #include "wx_util.h"
  #include "film_editor.h"
diff --cc wscript
index 3b43f3aec,8e3f75d09..de92c182a
--- a/wscript
+++ b/wscript
@@@ -60,9 -54,10 +54,9 @@@ def configure(conf)
      conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = False)
      conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True)
      conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True)
-     conf.check_cfg(package = 'libdcp', atleast_version = '0.24', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
+     conf.check_cfg(package = 'libdcp', atleast_version = '0.32', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
      conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True)
      conf.check_cfg(package = '', path = 'Magick++-config', args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True)
 -    conf.check_cc(msg = 'Checking for library libtiff', function_name = 'TIFFOpen', header_name = 'tiffio.h', lib = 'tiff', uselib_store = 'TIFF')
      conf.check_cc(fragment  = """
      			      #include <stdio.h>\n
  			      #include <openjpeg.h>\n