swaroop: fix up restart-after-crash.

[dcpomatic.git] / src / wx / film_editor.cc

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 5380cbd9bed582cd7716ade2096b7c5c34dc2065..34aad9078d5474071970ab1ce006f2633d365974 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -22,14 +22,14 @@
  *  @brief FilmEditor class.
  */
 
-#include "lib/film.h"
-#include "lib/job_manager.h"
-#include "lib/content.h"
-#include "lib/dcp_content.h"
 #include "wx_util.h"
 #include "film_editor.h"
 #include "dcp_panel.h"
 #include "content_panel.h"
+#include "lib/film.h"
+#include "lib/job_manager.h"
+#include "lib/content.h"
+#include "lib/dcp_content.h"
 #include <wx/wx.h>
 #include <wx/notebook.h>
 #include <boost/foreach.hpp>
@@ -39,9 +39,10 @@ using std::cout;
 using std::string;
 using std::list;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::optional;
 
-FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
+FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
        : wxPanel (parent)
 {
        wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
@@ -68,8 +69,12 @@ FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
  *  @param p Property of the Film that has changed.
  */
 void
-FilmEditor::film_changed (Film::Property p)
+FilmEditor::film_change (ChangeType type, Film::Property p)
 {
+       if (type != CHANGE_TYPE_DONE) {
+               return;
+       }
+
        ensure_ui_thread ();
 
        if (!_film) {
@@ -86,8 +91,12 @@ FilmEditor::film_changed (Film::Property p)
 }
 
 void
-FilmEditor::film_content_changed (int property)
+FilmEditor::film_content_change (ChangeType type, int property)
 {
+       if (type != CHANGE_TYPE_DONE) {
+               return;
+       }
+
        ensure_ui_thread ();
 
        if (!_film) {
@@ -117,8 +126,8 @@ FilmEditor::set_film (shared_ptr<Film> film)
        _dcp_panel->set_film (_film);
 
        if (_film) {
-               _film->Changed.connect (bind (&FilmEditor::film_changed, this, _1));
-               _film->ContentChanged.connect (bind (&FilmEditor::film_content_changed, this, _2));
+               _film->Change.connect (bind (&FilmEditor::film_change, this, _1, _2));
+               _film->ContentChange.connect (bind (&FilmEditor::film_content_change, this, _1, _3));
        }
 
        if (_film && _film->directory()) {
@@ -142,5 +151,5 @@ FilmEditor::set_general_sensitivity (bool s)
 void
 FilmEditor::active_jobs_changed (optional<string> j)
 {
-       set_general_sensitivity (!j || *j == "analyse_audio");
+       set_general_sensitivity (!j);
 }