Fix some bugs I introduced with the last commit.

[ardour.git] / gtk2_ardour / midi_list_editor.h

diff --git a/gtk2_ardour/midi_list_editor.h b/gtk2_ardour/midi_list_editor.h
index de7b2220bb8900c6488a329177f143f7e05926dd..c85eeafc516ca67ad197eb0b76052aabf5933ba6 100644 (file)
--- a/gtk2_ardour/midi_list_editor.h
+++ b/gtk2_ardour/midi_list_editor.h
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2009 Paul Davis
+    Copyright (C) 2009 Paul Davis
 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
        You should have received a copy of the GNU General Public License
        along with this program; if not, write to the Free Software
        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
 */
 
 #ifndef __ardour_gtk2_midi_list_editor_h_
@@ -28,7 +27,11 @@
 
 #include "ardour/session_handle.h"
 
-#include "ardour_dialog.h"
+#include "ardour_window.h"
+
+namespace Evoral {
+       template<typename Time> class Note;
+};
 
 namespace ARDOUR {
        class MidiRegion;
@@ -36,7 +39,7 @@ namespace ARDOUR {
        class Session;
 };
 
-class MidiListEditor : public ArdourDialog
+class MidiListEditor : public ArdourWindow
 {
   public:
        typedef Evoral::Note<Evoral::MusicalTime> NoteType;
@@ -54,7 +57,7 @@ class MidiListEditor : public ArdourDialog
                        add (start);
                        add (length);
                        add (end);
-                       add (note);
+                       add (_note);
                };
                Gtk::TreeModelColumn<uint8_t> channel;
                Gtk::TreeModelColumn<uint8_t> note;
@@ -70,11 +73,20 @@ class MidiListEditor : public ArdourDialog
        Glib::RefPtr<Gtk::ListStore> model;
        Gtk::TreeView                view;
        Gtk::ScrolledWindow          scroller;
+       std::string               _current_edit;
 
        boost::shared_ptr<ARDOUR::MidiRegion> region;
 
-       void edited (const Glib::ustring&, const Glib::ustring&);
+       void edited (const std::string&, const std::string&);
+       void editing_started (Gtk::CellEditable*, const std::string& path, int);
+       void editing_canceled ();
+
        void redisplay_model ();
+
+       bool key_press (GdkEventKey* ev);
+       bool key_release (GdkEventKey* ev);
+
+       void delete_selected_note ();
 };
 
 #endif /* __ardour_gtk2_midi_list_editor_h_ */