Whitespace and pointer cleanup.

src/audio/AudioDevice.cpp

@@ -1,11 +1,11 @@
 #include "AudioDevice.h"
 
 AudioDevice::AudioDevice()
-	: mName("plughw:1,0"),
-	  mSampleRate(44100),
-	  mNumChannels(2),
-	  mPeriod(2),
-	  mBufferSize()
+    : mName("plughw:1,0"),
+      mSampleRate(44100),
+      mNumChannels(2),
+      mPeriod(2),
+      mBufferSize()
 {
 
 }
@@ -15,57 +15,57 @@ AudioDevice::~AudioDevice()
 
 }
 
-std::shared_ptr<AudioDevice> AudioDevice::Create()
+std::unique_ptr<AudioDevice> AudioDevice::Create()
 {
-	return std::make_shared<AudioDevice>();
+    return std::make_unique<AudioDevice>();
 }
 
 void AudioDevice::SetNumChannels(unsigned numChannels)
 {
-	mNumChannels = numChannels;
+    mNumChannels = numChannels;
 }
 
 void AudioDevice::SetPeriod(unsigned period)
 {
-	mPeriod = period;
+    mPeriod = period;
 }
 
 void AudioDevice::SetBufferSize(std::size_t bufferSize)
 {
-	mBufferSize = bufferSize;
+    mBufferSize = bufferSize;
 }
 
-unsigned AudioDevice::GetNumChannels()
+unsigned AudioDevice::GetNumChannels() const
 {
-	return mNumChannels;
+    return mNumChannels;
 }
 
-unsigned AudioDevice::GetPeriod()
+unsigned AudioDevice::GetPeriod() const
 {
-	return mPeriod;
+    return mPeriod;
 }
 
-std::size_t AudioDevice::GetBufferSize()
+std::size_t AudioDevice::GetBufferSize() const
 {
-	return mBufferSize;
+    return mBufferSize;
 }
 
 void AudioDevice::SetSampleRate(unsigned rate)
 {
-	mSampleRate = rate;
+    mSampleRate = rate;
 }
 
-unsigned AudioDevice::GetSampleRate()
+unsigned AudioDevice::GetSampleRate() const
 {
-	return mSampleRate;
+    return mSampleRate;
 }
 
 void AudioDevice::SetName(const std::string& name)
 {
-	mName = name;
+    mName = name;
 }
 
-std::string AudioDevice::GetName()
+std::string AudioDevice::GetName() const
 {
-	return mName;
+    return mName;
 }

src/audio/AudioDevice.h

@@ -8,39 +8,39 @@ class AudioDevice
 
 private:
 
-	std::string mName;
-	unsigned mSampleRate;
-	unsigned mNumChannels;
-	unsigned mPeriod;
-	std::size_t mBufferSize;
+    std::string mName;
+    unsigned mSampleRate;
+    unsigned mNumChannels;
+    unsigned mPeriod;
+    std::size_t mBufferSize;
 
 public:
 
-	AudioDevice();
+    AudioDevice();
 
-	~AudioDevice();
+    ~AudioDevice();
 
-	void SetSampleRate(unsigned rate);
+    void SetSampleRate(unsigned rate);
 
-	unsigned GetSampleRate();
+    unsigned GetSampleRate() const;
 
-	void SetName(const std::string& name);
+    void SetName(const std::string& name);
 
-	void SetNumChannels(unsigned numChannels);
+    void SetNumChannels(unsigned numChannels);
 
-	void SetPeriod(unsigned period);
+    void SetPeriod(unsigned period);
 
-	void SetBufferSize(std::size_t bufferSize);
+    void SetBufferSize(std::size_t bufferSize);
 
-	unsigned GetNumChannels();
+    unsigned GetNumChannels() const;
 
-	unsigned GetPeriod();
+    unsigned GetPeriod() const;
 
-	std::size_t GetBufferSize();
+    std::size_t GetBufferSize() const;
 
-	std::string GetName();
+    std::string GetName() const;
 
