#include <iostream>
-#include "pbd/filesystem.h"
#include "pbd/file_utils.h"
#include "gtkmm2ext/keyboard.h"
#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"
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")
, 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, 1, 11, 1, 4) // start in octave 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)
, 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<<i)) {
channel_adjustment.set_value (i+1);
}
}
+#endif
+
RadioButtonGroup length_group = length_1_button.get_group();
length_2_button.set_group (length_group);
length_4_button.set_group (length_group);
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);
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));
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<RadioAction> r = RefPtr<RadioAction>::cast_dynamic (act);
+ assert (r);
+ r->set_active (true);
+
+ act = myactions.find_action ("StepEditing/note-velocity-mf");
+ r = RefPtr<RadioAction>::cast_dynamic (act);
+ assert (r);
+ r->set_active (true);
}
StepEntry::~StepEntry()
/* 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;
}
}
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;
}
}
-
+
/* 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 ()
{
- 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<Action> act = myactions.find_action ("StepEditing/toggle-triplet");
RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
bool triplets = tact->get_active ();
return (Evoral::MusicalTime) velocity_adjustment.get_value();
}
-uint8_t
+uint8_t
StepEntry::note_channel() const
{
return channel_adjustment.get_value() - 1;
void
StepEntry::on_show ()
{
- ArdourDialog::on_show ();
+ 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
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",
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"),
StepEntry::load_bindings ()
{
/* XXX move this to a better place */
- KeyboardKey::set_ignored_state (GDK_LOCK_MASK|GDK_MOD2_MASK|GDK_MOD3_MASK);
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 (spath, "step_editing.bindings", binding_file)) {
- bindings.load (binding_file.to_string());
+ if (find_file_in_search_path (ardour_config_search_path(), "step_editing.bindings", binding_file)) {
+ bindings.load (binding_file);
}
}
void
StepEntry::toggle_triplet ()
{
- _mtv->set_step_edit_cursor_width (note_length());
+ se->set_step_edit_cursor_width (note_length());
}
void
StepEntry::toggle_chord ()
{
- _mtv->step_edit_toggle_chord ();
+ se->step_edit_toggle_chord ();
}
void
for (vector<const char*>::iterator i = dot_actions.begin(); i != dot_actions.end(); ++i) {
act = myactions.find_action (*i);
-
+
if (act) {
ract = RefPtr<RadioAction>::cast_dynamic (act);
- if (ract) {
+ if (ract) {
if (ract->property_value() == val) {
ract->set_active (true);
inconsistent = false;
}
}
}
-
+
dot1_button.set_inconsistent (inconsistent);
dot2_button.set_inconsistent (inconsistent);
dot3_button.set_inconsistent (inconsistent);
- _mtv->set_step_edit_cursor_width (note_length());
+ 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());
+ if (note > 127) {
+ return;
+ }
+
+ se->step_add_note (note_channel(), note, note_velocity(), note_length());
}
void
StepEntry::insert_c ()
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);
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);
for (vector<const char*>::iterator i = velocity_actions.begin(); i != velocity_actions.end(); ++i) {
act = myactions.find_action (*i);
-
+
if (act) {
ract = RefPtr<RadioAction>::cast_dynamic (act);
- if (ract) {
+ if (ract) {
if (ract->property_value() == val) {
ract->set_active (true);
inconsistent = false;
for (vector<const char*>::iterator i = length_actions.begin(); i != length_actions.end(); ++i) {
act = myactions.find_action (*i);
-
+
if (act) {
ract = RefPtr<RadioAction>::cast_dynamic (act);
- if (ract) {
+ if (ract) {
if (ract->property_value() == val) {
ract->set_active (true);
inconsistent = false;
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
{
if (ev->button == 1) {
return true;
- }
+ }
return false;
}
{
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;
}
} else if (l < 127) {
l = 127;
}
-
+
velocity_adjustment.set_value (l);
}
} else {
l = 1;
}
-
+
velocity_adjustment.set_value (l);
}
void
StepEntry::do_sustain ()
{
- _mtv->step_edit_sustain (note_length());
+ se->step_edit_sustain (note_length());
}
void
StepEntry::back ()
{
- _mtv->move_step_edit_beat_pos (-note_length());
+ se->move_step_edit_beat_pos (-note_length());
}
void
StepEntry::sync_to_edit_point ()
{
- _mtv->resync_step_edit_to_edit_point ();
+ se->resync_step_edit_to_edit_point ();
}
projects / ardour.git / blobdiff