Numerical sort patch from mantis #2654
[ardour.git] / gtk2_ardour / editor_route_list.cc
index 86e516d17c9122678c469e5fda1766bdf6e8e711..86c7c9d437519a60ba0180d16d23c54df0f4ffc4 100644 (file)
@@ -38,6 +38,9 @@ using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
+using namespace Glib;
+
+const char* _order_key = N_("editor");
 
 void
 Editor::handle_new_route (Session::RouteList& routes)
@@ -49,8 +52,7 @@ Editor::handle_new_route (Session::RouteList& routes)
        TreeModel::Row parent;
        TreeModel::Row row;
 
-       ignore_route_list_reorder = true;
-       ignore_route_order_sync = true;
+       route_redisplay_does_not_sync_order_keys = true;
        no_route_list_redisplay = true;
 
        for (Session::RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
@@ -60,7 +62,7 @@ Editor::handle_new_route (Session::RouteList& routes)
                        continue;
                }
                
-               tv = new AudioTimeAxisView (*this, *session, route, track_canvas);
+               tv = new AudioTimeAxisView (*this, *session, route, *track_canvas);
                //cerr << "Editor::handle_new_route() called on " << route->name() << endl;//DEBUG
                row = *(route_display_model->append ());
                
@@ -73,18 +75,16 @@ Editor::handle_new_route (Session::RouteList& routes)
                
                if ((atv = dynamic_cast<AudioTimeAxisView*> (tv)) != 0) {
                        /* added a new fresh one at the end */
-                       if (atv->route()->order_key(N_("editor")) == -1) {
-                               atv->route()->set_order_key (N_("editor"), route_display_model->children().size()-1);
+                       if (atv->route()->order_key(_order_key) == -1) {
+                               atv->route()->set_order_key (_order_key, route_display_model->children().size()-1);
                        }
+                       atv->effective_gain_display ();
                }
 
-               tv->set_old_order_key (route_display_model->children().size() - 1);
                route->gui_changed.connect (mem_fun(*this, &Editor::handle_gui_changes));
                tv->GoingAway.connect (bind (mem_fun(*this, &Editor::remove_route), tv));
        }
 
-       ignore_route_list_reorder = false;
-       ignore_route_order_sync = false;
        no_route_list_redisplay = false;
 
        redisplay_route_list ();
@@ -92,16 +92,24 @@ Editor::handle_new_route (Session::RouteList& routes)
        if (show_editor_mixer_when_tracks_arrive) {
                show_editor_mixer (true);
        }
-
-       editor_mixer_button.set_sensitive(true);
+       
+       route_redisplay_does_not_sync_order_keys = false;
 }
 
 void
 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 ();
        }
 }
@@ -114,37 +122,52 @@ Editor::remove_route (TimeAxisView *tv)
        TrackViewList::iterator i;
        TreeModel::Children rows = route_display_model->children();
        TreeModel::Children::iterator ri;
+       boost::shared_ptr<Route> route;
+       TimeAxisView* next_tv;
 
-       /* 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];
-               if (v->old_order_key() > tv->old_order_key()) {
-                       v->set_old_order_key (v->old_order_key() - 1);
-               }
+       if (tv == entered_track) {
+               entered_track = 0;
        }
 
+       /* the core model has changed, there is no need to sync 
+          view orders.
+       */
+
+       route_redisplay_does_not_sync_order_keys = true;
+
        for (ri = rows.begin(); ri != rows.end(); ++ri) {
                if ((*ri)[route_display_columns.tv] == tv) {
+                       route = (*ri)[route_display_columns.route];
                        route_display_model->erase (ri);
                        break;
                }
        }
 
+       route_redisplay_does_not_sync_order_keys = false;
+
        if ((i = find (track_views.begin(), track_views.end(), tv)) != track_views.end()) {
-               track_views.erase (i);
+               i = track_views.erase (i);
+               
+               if (track_views.empty()) {
+                       next_tv = 0;
+               } else if (i == track_views.end()) {
+                       next_tv = track_views.front();
+               } else {
+                       next_tv = (*i);
+               }
        }
 
-       /* since the editor mixer goes away when you remove a route, set the
-        * button to inactive and untick the menu option
-        */
-
-       editor_mixer_button.set_active(false);
-       ActionManager::uncheck_toggleaction ("<Actions>/Editor/show-editor-mixer");
+       if (current_mixer_strip && (current_mixer_strip->route() == route)) {
 
-       /* and disable if all tracks and/or routes are gone */
-
-       if (track_views.size() == 0) {
-               editor_mixer_button.set_sensitive(false);
+               if (next_tv) {
+                       set_selected_mixer_strip (*next_tv);
+               } else {
+                       /* make the editor mixer strip go away by setting the
+                        * button to inactive (which also unticks the menu option)
+                        */
+                       
+                       ActionManager::uncheck_toggleaction ("<Actions>/Editor/show-editor-mixer");
+               }
        }
 }
 
