simple file renames to better represent their new purposes

app/audio/CMakeLists.txt

@@ -16,14 +16,14 @@
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  audio/audiobufferaverage.h
-  audio/audiobufferaverage.cpp
-  audio/audiohybriddevice.h
-  audio/audiohybriddevice.cpp
   audio/audiomanager.h
   audio/audiomanager.cpp
-  audio/audiooutputdeviceproxy.h
-  audio/audiooutputdeviceproxy.cpp
+  audio/bufferaverage.h
+  audio/bufferaverage.cpp
+  audio/outputdeviceproxy.h
+  audio/outputdeviceproxy.cpp
+  audio/outputmanager.h
+  audio/outputmanager.cpp
   audio/sampleformat.h
   audio/sampleformat.cpp
   PARENT_SCOPE

app/audio/audiomanager.cpp

@@ -174,7 +174,7 @@ AudioManager::AudioManager() :
 {
   RefreshDevices();
 
-  connect(&output_manager_, &AudioHybridDevice::SentSamples, this, &AudioManager::SentSamples);
+  connect(&output_manager_, &AudioOutputManager::SentSamples, this, &AudioManager::SentSamples);
 
   output_manager_.SetEnableSendingSamples(true);
 }

app/audio/audiomanager.h

@@ -26,7 +26,7 @@
 #include <QAudioOutput>
 #include <QThread>
 
-#include "audiohybriddevice.h"
+#include "outputmanager.h"
 #include "render/audioparams.h"
 
 /**
@@ -109,7 +109,7 @@ private:
 
   static AudioManager* instance_;
 
-  AudioHybridDevice output_manager_;
+  AudioOutputManager output_manager_;
 
   QAudioDeviceInfo output_device_info_;
   AudioRenderingParams output_params_;

app/audio/bufferaverage.cpp

@@ -1,4 +1,4 @@
-#include "audiobufferaverage.h"
+#include "bufferaverage.h"
 
 QVector<double> AudioBufferAverage::ProcessAverages(const char *data, int length)
 {

app/audio/outputdeviceproxy.cpp

@@ -1,6 +1,6 @@
-#include "audiooutputdeviceproxy.h"
+#include "outputdeviceproxy.h"
 
-#include "audiobufferaverage.h"
+#include "bufferaverage.h"
 
 AudioOutputDeviceProxy::AudioOutputDeviceProxy() :
   device_(nullptr),

app/audio/outputmanager.cpp

@@ -18,28 +18,28 @@
 
 ***/
 
-#include "audiohybriddevice.h"
+#include "outputmanager.h"
 
 #include <QDebug>
 #include <QtMath>
 
-#include "audiobufferaverage.h"
+#include "bufferaverage.h"
 
-AudioHybridDevice::AudioHybridDevice(QObject *parent) :
+AudioOutputManager::AudioOutputManager(QObject *parent) :
   QObject(parent),
   output_(nullptr),
   push_device_(nullptr),
   enable_sending_samples_(false)
 {
-  connect(&device_proxy_, &AudioOutputDeviceProxy::ProcessedAverages, this, &AudioHybridDevice::SentSamples);
+  connect(&device_proxy_, &AudioOutputDeviceProxy::ProcessedAverages, this, &AudioOutputManager::SentSamples);
 }
 
-bool AudioHybridDevice::OutputIsSet()
+bool AudioOutputManager::OutputIsSet()
 {
   return (output_.get());
 }
 
-void AudioHybridDevice::Push(const QByteArray& samples)
+void AudioOutputManager::Push(const QByteArray& samples)
 {
   // If no output device, nothing to be done
   if (!output_) {
@@ -57,7 +57,7 @@ void AudioHybridDevice::Push(const QByteArray& samples)
   OutputNotified();
 }
 
-void AudioHybridDevice::ResetToPushMode()
+void AudioOutputManager::ResetToPushMode()
 {
   // If we have a null push device, then we currently have the output in pull mode. We restore it to push mode here.
   if (output_ && !push_device_) {
@@ -70,7 +70,7 @@ void AudioHybridDevice::ResetToPushMode()
   }
 }
 
-void AudioHybridDevice::PullFromDevice(QIODevice *device)
+void AudioOutputManager::PullFromDevice(QIODevice *device)
 {
   if (!output_ || !device) {
     return;
@@ -87,7 +87,7 @@ void AudioHybridDevice::PullFromDevice(QIODevice *device)
   output_->start(&device_proxy_);
 }
 
-void AudioHybridDevice::OutputNotified()
+void AudioOutputManager::OutputNotified()
 {
   // Check if we're currently in push mode and if we have samples to push
   if (!push_device_ || pushed_samples_.isEmpty()) {
@@ -112,14 +112,14 @@ void AudioHybridDevice::OutputNotified()
   }
 }
 
-void AudioHybridDevice::SetEnableSendingSamples(bool e)
+void AudioOutputManager::SetEnableSendingSamples(bool e)
 {
   enable_sending_samples_ = e;
 
   device_proxy_.SetSendAverages(e);
 }
 
-void AudioHybridDevice::SetOutputDevice(QAudioDeviceInfo info, QAudioFormat format)
+void AudioOutputManager::SetOutputDevice(QAudioDeviceInfo info, QAudioFormat format)
 {
   // Whatever the output is doing right now, stop it
   if (output_) {
@@ -134,10 +134,10 @@ void AudioHybridDevice::SetOutputDevice(QAudioDeviceInfo info, QAudioFormat form
   output_ = std::unique_ptr<QAudioOutput>(new QAudioOutput(info, format, this));
   output_->setNotifyInterval(1);
   push_device_ = output_->start();
-  connect(output_.get(), &QAudioOutput::notify, this, &AudioHybridDevice::OutputNotified);
+  connect(output_.get(), &QAudioOutput::notify, this, &AudioOutputManager::OutputNotified);
 }
 
-void AudioHybridDevice::ProcessAverages(const char *data, int length)
+void AudioOutputManager::ProcessAverages(const char *data, int length)
 {
   if (!enable_sending_samples_ || length == 0) {
     return;

app/audio/outputmanager.h

@@ -26,13 +26,13 @@
 #include <QIODevice>
 #include <QMutex>
 
-#include "audiooutputdeviceproxy.h"
+#include "outputdeviceproxy.h"
 
-class AudioHybridDevice : public QObject
+class AudioOutputManager : public QObject
 {
   Q_OBJECT
 public:
-  AudioHybridDevice(QObject* parent = nullptr);
+  AudioOutputManager(QObject* parent = nullptr);
 
   bool OutputIsSet();