diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-05-28 16:37:04 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-05-28 16:37:04 +0000 |
| commit | 3e966771d042455a50a01e786af2af7b6f407395 (patch) | |
| tree | b93b553d12b4c903087f26efa5ff06284add0cab /gtk2_ardour/canvas-note-event.h | |
| parent | 3d6493abc9d332132aef250a551d60fe45f7b3eb (diff) | |
clean up item event handling in MidiRegionViews by removing unnecessary InteractiveItem inheritance, and keep child->parent event handling order consistent as much as possible
git-svn-id: svn://localhost/ardour2/branches/3.0@7186 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/canvas-note-event.h')
| -rw-r--r-- | gtk2_ardour/canvas-note-event.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/canvas-note-event.h b/gtk2_ardour/canvas-note-event.h index af5dd24102..72772a2fc0 100644 --- a/gtk2_ardour/canvas-note-event.h +++ b/gtk2_ardour/canvas-note-event.h @@ -28,8 +28,8 @@ #include "rgb_macros.h" #include "ardour_ui.h" +#include "canvas-noevent-text.h" #include "ui_config.h" -#include "interactive-item.h" class Editor; class MidiRegionView; @@ -51,8 +51,9 @@ namespace Canvas { * * A newer, better canvas should remove the need for all the ugly here. */ -class CanvasNoteEvent : virtual public sigc::trackable, public InteractiveItem { -public: +class CanvasNoteEvent : virtual public sigc::trackable +{ + public: typedef Evoral::Note<ARDOUR::MidiModel::TimeType> NoteType; CanvasNoteEvent( @@ -129,7 +130,7 @@ protected: MidiRegionView& _region; Item* const _item; - InteractiveText* _text; + NoEventText* _text; Widget* _channel_selector_widget; State _state; const boost::shared_ptr<NoteType> _note; |