From 3e1f72a0117d2f3f83665c16fc7e84881748561f Mon Sep 17 00:00:00 2001 From: Mike McDonald Date: Wed, 28 Aug 2013 21:37:45 -0400 Subject: [PATCH] Fixed minor formatting issues --- channels/rdpsnd/client/ios/rdpsnd_ios.c | 173 ++++++++++++------------ 1 file changed, 86 insertions(+), 87 deletions(-) diff --git a/channels/rdpsnd/client/ios/rdpsnd_ios.c b/channels/rdpsnd/client/ios/rdpsnd_ios.c index 60d6b9655..60da43cc1 100644 --- a/channels/rdpsnd/client/ios/rdpsnd_ios.c +++ b/channels/rdpsnd/client/ios/rdpsnd_ios.c @@ -32,8 +32,8 @@ #include "rdpsnd_main.h" #include "TPCircularBuffer.h" -#define INPUT_BUFFER_SIZE 32768 -#define CIRCULAR_BUFFER_SIZE (INPUT_BUFFER_SIZE * 4) +#define INPUT_BUFFER_SIZE 32768 +#define CIRCULAR_BUFFER_SIZE (INPUT_BUFFER_SIZE * 4) typedef struct rdpsnd_ios_plugin { @@ -47,20 +47,20 @@ typedef struct rdpsnd_ios_plugin #define THIS(__ptr) ((rdpsndIOSPlugin*)__ptr) static OSStatus rdpsnd_ios_render_cb( - void *inRefCon, - AudioUnitRenderActionFlags __unused *ioActionFlags, - const AudioTimeStamp __unused *inTimeStamp, - UInt32 inBusNumber, - UInt32 __unused inNumberFrames, - AudioBufferList *ioData + void *inRefCon, + AudioUnitRenderActionFlags __unused *ioActionFlags, + const AudioTimeStamp __unused *inTimeStamp, + UInt32 inBusNumber, + UInt32 __unused inNumberFrames, + AudioBufferList *ioData ) { - unsigned int i; + unsigned int i; if (inBusNumber != 0) { return noErr; - }; + } rdpsndIOSPlugin *p = THIS(inRefCon); @@ -84,17 +84,17 @@ static OSStatus rdpsnd_ios_render_cb( target_buffer->mDataByteSize = 0; AudioOutputUnitStop(p->audio_unit); p->is_playing = 0; - }; - }; + } + } return noErr; } static BOOL rdpsnd_ios_format_supported(rdpsndDevicePlugin* __unused device, AUDIO_FORMAT* format) { - if (format->wFormatTag == WAVE_FORMAT_PCM) + if (format->wFormatTag == WAVE_FORMAT_PCM) { - return 1; + return 1; } return 0; } @@ -111,10 +111,10 @@ static void rdpsnd_ios_start(rdpsndDevicePlugin* device) { rdpsndIOSPlugin *p = THIS(device); - /* If this device is not playing... */ + /* If this device is not playing... */ if (!p->is_playing) { - /* Start the device. */ + /* Start the device. */ int32_t available_bytes = 0; TPCircularBufferTail(&p->buffer, &available_bytes); if (available_bytes > 0) @@ -129,16 +129,16 @@ static void rdpsnd_ios_stop(rdpsndDevicePlugin* __unused device) { rdpsndIOSPlugin *p = THIS(device); - /* If the device is playing... */ + /* If the device is playing... */ if (p->is_playing) { - /* Stop the device. */ + /* Stop the device. */ AudioOutputUnitStop(p->audio_unit); p->is_playing = 0; - /* Free all buffers. */ - TPCircularBufferClear(&p->buffer); - }; + /* Free all buffers. */ + TPCircularBufferClear(&p->buffer); + } } static void rdpsnd_ios_play(rdpsndDevicePlugin* device, BYTE* data, int size) @@ -151,8 +151,7 @@ static void rdpsnd_ios_play(rdpsndDevicePlugin* device, BYTE* data, int size) return; } - rdpsnd_ios_start(device); - + rdpsnd_ios_start(device); } static void rdpsnd_ios_open(rdpsndDevicePlugin* device, AUDIO_FORMAT* format, int __unused latency) @@ -162,9 +161,9 @@ static void rdpsnd_ios_open(rdpsndDevicePlugin* device, AUDIO_FORMAT* format, in if (p->is_opened) { return; - }; + } - /* Find the output audio unit. */ + /* Find the output audio unit. */ AudioComponentDescription desc; desc.componentManufacturer = kAudioUnitManufacturer_Apple; desc.componentType = kAudioUnitType_Output; @@ -173,13 +172,13 @@ static void rdpsnd_ios_open(rdpsndDevicePlugin* device, AUDIO_FORMAT* format, in desc.componentFlagsMask = 0; AudioComponent audioComponent = AudioComponentFindNext(NULL, &desc); - if (audioComponent == NULL) return; + if (audioComponent == NULL) return; - /* Open the audio unit. */ + /* Open the audio unit. */ OSStatus status = AudioComponentInstanceNew(audioComponent, &p->audio_unit); - if (status != 0) return; + if (status != 0) return; - /* Set the format for the AudioUnit. */ + /* Set the format for the AudioUnit. */ AudioStreamBasicDescription audioFormat = {0}; audioFormat.mSampleRate = format->nSamplesPerSec; audioFormat.mFormatID = kAudioFormatLinearPCM; @@ -191,55 +190,55 @@ static void rdpsnd_ios_open(rdpsndDevicePlugin* device, AUDIO_FORMAT* format, in audioFormat.mBytesPerPacket = audioFormat.mBytesPerFrame * audioFormat.mFramesPerPacket; status = AudioUnitSetProperty( - p->audio_unit, - kAudioUnitProperty_StreamFormat, - kAudioUnitScope_Input, - 0, - &audioFormat, - sizeof(audioFormat)); - if (status != 0) - { - AudioComponentInstanceDispose(p->audio_unit); - p->audio_unit = NULL; - return; - } + p->audio_unit, + kAudioUnitProperty_StreamFormat, + kAudioUnitScope_Input, + 0, + &audioFormat, + sizeof(audioFormat)); + if (status != 0) + { + AudioComponentInstanceDispose(p->audio_unit); + p->audio_unit = NULL; + return; + } - /* Set up the AudioUnit callback. */ + /* Set up the AudioUnit callback. */ AURenderCallbackStruct callbackStruct = {0}; callbackStruct.inputProc = rdpsnd_ios_render_cb; callbackStruct.inputProcRefCon = p; - status = AudioUnitSetProperty( - p->audio_unit, - kAudioUnitProperty_SetRenderCallback, - kAudioUnitScope_Input, - 0, - &callbackStruct, - sizeof(callbackStruct)); - if (status != 0) - { - AudioComponentInstanceDispose(p->audio_unit); - p->audio_unit = NULL; - return; - } + status = AudioUnitSetProperty( + p->audio_unit, + kAudioUnitProperty_SetRenderCallback, + kAudioUnitScope_Input, + 0, + &callbackStruct, + sizeof(callbackStruct)); + if (status != 0) + { + AudioComponentInstanceDispose(p->audio_unit); + p->audio_unit = NULL; + return; + } - /* Initialize the AudioUnit. */ + /* Initialize the AudioUnit. */ status = AudioUnitInitialize(p->audio_unit); - if (status != 0) - { - AudioComponentInstanceDispose(p->audio_unit); - p->audio_unit = NULL; - return; - } + if (status != 0) + { + AudioComponentInstanceDispose(p->audio_unit); + p->audio_unit = NULL; + return; + } - /* Allocate the circular buffer. */ + /* Allocate the circular buffer. */ const BOOL ok = TPCircularBufferInit(&p->buffer, CIRCULAR_BUFFER_SIZE); - if (!ok) - { - AudioUnitUninitialize(p->audio_unit); - AudioComponentInstanceDispose(p->audio_unit); - p->audio_unit = NULL; - return; - } + if (!ok) + { + AudioUnitUninitialize(p->audio_unit); + AudioComponentInstanceDispose(p->audio_unit); + p->audio_unit = NULL; + return; + } p->is_opened = 1; } @@ -248,32 +247,32 @@ static void rdpsnd_ios_close(rdpsndDevicePlugin* device) { rdpsndIOSPlugin *p = THIS(device); - /* Make sure the device is stopped. */ - rdpsnd_ios_stop(device); + /* Make sure the device is stopped. */ + rdpsnd_ios_stop(device); - /* If the device is open... */ - if (p->is_opened) - { - /* Close the device. */ - AudioUnitUninitialize(p->audio_unit); - AudioComponentInstanceDispose(p->audio_unit); - p->audio_unit = NULL; - p->is_opened = 0; + /* If the device is open... */ + if (p->is_opened) + { + /* Close the device. */ + AudioUnitUninitialize(p->audio_unit); + AudioComponentInstanceDispose(p->audio_unit); + p->audio_unit = NULL; + p->is_opened = 0; - /* Destroy the circular buffer. */ - TPCircularBufferCleanup(&p->buffer); - } + /* Destroy the circular buffer. */ + TPCircularBufferCleanup(&p->buffer); + } } static void rdpsnd_ios_free(rdpsndDevicePlugin* device) { rdpsndIOSPlugin *p = THIS(device); - /* Ensure the device is closed. */ - rdpsnd_ios_close(device); + /* Ensure the device is closed. */ + rdpsnd_ios_close(device); - /* Free memory associated with the device. */ - free(p); + /* Free memory associated with the device. */ + free(p); } #ifdef STATIC_CHANNELS