ardour/livetrax
13
0
Fork 0
Code

comment out actual action in MidiPlaylistSource::read()

Browse Source 
See comment and remember that we do not MidiPlaylistSource at this time.
This commit is contained in:
Paul Davis 2019-10-26 19:51:47 -06:00
parent 17ba6d319f
commit 7dfae40e3b
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/ardour/midi_playlist_source.cc
View File

@ -139,7 +139,19 @@ MidiPlaylistSource::read_unlocked (const Lock& lock,
return 0;
}
return mp->read (dst, start, cnt, loop_range);
/* XXX paul says on Oct 26 2019:
rgareus: so to clarify now that i have better perspective: the API i want to get rid of is MidiPlaylist::read() ; everything that used it (i.e. the DiskReader) should use MidiPlaylist::rendered()->read()
rgareus: but a "read" operation is also a "write" operation: you have to put the data somewhere
rgareus: the only other user of MidiPlaylist::read() was MidiPlaylistSource (unsurprisingly), which as I noted is not even (really) used
rgareus: ::rendered() returns a ptr-to-RT_MidiBuffer, which has a read method which expects to write into a MidiBuffer, using push_back()
rgareus: but MidiPlaylistSource::read() is given an EventSink<samplepos_t> as the destination, and this does not (currently) have ::push_back(), only ::write() (which is willing to deal with inserts rather than appends)
rgareus: so, this is the API "mess" I'm trying to clean up. simple solution: since we don't use MidiPlaylistSource just comment out the line and forget about it for now, then remove MidiPlaylist::read() and move on
This represents that decision, for now.
*/
return cnt; // mp->read (dst, start, cnt, loop_range);
}
samplecnt_t
@ -190,4 +202,3 @@ MidiPlaylistSource::empty () const
{
return !_playlist || _playlist->empty();
}