Ticket #2539: audiooutputca.h.diff

audiooutputca.h

@@ -13 +13 @@
 
 // We hide Core Audio-specific items, to avoid
 // pulling in Mac-specific header files.
-struct CoreAudioData;
+class CoreAudio_impl;
 
 class AudioOutputCA : public AudioOutputBase
 {
@@ -26 +26 @@
                   bool lset_initial_vol, bool laudio_passthru);
     virtual ~AudioOutputCA();
     
-    // callback for delivering audio to output device
-    bool RenderAudio(unsigned char *aubuf, int size,
-                     unsigned long long timestamp);
-
     // Volume control
     virtual int GetVolumeChannel(int channel); // Returns 0-100
     virtual void SetVolumeChannel(int channel, int volume); // range 0-100 for vol
@@ -40 +36 @@
     virtual bool OpenDevice(void);
     virtual void CloseDevice(void);
     virtual void WriteAudio(unsigned char *aubuf, int size);
-    virtual inline int getSpaceOnSoundcard(void);
-    virtual inline int getBufferedOnSoundcard(void);
+    virtual int getSpaceOnSoundcard(void);
+    virtual int getBufferedOnSoundcard(void);
     
     // The following functions may be overridden, but don't need to be
-    virtual inline void StartOutputThread(void);
-    virtual inline void StopOutputThread(void);
+    virtual void StartOutputThread(void);
+    virtual void StopOutputThread(void);
 
 private:
 
-    CoreAudioData * coreaudio_data;
-    int bufferedBytes;
+    CoreAudio_impl * mPImpl;
+    friend class CoreAudio_impl;
 };
 
 #endif