X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_canvas.cc;h=031e58bf615e415d273449ea9717472c44eddd1e;hb=bbb65d07d33160366533d9f2390f3f8d56fcb8e1;hp=aeff20f0bc857e821d3dc477d600fa7e849954ec;hpb=9f63ab9931e6478472853bdda58da47ea29ac125;p=ardour.git diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index aeff20f0bc..031e58bf61 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2005 Paul Davis + Copyright (C) 2005 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,36 +18,37 @@ */ #include +#include #include #include -#include -#include +#include "ardour/profile.h" +#include "ardour/rc_configuration.h" #include "ardour_ui.h" #include "editor.h" #include "waveview.h" #include "simplerect.h" #include "simpleline.h" +#include "imageframe.h" #include "waveview_p.h" #include "simplerect_p.h" #include "simpleline_p.h" +#include "imageframe_p.h" #include "canvas_impl.h" +#include "canvas-noevent-text.h" #include "editing.h" #include "rgb_macros.h" #include "utils.h" -#include "time_axis_view.h" #include "audio_time_axis.h" - -#ifdef WITH_CMT -#include "imageframe.h" -#include "imageframe_p.h" -#endif +#include "editor_drag.h" +#include "region_view.h" +#include "editor_group_tabs.h" +#include "editor_routes.h" #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -55,7 +56,7 @@ using namespace Glib; using namespace Gtkmm2ext; using namespace Editing; -/* XXX this is a hack. it ought to be the maximum value of an nframes_t */ +/* XXX this is a hack. it ought to be the maximum value of an nframes64_t */ const double max_canvas_coordinate = (double) JACK_MAX_FRAMES; @@ -65,222 +66,250 @@ extern "C" GType gnome_canvas_simpleline_get_type(void); GType gnome_canvas_simplerect_get_type(void); GType gnome_canvas_waveview_get_type(void); - -#ifdef WITH_CMT GType gnome_canvas_imageframe_get_type(void); -#endif } -static void ardour_canvas_type_init() +static void ardour_canvas_type_init() { // Map gtypes to gtkmm wrapper-creation functions: - + Glib::wrap_register(gnome_canvas_simpleline_get_type(), &Gnome::Canvas::SimpleLine_Class::wrap_new); Glib::wrap_register(gnome_canvas_simplerect_get_type(), &Gnome::Canvas::SimpleRect_Class::wrap_new); Glib::wrap_register(gnome_canvas_waveview_get_type(), &Gnome::Canvas::WaveView_Class::wrap_new); + // Glib::wrap_register(gnome_canvas_imageframe_get_type(), &Gnome::Canvas::ImageFrame_Class::wrap_new); -#ifdef WITH_CMT - Glib::wrap_register(gnome_canvas_imageframe_get_type(), &Gnome::Canvas::ImageFrame_Class::wrap_new); -#endif - // Register the gtkmm gtypes: (void) Gnome::Canvas::WaveView::get_type(); (void) Gnome::Canvas::SimpleLine::get_type(); (void) Gnome::Canvas::SimpleRect::get_type(); - -#ifdef WITH_CMT (void) Gnome::Canvas::ImageFrame::get_type(); -#endif -} +} void Editor::initialize_canvas () { + if (getenv ("ARDOUR_NON_AA_CANVAS")) { + track_canvas = new ArdourCanvas::Canvas (); + } else { + track_canvas = new ArdourCanvas::CanvasAA (); + } + ArdourCanvas::init (); ardour_canvas_type_init (); /* don't try to center the canvas */ - track_canvas.set_center_scroll_region (false); - track_canvas.set_dither (Gdk::RGB_DITHER_NONE); - - /* need to handle 4 specific types of events as catch-alls */ - - track_canvas.signal_scroll_event().connect (mem_fun (*this, &Editor::track_canvas_scroll_event)); - track_canvas.signal_motion_notify_event().connect (mem_fun (*this, &Editor::track_canvas_motion_notify_event)); - track_canvas.signal_button_press_event().connect (mem_fun (*this, &Editor::track_canvas_button_press_event)); - track_canvas.signal_button_release_event().connect (mem_fun (*this, &Editor::track_canvas_button_release_event)); - - /* just scroll stuff for the timecanvas */ - time_canvas.signal_scroll_event().connect (mem_fun (*this, &Editor::time_canvas_scroll_event)); + track_canvas->set_center_scroll_region (false); + track_canvas->set_dither (Gdk::RGB_DITHER_NONE); - track_canvas.set_name ("EditorMainCanvas"); - track_canvas.add_events (Gdk::POINTER_MOTION_HINT_MASK|Gdk::SCROLL_MASK); - track_canvas.signal_leave_notify_event().connect (mem_fun(*this, &Editor::left_track_canvas)); - track_canvas.set_flags (CAN_FOCUS); + Glib::RefPtr screen = get_screen(); - /* set up drag-n-drop */ - - vector target_table; - - // Drag-N-Drop from the region list can generate this target - target_table.push_back (TargetEntry ("regions")); - - target_table.push_back (TargetEntry ("text/plain")); - target_table.push_back (TargetEntry ("text/uri-list")); - target_table.push_back (TargetEntry ("application/x-rootwin-drop")); - - track_canvas.drag_dest_set (target_table); - track_canvas.signal_drag_data_received().connect (mem_fun(*this, &Editor::track_canvas_drag_data_received)); + if (!screen) { + screen = Gdk::Screen::get_default(); + } + physical_screen_width = screen->get_width (); + physical_screen_height = screen->get_height (); /* stuff for the verbose canvas cursor */ Pango::FontDescription* font = get_font_for_style (N_("VerboseCanvasCursor")); - verbose_canvas_cursor = new ArdourCanvas::Text (*track_canvas.root()); + verbose_canvas_cursor = new ArdourCanvas::NoEventText (*track_canvas->root()); verbose_canvas_cursor->property_font_desc() = *font; verbose_canvas_cursor->property_anchor() = ANCHOR_NW; - + delete font; verbose_cursor_visible = false; - + + /* on the bottom, an image */ + if (Profile->get_sae()) { Image img (::get_icon (X_("saelogo"))); - logo_item = new ArdourCanvas::Pixbuf (*track_canvas.root(), 0.0, 0.0, img.get_pixbuf()); + logo_item = new ArdourCanvas::Pixbuf (*track_canvas->root(), 0.0, 0.0, img.get_pixbuf()); // logo_item->property_height_in_pixels() = true; // logo_item->property_width_in_pixels() = true; // logo_item->property_height_set() = true; // logo_item->property_width_set() = true; logo_item->show (); } - + /* a group to hold time (measure) lines */ - - time_line_group = new ArdourCanvas::Group (*track_canvas.root(), 0.0, 0.0); - tempo_lines = new TempoLines(track_canvas, time_line_group); - cursor_group = new ArdourCanvas::Group (*track_canvas.root(), 0.0, 0.0); - time_canvas.set_name ("EditorTimeCanvas"); - time_canvas.add_events (Gdk::POINTER_MOTION_HINT_MASK); - time_canvas.set_flags (CAN_FOCUS); - time_canvas.set_center_scroll_region (false); - time_canvas.set_dither (Gdk::RGB_DITHER_NONE); - - marker_time_line_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, 0.0); - marker_tempo_lines = new TempoLines(time_canvas, marker_time_line_group); - - meter_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, 0.0); - tempo_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height); - range_marker_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height * 2.0); - transport_marker_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height * 3.0); - marker_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height * 4.0); - cd_marker_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height * 5.0); - - tempo_bar = new ArdourCanvas::SimpleRect (*tempo_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0); - tempo_bar->property_outline_what() = (0x1 | 0x8); - tempo_bar->property_outline_pixels() = 1; - - meter_bar = new ArdourCanvas::SimpleRect (*meter_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0); + time_line_group = new ArdourCanvas::Group (*track_canvas->root()); + +#ifdef GTKOSX + /*XXX please don't laugh. this actually improves canvas performance on osx */ + bogus_background_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, max_canvas_coordinate/3, physical_screen_height); + bogus_background_rect->property_outline_pixels() = 0; +#endif + transport_loop_range_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, physical_screen_height); + transport_loop_range_rect->property_outline_pixels() = 1; + transport_loop_range_rect->hide(); + + transport_punch_range_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, physical_screen_height); + transport_punch_range_rect->property_outline_pixels() = 0; + transport_punch_range_rect->hide(); + + _background_group = new ArdourCanvas::Group (*track_canvas->root()); + _master_group = new ArdourCanvas::Group (*track_canvas->root()); + + _trackview_group = new ArdourCanvas::Group (*_master_group); + _region_motion_group = new ArdourCanvas::Group (*_trackview_group); + + meter_bar_group = new ArdourCanvas::Group (*track_canvas->root ()); + if (Profile->get_sae()) { + meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, physical_screen_width, timebar_height - 1); + meter_bar->property_outline_pixels() = 1; + } else { + meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, physical_screen_width, timebar_height); + meter_bar->property_outline_pixels() = 0; + } meter_bar->property_outline_what() = (0x1 | 0x8); - meter_bar->property_outline_pixels() = 1; - - marker_bar = new ArdourCanvas::SimpleRect (*marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0); - marker_bar->property_outline_what() = (0x1 | 0x8); - marker_bar->property_outline_pixels() = 1; - cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0); - cd_marker_bar->property_outline_what() = (0x1 | 0x8); - cd_marker_bar->property_outline_pixels() = 1; - - range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0); + tempo_bar_group = new ArdourCanvas::Group (*track_canvas->root ()); + if (Profile->get_sae()) { + tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height - 1)); + tempo_bar->property_outline_pixels() = 1; + } else { + tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height)); + tempo_bar->property_outline_pixels() = 0; + } + tempo_bar->property_outline_what() = (0x1 | 0x8); + + range_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root ()); + if (Profile->get_sae()) { + range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height - 1)); + range_marker_bar->property_outline_pixels() = 1; + } else { + range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height)); + range_marker_bar->property_outline_pixels() = 0; + } range_marker_bar->property_outline_what() = (0x1 | 0x8); - range_marker_bar->property_outline_pixels() = 1; - - transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0); + + transport_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root ()); + if (Profile->get_sae()) { + transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height - 1)); + transport_marker_bar->property_outline_pixels() = 1; + } else { + transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height)); + transport_marker_bar->property_outline_pixels() = 0; + } transport_marker_bar->property_outline_what() = (0x1 | 0x8); - transport_marker_bar->property_outline_pixels() = 1; - range_bar_drag_rect = new ArdourCanvas::SimpleRect (*range_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0); + marker_bar_group = new ArdourCanvas::Group (*track_canvas->root ()); + if (Profile->get_sae()) { + marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height - 1)); + marker_bar->property_outline_pixels() = 1; + } else { + marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height)); + marker_bar->property_outline_pixels() = 0; + } + marker_bar->property_outline_what() = (0x1 | 0x8); + + cd_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root ()); + if (Profile->get_sae()) { + cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height - 1)); + cd_marker_bar->property_outline_pixels() = 1; + } else { + cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height)); + cd_marker_bar->property_outline_pixels() = 0; + } + cd_marker_bar->property_outline_what() = (0x1 | 0x8); + + timebar_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0); + cursor_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0); + + meter_group = new ArdourCanvas::Group (*timebar_group, 0.0, timebar_height * 5.0); + tempo_group = new ArdourCanvas::Group (*timebar_group, 0.0, timebar_height * 4.0); + range_marker_group = new ArdourCanvas::Group (*timebar_group, 0.0, timebar_height * 3.0); + transport_marker_group = new ArdourCanvas::Group (*timebar_group, 0.0, timebar_height * 2.0); + marker_group = new ArdourCanvas::Group (*timebar_group, 0.0, timebar_height); + cd_marker_group = new ArdourCanvas::Group (*timebar_group, 0.0, 0.0); + + cd_marker_bar_drag_rect = new ArdourCanvas::SimpleRect (*cd_marker_group, 0.0, 0.0, 100, timebar_height); + cd_marker_bar_drag_rect->property_outline_pixels() = 0; + cd_marker_bar_drag_rect->hide (); + + range_bar_drag_rect = new ArdourCanvas::SimpleRect (*range_marker_group, 0.0, 0.0, 100, timebar_height); range_bar_drag_rect->property_outline_pixels() = 0; range_bar_drag_rect->hide (); - - transport_bar_drag_rect = new ArdourCanvas::SimpleRect (*transport_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0); + + transport_bar_drag_rect = new ArdourCanvas::SimpleRect (*transport_marker_group, 0.0, 0.0, 100, timebar_height); transport_bar_drag_rect->property_outline_pixels() = 0; transport_bar_drag_rect->hide (); - - marker_drag_line_points.push_back(Gnome::Art::Point(0.0, 0.0)); - marker_drag_line_points.push_back(Gnome::Art::Point(0.0, 0.0)); - - marker_drag_line = new ArdourCanvas::Line (*track_canvas.root()); - marker_drag_line->property_width_pixels() = 1; - marker_drag_line->property_points() = marker_drag_line_points; - marker_drag_line->hide(); - - range_marker_drag_rect = new ArdourCanvas::SimpleRect (*track_canvas.root(), 0.0, 0.0, 0.0, 0.0); - range_marker_drag_rect->hide (); - - transport_loop_range_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, 0.0); - transport_loop_range_rect->property_outline_pixels() = 1; - transport_loop_range_rect->hide(); - - transport_punch_range_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, 0.0); - transport_punch_range_rect->property_outline_pixels() = 0; - transport_punch_range_rect->hide(); - - transport_loop_range_rect->lower_to_bottom (); // loop on the bottom - transport_punchin_line = new ArdourCanvas::SimpleLine (*time_line_group); + transport_punchin_line = new ArdourCanvas::SimpleLine (*_master_group); transport_punchin_line->property_x1() = 0.0; transport_punchin_line->property_y1() = 0.0; transport_punchin_line->property_x2() = 0.0; - transport_punchin_line->property_y2() = 0.0; + transport_punchin_line->property_y2() = physical_screen_height; transport_punchin_line->hide (); - - transport_punchout_line = new ArdourCanvas::SimpleLine (*time_line_group); + + transport_punchout_line = new ArdourCanvas::SimpleLine (*_master_group); transport_punchout_line->property_x1() = 0.0; transport_punchout_line->property_y1() = 0.0; transport_punchout_line->property_x2() = 0.0; - transport_punchout_line->property_y2() = 0.0; + transport_punchout_line->property_y2() = physical_screen_height; transport_punchout_line->hide(); - + // used to show zoom mode active zooming - zoom_rect = new ArdourCanvas::SimpleRect (*track_canvas.root(), 0.0, 0.0, 0.0, 0.0); + zoom_rect = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, 0.0); zoom_rect->property_outline_pixels() = 1; zoom_rect->hide(); - - zoom_rect->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_zoom_rect_event), (ArdourCanvas::Item*) 0)); - + + zoom_rect->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_zoom_rect_event), (ArdourCanvas::Item*) 0)); + // used as rubberband rect - rubberband_rect = new ArdourCanvas::SimpleRect (*track_canvas.root(), 0.0, 0.0, 0.0, 0.0); + rubberband_rect = new ArdourCanvas::SimpleRect (*_trackview_group, 0.0, 0.0, 0.0, 0.0); + rubberband_rect->property_outline_pixels() = 1; rubberband_rect->hide(); - - tempo_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_tempo_bar_event), tempo_bar)); - meter_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_meter_bar_event), meter_bar)); - marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_marker_bar_event), marker_bar)); - cd_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_cd_marker_bar_event), cd_marker_bar)); - range_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_range_marker_bar_event), range_marker_bar)); - transport_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_transport_marker_bar_event), transport_marker_bar)); - - ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_loop_range_view), false)); - ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_punch_range_view), false)); - - double time_height = timebar_height * 5; - double time_width = FLT_MAX/frames_per_unit; - time_canvas.set_scroll_region(0.0, 0.0, time_width, time_height); - - playhead_cursor = new Cursor (*this, &Editor::canvas_playhead_cursor_event); - - initial_ruler_update_required = true; - track_canvas.signal_size_allocate().connect (mem_fun(*this, &Editor::track_canvas_allocate)); + + tempo_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_tempo_bar_event), tempo_bar)); + meter_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_meter_bar_event), meter_bar)); + marker_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_marker_bar_event), marker_bar)); + cd_marker_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_cd_marker_bar_event), cd_marker_bar)); + range_marker_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_range_marker_bar_event), range_marker_bar)); + transport_marker_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_transport_marker_bar_event), transport_marker_bar)); + + playhead_cursor = new EditorCursor (*this, &Editor::canvas_playhead_cursor_event); if (logo_item) { logo_item->lower_to_bottom (); } + /* need to handle 4 specific types of events as catch-alls */ + + track_canvas->signal_scroll_event().connect (sigc::mem_fun (*this, &Editor::track_canvas_scroll_event)); + track_canvas->signal_motion_notify_event().connect (sigc::mem_fun (*this, &Editor::track_canvas_motion_notify_event)); + track_canvas->signal_button_press_event().connect (sigc::mem_fun (*this, &Editor::track_canvas_button_press_event)); + track_canvas->signal_button_release_event().connect (sigc::mem_fun (*this, &Editor::track_canvas_button_release_event)); + track_canvas->signal_drag_motion().connect (sigc::mem_fun (*this, &Editor::track_canvas_drag_motion)); + + track_canvas->set_name ("EditorMainCanvas"); + track_canvas->add_events (Gdk::POINTER_MOTION_HINT_MASK|Gdk::SCROLL_MASK); + track_canvas->signal_leave_notify_event().connect (sigc::mem_fun(*this, &Editor::left_track_canvas)); + track_canvas->signal_enter_notify_event().connect (sigc::mem_fun(*this, &Editor::entered_track_canvas)); + track_canvas->set_flags (CAN_FOCUS); + + /* set up drag-n-drop */ + + vector target_table; - ColorsChanged.connect (mem_fun (*this, &Editor::color_handler)); + // Drag-N-Drop from the region list can generate this target + target_table.push_back (TargetEntry ("regions")); + + target_table.push_back (TargetEntry ("text/plain")); + target_table.push_back (TargetEntry ("text/uri-list")); + target_table.push_back (TargetEntry ("application/x-rootwin-drop")); + + track_canvas->drag_dest_set (target_table); + track_canvas->signal_drag_data_received().connect (sigc::mem_fun(*this, &Editor::track_canvas_drag_data_received)); + + track_canvas->signal_size_allocate().connect (sigc::mem_fun(*this, &Editor::track_canvas_allocate)); + + ColorsChanged.connect (sigc::mem_fun (*this, &Editor::color_handler)); color_handler(); } @@ -289,72 +318,53 @@ void Editor::track_canvas_allocate (Gtk::Allocation alloc) { canvas_allocation = alloc; - - if (!initial_ruler_update_required) { - if (!canvas_idle_queued) { - /* call this first so that we do stuff before any pending redraw */ - Glib::signal_idle().connect (mem_fun (*this, &Editor::track_canvas_size_allocated), false); - canvas_idle_queued = true; - } - return; - } - - initial_ruler_update_required = false; track_canvas_size_allocated (); } bool Editor::track_canvas_size_allocated () { - if (canvas_idle_queued) { - canvas_idle_queued = false; - } - - canvas_width = canvas_allocation.get_width(); - canvas_height = canvas_allocation.get_height(); + bool height_changed = _canvas_height != canvas_allocation.get_height(); - full_canvas_height = canvas_height; + _canvas_width = canvas_allocation.get_width(); + _canvas_height = canvas_allocation.get_height(); - if (session) { + if (_session) { TrackViewList::iterator i; double height = 0; for (i = track_views.begin(); i != track_views.end(); ++i) { - if ((*i)->control_parent) { - height += (*i)->effective_height; - } + height += (*i)->effective_height (); + (*i)->clip_to_viewport (); } - - full_canvas_height = height; - } - zoom_range_clock.set ((nframes_t) floor ((canvas_width * frames_per_unit))); - playhead_cursor->set_position (playhead_cursor->current_frame); + full_canvas_height = height + canvas_timebars_vsize; + } - reset_hscrollbar_stepping (); - reset_scrolling_region (); + if (height_changed) { + if (playhead_cursor) { + playhead_cursor->set_length (_canvas_height); + } - if (playhead_cursor) playhead_cursor->set_length (canvas_height); + for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) { + (*x)->set_line_vpos (0, _canvas_height); + } - double y1 = vertical_adjustment.get_value (); - - for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) { - (*x)->set_line_vpos (y1, canvas_height); + vertical_adjustment.set_page_size (_canvas_height); + last_trackview_group_vertical_offset = get_trackview_group_vertical_offset (); + if ((vertical_adjustment.get_value() + _canvas_height) >= vertical_adjustment.get_upper()) { + /* + We're increasing the size of the canvas while the bottom is visible. + We scroll down to keep in step with the controls layout. + */ + vertical_adjustment.set_value (full_canvas_height - _canvas_height); + } } - range_marker_drag_rect->property_y1() = 0.0; - range_marker_drag_rect->property_y2() = canvas_height; - transport_loop_range_rect->property_y1() = 0.0; - transport_loop_range_rect->property_y2() = canvas_height; - transport_punch_range_rect->property_y1() = 0.0; - transport_punch_range_rect->property_y2() = canvas_height; - transport_punchin_line->property_y1() = 0.0; - transport_punchin_line->property_y2() = canvas_height; - transport_punchout_line->property_y1() = 0.0; - transport_punchout_line->property_y2() = canvas_height; - + handle_new_duration (); update_fixed_rulers(); - redisplay_tempo (true); + redisplay_tempo (false); + _summary->set_overlays_dirty (); Resized (); /* EMIT_SIGNAL */ @@ -362,99 +372,78 @@ Editor::track_canvas_size_allocated () } void -Editor::reset_scrolling_region (Gtk::Allocation* alloc) +Editor::controls_layout_size_request (Requisition* req) { - TreeModel::Children rows = route_display_model->children(); - TreeModel::Children::iterator i; - double pos; - - for (pos = 0, i = rows.begin(); i != rows.end(); ++i) { - TimeAxisView *tv = (*i)[route_display_columns.tv]; - if (tv != 0 && !tv->hidden()) { - pos += tv->effective_height; - } + double pos = 0; + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + pos += (*i)->effective_height (); + (*i)->clip_to_viewport (); } - double last_canvas_unit = max ((last_canvas_frame / frames_per_unit), canvas_width); + gint height = min ((gint) pos, (gint) (physical_screen_height - 600)); - track_canvas.set_scroll_region (0.0, 0.0, last_canvas_unit, pos); + bool changed = false; - // XXX what is the correct height value for the time canvas ? this overstates it - time_canvas.set_scroll_region ( 0.0, 0.0, last_canvas_unit, canvas_height); + gint w = edit_controls_vbox.get_width(); + if (_group_tabs->is_mapped()) { + w += _group_tabs->get_width (); + } - range_marker_drag_rect->property_y2() = canvas_height; - transport_loop_range_rect->property_y2() = canvas_height; - transport_punch_range_rect->property_y2() = canvas_height; - transport_punchin_line->property_y2() = canvas_height; - transport_punchout_line->property_y2() = canvas_height; + gint width = max (w, controls_layout.get_width()); - update_punch_range_view (true); + /* don't get too big. the fudge factors here are just guesses */ - controls_layout.queue_resize(); -} + width = min (width, (gint) (physical_screen_width - 300)); -void -Editor::controls_layout_size_request (Requisition* req) -{ - TreeModel::Children rows = route_display_model->children(); - TreeModel::Children::iterator i; - double pos; - - for (pos = 0, i = rows.begin(); i != rows.end(); ++i) { - TimeAxisView *tv = (*i)[route_display_columns.tv]; - if (tv != 0) { - pos += tv->effective_height; - } + if ((req->width != width) || (req->height != height)) { + changed = true; + controls_layout_size_request_connection.disconnect (); } - RefPtr screen = get_screen(); - - if (!screen) { - screen = Gdk::Screen::get_default(); - } - - edit_controls_vbox.check_resize(); - req->width = max (edit_controls_vbox.get_width(), controls_layout.get_width()); + if (req->width != width) { + gint vbox_width = edit_controls_vbox.get_width(); + if (_group_tabs->is_mapped()) { + vbox_width += _group_tabs->get_width(); + } + req->width = width; - /* don't get too big. the fudge factors here are just guesses */ - - req->width = min (req->width, screen->get_width() - 300); - req->height = min ((gint) pos, (screen->get_height() - 400)); + /* this one is important: it determines how big the layout thinks it really is, as + opposed to what it displays on the screen + */ + controls_layout.property_width () = vbox_width; + controls_layout.property_width_request () = vbox_width; - /* this one is important: it determines how big the layout thinks it really is, as - opposed to what it displays on the screen - */ - - controls_layout.set_size (edit_controls_vbox.get_width(), (gint) pos); - controls_layout.set_size_request(edit_controls_vbox.get_width(), -1); - zoom_box.set_size_request(edit_controls_vbox.get_width(), -1); - time_button_frame.set_size_request(edit_controls_vbox.get_width(), -1); + // time_button_event_box.property_width_request () = vbox_width; + // zoom_box.property_width_request () = vbox_width; + } - //cerr << "sizes = " << req->width << " " << edit_controls_vbox.get_width() << " " << controls_layout.get_width() << " " << zoom_box.get_width() << " " << time_button_frame.get_width() << endl;//DEBUG -} + if (req->height != height) { + req->height = height; + controls_layout.property_height () = (guint) floor (pos); + controls_layout.property_height_request () = height; + } -bool -Editor::track_canvas_map_handler (GdkEventAny* ev) -{ - track_canvas.get_window()->set_cursor (*current_canvas_cursor); - return false; + if (changed) { + controls_layout_size_request_connection = controls_layout.signal_size_request().connect (sigc::mem_fun (*this, &Editor::controls_layout_size_request)); + } + //cerr << "sizes = " << req->width << " " << edit_controls_vbox.get_width() << " " << controls_layout.get_width() << " " << zoom_box.get_width() << " " << time_button_frame.get_width() << endl;//DEBUG } bool -Editor::time_canvas_map_handler (GdkEventAny* ev) +Editor::track_canvas_map_handler (GdkEventAny* /*ev*/) { - time_canvas.get_window()->set_cursor (*timebar_cursor); + if (current_canvas_cursor) { + track_canvas->get_window()->set_cursor (*current_canvas_cursor); + } return false; } -void +void Editor::track_canvas_drag_data_received (const RefPtr& context, - int x, int y, + int x, int y, const SelectionData& data, guint info, guint time) { - cerr << "drop on canvas, target = " << data.get_target() << endl; - if (data.get_target() == "regions") { drop_regions (context, x, y, data, info, time); } else { @@ -462,126 +451,145 @@ Editor::track_canvas_drag_data_received (const RefPtr& context } } +bool +Editor::idle_drop_paths (vector paths, nframes64_t frame, double ypos) +{ + drop_paths_part_two (paths, frame, ypos); + return false; +} + +void +Editor::drop_paths_part_two (const vector& paths, nframes64_t frame, double ypos) +{ + RouteTimeAxisView* tv; + + std::pair const tvp = trackview_by_y_position (ypos); + if (tvp.first == 0) { + + /* drop onto canvas background: create new tracks */ + + frame = 0; + + if (Profile->get_sae() || Config->get_only_copy_imported_files()) { + do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, SrcBest, frame); + } else { + do_embed (paths, Editing::ImportDistinctFiles, ImportAsTrack, frame); + } + + } else if ((tv = dynamic_cast (tvp.first)) != 0) { + + /* check that its an audio track, not a bus */ + + if (tv->get_diskstream()) { + /* select the track, then embed/import */ + selection->set (tv); + + if (Profile->get_sae() || Config->get_only_copy_imported_files()) { + do_import (paths, Editing::ImportSerializeFiles, Editing::ImportToTrack, SrcBest, frame); + } else { + do_embed (paths, Editing::ImportSerializeFiles, ImportToTrack, frame); + } + } + } +} + void Editor::drop_paths (const RefPtr& context, - int x, int y, + int x, int y, const SelectionData& data, guint info, guint time) { - TimeAxisView* tvp; - RouteTimeAxisView* tv; - double cy; vector paths; - string spath; GdkEvent ev; nframes64_t frame; - - if (convert_drop_to_paths (paths, context, x, y, data, info, time)) { - goto out; - } - - /* D-n-D coordinates are window-relative, so convert to "world" coordinates - */ - double wx; double wy; + double cy; - track_canvas.window_to_world (x, y, wx, wy); - wx += horizontal_adjustment.get_value(); - wy += vertical_adjustment.get_value(); - - ev.type = GDK_BUTTON_RELEASE; - ev.button.x = wx; - ev.button.y = wy; + if (convert_drop_to_paths (paths, context, x, y, data, info, time) == 0) { - frame = event_frame (&ev, 0, &cy); + /* D-n-D coordinates are window-relative, so convert to "world" coordinates + */ - snap_to (frame); + track_canvas->window_to_world (x, y, wx, wy); - if ((tvp = trackview_by_y_position (cy)) == 0) { + ev.type = GDK_BUTTON_RELEASE; + ev.button.x = wx; + ev.button.y = wy; - /* drop onto canvas background: create new tracks */ + frame = event_frame (&ev, 0, &cy); - do_embed (paths, Editing::ImportDistinctFiles, ImportAsTrack, frame); - - } else if ((tv = dynamic_cast(tvp)) != 0) { + snap_to (frame); - /* check that its an audio track, not a bus */ - - /* check that its an audio track, not a bus */ - - if (tv->get_diskstream()) { - /* select the track, then embed */ - selection->set (tv); - do_embed (paths, Editing::ImportDistinctFiles, ImportToTrack, frame); - } +#ifdef GTKOSX + /* We are not allowed to call recursive main event loops from within + the main event loop with GTK/Quartz. Since import/embed wants + to push up a progress dialog, defer all this till we go idle. + */ + Glib::signal_idle().connect (sigc::bind (sigc::mem_fun (*this, &Editor::idle_drop_paths), paths, frame, cy)); +#else + drop_paths_part_two (paths, frame, cy); +#endif } - out: context->drag_finish (true, false, time); } void -Editor::drop_regions (const RefPtr& context, - int x, int y, - const SelectionData& data, - guint info, guint time) +Editor::drop_regions (const RefPtr& /*context*/, + int /*x*/, int /*y*/, + const SelectionData& /*data*/, + guint /*info*/, guint /*time*/) { - const SerializedObjectPointers >* sr = - reinterpret_cast > *> (data.get_data()); - - for (uint32_t i = 0; i < sr->cnt; ++i) { - - boost::shared_ptr r = sr->data[i]; - - insert_region_list_drag (r, x, y); - } - - context->drag_finish (true, false, time); + _drags->end_grab (0); } void -Editor::maybe_autoscroll (GdkEvent* event) +Editor::maybe_autoscroll (GdkEventMotion* event, bool allow_vert) { - nframes_t rightmost_frame = leftmost_frame + current_page_frames(); - nframes_t frame = drag_info.current_pointer_frame; + nframes64_t rightmost_frame = leftmost_frame + current_page_frames(); + pair frames = _drags->extent (); bool startit = false; - static int last_autoscroll_direction = 0; + autoscroll_y = 0; + autoscroll_x = 0; + if (event->y < canvas_timebars_vsize && allow_vert) { + autoscroll_y = -1; + startit = true; + } else if (event->y > _canvas_height) { + autoscroll_y = 1; + startit = true; + } - if (frame > rightmost_frame) { + if (frames.second > rightmost_frame) { if (rightmost_frame < max_frames) { - autoscroll_direction = 1; + autoscroll_x = 1; startit = true; } - } else if (frame < leftmost_frame) { - + } else if (frames.first < leftmost_frame) { if (leftmost_frame > 0) { - autoscroll_direction = -1; + autoscroll_x = -1; startit = true; } - } else { - - if (drag_info.last_pointer_frame > drag_info.current_pointer_frame) { - autoscroll_direction = -1; - } else { - autoscroll_direction = 1; - } } + if (!allow_vertical_scroll) { + autoscroll_y = 0; + } - if ((autoscroll_direction != last_autoscroll_direction) || (leftmost_frame < frame < rightmost_frame)) { + if ((autoscroll_x != last_autoscroll_x) || (autoscroll_y != last_autoscroll_y) || (autoscroll_x == 0 && autoscroll_y == 0)) { stop_canvas_autoscroll (); } - + if (startit && autoscroll_timeout_tag < 0) { - start_canvas_autoscroll (autoscroll_direction); + start_canvas_autoscroll (autoscroll_x, autoscroll_y); } - last_autoscroll_direction = autoscroll_direction; + last_autoscroll_x = autoscroll_x; + last_autoscroll_y = autoscroll_y; } gint @@ -593,90 +601,141 @@ Editor::_autoscroll_canvas (void *arg) bool Editor::autoscroll_canvas () { - nframes_t new_frame; - nframes_t limit = max_frames - current_page_frames(); + nframes64_t new_frame; + nframes64_t limit = max_frames - current_page_frames(); GdkEventMotion ev; - nframes_t target_frame; + double new_pixel; + double target_pixel; + + if (autoscroll_x_distance != 0) { + + pair const e = _drags->extent (); + + if (autoscroll_x > 0) { + autoscroll_x_distance = (e.second - (leftmost_frame + current_page_frames())) / 3; + } else if (autoscroll_x < 0) { + autoscroll_x_distance = (leftmost_frame - e.first) / 3; - if (autoscroll_direction < 0) { - if (leftmost_frame < autoscroll_distance) { + } + } + + if (autoscroll_y_distance != 0) { + if (autoscroll_y > 0) { + autoscroll_y_distance = (_drags->current_pointer_y() - (get_trackview_group_vertical_offset() + _canvas_height)) / 3; + } else if (autoscroll_y < 0) { + + autoscroll_y_distance = (vertical_adjustment.get_value () - _drags->current_pointer_y()) / 3; + } + } + + if (autoscroll_x < 0) { + if (leftmost_frame < autoscroll_x_distance) { new_frame = 0; } else { - new_frame = leftmost_frame - autoscroll_distance; + new_frame = leftmost_frame - autoscroll_x_distance; } - target_frame = drag_info.current_pointer_frame - autoscroll_distance; - } else { - if (leftmost_frame > limit - autoscroll_distance) { + } else if (autoscroll_x > 0) { + if (leftmost_frame > limit - autoscroll_x_distance) { new_frame = limit; } else { - new_frame = leftmost_frame + autoscroll_distance; + new_frame = leftmost_frame + autoscroll_x_distance; } - target_frame = drag_info.current_pointer_frame + autoscroll_distance; + } else { + new_frame = leftmost_frame; } - /* now fake a motion event to get the object that is being dragged to move too */ + double vertical_pos = vertical_adjustment.get_value(); - ev.type = GDK_MOTION_NOTIFY; - ev.state &= Gdk::BUTTON1_MASK; - ev.x = frame_to_unit (target_frame); - ev.y = drag_info.current_pointer_y; - motion_handler (drag_info.item, (GdkEvent*) &ev, drag_info.item_type, true); + if (autoscroll_y < 0) { - if (new_frame == 0 || new_frame == limit) { - /* we are done */ - return false; - } + if (vertical_pos < autoscroll_y_distance) { + new_pixel = 0; + } else { + new_pixel = vertical_pos - autoscroll_y_distance; + } - autoscroll_cnt++; + target_pixel = _drags->current_pointer_y() - autoscroll_y_distance; + target_pixel = max (target_pixel, 0.0); - if (autoscroll_cnt == 1) { + } else if (autoscroll_y > 0) { - /* connect the timeout so that we get called repeatedly */ + double top_of_bottom_of_canvas = full_canvas_height - _canvas_height; - autoscroll_timeout_tag = g_idle_add ( _autoscroll_canvas, this); - return false; + if (vertical_pos > full_canvas_height - autoscroll_y_distance) { + new_pixel = full_canvas_height; + } else { + new_pixel = vertical_pos + autoscroll_y_distance; + } + + new_pixel = min (top_of_bottom_of_canvas, new_pixel); + + target_pixel = _drags->current_pointer_y() + autoscroll_y_distance; - } + /* don't move to the full canvas height because the item will be invisible + (its top edge will line up with the bottom of the visible canvas. + */ + + target_pixel = min (target_pixel, full_canvas_height - 10); + + } else { + target_pixel = _drags->current_pointer_y(); + new_pixel = vertical_pos; + } + + if ((new_frame == 0 || new_frame == limit) && (new_pixel == 0 || new_pixel == DBL_MAX)) { + /* we are done */ + return false; + } if (new_frame != leftmost_frame) { reset_x_origin (new_frame); } - if (autoscroll_cnt == 50) { /* 0.5 seconds */ - - /* after about a while, speed up a bit by changing the timeout interval */ + vertical_adjustment.set_value (new_pixel); - autoscroll_distance = (nframes_t) floor (current_page_frames()/30.0f); - - } else if (autoscroll_cnt == 150) { /* 1.0 seconds */ + /* fake an event. */ - autoscroll_distance = (nframes_t) floor (current_page_frames()/20.0f); + Glib::RefPtr canvas_window = const_cast(this)->track_canvas->get_window(); + gint x, y; + Gdk::ModifierType mask; + canvas_window->get_pointer (x, y, mask); + ev.type = GDK_MOTION_NOTIFY; + ev.state = Gdk::BUTTON1_MASK; + ev.x = x; + ev.y = y; + + motion_handler (0, (GdkEvent*) &ev, true); + + autoscroll_cnt++; - } else if (autoscroll_cnt == 300) { /* 1.5 seconds */ + if (autoscroll_cnt == 1) { - /* after about another while, speed up by increasing the shift per callback */ + /* connect the timeout so that we get called repeatedly */ - autoscroll_distance = (nframes_t) floor (current_page_frames()/10.0f); + autoscroll_timeout_tag = g_idle_add ( _autoscroll_canvas, this); + return false; - } + } return true; } void -Editor::start_canvas_autoscroll (int dir) +Editor::start_canvas_autoscroll (int dx, int dy) { - if (!session || autoscroll_active) { + if (!_session || autoscroll_active) { return; } stop_canvas_autoscroll (); autoscroll_active = true; - autoscroll_direction = dir; - autoscroll_distance = (nframes_t) floor (current_page_frames()/50.0); + autoscroll_x = dx; + autoscroll_y = dy; + autoscroll_x_distance = (nframes64_t) floor (current_page_frames()/50.0); + autoscroll_y_distance = fabs (dy * 5); /* pixels */ autoscroll_cnt = 0; - + /* do it right now, which will start the repeated callbacks */ autoscroll_canvas (); @@ -685,6 +744,7 @@ Editor::start_canvas_autoscroll (int dir) void Editor::stop_canvas_autoscroll () { + if (autoscroll_timeout_tag >= 0) { g_source_remove (autoscroll_timeout_tag); autoscroll_timeout_tag = -1; @@ -693,75 +753,87 @@ Editor::stop_canvas_autoscroll () autoscroll_active = false; } -gint -Editor::left_track_canvas (GdkEventCrossing *ev) +bool +Editor::left_track_canvas (GdkEventCrossing */*ev*/) { set_entered_track (0); set_entered_regionview (0); + reset_canvas_action_sensitivity (false); + return false; +} + +bool +Editor::entered_track_canvas (GdkEventCrossing */*ev*/) +{ + reset_canvas_action_sensitivity (true); return FALSE; } void Editor::tie_vertical_scrolling () { - double y1 = vertical_adjustment.get_value(); - - playhead_cursor->set_y_axis (y1); - - range_marker_drag_rect->property_y1() = y1; - range_marker_drag_rect->property_y2() = y1 + canvas_height; - transport_loop_range_rect->property_y1() = y1; - transport_loop_range_rect->property_y2() = y1 + canvas_height; - transport_punch_range_rect->property_y1() = y1; - transport_punch_range_rect->property_y2() = y1 + canvas_height; - transport_punchin_line->property_y1() = y1; - transport_punchin_line->property_y2() = y1 + canvas_height; - transport_punchout_line->property_y1() = y1; - transport_punchout_line->property_y2() = y1 + canvas_height; - - if (!selection->markers.empty()) { - for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) { - (*x)->set_line_vpos (y1, canvas_height); - } - } - - if (logo_item) { - logo_item->property_y() = y1; - } + scroll_canvas_vertically (); /* this will do an immediate redraw */ - controls_layout.get_vadjustment()->set_value (y1); + controls_layout.get_vadjustment()->set_value (vertical_adjustment.get_value()); + + if (pending_visual_change.idle_handler_id < 0) { + _summary->set_overlays_dirty (); + } } -void -Editor::canvas_horizontally_scrolled () +void +Editor::scroll_canvas_horizontally () { - nframes64_t time_origin = (nframes_t) floor (horizontal_adjustment.get_value() * frames_per_unit); + /* horizontal scrolling only */ + double x1, y1, x2, y2, x_delta; + _master_group->get_bounds (x1, y1, x2, y2); + + x_delta = - (x1 + horizontal_adjustment.get_value()); + + _master_group->move (x_delta, 0); + timebar_group->move (x_delta, 0); + time_line_group->move (x_delta, 0); + cursor_group->move (x_delta, 0); - if (time_origin != leftmost_frame) { - canvas_scroll_to (time_origin); + leftmost_frame = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit); + + update_fixed_rulers (); + redisplay_tempo (true); + + if (pending_visual_change.idle_handler_id < 0) { + _summary->set_overlays_dirty (); } + +#ifndef GTKOSX + if (!autoscroll_active) { + /* force rulers and canvas to move in lock step */ + while (gtk_events_pending ()) { + gtk_main_iteration (); + } + } +#endif + } void -Editor::canvas_scroll_to (nframes64_t time_origin) +Editor::scroll_canvas_vertically () { - leftmost_frame = time_origin; - nframes_t rightmost_frame = leftmost_frame + current_page_frames (); + /* vertical scrolling only */ - if (rightmost_frame > last_canvas_frame) { - last_canvas_frame = rightmost_frame; - reset_scrolling_region (); - } - - if (logo_item) { - logo_item->property_x() = horizontal_adjustment.get_value (); - } + double y_delta; - update_fixed_rulers (); + y_delta = last_trackview_group_vertical_offset - get_trackview_group_vertical_offset (); + _trackview_group->move (0, y_delta); + _background_group->move (0, y_delta); - redisplay_tempo (!_dragging_hscrollbar); + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + (*i)->clip_to_viewport (); + } + last_trackview_group_vertical_offset = get_trackview_group_vertical_offset (); + /* required to keep the controls_layout in lock step with the canvas group */ + update_canvas_now (); } void @@ -769,7 +841,7 @@ Editor::color_handler() { playhead_cursor->canvas_item.property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_PlayHead.get(); verbose_canvas_cursor->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_VerboseCanvasCursor.get(); - + meter_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MeterBar.get(); meter_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get(); @@ -788,17 +860,15 @@ Editor::color_handler() transport_marker_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportMarkerBar.get(); transport_marker_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get(); + cd_marker_bar_drag_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragBarRect.get(); + cd_marker_bar_drag_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragBarRect.get(); + range_bar_drag_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragBarRect.get(); range_bar_drag_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragBarRect.get(); transport_bar_drag_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportDragRect.get(); transport_bar_drag_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportDragRect.get(); - marker_drag_line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerDragLine.get(); - - range_marker_drag_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragRect.get(); - range_marker_drag_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragRect.get(); - transport_loop_range_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportLoopRect.get(); transport_loop_range_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportLoopRect.get(); @@ -821,9 +891,37 @@ Editor::color_handler() location_punch_color = ARDOUR_UI::config()->canvasvar_LocationPunch.get(); refresh_location_display (); +/* redisplay_tempo (true); - if (session) - session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers + if (_session) + _session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers +*/ +} + +void +Editor::flush_canvas () +{ + if (is_mapped()) { + update_canvas_now (); + // gdk_window_process_updates (GTK_LAYOUT(track_canvas->gobj())->bin_window, true); + } } +void +Editor::update_canvas_now () +{ + /* GnomeCanvas has a bug whereby if its idle handler is not scheduled between + two calls to update_now, an assert will trip. This wrapper works around + that problem by only calling update_now if the assert will not trip. + + I think the GC bug is due to the fact that its code will reset need_update + and need_redraw to FALSE without checking to see if an idle handler is scheduled. + If one is scheduled, GC should probably remove it. + */ + + GnomeCanvas* c = track_canvas->gobj (); + if (c->need_update || c->need_redraw) { + track_canvas->update_now (); + } +}