X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_summary.cc;h=cc9f1a6783b683bd121f8fc60a0eac61a22b7e0c;hb=89d48f4459e64ec8a0d49964b2735a95b2032ba3;hp=1c30df4f3af17fe9ef19ed5e4ee4f2baebd699b1;hpb=680c64246e4ee9f3eb53da079dea6a7ecf996e92;p=ardour.git diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc index 1c30df4f3a..cc9f1a6783 100644 --- a/gtk2_ardour/editor_summary.cc +++ b/gtk2_ardour/editor_summary.cc @@ -21,6 +21,7 @@ #include "canvas/debug.h" +#include "ardour_ui.h" #include "time_axis_view.h" #include "streamview.h" #include "editor_summary.h" @@ -54,16 +55,41 @@ EditorSummary::EditorSummary (Editor* e) _view_rectangle_x (0, 0), _view_rectangle_y (0, 0), _zoom_dragging (false), - _old_follow_playhead (false) + _old_follow_playhead (false), + _image (0), + _background_dirty (true) { - Region::RegionPropertyChanged.connect (region_property_connection, invalidator (*this), boost::bind (&CairoWidget::set_dirty, this), gui_context()); - Route::RemoteControlIDChange.connect (route_ctrl_id_connection, invalidator (*this), boost::bind (&CairoWidget::set_dirty, this), gui_context()); - _editor->playhead_cursor->PositionChanged.connect (position_connection, invalidator (*this), boost::bind (&EditorSummary::playhead_position_changed, this, _1), gui_context()); - add_events (Gdk::POINTER_MOTION_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK); set_flags (get_flags() | Gtk::CAN_FOCUS); + + ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun (*this, &EditorSummary::parameter_changed)); +} + +EditorSummary::~EditorSummary () +{ + cairo_surface_destroy (_image); +} + +void +EditorSummary::parameter_changed (string p) +{ + + if (p == "color-regions-using-track-color") { + set_background_dirty (); + } } +/** Handle a size allocation. + * @param alloc GTK allocation. + */ +void +EditorSummary::on_size_allocate (Gtk::Allocation& alloc) +{ + CairoWidget::on_size_allocate (alloc); + set_background_dirty (); +} + + /** Connect to a session. * @param s Session. */ @@ -80,27 +106,29 @@ EditorSummary::set_session (Session* s) */ if (_session) { - _session->StartTimeChanged.connect (_session_connections, invalidator (*this), boost::bind (&CairoWidget::set_dirty, this), gui_context()); - _session->EndTimeChanged.connect (_session_connections, invalidator (*this), boost::bind (&CairoWidget::set_dirty, this), gui_context()); + Region::RegionPropertyChanged.connect (region_property_connection, invalidator (*this), boost::bind (&EditorSummary::set_background_dirty, this), gui_context()); + Route::RemoteControlIDChange.connect (route_ctrl_id_connection, invalidator (*this), boost::bind (&EditorSummary::set_background_dirty, this), gui_context()); + _editor->playhead_cursor->PositionChanged.connect (position_connection, invalidator (*this), boost::bind (&EditorSummary::playhead_position_changed, this, _1), gui_context()); + _session->StartTimeChanged.connect (_session_connections, invalidator (*this), boost::bind (&EditorSummary::set_background_dirty, this), gui_context()); + _session->EndTimeChanged.connect (_session_connections, invalidator (*this), boost::bind (&EditorSummary::set_background_dirty, this), gui_context()); + _editor->selection->RegionsChanged.connect (sigc::mem_fun(*this, &EditorSummary::set_background_dirty)); } } -/** Render the required regions to a cairo context. - * @param cr Context. - */ void -EditorSummary::render (cairo_t* cr) +EditorSummary::render_background_image () { - /* background (really just the dividing lines between tracks */ + cairo_surface_destroy (_image); // passing NULL is safe + _image = cairo_image_surface_create (CAIRO_FORMAT_RGB24, get_width (), get_height ()); + + cairo_t* cr = cairo_create (_image); + + /* background (really just the dividing lines between tracks */ cairo_set_source_rgb (cr, 0, 0, 0); cairo_rectangle (cr, 0, 0, get_width(), get_height()); cairo_fill (cr); - if (_session == 0) { - return; - } - /* compute start and end points for the summary */ framecnt_t const session_length = _session->current_end_frame() - _session->current_start_frame (); @@ -169,13 +197,39 @@ EditorSummary::render (cairo_t* cr) const double p = (_session->current_start_frame() - _start) * _x_scale; cairo_move_to (cr, p, 0); cairo_line_to (cr, p, get_height()); - cairo_stroke (cr); double const q = (_session->current_end_frame() - _start) * _x_scale; cairo_move_to (cr, q, 0); cairo_line_to (cr, q, get_height()); cairo_stroke (cr); + cairo_destroy (cr); +} + +/** Render the required regions to a cairo context. + * @param cr Context. + */ +void +EditorSummary::render (cairo_t* cr, cairo_rectangle_t*) +{ + + if (_session == 0) { + return; + } + + if (!_image || _background_dirty) { + render_background_image (); + _background_dirty = false; + } + + cairo_push_group (cr); + + /* Fill with the background image */ + + cairo_rectangle (cr, 0, 0, get_width(), get_height()); + cairo_set_source_surface (cr, _image, 0, 0); + cairo_fill (cr); + /* Render the view rectangle. If there is an editor visual pending, don't update the view rectangle now --- wait until the expose event that we'll get after the visual change. This prevents a flicker. @@ -185,11 +239,9 @@ EditorSummary::render (cairo_t* cr) get_editor (&_view_rectangle_x, &_view_rectangle_y); } - cairo_move_to (cr, _view_rectangle_x.first, _view_rectangle_y.first); - cairo_line_to (cr, _view_rectangle_x.second, _view_rectangle_y.first); - cairo_line_to (cr, _view_rectangle_x.second, _view_rectangle_y.second); - cairo_line_to (cr, _view_rectangle_x.first, _view_rectangle_y.second); - cairo_line_to (cr, _view_rectangle_x.first, _view_rectangle_y.first); + int32_t width = _view_rectangle_x.second - _view_rectangle_x.first; + int32_t height = _view_rectangle_y.second - _view_rectangle_y.first; + cairo_rectangle (cr, _view_rectangle_x.first, _view_rectangle_y.first, width, height); cairo_set_source_rgba (cr, 1, 1, 1, 0.25); cairo_fill_preserve (cr); cairo_set_line_width (cr, 1); @@ -206,6 +258,8 @@ EditorSummary::render (cairo_t* cr) cairo_move_to (cr, ph, 0); cairo_line_to (cr, ph, get_height()); cairo_stroke (cr); + cairo_pop_group_to_source (cr); + cairo_paint (cr); _last_playhead = ph; } @@ -236,6 +290,13 @@ EditorSummary::render_region (RegionView* r, cairo_t* cr, double y) const cairo_stroke (cr); } +void +EditorSummary::set_background_dirty () +{ + _background_dirty = true; + set_dirty (); +} + /** Set the summary so that just the overlays (viewbox, playhead etc.) will be re-rendered */ void EditorSummary::set_overlays_dirty () @@ -440,7 +501,7 @@ EditorSummary::get_editor (pair* x, pair* y) con x->second = x->first + _editor->current_page_samples() * _x_scale; y->first = editor_y_to_summary (_editor->vertical_adjustment.get_value ()); - y->second = editor_y_to_summary (_editor->vertical_adjustment.get_value () + _editor->visible_canvas_height()); + y->second = editor_y_to_summary (_editor->vertical_adjustment.get_value () + _editor->visible_canvas_height() - _editor->get_trackview_group()->canvas_origin().y); } } @@ -805,7 +866,7 @@ void EditorSummary::set_editor_y (double const y) { double y1 = summary_y_to_editor (y); - double const eh = _editor->visible_canvas_height(); + double const eh = _editor->visible_canvas_height() - _editor->get_trackview_group()->canvas_origin().y; double y2 = y1 + eh; double const full_editor_height = _editor->_full_canvas_height; @@ -981,18 +1042,18 @@ EditorSummary::routes_added (list const & r) (*i)->route()->gui_changed.connect (*this, invalidator (*this), boost::bind (&EditorSummary::route_gui_changed, this, _1), gui_context ()); boost::shared_ptr tr = boost::dynamic_pointer_cast ((*i)->route ()); if (tr) { - tr->PlaylistChanged.connect (*this, invalidator (*this), boost::bind (&CairoWidget::set_dirty, this), gui_context ()); + tr->PlaylistChanged.connect (*this, invalidator (*this), boost::bind (&EditorSummary::set_background_dirty, this), gui_context ()); } } - set_dirty (); + set_background_dirty (); } void EditorSummary::route_gui_changed (string c) { if (c == "color") { - set_dirty (); + set_background_dirty (); } }