#include "gtkmm2ext/keyboard.h"
+#include "editing.h"
#include "piano_roll_header.h"
#include "midi_time_axis.h"
#include "midi_streamview.h"
+#include "public_editor.h"
const int no_note = 0xff;
void
PianoRollHeader::get_path(PianoRollHeader::ItemType note_type, int note, double x[], double y[])
{
- double y_pos = floor(_view.note_to_y(note)) - 0.5f;
+ double y_pos = floor(_view.note_to_y(note)) + 1.5f;
double note_height;
- double other_y1 = floor(_view.note_to_y(note+1)) + floor(_note_height / 2.0f) + 0.5f;
- double other_y2 = floor(_view.note_to_y(note-1)) + floor(_note_height / 2.0f) - 1.0f;
+ double other_y1 = floor(_view.note_to_y(note+1)) + floor(_note_height / 2.0f) + 2.5f;
+ double other_y2 = floor(_view.note_to_y(note-1)) + floor(_note_height / 2.0f) + 1.0f;
double width = get_width();
if (note == 0) {
- note_height = floor(_view.contents_height()) - y_pos;
+ note_height = floor(_view.contents_height()) - y_pos + 2.;
} else {
- note_height = floor(_view.note_to_y(note - 1)) - y_pos;
+ note_height = floor(_view.note_to_y(note - 1)) - y_pos + 2.;
}
switch (note_type) {
double y = floor(_view.note_to_y(i)) - 0.5f;
double note_height = floor(_view.note_to_y(i - 1)) - y;
- int cn = i / 12;
+ int cn = i / 12 - 1;
s << "C" << cn;
//cr->get_text_extents(s.str(), te);
int note = _view.y_to_note(ev->y);
- if (_highlighted_note != no_note) {
- if (note > _highlighted_note) {
- invalidate_note_range(_highlighted_note, note);
- } else {
- invalidate_note_range(note, _highlighted_note);
+ if ( false /*editor().current_mouse_mode() == Editing::MouseRange*/ ) { //ToDo: fix this. this mode is buggy, and of questionable utility anyway
+
+ /* select note range */
+
+ if (Keyboard::no_modifiers_active (ev->state)) {
+ AddNoteSelection (note); // EMIT SIGNAL
}
+
+ } else {
- _highlighted_note = note;
- }
-
- /* redraw already taken care of above */
- if (_clicked_note != no_note && _clicked_note != note) {
- _active_notes[_clicked_note] = false;
- send_note_off(_clicked_note);
+ /* play notes */
- _clicked_note = note;
+ if (_highlighted_note != no_note) {
+ if (note > _highlighted_note) {
+ invalidate_note_range(_highlighted_note, note);
+ } else {
+ invalidate_note_range(note, _highlighted_note);
+ }
+
+ _highlighted_note = note;
+ }
- if (!_active_notes[note]) {
- _active_notes[note] = true;
- send_note_on(note);
+ /* redraw already taken care of above */
+ if (_clicked_note != no_note && _clicked_note != note) {
+ _active_notes[_clicked_note] = false;
+ send_note_off(_clicked_note);
+
+ _clicked_note = note;
+
+ if (!_active_notes[note]) {
+ _active_notes[note] = true;
+ send_note_on(note);
+ }
}
}
}
PianoRollHeader::on_button_press_event (GdkEventButton* ev)
{
int note = _view.y_to_note(ev->y);
-
- if (ev->button == 2) {
- send_note_on (note);
- /* relax till release */
- } else {
+ bool tertiary = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier);
+
+ if (ev->button == 2 && Keyboard::no_modifiers_active (ev->state)) {
+ SetNoteSelection (note); // EMIT SIGNAL
+ return true;
+ } else if (tertiary && (ev->button == 1 || ev->button == 2)) {
+ ExtendNoteSelection (note); // EMIT SIGNAL
+ return true;
+ } else if (ev->button == 1 && note >= 0 && note < 128) {
+ add_modal_grab();
+ _dragging = true;
- if (ev->type == GDK_BUTTON_PRESS && note >= 0 && note < 128) {
-
- add_modal_grab();
- _dragging = true;
+ if (!_active_notes[note]) {
+ _active_notes[note] = true;
+ _clicked_note = note;
+ send_note_on(note);
- if (!_active_notes[note]) {
- _active_notes[note] = true;
- _clicked_note = note;
- send_note_on(note);
-
- invalidate_note_range(note, note);
- } else {
- reset_clicked_note(note);
- }
+ invalidate_note_range(note, note);
+ } else {
+ reset_clicked_note(note);
}
}
{
int note = _view.y_to_note(ev->y);
- if (ev->button == 2) {
- send_note_off (note);
+ if (false /*editor().current_mouse_mode() == Editing::MouseRange*/ ) { //Todo: this mode is buggy, and of questionable utility anyway
if (Keyboard::no_modifiers_active (ev->state)) {
AddNoteSelection (note); // EMIT SIGNAL
- } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+ } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
ToggleNoteSelection (note); // EMIT SIGNAL
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::RangeSelectModifier)) {
ExtendNoteSelection (note); // EMIT SIGNAL
if (_dragging) {
remove_modal_grab();
- _dragging = false;
-
+
if (note == _clicked_note) {
reset_clicked_note(note);
}
- }
+ }
}
+ _dragging = false;
return true;
}
PianoRollHeader::note_range_changed()
{
_note_height = floor(_view.note_height()) + 0.5f;
-
queue_draw();
-
- Glib::RefPtr<Gdk::Window> win = get_window();
-
- if (win) {
- win->process_updates(false);
- }
}
void
PianoRollHeader::send_note_on(uint8_t note)
{
boost::shared_ptr<ARDOUR::MidiTrack> track = _view.trackview().midi_track();
+ MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*> (&_view.trackview ());
//cerr << "note on: " << (int) note << endl;
if (track) {
- _event[0] = (MIDI_CMD_NOTE_ON | track->default_channel());
+ _event[0] = (MIDI_CMD_NOTE_ON | mtv->get_channel_for_add ());
_event[1] = note;
_event[2] = 100;
PianoRollHeader::send_note_off(uint8_t note)
{
boost::shared_ptr<ARDOUR::MidiTrack> track = _view.trackview().midi_track();
+ MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*> (&_view.trackview ());
if (track) {
- _event[0] = (MIDI_CMD_NOTE_OFF | track->default_channel());
+ _event[0] = (MIDI_CMD_NOTE_OFF | mtv->get_channel_for_add ());
_event[1] = note;
_event[2] = 100;
invalidate_note_range (note, note);
}
}
+
+PublicEditor&
+PianoRollHeader::editor() const
+{
+ return _view.trackview().editor();
+}
projects / ardour.git / blobdiff