Merge branch 'master' into 2.0

diff --cc src/lib/film.cc
Simple merge

diff --cc src/lib/job.cc
index 01df2c570611cf90c2fa38a7aee41f142391725d,db9a9b215bdf74f3a6153dc7629516131ae00551..2ac8c60771b1c960850b4805ff1ca550fbb1cd3a
--- 1/src/lib/job.cc
--- 2/src/lib/job.cc
+++ b/src/lib/job.cc
@@@ -197,14 -213,9 +213,9 @@@ Job::set_state (State s
                        _sub_name.clear ();
                }
        }
- 
-       if (finished && ui_signaller) {
-               ui_signaller->emit (boost::bind (boost::ref (Finished)));
-       }
  }
  
 -/** @return Time (in seconds) that this sub-job has been running */
 +/** @return DCPTime (in seconds) that this sub-job has been running */
  int
  Job::elapsed_time () const
  {

diff --cc src/lib/util.cc
Simple merge

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

diff --cc src/lib/wscript
index 16b5aafe4d2c7c9e684db7c80f17cb60f8d9bede,7c9712ff8f74c3f7f4b83144ac0bb69a3dd23839..5d27cfe45317d68df9c8e27dda6ea07bb2a0d173
--- 1/src/lib/wscript
--- 2/src/lib/wscript
+++ b/src/lib/wscript
@@@ -84,9 -77,12 +84,12 @@@ def build(bld)
                   AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE 
                   BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
                   SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
 -                 CURL ZIP QUICKMAIL
 +                 CURL ZIP QUICKMAIL PANGOMM CAIROMM
                   """
  
+     if bld.env.TARGET_OSX:
+         obj.framework = ['IOKit', 'Foundation']
+ 
      obj.source = sources + ' version.cc'
  
      if bld.env.TARGET_WINDOWS:

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

diff --cc wscript
Simple merge