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

fixed some compiler errors

Browse Source
This commit is contained in:
itsmattkc
2021-10-01 17:25:43 -07:00
parent 467038d45e
commit 48e700ecb5
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/audio/audiomanager.cpp
+3 -3
View File
@@ -93,7 +93,7 @@ void AudioManager::PushToOutput(const AudioParams &params, 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<PreviewAudioDevice>();
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()
app/audio/audiomanager.h
+1 -1
View File
@@ -91,7 +91,7 @@ private:
PaDeviceIndex output_device_;
PaStream *output_stream_;
AudioParams output_params_;
std::unique_ptr<PreviewAudioDevice> output_buffer_;
PreviewAudioDevice *output_buffer_;
PaDeviceIndex input_device_;
app/widget/viewer/viewer.cpp
+3 -3
View File
@@ -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);
}
}