diff options
author | Robin Gareus <robin@gareus.org> | 2017-06-28 18:46:07 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-06-28 18:46:07 +0200 |
commit | a9224abcf493f01ff89556f8c6da4b053293514d (patch) | |
tree | 18dd9ca7d8852b92b4f130899419ba53af15cdee | |
parent | f73ce2d47f60e050cb633a2d260ecfcc2a9ef74c (diff) |
Add explicit VideoTimeline change-type, follow up on f73ce2d
-rw-r--r-- | gtk2_ardour/editor.cc | 15 | ||||
-rw-r--r-- | gtk2_ardour/editor.h | 3 |
2 files changed, 8 insertions, 10 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 9750f58e9d..4a83bf6571 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4557,13 +4557,7 @@ Editor::playhead_cursor_sample () const void Editor::queue_visual_videotimeline_update () { - /* TODO: - * pending_visual_change.add (VisualChange::VideoTimeline); - * or maybe even more specific: which videotimeline-image - * currently it calls update_video_timeline() to update - * _all outdated_ images on the video-timeline. - * see 'exposeimg()' in video_image_frame.cc - */ + pending_visual_change.add (VisualChange::VideoTimeline); ensure_visual_change_idle_handler (); } @@ -4679,9 +4673,12 @@ Editor::visual_changer (const VisualChange& vc) if (vc.pending != VisualChange::YOrigin) { update_fixed_rulers (); redisplay_tempo (true); - } - update_video_timeline(); + /* video frames & position need to be updated for zoom, horiz-scroll + * and (explicitly) VisualChange::VideoTimeline. + */ + update_video_timeline(); + } _summary->set_overlays_dirty (); } diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 633329541e..6e1ae4528d 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1130,7 +1130,8 @@ private: enum Type { TimeOrigin = 0x1, ZoomLevel = 0x2, - YOrigin = 0x4 + YOrigin = 0x4, + VideoTimeline = 0x8 }; Type pending; |