Merge with 2.0-ongoing R2988

[ardour.git] / gtk2_ardour / midi_region_view.h

diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index d2c0df182d52c5765fff461e128ef968b43f1f24..a709f523a3aa660f5fd5ff63039fb35a2400ca35 100644 (file)
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -72,12 +72,14 @@ class MidiRegionView : public RegionView
        
        void set_y_position_and_height (double, double);
        
+       void set_frame_color();
+
        void redisplay_model();
 
     GhostRegion* add_ghost (AutomationTimeAxisView&);
 
-       void add_event(const ARDOUR::MidiEvent& ev);
-       void add_note(const ARDOUR::Note& note);
+       void add_note(const boost::shared_ptr<ARDOUR::Note> note);
+       void resolve_note(uint8_t note_num, double end_time);
 
        void begin_write();
        void end_write();
@@ -99,14 +101,14 @@ class MidiRegionView : public RegionView
                        _delta_command = _model->new_delta_command();
        }
        
-       void command_add_note(ARDOUR::Note& note) {
+       void command_add_note(const boost::shared_ptr<ARDOUR::Note> note) {
                if (_delta_command)
                        _delta_command->add(note);
        }
 
        void command_remove_note(ArdourCanvas::CanvasMidiEvent* ev) {
                if (_delta_command && ev->note()) {
-                       _delta_command->remove(*ev->note());
+                       _delta_command->remove(ev->note());
                        ev->selected(true);
                }
        }