Simplify and fix up selection code for the content list (#2428).

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

diff --git a/src/wx/markers_dialog.cc b/src/wx/markers_dialog.cc
index 2e4dc42c5950e4f6922651521b9971eebc3e76a2..cc254b2a1edada6ed9157756b920ac6008816b32 100644 (file)
--- a/src/wx/markers_dialog.cc
+++ b/src/wx/markers_dialog.cc
@@ -47,7 +47,7 @@ using dcpomatic::DCPTime;
 class Marker
 {
 public:
-       Marker (wxWindow* parent, wxGridBagSizer* grid, int row, weak_ptr<Film> film_, weak_ptr<FilmViewer> viewer_, wxString name, dcp::Marker type_)
+       Marker(wxWindow* parent, wxGridBagSizer* grid, int row, weak_ptr<Film> film_, FilmViewer const& viewer_, wxString name, dcp::Marker type_)
                : film (film_)
                , viewer (viewer_)
                , type (type_)
@@ -71,7 +71,7 @@ public:
                set_sensitivity ();
 
                set_button->Bind (wxEVT_BUTTON, bind(&Marker::set, this));
-               checkbox->Bind (wxEVT_CHECKBOX, bind(&Marker::checkbox_clicked, this));
+               checkbox->bind(&Marker::checkbox_clicked, this);
                timecode->Changed.connect (bind(&Marker::changed, this));
        }
 
@@ -92,9 +92,7 @@ private:
        {
                auto f = film.lock ();
                DCPOMATIC_ASSERT (f);
-               auto v = viewer.lock ();
-               DCPOMATIC_ASSERT (v);
-               timecode->set (v->position(), f->video_frame_rate());
+               timecode->set(viewer.position(), f->video_frame_rate());
                changed ();
        }
 
@@ -116,7 +114,7 @@ private:
        }
 
        weak_ptr<Film> film;
-       weak_ptr<FilmViewer> viewer;
+       FilmViewer const& viewer;
        dcp::Marker type;
        CheckBox* checkbox;
        Timecode<dcpomatic::DCPTime>* timecode;
@@ -124,7 +122,7 @@ private:
 };
 
 
-MarkersDialog::MarkersDialog (wxWindow* parent, weak_ptr<Film> film, weak_ptr<FilmViewer> viewer)
+MarkersDialog::MarkersDialog(wxWindow* parent, weak_ptr<Film> film, FilmViewer const& viewer)
        : wxDialog (parent, wxID_ANY, _("Markers"))
        , _film (film)
 {
@@ -132,7 +130,7 @@ MarkersDialog::MarkersDialog (wxWindow* parent, weak_ptr<Film> film, weak_ptr<Fi
        auto grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 
        int r = 0;
-       for (auto const& marker: all_markers()) {
+       for (auto const& marker: all_editable_markers()) {
                _markers.push_back (make_shared<Marker>(this, grid, r++, film, viewer, marker.first, marker.second));
        }