X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fnote_base.h;h=8ee3a4d27790496a15f16ddfd5772b1fd19d47ad;hb=300b484cf6ac14c15e365c4062345d64a61c4b18;hp=9680091c75456e0234df81d02f554eba83da784e;hpb=6ae4f104371ed433a79c8845de97428d964edd8b;p=ardour.git

diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h
index 9680091c75..8ee3a4d277 100644
--- a/gtk2_ardour/note_base.h
+++ b/gtk2_ardour/note_base.h
@@ -91,9 +91,6 @@ public:
 	/** Channel selection changed */
 	void on_channel_selection_change(uint16_t selection);
 
-	void show_channel_selector();
-	void hide_channel_selector();
-
 	virtual void set_outline_color(uint32_t c) = 0;
 	virtual void set_fill_color(uint32_t c) = 0;
 
@@ -112,25 +109,25 @@ public:
                 if (selected) {
                         if (vel < 64) {
                                 return UINT_INTERPOLATE(
-					ARDOUR_UI::config()->canvasvar_SelectedMidiNoteColorBase.get(),
-					ARDOUR_UI::config()->canvasvar_SelectedMidiNoteColorMid.get(),
+					ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorBase(),
+					ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorMid(),
 					(vel / (double)63.0));
                         } else {
                                 return UINT_INTERPOLATE(
-					ARDOUR_UI::config()->canvasvar_SelectedMidiNoteColorMid.get(),
-					ARDOUR_UI::config()->canvasvar_SelectedMidiNoteColorTop.get(),
+					ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorMid(),
+					ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorTop(),
 					((vel-64) / (double)63.0));
                         }
                 } else {
                         if (vel < 64) {
                                 return UINT_INTERPOLATE(
-					ARDOUR_UI::config()->canvasvar_MidiNoteColorBase.get(),
-					ARDOUR_UI::config()->canvasvar_MidiNoteColorMid.get(),
+					ARDOUR_UI::config()->get_canvasvar_MidiNoteColorBase(),
+					ARDOUR_UI::config()->get_canvasvar_MidiNoteColorMid(),
 					(vel / (double)63.0));
                         } else {
                                 return UINT_INTERPOLATE(
-					ARDOUR_UI::config()->canvasvar_MidiNoteColorMid.get(),
-					ARDOUR_UI::config()->canvasvar_MidiNoteColorTop.get(),
+					ARDOUR_UI::config()->get_canvasvar_MidiNoteColorMid(),
+					ARDOUR_UI::config()->get_canvasvar_MidiNoteColorTop(),
 					((vel-64) / (double)63.0));
                         }
                 }
@@ -153,7 +150,6 @@ protected:
 	MidiRegionView&                   _region;
 	ArdourCanvas::Item*               _item;
 	ArdourCanvas::Text*               _text;
-//	Widget*                           _channel_selector_widget;
 	State                             _state;
 	const boost::shared_ptr<NoteType> _note;
 	bool                              _with_events;