diff options
| author | Robin Gareus <robin@gareus.org> | 2019-10-24 19:43:46 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2019-10-24 19:59:22 +0200 |
| commit | 3f2f5172915973a98b550c70cabbe979553664b2 (patch) | |
| tree | 7713bf254c2128d586eee0f41f7374fb1cd46a70 /gtk2_ardour/step_entry.cc | |
| parent | 7664f8fd29793be09899cd1c94695a2a3880215f (diff) | |
Rough-in gtk-pianokeyboard C -> C++
Diffstat (limited to 'gtk2_ardour/step_entry.cc')
| -rw-r--r-- | gtk2_ardour/step_entry.cc | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc index ec38782a10..374791627e 100644 --- a/gtk2_ardour/step_entry.cc +++ b/gtk2_ardour/step_entry.cc @@ -50,18 +50,6 @@ using namespace ArdourWidgets; Gtkmm2ext::Bindings* StepEntry::bindings = 0; StepEntry* StepEntry::_instance = 0; -static void -_note_off_event_handler (GtkWidget* /*widget*/, int note, gpointer arg) -{ - ((StepEntry*)arg)->note_off_event_handler (note); -} - -static void -_rest_event_handler (GtkWidget* /*widget*/, gpointer arg) -{ - ((StepEntry*)arg)->rest_event_handler (); -} - StepEntry& StepEntry::instance() { @@ -99,8 +87,6 @@ StepEntry::StepEntry () , program_adjustment (0, 0.0, 127.0, 1.0, 4.0) , program_spinner (program_adjustment) , program_button (_("+")) - , _piano (0) - , piano (0) , se (0) { set_data ("ardour-bindings", bindings); @@ -436,13 +422,10 @@ StepEntry::StepEntry () length_divisor_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &StepEntry::length_value_change)); dot_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &StepEntry::dot_value_change)); - _piano = (PianoKeyboard*) piano_keyboard_new (); - piano = wrap ((GtkWidget*) _piano); - - piano->set_flags (Gtk::CAN_FOCUS); + _piano.set_flags (Gtk::CAN_FOCUS); - g_signal_connect(G_OBJECT(_piano), "note-off", G_CALLBACK(_note_off_event_handler), this); - g_signal_connect(G_OBJECT(_piano), "rest", G_CALLBACK(_rest_event_handler), this); + _piano.NoteOff.connect (sigc::mem_fun (*this, &StepEntry::note_off_event_handler)); + _piano.Rest.connect (sigc::mem_fun (*this, &StepEntry::rest_event_handler)); program_button.signal_clicked().connect (sigc::mem_fun (*this, &StepEntry::program_click)); bank_button.signal_clicked().connect (sigc::mem_fun (*this, &StepEntry::bank_click)); @@ -453,7 +436,7 @@ StepEntry::StepEntry () packer.set_spacing (6); packer.pack_start (upper_box, false, false); - packer.pack_start (*piano, false, false); + packer.pack_start (_piano, false, false); packer.show_all (); add (packer); @@ -592,7 +575,7 @@ void StepEntry::on_show () { ArdourWindow::on_show (); - //piano->grab_focus (); + //_piano->grab_focus (); } void |