diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-21 23:08:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-21 23:08:36 +0100 |
| commit | 94cee20beaa2d557c3c47960d8a65501c37410c2 (patch) | |
| tree | 3831bb8b6c3e533b1376a207b45c67c4425fa365 /src | |
| parent | b4f9d2e2c287848623c6dc59d8768c1d5fae15f0 (diff) | |
Revert "Odd const fix."
This reverts commit b4f9d2e2c287848623c6dc59d8768c1d5fae15f0.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/timeline.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 8633e47b9..ef8549d42 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -150,23 +150,21 @@ 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<Content> i, film->content ()) { if (i->video) { - _views.push_back (shared_ptr<TimelineContentView> (new TimelineVideoContentView (*this, i))); + _views.push_back (make_shared<TimelineVideoContentView> (*this, i)); } if (i->audio && !i->audio->mapping().mapped_output_channels().empty ()) { - _views.push_back (shared_ptr<TimelineContentView> (new TimelineAudioContentView (*this, i))); + _views.push_back (make_shared<TimelineAudioContentView> (*this, i)); } if (i->subtitle) { - _views.push_back (shared_ptr<TimelineContentView> (new TimelineSubtitleContentView (*this, i))); + _views.push_back (make_shared<TimelineSubtitleContentView> (*this, i)); } if (dynamic_pointer_cast<AtmosMXFContent> (i)) { - _views.push_back (shared_ptr<TimelineContentView> (new TimelineAtmosContentView (*this, i))); + _views.push_back (make_shared<TimelineAtmosContentView> (*this, i)); } } |
