X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstep_entry.cc;h=f49ce44813dd0d43e2099f2826ebc5f69e41036e;hb=7745a373940a0bcabd618b5b66c6b8916045ea9e;hp=fa5a3aac85ef8c7b9da99ed3907e90b0dc5e5a9e;hpb=5182f0770cca50cbb7c8fe419b2e64af02525553;p=ardour.git diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc index fa5a3aac85..f49ce44813 100644 --- a/gtk2_ardour/step_entry.cc +++ b/gtk2_ardour/step_entry.cc @@ -19,19 +19,18 @@ #include -#include "pbd/filesystem.h" #include "pbd/file_utils.h" -#include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/actions.h" -#include "gtkmm2ext/bindings.h" +#include "gtkmm2ext/keyboard.h" #include "ardour/filesystem_paths.h" -#include "ardour_ui.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 "i18n.h" @@ -42,32 +41,36 @@ using namespace Glib; using namespace Gtkmm2ext; using namespace PBD; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; static void -_note_off_event_handler (GtkWidget* widget, int note, gpointer arg) +_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) +_rest_event_handler (GtkWidget* /*widget*/, gpointer arg) { ((StepEntry*)arg)->rest_event_handler (); } -StepEntry::StepEntry (MidiTimeAxisView& mtv) - : ArdourDialog (string_compose (_("Step Entry: %1"), mtv.name())) +StepEntry::StepEntry (StepEditor& seditor) + : ArdourWindow (string_compose (_("Step Entry: %1"), seditor.name())) , _current_note_length (1.0) , _current_note_velocity (64) , triplet_button ("3") + , dot_adjustment (0.0, 0.0, 3.0, 1.0, 1.0) , beat_resync_button (_(">beat")) , bar_resync_button (_(">bar")) + , resync_button (_(">EP")) , sustain_button (_("sustain")) , rest_button (_("rest")) , grid_rest_button (_("g-rest")) - , channel_adjustment (1, 1, 16, 1, 4) + , back_button (_("back")) + , channel_adjustment (1, 1, 16, 1, 4) , channel_spinner (channel_adjustment) - , octave_adjustment (0, 1, 11, 1, 4) + , 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) @@ -81,18 +84,20 @@ StepEntry::StepEntry (MidiTimeAxisView& mtv) , program_button (_("+")) , _piano (0) , piano (0) - , _mtv (&mtv) + , se (&seditor) + , myactions (X_("step entry")) { 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 = _mtv->channel_selector().get_selected_channels(); - + uint16_t chn_mask = se->channel_selector().get_selected_channels(); + for (uint32_t i = 0; i < 16; ++i) { if (chn_mask & (1<set_tip (&length_1_button, _("Set note length to a whole note"), ""); - ARDOUR_UI::instance()->set_tip (&length_2_button, _("Set note length to a half note"), ""); - ARDOUR_UI::instance()->set_tip (&length_4_button, _("Set note length to a quarter note"), ""); - ARDOUR_UI::instance()->set_tip (&length_8_button, _("Set note length to a eighth note"), ""); - ARDOUR_UI::instance()->set_tip (&length_16_button, _("Set note length to a sixteenth note"), ""); - ARDOUR_UI::instance()->set_tip (&length_32_button, _("Set note length to a thirty-second note"), ""); - ARDOUR_UI::instance()->set_tip (&length_64_button, _("Set note length to a sixty-fourth note"), ""); + set_tooltip (&length_1_button, _("Set note length to a whole note"), ""); + set_tooltip (&length_2_button, _("Set note length to a half note"), ""); + set_tooltip (&length_4_button, _("Set note length to a quarter note"), ""); + set_tooltip (&length_8_button, _("Set note length to a eighth note"), ""); + set_tooltip (&length_16_button, _("Set note length to a sixteenth note"), ""); + set_tooltip (&length_32_button, _("Set note length to a thirty-second note"), ""); + set_tooltip (&length_64_button, _("Set note length to a sixty-fourth note"), ""); RadioButtonGroup velocity_group = velocity_ppp_button.get_group(); velocity_pp_button.set_group (velocity_group); @@ -266,14 +273,14 @@ StepEntry::StepEntry (MidiTimeAxisView& mtv) velocity_ff_button.property_draw_indicator() = false; velocity_fff_button.property_draw_indicator() = false; - ARDOUR_UI::instance()->set_tip (&velocity_ppp_button, _("Set volume (velocity) to pianississimo"), ""); - ARDOUR_UI::instance()->set_tip (&velocity_pp_button, _("Set volume (velocity) to pianissimo"), ""); - ARDOUR_UI::instance()->set_tip (&velocity_p_button, _("Set volume (velocity) to piano"), ""); - ARDOUR_UI::instance()->set_tip (&velocity_mp_button, _("Set volume (velocity) to mezzo-piano"), ""); - ARDOUR_UI::instance()->set_tip (&velocity_mf_button, _("Set volume (velocity) to mezzo-forte"), ""); - ARDOUR_UI::instance()->set_tip (&velocity_f_button, _("Set volume (velocity) to forte"), ""); - ARDOUR_UI::instance()->set_tip (&velocity_ff_button, _("Set volume (velocity) to forteissimo"), ""); - ARDOUR_UI::instance()->set_tip (&velocity_fff_button, _("Set volume (velocity) to forteississimo"), ""); + set_tooltip (&velocity_ppp_button, _("Set volume (velocity) to pianississimo"), ""); + set_tooltip (&velocity_pp_button, _("Set volume (velocity) to pianissimo"), ""); + set_tooltip (&velocity_p_button, _("Set volume (velocity) to piano"), ""); + set_tooltip (&velocity_mp_button, _("Set volume (velocity) to mezzo-piano"), ""); + set_tooltip (&velocity_mf_button, _("Set volume (velocity) to mezzo-forte"), ""); + set_tooltip (&velocity_f_button, _("Set volume (velocity) to forte"), ""); + set_tooltip (&velocity_ff_button, _("Set volume (velocity) to fortissimo"), ""); + set_tooltip (&velocity_fff_button, _("Set volume (velocity) to fortississimo"), ""); note_velocity_box.pack_start (velocity_ppp_button, false, false); note_velocity_box.pack_start (velocity_pp_button, false, false); @@ -285,35 +292,97 @@ StepEntry::StepEntry (MidiTimeAxisView& mtv) note_velocity_box.pack_start (velocity_fff_button, false, false); Label* l = manage (new Label); + l->set_markup ("-"); + l->show (); + dot0_button.add (*l); + + l = manage (new Label); l->set_markup ("."); l->show (); - dot_button.add (*l); + dot1_button.add (*l); + + l = manage (new Label); + l->set_markup (".."); + l->show (); + dot2_button.add (*l); + + l = manage (new Label); + l->set_markup ("..."); + l->show (); + dot3_button.add (*l); w = manage (new Image (::get_icon (X_("chord")))); w->show(); chord_button.add (*w); + dot_box1.pack_start (dot0_button, true, false); + dot_box1.pack_start (dot1_button, true, false); + dot_box2.pack_start (dot2_button, true, false); + dot_box2.pack_start (dot3_button, true, false); + rest_box.pack_start (rest_button, true, false); rest_box.pack_start (grid_rest_button, true, false); + rest_box.pack_start (back_button, true, false); resync_box.pack_start (beat_resync_button, true, false); resync_box.pack_start (bar_resync_button, true, false); - - ARDOUR_UI::instance()->set_tip (&chord_button, _("Stack inserted notes to form a chord"), ""); - ARDOUR_UI::instance()->set_tip (&sustain_button, _("Extend selected notes by note length"), ""); - ARDOUR_UI::instance()->set_tip (&dot_button, _("Use dotted note lengths"), ""); - ARDOUR_UI::instance()->set_tip (&rest_button, _("Insert a note-length's rest"), ""); - ARDOUR_UI::instance()->set_tip (&grid_rest_button, _("Insert a grid-unit's rest"), ""); - ARDOUR_UI::instance()->set_tip (&beat_resync_button, _("Insert a rest until the next beat"), ""); - ARDOUR_UI::instance()->set_tip (&bar_resync_button, _("Insert a rest until the next bar"), ""); - ARDOUR_UI::instance()->set_tip (&bank_button, _("Insert a bank change message"), ""); - ARDOUR_UI::instance()->set_tip (&program_button, _("Insert a program change message"), ""); + resync_box.pack_start (resync_button, true, false); + + set_tooltip (&chord_button, _("Stack inserted notes to form a chord"), ""); + set_tooltip (&sustain_button, _("Extend selected notes by note length"), ""); + set_tooltip (&dot0_button, _("Use undotted note lengths"), ""); + set_tooltip (&dot1_button, _("Use dotted (* 1.5) note lengths"), ""); + set_tooltip (&dot2_button, _("Use double-dotted (* 1.75) note lengths"), ""); + set_tooltip (&dot3_button, _("Use triple-dotted (* 1.875) note lengths"), ""); + set_tooltip (&rest_button, _("Insert a note-length's rest"), ""); + set_tooltip (&grid_rest_button, _("Insert a grid-unit's rest"), ""); + set_tooltip (&beat_resync_button, _("Insert a rest until the next beat"), ""); + set_tooltip (&bar_resync_button, _("Insert a rest until the next bar"), ""); + set_tooltip (&bank_button, _("Insert a bank change message"), ""); + set_tooltip (&program_button, _("Insert a program change message"), ""); + 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()); upper_box.set_spacing (6); upper_box.pack_start (chord_button, false, false); upper_box.pack_start (note_length_box, false, false, 12); upper_box.pack_start (triplet_button, false, false); - upper_box.pack_start (dot_button, false, false); + upper_box.pack_start (dot_box1, false, false); + upper_box.pack_start (dot_box2, false, false); upper_box.pack_start (sustain_button, false, false); upper_box.pack_start (rest_box, false, false); upper_box.pack_start (resync_box, false, false); @@ -367,6 +436,7 @@ StepEntry::StepEntry (MidiTimeAxisView& mtv) 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); @@ -375,13 +445,9 @@ StepEntry::StepEntry (MidiTimeAxisView& mtv) 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); - + program_button.signal_clicked().connect (sigc::mem_fun (*this, &StepEntry::program_click)); bank_button.signal_clicked().connect (sigc::mem_fun (*this, &StepEntry::bank_click)); - rest_button.signal_clicked().connect (sigc::mem_fun (*this, &StepEntry::rest_click)); - grid_rest_button.signal_clicked().connect (sigc::mem_fun (*this, &StepEntry::grid_rest_click)); - chord_button.signal_toggled().connect (sigc::mem_fun (*this, &StepEntry::chord_toggled)); - triplet_button.signal_toggled().connect (sigc::mem_fun (*this, &StepEntry::triplet_toggled)); 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)); @@ -392,7 +458,19 @@ StepEntry::StepEntry (MidiTimeAxisView& mtv) packer.pack_start (*piano, false, false); packer.show_all (); - get_vbox()->add (packer); + add (packer); + + /* 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); } StepEntry::~StepEntry() @@ -417,55 +495,62 @@ StepEntry::on_key_press_event (GdkEventKey* ev) /* focus widget gets first shot, then bindings, otherwise forward to main window */ - - if (!gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) { - KeyboardKey k (ev->state, ev->keyval); - if (bindings.activate (k, KeyboardKey::Press)) { - return true; - } + if (gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) { + return true; } - return forward_key_press (ev); + return relay_key_press (ev, this); } bool StepEntry::on_key_release_event (GdkEventKey* ev) { - /* focus widget gets first shot, then bindings, otherwise - forward to main window - */ - - if (!gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) { - KeyboardKey k (ev->state, ev->keyval); - - if (bindings.activate (k, KeyboardKey::Release)) { - return true; - } + if (gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) { + return true; } - return forward_key_press (ev); + /* don't forward releases */ + + return true; } void StepEntry::rest_event_handler () { - _mtv->step_edit_rest (0.0); + se->step_edit_rest (Evoral::Beats()); } -Evoral::MusicalTime -StepEntry::note_length () const +Evoral::Beats +StepEntry::note_length () { - return 1.0 / (Evoral::MusicalTime) 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 (); + + if (triplets) { + base_time *= (2.0/3.0); + } + + double dots = dot_adjustment.get_value (); + + if (dots > 0) { + dots = pow (2.0, dots); + base_time *= 1 + ((dots - 1.0)/dots); + } + + return Evoral::Beats(base_time); } uint8_t StepEntry::note_velocity () const { - return (Evoral::MusicalTime) velocity_adjustment.get_value(); + return velocity_adjustment.get_value(); } -uint8_t +uint8_t StepEntry::note_channel() const { return channel_adjustment.get_value() - 1; @@ -477,149 +562,233 @@ StepEntry::note_off_event_handler (int note) insert_note (note); } -void -StepEntry::rest_click () -{ - insert_rest (); -} - -void -StepEntry::grid_rest_click () -{ - insert_grid_rest (); -} - -void -StepEntry::triplet_toggled () -{ - if (triplet_button.get_active () != _mtv->step_edit_within_triplet()) { - _mtv->step_edit_toggle_triplet (); - } -} - -void -StepEntry::chord_toggled () -{ - if (chord_button.get_active() != _mtv->step_edit_within_chord ()) { - _mtv->step_edit_toggle_chord (); - } -} void StepEntry::on_show () { - ArdourDialog::on_show (); - piano->grab_focus (); + ArdourWindow::on_show (); + //piano->grab_focus (); } void StepEntry::beat_resync_click () { - _mtv->step_edit_beat_sync (); + se->step_edit_beat_sync (); } void StepEntry::bar_resync_click () { - _mtv->step_edit_bar_sync (); + se->step_edit_bar_sync (); } void StepEntry::register_actions () { - /* add named actions for the editor */ - - myactions.register_action ("StepEditing", "insert-a", _("Insert Note A"), sigc::mem_fun (*this, &StepEntry::insert_a)); - myactions.register_action ("StepEditing", "insert-asharp", _("Insert Note A-sharp"), sigc::mem_fun (*this, &StepEntry::insert_asharp)); - myactions.register_action ("StepEditing", "insert-b", _("Insert Note B"), sigc::mem_fun (*this, &StepEntry::insert_b)); - myactions.register_action ("StepEditing", "insert-c", _("Insert Note C"), sigc::mem_fun (*this, &StepEntry::insert_c)); - myactions.register_action ("StepEditing", "insert-csharp", _("Insert Note C-sharp"), sigc::mem_fun (*this, &StepEntry::insert_csharp)); - myactions.register_action ("StepEditing", "insert-d", _("Insert Note D"), sigc::mem_fun (*this, &StepEntry::insert_d)); - myactions.register_action ("StepEditing", "insert-dsharp", _("Insert Note D-sharp"), sigc::mem_fun (*this, &StepEntry::insert_dsharp)); - myactions.register_action ("StepEditing", "insert-e", _("Insert Note E"), sigc::mem_fun (*this, &StepEntry::insert_e)); - myactions.register_action ("StepEditing", "insert-f", _("Insert Note F"), sigc::mem_fun (*this, &StepEntry::insert_f)); - myactions.register_action ("StepEditing", "insert-fsharp", _("Insert Note F-sharp"), sigc::mem_fun (*this, &StepEntry::insert_fsharp)); - myactions.register_action ("StepEditing", "insert-g", _("Insert Note G"), sigc::mem_fun (*this, &StepEntry::insert_g)); - myactions.register_action ("StepEditing", "insert-gsharp", _("Insert Note G-sharp"), sigc::mem_fun (*this, &StepEntry::insert_gsharp)); - + /* 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 ("StepEditing", note_length_group, "note-length-whole", + 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 ("StepEditing", note_length_group, "note-length-half", + 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 ("StepEditing", note_length_group, "note-length-quarter", + 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 ("StepEditing", note_length_group, "note-length-eighth", + 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 ("StepEditing", note_length_group, "note-length-sixteenth", + 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 ("StepEditing", note_length_group, "note-length-thirtysecond", + 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 ("StepEditing", note_length_group, "note-length-sixtyfourth", + 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 ("StepEditing", note_velocity_group, "note-velocity-ppp", + 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 ("StepEditing", note_velocity_group, "note-velocity-pp", + 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 ("StepEditing", note_velocity_group, "note-velocity-p", + 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 ("StepEditing", note_velocity_group, "note-velocity-mp", + 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 ("StepEditing", note_velocity_group, "note-velocity-mf", + 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 ("StepEditing", note_velocity_group, "note-velocity-f", + 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 ("StepEditing", note_velocity_group, "note-velocity-ff", + 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 ("StepEditing", note_velocity_group, "note-velocity-fff", + 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); } void StepEntry::load_bindings () { - bindings.set_action_map (myactions); + bindings = Bindings::get_bindings (X_("Step Editing"), myactions); + set_data ("ardour-bindings", bindings); +} - sys::path binding_file; - SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path(); +void +StepEntry::toggle_triplet () +{ + se->set_step_edit_cursor_width (note_length()); +} - if (find_file_in_search_path (spath, "step_editing.bindings", binding_file)) { - bindings.load (binding_file.to_string()); +void +StepEntry::toggle_chord () +{ + 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); + } +} + +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()); } void StepEntry::program_click () { - _mtv->step_add_program_change (note_channel(), (int8_t) floor (program_adjustment.get_value())); + se->step_add_program_change (note_channel(), (int8_t) floor (program_adjustment.get_value())); } void StepEntry::bank_click () { - _mtv->step_add_bank_change (note_channel(), (int8_t) floor (bank_adjustment.get_value())); + se->step_add_bank_change (note_channel(), (int8_t) floor (bank_adjustment.get_value())); } void StepEntry::insert_rest () { - _mtv->step_edit_rest (note_length()); + se->step_edit_rest (note_length()); } void StepEntry::insert_grid_rest () { - _mtv->step_edit_rest (0.0); + se->step_edit_rest (Evoral::Beats()); } void StepEntry::insert_note (uint8_t note) { - _mtv->step_add_note (note_channel(), note, note_velocity(), note_length()); + if (note > 127) { + return; + } + + se->step_add_note (note_channel(), note, note_velocity(), note_length()); } void StepEntry::insert_c () @@ -694,7 +863,7 @@ StepEntry::note_length_change (GtkAction* act) 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); @@ -711,10 +880,9 @@ StepEntry::note_velocity_change (GtkAction* act) 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)); - cerr << "Velocity reset to " << v << endl; velocity_adjustment.set_value (v); } } @@ -740,11 +908,11 @@ StepEntry::velocity_value_change () 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) { if (ract->property_value() == val) { ract->set_active (true); inconsistent = false; @@ -784,11 +952,11 @@ StepEntry::length_value_change () 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) { if (ract->property_value() == val) { ract->set_active (true); inconsistent = false; @@ -805,6 +973,8 @@ StepEntry::length_value_change () 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()); } bool @@ -812,7 +982,7 @@ StepEntry::radio_button_press (GdkEventButton* ev) { if (ev->button == 1) { return true; - } + } return false; } @@ -822,13 +992,159 @@ 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 (act) { gtk_radio_action_set_current_value (GTK_RADIO_ACTION(act), v); } - + return true; - } + } return false; } + +void +StepEntry::next_octave () +{ + octave_adjustment.set_value (octave_adjustment.get_value() + 1.0); +} + +void +StepEntry::prev_octave () +{ + 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); +} + +void +StepEntry::dec_note_length () +{ + 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 + + if (il == 0) { + il = 1; + } + + il *= 2; // double + + 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 + + if (il == 0) { + il = 1; + } + + il /= 2; // half + + if (il > 0) { + length_divisor_adjustment.set_value (il); + } +} + +void +StepEntry::inc_note_velocity () +{ + 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); +} + +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); +} + +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); +} + +void +StepEntry::octave_n (int n) +{ + octave_adjustment.set_value (n); +} + +void +StepEntry::do_sustain () +{ + se->step_edit_sustain (note_length()); +} + +void +StepEntry::back () +{ + se->move_step_edit_beat_pos (-note_length()); +} + +void +StepEntry::sync_to_edit_point () +{ + se->resync_step_edit_to_edit_point (); +}