From 2fd62f25b3202b4aa94a4afd19e9233a003f877a Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 2 May 2013 20:28:04 -0400
Subject: [PATCH] remove channel selector from canvas note events, as was done
 in master

---
 gtk2_ardour/note_base.cc | 60 ----------------------------------------
 gtk2_ardour/note_base.h  |  4 ---
 2 files changed, 64 deletions(-)

diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc
index e792fcba7d..3bdb73489e 100644
--- a/gtk2_ardour/note_base.cc
+++ b/gtk2_ardour/note_base.cc
@@ -48,7 +48,6 @@ NoteBase::NoteBase(MidiRegionView& region, bool with_events, const boost::shared
 	: _region(region)
 	, _item (0)
 	, _text(0)
-//	, _channel_selector_widget()
 	, _state(None)
 	, _note(note)
 	, _with_events (with_events)
@@ -64,9 +63,6 @@ NoteBase::~NoteBase()
 	NoteBaseDeleted (this);
 
 	delete _text;
-
-	/* XXX */
-//	delete _channel_selector_widget;
 }
 
 void
@@ -138,59 +134,9 @@ void
 NoteBase::on_channel_change(uint8_t channel)
 {
 	_region.note_selected(this, true);
-	hide_channel_selector();
 	_region.change_channel(channel);
 }
 
-void
-NoteBase::show_channel_selector ()
-{
-#if 0	
-	if (_channel_selector_widget == 0) {
-	  
-	  	if(_region.channel_selector_scoped_note() != 0){
-		    _region.channel_selector_scoped_note()->hide_channel_selector();
-		    _region.set_channel_selector_scoped_note(0);
-		}
-
-		SingleMidiChannelSelector* _channel_selector = new SingleMidiChannelSelector(_note->channel());
-		_channel_selector->show_all();
-		_channel_selector->channel_selected.connect(
-			sigc::mem_fun(this, &NoteBase::on_channel_change));
-
-		_channel_selector->clicked.connect (
-			sigc::mem_fun (this, &NoteBase::hide_channel_selector));
-
-		_channel_selector_widget = new Widget(*(_item->property_parent()),
-		                                      x1(),
-		                                      y2() + 2,
-		                                      (Gtk::Widget &) *_channel_selector);
-
-		_channel_selector_widget->hide();
-		_channel_selector_widget->property_height() = 100;
-		_channel_selector_widget->property_width() = 100;
-		_channel_selector_widget->raise_to_top();
-		_channel_selector_widget->show();
-		
-		_region.set_channel_selector_scoped_note(this);
-	} else {
-		hide_channel_selector();
-	}
-#endif	
-}
-
-void
-NoteBase::hide_channel_selector ()
-{
-#if 0
-	if (_channel_selector_widget) {
-		_channel_selector_widget->hide();
-		delete _channel_selector_widget;
-		_channel_selector_widget = 0;
-	}
-#endif	
-}
-
 void
 NoteBase::set_selected(bool selected)
 {
@@ -203,14 +149,8 @@ NoteBase::set_selected(bool selected)
         
 	if (_selected) {
 		set_outline_color(calculate_outline(ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected()));
-		
-		if(_region.channel_selector_scoped_note() != 0){
-		    _region.channel_selector_scoped_note()->hide_channel_selector();
-		    _region.set_channel_selector_scoped_note(0);
-		}
 	} else {
 		set_outline_color(calculate_outline(base_color()));
-		hide_channel_selector();
 	}
 
 }
diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h
index 289a5fa671..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;
 
@@ -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;