diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-09-21 09:17:25 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-09-21 09:17:25 +0100 |
| commit | 19bb2b33a89a1291451f0740739a36daebe00bae (patch) | |
| tree | d0cafb4792ec4ff61d04d16c1e86199b2714a36f /gtk2_ardour/editor_videotimeline.cc | |
| parent | 66aa6dfc8ecdb7591768bc45866a8c2b0d77e767 (diff) | |
| parent | fd23ebd0886cd61f8ee68d52d6576d00a16c9032 (diff) | |
Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
gtk2_ardour/marker.cc
gtk2_ardour/midi_region_view.h
gtk2_ardour/region_gain_line.h
gtk2_ardour/utils.cc
gtk2_ardour/video_image_frame.cc
gtk2_ardour/wscript
libs/backends/jack/wscript
Diffstat (limited to 'gtk2_ardour/editor_videotimeline.cc')
| -rw-r--r-- | gtk2_ardour/editor_videotimeline.cc | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc index ce373f0406..1da9fb4f19 100644 --- a/gtk2_ardour/editor_videotimeline.cc +++ b/gtk2_ardour/editor_videotimeline.cc @@ -29,8 +29,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,9 +48,7 @@ Editor::set_video_timeline_height (const int h) if (videotl_bar_height == h) { return; } if (h < 2 || h > 8) { return; } 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); ARDOUR_UI::instance()->video_timeline->set_height(videotl_bar_height * timebar_height); update_ruler_visibility(); } @@ -59,16 +56,6 @@ Editor::set_video_timeline_height (const int h) void Editor::update_video_timeline (bool flush) { -#if DEBUG - framepos_t rightmost_frame = leftmost_frame + current_page_frames(); - std::cout << "VIDEO SCROLL: " << leftmost_frame << " -- " << rightmost_frame << std::endl; - std::cout << "SCROLL UNITS: " << frame_to_unit(leftmost_frame) << " -- " << frame_to_unit(rightmost_frame) - << " = " << frame_to_unit(rightmost_frame) - frame_to_unit(leftmost_frame) - << std::endl; -#endif - - // TODO later: make this a list for mult. video tracks - // also modify ardour_ui_dialogs.cc : set_session() if (flush) { ARDOUR_UI::instance()->video_timeline->flush_local_cache(); } @@ -142,10 +129,6 @@ Editor::export_video () } ExportVideoDialog dialog (_session, get_selection().time); Gtk::ResponseType r = (Gtk::ResponseType) dialog.run(); + (void) r; // keep gcc quiet dialog.hide(); -#if 0 - if (r == Gtk::RESPONSE_ACCEPT) { - ARDOUR_UI::instance()->popup_error(string_compose(_("Export Successful: %1"),dialog.get_exported_filename())); - } -#endif } |