summaryrefslogtreecommitdiff
path: root/src/wx/timeline_content_view.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-02-24 00:17:26 +0000
committerCarl Hetherington <cth@carlh.net>2016-02-24 00:17:26 +0000
commite1ec5b2c81ec2e15d4c1d97cce8252fa34c7116a (patch)
tree78aed756a937f979983de33f51acbf2b43744aa4 /src/wx/timeline_content_view.cc
parent794396aa29061894ea359a6f30aa0f759a1f1b74 (diff)
An unfortunately large set of timeline-related changes:
- Rename sequence_video to sequence, and sequence subtitle content like we do video content (i.e. adding multiple subtitle contents will result in them sequenced in time rather than overlaid). - Stop doing selection-changed related stuff in ContentPanel if no selection change has actually happened. - Attempt to tidy up event handling in the timeline a bit.
Diffstat (limited to 'src/wx/timeline_content_view.cc')
-rw-r--r--src/wx/timeline_content_view.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 989be3fad..ed7e1d3d0 100644
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -31,7 +31,7 @@ TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
, _content (c)
, _selected (false)
{
- _content_connection = c->Changed.connect (bind (&TimelineContentView::content_changed, this, _2, _3));
+ _content_connection = c->Changed.connect (bind (&TimelineContentView::content_changed, this, _2));
}
dcpomatic::Rect<int>
@@ -152,16 +152,11 @@ TimelineContentView::y_pos (int t) const
}
void
-TimelineContentView::content_changed (int p, bool frequent)
+TimelineContentView::content_changed (int p)
{
ensure_ui_thread ();
if (p == ContentProperty::POSITION || p == ContentProperty::LENGTH) {
force_redraw ();
}
-
- if (!frequent) {
- _timeline.setup_pixels_per_second ();
- _timeline.Refresh ();
- }
}