Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / midi_streamview.h

diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index d216752eda18c933c3ae49236be834f566265eae..b3506d42248d2c34cea8b16911b1c56dcab6c48d 100644 (file)
--- a/gtk2_ardour/midi_streamview.h
+++ b/gtk2_ardour/midi_streamview.h
@@ -27,7 +27,6 @@
 #include "streamview.h"
 #include "time_axis_view_item.h"
 #include "route_time_axis.h"
-#include "canvas.h"
 
 namespace Gdk {
        class Color;
@@ -42,6 +41,10 @@ namespace ARDOUR {
        struct PeakData;
 }
 
+namespace ArdourCanvas {
+       class LineSet;
+}
+
 class PublicEditor;
 class Selectable;
 class MidiTimeAxisView;
@@ -76,6 +79,8 @@ class MidiStreamView : public StreamView
 
        void redisplay_track ();
 
+       void leave_internal_edit_mode ();
+       
        inline double contents_height() const
        { return (child_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); }