From 48e700ecb5308ab6ff2c570038307e27b240f8b9 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Fri, 1 Oct 2021 17:25:43 -0700 Subject: [PATCH] fixed some compiler errors --- app/audio/audiomanager.cpp | 6 +++--- app/audio/audiomanager.h | 2 +- app/widget/viewer/viewer.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/audio/audiomanager.cpp b/app/audio/audiomanager.cpp index 433efbbe6..e851a61b6 100644 --- a/app/audio/audiomanager.cpp +++ b/app/audio/audiomanager.cpp @@ -93,7 +93,7 @@ void AudioManager::PushToOutput(const AudioParams ¶ms, const QByteArray &sam p.sampleFormat = GetPortAudioSampleFormat(output_params_.format()); p.suggestedLatency = Pa_GetDeviceInfo(output_device_)->defaultLowOutputLatency; - Pa_OpenStream(&output_stream_, nullptr, &p, output_params_.sample_rate(), paFramesPerBufferUnspecified, paNoFlag, OutputCallback, output_buffer_.get()); + Pa_OpenStream(&output_stream_, nullptr, &p, output_params_.sample_rate(), paFramesPerBufferUnspecified, paNoFlag, OutputCallback, output_buffer_); output_buffer_->set_bytes_per_frame(output_params_.samples_to_bytes(1)); } @@ -206,9 +206,9 @@ AudioManager::AudioManager() : SetOutputDevice(Pa_GetDefaultOutputDevice()); SetInputDevice(Pa_GetDefaultInputDevice()); - output_buffer_ = std::make_unique(); + output_buffer_ = new PreviewAudioDevice(this); output_buffer_->open(PreviewAudioDevice::ReadWrite); - connect(output_buffer_.get(), &PreviewAudioDevice::Notify, this, &AudioManager::OutputNotify); + connect(output_buffer_, &PreviewAudioDevice::Notify, this, &AudioManager::OutputNotify); } AudioManager::~AudioManager() diff --git a/app/audio/audiomanager.h b/app/audio/audiomanager.h index ca0f2429e..d5f224f03 100644 --- a/app/audio/audiomanager.h +++ b/app/audio/audiomanager.h @@ -91,7 +91,7 @@ private: PaDeviceIndex output_device_; PaStream *output_stream_; AudioParams output_params_; - std::unique_ptr output_buffer_; + PreviewAudioDevice *output_buffer_; PaDeviceIndex input_device_; diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp index 6fd75f5db..72a063b27 100644 --- a/app/widget/viewer/viewer.cpp +++ b/app/widget/viewer/viewer.cpp @@ -495,10 +495,10 @@ void ViewerWidget::ReceivedAudioBufferForScrubbing() samples->transform_volume_for_sample(samples->sample_count() - i - 1, amt); }*/ - QByteArray data = packed_processor_.Convert(samples); + QByteArray packed = packed_processor_.Convert(samples); AudioManager::instance()->ClearBufferedOutput(); - AudioManager::instance()->PushToOutput(samples->audio_params(), data); - AudioMonitor::PushBytesOnAll(data); + AudioManager::instance()->PushToOutput(samples->audio_params(), packed); + AudioMonitor::PushBytesOnAll(packed); } }