projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Take Film pointer out of Content.
[dcpomatic.git]
/
src
/
wx
/
timeline_content_view.cc
diff --git
a/src/wx/timeline_content_view.cc
b/src/wx/timeline_content_view.cc
index bf22e0156d7d739f4ecc0f6d47f24685ac042f53..69f1723cee28b6ea055ab647a1833882fa7a0e67 100644
(file)
--- a/
src/wx/timeline_content_view.cc
+++ b/
src/wx/timeline_content_view.cc
@@
-33,7
+33,7
@@
TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
, _content (c)
, _selected (false)
{
, _content (c)
, _selected (false)
{
- _content_connection = c->Change
d.connect (bind (&TimelineContentView::content_changed, this, _2
));
+ _content_connection = c->Change
.connect (bind (&TimelineContentView::content_change, this, _1, _3
));
}
dcpomatic::Rect<int>
}
dcpomatic::Rect<int>
@@
-50,7
+50,7
@@
TimelineContentView::bbox () const
return dcpomatic::Rect<int> (
time_x (content->position ()),
y_pos (_track.get()),
return dcpomatic::Rect<int> (
time_x (content->position ()),
y_pos (_track.get()),
- content->length_after_trim().seconds() * _timeline.pixels_per_second().get_value_or(0),
+ content->length_after_trim(
film
).seconds() * _timeline.pixels_per_second().get_value_or(0),
_timeline.pixels_per_track()
);
}
_timeline.pixels_per_track()
);
}
@@
-104,7
+104,7
@@
TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
}
DCPTime const position = cont->position ();
}
DCPTime const position = cont->position ();
- DCPTime const len = cont->length_after_trim ();
+ DCPTime const len = cont->length_after_trim (
film
);
wxColour selected (background_colour().Red() / 2, background_colour().Green() / 2, background_colour().Blue() / 2);
wxColour selected (background_colour().Red() / 2, background_colour().Green() / 2, background_colour().Blue() / 2);
@@
-160,8
+160,12
@@
TimelineContentView::y_pos (int t) const
}
void
}
void
-TimelineContentView::content_change
d (
int p)
+TimelineContentView::content_change
(ChangeType type,
int p)
{
{
+ if (type != CHANGE_TYPE_DONE) {
+ return;
+ }
+
ensure_ui_thread ();
if (p == ContentProperty::POSITION || p == ContentProperty::LENGTH) {
ensure_ui_thread ();
if (p == ContentProperty::POSITION || p == ContentProperty::LENGTH) {