X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fmidi_list_editor.h;h=764dc5696a5cb812fc263a1fd1618118cfa12075;hb=50303d90bdcc329efe2e6d09b48c480a9bc2ba3b;hp=faaec51f303f2d853740f099653a0c2b1685a3b8;hpb=e39e6196c69adb51cab9283aac08777edf4698de;p=ardour.git

diff --git a/gtk2_ardour/midi_list_editor.h b/gtk2_ardour/midi_list_editor.h
index faaec51f30..764dc5696a 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 {
@@ -44,15 +43,16 @@ namespace ARDOUR {
 
 class MidiListEditor : public ArdourWindow
 {
-  public:
-	typedef Evoral::Note<Evoral::MusicalTime> NoteType;
+public:
+	typedef Evoral::Note<Temporal::Beats> NoteType;
 
 	MidiListEditor(ARDOUR::Session*, boost::shared_ptr<ARDOUR::MidiRegion>,
-		       boost::shared_ptr<ARDOUR::MidiTrack>);
+	               boost::shared_ptr<ARDOUR::MidiTrack>);
 	~MidiListEditor();
 
-  private:
-	struct MidiListModelColumns : public Gtk::TreeModel::ColumnRecord {
+private:
+	struct MidiListModelColumns : public Gtk::TreeModel::ColumnRecord
+	{
 		MidiListModelColumns() {
 			add (channel);
 			add (note);
@@ -60,7 +60,6 @@ class MidiListEditor : public ArdourWindow
 			add (velocity);
 			add (start);
 			add (length);
-			add (end);
 			add (_note);
 		};
 		Gtk::TreeModelColumn<uint8_t>     channel;
@@ -68,12 +67,12 @@ class MidiListEditor : public ArdourWindow
 		Gtk::TreeModelColumn<std::string> note_name;
 		Gtk::TreeModelColumn<uint8_t>     velocity;
 		Gtk::TreeModelColumn<std::string> start;
-		Gtk::TreeModelColumn<int>         length;
-		Gtk::TreeModelColumn<std::string> end;
+		Gtk::TreeModelColumn<std::string> length;
 		Gtk::TreeModelColumn<boost::shared_ptr<NoteType> > _note;
 	};
 
-	struct NoteLengthColumns : public Gtk::TreeModel::ColumnRecord {
+	struct NoteLengthColumns : public Gtk::TreeModel::ColumnRecord
+	{
 		NoteLengthColumns() {
 			add (ticks);
 			add (name);
@@ -91,9 +90,10 @@ class MidiListEditor : public ArdourWindow
 	Gtk::TreeModel::Path         edit_path;
 	int                          edit_column;
 	Gtk::CellRendererText*       editing_renderer;
+	Gtk::CellEditable*           editing_editable;
 	Gtk::Table                   buttons;
 	Gtk::VBox                    vbox;
-	Gtk::ToggleButton            additional_info_button;
+	Gtk::ToggleButton            sound_notes_button;
 
 	boost::shared_ptr<ARDOUR::MidiRegion> region;
 	boost::shared_ptr<ARDOUR::MidiTrack>  track;
@@ -110,6 +110,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 ();