only the last step-edited note remains selected after each note addition; waf install...

[ardour.git] / gtk2_ardour / canvas-program-change.cc

diff --git a/gtk2_ardour/canvas-program-change.cc b/gtk2_ardour/canvas-program-change.cc
index badadd22a7bbd44c47a1f6f8abdbb056451cf73d..77169ce8ecdcac72e2ceca937013557882d14e1b 100644 (file)
--- a/gtk2_ardour/canvas-program-change.cc
+++ b/gtk2_ardour/canvas-program-change.cc
@@ -14,20 +14,20 @@ using namespace std;
 CanvasProgramChange::CanvasProgramChange(
                MidiRegionView& region,
                Group&          parent,
-               string&         text,
+               const string&   text,
                double          height,
                double          x,
                double          y,
                string&         model_name,
                string&         custom_device_mode,
-               nframes_t       event_time,
+                double          event_time,
                uint8_t         channel,
                uint8_t         program)
        : CanvasFlag(
-                       region, 
-                       parent, 
-                       height, 
-                       ARDOUR_UI::config()->canvasvar_MidiProgramChangeOutline.get(), 
+                       region,
+                       parent,
+                       height,
+                       ARDOUR_UI::config()->canvasvar_MidiProgramChangeOutline.get(),
                        ARDOUR_UI::config()->canvasvar_MidiProgramChangeFill.get(),
                        x,
                        y)
@@ -45,57 +45,57 @@ CanvasProgramChange::~CanvasProgramChange()
 {
 }
 
-void 
+void
 CanvasProgramChange::initialize_popup_menus()
 {
-       boost::shared_ptr<ChannelNameSet> channel_name_set = 
+       boost::shared_ptr<ChannelNameSet> channel_name_set =
                MidiPatchManager::instance()
                        .find_channel_name_set(_model_name, _custom_device_mode, _channel);
 
        if (!channel_name_set) {
                return;
        }
-       
+
        const ChannelNameSet::PatchBanks& patch_banks = channel_name_set->patch_banks();
-       
+
        // fill popup menu:
        Gtk::Menu::MenuList& patch_bank_menus = _popup.items();
-       
+
        for (ChannelNameSet::PatchBanks::const_iterator bank = patch_banks.begin();
             bank != patch_banks.end();
             ++bank) {
                Glib::RefPtr<Glib::Regex> underscores = Glib::Regex::create("_");
                Glib::ustring replacement(" ");
-               
+
                Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu());
-               
+
                const PatchBank::PatchNameList& patches = (*bank)->patch_name_list();
                Gtk::Menu::MenuList& patch_menus = patch_bank_menu.items();
-               
+
                for (PatchBank::PatchNameList::const_iterator patch = patches.begin();
                     patch != patches.end();
                     ++patch) {
                        Glib::ustring name = underscores->replace((*patch)->name().c_str(), -1, 0, replacement);
-                   
+
                        patch_menus.push_back(
                                Gtk::Menu_Helpers::MenuElem(
-                                       name, 
+                                       name,
                                        sigc::bind(
-                                               sigc::mem_fun(*this, &CanvasProgramChange::on_patch_menu_selected), 
-                                               (*patch)->patch_primary_key())) );              
+                                               sigc::mem_fun(*this, &CanvasProgramChange::on_patch_menu_selected),
+                                               (*patch)->patch_primary_key())) );
                }
 
 
                Glib::ustring name = underscores->replace((*bank)->name().c_str(), -1, 0, replacement);
-               
-               patch_bank_menus.push_back( 
+
+               patch_bank_menus.push_back(
                        Gtk::Menu_Helpers::MenuElem(
-                               name, 
-                               patch_bank_menu) );             
+                               name,
+                               patch_bank_menu) );
        }
 }
 
-void 
+void
 CanvasProgramChange::on_patch_menu_selected(const PatchPrimaryKey& key)
 {
        cerr << " got patch program number " << key.program_number << endl;
@@ -113,11 +113,28 @@ CanvasProgramChange::on_event(GdkEvent* ev)
                                initialize_popup_menus();
                                _popup_initialized = true;
                        }
-                   _popup.popup(ev->button.button, ev->button.time);
+                        _popup.popup(ev->button.button, ev->button.time);
                        return true;
                }
                break;
-               
+
+        case GDK_KEY_PRESS:
+                switch (ev->key.keyval) {
+                case GDK_Up:
+                case GDK_KP_Up:
+                case GDK_uparrow:
+                       _region.previous_program(*this);
+                        break;
+                case GDK_Down:
+                case GDK_KP_Down:
+                case GDK_downarrow:
+                       _region.next_program(*this);
+                        break;
+                default:
+                        break;
+                }
+                break;
+
        case GDK_SCROLL:
                if (ev->scroll.direction == GDK_SCROLL_UP) {
                        _region.previous_program(*this);
@@ -125,12 +142,12 @@ CanvasProgramChange::on_event(GdkEvent* ev)
                } else if (ev->scroll.direction == GDK_SCROLL_DOWN) {
                        _region.next_program(*this);
                        return true;
-               } 
+               }
                break;
-               
+
        default:
                break;
        }
-       
+
        return false;
 }