Merge master.

diff --cc ChangeLog
index 7d73e186f894a577cc6ec9791f27727790c0bd2d,0b5a52b511f90df1c1da90946bf30b47d2bcd675..f507f90eb5ba6d910c1189072dec01feebb82c3f
--- 1/ChangeLog
--- 2/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 release
Simple merge

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

diff --cc src/lib/encoder.h
index 68a5f6139311ef81672dde9f7237fc77bfac23a4,20ec8fb162b04f04e0a0ef2496134bc7d9377520..b12bd0d48710291ce9e2ae8745137e8ac21bf817
--- 1/src/lib/encoder.h
--- 2/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/film.h
Simple merge

diff --cc src/lib/util.cc
index bb33eb431322fa931e50ef28623c6e30c4823bf5,6179eedaced5f04d7c1511c9c562044eebe01649..b69581eba56a1e8b282f75cff6ad02371d737aac
--- 1/src/lib/util.cc
--- 2/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 942975b32fd8006e2125b437fbebed9daaa61f0e,2d31e09a2382b499dfac9e5e9b2c28534e450083..0d3c7d99de937bce70e5a3239383a21f928c11cb
--- 1/src/lib/wscript
--- 2/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 f2831d75abf4e692410425c659d7a8681cc3c694,67cd17d4ada9449a91acee724ef52aeae1871cbe..396958719a7e1b8fc85582eca4d154b68059e3e1
--- 1/src/wx/film_editor.cc
--- 2/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 3b43f3aecbcdd0cdc11a1121679db12bc4cb7aef,8e3f75d0979327cbe6a94e0951861ccbb0094684..de92c182aa923305be0bc645673a02734091c1ec
--- 1/wscript
--- 2/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