correctly affect speed/reversing when shuttling audio
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
#include "outputdeviceproxy.h"
|
||||
|
||||
#include "audiomanager.h"
|
||||
#include "bufferaverage.h"
|
||||
|
||||
AudioOutputDeviceProxy::AudioOutputDeviceProxy() :
|
||||
@@ -8,9 +9,24 @@ AudioOutputDeviceProxy::AudioOutputDeviceProxy() :
|
||||
{
|
||||
}
|
||||
|
||||
void AudioOutputDeviceProxy::SetDevice(QIODevice *device)
|
||||
void AudioOutputDeviceProxy::SetParameters(const AudioRenderingParams ¶ms)
|
||||
{
|
||||
params_ = params;
|
||||
}
|
||||
|
||||
void AudioOutputDeviceProxy::SetDevice(QIODevice *device, int playback_speed)
|
||||
{
|
||||
device_ = device;
|
||||
|
||||
if (!device_->isOpen()) {
|
||||
device_->open(QIODevice::ReadOnly);
|
||||
}
|
||||
|
||||
playback_speed_ = playback_speed;
|
||||
|
||||
if (qAbs(playback_speed_) != 1) {
|
||||
tempo_processor_.Open(params_, qAbs(playback_speed_));
|
||||
}
|
||||
}
|
||||
|
||||
void AudioOutputDeviceProxy::SetSendAverages(bool send)
|
||||
@@ -23,14 +39,39 @@ void AudioOutputDeviceProxy::close()
|
||||
QIODevice::close();
|
||||
|
||||
device_->close();
|
||||
|
||||
if (tempo_processor_.IsOpen()) {
|
||||
tempo_processor_.Close();
|
||||
}
|
||||
}
|
||||
|
||||
qint64 AudioOutputDeviceProxy::readData(char *data, qint64 maxlen)
|
||||
{
|
||||
if (device_) {
|
||||
qint64 read_count = device_->read(data, maxlen);
|
||||
|
||||
if (send_averages_ && read_count > 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);
|
||||
}
|
||||
|
||||
// If we read any
|
||||
if (read_count > 0 && send_averages_) {
|
||||
emit ProcessedAverages(AudioBufferAverage::ProcessAverages(data, static_cast<int>(read_count)));
|
||||
}
|
||||
|
||||
@@ -44,3 +85,32 @@ qint64 AudioOutputDeviceProxy::writeData(const char *data, qint64 maxSize)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
qint64 AudioOutputDeviceProxy::ReverseAwareRead(char *data, qint64 maxlen)
|
||||
{
|
||||
qint64 new_pos;
|
||||
|
||||
if (playback_speed_ < 0) {
|
||||
// If we're reversing, we'll seek back by maxlen bytes before we read
|
||||
new_pos = device_->pos() - maxlen;
|
||||
|
||||
if (new_pos < 0) {
|
||||
maxlen = device_->pos();
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user