summaryrefslogtreecommitdiff
path: root/libs/ardour/midi_playlist.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-09-29 22:47:40 +0000
committerDavid Robillard <d@drobilla.net>2008-09-29 22:47:40 +0000
commitb5ec66ae6cb60fa43c343d3d29340b2370d0b9d1 (patch)
tree217722d96b61288f44477c69ac3bbe5d2e7d43f1 /libs/ardour/midi_playlist.cc
parent03f188cc8b17edc7c727f62b22b4577a2fdbfbe8 (diff)
Can't call the wrong function when there's only one of them: remove ARDOUR::Parameter and just use Evoral::Parameter (move Ardour specific functionality to EventTypeMap where it belongs).
Less than pretty in places but easily seddable just in case... git-svn-id: svn://localhost/ardour2/branches/3.0@3838 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_playlist.cc')
-rw-r--r--libs/ardour/midi_playlist.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index 9ac1d41994..7403438483 100644
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -265,7 +265,7 @@ MidiPlaylist::destroy_region (boost::shared_ptr<Region> region)
return changed;
}
-set<Parameter>
+set<Evoral::Parameter>
MidiPlaylist::contained_automation()
{
/* this function is never called from a realtime thread, so
@@ -274,7 +274,7 @@ MidiPlaylist::contained_automation()
Glib::Mutex::Lock rm (region_lock);
- set<Parameter> ret;
+ set<Evoral::Parameter> ret;
for (RegionList::const_iterator r = regions.begin(); r != regions.end(); ++r) {
boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(*r);