@@ -162,11 +185,27 @@ 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 ();
+       }
+
+       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;
@@ -195,20 +234,19 @@ Editor::show_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] = true;
-                       tv.set_marked_for_display (true);
                        break;
                }
        }
 }
 
 void
-Editor::sync_order_keys ()
+Editor::sync_order_keys (const char *src)
 {
        vector<int> neworder;
        TreeModel::Children rows = route_display_model->children();
        TreeModel::Children::iterator ri;
 
-       if (ignore_route_order_sync || !session || (session->state_of_the_state() & Session::Loading) || rows.empty()) {
+       if ((strcmp (src, _order_key) == 0) || !session || (session->state_of_the_state() & Session::Loading) || rows.empty()) {
                return;
        }
 
@@ -216,15 +254,27 @@ Editor::sync_order_keys ()
                neworder.push_back (0);
        }
 
-       for (ri = rows.begin(); ri != rows.end(); ++ri) {
-               TimeAxisView* tv = (*ri)[route_display_columns.tv];
+       bool changed = false;
+       int order;
+
+       for (order = 0, ri = rows.begin(); ri != rows.end(); ++ri, ++order) {
                boost::shared_ptr<Route> route = (*ri)[route_display_columns.route];
-               neworder[route->order_key (X_("editor"))] = tv->old_order_key ();
+
+               int old_key = order;
+               int new_key = route->order_key (_order_key);
+
+               neworder[new_key] = old_key;
+
+               if (new_key != old_key) {
+                       changed = true;
+               }
        }
 
-       ignore_route_list_reorder = true;
-       route_display_model->reorder (neworder);
-       ignore_route_list_reorder = false;
+       if (changed) {
+               route_redisplay_does_not_reset_order_keys = true;
+               route_display_model->reorder (neworder);
+               route_redisplay_does_not_reset_order_keys = false;
+       }
 }
 
 void
@@ -254,23 +304,23 @@ Editor::redisplay_route_list ()
                        continue;
                }
 
-               if (!ignore_route_list_reorder) {
+               if (!route_redisplay_does_not_reset_order_keys) {
                        
                        /* this reorder is caused by user action, so reassign sort order keys
                           to tracks.
                        */
                        
-                       route->set_order_key (N_("editor"), order);
+                       route->set_order_key (_order_key, order);
                }
 
-               tv->set_old_order_key (order);
-
                bool visible = (*i)[route_display_columns.visible];
-
+               
                if (visible) {
                        tv->set_marked_for_display (true);
                        position += tv->show_at (position, n, &edit_controls_vbox);
+                       tv->clip_to_viewport ();
                } else {
+                       tv->set_marked_for_display (false);
                        tv->hide ();
                }
                
@@ -278,19 +328,42 @@ Editor::redisplay_route_list ()
                ++n;
        }
 
-       full_canvas_height = position;
+       /* whenever we go idle, update the track view list to reflect the new order.
+          we can't do this here, because we could mess up something that is traversing
+          the track order and has caused a redisplay of the list.
+       */
 
-       /* make sure the cursors stay on top of every newly added track */
+       Glib::signal_idle().connect (mem_fun (*this, &Editor::sync_track_view_list_and_route_list));
 
-       cursor_group->raise_to_top ();
+       full_canvas_height = position + canvas_timebars_vsize;
+       vertical_adjustment.set_upper (full_canvas_height);
+       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);
+       } 
 
-       reset_scrolling_region ();
+       if (!route_redisplay_does_not_reset_order_keys && !route_redisplay_does_not_sync_order_keys) {
+               session->sync_order_keys (_order_key);
+       }
+}
 
-       if (Config->get_sync_all_route_ordering() && !ignore_route_list_reorder) {
-               ignore_route_order_sync = true;
-               Route::SyncOrderKeys (); // EMIT SIGNAL
-               ignore_route_order_sync = false;
+bool
+Editor::sync_track_view_list_and_route_list ()
+{
+       TreeModel::Children rows = route_display_model->children();
+       TreeModel::Children::iterator i;
+
+       track_views.clear ();
+
+       for (i = rows.begin(); i != rows.end(); ++i) {
+               TimeAxisView *tv = (*i)[route_display_columns.tv];
+               track_views.push_back (tv);
        }
+       
+       return false; // do not call again (until needed)
 }
 
 void
@@ -320,7 +393,7 @@ Editor::hide_all_tracks (bool with_select)
           otherwise.
        */
 
-       reset_scrolling_region ();
+       //reset_scrolling_region ();
 }
 
 void
