X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=a821323586dd2cce1c5e29b275aac541667bca7f;hb=a237ef0838c4c730ff824a203780833c206764cc;hp=2496679aa83e0325a8e40a8163741bcf3d8719c4;hpb=63ea6b6c5ee64f8ee067c2b488d004b6dfe363e0;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 2496679aa..a82132358 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -40,9 +40,10 @@ using boost::shared_ptr; class ThumbPanel : public wxPanel { public: - ThumbPanel (wxPanel* parent, Film* film) + ThumbPanel (wxPanel* parent, shared_ptr film) : wxPanel (parent) , _film (film) + , _index (0) , _frame_rebuild_needed (false) , _composition_needed (false) {} @@ -100,7 +101,7 @@ public: Refresh (); } - void set_film (Film* f) + void set_film (shared_ptr f) { _film = f; if (!_film) { @@ -189,7 +190,7 @@ private: } } - Film* _film; + shared_ptr _film; shared_ptr _image; wxImage _transformed_image; /** currently-displayed thumbnail index */ @@ -224,9 +225,8 @@ EVT_PAINT (ThumbPanel::paint_event) EVT_SIZE (ThumbPanel::size_event) END_EVENT_TABLE () -FilmViewer::FilmViewer (Film* f, wxWindow* p) +FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) : wxPanel (p) - , _film (0) { _sizer = new wxBoxSizer (wxVERTICAL); SetSizer (_sizer); @@ -293,7 +293,7 @@ FilmViewer::film_changed (Film::Property p) } void -FilmViewer::set_film (Film* f) +FilmViewer::set_film (shared_ptr f) { if (_film == f) { return;