-	static std::shared_ptr<AudioDevice> Create();
+    static std::unique_ptr<AudioDevice> Create();
 };
 
-using AudioDevicePtr = std::shared_ptr<AudioDevice>;
+using AudioDevicePtr = std::unique_ptr<AudioDevice>;

src/audio/AudioManager.cpp

@@ -1,10 +1,11 @@
 #include "AudioManager.h"
+#include "AlsaInterface.h"
 
 AudioManager::AudioManager()
     : mAudioDevices(),
       mAudioInterface()
 {
-    mAudioInterface = AudioInterface::Create();
+    mAudioInterface = AlsaInterface::Create();
 }
 
 AudioManager::~AudioManager()
@@ -22,7 +23,7 @@ void AudioManager::AddAudioDevice(AudioDevicePtr device)
     mAudioDevices.push_back(device);
 }
 
-AudioInterface* AudioManager::GetAudioInterface()
+IAudioInterface* AudioManager::GetAudioInterface()
 {
     return mAudioInterface.get();
 }

src/audio/AudioManager.h

@@ -3,7 +3,7 @@
 #include <memory>
 #include <vector>
 
-#include "AudioInterface.h"
+#include "audio_interfaces/IAudioInterface.h"
 #include "AudioDevice.h"
 
 class AudioManager
@@ -12,7 +12,7 @@ class AudioManager
 private:
 
     std::vector<AudioDevicePtr> mAudioDevices;
-    AudioInterfaceUPtr mAudioInterface;
+    IAudioInterfaceUPtr mAudioInterface;
 
 public:
 
@@ -26,7 +26,7 @@ public:
 
     std::vector<AudioDevicePtr> GetAudioDevices();
 
-    AudioInterface* GetAudioInterface();
+    IAudioInterface* GetAudioInterface();
 };
 
 using AudioManagerUPtr = std::unique_ptr<AudioManager>;

src/audio/CMakeLists.txt

