Use boost::signals2; fix bugs with x-thread signalling.

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 502f3734c233b86f7d4a85044e25d3e2c8fc3241..542cde7d7917b09c526de6860a17c882ef9db50f 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -594,7 +594,7 @@ FilmEditor::set_film (Film* f)
        set_things_sensitive (_film != 0);
 
        if (_film) {
-               _film->Changed.connect (sigc::mem_fun (*this, &FilmEditor::film_changed));
+               _film->Changed.connect (bind (&FilmEditor::film_changed, this, _1));
        }
 
        if (_film) {
@@ -663,7 +663,7 @@ void
 FilmEditor::edit_filters_clicked (wxCommandEvent &)
 {
        FilterDialog* d = new FilterDialog (this, _film->filters());
-       d->ActiveChanged.connect (sigc::mem_fun (*_film, &Film::set_filters));
+       d->ActiveChanged.connect (bind (&Film::set_filters, _film, _1));
        d->ShowModal ();
        d->Destroy ();
 }
@@ -758,7 +758,7 @@ void
 FilmEditor::change_dcp_range_clicked (wxCommandEvent &)
 {
        DCPRangeDialog* d = new DCPRangeDialog (this, _film);
-       d->Changed.connect (sigc::mem_fun (*this, &FilmEditor::dcp_range_changed));
+       d->Changed.connect (bind (&FilmEditor::dcp_range_changed, this, _1, _2));
        d->ShowModal ();
 }