X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstep_entry.cc;h=7dc9d178055f46ba048fd51f97364c23d5aa4b4b;hb=f974ff594a132fe651a6e620bab3e6f913d697a3;hp=855766b1c8ea9983dac0ff8227afd0d0905bb81f;hpb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;p=ardour.git diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc index 855766b1c8..7dc9d17805 100644 --- a/gtk2_ardour/step_entry.cc +++ b/gtk2_ardour/step_entry.cc @@ -24,13 +24,14 @@ #include "gtkmm2ext/actions.h" #include "gtkmm2ext/keyboard.h" +#include "widgets/tooltips.h" + #include "ardour/filesystem_paths.h" #include "midi_channel_selector.h" #include "midi_time_axis.h" #include "step_editor.h" #include "step_entry.h" -#include "tooltips.h" #include "utils.h" #include "pbd/i18n.h" @@ -42,6 +43,10 @@ using namespace Gtkmm2ext; using namespace PBD; using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; +using namespace ArdourWidgets; + +Gtkmm2ext::Bindings* StepEntry::bindings = 0; +StepEntry* StepEntry::_instance = 0; static void _note_off_event_handler (GtkWidget* /*widget*/, int note, gpointer arg) @@ -55,12 +60,22 @@ _rest_event_handler (GtkWidget* /*widget*/, gpointer arg) ((StepEntry*)arg)->rest_event_handler (); } -StepEntry::StepEntry (StepEditor& seditor) - : ArdourWindow (string_compose (_("Step Entry: %1"), seditor.name())) - , _current_note_length (1.0) - , _current_note_velocity (64) +StepEntry& +StepEntry::instance() +{ + if (!_instance) { + _instance = new StepEntry; + } + + return *_instance; +} + +StepEntry::StepEntry () + : ArdourWindow (string()) + , _current_note_length (1.0) + , _current_note_velocity (64) , triplet_button ("3") - , dot_adjustment (0.0, 0.0, 3.0, 1.0, 1.0) + , dot_adjustment (0.0, 0.0, 3.0, 1.0, 1.0) , beat_resync_button (_(">beat")) , bar_resync_button (_(">bar")) , resync_button (_(">EP")) @@ -70,42 +85,23 @@ StepEntry::StepEntry (StepEditor& seditor) , back_button (_("back")) , channel_adjustment (1, 1, 16, 1, 4) , channel_spinner (channel_adjustment) - , octave_adjustment (4, 0, 10, 1, 4) // start in octave 4 - , octave_spinner (octave_adjustment) - , length_divisor_adjustment (1.0, 1.0, 128, 1.0, 4.0) - , length_divisor_spinner (length_divisor_adjustment) - , velocity_adjustment (64.0, 0.0, 127.0, 1.0, 4.0) - , velocity_spinner (velocity_adjustment) - , bank_adjustment (0, 0.0, 127.0, 1.0, 4.0) - , bank_spinner (bank_adjustment) - , bank_button (_("+")) - , program_adjustment (0, 0.0, 127.0, 1.0, 4.0) - , program_spinner (program_adjustment) - , program_button (_("+")) + , octave_adjustment (4, 0, 10, 1, 4) // start in octave 4 + , octave_spinner (octave_adjustment) + , length_divisor_adjustment (1.0, 1.0, 128, 1.0, 4.0) + , length_divisor_spinner (length_divisor_adjustment) + , velocity_adjustment (64.0, 0.0, 127.0, 1.0, 4.0) + , velocity_spinner (velocity_adjustment) + , bank_adjustment (0, 0.0, 127.0, 1.0, 4.0) + , bank_spinner (bank_adjustment) + , bank_button (_("+")) + , program_adjustment (0, 0.0, 127.0, 1.0, 4.0) + , program_spinner (program_adjustment) + , program_button (_("+")) , _piano (0) , piano (0) - , se (&seditor) - , myactions (X_("step entry")) + , se (0) { - register_actions (); - load_bindings (); - -#if 0 - /* set channel selector to first selected channel. if none - are selected, it will remain at the value set in its - constructor, above (1) - */ - - uint16_t chn_mask = se->channel_selector().get_selected_channels(); - - for (uint32_t i = 0; i < 16; ++i) { - if (chn_mask & (1<show(); length_64_button.add (*w); - RefPtr act; - - act = myactions.find_action ("StepEditing/note-length-whole"); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (length_1_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/note-length-half"); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (length_2_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/note-length-quarter"); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (length_4_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/note-length-eighth"); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (length_8_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/note-length-sixteenth"); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (length_16_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/note-length-thirtysecond"); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (length_32_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/note-length-sixtyfourth"); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (length_64_button.gobj()), act->gobj()); - - length_1_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); - length_1_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &length_1_button, 1), false); - length_2_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); - length_2_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &length_1_button, 2), false); - length_4_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); - length_4_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &length_1_button, 4), false); - length_8_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); - length_8_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &length_1_button, 8), false); - length_16_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); - length_16_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &length_1_button, 16), false); - length_32_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); - length_32_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &length_1_button, 32), false); - length_64_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); - length_64_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &length_1_button, 64), false); + RefPtr act; + + act = ActionManager::get_action ("StepEditing/note-length-whole"); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (length_1_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/note-length-half"); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (length_2_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/note-length-quarter"); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (length_4_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/note-length-eighth"); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (length_8_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/note-length-sixteenth"); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (length_16_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/note-length-thirtysecond"); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (length_32_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/note-length-sixtyfourth"); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (length_64_button.gobj()), act->gobj()); + + length_1_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); + length_1_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &length_1_button, 1), false); + length_2_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); + length_2_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &length_1_button, 2), false); + length_4_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); + length_4_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &length_1_button, 4), false); + length_8_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); + length_8_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &length_1_button, 8), false); + length_16_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); + length_16_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &length_1_button, 16), false); + length_32_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); + length_32_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &length_1_button, 32), false); + length_64_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); + length_64_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &length_1_button, 64), false); length_1_button.property_draw_indicator() = false; length_2_button.property_draw_indicator() = false; @@ -230,39 +226,39 @@ StepEntry::StepEntry (StepEditor& seditor) w->show(); velocity_fff_button.add (*w); - act = myactions.find_action ("StepEditing/note-velocity-ppp"); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_ppp_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/note-velocity-pp"); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_pp_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/note-velocity-p"); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_p_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/note-velocity-mp"); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_mp_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/note-velocity-mf"); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_mf_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/note-velocity-f"); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_f_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/note-velocity-ff"); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_ff_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/note-velocity-fff"); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_fff_button.gobj()), act->gobj()); - - velocity_ppp_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); - velocity_ppp_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_ppp_button, 1), false); - velocity_pp_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); - velocity_pp_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_pp_button, 16), false); - velocity_p_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); - velocity_p_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_p_button, 32), false); - velocity_mp_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); - velocity_mp_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_mp_button, 64), false); - velocity_mf_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); - velocity_mf_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_mf_button, 80), false); - velocity_f_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); - velocity_f_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_f_button, 96), false); - velocity_ff_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); - velocity_ff_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_ff_button, 112), false); - velocity_fff_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); - velocity_fff_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_fff_button, 127), false); + act = ActionManager::get_action ("StepEditing/note-velocity-ppp"); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_ppp_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/note-velocity-pp"); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_pp_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/note-velocity-p"); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_p_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/note-velocity-mp"); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_mp_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/note-velocity-mf"); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_mf_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/note-velocity-f"); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_f_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/note-velocity-ff"); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_ff_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/note-velocity-fff"); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (velocity_fff_button.gobj()), act->gobj()); + + velocity_ppp_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); + velocity_ppp_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_ppp_button, 1), false); + velocity_pp_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); + velocity_pp_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_pp_button, 16), false); + velocity_p_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); + velocity_p_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_p_button, 32), false); + velocity_mp_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); + velocity_mp_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_mp_button, 64), false); + velocity_mf_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); + velocity_mf_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_mf_button, 80), false); + velocity_f_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); + velocity_f_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_f_button, 96), false); + velocity_ff_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); + velocity_ff_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_ff_button, 112), false); + velocity_fff_button.signal_button_press_event().connect (sigc::mem_fun (*this, &StepEntry::radio_button_press), false); + velocity_fff_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &StepEntry::radio_button_release), &velocity_fff_button, 127), false); velocity_ppp_button.property_draw_indicator() = false; velocity_pp_button.property_draw_indicator() = false; @@ -343,39 +339,39 @@ StepEntry::StepEntry (StepEditor& seditor) set_tooltip (&back_button, _("Move Insert Position Back by Note Length"), ""); set_tooltip (&resync_button, _("Move Insert Position to Edit Point"), ""); - act = myactions.find_action ("StepEditing/back"); - gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (back_button.gobj()), false); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (back_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/sync-to-edit-point"); - gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (resync_button.gobj()), false); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (resync_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/toggle-triplet"); - gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (triplet_button.gobj()), false); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (triplet_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/no-dotted"); - gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (dot0_button.gobj()), false); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (dot0_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/toggle-dotted"); - gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (dot1_button.gobj()), false); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (dot1_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/toggle-double-dotted"); - gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (dot2_button.gobj()), false); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (dot2_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/toggle-triple-dotted"); - gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (dot3_button.gobj()), false); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (dot3_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/toggle-chord"); - gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (chord_button.gobj()), false); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (chord_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/insert-rest"); - gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (rest_button.gobj()), false); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (rest_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/insert-snap-rest"); - gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (grid_rest_button.gobj()), false); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (grid_rest_button.gobj()), act->gobj()); - act = myactions.find_action ("StepEditing/sustain"); - gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (sustain_button.gobj()), false); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (sustain_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/back"); + gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (back_button.gobj()), false); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (back_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/sync-to-edit-point"); + gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (resync_button.gobj()), false); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (resync_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/toggle-triplet"); + gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (triplet_button.gobj()), false); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (triplet_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/no-dotted"); + gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (dot0_button.gobj()), false); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (dot0_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/toggle-dotted"); + gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (dot1_button.gobj()), false); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (dot1_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/toggle-double-dotted"); + gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (dot2_button.gobj()), false); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (dot2_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/toggle-triple-dotted"); + gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (dot3_button.gobj()), false); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (dot3_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/toggle-chord"); + gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (chord_button.gobj()), false); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (chord_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/insert-rest"); + gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (rest_button.gobj()), false); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (rest_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/insert-snap-rest"); + gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (grid_rest_button.gobj()), false); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (grid_rest_button.gobj()), act->gobj()); + act = ActionManager::get_action ("StepEditing/sustain"); + gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (sustain_button.gobj()), false); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (sustain_button.gobj()), act->gobj()); upper_box.set_spacing (6); upper_box.pack_start (chord_button, false, false); @@ -390,35 +386,35 @@ StepEntry::StepEntry (StepEditor& seditor) VBox* v; - v = manage (new VBox); + v = manage (new VBox); l = manage (new Label (_("Channel"))); v->set_spacing (6); v->pack_start (*l, false, false); v->pack_start (channel_spinner, false, false); upper_box.pack_start (*v, false, false); - v = manage (new VBox); + v = manage (new VBox); l = manage (new Label (_("1/Note"))); v->set_spacing (6); v->pack_start (*l, false, false); v->pack_start (length_divisor_spinner, false, false); upper_box.pack_start (*v, false, false); - v = manage (new VBox); + v = manage (new VBox); l = manage (new Label (_("Velocity"))); v->set_spacing (6); v->pack_start (*l, false, false); v->pack_start (velocity_spinner, false, false); upper_box.pack_start (*v, false, false); - v = manage (new VBox); + v = manage (new VBox); l = manage (new Label (_("Octave"))); v->set_spacing (6); v->pack_start (*l, false, false); v->pack_start (octave_spinner, false, false); upper_box.pack_start (*v, false, false); - v = manage (new VBox); + v = manage (new VBox); l = manage (new Label (_("Bank"))); v->set_spacing (6); v->pack_start (*l, false, false); @@ -426,7 +422,7 @@ StepEntry::StepEntry (StepEditor& seditor) v->pack_start (bank_button, false, false); upper_box.pack_start (*v, false, false); - v = manage (new VBox); + v = manage (new VBox); l = manage (new Label (_("Program"))); v->set_spacing (6); v->pack_start (*l, false, false); @@ -434,9 +430,9 @@ StepEntry::StepEntry (StepEditor& seditor) v->pack_start (program_button, false, false); upper_box.pack_start (*v, false, false); - velocity_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &StepEntry::velocity_value_change)); - 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)); + velocity_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &StepEntry::velocity_value_change)); + 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); @@ -451,7 +447,7 @@ StepEntry::StepEntry (StepEditor& seditor) beat_resync_button.signal_clicked().connect (sigc::mem_fun (*this, &StepEntry::beat_resync_click)); bar_resync_button.signal_clicked().connect (sigc::mem_fun (*this, &StepEntry::bar_resync_click)); - length_divisor_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &StepEntry::length_changed)); + length_divisor_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &StepEntry::length_changed)); packer.set_spacing (6); packer.pack_start (upper_box, false, false); @@ -462,39 +458,65 @@ StepEntry::StepEntry (StepEditor& seditor) /* initial settings: quarter note and mezzo forte */ - act = myactions.find_action ("StepEditing/note-length-quarter"); - RefPtr r = RefPtr::cast_dynamic (act); - assert (r); - r->set_active (true); - - act = myactions.find_action ("StepEditing/note-velocity-mf"); - r = RefPtr::cast_dynamic (act); - assert (r); - r->set_active (true); + ActionManager::get_radio_action ("StepEditing/note-length-quarter")->set_active (true); + ActionManager::get_radio_action ("StepEditing/note-velocity-mf")->set_active (true); } StepEntry::~StepEntry() { } +void +StepEntry::set_step_editor (StepEditor* seditor) +{ + if (se && se != seditor) { + se->step_entry_done (); + } + + se = seditor; + + if (se) { + set_title (string_compose (_("Step Entry: %1"), se->name())); +#if 0 + /* set channel selector to first selected channel. if none + are selected, it will remain at the value set in its + constructor, above (1) + */ + + uint16_t chn_mask = se->channel_selector().get_selected_channels(); + + for (uint32_t i = 0; i < 16; ++i) { + if (chn_mask & (1<step_edit_rest (Evoral::Beats()); + if (se) { + se->step_edit_rest (Temporal::Beats()); + } } -Evoral::Beats +Temporal::Beats StepEntry::note_length () { - double base_time = 4.0 / (double) length_divisor_adjustment.get_value(); + double base_time = 4.0 / (double) length_divisor_adjustment.get_value(); - RefPtr act = myactions.find_action ("StepEditing/toggle-triplet"); - RefPtr tact = RefPtr::cast_dynamic (act); - bool triplets = tact->get_active (); + RefPtr act = ActionManager::get_action ("StepEditing/toggle-triplet"); + RefPtr tact = RefPtr::cast_dynamic (act); + bool triplets = tact->get_active (); - if (triplets) { - base_time *= (2.0/3.0); - } + if (triplets) { + base_time *= (2.0/3.0); + } - double dots = dot_adjustment.get_value (); + double dots = dot_adjustment.get_value (); - if (dots > 0) { - dots = pow (2.0, dots); - base_time *= 1 + ((dots - 1.0)/dots); - } + if (dots > 0) { + dots = pow (2.0, dots); + base_time *= 1 + ((dots - 1.0)/dots); + } - return Evoral::Beats(base_time); + return Temporal::Beats(base_time); } uint8_t @@ -559,7 +583,7 @@ StepEntry::note_channel() const void StepEntry::note_off_event_handler (int note) { - insert_note (note); + insert_note (note); } @@ -573,13 +597,17 @@ StepEntry::on_show () void StepEntry::beat_resync_click () { - se->step_edit_beat_sync (); + if (se) { + se->step_edit_beat_sync (); + } } void StepEntry::bar_resync_click () { - se->step_edit_bar_sync (); + if (se) { + se->step_edit_bar_sync (); + } } void @@ -587,564 +615,581 @@ StepEntry::register_actions () { /* add named actions for the step editor */ - Glib::RefPtr group = myactions.create_action_group (X_("StepEditing")); - - myactions.register_action (group, "insert-a", _("Insert Note A"), sigc::mem_fun (*this, &StepEntry::insert_a)); - myactions.register_action (group, "insert-asharp", _("Insert Note A-sharp"), sigc::mem_fun (*this, &StepEntry::insert_asharp)); - myactions.register_action (group, "insert-b", _("Insert Note B"), sigc::mem_fun (*this, &StepEntry::insert_b)); - myactions.register_action (group, "insert-c", _("Insert Note C"), sigc::mem_fun (*this, &StepEntry::insert_c)); - myactions.register_action (group, "insert-csharp", _("Insert Note C-sharp"), sigc::mem_fun (*this, &StepEntry::insert_csharp)); - myactions.register_action (group, "insert-d", _("Insert Note D"), sigc::mem_fun (*this, &StepEntry::insert_d)); - myactions.register_action (group, "insert-dsharp", _("Insert Note D-sharp"), sigc::mem_fun (*this, &StepEntry::insert_dsharp)); - myactions.register_action (group, "insert-e", _("Insert Note E"), sigc::mem_fun (*this, &StepEntry::insert_e)); - myactions.register_action (group, "insert-f", _("Insert Note F"), sigc::mem_fun (*this, &StepEntry::insert_f)); - myactions.register_action (group, "insert-fsharp", _("Insert Note F-sharp"), sigc::mem_fun (*this, &StepEntry::insert_fsharp)); - myactions.register_action (group, "insert-g", _("Insert Note G"), sigc::mem_fun (*this, &StepEntry::insert_g)); - myactions.register_action (group, "insert-gsharp", _("Insert Note G-sharp"), sigc::mem_fun (*this, &StepEntry::insert_gsharp)); - - myactions.register_action (group, "insert-rest", _("Insert a Note-length Rest"), sigc::mem_fun (*this, &StepEntry::insert_rest)); - myactions.register_action (group, "insert-snap-rest", _("Insert a Snap-length Rest"), sigc::mem_fun (*this, &StepEntry::insert_grid_rest)); - - myactions.register_action (group, "next-octave", _("Move to next octave"), sigc::mem_fun (*this, &StepEntry::next_octave)); - myactions.register_action (group, "prev-octave", _("Move to next octave"), sigc::mem_fun (*this, &StepEntry::prev_octave)); - - myactions.register_action (group, "next-note-length", _("Move to Next Note Length"), sigc::mem_fun (*this, &StepEntry::next_note_length)); - myactions.register_action (group, "prev-note-length", _("Move to Previous Note Length"), sigc::mem_fun (*this, &StepEntry::prev_note_length)); - - myactions.register_action (group, "inc-note-length", _("Increase Note Length"), sigc::mem_fun (*this, &StepEntry::inc_note_length)); - myactions.register_action (group, "dec-note-length", _("Decrease Note Length"), sigc::mem_fun (*this, &StepEntry::dec_note_length)); - - myactions.register_action (group, "next-note-velocity", _("Move to Next Note Velocity"), sigc::mem_fun (*this, &StepEntry::next_note_velocity)); - myactions.register_action (group, "prev-note-velocity", _("Move to Previous Note Velocity"), sigc::mem_fun (*this, &StepEntry::prev_note_velocity)); - - myactions.register_action (group, "inc-note-velocity", _("Increase Note Velocity"), sigc::mem_fun (*this, &StepEntry::inc_note_velocity)); - myactions.register_action (group, "dec-note-velocity", _("Decrease Note Velocity"), sigc::mem_fun (*this, &StepEntry::dec_note_velocity)); - - myactions.register_action (group, "octave-0", _("Switch to the 1st octave"), sigc::mem_fun (*this, &StepEntry::octave_0)); - myactions.register_action (group, "octave-1", _("Switch to the 2nd octave"), sigc::mem_fun (*this, &StepEntry::octave_1)); - myactions.register_action (group, "octave-2", _("Switch to the 3rd octave"), sigc::mem_fun (*this, &StepEntry::octave_2)); - myactions.register_action (group, "octave-3", _("Switch to the 4th octave"), sigc::mem_fun (*this, &StepEntry::octave_3)); - myactions.register_action (group, "octave-4", _("Switch to the 5th octave"), sigc::mem_fun (*this, &StepEntry::octave_4)); - myactions.register_action (group, "octave-5", _("Switch to the 6th octave"), sigc::mem_fun (*this, &StepEntry::octave_5)); - myactions.register_action (group, "octave-6", _("Switch to the 7th octave"), sigc::mem_fun (*this, &StepEntry::octave_6)); - myactions.register_action (group, "octave-7", _("Switch to the 8th octave"), sigc::mem_fun (*this, &StepEntry::octave_7)); - myactions.register_action (group, "octave-8", _("Switch to the 9th octave"), sigc::mem_fun (*this, &StepEntry::octave_8)); - myactions.register_action (group, "octave-9", _("Switch to the 10th octave"), sigc::mem_fun (*this, &StepEntry::octave_9)); - myactions.register_action (group, "octave-10", _("Switch to the 11th octave"), sigc::mem_fun (*this, &StepEntry::octave_10)); - - myactions.register_toggle_action (group, "toggle-triplet", _("Toggle Triple Notes"), - sigc::mem_fun (*this, &StepEntry::toggle_triplet)); - - myactions.register_toggle_action (group, "toggle-chord", _("Toggle Chord Entry"), - sigc::mem_fun (*this, &StepEntry::toggle_chord)); - myactions.register_action (group, "sustain", _("Sustain Selected Notes by Note Length"), - sigc::mem_fun (*this, &StepEntry::do_sustain)); - - myactions.register_action (group, "sync-to-edit-point", _("Move Insert Position to Edit Point"), - sigc::mem_fun (*this, &StepEntry::sync_to_edit_point)); - myactions.register_action (group, "back", _("Move Insert Position Back by Note Length"), - sigc::mem_fun (*this, &StepEntry::back)); - RadioAction::Group note_length_group; - - myactions.register_radio_action (group, note_length_group, "note-length-whole", - _("Set Note Length to Whole"), sigc::mem_fun (*this, &StepEntry::note_length_change), 1); - myactions.register_radio_action (group, note_length_group, "note-length-half", - _("Set Note Length to 1/2"), sigc::mem_fun (*this, &StepEntry::note_length_change), 2); - myactions.register_radio_action (group, note_length_group, "note-length-third", - _("Set Note Length to 1/3"), sigc::mem_fun (*this, &StepEntry::note_length_change), 3); - myactions.register_radio_action (group, note_length_group, "note-length-quarter", - _("Set Note Length to 1/4"), sigc::mem_fun (*this, &StepEntry::note_length_change), 4); - myactions.register_radio_action (group, note_length_group, "note-length-eighth", - _("Set Note Length to 1/8"), sigc::mem_fun (*this, &StepEntry::note_length_change), 8); - myactions.register_radio_action (group, note_length_group, "note-length-sixteenth", - _("Set Note Length to 1/16"), sigc::mem_fun (*this, &StepEntry::note_length_change), 16); - myactions.register_radio_action (group, note_length_group, "note-length-thirtysecond", - _("Set Note Length to 1/32"), sigc::mem_fun (*this, &StepEntry::note_length_change), 32); - myactions.register_radio_action (group, note_length_group, "note-length-sixtyfourth", - _("Set Note Length to 1/64"), sigc::mem_fun (*this, &StepEntry::note_length_change), 64); - - RadioAction::Group note_velocity_group; - - myactions.register_radio_action (group, note_velocity_group, "note-velocity-ppp", - _("Set Note Velocity to Pianississimo"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 1); - myactions.register_radio_action (group, note_velocity_group, "note-velocity-pp", - _("Set Note Velocity to Pianissimo"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 16); - myactions.register_radio_action (group, note_velocity_group, "note-velocity-p", - _("Set Note Velocity to Piano"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 32); - myactions.register_radio_action (group, note_velocity_group, "note-velocity-mp", - _("Set Note Velocity to Mezzo-Piano"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 64); - myactions.register_radio_action (group, note_velocity_group, "note-velocity-mf", - _("Set Note Velocity to Mezzo-Forte"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 80); - myactions.register_radio_action (group, note_velocity_group, "note-velocity-f", - _("Set Note Velocity to Forte"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 96); - myactions.register_radio_action (group, note_velocity_group, "note-velocity-ff", - _("Set Note Velocity to Fortississimo"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 112); - myactions.register_radio_action (group, note_velocity_group, "note-velocity-fff", - _("Set Note Velocity to Fortississimo"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 127); - - - RadioAction::Group dot_group; - - myactions.register_radio_action (group, dot_group, "no-dotted", _("No Dotted Notes"), sigc::mem_fun (*this, &StepEntry::dot_change), 0); - myactions.register_radio_action (group, dot_group, "toggle-dotted", _("Toggled Dotted Notes"), sigc::mem_fun (*this, &StepEntry::dot_change), 1); - myactions.register_radio_action (group, dot_group, "toggle-double-dotted", _("Toggled Double-Dotted Notes"), sigc::mem_fun (*this, &StepEntry::dot_change), 2); - myactions.register_radio_action (group, dot_group, "toggle-triple-dotted", _("Toggled Triple-Dotted Notes"), sigc::mem_fun (*this, &StepEntry::dot_change), 3); + Glib::RefPtr group = ActionManager::create_action_group (bindings, X_("StepEditing")); + + ActionManager::register_action (group, "insert-a", _("Insert Note A"), sigc::ptr_fun (&StepEntry::se_insert_a)); + ActionManager::register_action (group, "insert-asharp", _("Insert Note A-sharp"), sigc::ptr_fun (&StepEntry::se_insert_asharp)); + ActionManager::register_action (group, "insert-b", _("Insert Note B"), sigc::ptr_fun (&StepEntry::se_insert_b)); + ActionManager::register_action (group, "insert-c", _("Insert Note C"), sigc::ptr_fun (&StepEntry::se_insert_c)); + ActionManager::register_action (group, "insert-csharp", _("Insert Note C-sharp"), sigc::ptr_fun (&StepEntry::se_insert_csharp)); + ActionManager::register_action (group, "insert-d", _("Insert Note D"), sigc::ptr_fun (&StepEntry::se_insert_d)); + ActionManager::register_action (group, "insert-dsharp", _("Insert Note D-sharp"), sigc::ptr_fun (&StepEntry::se_insert_dsharp)); + ActionManager::register_action (group, "insert-e", _("Insert Note E"), sigc::ptr_fun (&StepEntry::se_insert_e)); + ActionManager::register_action (group, "insert-f", _("Insert Note F"), sigc::ptr_fun (&StepEntry::se_insert_f)); + ActionManager::register_action (group, "insert-fsharp", _("Insert Note F-sharp"), sigc::ptr_fun (&StepEntry::se_insert_fsharp)); + ActionManager::register_action (group, "insert-g", _("Insert Note G"), sigc::ptr_fun (&StepEntry::se_insert_g)); + ActionManager::register_action (group, "insert-gsharp", _("Insert Note G-sharp"), sigc::ptr_fun (&StepEntry::se_insert_gsharp)); + + ActionManager::register_action (group, "insert-rest", _("Insert a Note-length Rest"), sigc::ptr_fun (&StepEntry::se_insert_rest)); + ActionManager::register_action (group, "insert-snap-rest", _("Insert a Snap-length Rest"), sigc::ptr_fun (&StepEntry::se_insert_grid_rest)); + + ActionManager::register_action (group, "next-octave", _("Move to next octave"), sigc::ptr_fun (&StepEntry::se_next_octave)); + ActionManager::register_action (group, "prev-octave", _("Move to next octave"), sigc::ptr_fun (&StepEntry::se_prev_octave)); + + ActionManager::register_action (group, "next-note-length", _("Move to Next Note Length"), sigc::ptr_fun (&StepEntry::se_next_note_length)); + ActionManager::register_action (group, "prev-note-length", _("Move to Previous Note Length"), sigc::ptr_fun (&StepEntry::se_prev_note_length)); + + ActionManager::register_action (group, "inc-note-length", _("Increase Note Length"), sigc::ptr_fun (&StepEntry::se_inc_note_length)); + ActionManager::register_action (group, "dec-note-length", _("Decrease Note Length"), sigc::ptr_fun (&StepEntry::se_dec_note_length)); + + ActionManager::register_action (group, "next-note-velocity", _("Move to Next Note Velocity"), sigc::ptr_fun (&StepEntry::se_next_note_velocity)); + ActionManager::register_action (group, "prev-note-velocity", _("Move to Previous Note Velocity"), sigc::ptr_fun (&StepEntry::se_prev_note_velocity)); + + ActionManager::register_action (group, "inc-note-velocity", _("Increase Note Velocity"), sigc::ptr_fun (&StepEntry::se_inc_note_velocity)); + ActionManager::register_action (group, "dec-note-velocity", _("Decrease Note Velocity"), sigc::ptr_fun (&StepEntry::se_dec_note_velocity)); + + ActionManager::register_action (group, "octave-0", _("Switch to the 1st octave"), sigc::ptr_fun (&StepEntry::se_octave_0)); + ActionManager::register_action (group, "octave-1", _("Switch to the 2nd octave"), sigc::ptr_fun (&StepEntry::se_octave_1)); + ActionManager::register_action (group, "octave-2", _("Switch to the 3rd octave"), sigc::ptr_fun (&StepEntry::se_octave_2)); + ActionManager::register_action (group, "octave-3", _("Switch to the 4th octave"), sigc::ptr_fun (&StepEntry::se_octave_3)); + ActionManager::register_action (group, "octave-4", _("Switch to the 5th octave"), sigc::ptr_fun (&StepEntry::se_octave_4)); + ActionManager::register_action (group, "octave-5", _("Switch to the 6th octave"), sigc::ptr_fun (&StepEntry::se_octave_5)); + ActionManager::register_action (group, "octave-6", _("Switch to the 7th octave"), sigc::ptr_fun (&StepEntry::se_octave_6)); + ActionManager::register_action (group, "octave-7", _("Switch to the 8th octave"), sigc::ptr_fun (&StepEntry::se_octave_7)); + ActionManager::register_action (group, "octave-8", _("Switch to the 9th octave"), sigc::ptr_fun (&StepEntry::se_octave_8)); + ActionManager::register_action (group, "octave-9", _("Switch to the 10th octave"), sigc::ptr_fun (&StepEntry::se_octave_9)); + ActionManager::register_action (group, "octave-10", _("Switch to the 11th octave"), sigc::ptr_fun (&StepEntry::se_octave_10)); + + ActionManager::register_toggle_action (group, "toggle-triplet", _("Toggle Triple Notes"), sigc::ptr_fun (&StepEntry::se_toggle_triplet)); + + ActionManager::register_toggle_action (group, "toggle-chord", _("Toggle Chord Entry"), sigc::ptr_fun (&StepEntry::se_toggle_chord)); + ActionManager::register_action (group, "sustain", _("Sustain Selected Notes by Note Length"), sigc::ptr_fun (&StepEntry::se_do_sustain)); + + ActionManager::register_action (group, "sync-to-edit-point", _("Move Insert Position to Edit Point"), sigc::ptr_fun (&StepEntry::se_sync_to_edit_point)); + ActionManager::register_action (group, "back", _("Move Insert Position Back by Note Length"), sigc::ptr_fun (&StepEntry::se_back)); + + RadioAction::Group note_length_group; + + ActionManager::register_radio_action (group, note_length_group, "note-length-whole", + _("Set Note Length to Whole"), sigc::ptr_fun (&StepEntry::se_note_length_change), 1); + ActionManager::register_radio_action (group, note_length_group, "note-length-half", + _("Set Note Length to 1/2"), sigc::ptr_fun (&StepEntry::se_note_length_change), 2); + ActionManager::register_radio_action (group, note_length_group, "note-length-third", + _("Set Note Length to 1/3"), sigc::ptr_fun (&StepEntry::se_note_length_change), 3); + ActionManager::register_radio_action (group, note_length_group, "note-length-quarter", + _("Set Note Length to 1/4"), sigc::ptr_fun (&StepEntry::se_note_length_change), 4); + ActionManager::register_radio_action (group, note_length_group, "note-length-eighth", + _("Set Note Length to 1/8"), sigc::ptr_fun (&StepEntry::se_note_length_change), 8); + ActionManager::register_radio_action (group, note_length_group, "note-length-sixteenth", + _("Set Note Length to 1/16"), sigc::ptr_fun (&StepEntry::se_note_length_change), 16); + ActionManager::register_radio_action (group, note_length_group, "note-length-thirtysecond", + _("Set Note Length to 1/32"), sigc::ptr_fun (&StepEntry::se_note_length_change), 32); + ActionManager::register_radio_action (group, note_length_group, "note-length-sixtyfourth", + _("Set Note Length to 1/64"), sigc::ptr_fun (&StepEntry::se_note_length_change), 64); + + RadioAction::Group note_velocity_group; + + ActionManager::register_radio_action (group, note_velocity_group, "note-velocity-ppp", + _("Set Note Velocity to Pianississimo"), sigc::ptr_fun (&StepEntry::se_note_velocity_change), 1); + ActionManager::register_radio_action (group, note_velocity_group, "note-velocity-pp", + _("Set Note Velocity to Pianissimo"), sigc::ptr_fun (&StepEntry::se_note_velocity_change), 16); + ActionManager::register_radio_action (group, note_velocity_group, "note-velocity-p", + _("Set Note Velocity to Piano"), sigc::ptr_fun (&StepEntry::se_note_velocity_change), 32); + ActionManager::register_radio_action (group, note_velocity_group, "note-velocity-mp", + _("Set Note Velocity to Mezzo-Piano"), sigc::ptr_fun (&StepEntry::se_note_velocity_change), 64); + ActionManager::register_radio_action (group, note_velocity_group, "note-velocity-mf", + _("Set Note Velocity to Mezzo-Forte"), sigc::ptr_fun (&StepEntry::se_note_velocity_change), 80); + ActionManager::register_radio_action (group, note_velocity_group, "note-velocity-f", + _("Set Note Velocity to Forte"), sigc::ptr_fun (&StepEntry::se_note_velocity_change), 96); + ActionManager::register_radio_action (group, note_velocity_group, "note-velocity-ff", + _("Set Note Velocity to Fortississimo"), sigc::ptr_fun (&StepEntry::se_note_velocity_change), 112); + ActionManager::register_radio_action (group, note_velocity_group, "note-velocity-fff", + _("Set Note Velocity to Fortississimo"), sigc::ptr_fun (&StepEntry::se_note_velocity_change), 127); + + + RadioAction::Group dot_group; + + ActionManager::register_radio_action (group, dot_group, "no-dotted", _("No Dotted Notes"), sigc::ptr_fun (&StepEntry::se_dot_change), 0); + ActionManager::register_radio_action (group, dot_group, "toggle-dotted", _("Toggled Dotted Notes"), sigc::ptr_fun (&StepEntry::se_dot_change), 1); + ActionManager::register_radio_action (group, dot_group, "toggle-double-dotted", _("Toggled Double-Dotted Notes"), sigc::ptr_fun (&StepEntry::se_dot_change), 2); + ActionManager::register_radio_action (group, dot_group, "toggle-triple-dotted", _("Toggled Triple-Dotted Notes"), sigc::ptr_fun (&StepEntry::se_dot_change), 3); +} + +void +StepEntry::setup_actions_and_bindings () +{ + load_bindings (); + register_actions (); } void StepEntry::load_bindings () { - bindings = Bindings::get_bindings (X_("Step Editing"), myactions); - set_data ("ardour-bindings", bindings); + bindings = Bindings::get_bindings (X_("Step Editing")); } void StepEntry::toggle_triplet () { - se->set_step_edit_cursor_width (note_length()); + if (se) { + se->set_step_edit_cursor_width (note_length()); + } } void StepEntry::toggle_chord () { - se->step_edit_toggle_chord (); + if (se) { + se->step_edit_toggle_chord (); + } } void StepEntry::dot_change (GtkAction* act) { - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(act))) { - gint v = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (act)); - dot_adjustment.set_value (v); - } + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(act))) { + gint v = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (act)); + dot_adjustment.set_value (v); + } } void StepEntry::dot_value_change () { - RefPtr act; - RefPtr ract; - double val = dot_adjustment.get_value(); - bool inconsistent = true; - vector dot_actions; - - dot_actions.push_back ("StepEditing/no-dotted"); - dot_actions.push_back ("StepEditing/toggle-dotted"); - dot_actions.push_back ("StepEditing/toggle-double-dotted"); - dot_actions.push_back ("StepEditing/toggle-triple-dotted"); - - for (vector::iterator i = dot_actions.begin(); i != dot_actions.end(); ++i) { - - act = myactions.find_action (*i); - - if (act) { - ract = RefPtr::cast_dynamic (act); - - if (ract) { - if (ract->property_value() == val) { - ract->set_active (true); - inconsistent = false; - break; - } - } - } - } - - dot1_button.set_inconsistent (inconsistent); - dot2_button.set_inconsistent (inconsistent); - dot3_button.set_inconsistent (inconsistent); - - se->set_step_edit_cursor_width (note_length()); + RefPtr act; + RefPtr ract; + double val = dot_adjustment.get_value(); + bool inconsistent = true; + vector dot_actions; + + dot_actions.push_back ("StepEditing/no-dotted"); + dot_actions.push_back ("StepEditing/toggle-dotted"); + dot_actions.push_back ("StepEditing/toggle-double-dotted"); + dot_actions.push_back ("StepEditing/toggle-triple-dotted"); + + for (vector::iterator i = dot_actions.begin(); i != dot_actions.end(); ++i) { + + act = ActionManager::get_action (*i); + + if (act) { + ract = RefPtr::cast_dynamic (act); + + if (ract) { + if (ract->property_value() == val) { + ract->set_active (true); + inconsistent = false; + break; + } + } + } + } + + dot1_button.set_inconsistent (inconsistent); + dot2_button.set_inconsistent (inconsistent); + dot3_button.set_inconsistent (inconsistent); + + if (se) { + se->set_step_edit_cursor_width (note_length()); + } } void StepEntry::program_click () { - se->step_add_program_change (note_channel(), (int8_t) floor (program_adjustment.get_value())); + if (se) { + se->step_add_program_change (note_channel(), (int8_t) floor (program_adjustment.get_value())); + } } void StepEntry::bank_click () { - se->step_add_bank_change (note_channel(), (int8_t) floor (bank_adjustment.get_value())); + if (se) { + se->step_add_bank_change (note_channel(), (int8_t) floor (bank_adjustment.get_value())); + } } void StepEntry::insert_rest () { - se->step_edit_rest (note_length()); + if (se) { + se->step_edit_rest (note_length()); + } } void StepEntry::insert_grid_rest () { - se->step_edit_rest (Evoral::Beats()); + if (se) { + se->step_edit_rest (Temporal::Beats()); + } } void StepEntry::insert_note (uint8_t note) { - if (note > 127) { - return; - } + if (note > 127) { + return; + } - se->step_add_note (note_channel(), note, note_velocity(), note_length()); + if (se) { + se->step_add_note (note_channel(), note, note_velocity(), note_length()); + } } void StepEntry::insert_c () { - insert_note (0 + (current_octave() * 12)); + insert_note (0 + (current_octave() * 12)); } void StepEntry::insert_csharp () { - insert_note (1 + (current_octave() * 12)); + insert_note (1 + (current_octave() * 12)); } void StepEntry::insert_d () { - insert_note (2 + (current_octave() * 12)); + insert_note (2 + (current_octave() * 12)); } void StepEntry::insert_dsharp () { - insert_note (3 + (current_octave() * 12)); + insert_note (3 + (current_octave() * 12)); } void StepEntry::insert_e () { - insert_note (4 + (current_octave() * 12)); + insert_note (4 + (current_octave() * 12)); } void StepEntry::insert_f () { - insert_note (5 + (current_octave() * 12)); + insert_note (5 + (current_octave() * 12)); } void StepEntry::insert_fsharp () { - insert_note (6 + (current_octave() * 12)); + insert_note (6 + (current_octave() * 12)); } void StepEntry::insert_g () { - insert_note (7 + (current_octave() * 12)); + insert_note (7 + (current_octave() * 12)); } void StepEntry::insert_gsharp () { - insert_note (8 + (current_octave() * 12)); + insert_note (8 + (current_octave() * 12)); } void StepEntry::insert_a () { - insert_note (9 + (current_octave() * 12)); + insert_note (9 + (current_octave() * 12)); } void StepEntry::insert_asharp () { - insert_note (10 + (current_octave() * 12)); + insert_note (10 + (current_octave() * 12)); } void StepEntry::insert_b () { - insert_note (11 + (current_octave() * 12)); + insert_note (11 + (current_octave() * 12)); } void StepEntry::note_length_change (GtkAction* act) { - /* it doesn't matter which note length action we look up - we are interested - in the current_value which is global across the whole group of note length - actions. this method is called twice for every user operation, - once for the action that became "inactive" and once for the action that - becaome "active". so ... only bother to actually change the value when this - is called for the "active" action. - */ - - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(act))) { - gint v = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (act)); - length_divisor_adjustment.set_value (v); - } + /* it doesn't matter which note length action we look up - we are interested + in the current_value which is global across the whole group of note length + actions. this method is called twice for every user operation, + once for the action that became "inactive" and once for the action that + becaome "active". so ... only bother to actually change the value when this + is called for the "active" action. + */ + + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(act))) { + gint v = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (act)); + length_divisor_adjustment.set_value (v); + } } void StepEntry::note_velocity_change (GtkAction* act) { - /* it doesn't matter which note length action we look up - we are interested - in the current_value which is global across the whole group of note length - actions. this method is called twice for every user operation, - once for the action that became "inactive" and once for the action that - becaome "active". so ... only bother to actually change the value when this - is called for the "active" action. - */ - - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(act))) { - gint v = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (act)); - velocity_adjustment.set_value (v); - } + /* it doesn't matter which note velocity action we look up - we are interested + in the current_value which is global across the whole group of note velocity + actions. this method is called twice for every user operation, + once for the action that became "inactive" and once for the action that + becaome "active". so ... only bother to actually change the value when this + is called for the "active" action. + */ + + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(act))) { + gint v = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (act)); + velocity_adjustment.set_value (v); + } } void StepEntry::velocity_value_change () { - RefPtr act; - RefPtr ract; - double val = velocity_adjustment.get_value(); - bool inconsistent = true; - vector velocity_actions; - - velocity_actions.push_back ("StepEditing/note-velocity-ppp"); - velocity_actions.push_back ("StepEditing/note-velocity-pp"); - velocity_actions.push_back ("StepEditing/note-velocity-p"); - velocity_actions.push_back ("StepEditing/note-velocity-mp"); - velocity_actions.push_back ("StepEditing/note-velocity-mf"); - velocity_actions.push_back ("StepEditing/note-velocity-f"); - velocity_actions.push_back ("StepEditing/note-velocity-ff"); - velocity_actions.push_back ("StepEditing/note-velocity-fff"); - - for (vector::iterator i = velocity_actions.begin(); i != velocity_actions.end(); ++i) { - - act = myactions.find_action (*i); - - if (act) { - ract = RefPtr::cast_dynamic (act); - - if (ract) { - if (ract->property_value() == val) { - ract->set_active (true); - inconsistent = false; - break; - } - } - } - } - - velocity_ppp_button.set_inconsistent (inconsistent); - velocity_pp_button.set_inconsistent (inconsistent); - velocity_p_button.set_inconsistent (inconsistent); - velocity_mp_button.set_inconsistent (inconsistent); - velocity_mf_button.set_inconsistent (inconsistent); - velocity_f_button.set_inconsistent (inconsistent); - velocity_ff_button.set_inconsistent (inconsistent); - velocity_fff_button.set_inconsistent (inconsistent); + RefPtr act; + RefPtr ract; + double val = velocity_adjustment.get_value(); + bool inconsistent = true; + vector velocity_actions; + + velocity_actions.push_back ("StepEditing/note-velocity-ppp"); + velocity_actions.push_back ("StepEditing/note-velocity-pp"); + velocity_actions.push_back ("StepEditing/note-velocity-p"); + velocity_actions.push_back ("StepEditing/note-velocity-mp"); + velocity_actions.push_back ("StepEditing/note-velocity-mf"); + velocity_actions.push_back ("StepEditing/note-velocity-f"); + velocity_actions.push_back ("StepEditing/note-velocity-ff"); + velocity_actions.push_back ("StepEditing/note-velocity-fff"); + + for (vector::iterator i = velocity_actions.begin(); i != velocity_actions.end(); ++i) { + + act = ActionManager::get_action (*i); + + if (act) { + ract = RefPtr::cast_dynamic (act); + + if (ract) { + if (ract->property_value() == val) { + ract->set_active (true); + inconsistent = false; + break; + } + } + } + } + + velocity_ppp_button.set_inconsistent (inconsistent); + velocity_pp_button.set_inconsistent (inconsistent); + velocity_p_button.set_inconsistent (inconsistent); + velocity_mp_button.set_inconsistent (inconsistent); + velocity_mf_button.set_inconsistent (inconsistent); + velocity_f_button.set_inconsistent (inconsistent); + velocity_ff_button.set_inconsistent (inconsistent); + velocity_fff_button.set_inconsistent (inconsistent); } void StepEntry::length_value_change () { - RefPtr act; - RefPtr ract; - double val = length_divisor_adjustment.get_value(); - bool inconsistent = true; - vector length_actions; - - length_actions.push_back ("StepEditing/note-length-whole"); - length_actions.push_back ("StepEditing/note-length-half"); - length_actions.push_back ("StepEditing/note-length-quarter"); - length_actions.push_back ("StepEditing/note-length-eighth"); - length_actions.push_back ("StepEditing/note-length-sixteenth"); - length_actions.push_back ("StepEditing/note-length-thirtysecond"); - length_actions.push_back ("StepEditing/note-length-sixtyfourth"); - - for (vector::iterator i = length_actions.begin(); i != length_actions.end(); ++i) { - - act = myactions.find_action (*i); - - if (act) { - ract = RefPtr::cast_dynamic (act); - - if (ract) { - if (ract->property_value() == val) { - ract->set_active (true); - inconsistent = false; - break; - } - } - } - } - - length_1_button.set_inconsistent (inconsistent); - length_2_button.set_inconsistent (inconsistent); - length_4_button.set_inconsistent (inconsistent); - length_8_button.set_inconsistent (inconsistent); - length_16_button.set_inconsistent (inconsistent); - length_32_button.set_inconsistent (inconsistent); - length_64_button.set_inconsistent (inconsistent); - - se->set_step_edit_cursor_width (note_length()); + RefPtr act; + RefPtr ract; + bool inconsistent = true; + vector length_actions; + + length_actions.push_back ("StepEditing/note-length-whole"); + length_actions.push_back ("StepEditing/note-length-half"); + length_actions.push_back ("StepEditing/note-length-quarter"); + length_actions.push_back ("StepEditing/note-length-eighth"); + length_actions.push_back ("StepEditing/note-length-sixteenth"); + length_actions.push_back ("StepEditing/note-length-thirtysecond"); + length_actions.push_back ("StepEditing/note-length-sixtyfourth"); + + for (vector::iterator i = length_actions.begin(); i != length_actions.end(); ++i) { + + Glib::RefPtr ract = ActionManager::get_radio_action (*i); + + ract->set_active (true); + inconsistent = false; + break; + } + + length_1_button.set_inconsistent (inconsistent); + length_2_button.set_inconsistent (inconsistent); + length_4_button.set_inconsistent (inconsistent); + length_8_button.set_inconsistent (inconsistent); + length_16_button.set_inconsistent (inconsistent); + length_32_button.set_inconsistent (inconsistent); + length_64_button.set_inconsistent (inconsistent); + + if (se) { + se->set_step_edit_cursor_width (note_length()); + } } bool StepEntry::radio_button_press (GdkEventButton* ev) { - if (ev->button == 1) { - return true; - } + if (ev->button == 1) { + return true; + } - return false; + return false; } bool StepEntry::radio_button_release (GdkEventButton* ev, RadioButton* btn, int v) { - if (ev->button == 1) { - GtkAction* act = gtk_activatable_get_related_action (GTK_ACTIVATABLE (btn->gobj())); + if (ev->button == 1) { + GtkAction* act = gtk_activatable_get_related_action (GTK_ACTIVATABLE (btn->gobj())); - if (act) { - gtk_radio_action_set_current_value (GTK_RADIO_ACTION(act), v); - } + if (act) { + gtk_radio_action_set_current_value (GTK_RADIO_ACTION(act), v); + } - return true; - } + return true; + } - return false; + return false; } void StepEntry::next_octave () { - octave_adjustment.set_value (octave_adjustment.get_value() + 1.0); + octave_adjustment.set_value (octave_adjustment.get_value() + 1.0); } void StepEntry::prev_octave () { - octave_adjustment.set_value (octave_adjustment.get_value() - 1.0); + octave_adjustment.set_value (octave_adjustment.get_value() - 1.0); } void StepEntry::inc_note_length () { - length_divisor_adjustment.set_value (length_divisor_adjustment.get_value() - 1.0); + length_divisor_adjustment.set_value (length_divisor_adjustment.get_value() - 1.0); } void StepEntry::dec_note_length () { - length_divisor_adjustment.set_value (length_divisor_adjustment.get_value() + 1.0); + length_divisor_adjustment.set_value (length_divisor_adjustment.get_value() + 1.0); } void StepEntry::prev_note_length () { - double l = length_divisor_adjustment.get_value(); - int il = (int) lrintf (l); // round to nearest integer - il = (il/2) * 2; // round to power of 2 + double l = length_divisor_adjustment.get_value(); + int il = (int) lrintf (l); // round to nearest integer + il = (il/2) * 2; // round to power of 2 - if (il == 0) { - il = 1; - } + if (il == 0) { + il = 1; + } - il *= 2; // double + il *= 2; // double - length_divisor_adjustment.set_value (il); + length_divisor_adjustment.set_value (il); } void StepEntry::next_note_length () { - double l = length_divisor_adjustment.get_value(); - int il = (int) lrintf (l); // round to nearest integer - il = (il/2) * 2; // round to power of 2 + double l = length_divisor_adjustment.get_value(); + int il = (int) lrintf (l); // round to nearest integer + il = (il/2) * 2; // round to power of 2 - if (il == 0) { - il = 1; - } + if (il == 0) { + il = 1; + } - il /= 2; // half + il /= 2; // half - if (il > 0) { - length_divisor_adjustment.set_value (il); - } + if (il > 0) { + length_divisor_adjustment.set_value (il); + } } void StepEntry::inc_note_velocity () { - velocity_adjustment.set_value (velocity_adjustment.get_value() + 1.0); + velocity_adjustment.set_value (velocity_adjustment.get_value() + 1.0); } void StepEntry::dec_note_velocity () { - velocity_adjustment.set_value (velocity_adjustment.get_value() - 1.0); + velocity_adjustment.set_value (velocity_adjustment.get_value() - 1.0); } void StepEntry::next_note_velocity () { - double l = velocity_adjustment.get_value (); - - if (l < 16) { - l = 16; - } else if (l < 32) { - l = 32; - } else if (l < 48) { - l = 48; - } else if (l < 64) { - l = 64; - } else if (l < 80) { - l = 80; - } else if (l < 96) { - l = 96; - } else if (l < 112) { - l = 112; - } else if (l < 127) { - l = 127; - } - - velocity_adjustment.set_value (l); + double l = velocity_adjustment.get_value (); + + if (l < 16) { + l = 16; + } else if (l < 32) { + l = 32; + } else if (l < 48) { + l = 48; + } else if (l < 64) { + l = 64; + } else if (l < 80) { + l = 80; + } else if (l < 96) { + l = 96; + } else if (l < 112) { + l = 112; + } else if (l < 127) { + l = 127; + } + + velocity_adjustment.set_value (l); } void StepEntry::prev_note_velocity () { - double l = velocity_adjustment.get_value (); - - if (l > 112) { - l = 112; - } else if (l > 96) { - l = 96; - } else if (l > 80) { - l = 80; - } else if (l > 64) { - l = 64; - } else if (l > 48) { - l = 48; - } else if (l > 32) { - l = 32; - } else if (l > 16) { - l = 16; - } else { - l = 1; - } - - velocity_adjustment.set_value (l); + double l = velocity_adjustment.get_value (); + + if (l > 112) { + l = 112; + } else if (l > 96) { + l = 96; + } else if (l > 80) { + l = 80; + } else if (l > 64) { + l = 64; + } else if (l > 48) { + l = 48; + } else if (l > 32) { + l = 32; + } else if (l > 16) { + l = 16; + } else { + l = 1; + } + + velocity_adjustment.set_value (l); } void StepEntry::octave_n (int n) { - octave_adjustment.set_value (n); + octave_adjustment.set_value (n); } void StepEntry::do_sustain () { - se->step_edit_sustain (note_length()); + if (se) { + se->step_edit_sustain (note_length()); + } } void StepEntry::back () { - se->move_step_edit_beat_pos (-note_length()); + if (se) { + se->move_step_edit_beat_pos (-note_length()); + } } void StepEntry::sync_to_edit_point () { - se->resync_step_edit_to_edit_point (); + if (se) { + se->resync_step_edit_to_edit_point (); + } }