hide speaker-config in menu (it's not implemented yet)

[ardour.git] / gtk2_ardour / canvas_patch_change.cc

diff --git a/gtk2_ardour/canvas_patch_change.cc b/gtk2_ardour/canvas_patch_change.cc
index 34658f51a493eac40f2cdfca5664389699581f75..04626692fbdeb54dc136855d9454e1b78f9be8b3 100644 (file)
--- a/gtk2_ardour/canvas_patch_change.cc
+++ b/gtk2_ardour/canvas_patch_change.cc
@@ -55,11 +55,11 @@ CanvasPatchChange::CanvasPatchChange(
                parent,
                height,
                (active_channel
-                ? ARDOUR_UI::config()->canvasvar_MidiPatchChangeOutline.get()
-                : ARDOUR_UI::config()->canvasvar_MidiPatchChangeInactiveChannelOutline.get()),
+                ? ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeOutline()
+                : ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeInactiveChannelOutline()),
                (active_channel
-                ? ARDOUR_UI::config()->canvasvar_MidiPatchChangeFill.get()
-                : ARDOUR_UI::config()->canvasvar_MidiPatchChangeInactiveChannelFill.get()),
+                ? ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeFill()
+                : ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeInactiveChannelFill()),
                x,
                y)
        , _info (info)
@@ -155,28 +155,28 @@ in_edit_mode(Editor* editor)
 bool
 CanvasPatchChange::on_event (GdkEvent* ev)
 {
-       Editor* e;
+       /* XXX: icky dcast */
+       Editor* e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
+       
+       if (!in_edit_mode(e)) {
+               return false;
+       }
 
        switch (ev->type) {
        case GDK_BUTTON_PRESS:
-               /* XXX: icky dcast */
-               e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
-               if (in_edit_mode(e)) {
-
-                       if (Gtkmm2ext::Keyboard::is_delete_event (&ev->button)) {
-
-                               _region.delete_patch_change (this);
-                               return true;
-
-                       } else if (Gtkmm2ext::Keyboard::is_edit_event (&ev->button)) {
-
-                               _region.edit_patch_change (this);
-                               return true;
-
-                       } else if (ev->button.button == 1) {
-                               e->drags()->set (new PatchChangeDrag (e, this, &_region), ev);
-                               return true;
-                       }
+               if (Gtkmm2ext::Keyboard::is_delete_event (&ev->button)) {
+                       
+                       _region.delete_patch_change (this);
+                       return true;
+                       
+               } else if (Gtkmm2ext::Keyboard::is_edit_event (&ev->button)) {
+                       
+                       _region.edit_patch_change (this);
+                       return true;
+                       
+               } else if (ev->button.button == 1) {
+                       e->drags()->set (new PatchChangeDrag (e, this, &_region), ev);
+                       return true;
                }
 
                if (ev->button.button == 3) {
@@ -221,26 +221,20 @@ CanvasPatchChange::on_event (GdkEvent* ev)
                break;
 
        case GDK_SCROLL:
-               /* XXX: icky dcast */
-               e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
-               if (in_edit_mode(e)) {
-                       if (ev->scroll.direction == GDK_SCROLL_UP) {
-                               if (Keyboard::modifier_state_contains (ev->scroll.state, Keyboard::PrimaryModifier)) {
-                                       _region.previous_bank (*this);
-                               } else {
-                                       _region.previous_patch (*this);
-                               }
-                       } else if (ev->scroll.direction == GDK_SCROLL_DOWN) {
+               if (ev->scroll.direction == GDK_SCROLL_UP) {
+                       if (Keyboard::modifier_state_contains (ev->scroll.state, Keyboard::PrimaryModifier)) {
+                               _region.previous_bank (*this);
+                       } else {
+                               _region.previous_patch (*this);
+                       }
+               } else if (ev->scroll.direction == GDK_SCROLL_DOWN) {
                                if (Keyboard::modifier_state_contains (ev->scroll.state, Keyboard::PrimaryModifier)) {
                                        _region.next_bank (*this);
                                } else {
                                        _region.next_patch (*this);
                                }
-                       }
-                       return true;
-                       break;
                }
-               break;
+               return true;
 
        case GDK_ENTER_NOTIFY:
                _region.patch_entered (this);