From 80d714a34f9efbb494d69cb9a88270cd5e251744 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 2 May 2013 15:35:21 -0400
Subject: [PATCH] rest of change to right click on MIDI note: remove channel
 selector cruft from canvas note event

---
 gtk2_ardour/canvas-note-event.cc | 58 --------------------------------
 gtk2_ardour/canvas-note-event.h  |  4 ---
 2 files changed, 62 deletions(-)

diff --git a/gtk2_ardour/canvas-note-event.cc b/gtk2_ardour/canvas-note-event.cc
index 8932633bd9..dfcf04eea1 100644
--- a/gtk2_ardour/canvas-note-event.cc
+++ b/gtk2_ardour/canvas-note-event.cc
@@ -22,7 +22,6 @@
 #include "gtkmm2ext/keyboard.h"
 
 #include "canvas-note-event.h"
-#include "midi_channel_selector.h"
 #include "midi_region_view.h"
 #include "public_editor.h"
 #include "editing_syms.h"
@@ -49,7 +48,6 @@ CanvasNoteEvent::CanvasNoteEvent(MidiRegionView& region, Item* item, const boost
 	: _region(region)
 	, _item(item)
 	, _text(0)
-	, _channel_selector_widget()
 	, _state(None)
 	, _note(note)
 	, _selected(false)
@@ -68,8 +66,6 @@ CanvasNoteEvent::~CanvasNoteEvent()
 		_text->hide();
 		delete _text;
 	}
-
-	delete _channel_selector_widget;
 }
 
 void
@@ -129,55 +125,9 @@ void
 CanvasNoteEvent::on_channel_change(uint8_t channel)
 {
 	_region.note_selected(this, true);
-	hide_channel_selector();
 	_region.change_channel(channel);
 }
 
-void
-CanvasNoteEvent::show_channel_selector(void)
-{
-	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, &CanvasNoteEvent::on_channel_change));
-
-		_channel_selector->clicked.connect (
-			sigc::mem_fun (this, &CanvasNoteEvent::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();
-	}
-}
-
-void
-CanvasNoteEvent::hide_channel_selector(void)
-{
-	if (_channel_selector_widget) {
-		_channel_selector_widget->hide();
-		delete _channel_selector_widget;
-		_channel_selector_widget = 0;
-	}
-}
-
 void
 CanvasNoteEvent::set_selected(bool selected)
 {
@@ -191,12 +141,6 @@ CanvasNoteEvent::set_selected(bool selected)
 
 	if (_selected && active) {
 		set_outline_color(calculate_outline(ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get()));
-
-		if(_region.channel_selector_scoped_note() != 0){
-		    _region.channel_selector_scoped_note()->hide_channel_selector();
-		    _region.set_channel_selector_scoped_note(0);
-		}
-
 		set_fill_color (base_color ());
 
 	} else {
@@ -208,8 +152,6 @@ CanvasNoteEvent::set_selected(bool selected)
 			set_fill_color(ARDOUR_UI::config()->canvasvar_MidiNoteInactiveChannel.get());
 			set_outline_color(calculate_outline(ARDOUR_UI::config()->canvasvar_MidiNoteInactiveChannel.get()));
 		}
-		
-		hide_channel_selector();
 	}
 }
 
diff --git a/gtk2_ardour/canvas-note-event.h b/gtk2_ardour/canvas-note-event.h
index e5b4896b92..bf98e2b7cb 100644
--- a/gtk2_ardour/canvas-note-event.h
+++ b/gtk2_ardour/canvas-note-event.h
@@ -89,9 +89,6 @@ class CanvasNoteEvent : virtual public sigc::trackable
 	/** 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;
 
@@ -151,7 +148,6 @@ class CanvasNoteEvent : virtual public sigc::trackable
 	MidiRegionView&                   _region;
 	Item* const                       _item;
 	NoEventText*                      _text;
-	Widget*                           _channel_selector_widget;
 	State                             _state;
 	const boost::shared_ptr<NoteType> _note;
 	bool                              _selected;