@@ -502,7 +575,7 @@ Editor::route_list_selection_filter (const Glib::RefPtr<TreeModel>& model, const
 struct EditorOrderRouteSorter {
     bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
            /* use of ">" forces the correct sort order */
-           return a->order_key ("editor") < b->order_key ("editor");
+           return a->order_key (_order_key) < b->order_key (_order_key);
     }
 };
 
@@ -529,20 +602,159 @@ Editor::initial_route_list_display ()
 void
 Editor::track_list_reorder (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter, int* new_order)
 {
+       route_redisplay_does_not_sync_order_keys = true;
        session->set_remote_control_ids();
        redisplay_route_list ();
+       route_redisplay_does_not_sync_order_keys = false;
 }
 
 void
 Editor::route_list_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter)
 {
+       /* never reset order keys because of a property change */
+       route_redisplay_does_not_reset_order_keys = true;
        session->set_remote_control_ids();
        redisplay_route_list ();
+       route_redisplay_does_not_reset_order_keys = false;
 }
 
 void
 Editor::route_list_delete (const Gtk::TreeModel::Path& path)
 {
+       /* this could require an order reset & sync */
        session->set_remote_control_ids();
        redisplay_route_list ();
 }
+
+void  
+Editor::route_list_display_drag_data_received (const RefPtr<Gdk::DragContext>& context,
+                                               int x, int y, 
+                                               const SelectionData& data,
+                                               guint info, guint time)
+{
+       if (data.get_target() == "GTK_TREE_MODEL_ROW") {
+               route_list_display.on_drag_data_received (context, x, y, data, info, time);
+               return;
+       }
+       context->drag_finish (true, false, time);
+}
+
+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);
+       }
+}
+
+void
+Editor::move_selected_tracks (bool up)
+{
+       if (selection->tracks.empty()) {
+               return;
+       }
+
+       typedef pair<TimeAxisView*,boost::shared_ptr<Route> > ViewRoute;
+       list<ViewRoute> view_routes;
+       vector<int> neworder;
+       TreeModel::Children rows = route_display_model->children();
+       TreeModel::Children::iterator ri;
+
+       for (ri = rows.begin(); ri != rows.end(); ++ri) {
+               TimeAxisView* tv = (*ri)[route_display_columns.tv];
+               boost::shared_ptr<Route> route = (*ri)[route_display_columns.route];
+
+               view_routes.push_back (ViewRoute (tv, route));
+       }
+
+       list<ViewRoute>::iterator trailing;
+       list<ViewRoute>::iterator leading;
+       
+       if (up) {
+               
+               trailing = view_routes.begin();
+               leading = view_routes.begin();
+               
+               ++leading;
+               
+               while (leading != view_routes.end()) {
+                       if (selection->selected (leading->first)) {
+                               view_routes.insert (trailing, ViewRoute (leading->first, leading->second));
+                               leading = view_routes.erase (leading);
+                       } else {
+                               ++leading;
+                               ++trailing;
+                       }
+               }
+
+       } else {
+
+               /* if we could use reverse_iterator in list::insert, this code
+                  would be a beautiful reflection of the code above. but we can't
+                  and so it looks like a bit of a mess.
+               */
+
+               trailing = view_routes.end();
+               leading = view_routes.end();
+
+               --leading; if (leading == view_routes.begin()) { return; }
+               --leading;
+               --trailing;
+
+               while (1) {
+
+                       if (selection->selected (leading->first)) {
+                               list<ViewRoute>::iterator tmp;
+
+                               /* need to insert *after* trailing, not *before* it,
+                                  which is what insert (iter, val) normally does.
+                               */
+
+                               tmp = trailing;
+                               tmp++;
+
+                               view_routes.insert (tmp, ViewRoute (leading->first, leading->second));
+                                       
+                               /* can't use iter = cont.erase (iter); form here, because
+                                  we need iter to move backwards.
+                               */
+
+                               tmp = leading;
+                               --tmp;
+
+                               bool done = false;
+
+                               if (leading == view_routes.begin()) {
+                                       /* the one we've just inserted somewhere else
+                                          was the first in the list. erase this copy,
+                                          and then break, because we're done.
+                                       */
+                                       done = true;
+                               }
+
+                               view_routes.erase (leading);
+                               
+                               if (done) {
+                                       break;
+                               }
+
+                               leading = tmp;
+
+                       } else {
+                               if (leading == view_routes.begin()) {
+                                       break;
+                               }
+                               --leading;
+                               --trailing;
+                       }
+               };
+       }
+
+       for (leading = view_routes.begin(); leading != view_routes.end(); ++leading) {
+               neworder.push_back (leading->second->order_key (_order_key));
+       }
+
+       route_display_model->reorder (neworder);
+
+       session->sync_order_keys (_order_key);
+}