wasapi output: fixed remaining bugs, added volume control

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6365 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 12 insertions, 15 deletions

diff --git a/src/plugins/Output/wasapi/outputwasapi.h b/src/plugins/Output/wasapi/outputwasapi.h
index 5d6df6172..421c01010 100644
--- a/src/plugins/Output/wasapi/outputwasapi.h
+++ b/src/plugins/Output/wasapi/outputwasapi.h
@@ -28,7 +28,7 @@
 #include <qmmp/volume.h>

 #include <qmmp/output.h>

 

-//class VolumeDirectSound;

+class VolumeWASAPI;

 

 /**

     @author Ilya Kotov <forkotov02@hotmail.ru>

@@ -50,45 +50,42 @@ public:
     void reset();

 

     //volume control

+    ISimpleAudioVolume *simpleAudioVolume();

     static OutputWASAPI *instance;

-    //static VolumeDirectSound *volumeControl;

-    //IDirectSoundBuffer8 *secondaryBuffer();

+    static VolumeWASAPI *volumeControl;

 

 

 private:

     // helper functions

     void status();

     void uninitialize();

-    DWORD bytesToWrite();

 

     IMMDeviceEnumerator *m_pEnumerator;

     IMMDevice *m_pDevice;

     IAudioClient *m_pAudioClient;

     IAudioRenderClient *m_pRenderClient;

+    ISimpleAudioVolume *m_pSimpleAudioVolume;

 

-    //IDirectSound8 *m_ds;

-    //IDirectSoundBuffer *m_primaryBuffer;

-    //IDirectSoundBuffer8 *m_dsBuffer;

-    DWORD m_dsBufferAt;

-    UINT32 m_bufferSize;

+    UINT32 m_bufferFrames;

+    int m_frameSize;

 

     typedef struct

     {

         Qmmp::ChannelPosition pos;

         DWORD chan_mask;

-    } DSoundChannels;

+    } DWASAPIChannels;

 

-    static DSoundChannels m_dsound_pos[10];

+    static DWASAPIChannels m_wasapi_pos[10];

 };

 

 /**

     @author Ilya Kotov <forkotov02@hotmail.ru>

 */

-/*class VolumeDirectSound : public Volume

+class VolumeWASAPI : public Volume

 {

 public:

-    VolumeDirectSound();

-    ~VolumeDirectSound();

+    VolumeWASAPI();

+    ~VolumeWASAPI();

 

     void setVolume(const VolumeSettings &vol);

     VolumeSettings volume() const;

@@ -96,7 +93,7 @@ public:
 

 private:

     VolumeSettings m_volume;

-};*/

+};

 

 

 #endif // OUTPUTWASAPI_H