Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / note_base.cc

diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc
index b8587e16da460bc8b5a924a5453f1fddf38bdeff..3bdb73489e078e53eaf7f7d3c3abe821092e5967 100644 (file)
--- 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
@@ -98,7 +94,7 @@ NoteBase::show_velocity()
        if (!_text) {
                _text = new Text (_item->parent ());
                _text->set_ignore_events (true);
-               _text->set_color (ARDOUR_UI::config()->canvasvar_MidiNoteVelocityText.get());
+               _text->set_color (ARDOUR_UI::config()->get_canvasvar_MidiNoteVelocityText());
                _text->set_alignment (Pango::ALIGN_CENTER);
        }
 
@@ -123,8 +119,8 @@ 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()->canvasvar_MidiNoteInactiveChannel.get());
-               set_outline_color(calculate_outline(ARDOUR_UI::config()->canvasvar_MidiNoteInactiveChannel.get()));
+               set_fill_color(ARDOUR_UI::config()->get_canvasvar_MidiNoteInactiveChannel());
+               set_outline_color(calculate_outline(ARDOUR_UI::config()->get_canvasvar_MidiNoteInactiveChannel()));
        } else {
                // set the color according to the notes selection state
                set_selected(_selected);
@@ -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)
 {
@@ -199,18 +145,12 @@ NoteBase::set_selected(bool selected)
        }
 
        _selected = selected;
-       set_fill_color (base_color ());
+       set_fill_color (base_color());
         
        if (_selected) {
-               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_outline_color(calculate_outline(ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected()));
        } else {
                set_outline_color(calculate_outline(base_color()));
-               hide_channel_selector();
        }
 
 }
@@ -236,13 +176,13 @@ NoteBase::base_color()
                                                 SCALE_USHORT_TO_UINT8_T(color.get_green()),
                                                 SCALE_USHORT_TO_UINT8_T(color.get_blue()),
                                                 opacity), 
-                                        ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(), 0.5);
+                                        ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected(), 0.5);
        }
 
        case ChannelColors:
                return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (NoteBase::midi_channel_colors[_note->channel()],
                                                             opacity), 
-                                        ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(), 0.5);
+                                        ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected(), 0.5);
 
        default:
                return meter_style_fill_color(_note->velocity(), selected());
@@ -279,7 +219,7 @@ NoteBase::set_mouse_fractions (GdkEvent* ev)
                return;
        }
 
-       boost::optional<Rect> bbox = _item->bounding_box ();
+       boost::optional<ArdourCanvas::Rect> bbox = _item->bounding_box ();
        assert (bbox);
 
        _item->canvas_to_item (ix, iy);
@@ -342,7 +282,7 @@ 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) {
-                       show_channel_selector();
+                       _region.get_time_axis_view().editor().edit_notes (_region);
                        return true;
                }
                break;