X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstep_entry.cc;h=3caada4b8908dbe7224f0be4f5398f4a6eaa22b7;hb=e490a1a2785f6d5aa3f8b3e600ce2e614c3a6077;hp=011fadc3c49025f16e49aa611a0b693f31a47c16;hpb=aac46a38fbd3b979dd1d352a4d1454ac8a70793f;p=ardour.git diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc index 011fadc3c4..3caada4b89 100644 --- a/gtk2_ardour/step_entry.cc +++ b/gtk2_ardour/step_entry.cc @@ -31,6 +31,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,27 +45,30 @@ 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) + : ArdourDialog (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")) + , back_button (_("back")) , channel_adjustment (1, 1, 16, 1, 4) , channel_spinner (channel_adjustment) , octave_adjustment (4, 1, 11, 1, 4) // start in octave 4 @@ -81,17 +85,18 @@ StepEntry::StepEntry (MidiTimeAxisView& mtv) , 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); + 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); + 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 (dot_button.gobj()), false); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (dot_button.gobj()), act->gobj()); + 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()); @@ -332,7 +381,8 @@ StepEntry::StepEntry (MidiTimeAxisView& mtv) 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); @@ -386,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); @@ -463,7 +514,7 @@ StepEntry::on_key_release_event (GdkEventKey* ev) void StepEntry::rest_event_handler () { - _mtv->step_edit_rest (0.0); + se->step_edit_rest (0.0); } Evoral::MusicalTime @@ -475,16 +526,15 @@ StepEntry::note_length () RefPtr tact = RefPtr::cast_dynamic (act); bool triplets = tact->get_active (); - act = myactions.find_action ("StepEditing/toggle-dotted"); - tact = RefPtr::cast_dynamic (act); - bool dotted = tact->get_active (); - if (triplets) { base_time *= (2.0/3.0); } - if (dotted) { - base_time *= 1.5; // add support for multiple dots sometime + double dots = dot_adjustment.get_value (); + + if (dots > 0) { + dots = pow (2.0, dots); + base_time *= 1 + ((dots - 1.0)/dots); } return base_time; @@ -519,13 +569,13 @@ StepEntry::on_show () 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 @@ -614,13 +664,28 @@ StepEntry::register_actions () _("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_dotted)); - myactions.register_toggle_action ("StepEditing", "toggle-dotted", _("Toggled Dotted 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 @@ -642,49 +707,90 @@ StepEntry::load_bindings () void StepEntry::toggle_triplet () { - // nowt to be done + se->set_step_edit_cursor_width (note_length()); } void StepEntry::toggle_chord () { - _mtv->step_edit_toggle_chord (); + se->step_edit_toggle_chord (); } void -StepEntry::toggle_dotted () +StepEntry::dot_change (GtkAction* act) { - // nowt to be done + 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 (0.0); } void StepEntry::insert_note (uint8_t note) { - _mtv->step_add_note (note_channel(), note, note_velocity(), note_length()); + se->step_add_note (note_channel(), note, note_velocity(), note_length()); } void StepEntry::insert_c () @@ -870,7 +976,7 @@ StepEntry::length_value_change () length_32_button.set_inconsistent (inconsistent); length_64_button.set_inconsistent (inconsistent); - _mtv->set_step_edit_cursor_width (note_length()); + se->set_step_edit_cursor_width (note_length()); } bool @@ -1030,5 +1136,17 @@ StepEntry::octave_n (int n) void StepEntry::do_sustain () { - _mtv->step_edit_sustain (note_length()); + 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 (); }