projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't abuse ScalePoints idea
[ardour.git]
/
libs
/
ardour
/
midi_playlist_source.cc
diff --git
a/libs/ardour/midi_playlist_source.cc
b/libs/ardour/midi_playlist_source.cc
index 587bc7b12fe034419f7fe816bcb83d0f8a6f0d7a..3d9c5b1e9f58a37bb0e492427dc546f8a5d112c7 100644
(file)
--- a/
libs/ardour/midi_playlist_source.cc
+++ b/
libs/ardour/midi_playlist_source.cc
@@
-126,7
+126,8
@@
MidiPlaylistSource::read_unlocked (const Lock& lock,
Evoral::EventSink<framepos_t>& dst,
framepos_t /*position*/,
framepos_t start, framecnt_t cnt,
Evoral::EventSink<framepos_t>& dst,
framepos_t /*position*/,
framepos_t start, framecnt_t cnt,
- MidiStateTracker*) const
+ MidiStateTracker*,
+ MidiChannelFilter*) const
{
boost::shared_ptr<MidiPlaylist> mp = boost::dynamic_pointer_cast<MidiPlaylist> (_playlist);
{
boost::shared_ptr<MidiPlaylist> mp = boost::dynamic_pointer_cast<MidiPlaylist> (_playlist);
@@
-149,7
+150,7
@@
MidiPlaylistSource::write_unlocked (const Lock&,
}
void
}
void
-MidiPlaylistSource::append_event_beats(const Glib::Threads::Mutex::Lock& /*lock*/, const Evoral::Event<Evoral::
MusicalTime
>& /*ev*/)
+MidiPlaylistSource::append_event_beats(const Glib::Threads::Mutex::Lock& /*lock*/, const Evoral::Event<Evoral::
Beats
>& /*ev*/)
{
fatal << string_compose (_("programming error: %1"), "MidiPlaylistSource::append_event_beats() called - should be impossible") << endmsg;
abort(); /*NOTREACHED*/
{
fatal << string_compose (_("programming error: %1"), "MidiPlaylistSource::append_event_beats() called - should be impossible") << endmsg;
abort(); /*NOTREACHED*/