ardour/livetrax
13
0
Fork 0
Code

endless further tweaks to step editor; stop stealing the "r" key inside MidiRegionView key handling

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7537 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-08-04 17:04:20 +00:00
parent c831ea5167
commit 46eaff772d
5 changed files with 145 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/midi_region_view.cc
View File

@ -613,13 +613,7 @@ MidiRegionView::key_press (GdkEventKey* ev)
} else if (ev->keyval == GDK_Control_L) {
return true;
} else if (ev->keyval == GDK_r) {
/* yes, this steals r */
if (midi_view()->midi_track()->step_editing()) {
midi_view()->step_edit_rest ();
return true;
}
}
return false;

23
gtk2_ardour/midi_time_axis.cc
View File

@ -968,6 +968,15 @@ MidiTimeAxisView::check_step_edit ()
int
MidiTimeAxisView::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Evoral::MusicalTime beat_duration)
{
MidiStreamView* msv = midi_view();
/* make sure its visible on the vertical axis */
if (pitch < msv->lowest_note() || pitch > msv->highest_note()) {
msv->update_note_range (pitch);
msv->set_note_range (MidiStreamView::ContentsRange);
}
if (step_edit_region == 0) {
step_edit_region = add_region (step_edit_insert_position);
@ -1050,11 +1059,19 @@ MidiTimeAxisView::step_edit_toggle_chord ()
}
void
MidiTimeAxisView::step_edit_rest ()
MidiTimeAxisView::step_edit_rest (Evoral::MusicalTime beats)
{
bool success;
Evoral::MusicalTime beats = _editor.get_grid_type_as_beats (success, step_edit_insert_position);
step_edit_beat_pos += beats;
if (beats == 0.0) {
beats = _editor.get_grid_type_as_beats (success, step_edit_insert_position);
} else {
success = true;
}
if (success) {
step_edit_beat_pos += beats;
}
}
boost::shared_ptr<Region>

2
gtk2_ardour/midi_time_axis.h
View File

@ -88,7 +88,7 @@ class MidiTimeAxisView : public RouteTimeAxisView
}
void check_step_edit ();
void step_edit_rest ();
void step_edit_rest (Evoral::MusicalTime beats);
int step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity,
Evoral::MusicalTime beat_duration);
bool step_edit_within_triplet () const;

132
gtk2_ardour/step_entry.cc
View File

