From 14d601a0ffe1ceb452aba103eb35ce03320acd21 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 2 Dec 2011 20:34:58 +0000 Subject: [PATCH] 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 --- gtk2_ardour/midi_region_view.cc | 4 ++-- libs/evoral/evoral/Event.hpp | 2 +- libs/evoral/evoral/MIDIEvent.hpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index c852e656a9..8a6ad8c95d 100644 --- 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 > mev = - boost::dynamic_pointer_cast > (*i); + boost::static_pointer_cast > (*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 > mev = - boost::dynamic_pointer_cast > (*i); + boost::static_pointer_cast > (*i); Evoral::MusicalTime time = (*i)->time(); assert (time >= 0); 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