Build fixes for Boost >= 1.73

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

diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 3af86b707753768aa77a0dc6c453d87c3a9a2aef..261177e36815e55b2a8d7ad52f812892ffbed585 100644 (file)
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -33,8 +33,12 @@ using std::list;
 using std::cout;
 using std::string;
 using boost::shared_ptr;
+using boost::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
-TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
+TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
        : wxDialog (
                cp->window(),
                wxID_ANY,
@@ -51,7 +55,7 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
 #endif
                )
        , _film (film)
-       , _timeline (this, cp, film)
+       , _timeline (this, cp, film, viewer)
 {
        wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 
@@ -92,13 +96,6 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
        _film_changed_connection = film->Change.connect (bind (&TimelineDialog::film_change, this, _1, _2));
 }
 
-wxString
-TimelineDialog::bitmap_path (string name)
-{
-       boost::filesystem::path p = shared_path() / String::compose("%1.png", name);
-       return std_to_wx (p.string());
-}
-
 void
 TimelineDialog::film_change (ChangeType type, Film::Property p)
 {