X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstep_entry.cc;h=fd53fd55ff3704fb912c8514ab9a8f644389387a;hb=8b5f990267622100b3a1a7ff6fa346282aca4dda;hp=27a0ee4a3c905fdfaea0a7bd321788d60eae28e8;hpb=a448f2827cd5f0d5db77bb9a7c6adbe15e497abd;p=ardour.git diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc index 27a0ee4a3c..fd53fd55ff 100644 --- a/gtk2_ardour/step_entry.cc +++ b/gtk2_ardour/step_entry.cc @@ -19,7 +19,6 @@ #include -#include "pbd/filesystem.h" #include "pbd/file_utils.h" #include "gtkmm2ext/keyboard.h" @@ -31,6 +30,7 @@ #include "ardour_ui.h" #include "midi_channel_selector.h" #include "midi_time_axis.h" +#include "step_editor.h" #include "step_entry.h" #include "utils.h" @@ -44,49 +44,59 @@ using namespace PBD; using namespace ARDOUR; 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) , 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) - , _mtv (&mtv) + , se (&seditor) { 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_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); - rest_box.pack_start (rest_button, false, false); - rest_box.pack_start (grid_rest_button, false, false); + 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, false, false); - resync_box.pack_start (bar_resync_button, false, false); + resync_box.pack_start (beat_resync_button, true, false); + resync_box.pack_start (bar_resync_button, true, false); + resync_box.pack_start (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 (&dot0_button, _("Use undotted note lengths"), ""); + ARDOUR_UI::instance()->set_tip (&dot1_button, _("Use dotted (* 1.5) note lengths"), ""); + ARDOUR_UI::instance()->set_tip (&dot2_button, _("Use double-dotted (* 1.75) note lengths"), ""); + ARDOUR_UI::instance()->set_tip (&dot3_button, _("Use triple-dotted (* 1.875) 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"), ""); + ARDOUR_UI::instance()->set_tip (&back_button, _("Move Insert Position Back by Note Length"), ""); + ARDOUR_UI::instance()->set_tip (&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); upper_box.pack_start (note_velocity_box, false, false, 12); - VBox* v = manage (new VBox); + VBox* v; + + 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); - upper_box.pack_start (length_divisor_spinner, false, false); - upper_box.pack_start (velocity_spinner, false, false); - upper_box.pack_start (octave_spinner, false, false); + 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); + 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); + 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); + l = manage (new Label (_("Bank"))); + v->set_spacing (6); + v->pack_start (*l, false, false); + v->pack_start (bank_spinner, false, false); + v->pack_start (bank_button, false, false); + upper_box.pack_start (*v, false, false); + + v = manage (new VBox); + l = manage (new Label (_("Program"))); + v->set_spacing (6); + v->pack_start (*l, false, false); + v->pack_start (program_spinner, false, false); + 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)); _piano = (PianoKeyboard*) piano_keyboard_new (); piano = wrap ((GtkWidget*) _piano); @@ -332,11 +444,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); - - 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)); + + program_button.signal_clicked().connect (sigc::mem_fun (*this, &StepEntry::program_click)); + bank_button.signal_clicked().connect (sigc::mem_fun (*this, &StepEntry::bank_click)); 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)); @@ -347,7 +457,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() @@ -372,11 +494,11 @@ 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)) { + if (bindings.activate (k, Bindings::Press)) { return true; } } @@ -387,31 +509,46 @@ StepEntry::on_key_press_event (GdkEventKey* ev) 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)) { + if (bindings.activate (k, Bindings::Release)) { 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 (0.0); } Evoral::MusicalTime -StepEntry::note_length () const +StepEntry::note_length () { - return 1.0 / (Evoral::MusicalTime) length_divisor_adjustment.get_value(); + Evoral::MusicalTime base_time = 4.0 / (Evoral::MusicalTime) 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 base_time; } uint8_t @@ -420,7 +557,7 @@ StepEntry::note_velocity () const return (Evoral::MusicalTime) velocity_adjustment.get_value(); } -uint8_t +uint8_t StepEntry::note_channel() const { return channel_adjustment.get_value() - 1; @@ -432,51 +569,24 @@ 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 @@ -485,9 +595,8 @@ 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-bsharp", _("Insert Note A-sharp"), sigc::mem_fun (*this, &StepEntry::insert_asharp)); + 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-bsharp", _("Insert Note B-sharp"), sigc::mem_fun (*this, &StepEntry::insert_bsharp)); 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)); @@ -498,12 +607,44 @@ StepEntry::register_actions () 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)); + myactions.register_action ("StepEditing", "insert-rest", _("Insert a Note-length Rest"), sigc::mem_fun (*this, &StepEntry::insert_rest)); + myactions.register_action ("StepEditing", "insert-snap-rest", _("Insert a Snap-length Rest"), sigc::mem_fun (*this, &StepEntry::insert_grid_rest)); + + myactions.register_action ("StepEditing", "next-octave", _("Move to next octave"), sigc::mem_fun (*this, &StepEntry::next_octave)); + myactions.register_action ("StepEditing", "prev-octave", _("Move to next octave"), sigc::mem_fun (*this, &StepEntry::prev_octave)); + + myactions.register_action ("StepEditing", "next-note-length", _("Move to Next Note Length"), sigc::mem_fun (*this, &StepEntry::next_note_length)); + myactions.register_action ("StepEditing", "prev-note-length", _("Move to Previous Note Length"), sigc::mem_fun (*this, &StepEntry::prev_note_length)); + + myactions.register_action ("StepEditing", "inc-note-length", _("Increase Note Length"), sigc::mem_fun (*this, &StepEntry::inc_note_length)); + myactions.register_action ("StepEditing", "dec-note-length", _("Decrease Note Length"), sigc::mem_fun (*this, &StepEntry::dec_note_length)); + + myactions.register_action ("StepEditing", "next-note-velocity", _("Move to Next Note Velocity"), sigc::mem_fun (*this, &StepEntry::next_note_velocity)); + myactions.register_action ("StepEditing", "prev-note-velocity", _("Move to Previous Note Velocity"), sigc::mem_fun (*this, &StepEntry::prev_note_velocity)); + + myactions.register_action ("StepEditing", "inc-note-velocity", _("Increase Note Velocity"), sigc::mem_fun (*this, &StepEntry::inc_note_velocity)); + myactions.register_action ("StepEditing", "dec-note-velocity", _("Decrease Note Velocity"), sigc::mem_fun (*this, &StepEntry::dec_note_velocity)); + + myactions.register_action ("StepEditing", "octave-0", _("Switch to the 1st octave"), sigc::mem_fun (*this, &StepEntry::octave_0)); + myactions.register_action ("StepEditing", "octave-1", _("Switch to the 2nd octave"), sigc::mem_fun (*this, &StepEntry::octave_1)); + myactions.register_action ("StepEditing", "octave-2", _("Switch to the 3rd octave"), sigc::mem_fun (*this, &StepEntry::octave_2)); + myactions.register_action ("StepEditing", "octave-3", _("Switch to the 4th octave"), sigc::mem_fun (*this, &StepEntry::octave_3)); + myactions.register_action ("StepEditing", "octave-4", _("Switch to the 5th octave"), sigc::mem_fun (*this, &StepEntry::octave_4)); + myactions.register_action ("StepEditing", "octave-5", _("Switch to the 6th octave"), sigc::mem_fun (*this, &StepEntry::octave_5)); + myactions.register_action ("StepEditing", "octave-6", _("Switch to the 7th octave"), sigc::mem_fun (*this, &StepEntry::octave_6)); + myactions.register_action ("StepEditing", "octave-7", _("Switch to the 8th octave"), sigc::mem_fun (*this, &StepEntry::octave_7)); + myactions.register_action ("StepEditing", "octave-8", _("Switch to the 9th octave"), sigc::mem_fun (*this, &StepEntry::octave_8)); + myactions.register_action ("StepEditing", "octave-9", _("Switch to the 10th octave"), sigc::mem_fun (*this, &StepEntry::octave_9)); + myactions.register_action ("StepEditing", "octave-10", _("Switch to the 11th octave"), sigc::mem_fun (*this, &StepEntry::octave_10)); + RadioAction::Group note_length_group; - myactions.register_radio_action ("StepEditing", note_length_group, "note-length-whole", + myactions.register_radio_action ("StepEditing", 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 ("StepEditing", 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-third", + _("Set Note Length to 1/3"), sigc::mem_fun (*this, &StepEntry::note_length_change), 3); myactions.register_radio_action ("StepEditing", 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", @@ -533,37 +674,137 @@ StepEntry::register_actions () _("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", _("Set Note Velocity to Fortississimo"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 127); + + myactions.register_toggle_action ("StepEditing", "toggle-triplet", _("Toggle Triple Notes"), + sigc::mem_fun (*this, &StepEntry::toggle_triplet)); + + RadioAction::Group dot_group; + + myactions.register_radio_action ("StepEditing", dot_group, "no-dotted", _("No Dotted Notes"), + sigc::mem_fun (*this, &StepEntry::dot_change), 0); + myactions.register_radio_action ("StepEditing", dot_group, "toggle-dotted", _("Toggled Dotted Notes"), + sigc::mem_fun (*this, &StepEntry::dot_change), 1); + myactions.register_radio_action ("StepEditing", dot_group, "toggle-double-dotted", _("Toggled Double-Dotted Notes"), + sigc::mem_fun (*this, &StepEntry::dot_change), 2); + myactions.register_radio_action ("StepEditing", dot_group, "toggle-triple-dotted", _("Toggled Triple-Dotted Notes"), + sigc::mem_fun (*this, &StepEntry::dot_change), 3); + + myactions.register_toggle_action ("StepEditing", "toggle-chord", _("Toggle Chord Entry"), + sigc::mem_fun (*this, &StepEntry::toggle_chord)); + myactions.register_action ("StepEditing", "sustain", _("Sustain Selected Notes by Note Length"), + sigc::mem_fun (*this, &StepEntry::do_sustain)); + + myactions.register_action ("StepEditing", "sync-to-edit-point", _("Move Insert Position to Edit Point"), + sigc::mem_fun (*this, &StepEntry::sync_to_edit_point)); + myactions.register_action ("StepEditing", "back", _("Move Insert Position Back by Note Length"), + sigc::mem_fun (*this, &StepEntry::back)); } void StepEntry::load_bindings () { + /* XXX move this to a better place */ + bindings.set_action_map (myactions); - sys::path binding_file; - SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path(); + std::string binding_file; + + if (find_file_in_search_path (ardour_config_search_path(), "step_editing.bindings", binding_file)) { + bindings.load (binding_file); + } +} + +void +StepEntry::toggle_triplet () +{ + se->set_step_edit_cursor_width (note_length()); +} + +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 (find_file_in_search_path (spath, "step_editing.bindings", binding_file)) { - bindings.load (binding_file.to_string()); + 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 () +{ + 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())); } 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 (0.0); } 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 () @@ -628,12 +869,6 @@ StepEntry::insert_b () insert_note (11 + (current_octave() * 12)); } -void -StepEntry::insert_bsharp () -{ - insert_note (12 + (current_octave() * 12)); -} - void StepEntry::note_length_change (GtkAction* act) { @@ -644,7 +879,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); @@ -661,10 +896,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); } } @@ -690,11 +924,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; @@ -734,11 +968,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; @@ -755,6 +989,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 @@ -762,7 +998,7 @@ StepEntry::radio_button_press (GdkEventButton* ev) { if (ev->button == 1) { return true; - } + } return false; } @@ -772,13 +1008,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 (); +}