diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-27 22:57:06 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-27 22:57:06 +0000 |
| commit | 11415b49be02f16495c95d6286c485ac8afc5189 (patch) | |
| tree | 8541101b792c6659994aedbd1ac19714e7ef4c2e /gtk2_ardour/editor_routes.h | |
| parent | 5ba1996fd70f05362c70b54e68261b955659f291 (diff) | |
first pass at the big rethink of managing sort order keys for editor and mixer. this appears to work, but remote control IDs are not yet correct (frequently off by one because of the presence of the master bus in the editor)
git-svn-id: svn://localhost/ardour2/branches/3.0@12953 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_routes.h')
| -rw-r--r-- | gtk2_ardour/editor_routes.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h index 00631d914a..cbe9825cb5 100644 --- a/gtk2_ardour/editor_routes.h +++ b/gtk2_ardour/editor_routes.h @@ -42,6 +42,10 @@ public: _no_redisplay = true; } + void allow_redisplay () { + _no_redisplay = false; + } + void resume_redisplay () { _no_redisplay = false; redisplay (); @@ -55,8 +59,8 @@ public: std::list<TimeAxisView*> views () const; void hide_all_tracks (bool); void clear (); - void sync_order_keys (ARDOUR::RouteSortOrderKey); - + uint32_t count_displayed_non_special_routes () const; + void sync_order_keys_from_model (); private: void initial_display (); @@ -68,6 +72,7 @@ private: void on_tv_solo_safe_toggled (std::string const &); void build_menu (); void show_menu (); + void sync_model_from_order_keys (ARDOUR::RouteSortOrderKey); void route_deleted (Gtk::TreeModel::Path const &); void visible_changed (std::string const &); void active_changed (std::string const &); @@ -98,7 +103,6 @@ private: Glib::RefPtr<Gdk::DragContext> const &, gint, gint, Gtk::SelectionData const &, guint, guint ); - void track_list_reorder (Gtk::TreeModel::Path const &, Gtk::TreeModel::iterator const & iter, int* new_order); bool selection_filter (Glib::RefPtr<Gtk::TreeModel> const &, Gtk::TreeModel::Path const &, bool); void name_edit (std::string const &, std::string const &); void solo_changed_so_update_mute (); @@ -150,8 +154,6 @@ private: bool _ignore_reorder; bool _no_redisplay; - bool _redisplay_does_not_sync_order_keys; - bool _redisplay_does_not_reset_order_keys; Gtk::Menu* _menu; Gtk::Widget* old_focus; |