X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_list_editor.h;h=283a0da8bc26b12af97dfbaf0861c5b814e04739;hb=eed6d13b60ccba041ad710798832efa86ae39d12;hp=6061f54db6d4c1962e140e85aa474e05e8cb0fab;hpb=2d015c06104186af6711f6040a82448723971481;p=ardour.git

diff --git a/gtk2_ardour/midi_list_editor.h b/gtk2_ardour/midi_list_editor.h
index 6061f54db6..283a0da8bc 100644
--- a/gtk2_ardour/midi_list_editor.h
+++ b/gtk2_ardour/midi_list_editor.h
@@ -25,14 +25,13 @@
 #include <gtkmm/liststore.h>
 #include <gtkmm/scrolledwindow.h>
 
-#include "evoral/types.hpp"
-
 #include "ardour/session_handle.h"
 
 #include "ardour_window.h"
 
 namespace Evoral {
 	template<typename Time> class Note;
+	class                         Beats;
 };
 
 namespace ARDOUR {
@@ -45,7 +44,7 @@ namespace ARDOUR {
 class MidiListEditor : public ArdourWindow
 {
   public:
-	typedef Evoral::Note<Evoral::MusicalTime> NoteType;
+	typedef Evoral::Note<Evoral::Beats> NoteType;
 
 	MidiListEditor(ARDOUR::Session*, boost::shared_ptr<ARDOUR::MidiRegion>,
 		       boost::shared_ptr<ARDOUR::MidiTrack>);
@@ -60,7 +59,6 @@ class MidiListEditor : public ArdourWindow
 			add (velocity);
 			add (start);
 			add (length);
-			add (end);
 			add (_note);
 		};
 		Gtk::TreeModelColumn<uint8_t>     channel;
@@ -69,7 +67,6 @@ class MidiListEditor : public ArdourWindow
 		Gtk::TreeModelColumn<uint8_t>     velocity;
 		Gtk::TreeModelColumn<std::string> start;
 		Gtk::TreeModelColumn<std::string> length;
-		Gtk::TreeModelColumn<std::string> end;
 		Gtk::TreeModelColumn<boost::shared_ptr<NoteType> > _note;
 	};
 
@@ -111,6 +108,7 @@ class MidiListEditor : public ArdourWindow
 
 	bool key_press (GdkEventKey* ev);
 	bool key_release (GdkEventKey* ev);
+	bool scroll_event (GdkEventScroll*);
 
 	void delete_selected_note ();
 	void selection_changed ();