ardour/livetrax
13
0
Fork 0
Code

Prepare Disk-reader for bi-directional micro-locates

Browse Source
This commit is contained in:
Robin Gareus 2019-02-06 19:01:42 +01:00
parent 6975b5ca54
commit dcd612f8a7
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
4 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/ardour/disk_reader.h
View File

@ -84,8 +84,8 @@ public:
void adjust_buffering ();
int can_internal_playback_seek (samplecnt_t distance);
int internal_playback_seek (samplecnt_t distance);
bool can_internal_playback_seek (sampleoffset_t distance);
void internal_playback_seek (sampleoffset_t distance);
int seek (samplepos_t sample, bool complete_refill = false);
static PBD::Signal0<void> Underrun;

4
libs/ardour/ardour/track.h
View File

@ -137,8 +137,8 @@ public:
int do_flush (RunContext, bool force = false);
void set_pending_overwrite (bool);
int seek (samplepos_t, bool complete_refill = false);
int can_internal_playback_seek (samplecnt_t);
int internal_playback_seek (samplecnt_t);
bool can_internal_playback_seek (samplecnt_t);
void internal_playback_seek (samplecnt_t);
void non_realtime_locate (samplepos_t);
void realtime_handle_transport_stopped ();
int overwrite_existing_buffers ();

35
libs/ardour/disk_reader.cc
View File

@ -623,8 +623,8 @@ DiskReader::seek (samplepos_t sample, bool complete_refill)
return ret;
}
int
DiskReader::can_internal_playback_seek (samplecnt_t distance)
bool
DiskReader::can_internal_playback_seek (sampleoffset_t distance)
{
/* 1. Audio */
@ -632,11 +632,15 @@ DiskReader::can_internal_playback_seek (samplecnt_t distance)
boost::shared_ptr<ChannelList> c = channels.reader();
for (chan = c->begin(); chan != c->end(); ++chan) {
if ((*chan)->rbuf->read_space() < (size_t) distance) {
if (!(*chan)->rbuf->can_seek (distance)) {
return false;
}
}
if (distance < 0) {
return true; // XXX TODO un-seek MIDI
}
/* 2. MIDI */
uint32_t samples_read = g_atomic_int_get(&_samples_read_from_ringbuffer);
@ -645,19 +649,26 @@ DiskReader::can_internal_playback_seek (samplecnt_t distance)
return ((samples_written - samples_read) < distance);
}
int
DiskReader::internal_playback_seek (samplecnt_t distance)
void
DiskReader::internal_playback_seek (sampleoffset_t distance)
{
ChannelList::iterator chan;
boost::shared_ptr<ChannelList> c = channels.reader();
for (chan = c->begin(); chan != c->end(); ++chan) {
(*chan)->rbuf->increment_read_ptr (::llabs(distance));
if (distance == 0) {
return;
}
playback_sample += distance;
sampleoffset_t off = distance;
return 0;
ChannelList::iterator chan;
boost::shared_ptr<ChannelList> c = channels.reader();
for (chan = c->begin(); chan != c->end(); ++chan) {
if (distance < 0) {
off = 0 - (sampleoffset_t) (*chan)->rbuf->decrement_read_ptr (llabs (distance));
} else {
off = (*chan)->rbuf->increment_read_ptr (distance);
}
}
playback_sample += off;
}
static

4
libs/ardour/track.cc
View File

@ -506,13 +506,13 @@ Track::seek (samplepos_t p, bool complete_refill)
return _disk_writer->seek (p, complete_refill);
}
int
bool
Track::can_internal_playback_seek (samplecnt_t p)
{
return _disk_reader->can_internal_playback_seek (p);
}
int
void
Track::internal_playback_seek (samplecnt_t p)
{
return _disk_reader->internal_playback_seek (p);