Don't report an error when the user cancels a time stretch operation.

[ardour.git] / gtk2_ardour / editor_group_tabs.cc

diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc
index 7007c37a05e4b6cba8665d7c72495bc3c596b397..04f61aaeef42d6447dd8ec922d26883c335bf47a 100644 (file)
--- a/gtk2_ardour/editor_group_tabs.cc
+++ b/gtk2_ardour/editor_group_tabs.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 2009 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
@@ -30,7 +30,7 @@ using namespace ARDOUR;
 EditorGroupTabs::EditorGroupTabs (Editor* e)
        : GroupTabs (e)
 {
-       
+
 }
 
 list<GroupTabs::Tab>
@@ -43,25 +43,23 @@ EditorGroupTabs::compute_tabs () const
        tab.group = 0;
 
        int32_t y = 0;
-       for (Editor::TrackViewList::iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
+       for (TrackViewList::iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
 
                if ((*i)->marked_for_display() == false) {
                        continue;
                }
-               
+
                RouteGroup* g = (*i)->route_group ();
 
                if (g != tab.group) {
                        if (tab.group) {
                                tab.to = y;
-                               tab.last_ui_size = (*i)->effective_height ();
                                tabs.push_back (tab);
                        }
 
                        tab.from = y;
                        tab.group = g;
                        tab.colour = (*i)->color ();
-                       tab.first_ui_size = (*i)->effective_height ();
                }
 
                y += (*i)->effective_height ();
@@ -80,7 +78,7 @@ EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 {
        double const arc_radius = _width;
 
-       if (tab.group->is_active()) {
+       if (tab.group && tab.group->is_active()) {
                cairo_set_source_rgba (cr, tab.colour.get_red_p (), tab.colour.get_green_p (), tab.colour.get_blue_p (), 1);
        } else {
                cairo_set_source_rgba (cr, 1, 1, 1, 0.2);
@@ -93,17 +91,19 @@ EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
        cairo_line_to (cr, 0, tab.from + arc_radius);
        cairo_fill (cr);
 
-       pair<string, double> const f = fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2);
-
-       cairo_text_extents_t ext;
-       cairo_text_extents (cr, tab.group->name().c_str(), &ext);
-
-       cairo_set_source_rgb (cr, 1, 1, 1);
-       cairo_move_to (cr, _width - ext.height / 2, tab.from + (f.second + tab.to - tab.from) / 2);
-       cairo_save (cr);
-       cairo_rotate (cr, - M_PI / 2);
-       cairo_show_text (cr, f.first.c_str());
-       cairo_restore (cr);
+       if (tab.group) {
+               pair<string, double> const f = fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2);
+               
+               cairo_text_extents_t ext;
+               cairo_text_extents (cr, tab.group->name().c_str(), &ext);
+               
+               cairo_set_source_rgb (cr, 1, 1, 1);
+               cairo_move_to (cr, _width - ext.height / 2, tab.from + (f.second + tab.to - tab.from) / 2);
+               cairo_save (cr);
+               cairo_rotate (cr, - M_PI / 2);
+               cairo_show_text (cr, f.first.c_str());
+               cairo_restore (cr);
+       }
 }
 
 double
@@ -112,13 +112,13 @@ EditorGroupTabs::primary_coordinate (double, double y) const
        return y;
 }
 
-void
-EditorGroupTabs::reflect_tabs (list<Tab> const & tabs)
+RouteList
+EditorGroupTabs::routes_for_tab (Tab const * t) const
 {
-       list<Tab>::const_iterator j = tabs.begin ();
-       
+       RouteList routes;
        int32_t y = 0;
-       for (Editor::TrackViewList::iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
+       
+       for (TrackViewList::iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
 
                if ((*i)->marked_for_display() == false) {
                        continue;
@@ -127,31 +127,22 @@ EditorGroupTabs::reflect_tabs (list<Tab> const & tabs)
                RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
                if (rtv) {
 
-                       if (j == tabs.end()) {
-                               
-                               /* already run out of tabs, so no edit group */
-                               rtv->route()->set_route_group (0, this);
-                               
-                       } else {
-                               
-                               if (y >= j->to) {
-                                       /* this tab finishes before this track starts, so onto the next tab */
-                                       ++j;
-                               }
-
-                               double const h = y + (*i)->effective_height() / 2;
-
-                               if (j->from < h && j->to > h) {
-                                       rtv->route()->set_route_group (j->group, this);
-                               } else {
-                                       rtv->route()->set_route_group (0, this);
-                               }
-                               
+                       if (y >= t->to) {
+                               /* tab finishes before this track starts */
+                               break;
+                       }
+
+                       double const h = y + (*i)->effective_height() / 2;
+
+                       if (t->from < h && t->to > h) {
+                               routes.push_back (rtv->route ());
                        }
                }
 
                y += (*i)->effective_height ();
        }
+
+       return routes;
 }
 
 
@@ -160,3 +151,9 @@ EditorGroupTabs::get_menu (RouteGroup *g)
 {
        return _editor->_route_groups->menu (g);
 }
+
+RouteGroup *
+EditorGroupTabs::new_route_group () const
+{
+       return _editor->_route_groups->new_route_group ();
+}