Per-region MIDI CC "automation".
[ardour.git] / gtk2_ardour / midi_region_view.cc
index eadbb7ce52d5431225715d994f220c8499f603a9..b12f8ef4d90b19e4525f962282f376ab10afab1c 100644 (file)
 #include "public_editor.h"
 #include "ghostregion.h"
 #include "midi_time_axis.h"
+#include "automation_time_axis.h"
+#include "automation_region_view.h"
 #include "utils.h"
-#include "rgb_macros.h"
+#include "midi_util.h"
 #include "gui_thread.h"
+#include "keyboard.h"
 
 #include "i18n.h"
 
@@ -57,22 +60,28 @@ using namespace PBD;
 using namespace Editing;
 using namespace ArdourCanvas;
 
-MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<MidiRegion> r, double spu,
-                                 Gdk::Color& basic_color)
+MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color& basic_color)
        : RegionView (parent, tv, r, spu, basic_color)
+       , _default_note_length(0.0)
        , _active_notes(0)
+       , _note_group(new ArdourCanvas::Group(*parent))
        , _delta_command(NULL)
-       , _command_mode(None)
+       , _mouse_state(None)
+       , _pressed_button(0)
 {
+       _note_group->raise_to_top();
 }
 
-MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<MidiRegion> r, double spu, 
-                                 Gdk::Color& basic_color, TimeAxisViewItem::Visibility visibility)
+MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color& basic_color, TimeAxisViewItem::Visibility visibility)
        : RegionView (parent, tv, r, spu, basic_color, visibility)
+       , _default_note_length(0.0)
        , _active_notes(0)
+       , _note_group(new ArdourCanvas::Group(*parent))
        , _delta_command(NULL)
-       , _command_mode(None)
+       , _mouse_state(None)
+       , _pressed_button(0)
 {
+       _note_group->raise_to_top();
 }
 
 void
@@ -80,6 +89,11 @@ MidiRegionView::init (Gdk::Color& basic_color, bool wfd)
 {
        if (wfd)
                midi_region()->midi_source(0)->load_model();
+       
+       const Meter& m = trackview.session().tempo_map().meter_at(_region->start());
+       const Tempo& t = trackview.session().tempo_map().tempo_at(_region->start());
+       _default_note_length = m.frames_per_bar(t, trackview.session().frame_rate())
+                       / m.beats_per_bar();
 
        _model = midi_region()->midi_source(0)->model();
        _enable_display = false;
@@ -108,6 +122,8 @@ MidiRegionView::init (Gdk::Color& basic_color, bool wfd)
                }
                _model->ContentsChanged.connect(sigc::mem_fun(this, &MidiRegionView::redisplay_model));
        }
+
+       midi_region()->midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegionView::switch_source));
        
        group->signal_event().connect (mem_fun (this, &MidiRegionView::canvas_event), false);
 