@@ -5,7 +5,7 @@ list(APPEND linux_HEADERS
 list(APPEND audio_HEADERS 
     AudioDevice.h
     AudioManager.h
-    audio_interfaces/AudioInterface.h
+    audio_interfaces/IAudioInterface.h
     midi/MidiReader.h
     midi/MidiTrack.h
     midi/MidiDocument.h
@@ -20,7 +20,6 @@ list(APPEND linux_INCLUDES
 list(APPEND audio_LIB_INCLUDES 
     AudioDevice.cpp
     AudioManager.cpp
-    audio_interfaces/AudioInterface.cpp
     midi/MidiReader.cpp
     midi/MidiTrack.cpp
     midi/MidiDocument.cpp
@@ -28,7 +27,7 @@ list(APPEND audio_LIB_INCLUDES
     midi/MetaMidiEvent.cpp
     midi/MidiChannelEvent.cpp)
 
-add_library(audio SHARED ${audio_LIB_INCLUDES} ${audio_HEADERS})
+add_library(audio SHARED ${audio_LIB_INCLUDES} ${linux_INCLUDES} ${audio_HEADERS} ${linux_HEADERS})
 target_include_directories(audio PUBLIC
                           "${CMAKE_CURRENT_SOURCE_DIR}"
                           "${PROJECT_SOURCE_DIR}/src/core/file_utilities"
@@ -41,6 +40,6 @@ list(APPEND linux_LIBS
     asound
 )
                           
-target_link_libraries(audio PUBLIC core)
+target_link_libraries(audio PUBLIC core ${linux_LIBS})
 set_target_properties( audio PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
 set_property(TARGET audio PROPERTY FOLDER src)

src/audio/audio_interfaces/AlsaInterface.cpp

@@ -19,7 +19,7 @@ std::shared_ptr<AlsaInterface> AlsaInterface::Create()
     return std::make_shared<AlsaInterface>();
 }
 
-void AlsaInterface::OpenDevice(AudioDevicePtr device)
+void AlsaInterface::OpenDevice(const AudioDevicePtr& device)
 {
     MLOG_INFO("Opening Device");
     snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK;
@@ -115,7 +115,7 @@ void AlsaInterface::SetChannelNumber(AudioDevicePtr device)
     }
 }
 
-void AlsaInterface::Play(AudioDevicePtr device)
+void AlsaInterface::Play(const AudioDevicePtr& device)
 {
     MLOG_INFO("Playing audio");
     unsigned char *data = (unsigned char *)malloc(mPeriodSize);

src/audio/audio_interfaces/AlsaInterface.h

@@ -3,37 +3,39 @@
 #include <memory>
 #include <alsa/asoundlib.h>
 
+#include "IAudioInterface.h"
+
 #include "AudioDevice.h"
 
-class AlsaInterface
+class AlsaInterface : public IAudioInterface
 {
-	snd_pcm_t* mHandle;
-	snd_pcm_hw_params_t* mHardwareParams;
-	snd_pcm_uframes_t mPeriodSize;
+    snd_pcm_t* mHandle;
+    snd_pcm_hw_params_t* mHardwareParams;
+    snd_pcm_uframes_t mPeriodSize;
 
 public:
 
-	AlsaInterface();
+    AlsaInterface();
 
-	~AlsaInterface();
+    ~AlsaInterface();
 
-	static std::shared_ptr<AlsaInterface> Create();
+    static std::shared_ptr<AlsaInterface> Create();
 
-	void OpenDevice(AudioDevicePtr device);
+    void OpenDevice(const AudioDevicePtr& device) override;
 
-	void SetAccessType(AudioDevicePtr device);
+    void SetAccessType(AudioDevicePtr device);
 
-	void SetSampleFormat(AudioDevicePtr device);
+    void SetSampleFormat(AudioDevicePtr device);
 
-	void SetSampleRate(AudioDevicePtr device);
+    void SetSampleRate(AudioDevicePtr device);
 
-	void SetPeriod(AudioDevicePtr device);
+    void SetPeriod(AudioDevicePtr device);
 
-	void SetBufferSize(AudioDevicePtr device);
+    void SetBufferSize(AudioDevicePtr device);
 
-	void SetChannelNumber(AudioDevicePtr device);
+    void SetChannelNumber(AudioDevicePtr device);
 
-	void Play(AudioDevicePtr device);
+    void Play(const AudioDevicePtr& device) override;
 };
 
 using AlsaInterfacePtr = std::shared_ptr<AlsaInterface>;

src/audio/audio_interfaces/AudioInterface.cpp

@@ -1,22 +0,0 @@
-#include "AudioInterface.h"
-#include "AudioDevice.h"
-
-AudioInterface::AudioInterface()
-{
-
-}
-
-std::unique_ptr<AudioInterface> AudioInterface::Create()
-{
-    return std::make_unique<AudioInterface>();
-}
-
-void AudioInterface::OpenDevice(AudioDevicePtr device)
-{
-
-}
-
-void AudioInterface::Play(AudioDevicePtr device)
-{
-
-}

src/audio/audio_interfaces/IAudioInterface.h

@@ -3,19 +3,19 @@
 #include <memory>
 
 class AudioDevice;
-using AudioDevicePtr = std::shared_ptr<AudioDevice>;
+using AudioDevicePtr = std::unique_ptr<AudioDevice>;
 
-class AudioInterface
+class IAudioInterface
 {
 public:
 
-    AudioInterface();
+    IAudioInterface() = default;
 
-    static std::unique_ptr<AudioInterface> Create();
+    virtual ~IAudioInterface() = default;
 
-    void OpenDevice(AudioDevicePtr device);
+    virtual void OpenDevice(const AudioDevicePtr& device) = 0;
 
-    void Play(AudioDevicePtr device);
+    virtual void Play(const AudioDevicePtr& device) = 0;
 };
 
-using AudioInterfaceUPtr = std::unique_ptr<AudioInterface>;
+using IAudioInterfaceUPtr = std::unique_ptr<IAudioInterface>;