From: Carl Hetherington Date: Tue, 21 Jun 2016 08:57:30 +0000 (+0100) Subject: Odd const fix. X-Git-Tag: v2.8.13~10 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=b4f9d2e2c287848623c6dc59d8768c1d5fae15f0 Odd const fix. --- diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index ef8549d42..8633e47b9 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -150,21 +150,23 @@ Timeline::recreate_views () _views.push_back (_reels_view); _views.push_back (_labels_view); + /* XXX: make_shared does not work here on some compilers due to some strange const problem */ + BOOST_FOREACH (shared_ptr i, film->content ()) { if (i->video) { - _views.push_back (make_shared (*this, i)); + _views.push_back (shared_ptr (new TimelineVideoContentView (*this, i))); } if (i->audio && !i->audio->mapping().mapped_output_channels().empty ()) { - _views.push_back (make_shared (*this, i)); + _views.push_back (shared_ptr (new TimelineAudioContentView (*this, i))); } if (i->subtitle) { - _views.push_back (make_shared (*this, i)); + _views.push_back (shared_ptr (new TimelineSubtitleContentView (*this, i))); } if (dynamic_pointer_cast (i)) { - _views.push_back (make_shared (*this, i)); + _views.push_back (shared_ptr (new TimelineAtmosContentView (*this, i))); } }