From: Marcus Tomlinson Date: Sat, 22 Apr 2017 17:30:28 +0000 (+0200) Subject: –Fix formatting X-Git-Tag: 5.0.0~24^2~3 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=1a1b19da942ce4b4332d2603136858313be68279;p=rtaudio.git –Fix formatting --- diff --git a/RtAudio.cpp b/RtAudio.cpp index a5439a2..41b6b6a 100644 --- a/RtAudio.cpp +++ b/RtAudio.cpp @@ -3887,24 +3887,24 @@ void convertBufferWasapi( char* outBuffer, switch ( format ) { - case RTAUDIO_SINT8: - memcpy( &( ( char* ) outBuffer )[ outSample * channelCount ], &( ( char* ) inBuffer )[ inSample * channelCount ], channelCount * sizeof( char ) ); - break; - case RTAUDIO_SINT16: - memcpy( &( ( short* ) outBuffer )[ outSample * channelCount ], &( ( short* ) inBuffer )[ inSample * channelCount ], channelCount * sizeof( short ) ); - break; - case RTAUDIO_SINT24: - memcpy( &( ( S24* ) outBuffer )[ outSample * channelCount ], &( ( S24* ) inBuffer )[ inSample * channelCount ], channelCount * sizeof( S24 ) ); - break; - case RTAUDIO_SINT32: - memcpy( &( ( int* ) outBuffer )[ outSample * channelCount ], &( ( int* ) inBuffer )[ inSample * channelCount ], channelCount * sizeof( int ) ); - break; - case RTAUDIO_FLOAT32: - memcpy( &( ( float* ) outBuffer )[ outSample * channelCount ], &( ( float* ) inBuffer )[ inSample * channelCount ], channelCount * sizeof( float ) ); - break; - case RTAUDIO_FLOAT64: - memcpy( &( ( double* ) outBuffer )[ outSample * channelCount ], &( ( double* ) inBuffer )[ inSample * channelCount ], channelCount * sizeof( double ) ); - break; + case RTAUDIO_SINT8: + memcpy( &( ( char* ) outBuffer )[ outSample * channelCount ], &( ( char* ) inBuffer )[ inSample * channelCount ], channelCount * sizeof( char ) ); + break; + case RTAUDIO_SINT16: + memcpy( &( ( short* ) outBuffer )[ outSample * channelCount ], &( ( short* ) inBuffer )[ inSample * channelCount ], channelCount * sizeof( short ) ); + break; + case RTAUDIO_SINT24: + memcpy( &( ( S24* ) outBuffer )[ outSample * channelCount ], &( ( S24* ) inBuffer )[ inSample * channelCount ], channelCount * sizeof( S24 ) ); + break; + case RTAUDIO_SINT32: + memcpy( &( ( int* ) outBuffer )[ outSample * channelCount ], &( ( int* ) inBuffer )[ inSample * channelCount ], channelCount * sizeof( int ) ); + break; + case RTAUDIO_FLOAT32: + memcpy( &( ( float* ) outBuffer )[ outSample * channelCount ], &( ( float* ) inBuffer )[ inSample * channelCount ], channelCount * sizeof( float ) ); + break; + case RTAUDIO_FLOAT64: + memcpy( &( ( double* ) outBuffer )[ outSample * channelCount ], &( ( double* ) inBuffer )[ inSample * channelCount ], channelCount * sizeof( double ) ); + break; } // jump to next in sample @@ -3920,72 +3920,72 @@ void convertBufferWasapi( char* outBuffer, switch ( format ) { - case RTAUDIO_SINT8: - { - for ( unsigned int channel = 0; channel < channelCount; channel++ ) + case RTAUDIO_SINT8: { - char fromSample = ( ( char* ) inBuffer )[ ( inSample * channelCount ) + channel ]; - char toSample = ( ( char* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ]; - float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) ); - ( ( char* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + ( char ) sampleDiff; + for ( unsigned int channel = 0; channel < channelCount; channel++ ) + { + char fromSample = ( ( char* ) inBuffer )[ ( inSample * channelCount ) + channel ]; + char toSample = ( ( char* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ]; + float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) ); + ( ( char* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + ( char ) sampleDiff; + } + break; } - break; - } - case RTAUDIO_SINT16: - { - for ( unsigned int channel = 0; channel < channelCount; channel++ ) + case RTAUDIO_SINT16: { - short fromSample = ( ( short* ) inBuffer )[ ( inSample * channelCount ) + channel ]; - short toSample = ( ( short* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ]; - float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) ); - ( ( short* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + ( short ) sampleDiff; + for ( unsigned int channel = 0; channel < channelCount; channel++ ) + { + short fromSample = ( ( short* ) inBuffer )[ ( inSample * channelCount ) + channel ]; + short toSample = ( ( short* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ]; + float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) ); + ( ( short* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + ( short ) sampleDiff; + } + break; } - break; - } - case RTAUDIO_SINT24: - { - for ( unsigned int channel = 0; channel < channelCount; channel++ ) + case RTAUDIO_SINT24: { - int fromSample = ( ( S24* ) inBuffer )[ ( inSample * channelCount ) + channel ].asInt(); - int toSample = ( ( S24* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ].asInt(); - float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) ); - ( ( S24* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + ( int ) sampleDiff; + for ( unsigned int channel = 0; channel < channelCount; channel++ ) + { + int fromSample = ( ( S24* ) inBuffer )[ ( inSample * channelCount ) + channel ].asInt(); + int toSample = ( ( S24* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ].asInt(); + float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) ); + ( ( S24* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + ( int ) sampleDiff; + } + break; } - break; - } - case RTAUDIO_SINT32: - { - for ( unsigned int channel = 0; channel < channelCount; channel++ ) + case RTAUDIO_SINT32: { - int fromSample = ( ( int* ) inBuffer )[ ( inSample * channelCount ) + channel ]; - int toSample = ( ( int* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ]; - float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) ); - ( ( int* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + ( int ) sampleDiff; + for ( unsigned int channel = 0; channel < channelCount; channel++ ) + { + int fromSample = ( ( int* ) inBuffer )[ ( inSample * channelCount ) + channel ]; + int toSample = ( ( int* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ]; + float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) ); + ( ( int* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + ( int ) sampleDiff; + } + break; } - break; - } - case RTAUDIO_FLOAT32: - { - for ( unsigned int channel = 0; channel < channelCount; channel++ ) + case RTAUDIO_FLOAT32: { - float fromSample = ( ( float* ) inBuffer )[ ( inSample * channelCount ) + channel ]; - float toSample = ( ( float* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ]; - float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) ); - ( ( float* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + sampleDiff; + for ( unsigned int channel = 0; channel < channelCount; channel++ ) + { + float fromSample = ( ( float* ) inBuffer )[ ( inSample * channelCount ) + channel ]; + float toSample = ( ( float* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ]; + float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) ); + ( ( float* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + sampleDiff; + } + break; } - break; - } - case RTAUDIO_FLOAT64: - { - for ( unsigned int channel = 0; channel < channelCount; channel++ ) + case RTAUDIO_FLOAT64: { - double fromSample = ( ( double* ) inBuffer )[ ( inSample * channelCount ) + channel ]; - double toSample = ( ( double* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ]; - double sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) ); - ( ( double* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + sampleDiff; + for ( unsigned int channel = 0; channel < channelCount; channel++ ) + { + double fromSample = ( ( double* ) inBuffer )[ ( inSample * channelCount ) + channel ]; + double toSample = ( ( double* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ]; + double sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) ); + ( ( double* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + sampleDiff; + } + break; } - break; - } } // jump to next in sample