@ -21,6 +21,8 @@
#include "gtkmm2ext/keyboard.h"
#include "ardour_ui.h"
#include "midi_channel_selector.h"
#include "midi_time_axis.h"
#include "step_entry.h"
#include "utils.h"
@ -46,12 +48,27 @@ StepEntry::StepEntry (MidiTimeAxisView& mtv)
, triplet_button ("3")
, sustain_button ("sustain")
, rest_button ("rest")
, channel_adjustment (0, 15, 0, 1, 4)
, grid_rest_button ("g-rest")
, channel_adjustment (1, 1, 16, 0, 1, 4)
, channel_spinner (channel_adjustment)
, _piano (0)
, piano (0)
, _mtv (&mtv)
{
/* 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();
for (uint32_t i = 0; i < 16; ++i) {
if (chn_mask & (1<<i)) {
channel_adjustment.set_value (i+1);
break;
}
}
RadioButtonGroup length_group = length_1_button.get_group();
length_2_button.set_group (length_group);
length_4_button.set_group (length_group);
@ -101,6 +118,14 @@ StepEntry::StepEntry (MidiTimeAxisView& mtv)
note_length_box.pack_start (length_32_button, false, false);
note_length_box.pack_start (length_64_button, false, false);
ARDOUR_UI::instance()->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"), "");
RadioButtonGroup velocity_group = velocity_ppp_button.get_group();
velocity_pp_button.set_group (velocity_group);
velocity_p_button.set_group (velocity_group);
@ -144,6 +169,15 @@ 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"), "");
note_velocity_box.pack_start (velocity_ppp_button, false, false);
note_velocity_box.pack_start (velocity_pp_button, false, false);
note_velocity_box.pack_start (velocity_p_button, false, false);
@ -162,15 +196,30 @@ StepEntry::StepEntry (MidiTimeAxisView& mtv)
w->show();
chord_button.add (*w);
rest_box.pack_start (rest_button, false, false);
rest_box.pack_start (grid_rest_button, false, 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"), "");
VBox* 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.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 (sustain_button, false, false);
upper_box.pack_start (rest_button, false, false);
upper_box.pack_start (rest_box, false, false);
upper_box.pack_start (note_velocity_box, false, false, 12);
upper_box.pack_start (channel_spinner, false, false);
upper_box.pack_start (*v, false, false);
_piano = (PianoKeyboard*) piano_keyboard_new ();
piano = Glib::wrap ((GtkWidget*) _piano);
@ -182,6 +231,7 @@ StepEntry::StepEntry (MidiTimeAxisView& mtv)
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));
@ -200,30 +250,39 @@ StepEntry::~StepEntry()
bool
StepEntry::on_key_press_event (GdkEventKey* ev)
{
int ret;
g_signal_emit_by_name (G_OBJECT(_piano), "key-press-event", ev, &ret);
return ret;
std::cerr << "Propagate key press, focus widget = "
<< gtk_window_get_focus (GTK_WINDOW(gobj()))
<< " _piano = " << _piano << std::endl;
if (!gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) {
return gtk_window_activate_key (GTK_WINDOW(gobj()), ev);
}
return true;
}
bool
StepEntry::on_key_release_event (GdkEventKey* ev)
{
int ret;
g_signal_emit_by_name (G_OBJECT(_piano), "key-release-event", ev, &ret);
return ret;
std::cerr << "Propagate key release, focus widget = "
<< gtk_window_get_focus (GTK_WINDOW(gobj()))
<< " _piano = " << _piano << std::endl;
if (!gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) {
return gtk_window_activate_key (GTK_WINDOW(gobj()), ev);
}
return true;
}
void
StepEntry::rest_event_handler ()
{
_mtv->step_edit_rest();
_mtv->step_edit_rest (0.0);
}
void
StepEntry::note_off_event_handler (int note)
Evoral::MusicalTime
StepEntry::note_length () const
{
Evoral::MusicalTime length = 1.0;
uint8_t velocity = 64;
Evoral::MusicalTime length = 0.0;
if (length_64_button.get_active()) {
length = 1.0/64.0;
@ -245,6 +304,18 @@ StepEntry::note_off_event_handler (int note)
length *= 0.5;
}
if (_mtv->step_edit_within_triplet()) {
length *= 2.0/3.0;
}
return length;
}
uint8_t
StepEntry::note_velocity () const
{
uint8_t velocity = 64;
if (velocity_ppp_button.get_active()) {
velocity = 16;
} else if (velocity_pp_button.get_active()) {
@ -263,17 +334,32 @@ StepEntry::note_off_event_handler (int note)
velocity = 127;
}
if (_mtv->step_edit_within_triplet()) {
length *= 2.0/3.0;
}
return velocity;
}
_mtv->step_add_note (channel_adjustment.get_value(), note, velocity, length);
uint8_t
StepEntry::note_channel() const
{
return channel_adjustment.get_value() - 1;
}
void
StepEntry::note_off_event_handler (int note)
{
_mtv->step_add_note (note_channel(), note, note_velocity(), note_length());
}
void
StepEntry::rest_click ()
{
_mtv->step_edit_rest ();
_mtv->step_edit_rest (note_length());
}
void
StepEntry::grid_rest_click ()
{
_mtv->step_edit_rest (0.0);
}
void
@ -295,7 +381,15 @@ StepEntry::chord_toggled ()
bool
StepEntry::piano_enter_notify_event (GdkEventCrossing *ev)
{
std::cerr << "PIANO ENTER\n";
piano->grab_focus ();
return false;
}
void
StepEntry::on_show ()
{
ArdourDialog::on_show ();
piano->grab_focus ();
std::cerr << "SHOW, piano has focus\n";
}

10
gtk2_ardour/step_entry.h
View File

@ -40,6 +40,10 @@ class StepEntry : public ArdourDialog
void note_off_event_handler (int note);
void rest_event_handler ();
Evoral::MusicalTime note_length() const;
uint8_t note_velocity() const;
uint8_t note_channel() const;
private:
Gtk::VBox packer;
Gtk::HBox upper_box;
@ -49,9 +53,12 @@ class StepEntry : public ArdourDialog
Gtk::ToggleButton chord_button;
Gtk::ToggleButton triplet_button;
Gtk::ToggleButton dot_button;
Gtk::ToggleButton restart_button;
Gtk::Button sustain_button;
Gtk::Button rest_button;
Gtk::Button grid_rest_button;
Gtk::VBox rest_box;
Gtk::RadioButton length_1_button;
Gtk::RadioButton length_2_button;
@ -79,6 +86,7 @@ class StepEntry : public ArdourDialog
MidiTimeAxisView* _mtv;
void rest_click ();
void grid_rest_click ();
void sustain_click ();
void chord_toggled ();
void triplet_toggled ();
@ -86,6 +94,8 @@ class StepEntry : public ArdourDialog
bool piano_enter_notify_event (GdkEventCrossing *ev);
bool on_key_release_event (GdkEventKey*);
bool on_key_press_event (GdkEventKey*);
void on_show ();
};
#endif /* __gtk2_ardour_step_entry_h__ */