Change ISettings interface a bit

We're adding new option anyway.

6 files changed, 13 insertions, 19 deletions

diff --git a/src/AudioDeviceManager.cpp b/src/AudioDeviceManager.cpp
index ce77885..f05f907 100644
--- a/src/AudioDeviceManager.cpp
+++ b/src/AudioDeviceManager.cpp
@@ -269,8 +269,7 @@ namespace SaneAudioRenderer
                     backend->dspFormat = DspFormat::Float;

                     backend->waveFormat = mixFormat;

 

-                    BOOL crossfeedEnabled;

-                    pSettings->GetCrossfeedEnabled(&crossfeedEnabled);

+                    BOOL crossfeedEnabled = pSettings->GetCrossfeedEnabled();

 

                     std::deque<WAVEFORMATEXTENSIBLE> priorities = {

                         BuildWaveFormatExt(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 32, 32,

diff --git a/src/AudioRenderer.cpp b/src/AudioRenderer.cpp
index 603b469..eb3ae82 100644
--- a/src/AudioRenderer.cpp
+++ b/src/AudioRenderer.cpp
@@ -259,8 +259,7 @@ namespace SaneAudioRenderer
 

         BOOL exclusive;

         m_settings->GetOuputDevice(nullptr, &exclusive, nullptr);

-        BOOL bitstreamingAllowed;

-        m_settings->GetAllowBitstreaming(&bitstreamingAllowed);

+        BOOL bitstreamingAllowed = m_settings->GetAllowBitstreaming();

 

         if (!exclusive || !bitstreamingAllowed || live)

             return false;

@@ -395,8 +394,7 @@ namespace SaneAudioRenderer
 

             if (!m_device->IsExclusive())

             {

-                BOOL crossfeedEnabled;

-                m_settings->GetCrossfeedEnabled(&crossfeedEnabled);

+                BOOL crossfeedEnabled = m_settings->GetCrossfeedEnabled();

                 BOOL ignoreSystemChannelMixer = m_settings->GetIgnoreSystemChannelMixer();

 

                 SharedWaveFormat newMixFormat = m_device->GetNewMixFormat();

diff --git a/src/DspCrossfeed.cpp b/src/DspCrossfeed.cpp
index 5fc9380..e47ccba 100644
--- a/src/DspCrossfeed.cpp
+++ b/src/DspCrossfeed.cpp
@@ -54,8 +54,7 @@ namespace SaneAudioRenderer
         UINT32 crossfeedLevel;

         m_settings->GetCrossfeedSettings(&cutoffFrequency, &crossfeedLevel);

 

-        BOOL enabled;

-        m_settings->GetCrossfeedEnabled(&enabled);

+        BOOL enabled = m_settings->GetCrossfeedEnabled();

 

         m_active = m_possible && enabled;

 

diff --git a/src/Interfaces.h b/src/Interfaces.h
index a62d7c9..7eb0f63 100644
--- a/src/Interfaces.h
+++ b/src/Interfaces.h
@@ -5,7 +5,7 @@
 

 namespace SaneAudioRenderer

 {

-    struct __declspec(uuid("6A5DD5AC-A1BF-4FB7-9C04-2A89970F8132"))

+    struct __declspec(uuid("ED41579C-C96A-4D8C-9813-856AB99F405E"))

     ISettings : IUnknown

     {

         STDMETHOD_(UINT32, GetSerial)() = 0;

@@ -20,10 +20,10 @@ namespace SaneAudioRenderer
         STDMETHOD(GetOuputDevice)(LPWSTR* ppDeviceId, BOOL* pbExclusive, UINT32* puBufferMS) = 0;

 

         STDMETHOD_(void, SetAllowBitstreaming)(BOOL bAllowBitstreaming) = 0;

-        STDMETHOD_(void, GetAllowBitstreaming)(BOOL* pbAllowBitstreaming) = 0;

+        STDMETHOD_(BOOL, GetAllowBitstreaming)() = 0;

 

         STDMETHOD_(void, SetCrossfeedEnabled)(BOOL bEnable) = 0;

-        STDMETHOD_(void, GetCrossfeedEnabled)(BOOL* pbEnabled) = 0;

+        STDMETHOD_(BOOL, GetCrossfeedEnabled)() = 0;

 

         enum

         {

diff --git a/src/Settings.cpp b/src/Settings.cpp
index 5750db4..41341a9 100644
--- a/src/Settings.cpp
+++ b/src/Settings.cpp
@@ -84,12 +84,11 @@ namespace SaneAudioRenderer
         }

     }

 

-    STDMETHODIMP_(void) Settings::GetAllowBitstreaming(BOOL* pbAllowBitstreaming)

+    STDMETHODIMP_(BOOL) Settings::GetAllowBitstreaming()

     {

         CAutoLock lock(this);

 

-        if (pbAllowBitstreaming)

-            *pbAllowBitstreaming = m_allowBitstreaming;

+        return m_allowBitstreaming;

     }

 

     STDMETHODIMP_(void) Settings::SetCrossfeedEnabled(BOOL bEnable)

@@ -103,12 +102,11 @@ namespace SaneAudioRenderer
         }

     }

 

-    STDMETHODIMP_(void) Settings::GetCrossfeedEnabled(BOOL* pbEnabled)

+    STDMETHODIMP_(BOOL) Settings::GetCrossfeedEnabled()

     {

         CAutoLock lock(this);

 

-        if (pbEnabled)

-            *pbEnabled = m_crossfeedEnabled;

+        return m_crossfeedEnabled;

     }

 

     STDMETHODIMP Settings::SetCrossfeedSettings(UINT32 uCutoffFrequency, UINT32 uCrossfeedLevel)

diff --git a/src/Settings.h b/src/Settings.h
index 6f3d775..7f9c8db 100644
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -25,10 +25,10 @@ namespace SaneAudioRenderer
         STDMETHODIMP GetOuputDevice(LPWSTR* ppDeviceId, BOOL* pbExclusive, UINT32* puBufferMS) override;

 

         STDMETHODIMP_(void) SetAllowBitstreaming(BOOL bAllowBitstreaming) override;

-        STDMETHODIMP_(void) GetAllowBitstreaming(BOOL* pbAllowBitstreaming) override;

+        STDMETHODIMP_(BOOL) GetAllowBitstreaming() override;

 

         STDMETHODIMP_(void) SetCrossfeedEnabled(BOOL bEnable) override;

-        STDMETHODIMP_(void) GetCrossfeedEnabled(BOOL* pbEnabled) override;

+        STDMETHODIMP_(BOOL) GetCrossfeedEnabled() override;

 

         STDMETHODIMP SetCrossfeedSettings(UINT32 uCutoffFrequency, UINT32 uCrossfeedLevel) override;

         STDMETHODIMP_(void) GetCrossfeedSettings(UINT32* puCutoffFrequency, UINT32* puCrossfeedLevel) override;