diff options
| author | Robin Gareus <robin@gareus.org> | 2013-04-06 04:09:58 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-04-06 04:10:27 +0200 |
| commit | 6830d83236ae047eb077802cdb54eff5492928d3 (patch) | |
| tree | 94dcc6fc53c6127731a13ac179d9c3e76577f5cd /gtk2_ardour/editor_videotimeline.cc | |
| parent | 486edf1680ab8837bdf4af9fcc07ec383c7354a0 (diff) | |
vtl: make videotimeline work with new cairo canvas
timeline thumbnail display, moving (drag/drop) and zoom works.
There still some crashes e.g. resizing the height of the timeline
and with off-screen image buffering when zooming in.
Likely due to concurrency issues:
VideoImageFrame::exposeimg() and direct access of the pixbuf:
"Assertion `!_bounding_box_dirty' failed." in canvas/item.cc:191
more work is needed..
Diffstat (limited to 'gtk2_ardour/editor_videotimeline.cc')
| -rw-r--r-- | gtk2_ardour/editor_videotimeline.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc index 564e3016e7..a4a0b1b210 100644 --- a/gtk2_ardour/editor_videotimeline.cc +++ b/gtk2_ardour/editor_videotimeline.cc @@ -28,8 +28,7 @@ #include "ardour_ui.h" #include "editor.h" -#include "simplerect.h" -#include "canvas_impl.h" +#include "canvas/rectangle.h" #include "editing.h" #include "audio_time_axis.h" #include "video_image_frame.h" @@ -49,7 +48,7 @@ Editor::set_video_timeline_height (const int h) videotl_bar_height = h; const double nh = (videotl_bar_height * timebar_height - ((ARDOUR::Profile->get_sae())?1.0:0.0)); videotl_label.set_size_request (-1, (int)timebar_height * videotl_bar_height); - videotl_bar->property_y2().set_value(nh); + videotl_bar->set_y1(nh); ARDOUR_UI::instance()->video_timeline->set_height(videotl_bar_height * timebar_height); update_ruler_visibility(); } |