node: split off traversing functions from renderer for usage elsewhere

Fixes issue where Viewer node wouldn't pick up correct length if a tracks
weren't in use.
This commit is contained in:
itsmattkc
2020-03-13 15:31:15 +11:00
parent 41da5dbd53
commit 9e4c79699e
18 changed files with 218 additions and 142 deletions
+1
View File
@@ -194,6 +194,7 @@ AudioManager::AudioManager() :
RefreshDevices();
connect(&output_manager_, &AudioOutputManager::SentSamples, this, &AudioManager::SentSamples);
connect(&output_manager_, &AudioOutputManager::OutputNotified, this, &AudioManager::OutputNotified);
output_manager_.SetEnableSendingSamples(true);
}
+2
View File
@@ -102,6 +102,8 @@ signals:
void SentSamples(QVector<double> averages);
void OutputNotified();
private:
AudioManager();
+3 -2
View File
@@ -54,7 +54,7 @@ void AudioOutputManager::Push(const QByteArray& samples)
ResetToPushMode();
// Start pushing samples to the output
OutputNotified();
PushMoreSamples();
}
void AudioOutputManager::ResetToPushMode()
@@ -92,7 +92,7 @@ void AudioOutputManager::PullFromDevice(QIODevice *device, int playback_speed)
output_->start(&device_proxy_);
}
void AudioOutputManager::OutputNotified()
void AudioOutputManager::PushMoreSamples()
{
// Check if we're currently in push mode and if we have samples to push
if (!push_device_ || pushed_samples_.isEmpty()) {
@@ -139,6 +139,7 @@ void AudioOutputManager::SetOutputDevice(QAudioDeviceInfo info, QAudioFormat for
output_ = std::unique_ptr<QAudioOutput>(new QAudioOutput(info, format, this));
output_->setNotifyInterval(1);
push_device_ = output_->start();
connect(output_.get(), &QAudioOutput::notify, this, &AudioOutputManager::PushMoreSamples);
connect(output_.get(), &QAudioOutput::notify, this, &AudioOutputManager::OutputNotified);
}
+3 -1
View File
@@ -69,6 +69,8 @@ signals:
*/
void SentSamples(QVector<double> averages);
void OutputNotified();
private:
void ProcessAverages(const char* data, int length);
@@ -83,7 +85,7 @@ private:
AudioOutputDeviceProxy device_proxy_;
private slots:
void OutputNotified();
void PushMoreSamples();
};
#endif // AUDIOHYBRIDDEVICE_H