Remove internal edit mode and add "content" tool.

[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 faaec51f303f2d853740f099653a0c2b1685a3b8..f8d2ce9432cd630748d50950911137de0c98359f 100644 (file)
--- a/gtk2_ardour/midi_list_editor.h
+++ b/gtk2_ardour/midi_list_editor.h
@@ -60,7 +60,6 @@ class MidiListEditor : public ArdourWindow
                        add (velocity);
                        add (start);
                        add (length);
-                       add (end);
                        add (_note);
                };
                Gtk::TreeModelColumn<uint8_t>     channel;
@@ -68,8 +67,7 @@ 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;
        };
 
@@ -91,9 +89,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 +109,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 ();