@@ -116,65 +132,123 @@ MidiRegionView::init (Gdk::Color& basic_color, bool wfd)
 bool
 MidiRegionView::canvas_event(GdkEvent* ev)
 {
-       enum State { None, Pressed, Dragging };
-       static int press_button = 0;
-       static State _state;
+       static bool delete_mod = false;
+       static Editing::MidiEditMode original_mode;
 
+       static double drag_start_x, drag_start_y;
        static double last_x, last_y;
        double event_x, event_y;
+       nframes_t event_frame = 0;
 
-       static ArdourCanvas::SimpleRect* select_rect = NULL;
+       static ArdourCanvas::SimpleRect* drag_rect = NULL;
        
        if (trackview.editor.current_mouse_mode() != MouseNote)
                return false;
 
+       // Mmmm, spaghetti
+       
        switch (ev->type) {
        case GDK_KEY_PRESS:
-               if (ev->key.keyval == GDK_Delete)
+               if (ev->key.keyval == GDK_Delete && !delete_mod) {
+                       delete_mod = true;
+                       original_mode = trackview.editor.current_midi_edit_mode();
+                       trackview.editor.set_midi_edit_mode(MidiEditErase);
                        start_remove_command();
-               break;
+                       _mouse_state = EraseTouchDragging;
+               } else if (ev->key.keyval == GDK_Shift_L || ev->key.keyval == GDK_Control_L) {
+                       _mouse_state = SelectTouchDragging;
+               }
+               return true;
        
        case GDK_KEY_RELEASE:
-               if (_command_mode == Remove && ev->key.keyval == GDK_Delete)
-                       apply_command();
-               break;
+               if (ev->key.keyval == GDK_Delete) {
+                       if (_mouse_state == EraseTouchDragging) {
+                               delete_selection();
+                               apply_command();
+                       }
+                       if (delete_mod) {
+                               trackview.editor.set_midi_edit_mode(original_mode);
+                               delete_mod = false;
+                       }
+               } else if (ev->key.keyval == GDK_Shift_L || ev->key.keyval == GDK_Control_L) {
+                       _mouse_state = None;
+               }
+               return true;
 
        case GDK_BUTTON_PRESS:
-               //group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, ev->button.time);
-               _state = Pressed;
-               press_button = ev->button.button;
-               cerr << "PRESSED: " << press_button << endl;
+               if (_mouse_state != SelectTouchDragging && _mouse_state != EraseTouchDragging)
+                       _mouse_state = Pressed;
+               _pressed_button = ev->button.button;
                return true;
        
+       case GDK_ENTER_NOTIFY:
+               /* FIXME: do this on switch to note tool, too, if the pointer is already in */
+               Keyboard::magic_widget_grab_focus();
+               group->grab_focus();
+               break;
+       
        case GDK_MOTION_NOTIFY:
                event_x = ev->motion.x;
                event_y = ev->motion.y;
                group->w2i(event_x, event_y);
+                               
+               event_frame = trackview.editor.pixel_to_frame(event_x);
+               trackview.editor.snap_to(event_frame);
 
-               switch (_state) {
+               switch (_mouse_state) {
                case Pressed: // Drag start
-                       cerr << "PRESSED MOTION: " << press_button << endl;
-                       if (press_button == 1) { // Select rect start
+
+                       // Select drag start
+                       if (_pressed_button == 1 && trackview.editor.current_midi_edit_mode() == MidiEditSelect) {
+                               group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
+                                               Gdk::Cursor(Gdk::FLEUR), ev->motion.time);
+                               last_x = event_x;
+                               last_y = event_y;
+                               drag_start_x = event_x;
+                               drag_start_y = event_y;
+
+                               drag_rect = new ArdourCanvas::SimpleRect(*group);
+                               drag_rect->property_x1() = event_x;
+                               drag_rect->property_y1() = event_y;
+                               drag_rect->property_x2() = event_x;
+                               drag_rect->property_y2() = event_y;
+                               drag_rect->property_outline_what() = 0xFF;
+                               drag_rect->property_outline_color_rgba()
+                                       = ARDOUR_UI::config()->canvasvar_MidiSelectRectOutline.get();
+                               drag_rect->property_fill_color_rgba()
+                                       = ARDOUR_UI::config()->canvasvar_MidiSelectRectFill.get();
+
+                               _mouse_state = SelectRectDragging;
+                               return true;
+
+                       // Add note drag start
+                       } else if (trackview.editor.current_midi_edit_mode() == MidiEditPencil) {
                                group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
                                                Gdk::Cursor(Gdk::FLEUR), ev->motion.time);
-                               _state = Dragging;
                                last_x = event_x;
                                last_y = event_y;
+                               drag_start_x = event_x;
+                               drag_start_y = event_y;
 
-                               select_rect = new ArdourCanvas::SimpleRect(*group);
-                               select_rect->property_x1() = event_x;
-                               select_rect->property_y1() = event_y;
-                               select_rect->property_x2() = event_x;
-                               select_rect->property_y2() = event_y;
-                               select_rect->property_outline_color_rgba() = 0xFF000099;
-                               select_rect->property_fill_color_rgba() = 0xFFDDDD33;
+                               drag_rect = new ArdourCanvas::SimpleRect(*group);
+                               drag_rect->property_x1() = trackview.editor.frame_to_pixel(event_frame);
+                               
+                               drag_rect->property_y1() = midi_stream_view()->note_to_y(midi_stream_view()->y_to_note(event_y));
+                               drag_rect->property_x2() = event_x;
+                               drag_rect->property_y2() = drag_rect->property_y1() + floor(midi_stream_view()->note_height());
+                               drag_rect->property_outline_what() = 0xFF;
+                               drag_rect->property_outline_color_rgba() = 0xFFFFFF99;
 
+                               drag_rect->property_fill_color_rgba() = 0xFFFFFF66;
+
+                               _mouse_state = AddDragging;
                                return true;
                        }
-                       _state = Dragging;
-                       break;
 
-               case Dragging: // Select rect motion
+                       return false;
+
+               case SelectRectDragging: // Select drag motion
+               case AddDragging: // Add note drag motion
                        if (ev->motion.is_hint) {
                                int t_x;
                                int t_y;
@@ -184,33 +258,73 @@ MidiRegionView::canvas_event(GdkEvent* ev)
                                event_y = t_y;
                        }
 
-                       if (select_rect) {
-                               select_rect->property_x2() = event_x;
-                               select_rect->property_y2() = event_y;
+                       if (_mouse_state == AddDragging)
+                               event_x = trackview.editor.frame_to_pixel(event_frame);
+
+                       if (drag_rect)
+                               if (event_x > drag_start_x)
+                                       drag_rect->property_x2() = event_x;
+                               else
+                                       drag_rect->property_x1() = event_x;
+
+                       if (drag_rect && _mouse_state == SelectRectDragging) {
+                               if (event_y > drag_start_y)
+                                       drag_rect->property_y2() = event_y;
+                               else
+                                       drag_rect->property_y1() = event_y;
+                               
+                               update_drag_selection(drag_start_x, event_x, drag_start_y, event_y);
                        }
 
                        last_x = event_x;
                        last_y = event_y;
 
-                       return true;
+               case EraseTouchDragging:
+               case SelectTouchDragging:
+                       return false;
+
                default:
-                       _state = None;
                        break;
                }
                break;
        
        case GDK_BUTTON_RELEASE:
+               event_x = ev->motion.x;
+               event_y = ev->motion.y;
+               group->w2i(event_x, event_y);
                group->ungrab(ev->button.time);
-               switch (_state) {
+               event_frame = trackview.editor.pixel_to_frame(event_x);
+
+               switch (_mouse_state) {
                case Pressed: // Clicked
-                       if (ev->button.button == 1)
-                               create_note_at(ev->button.x, ev->button.y);
-                       _state = None;
+                       switch (trackview.editor.current_midi_edit_mode()) {
+                       case MidiEditSelect:
+                               clear_selection();
+                               break;
+                       case MidiEditPencil:
+                               trackview.editor.snap_to(event_frame);
+                               event_x = trackview.editor.frame_to_pixel(event_frame);
+                               create_note_at(event_x, event_y, _default_note_length);
+                       default:
+                               break;
+                       }
+                       _mouse_state = None;
                        return true;
-               case Dragging: // Select rect done
-                       _state = None;
-                       delete select_rect;
-                       select_rect = NULL;
+               case SelectRectDragging: // Select drag done
+                       _mouse_state = None;
+                       delete drag_rect;
+                       drag_rect = NULL;
+                       return true;
+               case AddDragging: // Add drag done
+                       _mouse_state = None;
+                       if (drag_rect->property_x2() > drag_rect->property_x1() + 2) {
+                               create_note_at(drag_rect->property_x1(), drag_rect->property_y1(),
+                                               trackview.editor.pixel_to_frame(
+                                               drag_rect->property_x2() - drag_rect->property_x1()));
+                       }
+
+                       delete drag_rect;
+                       drag_rect = NULL;
                        return true;
                default:
                        break;
@@ -226,18 +340,13 @@ MidiRegionView::canvas_event(GdkEvent* ev)
 
 /** Add a note to the model, and the view, at a canvas (click) coordinate */
 void
-MidiRegionView::create_note_at(double x, double y)
+MidiRegionView::create_note_at(double x, double y, double dur)
 {
        MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
        MidiStreamView* const view = mtv->midi_view();
 
-       const uint8_t note_range = view->highest_note() - view->lowest_note() + 1;
-       const double footer_height = name_highlight->property_y2() - name_highlight->property_y1();
-       const double roll_height = trackview.height - footer_height;
-
-       get_canvas_group()->w2i(x, y);
+       double note = midi_stream_view()->y_to_note(y);
 
-       double note = floor((roll_height - y) / roll_height * (double)note_range) + view->lowest_note();
        assert(note >= 0.0);
        assert(note <= 127.0);
 
@@ -245,9 +354,9 @@ MidiRegionView::create_note_at(double x, double y)
        assert(stamp >= 0);
        //assert(stamp <= _region->length());
 
-       const Meter& m = trackview.session().tempo_map().meter_at(stamp);
-       const Tempo& t = trackview.session().tempo_map().tempo_at(stamp);
-       double dur = m.frames_per_bar(t, trackview.session().frame_rate()) / m.beats_per_bar();
+       //const Meter& m = trackview.session().tempo_map().meter_at(stamp);
+       //const Tempo& t = trackview.session().tempo_map().tempo_at(stamp);
+       //double dur = m.frames_per_bar(t, trackview.session().frame_rate()) / m.beats_per_bar();
 
        // Add a 1 beat long note (for now)
        const MidiModel::Note new_note(stamp, dur, (uint8_t)note, 0x40);
@@ -265,7 +374,7 @@ MidiRegionView::create_note_at(double x, double y)
 void
 MidiRegionView::clear_events()
 {
-       for (std::vector<ArdourCanvas::Item*>::iterator i = _events.begin(); i != _events.end(); ++i)
+       for (std::vector<CanvasMidiEvent*>::iterator i = _events.begin(); i != _events.end(); ++i)
                delete *i;
        
        _events.clear();
@@ -285,17 +394,54 @@ MidiRegionView::display_model(boost::shared_ptr<MidiModel> model)
 void
 MidiRegionView::redisplay_model()
 {
-       clear_events();
+       // Don't redisplay the model if we're currently recording and displaying that
+       if (_active_notes)
+               return;
        
        if (_model) {
+
+               clear_events();
                begin_write();
+               
+               _model->read_lock();
 
                for (size_t i=0; i < _model->n_notes(); ++i)
                        add_note(_model->note_at(i));
 
                end_write();
+
+               for (Automatable::Controls::const_iterator i = _model->controls().begin();
+                               i != _model->controls().end(); ++i) {
+
+                       assert(i->second);
+
+                       boost::shared_ptr<AutomationTimeAxisView> at
+                               = midi_view()->automation_child(i->second->parameter());
+                       if (!at)
+                               continue;
+
+                       Gdk::Color col = midi_stream_view()->get_region_color();
+                               
+                       boost::shared_ptr<AutomationRegionView> arv;
+
+                       {
+                               Glib::Mutex::Lock list_lock (i->second->list()->lock());
+
+                               arv = boost::shared_ptr<AutomationRegionView>(
+                                               new AutomationRegionView(at->canvas_display,
+                                                       *at.get(), _region, i->second->list(),
+                                                       midi_stream_view()->get_samples_per_unit(), col));
+
+                               _automation_children.insert(std::make_pair(i->second->parameter(), arv));
+                       }
+
+                       arv->init(col, true);
+               }
+               
+               _model->read_unlock();
+
        } else {
-               warning << "MidiRegionView::redisplay_model called without a model" << endmsg;
+               cerr << "MidiRegionView::redisplay_model called without a model" << endmsg;
        }
 }
 
@@ -303,17 +449,14 @@ MidiRegionView::redisplay_model()
 MidiRegionView::~MidiRegionView ()
 {
        in_destructor = true;
-       end_write();
+       if (_active_notes)
+               end_write();
+
+       clear_events();
 
        RegionViewGoingAway (this); /* EMIT_SIGNAL */
 }
 
-boost::shared_ptr<ARDOUR::MidiRegion>
-MidiRegionView::midi_region() const
-{
-       // "Guaranteed" to succeed...
-       return boost::dynamic_pointer_cast<MidiRegion>(_region);
-}
 
 void
 MidiRegionView::region_resized (Change what_changed)
@@ -359,12 +502,6 @@ MidiRegionView::set_y_position_and_height (double y, double h)
        }
 }
 
-void
-MidiRegionView::show_region_editor ()
-{
-       cerr << "No MIDI region editor." << endl;
-}
-
 GhostRegion*
 MidiRegionView::add_ghost (AutomationTimeAxisView& atv)
 {
@@ -389,6 +526,7 @@ MidiRegionView::add_ghost (AutomationTimeAxisView& atv)
 void
 MidiRegionView::begin_write()
 {
+       assert(!_active_notes);
        _active_notes = new CanvasNote*[128];
        for (unsigned i=0; i < 128; ++i)
                _active_notes[i] = NULL;
@@ -413,25 +551,19 @@ MidiRegionView::end_write()
 void
 MidiRegionView::add_event (const MidiEvent& ev)
 {
-       /*printf("Event, time = %f, size = %zu, data = ", ev.time, ev.size);
-       for (size_t i=0; i < ev.size; ++i) {
-               printf("%X ", ev.buffer[i]);
+       /*printf("MRV add Event, time = %f, size = %u, data = ", ev.time(), ev.size());
+       for (size_t i=0; i < ev.size(); ++i) {
+               printf("%X ", ev.buffer()[i]);
        }
        printf("\n\n");*/
 
-       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
-       MidiStreamView* const view = mtv->midi_view();
-       ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
+       //ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
+       ArdourCanvas::Group* const group = _note_group;
        
-       const uint8_t note_range = view->highest_note() - view->lowest_note() + 1;
-       const double footer_height = name_highlight->property_y2() - name_highlight->property_y1();
-       const double pixel_range = (trackview.height - footer_height - 5.0) / (double)note_range;
-
-       if (mtv->note_mode() == Sustained) {
+       if (midi_view()->note_mode() == Sustained) {
                if ((ev.buffer()[0] & 0xF0) == MIDI_CMD_NOTE_ON) {
                        const Byte& note = ev.buffer()[1];
-                       const double y1 = trackview.height - (pixel_range * (note - view->lowest_note() + 1))
-                               - footer_height - 3.0;
+                       const double y1 = midi_stream_view()->note_to_y(note);
 
                        CanvasNote* ev_rect = new CanvasNote(*this, *group);
                        ev_rect->property_x1() = trackview.editor.frame_to_pixel (
@@ -439,11 +571,11 @@ MidiRegionView::add_event (const MidiEvent& ev)
                        ev_rect->property_y1() = y1;
                        ev_rect->property_x2() = trackview.editor.frame_to_pixel (
                                        _region->length());
-                       ev_rect->property_y2() = y1 + ceil(pixel_range);
-                       ev_rect->property_outline_color_rgba() = 0xFFFFFFAA;
+                       ev_rect->property_y2() = y1 + floor(midi_stream_view()->note_height());
+                       ev_rect->property_fill_color_rgba() = note_fill_color(ev.velocity());
+                       ev_rect->property_outline_color_rgba() = note_outline_color(ev.velocity());
                        /* outline all but right edge */
                        ev_rect->property_outline_what() = (guint32) (0x1 & 0x4 & 0x8);
-                       ev_rect->property_fill_color_rgba() = 0xFFFFFF66;
 
                        ev_rect->raise_to_top();
 
@@ -460,18 +592,18 @@ MidiRegionView::add_event (const MidiEvent& ev)
                        }
                }
        
-       } else if (mtv->note_mode() == Percussive) {
+       } else if (midi_view()->note_mode() == Percussive) {
                const Byte& note = ev.buffer()[1];
+               const double diamond_size = midi_stream_view()->note_height() / 2.0;
                const double x = trackview.editor.frame_to_pixel((nframes_t)ev.time());
-               const double y = trackview.height - (pixel_range * (note - view->lowest_note() + 1))
-                       - footer_height - 3.0;
+               const double y = midi_stream_view()->note_to_y(note) + ((diamond_size-2) / 4.0);
 
-               CanvasHit* ev_diamond = new CanvasHit(*this, *group, std::min(pixel_range, 5.0));
+               CanvasHit* ev_diamond = new CanvasHit(*this, *group, diamond_size);
                ev_diamond->move(x, y);
                ev_diamond->show();
-               ev_diamond->property_outline_color_rgba() = 0xFFFFFFDD;
-               ev_diamond->property_fill_color_rgba() = 0xFFFFFF66;
-                       
+               ev_diamond->property_fill_color_rgba() = note_fill_color(ev.velocity());
+               ev_diamond->property_outline_color_rgba() = note_outline_color(ev.velocity());
+               
                _events.push_back(ev_diamond);
        }
 }
@@ -500,54 +632,182 @@ void
 MidiRegionView::add_note (const MidiModel::Note& note)
 {
        assert(note.time() >= 0);
-       assert(note.time() < _region->length());
-       //assert(note.time() + note.duration < _region->length());
+       //assert(note.time() < _region->length());
 
-       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
-       MidiStreamView* const view = mtv->midi_view();
        ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
        
-       const uint8_t note_range = view->highest_note() - view->lowest_note() + 1;
-       const double footer_height = name_highlight->property_y2() - name_highlight->property_y1();
-       const double pixel_range = (trackview.height - footer_height - 5.0) / (double)note_range;
-       const uint8_t fill_alpha = 0x20 + (uint8_t)(note.velocity() * 1.5); 
-       const uint32_t fill = RGBA_TO_UINT(0xE0 + note.velocity()/127.0 * 0x10, 0xE0, 0xE0, fill_alpha);
-       const uint8_t outline_alpha = 0x80 + (uint8_t)(note.velocity()); 
-       const uint32_t outline = RGBA_TO_UINT(0xE0 + note.velocity()/127.0 * 0x10, 0xE0, 0xE0, outline_alpha);
-       
-       //printf("Range: %d\n", note_range);
-       //printf("Event, time = %f, note = %d\n", note.time(), note.note());
-
+       if (midi_view()->note_mode() == Sustained) {
+               const double y1 = midi_stream_view()->note_to_y(note.note());
 
-       if (mtv->note_mode() == Sustained) {
-               const double y1 = trackview.height - (pixel_range * (note.note() - view->lowest_note() + 1))
-                       - footer_height - 3.0;
-
-               ArdourCanvas::SimpleRect * ev_rect = new CanvasNote(*this, *group, &note);
+               CanvasNote* ev_rect = new CanvasNote(*this, *group, &note);
                ev_rect->property_x1() = trackview.editor.frame_to_pixel((nframes_t)note.time());
                ev_rect->property_y1() = y1;
                ev_rect->property_x2() = trackview.editor.frame_to_pixel((nframes_t)(note.end_time()));
-               ev_rect->property_y2() = y1 + ceil(pixel_range);
+               ev_rect->property_y2() = y1 + floor(midi_stream_view()->note_height());
 
-               ev_rect->property_fill_color_rgba() = fill;
-               ev_rect->property_outline_color_rgba() = outline;
+               ev_rect->property_fill_color_rgba() = note_fill_color(note.velocity());
+               ev_rect->property_outline_color_rgba() = note_outline_color(note.velocity());
                ev_rect->property_outline_what() = (guint32) 0xF; // all edges
 
                ev_rect->show();
                _events.push_back(ev_rect);
 
-       } else if (mtv->note_mode() == Percussive) {
+       } else if (midi_view()->note_mode() == Percussive) {
+               const double diamond_size = midi_stream_view()->note_height() / 2.0;
                const double x = trackview.editor.frame_to_pixel((nframes_t)note.time());
-               const double y = trackview.height - (pixel_range * (note.note() - view->lowest_note() + 1))
-                       - footer_height - 3.0;
+               const double y = midi_stream_view()->note_to_y(note.note()) + ((diamond_size-2) / 4.0);
 
-               CanvasHit* ev_diamond = new CanvasHit(*this, *group, std::min(pixel_range, 5.0), &note);
+               CanvasHit* ev_diamond = new CanvasHit(*this, *group, diamond_size);
                ev_diamond->move(x, y);
                ev_diamond->show();
-               ev_diamond->property_fill_color_rgba() = fill;
-               ev_diamond->property_outline_color_rgba() = outline;
+               ev_diamond->property_fill_color_rgba() = note_fill_color(note.velocity());
+               ev_diamond->property_outline_color_rgba() = note_outline_color(note.velocity());
                _events.push_back(ev_diamond);
        }
 }
 
+void
+MidiRegionView::delete_selection()
+{
+       assert(_delta_command);
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i)
+               if ((*i)->selected())
+                       _delta_command->remove(*(*i)->note());
+
+       _selection.clear();
+}
+
+void
+MidiRegionView::clear_selection_except(ArdourCanvas::CanvasMidiEvent* ev)
+{
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i)
+               if ((*i)->selected() && (*i) != ev)
+                       (*i)->selected(false);
+
+       _selection.clear();
+}
+
+void
+MidiRegionView::unique_select(ArdourCanvas::CanvasMidiEvent* ev)
+{
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i)
+               if ((*i) != ev)
+                       (*i)->selected(false);
+
+       _selection.clear();
+       _selection.insert(ev);
+       
+       if ( ! ev->selected())
+               ev->selected(true);
+}
+       
+void
+MidiRegionView::note_selected(ArdourCanvas::CanvasMidiEvent* ev, bool add)
+{
+       if ( ! add)
+               clear_selection_except(ev);
+       
+       _selection.insert(ev);
+       
+       if ( ! ev->selected())
+               ev->selected(true);
+}
+
+
+void
+MidiRegionView::note_deselected(ArdourCanvas::CanvasMidiEvent* ev, bool add)
+{
+       if ( ! add)
+               clear_selection_except(ev);
+       
+       _selection.erase(ev);
+       
+       if (ev->selected())
+               ev->selected(false);
+}
+
+
+void
+MidiRegionView::update_drag_selection(double x1, double x2, double y1, double y2)
+{
+       const double last_y = std::min(y1, y2);
+       const double y      = std::max(y1, y2);
+       
+       // FIXME: so, so, so much slower than this should be
+
+       if (x1 < x2) {
+               for (std::vector<CanvasMidiEvent*>::iterator i = _events.begin(); i != _events.end(); ++i) {
+                       if ((*i)->x1() >= x1 && (*i)->x1() <= x2 && (*i)->y1() >= last_y && (*i)->y1() <= y) {
+                               (*i)->selected(true);
+                               _selection.insert(*i);
+                       } else {
+                               (*i)->selected(false);
+                               _selection.erase(*i);
+                       }
+               }
+       } else {
+               for (std::vector<CanvasMidiEvent*>::iterator i = _events.begin(); i != _events.end(); ++i) {
+                       if ((*i)->x2() <= x1 && (*i)->x2() >= x2 && (*i)->y1() >= last_y && (*i)->y1() <= y) {
+                               (*i)->selected(true);
+                               _selection.insert(*i);
+                       } else {
+                               (*i)->selected(false);
+                               _selection.erase(*i);
+                       }
+               }
+       }
+}
+
+       
+void
+MidiRegionView::move_selection(double dx, double dy)
+{
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i)
+               (*i)->item()->move(dx, dy);
+}
+
+
+void
+MidiRegionView::note_dropped(CanvasMidiEvent* ev, double dt, uint8_t dnote)
+{
+       // TODO: This would be faster/nicer with a MoveCommand that doesn't need to copy...
+       if (_selection.find(ev) != _selection.end()) {
+               start_delta_command();
+
+               for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+                       command_remove_note(*i);
+                       MidiModel::Note copy(*(*i)->note()); 
+
+                       copy.set_time((*i)->note()->time() + dt);
+                       copy.set_note((*i)->note()->note() + dnote);
+
+                       command_add_note(copy);
+               }
+               apply_command();
+       }
+}
+       
+
+void
+MidiRegionView::note_entered(ArdourCanvas::CanvasMidiEvent* ev)
+{
+       cerr << "NOTE ENTERED: " << _mouse_state << endl;
+       if (ev->note() && _mouse_state == EraseTouchDragging) {
+               start_delta_command();
+               ev->selected(true);
+               _delta_command->remove(*ev->note());
+       } else if (_mouse_state == SelectTouchDragging) {
+               note_selected(ev, true);
+       }
+}
+       
+
+void
+MidiRegionView::switch_source(boost::shared_ptr<Source> src)
+{
+       boost::shared_ptr<MidiSource> msrc = boost::dynamic_pointer_cast<MidiSource>(src);
+       if (msrc)
+               display_model(msrc->model());
+}