revert recent change to Evoral::Event, and use static_cast<> to get from Event to...

git-svn-id: svn://localhost/ardour2/branches/3.0@10870 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index c852e656a95c8803c6e287a50e8856b64618ea5a..8a6ad8c95dc84bbde8e468c7dbc0e685b5b36f34 100644 (file)
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -1240,7 +1240,7 @@ MidiRegionView::display_sysexes()
 
                for (MidiModel::SysExes::const_iterator i = _model->sysexes().begin(); i != _model->sysexes().end(); ++i) {
                        const boost::shared_ptr<const Evoral::MIDIEvent<Evoral::MusicalTime> > mev = 
-                               boost::dynamic_pointer_cast<const Evoral::MIDIEvent<Evoral::MusicalTime> > (*i);
+                               boost::static_pointer_cast<const Evoral::MIDIEvent<Evoral::MusicalTime> > (*i);
                        
                        if (mev) {
                                if (mev->is_spp() || mev->is_mtc_quarter() || mev->is_mtc_full()) {
@@ -1273,7 +1273,7 @@ MidiRegionView::display_sysexes()
        for (MidiModel::SysExes::const_iterator i = _model->sysexes().begin(); i != _model->sysexes().end(); ++i) {
 
                const boost::shared_ptr<const Evoral::MIDIEvent<Evoral::MusicalTime> > mev = 
-                       boost::dynamic_pointer_cast<const Evoral::MIDIEvent<Evoral::MusicalTime> > (*i);
+                       boost::static_pointer_cast<const Evoral::MIDIEvent<Evoral::MusicalTime> > (*i);
 
                Evoral::MusicalTime time = (*i)->time();
                assert (time >= 0);

diff --git a/libs/evoral/evoral/Event.hpp b/libs/evoral/evoral/Event.hpp
index f9f5eb6a408d2147936ee59628a9a3ca0d059e76..da8036c8f60510f3cbd02c1fb2aa9deaba05f4e9 100644 (file)
--- 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 d2bf4142bdefdbf09d1d08fe664fc3c51077d6a2..c695e7d7a93f7c5ee75bd2a414a62ce53ee2d4a1 100644 (file)
--- 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>