Changeset 26543 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 15, 2010 2:03:04 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

57718

Message:

Audio-OSX: use DECLCALLBACK

File:

• trunk/src/VBox/Devices/Audio/coreaudio.c (modified) (7 diffs)

trunk/src/VBox/Devices/Audio/coreaudio.c

@@ -524 +524 @@
 
 /* Callback for getting notified when the default output device was changed */
-static OSStatus caPlaybackDefaultDeviceChanged(AudioHardwarePropertyID inPropertyID,
-                                               void *inClientData)
+static DECLCALLBACK(OSStatus) caPlaybackDefaultDeviceChanged(AudioHardwarePropertyID inPropertyID,
+                                                             void *inClientData)
 {
     OSStatus err = noErr;
@@ -560 +560 @@
 
 /* Callback for getting notified when some of the properties of an audio device has changed */
-static OSStatus caPlaybackAudioDevicePropertyChanged(AudioDeviceID inDevice,
-                                                     UInt32 inChannel,
-                                                     Boolean isInput,
-                                                     AudioDevicePropertyID inPropertyID,
-                                                     void *inClientData)
+static DECLCALLBACK(OSStatus) caPlaybackAudioDevicePropertyChanged(AudioDeviceID inDevice,
+                                                                   UInt32 inChannel,
+                                                                   Boolean isInput,
+                                                                   AudioDevicePropertyID inPropertyID,
+                                                                   void *inClientData)
 {
     switch (inPropertyID)
@@ -582 +582 @@
 
 /* Callback to feed audio output buffer */
-static OSStatus caPlaybackCallback(void* inRefCon,
-                                   AudioUnitRenderActionFlags* ioActionFlags,
-                                   const AudioTimeStamp* inTimeStamp,
-                                   UInt32 inBusNumber,
-                                   UInt32 inNumberFrames,
-                                   AudioBufferList* ioData)
+static DECLCALLBACK(OSStatus) caPlaybackCallback(void* inRefCon,
+                                                 AudioUnitRenderActionFlags* ioActionFlags,
+                                                 const AudioTimeStamp* inTimeStamp,
+                                                 UInt32 inBusNumber,
+                                                 UInt32 inNumberFrames,
+                                                 AudioBufferList* ioData)
 {
     uint32_t csAvail = 0;
@@ -1179 +1179 @@
 
 /* Callback for getting notified when the default input device was changed */
-static OSStatus caRecordingDefaultDeviceChanged(AudioHardwarePropertyID inPropertyID,
-                                                void *inClientData)
+static DECLCALLBACK(OSStatus) caRecordingDefaultDeviceChanged(AudioHardwarePropertyID inPropertyID,
+                                                              void *inClientData)
 {
     OSStatus err = noErr;
@@ -1215 +1215 @@
 
 /* Callback for getting notified when some of the properties of an audio device has changed */
-static OSStatus caRecordingAudioDevicePropertyChanged(AudioDeviceID inDevice,
-                                                      UInt32 inChannel,
-                                                      Boolean isInput,
-                                                      AudioDevicePropertyID inPropertyID,
-                                                      void *inClientData)
+static DECLCALLBACK(OSStatus) caRecordingAudioDevicePropertyChanged(AudioDeviceID inDevice,
+                                                                    UInt32 inChannel,
+                                                                    Boolean isInput,
+                                                                    AudioDevicePropertyID inPropertyID,
+                                                                    void *inClientData)
 {
     caVoiceIn *caVoice = (caVoiceIn *) inClientData;
@@ -1248 +1248 @@
 
 /* Callback to convert audio input data from one format to another */
-static OSStatus caConverterCallback(AudioConverterRef inAudioConverter,
-                                    UInt32 *ioNumberDataPackets,
-                                    AudioBufferList *ioData,
-                                    AudioStreamPacketDescription **outDataPacketDescription,
-                                    void *inUserData)
+static DECLCALLBACK(OSStatus) caConverterCallback(AudioConverterRef inAudioConverter,
+                                                  UInt32 *ioNumberDataPackets,
+                                                  AudioBufferList *ioData,
+                                                  AudioStreamPacketDescription **outDataPacketDescription,
+                                                  void *inUserData)
 {
     /* In principle we had to check here if the source is non interleaved & if
@@ -1295 +1295 @@
 
 /* Callback to feed audio input buffer */
-static OSStatus caRecordingCallback(void* inRefCon,
-                                    AudioUnitRenderActionFlags* ioActionFlags,
-                                    const AudioTimeStamp* inTimeStamp,
-                                    UInt32 inBusNumber,
-                                    UInt32 inNumberFrames,
-                                    AudioBufferList* ioData)
+static DECLCALLBACK(OSStatus) caRecordingCallback(void* inRefCon,
+                                                  AudioUnitRenderActionFlags* ioActionFlags,
+                                                  const AudioTimeStamp* inTimeStamp,
+                                                  UInt32 inBusNumber,
+                                                  UInt32 inNumberFrames,
+                                                  AudioBufferList* ioData)
 {
     OSStatus err = noErr;