Fix build.

diff --git a/ChangeLog b/ChangeLog
index 46230393fcbc652b3838ceddc975fdbb8c286b20..420486e1fc22a121ef673ac84a437e0f42f1a36a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-03-06  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.65.0 released.
+
+2014-03-05  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.64.19 released.
+
 2014-03-05  Carl Hetherington  <cth@carlh.net>
 
        * Bump maximum audio channels to 12 so that we can

diff --git a/debian/changelog b/debian/changelog
index cd98d1bd1297825ead45b08a38f2517274916b28..5ce77d8af73506da158f87cf7469a37ae243701e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.64.18-1) UNRELEASED; urgency=low
+dcpomatic (1.65.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -99,8 +99,10 @@ dcpomatic (1.64.18-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 04 Mar 2014 16:45:28 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 06 Mar 2014 18:28:57 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 2ac8c60771b1c960850b4805ff1ca550fbb1cd3a..e48daa4109bbfb935fdc1f532a0d6947c9a276f9 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -186,33 +186,22 @@ Job::paused () const
 void
 Job::set_state (State s)
 {
-       bool const finished = (s == FINISHED_OK || s == FINISHED_ERROR || s == FINISHED_CANCELLED);
-       
-       /* Do this first, so that we handle things that should happen on finish before the
-        * job is actually marked as such.  This is important for callers that do:
-        *
-        * while (JobManager::work_to_do ()) {
-        *   ui_signaller->ui_idle ();
-        * }
-        *
-        * as otherwise this loop can finish before the Finished handler has been executed
-        * (job finishes, calls set_state(), this sets the state and sets a pending signal
-        * for Finished, but this is never called as a ui_idle() never happens as work_to_do()
-        * is now false).
-        */
-       if (finished && ui_signaller) {
-               ui_signaller->emit (boost::bind (boost::ref (Finished)));
-       }
+       bool finished = false;
 
        {
                boost::mutex::scoped_lock lm (_state_mutex);
                _state = s;
 
-               if (finished) {
+               if (_state == FINISHED_OK || _state == FINISHED_ERROR || _state == FINISHED_CANCELLED) {
                        _ran_for = elapsed_time ();
+                       finished = true;
                        _sub_name.clear ();
                }
        }
+
+       if (finished && ui_signaller) {
+               ui_signaller->emit (boost::bind (boost::ref (Finished)));
+       }       
 }
 
 /** @return DCPTime (in seconds) that this sub-job has been running */

diff --git a/src/lib/ui_signaller.h b/src/lib/ui_signaller.h
index 7e0f575135fc893681cc08e3b481847d112c3824..1d62547f61f79f5019f506b3a5b81712bc49167b 100644 (file)
--- a/src/lib/ui_signaller.h
+++ b/src/lib/ui_signaller.h
@@ -55,8 +55,8 @@ public:
        }
 
        /** Call this in the UI when it is idle */
-       void ui_idle () {
-               _service.poll ();
+       size_t ui_idle () {
+               return _service.poll ();
        }
 
        /** This should wake the UI and make it call ui_idle() */

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 1b985a918e752dc7d94264f026ce8f37ccda05ba..c75f8f9539ffe9f06d9b4d61936304ae038a7301 100644 (file)
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -182,9 +182,9 @@ main (int argc, char* argv[])
                }
                
                JobManager* jm = JobManager::instance ();
-               while (jm->work_to_do ()) {
-                       ui_signaller->ui_idle ();
-               }
+
+               while (jm->work_to_do ()) {}
+               while (ui_signaller->ui_idle() > 0) {}
 
                ContentList content = film->content ();
                for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 7b82f1237c4caf23590dc58f9e02428da6b7a2a9..3c0730870b1070b7dd96e73f4582380c5b6c09e7 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -91,82 +91,94 @@ AboutDialog::AboutDialog (wxWindow* parent)
        add_section (_("Written by"), written_by);
 
        wxArrayString translated_by;
-       translated_by.Add (wxT ("Olivier Perriere"));
+       translated_by.Add (wxT ("Adam Klotblixt"));
        translated_by.Add (wxT ("Lilian Lefranc"));
-       translated_by.Add (wxT ("Thierry Journet"));
-       translated_by.Add (wxT ("Massimiliano Broggi"));
-       translated_by.Add (wxT ("William Fanelli"));
        translated_by.Add (wxT ("Manuel AC"));
-       translated_by.Add (wxT ("Adam Klotblixt"));
        translated_by.Add (wxT ("Markus Raab"));
+       translated_by.Add (wxT ("Massimiliano Broggi"));
+       translated_by.Add (wxT ("Olivier Perriere"));
+       translated_by.Add (wxT ("Thierry Journet"));
+       translated_by.Add (wxT ("William Fanelli"));
        add_section (_("Translated by"), translated_by);
 
        wxArrayString supported_by;
-       supported_by.Add (wxT ("Carsten Kurz"));
-       supported_by.Add (wxT ("Wolfgang Woehl"));
-       supported_by.Add (wxT ("Manual AC"));
-       supported_by.Add (wxT ("Theo Lipfert"));
-       supported_by.Add (wxT ("Olivier Lemaire"));
-       supported_by.Add (wxT ("Mattias Mattsson"));
+       supported_by.Add (wxT ("Adam Colt"));
+       supported_by.Add (wxT ("Adam Klotblixt"));
+       supported_by.Add (wxT ("Aldo Midali"));
+       supported_by.Add (wxT ("Andres Fink"));
        supported_by.Add (wxT ("Andrä Steiner"));
-       supported_by.Add (wxT ("Jonathan Jensen"));
-       supported_by.Add (wxT ("Mike Stiebing"));
-       supported_by.Add (wxT ("Kjarten Michaelsen"));
-       supported_by.Add (wxT ("Jussi Siponen"));
+       supported_by.Add (wxT ("Carsten Kurz"));
        supported_by.Add (wxT ("Cinema Clarici"));
        supported_by.Add (wxT ("Evan Freeze"));
+       supported_by.Add (wxT ("Filip Kovcin"));
        supported_by.Add (wxT ("Flor Guillaume"));
-       supported_by.Add (wxT ("Adam Klotblixt "));
-       supported_by.Add (wxT ("Lilian Lefranc"));
+       supported_by.Add (wxT ("Frank Cianciolo"));
+       supported_by.Add (wxT ("Frank de Wulf"));
        supported_by.Add (wxT ("Gavin Lewarne"));
-       supported_by.Add (wxT ("Lasse Salling"));
-       supported_by.Add (wxT ("Andres Fink"));
-       supported_by.Add (wxT ("Kieran Carroll"));
+       supported_by.Add (wxT ("Ivan Pullman"));
+       supported_by.Add (wxT ("Jeff Boot"));
+       supported_by.Add (wxT ("Jonathan Jensen"));
+       supported_by.Add (wxT ("Jussi Siponen"));
        supported_by.Add (wxT ("Kambiz Afshar"));
-       supported_by.Add (wxT ("Sean Leigh"));
-       supported_by.Add (wxT ("Wolfram Weber"));
+       supported_by.Add (wxT ("Kieran Carroll"));
+       supported_by.Add (wxT ("Kjarten Michaelsen"));
+       supported_by.Add (wxT ("Lasse Salling"));
+       supported_by.Add (wxT ("Lilian Lefranc"));
+       supported_by.Add (wxT ("Lindsay Morris"));
+       supported_by.Add (wxT ("Manual AC"));
+       supported_by.Add (wxT ("Mattias Mattsson"));
+       supported_by.Add (wxT ("Mike Stiebing"));
+       supported_by.Add (wxT ("Olivier Lemaire"));
        supported_by.Add (wxT ("Randy Stankey"));
-       supported_by.Add (wxT ("Frank Cianciolo"));
        supported_by.Add (wxT ("Rodolfo Giuliano"));
+       supported_by.Add (wxT ("Sean Leigh"));
        supported_by.Add (wxT ("Sylvain Mielle"));
-       supported_by.Add (wxT ("Ivan Pullman"));
-       supported_by.Add (wxT ("Aldo Midali"));
-       supported_by.Add (wxT ("Jeff Boot"));
-       supported_by.Add (wxT ("Filip Kovcin"));
-       supported_by.Add (wxT ("Adam Colt"));
-       supported_by.Add (wxT ("Lindsay Morris"));
+       supported_by.Add (wxT ("Theo Lipfert"));
        supported_by.Add (wxT ("Tim O'Brien"));
+       supported_by.Add (wxT ("Wolfgang Woehl"));
+       supported_by.Add (wxT ("Wolfram Weber"));
        add_section (_("Supported by"), supported_by);
 
-       wxArrayString testers;
-       testers.Add (wxT ("Greg Rooke"));
-       testers.Add (wxT ("Olivier Lemaire"));
-       testers.Add (wxT ("Trever Anderson"));
-       testers.Add (wxT ("Wolfgang Woehl"));
-       testers.Add (wxT ("Jonathan Jensen"));
-       testers.Add (wxT ("Anders Nordentoft-Madsen"));
-       testers.Add (wxT ("Lilian Lefranc"));
-       testers.Add (wxT ("Gérald Maruccia"));
-       testers.Add (wxT ("John Convertino"));
-       testers.Add (wxT ("Mike Blakesley"));
-       testers.Add (wxT ("Simon Kesselman"));
-       testers.Add (wxT ("Gavin Lewarne"));
-       testers.Add (wxT ("Thierry Journet"));
-       testers.Add (wxT ("Carsten Kurz"));
-       testers.Add (wxT ("Karim Senoucci"));
-       testers.Add (wxT ("Paul Willmott"));
-       testers.Add (wxT ("Mattias Mattsson"));
-       testers.Add (wxT ("Andreas Eli"));
-       testers.Add (wxT ("Roop Chand"));
-       testers.Add (wxT ("Peter Puchner"));
-       testers.Add (wxT ("David Booty"));
-       testers.Add (wxT ("Maurizio Giampà"));
-       testers.Add (wxT ("Bill Lam"));
-       testers.Add (wxT ("Pepijn Klijs"));
-       testers.Add (wxT ("Will Meadows"));
-       testers.Add (wxT ("Adam Colt"));
-       testers.Add (wxT ("Markus Raab"));
-       add_section (_("Tested by"), testers);
+       wxArrayString tested_by;
+       tested_by.Add (wxT ("Ada de Kamper"));
+       tested_by.Add (wxT ("Adam Colt"));
+       tested_by.Add (wxT ("Adam Keay"));
+       tested_by.Add (wxT ("Anders Nordentoft-Madsen"));
+       tested_by.Add (wxT ("Andreas Eli"));
+       tested_by.Add (wxT ("Andreas Weiss"));
+       tested_by.Add (wxT ("Bill Lam"));
+       tested_by.Add (wxT ("Brad Miller"));
+       tested_by.Add (wxT ("Carsten Kurz"));
+       tested_by.Add (wxT ("David Booty"));
+       tested_by.Add (wxT ("Denzil Kriekenbeek"));
+       tested_by.Add (wxT ("Gavin Lewarne"));
+       tested_by.Add (wxT ("Greg Rooke"));
+       tested_by.Add (wxT ("Gérald Maruccia"));
+       tested_by.Add (wxT ("John Convertino"));
+       tested_by.Add (wxT ("Jonathan Jensen"));
+       tested_by.Add (wxT ("Karim Senoucci"));
+       tested_by.Add (wxT ("Lilian Lefranc"));
+       tested_by.Add (wxT ("Luke Granger-Brown"));
+       tested_by.Add (wxT ("Markus Raab"));
+       tested_by.Add (wxT ("Mattias Mattsson"));
+       tested_by.Add (wxT ("Maurizio Giampà"));
+       tested_by.Add (wxT ("Mauro Ottonello"));
+       tested_by.Add (wxT ("Mike Blakesley"));
+       tested_by.Add (wxT ("Olivier Lemaire"));
+       tested_by.Add (wxT ("Patrick Haderer"));
+       tested_by.Add (wxT ("Paul Willmott"));
+       tested_by.Add (wxT ("Pepijn Klijs"));
+       tested_by.Add (wxT ("Peter Puchner"));
+       tested_by.Add (wxT ("Roop Chand"));
+       tested_by.Add (wxT ("Simon Kesselman"));
+       tested_by.Add (wxT ("Simon Vannarath"));
+       tested_by.Add (wxT ("Stefan Karner"));
+       tested_by.Add (wxT ("Steve Guttag"));
+       tested_by.Add (wxT ("Thierry Journet"));
+       tested_by.Add (wxT ("Trever Anderson"));
+       tested_by.Add (wxT ("Will Meadows"));
+       tested_by.Add (wxT ("Wolfgang Woehl"));
+       add_section (_("Tested by"), tested_by);
        
        sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16).Expand());
 

diff --git a/test/long_ffmpeg_seek_test.cc b/test/long_ffmpeg_seek_test.cc
index fedd8749bcf6d07e3068f5a28ff0170e4fee51e9..58b039eeea8d88437bd2297907c4c49522842490 100644 (file)
--- a/test/long_ffmpeg_seek_test.cc
+++ b/test/long_ffmpeg_seek_test.cc
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE (long_ffmpeg_seek_test)
        film->set_name ("long_ffmpeg_audio_test");
        film->set_container (Ratio::from_id ("185"));
        shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/long_data/dolby_aurora.vob"));
-       c->set_ratio (Ratio::from_id ("185"));
+       c->set_scale (VideoContentScale (Ratio::from_id ("185")));
        film->examine_and_add_content (c);
 
        wait_for_jobs ();