X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.h;h=b4c0a03f8506508c084b11694c030ac704873637;hb=1aba241919420198c82f31cffa11f6c8189747fb;hp=dd433c77a2e53c68f07e876d62e02893f0619e67;hpb=52a8242a1158426caeed4757bbc3f7f71091e351;p=ardour.git

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index dd433c77a2..b4c0a03f85 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -268,6 +268,7 @@ class Editor : public PublicEditor
 	Width editor_mixer_strip_width;
 	void maybe_add_mixer_strip_width (XMLNode&);
 	void show_editor_mixer (bool yn);
+	void show_editor_list (bool yn);
 	void set_selected_mixer_strip (TimeAxisView&);
 	void hide_track_in_display (TimeAxisView& tv);
 	void show_track_in_display (TimeAxisView& tv);
@@ -350,6 +351,7 @@ class Editor : public PublicEditor
   private:
 
 	/// The session that we are editing, or 0
+	void color_handler ();
 	ARDOUR::Session     *session;
 	bool                 constructed;
 
@@ -574,13 +576,6 @@ class Editor : public PublicEditor
 	ArdourCanvas::SimpleRect* range_marker_bar;
 	ArdourCanvas::SimpleRect* transport_marker_bar;
 
-	
-	ArdourCanvas::SimpleLine* tempo_line;
-	ArdourCanvas::SimpleLine* meter_line;
-	ArdourCanvas::SimpleLine* marker_line;
-	ArdourCanvas::SimpleLine* range_marker_line;
-	ArdourCanvas::SimpleLine* transport_marker_line;
-
 	Gtk::Label  minsec_label;
 	Gtk::Label  bbt_label;
 	Gtk::Label  smpte_label;
@@ -670,7 +665,6 @@ class Editor : public PublicEditor
 	Gtk::VBox           track_canvas_vbox;
 	Gtk::VBox           time_canvas_vbox;
 	Gtk::VBox           edit_controls_vbox;
-	Gtk::HBox           edit_controls_hbox;
 
 	void control_scroll (float);
 	bool deferred_control_scroll (nframes_t);
@@ -728,7 +722,6 @@ class Editor : public PublicEditor
 
 	Gtk::Menu          *region_list_menu;
 	Gtk::ScrolledWindow region_list_scroller;
-	Gtk::Frame          region_list_frame;
 
 	bool region_list_display_key_press (GdkEventKey *);
 	bool region_list_display_key_release (GdkEventKey *);
@@ -815,6 +808,7 @@ class Editor : public PublicEditor
 	static Gdk::Cursor* time_fx_cursor;
 	static Gdk::Cursor* fader_cursor;
 	static Gdk::Cursor* speaker_cursor;
+	static Gdk::Cursor* note_cursor;
 	static Gdk::Cursor* wait_cursor;
 	static Gdk::Cursor* timebar_cursor;
 
@@ -1298,9 +1292,11 @@ class Editor : public PublicEditor
 
 	/* toolbar */
 	
-	Gtk::ToggleButton        editor_mixer_button;
+	Gtk::ToggleButton editor_mixer_button;
+	Gtk::ToggleButton editor_list_button;
 
 	void editor_mixer_button_toggled ();
+	void editor_list_button_toggled ();
 
 	AudioClock               edit_cursor_clock;
 	AudioClock               zoom_range_clock;
@@ -1322,6 +1318,7 @@ class Editor : public PublicEditor
 	Gtk::ToggleButton        mouse_zoom_button;
 	Gtk::ToggleButton        mouse_timefx_button;
 	Gtk::ToggleButton        mouse_audition_button;
+	Gtk::ToggleButton        mouse_note_button;
 	GroupedButtons          *mouse_mode_button_set;
 	void                     mouse_mode_toggled (Editing::MouseMode m);
 	bool                     ignore_mouse_mode_toggle;