Remove special handling of session range in export. Fixes things when the session...

[ardour.git] / gtk2_ardour / piano_roll_header.cc

diff --git a/gtk2_ardour/piano_roll_header.cc b/gtk2_ardour/piano_roll_header.cc
index 4bb8250fea2c38f2f223a23b5ea12393782a0574..3243f893c7622a9d27dfcf6b38c263e1b4000b29 100644 (file)
--- a/gtk2_ardour/piano_roll_header.cc
+++ b/gtk2_ardour/piano_roll_header.cc
@@ -22,9 +22,11 @@
 
 #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;
 
@@ -445,7 +447,7 @@ PianoRollHeader::on_expose_event (GdkEventExpose* ev)
                        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);
@@ -465,26 +467,39 @@ PianoRollHeader::on_motion_notify_event (GdkEventMotion* ev)
 
                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 (editor().current_mouse_mode() == Editing::MouseRange) {
+                       
+                       /* 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);
+                               }
                        }
                }
        }
@@ -499,21 +514,27 @@ 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 */
+       if (ev->button != 1) {
+               return false;
+       }
+
+       if (editor().current_mouse_mode() == Editing::MouseRange) {
+               if (Keyboard::no_modifiers_active (ev->state)) {
+                       SetNoteSelection (note); // EMIT SIGNAL
+               }
+               _dragging = true;
        } else {
-               
+
                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);
-                               
+
                                invalidate_note_range(note, note);
                        } else {
                                reset_clicked_note(note);
@@ -529,12 +550,11 @@ PianoRollHeader::on_button_release_event (GdkEventButton* ev)
 {
        int note = _view.y_to_note(ev->y);
 
-       if (ev->button == 2) {
-               send_note_off (note);
+       if (editor().current_mouse_mode() == Editing::MouseRange) {
 
                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
@@ -544,14 +564,14 @@ PianoRollHeader::on_button_release_event (GdkEventButton* ev)
 
                if (_dragging) {
                        remove_modal_grab();
-                       _dragging = false;
-                       
+
                        if (note == _clicked_note) {
                                reset_clicked_note(note);
                        }
-               } 
+               }
        }
 
+       _dragging = false;
        return true;
 }
 
@@ -656,11 +676,12 @@ 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;
 
@@ -672,9 +693,10 @@ void
 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;
 
@@ -692,3 +714,9 @@ PianoRollHeader::reset_clicked_note (uint8_t note, bool invalidate)
                invalidate_note_range (note, note);
        }
 }
+
+PublicEditor&
+PianoRollHeader::editor() const
+{
+       return _view.trackview().editor();
+}