oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reimplemented reversing and shuttling in new audio

Browse Source
This commit is contained in:
itsmattkc
2021-09-26 14:22:50 -07:00
parent 6f3f7e558b
commit db873dfc69
8 changed files with 95 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/audio/outputdeviceproxy.cpp
+3 -63
View File
@@ -35,7 +35,7 @@ void AudioOutputDeviceProxy::SetParameters(const AudioParams &params)
params_ = params;
}
void AudioOutputDeviceProxy::SetDevice(std::shared_ptr<QIODevice> device, int playback_speed)
void AudioOutputDeviceProxy::SetDevice(std::shared_ptr<QIODevice> device)
{
device_ = device;
@@ -44,12 +44,6 @@ void AudioOutputDeviceProxy::SetDevice(std::shared_ptr<QIODevice> device, int pl
device_ = nullptr;
return;
}
playback_speed_ = playback_speed;
if (qAbs(playback_speed_) != 1) {
tempo_processor_.Open(params_, qAbs(playback_speed_));
}
}
void AudioOutputDeviceProxy::close()
@@ -57,10 +51,6 @@ void AudioOutputDeviceProxy::close()
QIODevice::close();
device_ = nullptr;
if (tempo_processor_.IsOpen()) {
tempo_processor_.Close();
}
}
qint64 AudioOutputDeviceProxy::readData(char *data, qint64 maxlen)
@@ -69,26 +59,7 @@ qint64 AudioOutputDeviceProxy::readData(char *data, qint64 maxlen)
return 0;
}
qint64 read_count;
if (tempo_processor_.IsOpen()) {
while ((read_count = tempo_processor_.Pull(data, static_cast<int>(maxlen))) == 0) {
int dev_read = static_cast<int>(ReverseAwareRead(data, maxlen));
if (!dev_read) {
break;
}
tempo_processor_.Push(data, dev_read);
}
} else {
// If we aren't doing any tempo processing, simply passthrough the read signal
read_count = ReverseAwareRead(data, maxlen);
}
return read_count;
return device_->read(data, maxlen);
}
qint64 AudioOutputDeviceProxy::writeData(const char *data, qint64 maxSize)
@@ -96,38 +67,7 @@ qint64 AudioOutputDeviceProxy::writeData(const char *data, qint64 maxSize)
Q_UNUSED(data)
Q_UNUSED(maxSize)
return 0;
}
qint64 AudioOutputDeviceProxy::ReverseAwareRead(char *data, qint64 maxlen)
{
qint64 new_pos = -1;
if (playback_speed_ < 0) {
// If we're reversing, we'll seek back by maxlen bytes before we read
qint64 len_adjusted_by_channels = maxlen / params_.channel_count();
new_pos = device_->pos() - len_adjusted_by_channels;
if (new_pos < 0) {
maxlen = device_->pos() * params_.channel_count();
new_pos = 0;
}
device_->seek(new_pos);
}
qint64 read_count = device_->read(data, maxlen);
if (playback_speed_ < 0) {
device_->seek(new_pos);
// Reverse the samples here
AudioManager::ReverseBuffer(data, static_cast<int>(read_count), params_.samples_to_bytes(1));
}
return read_count;
return -1;
}
}