Plugin automation fixes from torbenh.

[ardour.git] / gtk2_ardour / editor_route_list.cc

diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc
index d7611d7cdf565458ada3bd8d23fe1b9173113efe..8fdc1ce1109332d3a0b60f262e4a38c6beb4dbf4 100644 (file)
--- a/gtk2_ardour/editor_route_list.cc
+++ b/gtk2_ardour/editor_route_list.cc
@@ -66,11 +66,12 @@ Editor::handle_new_route (Session::RouteList& routes)
                }
                
                if (route->default_type() == ARDOUR::DataType::AUDIO)
-                       tv = new AudioTimeAxisView (*this, *session, route, track_canvas);
+                       tv = new AudioTimeAxisView (*this, *session, route, *track_canvas);
                else if (route->default_type() == ARDOUR::DataType::MIDI)
-                       tv = new MidiTimeAxisView (*this, *session, route, track_canvas);
+                       tv = new MidiTimeAxisView (*this, *session, route, *track_canvas);
                else
                        throw unknown_type();
+
                //cerr << "Editor::handle_new_route() called on " << route->name() << endl;//DEBUG
 #if 0
                if (route_display_model->children().size() == 0) {
@@ -101,12 +102,14 @@ Editor::handle_new_route (Session::RouteList& routes)
 #else 
                row = *(route_display_model->append ());
 #endif
+
+               cerr << route->name() << " marked for display ? " << tv->marked_for_display() << endl;
                
                row[route_display_columns.text] = route->name();
                row[route_display_columns.visible] = tv->marked_for_display();
                row[route_display_columns.tv] = tv;
                row[route_display_columns.route] = route;
-               
+
                track_views.push_back (tv);
                
                ignore_route_list_reorder = true;
@@ -147,10 +150,17 @@ Editor::handle_gui_changes (const string & what, void *src)
        ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::handle_gui_changes), what, src));
        
        if (what == "track_height") {
+               /* Optional :make tracks change height while it happens, instead 
+                  of on first-idle
+               */
+               //track_canvas->update_now ();
                redisplay_route_list ();
        }
-}
 
+       if (what == "visible_tracks") {
+               redisplay_route_list ();
+       }
+}
 
 void
 Editor::remove_route (TimeAxisView *tv)
@@ -161,6 +171,10 @@ Editor::remove_route (TimeAxisView *tv)
        TreeModel::Children rows = route_display_model->children();
        TreeModel::Children::iterator ri;
 
+       if (tv == entered_track) {
+               entered_track = 0;
+       }
+
        /* Decrement old order keys for tracks `above' the one that is being removed */
        for (ri = rows.begin(); ri != rows.end(); ++ri) {
                TimeAxisView* v = (*ri)[route_display_columns.tv];
@@ -208,11 +222,28 @@ Editor::route_name_changed (TimeAxisView *tv)
                        break;
                }
        } 
+}
+
+void
+Editor::update_route_visibility ()
+{
+       TreeModel::Children rows = route_display_model->children();
+       TreeModel::Children::iterator i;
+       
+       no_route_list_redisplay = true;
+
+       for (i = rows.begin(); i != rows.end(); ++i) {
+               TimeAxisView *tv = (*i)[route_display_columns.tv];
+               (*i)[route_display_columns.visible] = tv->marked_for_display ();
+               cerr << "marked " << tv->name() << " for display = " << tv->marked_for_display() << endl;
+       }
 
+       no_route_list_redisplay = false;
+       redisplay_route_list ();
 }
 
 void
-Editor::hide_track_in_display (TimeAxisView& tv)
+Editor::hide_track_in_display (TimeAxisView& tv, bool temponly)
 {
        TreeModel::Children rows = route_display_model->children();
        TreeModel::Children::iterator i;
@@ -220,6 +251,9 @@ Editor::hide_track_in_display (TimeAxisView& tv)
        for (i = rows.begin(); i != rows.end(); ++i) {
                if ((*i)[route_display_columns.tv] == &tv) { 
                        (*i)[route_display_columns.visible] = false;
+                       // if (temponly) {
+                       tv.set_marked_for_display (false);
+                       // }
                        break;
                }
        }
@@ -288,7 +322,7 @@ Editor::redisplay_route_list ()
        uint32_t position;
        uint32_t order;
        int n;
-       
+
        if (no_route_list_redisplay) {
                return;
        }
@@ -329,11 +363,14 @@ Editor::redisplay_route_list ()
 
        full_canvas_height = position;
 
-       /* make sure the cursors stay on top of every newly added track */
-
-       cursor_group->raise_to_top ();
-
-       reset_scrolling_region ();
+       vertical_adjustment.set_upper (position + canvas_timebars_vsize);
+       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 (position + canvas_timebars_vsize - canvas_height);
+       } 
 
        if (Config->get_sync_all_route_ordering() && !ignore_route_list_reorder) {
                ignore_route_order_sync = true;
@@ -370,13 +407,13 @@ Editor::hide_all_tracks (bool with_select)
           otherwise.
        */
 
-       reset_scrolling_region ();
+       //reset_scrolling_region ();
 }
 
 void
 Editor::build_route_list_menu ()
 {
-        using namespace Menu_Helpers;
+       using namespace Menu_Helpers;
        using namespace Gtk;
 
        route_list_menu = new Menu;
@@ -396,7 +433,7 @@ Editor::build_route_list_menu ()
 void
 Editor::set_all_tracks_visibility (bool yn)
 {
-        TreeModel::Children rows = route_display_model->children();
+       TreeModel::Children rows = route_display_model->children();
        TreeModel::Children::iterator i;
 
        no_route_list_redisplay = true;
@@ -420,7 +457,7 @@ Editor::set_all_tracks_visibility (bool yn)
 void
 Editor::set_all_audio_visibility (int tracks, bool yn) 
 {
-        TreeModel::Children rows = route_display_model->children();
+       TreeModel::Children rows = route_display_model->children();
        TreeModel::Children::iterator i;
 
        no_route_list_redisplay = true;
@@ -594,10 +631,11 @@ void
 Editor::route_list_delete (const Gtk::TreeModel::Path& path)
 {
        session->set_remote_control_ids();
+       ignore_route_list_reorder = true;
        redisplay_route_list ();
+       ignore_route_list_reorder = false;
 }
 
-
 void  
 Editor::route_list_display_drag_data_received (const RefPtr<Gdk::DragContext>& context,
                                                int x, int y, 
@@ -615,7 +653,6 @@ Editor::route_list_display_drag_data_received (const RefPtr<Gdk::DragContext>& c
        context->drag_finish (true, false, time);
 }
 
-
 RouteTimeAxisView*
 Editor::get_route_view_by_id (PBD::ID& id)
 {
@@ -631,3 +668,11 @@ Editor::get_route_view_by_id (PBD::ID& id)
 
        return 0;
 }
+
+void
+Editor::foreach_time_axis_view (sigc::slot<void,TimeAxisView&> theslot)
+{
+       for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+               theslot (**i);
+       }
+}