X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_routes.h;h=6297f906bbe806921364a36982e7b35fe89a4e2e;hb=b691ba816f3080d0f8029beac6d0ff4c4c3a1900;hp=7489cbf7d816e3f62f08888bef7bc1607f3d1ce7;hpb=fa701b8c065251d242342b86a54d91826d2290a0;p=ardour.git

diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index 7489cbf7d8..6297f906bb 100644
--- a/gtk2_ardour/editor_routes.h
+++ b/gtk2_ardour/editor_routes.h
@@ -23,7 +23,7 @@
 #include "pbd/signals.h"
 #include "editor_component.h"
 
-class EditorRoutes : public EditorComponent, public PBD::ScopedConnectionList
+class EditorRoutes : public EditorComponent, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
 {
 public:
 	EditorRoutes (Editor *);
@@ -59,30 +59,34 @@ public:
 private:
 
 	void initial_display ();
-	void on_tv_rec_enable_toggled (Glib::ustring const &);
-	void on_tv_mute_enable_toggled (Glib::ustring const &);
-	void on_tv_solo_enable_toggled (Glib::ustring const &);
-	void on_tv_solo_isolate_toggled (Glib::ustring const &);
+	void on_tv_rec_enable_changed (std::string const &);
+	void on_tv_mute_enable_toggled (std::string const &);
+	void on_tv_solo_enable_toggled (std::string const &);
+	void on_tv_solo_isolate_toggled (std::string const &);
+	void on_tv_solo_safe_toggled (std::string const &);
 	void build_menu ();
 	void show_menu ();
 	void route_deleted (Gtk::TreeModel::Path const &);
-	void visible_changed (Glib::ustring const &);
+	void visible_changed (std::string const &);
 	void reordered (Gtk::TreeModel::Path const &, Gtk::TreeModel::iterator const &, int *);
 	bool button_press (GdkEventButton *);
 	void route_property_changed (const PBD::PropertyChange&, boost::weak_ptr<ARDOUR::Route>);
 	void handle_gui_changes (std::string const &, void *);
 	void update_rec_display ();
 	void update_mute_display ();
-	void update_solo_display ();
+	void update_solo_display (bool);
 	void update_solo_isolate_display ();
+	void update_solo_safe_display ();
 	void set_all_tracks_visibility (bool);
-	void set_all_audio_visibility (int, bool);
+	void set_all_audio_midi_visibility (int, bool);
 	void show_all_routes ();
 	void hide_all_routes ();
 	void show_all_audiotracks ();
 	void hide_all_audiotracks ();
 	void show_all_audiobus ();
 	void hide_all_audiobus ();
+	void show_all_miditracks ();
+	void hide_all_miditracks ();
 	void show_tracks_with_regions_at_playhead ();
 	
 	void display_drag_data_received (
@@ -91,29 +95,31 @@ private:
 	
 	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 (Glib::ustring const &, Glib::ustring const &);
+	void name_edit (std::string const &, std::string const &);
 	void solo_changed_so_update_mute ();
 
 	struct ModelColumns : public Gtk::TreeModel::ColumnRecord {
 		ModelColumns() {
 			add (text);
 			add (visible);
-			add (rec_enabled);
+			add (rec_state);
 			add (mute_state);
 			add (solo_state);
 			add (solo_isolate_state);
+			add (solo_safe_state);
 			add (is_track);
 			add (tv);
 			add (route);
 			add (name_editable);
 		}
 		
-		Gtk::TreeModelColumn<Glib::ustring>  text;
+		Gtk::TreeModelColumn<std::string>  text;
 		Gtk::TreeModelColumn<bool>           visible;
-		Gtk::TreeModelColumn<bool>           rec_enabled;
+		Gtk::TreeModelColumn<uint32_t>       rec_state;
 		Gtk::TreeModelColumn<uint32_t>       mute_state;
 		Gtk::TreeModelColumn<uint32_t>       solo_state;
 		Gtk::TreeModelColumn<uint32_t>       solo_isolate_state;
+		Gtk::TreeModelColumn<uint32_t>       solo_safe_state;
 		Gtk::TreeModelColumn<bool>           is_track;
 		Gtk::TreeModelColumn<TimeAxisView*>  tv;
 		Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> >  route;
@@ -131,6 +137,18 @@ private:
 	bool _redisplay_does_not_reset_order_keys;
 	
 	Gtk::Menu* _menu;
+        Gtk::Widget* old_focus; 
+        uint32_t selection_countdown;
+        Gtk::CellEditable* name_editable;
+
+        bool key_press (GdkEventKey* ev);
+        bool focus_in (GdkEventFocus*);
+        bool focus_out (GdkEventFocus*);
+        bool enter_notify (GdkEventCrossing*);
+        bool leave_notify (GdkEventCrossing*);
+        void name_edit_started (Gtk::CellEditable*, const Glib::ustring&);
+
+        bool get_relevant_routes (boost::shared_ptr<ARDOUR::RouteList> rl);
 };
 
 #endif /* __ardour_gtk_editor_route_h__ */