From: rbencina Date: Fri, 11 Apr 2014 05:31:13 +0000 (+0000) Subject: pa_win_wmme.c: converted tabs to spaces (just a few sections) X-Git-Tag: pa_stable_v190600_20161030~53 X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=9222d8bfb49f9a4e314bcd263b41a816ed25d83a;p=portaudio pa_win_wmme.c: converted tabs to spaces (just a few sections) --- diff --git a/src/hostapi/wmme/pa_win_wmme.c b/src/hostapi/wmme/pa_win_wmme.c index 9015c9d..25fe0cc 100644 --- a/src/hostapi/wmme/pa_win_wmme.c +++ b/src/hostapi/wmme/pa_win_wmme.c @@ -62,7 +62,7 @@ */ /** @file - @ingroup hostapi_src + @ingroup hostapi_src @brief Win32 host API implementation for the Windows MultiMedia Extensions (WMME) audio API. */ @@ -207,7 +207,7 @@ static const char constOutputMapperSuffix_[] = " - Output"; static char *CopyTCharStringToUtf8CString(char *destination, size_t destLengthBytes, const TCHAR *source) { #if !defined(_UNICODE) && !defined(UNICODE) - return strcpy(destination, source); + return strcpy(destination, source); #else /* The cbMultiByte parameter ["destLengthBytes" below] is: """ @@ -218,9 +218,9 @@ static char *CopyTCharStringToUtf8CString(char *destination, size_t destLengthBy Source: WideCharToMultiByte at MSDN: http://msdn.microsoft.com/en-us/library/windows/desktop/dd374130(v=vs.85).aspx */ - if (WideCharToMultiByte(CP_UTF8, 0, source, -1, destination, (int)destLengthBytes, NULL, NULL) == 0) - return NULL; - return destination; + if (WideCharToMultiByte(CP_UTF8, 0, source, -1, destination, (int)destLengthBytes, NULL, NULL) == 0) + return NULL; + return destination; #endif } @@ -229,9 +229,9 @@ static char *CopyTCharStringToUtf8CString(char *destination, size_t destLengthBy static size_t TCharStringLen(const TCHAR *str) { #if !defined(_UNICODE) && !defined(UNICODE) - return strlen(str); + return strlen(str); #else - return WideCharToMultiByte(CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL); + return WideCharToMultiByte(CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL); #endif } @@ -497,7 +497,7 @@ static UINT LocalDeviceIndexToWinMmeDeviceId( PaWinMmeHostApiRepresentation *hos { assert( device >= 0 && device < hostApi->inputDeviceCount + hostApi->outputDeviceCount ); - return hostApi->winMmeDeviceIds[ device ]; + return hostApi->winMmeDeviceIds[ device ]; } @@ -853,7 +853,7 @@ static PaError InitializeOutputDeviceInfo( PaWinMmeHostApiRepresentation *winMme len = TCharStringLen( woc.szPname ) + 1 + sizeof(constOutputMapperSuffix_); deviceName = (char*)PaUtil_GroupAllocateMemory( winMmeHostApi->allocations, - (long)len ); + (long)len ); if( !deviceName ) { result = paInsufficientMemory; @@ -867,7 +867,7 @@ static PaError InitializeOutputDeviceInfo( PaWinMmeHostApiRepresentation *winMme len = TCharStringLen( woc.szPname ) + 1; deviceName = (char*)PaUtil_GroupAllocateMemory( winMmeHostApi->allocations, - (long)len ); + (long)len ); if( !deviceName ) { result = paInsufficientMemory; @@ -898,7 +898,7 @@ static PaError InitializeOutputDeviceInfo( PaWinMmeHostApiRepresentation *winMme #ifdef PAWIN_USE_WDMKS_DEVICE_INFO wdmksDeviceOutputChannelCountIsKnown = QueryWaveOutKSFilterMaxChannels( - winMmeOutputDeviceId, &deviceInfo->maxOutputChannels ); + winMmeOutputDeviceId, &deviceInfo->maxOutputChannels ); if( wdmksDeviceOutputChannelCountIsKnown && !winMmeDeviceInfo->deviceOutputChannelCountIsKnown ) winMmeDeviceInfo->deviceOutputChannelCountIsKnown = 1; #endif /* PAWIN_USE_WDMKS_DEVICE_INFO */ @@ -919,7 +919,7 @@ static void GetDefaultLatencies( PaTime *defaultLowLatency, PaTime *defaultHighL { OSVERSIONINFO osvi; osvi.dwOSVersionInfoSize = sizeof( osvi ); - GetVersionEx( &osvi ); + GetVersionEx( &osvi ); /* Check for NT */ if( (osvi.dwMajorVersion == 4) && (osvi.dwPlatformId == 2) ) @@ -999,11 +999,11 @@ PaError PaWinMme_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd inputDeviceCount = waveInGetNumDevs(); if( inputDeviceCount > 0 ) - maximumPossibleDeviceCount += inputDeviceCount + 1; /* assume there is a WAVE_MAPPER */ + maximumPossibleDeviceCount += inputDeviceCount + 1; /* assume there is a WAVE_MAPPER */ outputDeviceCount = waveOutGetNumDevs(); if( outputDeviceCount > 0 ) - maximumPossibleDeviceCount += outputDeviceCount + 1; /* assume there is a WAVE_MAPPER */ + maximumPossibleDeviceCount += outputDeviceCount + 1; /* assume there is a WAVE_MAPPER */ if( maximumPossibleDeviceCount > 0 ){ @@ -2173,29 +2173,29 @@ static PaError ValidateWinMmeSpecificStreamInfo( char *throttleProcessingThreadOnOverload, unsigned long *deviceCount ) { - if( streamInfo ) - { - if( streamInfo->size != sizeof( PaWinMmeStreamInfo ) - || streamInfo->version != 1 ) - { - return paIncompatibleHostApiSpecificStreamInfo; - } + if( streamInfo ) + { + if( streamInfo->size != sizeof( PaWinMmeStreamInfo ) + || streamInfo->version != 1 ) + { + return paIncompatibleHostApiSpecificStreamInfo; + } *winMmeSpecificFlags = streamInfo->flags; - if( streamInfo->flags & paWinMmeDontThrottleOverloadedProcessingThread ) - *throttleProcessingThreadOnOverload = 0; + if( streamInfo->flags & paWinMmeDontThrottleOverloadedProcessingThread ) + *throttleProcessingThreadOnOverload = 0; - if( streamInfo->flags & paWinMmeUseMultipleDevices ) - { - if( streamParameters->device != paUseHostApiSpecificDeviceSpecification ) - return paInvalidDevice; - - *deviceCount = streamInfo->deviceCount; - } - } + if( streamInfo->flags & paWinMmeUseMultipleDevices ) + { + if( streamParameters->device != paUseHostApiSpecificDeviceSpecification ) + return paInvalidDevice; + + *deviceCount = streamInfo->deviceCount; + } + } - return paNoError; + return paNoError; } static PaError RetrieveDevicesFromStreamParameters( @@ -2210,34 +2210,34 @@ static PaError RetrieveDevicesFromStreamParameters( int totalChannelCount; PaDeviceIndex hostApiDevice; - if( streamInfo && streamInfo->flags & paWinMmeUseMultipleDevices ) - { - totalChannelCount = 0; - for( i=0; i < deviceCount; ++i ) - { - /* validate that the device number is within range */ - result = PaUtil_DeviceIndexToHostApiDeviceIndex( &hostApiDevice, - streamInfo->devices[i].device, hostApi ); - if( result != paNoError ) - return result; - - devices[i].device = hostApiDevice; - devices[i].channelCount = streamInfo->devices[i].channelCount; - - totalChannelCount += devices[i].channelCount; - } - - if( totalChannelCount != streamParameters->channelCount ) - { - /* channelCount must match total channels specified by multiple devices */ - return paInvalidChannelCount; /* REVIEW use of this error code */ - } - } - else - { - devices[0].device = streamParameters->device; - devices[0].channelCount = streamParameters->channelCount; - } + if( streamInfo && streamInfo->flags & paWinMmeUseMultipleDevices ) + { + totalChannelCount = 0; + for( i=0; i < deviceCount; ++i ) + { + /* validate that the device number is within range */ + result = PaUtil_DeviceIndexToHostApiDeviceIndex( &hostApiDevice, + streamInfo->devices[i].device, hostApi ); + if( result != paNoError ) + return result; + + devices[i].device = hostApiDevice; + devices[i].channelCount = streamInfo->devices[i].channelCount; + + totalChannelCount += devices[i].channelCount; + } + + if( totalChannelCount != streamParameters->channelCount ) + { + /* channelCount must match total channels specified by multiple devices */ + return paInvalidChannelCount; /* REVIEW use of this error code */ + } + } + else + { + devices[0].device = streamParameters->device; + devices[0].channelCount = streamParameters->channelCount; + } return result; } @@ -2251,10 +2251,10 @@ static PaError ValidateInputChannelCounts( PaWinMmeDeviceInfo *inputDeviceInfo; PaError paerror; - for( i=0; i < deviceCount; ++i ) - { + for( i=0; i < deviceCount; ++i ) + { if( devices[i].channelCount < 1 ) - return paInvalidChannelCount; + return paInvalidChannelCount; inputDeviceInfo = (PaWinMmeDeviceInfo*)hostApi->deviceInfos[ devices[i].device ]; @@ -2262,7 +2262,7 @@ static PaError ValidateInputChannelCounts( paerror = IsInputChannelCountSupported( inputDeviceInfo, devices[i].channelCount ); if( paerror != paNoError ) return paerror; - } + } return paNoError; } @@ -2276,10 +2276,10 @@ static PaError ValidateOutputChannelCounts( PaWinMmeDeviceInfo *outputDeviceInfo; PaError paerror; - for( i=0; i < deviceCount; ++i ) - { + for( i=0; i < deviceCount; ++i ) + { if( devices[i].channelCount < 1 ) - return paInvalidChannelCount; + return paInvalidChannelCount; outputDeviceInfo = (PaWinMmeDeviceInfo*)hostApi->deviceInfos[ devices[i].device ]; @@ -2287,7 +2287,7 @@ static PaError ValidateOutputChannelCounts( paerror = IsOutputChannelCountSupported( outputDeviceInfo, devices[i].channelCount ); if( paerror != paNoError ) return paerror; - } + } return paNoError; } @@ -2336,28 +2336,28 @@ static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi, if( inputParameters ) { - inputChannelCount = inputParameters->channelCount; + inputChannelCount = inputParameters->channelCount; inputSampleFormat = inputParameters->sampleFormat; suggestedInputLatency = inputParameters->suggestedLatency; - inputDeviceCount = 1; + inputDeviceCount = 1; - /* validate input hostApiSpecificStreamInfo */ + /* validate input hostApiSpecificStreamInfo */ inputStreamInfo = (PaWinMmeStreamInfo*)inputParameters->hostApiSpecificStreamInfo; - result = ValidateWinMmeSpecificStreamInfo( inputParameters, inputStreamInfo, + result = ValidateWinMmeSpecificStreamInfo( inputParameters, inputStreamInfo, &winMmeSpecificInputFlags, - &throttleProcessingThreadOnOverload, - &inputDeviceCount ); - if( result != paNoError ) return result; + &throttleProcessingThreadOnOverload, + &inputDeviceCount ); + if( result != paNoError ) return result; - inputDevices = (PaWinMmeDeviceAndChannelCount*)alloca( sizeof(PaWinMmeDeviceAndChannelCount) * inputDeviceCount ); + inputDevices = (PaWinMmeDeviceAndChannelCount*)alloca( sizeof(PaWinMmeDeviceAndChannelCount) * inputDeviceCount ); if( !inputDevices ) return paInsufficientMemory; - result = RetrieveDevicesFromStreamParameters( hostApi, inputParameters, inputStreamInfo, inputDevices, inputDeviceCount ); - if( result != paNoError ) return result; + result = RetrieveDevicesFromStreamParameters( hostApi, inputParameters, inputStreamInfo, inputDevices, inputDeviceCount ); + if( result != paNoError ) return result; - result = ValidateInputChannelCounts( hostApi, inputDevices, inputDeviceCount ); - if( result != paNoError ) return result; + result = ValidateInputChannelCounts( hostApi, inputDevices, inputDeviceCount ); + if( result != paNoError ) return result; hostInputSampleFormat = PaUtil_SelectClosestAvailableFormat( paInt16 /* native formats */, inputSampleFormat ); @@ -2373,7 +2373,7 @@ static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi, else inputChannelMask = PaWin_DefaultChannelMask( inputDevices[0].channelCount ); } - } + } else { inputChannelCount = 0; @@ -2392,22 +2392,22 @@ static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi, outputDeviceCount = 1; - /* validate output hostApiSpecificStreamInfo */ + /* validate output hostApiSpecificStreamInfo */ outputStreamInfo = (PaWinMmeStreamInfo*)outputParameters->hostApiSpecificStreamInfo; - result = ValidateWinMmeSpecificStreamInfo( outputParameters, outputStreamInfo, + result = ValidateWinMmeSpecificStreamInfo( outputParameters, outputStreamInfo, &winMmeSpecificOutputFlags, - &throttleProcessingThreadOnOverload, - &outputDeviceCount ); - if( result != paNoError ) return result; + &throttleProcessingThreadOnOverload, + &outputDeviceCount ); + if( result != paNoError ) return result; - outputDevices = (PaWinMmeDeviceAndChannelCount*)alloca( sizeof(PaWinMmeDeviceAndChannelCount) * outputDeviceCount ); + outputDevices = (PaWinMmeDeviceAndChannelCount*)alloca( sizeof(PaWinMmeDeviceAndChannelCount) * outputDeviceCount ); if( !outputDevices ) return paInsufficientMemory; - result = RetrieveDevicesFromStreamParameters( hostApi, outputParameters, outputStreamInfo, outputDevices, outputDeviceCount ); - if( result != paNoError ) return result; + result = RetrieveDevicesFromStreamParameters( hostApi, outputParameters, outputStreamInfo, outputDevices, outputDeviceCount ); + if( result != paNoError ) return result; - result = ValidateOutputChannelCounts( hostApi, outputDevices, outputDeviceCount ); - if( result != paNoError ) return result; + result = ValidateOutputChannelCounts( hostApi, outputDevices, outputDeviceCount ); + if( result != paNoError ) return result; hostOutputSampleFormat = PaUtil_SelectClosestAvailableFormat( paInt16 /* native formats */, outputSampleFormat ); @@ -3235,9 +3235,9 @@ static PaError StartStream( PaStream *s ) MMRESULT mmresult; unsigned int i, j; int callbackResult; - unsigned int channel; - unsigned long framesProcessed; - PaStreamCallbackTimeInfo timeInfo = {0,0,0}; /** @todo implement this for stream priming */ + unsigned int channel; + unsigned long framesProcessed; + PaStreamCallbackTimeInfo timeInfo = {0,0,0}; /** @todo implement this for stream priming */ PaUtil_ResetBufferProcessor( &stream->bufferProcessor );