X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fnote_base.cc;h=ff0ec34dfb4b0eaff433974c5b73baf820f4c6a5;hb=32a579ec28c9a34fb1c932e37869dddfd37fce2f;hp=b70b821adef5bd67bc7a70a1bf5073f91bc58fca;hpb=2588b1cac9a50353c65c671ee2a5efe569b96c36;p=ardour.git

diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc
index b70b821ade..ff0ec34dfb 100644
--- a/gtk2_ardour/note_base.cc
+++ b/gtk2_ardour/note_base.cc
@@ -36,8 +36,6 @@ using namespace Gtkmm2ext;
 using ARDOUR::MidiModel;
 using namespace ArdourCanvas;
 
-PBD::Signal1<void,NoteBase*> NoteBase::NoteBaseDeleted;
-
 /// dividing the hue circle in 16 parts, hand adjusted for equal look, courtesy Thorsten Wilms
 const uint32_t NoteBase::midi_channel_colors[16] = {
 	  0xd32d2dff,  0xd36b2dff,  0xd3972dff,  0xd3d12dff,
@@ -62,7 +60,7 @@ NoteBase::NoteBase(MidiRegionView& region, bool with_events, const boost::shared
 
 NoteBase::~NoteBase()
 {
-	NoteBaseDeleted (this);
+	_region.note_deleted (this);
 
 	delete _text;
 }
@@ -96,7 +94,7 @@ NoteBase::show_velocity()
 	if (!_text) {
 		_text = new Text (_item->parent ());
 		_text->set_ignore_events (true);
-		_text->set_color (ARDOUR_UI::config()->get_MidiNoteVelocityText());
+		_text->set_color (UIConfiguration::instance().color_mod ("midi note velocity text", "midi note velocity text"));
 		_text->set_alignment (Pango::ALIGN_CENTER);
 	}
 
@@ -121,8 +119,9 @@ NoteBase::on_channel_selection_change(uint16_t selection)
 {
 	// make note change its color if its channel is not marked active
 	if ( (selection & (1 << _note->channel())) == 0 ) {
-		set_fill_color(ARDOUR_UI::config()->get_MidiNoteInactiveChannel());
-		set_outline_color(calculate_outline(ARDOUR_UI::config()->get_MidiNoteInactiveChannel()));
+		const ArdourCanvas::Color inactive_ch = UIConfiguration::instance().color ("midi note inactive channel");
+		set_fill_color(inactive_ch);
+		set_outline_color(calculate_outline(inactive_ch, _selected));
 	} else {
 		// set the color according to the notes selection state
 		set_selected(_selected);
@@ -147,14 +146,11 @@ NoteBase::set_selected(bool selected)
 	}
 
 	_selected = selected;
-	set_fill_color (base_color());
-        
-	if (_selected) {
-		set_outline_color(calculate_outline(ARDOUR_UI::config()->get_MidiNoteSelected()));
-	} else {
-		set_outline_color(calculate_outline(base_color()));
-	}
 
+	const uint32_t base_col = base_color();
+	set_fill_color (base_col);
+
+	set_outline_color(calculate_outline(base_col, _selected));
 }
 
 #define SCALE_USHORT_TO_UINT8_T(x) ((x) / 257)
@@ -172,15 +168,15 @@ NoteBase::base_color()
 	switch (mode) {
 	case TrackColor:
 	{
-		uint32_t color = _region.midi_stream_view()->get_region_color();
-		return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (color, opacity), 
-		                         ARDOUR_UI::config()->get_MidiNoteSelected(), 
+		const uint32_t region_color = _region.midi_stream_view()->get_region_color();
+		return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (region_color, opacity),
+		                         UIConfiguration::instance().color ("midi note selected"),
 					 0.5);
 	}
 
 	case ChannelColors:
-		return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (NoteBase::midi_channel_colors[_note->channel()], opacity), 
-		                         ARDOUR_UI::config()->get_MidiNoteSelected(), 0.5);
+		return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (NoteBase::midi_channel_colors[_note->channel()], opacity),
+		                         UIConfiguration::instance().color ("midi note selected"), 0.5);
 
 	default:
 		return meter_style_fill_color(_note->velocity(), selected());
@@ -244,21 +240,22 @@ NoteBase::set_mouse_fractions (GdkEvent* ev)
 	_mouse_y_fraction = yf;
 
 	if (notify) {
-                if (big_enough_to_trim()) {
-                        _region.note_mouse_position (_mouse_x_fraction, _mouse_y_fraction, set_cursor);
-                } else {
-                        /* pretend the mouse is in the middle, because this is not big enough
-                           to trim right now.
-                        */
-                        _region.note_mouse_position (0.5, 0.5, set_cursor);
-                }
+		if (big_enough_to_trim()) {
+			_region.note_mouse_position (_mouse_x_fraction, _mouse_y_fraction, set_cursor);
+		} else {
+			/* pretend the mouse is in the middle, because this is not big enough
+			   to trim right now.
+			*/
+			_region.note_mouse_position (0.5, 0.5, set_cursor);
+		}
 	}
 }
 
 bool
 NoteBase::event_handler (GdkEvent* ev)
 {
-	if (!_region.get_time_axis_view().editor().internal_editing()) {
+	PublicEditor& editor = _region.get_time_axis_view().editor();
+	if (!editor.internal_editing()) {
 		return false;
 	}
 
@@ -279,24 +276,17 @@ NoteBase::event_handler (GdkEvent* ev)
 
 	case GDK_BUTTON_PRESS:
 		set_mouse_fractions (ev);
-		if (ev->button.button == 3 && Keyboard::no_modifiers_active (ev->button.state) && _selected) {
-			_region.get_time_axis_view().editor().edit_notes (_region);
-			return true;
-		}
 		break;
 
 	case GDK_BUTTON_RELEASE:
 		set_mouse_fractions (ev);
-		if (ev->button.button == 3 && Keyboard::no_modifiers_active (ev->button.state)) {
-			return true;
-		}
 		break;
 
 	default:
 		break;
 	}
 
-	return _region.get_time_axis_view().editor().canvas_note_event (ev, _item);
+	return editor.canvas_note_event (ev, _item);
 }
 
 bool