Use a C++ bool constant

[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..283a0da8bc26b12af97dfbaf0861c5b814e04739 100644 (file)
--- 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;
@@ -68,8 +66,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 +88,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 +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 ();