X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstep_entry.cc;h=8e8bd3a3fadae62bae2a33addeaa922d89850673;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=0ac281b8779ff4139698999790007f10f87c83bc;hpb=7874dd2b07ec38a400479e39a65e4d4c75b32394;p=ardour.git diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc index 0ac281b877..8e8bd3a3fa 100644 --- a/gtk2_ardour/step_entry.cc +++ b/gtk2_ardour/step_entry.cc @@ -57,7 +57,7 @@ _rest_event_handler (GtkWidget* /*widget*/, gpointer arg) } StepEntry::StepEntry (StepEditor& seditor) - : ArdourDialog (string_compose (_("Step Entry: %1"), seditor.name())) + : ArdourWindow (string_compose (_("Step Entry: %1"), seditor.name())) , _current_note_length (1.0) , _current_note_velocity (64) , triplet_button ("3") @@ -69,7 +69,7 @@ StepEntry::StepEntry (StepEditor& seditor) , rest_button (_("rest")) , grid_rest_button (_("g-rest")) , back_button (_("back")) - , channel_adjustment (1, 1, 16, 1, 4) + , 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) @@ -97,7 +97,7 @@ StepEntry::StepEntry (StepEditor& seditor) */ uint16_t chn_mask = se->channel_selector().get_selected_channels(); - + for (uint32_t i = 0; i < 16; ++i) { if (chn_mask & (1<gobj()); - + upper_box.set_spacing (6); upper_box.pack_start (chord_button, false, false); upper_box.pack_start (note_length_box, false, false, 12); @@ -445,7 +445,7 @@ StepEntry::StepEntry (StepEditor& seditor) 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)); beat_resync_button.signal_clicked().connect (sigc::mem_fun (*this, &StepEntry::beat_resync_click)); @@ -458,7 +458,19 @@ StepEntry::StepEntry (StepEditor& seditor) 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() @@ -483,7 +495,7 @@ 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); @@ -505,7 +517,7 @@ StepEntry::on_key_release_event (GdkEventKey* ev) return true; } } - + /* don't forward releases */ return true; @@ -520,8 +532,8 @@ StepEntry::rest_event_handler () Evoral::MusicalTime StepEntry::note_length () { - Evoral::MusicalTime base_time = 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 (); @@ -546,7 +558,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; @@ -562,7 +574,7 @@ StepEntry::note_off_event_handler (int note) void StepEntry::on_show () { - ArdourDialog::on_show (); + ArdourWindow::on_show (); //piano->grab_focus (); } @@ -628,11 +640,11 @@ StepEntry::register_actions () 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", + 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); @@ -669,13 +681,13 @@ StepEntry::register_actions () RadioAction::Group dot_group; - myactions.register_radio_action ("StepEditing", dot_group, "no-dotted", _("No Dotted Notes"), + 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"), + 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"), + 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"), + 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"), @@ -697,9 +709,8 @@ StepEntry::load_bindings () bindings.set_action_map (myactions); sys::path binding_file; - SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path(); - if (find_file_in_search_path (spath, "step_editing.bindings", binding_file)) { + if (find_file_in_search_path (ardour_config_search_path(), "step_editing.bindings", binding_file)) { bindings.load (binding_file.to_string()); } } @@ -742,11 +753,11 @@ StepEntry::dot_value_change () 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) { if (ract->property_value() == val) { ract->set_active (true); inconsistent = false; @@ -755,7 +766,7 @@ StepEntry::dot_value_change () } } } - + dot1_button.set_inconsistent (inconsistent); dot2_button.set_inconsistent (inconsistent); dot3_button.set_inconsistent (inconsistent); @@ -869,7 +880,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); @@ -886,7 +897,7 @@ 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)); velocity_adjustment.set_value (v); @@ -914,11 +925,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; @@ -958,11 +969,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; @@ -988,7 +999,7 @@ StepEntry::radio_button_press (GdkEventButton* ev) { if (ev->button == 1) { return true; - } + } return false; } @@ -998,13 +1009,13 @@ 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; } @@ -1101,7 +1112,7 @@ StepEntry::next_note_velocity () } else if (l < 127) { l = 127; } - + velocity_adjustment.set_value (l); } @@ -1127,7 +1138,7 @@ StepEntry::prev_note_velocity () } else { l = 1; } - + velocity_adjustment.set_value (l); }