diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-02 20:34:58 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-02 20:34:58 +0000 |
| commit | 14d601a0ffe1ceb452aba103eb35ce03320acd21 (patch) | |
| tree | 5e17e7e74de6004f0b6644a1205f7ceccd0db5ca /libs | |
| parent | 07b4626ea5565d0c245c4a233a07257fc285ae64 (diff) | |
revert recent change to Evoral::Event, and use static_cast<> to get from Event to MIDIEvent
git-svn-id: svn://localhost/ardour2/branches/3.0@10870 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/evoral/evoral/Event.hpp | 2 | ||||
| -rw-r--r-- | libs/evoral/evoral/MIDIEvent.hpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/evoral/evoral/Event.hpp b/libs/evoral/evoral/Event.hpp index f9f5eb6a40..da8036c8f6 100644 --- a/libs/evoral/evoral/Event.hpp +++ b/libs/evoral/evoral/Event.hpp @@ -56,7 +56,7 @@ struct Event { */ Event(const Event& copy, bool alloc); - virtual ~Event(); + ~Event(); const Event& operator=(const Event& copy); diff --git a/libs/evoral/evoral/MIDIEvent.hpp b/libs/evoral/evoral/MIDIEvent.hpp index d2bf4142bd..c695e7d7a9 100644 --- a/libs/evoral/evoral/MIDIEvent.hpp +++ b/libs/evoral/evoral/MIDIEvent.hpp @@ -31,8 +31,8 @@ namespace Evoral { /** MIDI helper functions for an Event. * - * This class contains no data, an event can be cast to a MIDIEvent - * but the application must make sure the event actually contains + * This class contains no data, an Evoral::Event can be cast to a MIDIEvent + * but the application must make sure the Event actually contains * valid MIDI data for these functions to make sense. */ template<typename Time> |