projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build fixes for Boost >= 1.73
[dcpomatic.git]
/
src
/
wx
/
timeline.cc
diff --git
a/src/wx/timeline.cc
b/src/wx/timeline.cc
index cbea2333c8293d6dade6acfba38f6c6b749eb7d2..7b9758febd16a4b3a27e300ab0f259745a3c5c42 100644
(file)
--- a/
src/wx/timeline.cc
+++ b/
src/wx/timeline.cc
@@
-56,6
+56,9
@@
using boost::dynamic_pointer_cast;
using boost::bind;
using boost::optional;
using namespace dcpomatic;
using boost::bind;
using boost::optional;
using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
/* 3 hours in 640 pixels */
double const Timeline::_minimum_pixels_per_second = 640.0 / (60 * 60 * 3);
/* 3 hours in 640 pixels */
double const Timeline::_minimum_pixels_per_second = 640.0 / (60 * 60 * 3);
@@
-262,8
+265,8
@@
Timeline::recreate_views ()
_views.push_back (shared_ptr<TimelineView> (new TimelineTextContentView (*this, i, j)));
}
_views.push_back (shared_ptr<TimelineView> (new TimelineTextContentView (*this, i, j)));
}
- if (
dynamic_pointer_cast<AtmosMXFContent> (i)
) {
- _views.push_back (shared_ptr<TimelineView>
(new TimelineAtmosContentView
(*this, i)));
+ if (
i->atmos
) {
+ _views.push_back (shared_ptr<TimelineView>
(new TimelineAtmosContentView
(*this, i)));
}
}
}
}