Mac: remove trailing spaces

modules/access/qtcapture.m

@@ -111,7 +111,7 @@ vlc_module_end ()
         imageBufferToRelease = currentImageBuffer;
         currentImageBuffer = videoFrame;
         currentPts = (mtime_t)(1000000L / [sampleBuffer presentationTime].timeScale * [sampleBuffer presentationTime].timeValue);
-        
+
         /* Try to use hosttime of the sample if available, because iSight Pts seems broken */
         NSNumber *hosttime = (NSNumber *)[sampleBuffer attributeForKey:QTSampleBufferHostTimeAttribute];
         if( hosttime ) currentPts = (mtime_t)AudioConvertHostTimeToNanos([hosttime unsignedLongLongValue])/1000;
@@ -200,7 +200,7 @@ static int Open( vlc_object_t *p_this )
     /* Only when selected */
     if( *p_demux->psz_access == '\0' )
         return VLC_EGENERIC;
-    
+
     NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
 
     /* Set up p_demux */
@@ -209,13 +209,13 @@ static int Open( vlc_object_t *p_this )
     p_demux->info.i_update = 0;
     p_demux->info.i_title = 0;
     p_demux->info.i_seekpoint = 0;
-    
+
     p_demux->p_sys = p_sys = calloc( 1, sizeof( demux_sys_t ) );
     if( !p_sys )
         return VLC_ENOMEM;
-    
-    memset( &fmt, 0, sizeof( es_format_t ) );    
-    
+
+    memset( &fmt, 0, sizeof( es_format_t ) );
+
     QTCaptureDeviceInput * input = nil;
     NSError *o_returnedError;
 
@@ -226,7 +226,7 @@ static int Open( vlc_object_t *p_this )
                         _("Your Mac does not seem to be equipped with a suitable input device. "
                           "Please check your connectors and drivers.") );
         msg_Err( p_demux, "Can't find any Video device" );
-        
+
         goto error;
     }
 
@@ -291,7 +291,7 @@ static int Open( vlc_object_t *p_this )
     NSLog( @"encoded_size %d %d", (int)encoded_size.width, (int)encoded_size.height );
     NSLog( @"display_size %d %d", (int)display_size.width, (int)display_size.height );
     NSLog( @"PAR size %d %d", (int)par_size.width, (int)par_size.height );
-    
+
     [p_sys->output setPixelBufferAttributes: [NSDictionary dictionaryWithObjectsAndKeys:
         [NSNumber numberWithInt: p_sys->height], kCVPixelBufferHeightKey,
         [NSNumber numberWithInt: p_sys->width], kCVPixelBufferWidthKey,

modules/audio_output/auhal.c

@@ -38,7 +38,7 @@
 
 #include <CoreAudio/CoreAudio.h>
 #include <AudioUnit/AudioUnit.h>
-#include <AudioToolbox/AudioFormat.h> 
+#include <AudioToolbox/AudioFormat.h>
 #include <AudioUnit/AudioComponent.h>
 
 #include <CoreServices/CoreServices.h>
@@ -164,7 +164,7 @@ static int Open( vlc_object_t * p_this )
 
     /* Use int here, to match kAudioDevicePropertyDeviceIsAlive
      * property size */
-    int                     b_alive = false; 
+    int                     b_alive = false;
 
     /* Allocate structure */
     p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) );
@@ -190,9 +190,9 @@ static int Open( vlc_object_t * p_this )
     memset( p_sys->p_remainder_buffer, 0, sizeof(uint8_t) * BUFSIZE );
 
     p_aout->output.pf_play = Play;
- 
+
     aout_FormatPrint( p_aout, "VLC is looking for:", (audio_sample_format_t *)&p_aout->output.output );
- 
+
     /* Persistent device variable */
     if( var_Type( p_aout->p_libvlc, "macosx-audio-device" ) == 0 )
     {
@@ -311,7 +311,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
         msg_Warn( p_aout, "we cannot open our HAL component" );
         return false;
     }
- 
+
     /* Set the device we will use for this output unit */
     err = AudioUnitSetProperty( p_sys->au_unit,
                          kAudioOutputUnitProperty_CurrentDevice,
@@ -319,13 +319,13 @@ static int OpenAnalog( aout_instance_t *p_aout )
                          0,
                          &p_sys->i_selected_dev,
                          sizeof( AudioDeviceID ));
- 
+
     if( err != noErr )
     {
         msg_Warn( p_aout, "we cannot select the audio device" );
         return false;
     }
- 
+
     /* Get the current format */
     i_param_size = sizeof(AudioStreamBasicDescription);
 
@@ -335,7 +335,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
                                    0,
                                    &DeviceFormat,
                                    &i_param_size );
- 
+
     if( err != noErr ) return false;
     else msg_Dbg( p_aout, STREAM_FORMAT_MSG( "current format is: ", DeviceFormat ) );
 
@@ -357,7 +357,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
                                        0,
                                        layout,
                                        &i_param_size ));
- 
+
         /* We need to "fill out" the ChannelLayout, because there are multiple ways that it can be set */
         if( layout->mChannelLayoutTag == kAudioChannelLayoutTag_UseChannelBitmap)
         {
@@ -377,11 +377,11 @@ static int OpenAnalog( aout_instance_t *p_aout )
         }
 
         msg_Dbg( p_aout, "layout of AUHAL has %d channels" , (int)layout->mNumberChannelDescriptions );
- 
+
         /* Initialize the VLC core channel count */
         p_aout->output.output.i_physical_channels = 0;
         i_original = p_aout->output.output.i_original_channels & AOUT_CHAN_PHYSMASK;
- 
+
         if( i_original == AOUT_CHAN_CENTER || layout->mNumberChannelDescriptions < 2 )
         {
             /* We only need Mono or cannot output more than 1 channel */
@@ -525,7 +525,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
     DeviceFormat.mFormatFlags = kAudioFormatFlagsNativeFloatPacked;
     DeviceFormat.mBitsPerChannel = 32;
     DeviceFormat.mChannelsPerFrame = aout_FormatNbChannels( &p_aout->output.output );
- 
+
     /* Calculate framesizes and stuff */
     DeviceFormat.mFramesPerPacket = 1;
     DeviceFormat.mBytesPerFrame = DeviceFormat.mBitsPerChannel * DeviceFormat.mChannelsPerFrame / 8;
@@ -539,9 +539,9 @@ static int OpenAnalog( aout_instance_t *p_aout )
                                    0,
                                    &DeviceFormat,
                                    i_param_size ));
- 
+
     msg_Dbg( p_aout, STREAM_FORMAT_MSG( "we set the AU format: " , DeviceFormat ) );
- 
+
     /* Retrieve actual format */
     verify_noerr( AudioUnitGetProperty( p_sys->au_unit,
                                    kAudioUnitProperty_StreamFormat,
@@ -549,7 +549,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
                                    0,
                                    &DeviceFormat,
                                    &i_param_size ));
- 
+
     msg_Dbg( p_aout, STREAM_FORMAT_MSG( "the actual set AU format is " , DeviceFormat ) );
 
     /* Do the last VLC aout setups */
@@ -560,7 +560,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
     /* set the IOproc callback */
     input.inputProc = (AURenderCallback) RenderCallbackAnalog;
     input.inputProcRefCon = p_aout;
- 
+
     verify_noerr( AudioUnitSetProperty( p_sys->au_unit,
                             kAudioUnitProperty_SetRenderCallback,
                             kAudioUnitScope_Input,
@@ -568,16 +568,16 @@ static int OpenAnalog( aout_instance_t *p_aout )
 
     input.inputProc = (AURenderCallback) RenderCallbackAnalog;
     input.inputProcRefCon = p_aout;
- 
+
     /* Set the new_layout as the layout VLC will use to feed the AU unit */
     verify_noerr( AudioUnitSetProperty( p_sys->au_unit,
                             kAudioUnitProperty_AudioChannelLayout,
                             kAudioUnitScope_Input,
                             0, &new_layout, sizeof(new_layout) ) );
- 
+
     if( new_layout.mNumberChannelDescriptions > 0 )
         free( new_layout.mChannelDescriptions );
- 
+
     /* AU initiliaze */
     verify_noerr( AudioUnitInitialize(p_sys->au_unit) );
 
@@ -588,7 +588,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
 
     /* Start the AU */
     verify_noerr( AudioOutputUnitStart(p_sys->au_unit) );
- 
+
     return true;
 }
 
@@ -610,10 +610,10 @@ static int OpenSPDIF( aout_instance_t * p_aout )
     /* Hog the device */
     i_param_size = sizeof( p_sys->i_hog_pid );
     p_sys->i_hog_pid = getpid() ;
- 
+
     err = AudioDeviceSetProperty( p_sys->i_selected_dev, 0, 0, FALSE,
                                   kAudioDevicePropertyHogMode, i_param_size, &p_sys->i_hog_pid );
- 
+
     if( err != noErr )
     {
         msg_Err( p_aout, "failed to set hogmode: [%4.4s]", (char *)&err );
@@ -626,7 +626,7 @@ static int OpenSPDIF( aout_instance_t * p_aout )
 
     err = AudioDeviceGetProperty( p_sys->i_selected_dev, 0, FALSE, kAudioDevicePropertySupportsMixing,
                                     &i_param_size, &b_mix );
- 
+
     if( !err && b_writeable )
     {
         b_mix = 0;
@@ -634,7 +634,7 @@ static int OpenSPDIF( aout_instance_t * p_aout )
                             kAudioDevicePropertySupportsMixing, i_param_size, &b_mix );
         p_sys->b_changed_mixing = true;
     }
- 
+
     if( err != noErr )
     {
         msg_Err( p_aout, "failed to set mixmode: [%4.4s]", (char *)&err );
@@ -650,16 +650,16 @@ static int OpenSPDIF( aout_instance_t * p_aout )
         msg_Err( p_aout, "could not get number of streams: [%4.4s]", (char *)&err );
         return false;
     }
- 
+
     i_streams = i_param_size / sizeof( AudioStreamID );
     p_streams = (AudioStreamID *)malloc( i_param_size );
     if( p_streams == NULL )
         return false;
- 
+
     err = AudioDeviceGetProperty( p_sys->i_selected_dev, 0, FALSE,
                                     kAudioDevicePropertyStreams,
                                     &i_param_size, p_streams );
- 
+
     if( err != noErr )
     {
         msg_Err( p_aout, "could not get number of streams: [%4.4s]", (char *)&err );
@@ -673,7 +673,7 @@ static int OpenSPDIF( aout_instance_t * p_aout )
         AudioStreamBasicDescription *p_format_list = NULL;
         int                         i_formats = 0, j = 0;
         bool                  b_digital = false;
- 
+
         /* Retrieve all the stream formats supported by each output stream */
         err = AudioStreamGetPropertyInfo( p_streams[i], 0,
                                           kAudioStreamPropertyPhysicalFormats,
@@ -683,12 +683,12 @@ static int OpenSPDIF( aout_instance_t * p_aout )
             msg_Err( p_aout, "could not get number of streamformats: [%4.4s]", (char *)&err );
             continue;
         }
- 
+
         i_formats = i_param_size / sizeof( AudioStreamBasicDescription );
         p_format_list = (AudioStreamBasicDescription *)malloc( i_param_size );
         if( p_format_list == NULL )
             continue;
- 
+
         err = AudioStreamGetProperty( p_streams[i], 0,
                                           kAudioStreamPropertyPhysicalFormats,
                                           &i_param_size, p_format_list );
@@ -709,7 +709,7 @@ static int OpenSPDIF( aout_instance_t * p_aout )
                 break;
             }
         }
- 
+
         if( b_digital )
         {
             /* if this stream supports a digital (cac3) format, then go set it. */
@@ -756,9 +756,9 @@ static int OpenSPDIF( aout_instance_t * p_aout )
                             i_backup_rate_format = j;
                     }
                 }
- 
+
             }
- 
+
             if( i_requested_rate_format >= 0 ) /* We prefer to output at the samplerate of the original audio */
                 p_sys->stream_format = p_format_list[i_requested_rate_format];
             else if( i_current_rate_format >= 0 ) /* If not possible, we will try to use the current samplerate of the device */
@@ -801,7 +801,7 @@ static int OpenSPDIF( aout_instance_t * p_aout )
     p_sys->clock_diff = - (mtime_t)
         AudioConvertHostTimeToNanos( AudioGetCurrentHostTime() ) / 1000;
     p_sys->clock_diff += mdate();
- 
+
     /* Start device */
     err = AudioDeviceStart( p_sys->i_selected_dev, p_sys->i_procID );
     if( err != noErr )
@@ -830,14 +830,14 @@ static void Close( vlc_object_t * p_this )
     struct aout_sys_t   *p_sys = p_aout->output.p_sys;
     OSStatus            err = noErr;
     UInt32              i_param_size = 0;
- 
+
     if( p_sys->au_unit )
     {
         verify_noerr( AudioOutputUnitStop( p_sys->au_unit ) );
         verify_noerr( AudioUnitUninitialize( p_sys->au_unit ) );
         verify_noerr( CloseComponent( p_sys->au_unit ) );
     }
- 
+
     if( p_sys->b_digital )
     {
         /* Stop device */
@@ -855,7 +855,7 @@ static void Close( vlc_object_t * p_this )
         {
             msg_Err( p_aout, "AudioDeviceDestroyIOProcID failed: [%4.4s]", (char *)&err );
         }
- 
+
         if( p_sys->b_revert )
         {
             AudioStreamChangeFormat( p_aout, p_sys->i_stream_id, p_sys->sfmt_revert );
@@ -871,7 +871,7 @@ static void Close( vlc_object_t * p_this )
 
             err = AudioDeviceGetProperty( p_sys->i_selected_dev, 0, FALSE, kAudioDevicePropertySupportsMixing,
                                         &i_param_size, &b_mix );
- 
+
             if( !err && b_writeable )
             {
                 msg_Dbg( p_aout, "mixable is: %d", b_mix );
@@ -889,12 +889,12 @@ static void Close( vlc_object_t * p_this )
 
     err = AudioHardwareRemovePropertyListener( kAudioHardwarePropertyDevices,
                                                HardwareListener );
- 
+
     if( err != noErr )
     {
         msg_Err( p_aout, "AudioHardwareRemovePropertyListener failed: [%4.4s]", (char *)&err );
     }
- 
+
     if( p_sys->i_hog_pid == getpid() )
     {
         p_sys->i_hog_pid = -1;
@@ -903,7 +903,7 @@ static void Close( vlc_object_t * p_this )
                                          kAudioDevicePropertyHogMode, i_param_size, &p_sys->i_hog_pid );
         if( err != noErr ) msg_Err( p_aout, "Could not release hogmode: [%4.4s]", (char *)&err );
     }
- 
+
     free( p_sys );
 }
 
@@ -972,11 +972,11 @@ static void Probe( aout_instance_t * p_aout )
         goto error;
     }
     p_sys->i_default_dev = devid_def;
- 
+
     var_Create( p_aout, "audio-device", VLC_VAR_INTEGER|VLC_VAR_HASCHOICE );
     text.psz_string = (char*)_("Audio Device");
     var_Change( p_aout, "audio-device", VLC_VAR_SETTEXT, &text, NULL );
- 
+
     for( i = 0; i < p_sys->i_devices; i++ )
     {
         char *psz_name;
@@ -1035,10 +1035,10 @@ static void Probe( aout_instance_t * p_aout )
                 }
             }
         }
- 
+
         free( psz_name);
     }
- 
+
     /* If a device is already "preselected", then use this device */
     var_Get( p_aout->p_libvlc, "macosx-audio-device", &val );
     if( val.i_int > 0 )
@@ -1046,7 +1046,7 @@ static void Probe( aout_instance_t * p_aout )
         var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL );
         var_Set( p_aout, "audio-device", val );
     }
- 
+
     /* If we change the device we want to use, we should renegotiate the audio chain */
     var_AddCallback( p_aout, "audio-device", AudioDeviceCallback, NULL );
 
@@ -1073,10 +1073,10 @@ static int AudioDeviceHasOutput( AudioDeviceID i_dev_id )
 {
     UInt32            dataSize;
     Boolean            isWritable;
-    
+
     verify_noerr( AudioDeviceGetPropertyInfo( i_dev_id, 0, FALSE, kAudioDevicePropertyStreams, &dataSize, &isWritable) );
     if (dataSize == 0) return FALSE;
- 
+
     return TRUE;
 }
 
@@ -1090,7 +1090,7 @@ static int AudioDeviceSupportsDigital( aout_instance_t *p_aout, AudioDeviceID i_
     AudioStreamID               *p_streams = NULL;
     int                         i = 0, i_streams = 0;
     bool                  b_return = false;
- 
+
     /* Retrieve all the output streams */
     err = AudioDeviceGetPropertyInfo( i_dev_id, 0, FALSE,
                                       kAudioDevicePropertyStreams,
@@ -1100,16 +1100,16 @@ static int AudioDeviceSupportsDigital( aout_instance_t *p_aout, AudioDeviceID i_
         msg_Err( p_aout, "could not get number of streams: [%4.4s]", (char *)&err );
         return false;
     }
- 
+
     i_streams = i_param_size / sizeof( AudioStreamID );
     p_streams = (AudioStreamID *)malloc( i_param_size );
     if( p_streams == NULL )
         return VLC_ENOMEM;
- 
+
     err = AudioDeviceGetProperty( i_dev_id, 0, FALSE,
                                     kAudioDevicePropertyStreams,
                                     &i_param_size, p_streams );
- 
+
     if( err != noErr )
     {
         msg_Err( p_aout, "could not get number of streams: [%4.4s]", (char *)&err );
@@ -1121,7 +1121,7 @@ static int AudioDeviceSupportsDigital( aout_instance_t *p_aout, AudioDeviceID i_
         if( AudioStreamSupportsDigital( p_aout, p_streams[i] ) )
             b_return = true;
     }
- 
+
     free( p_streams );
     return b_return;
 }
@@ -1136,7 +1136,7 @@ static int AudioStreamSupportsDigital( aout_instance_t *p_aout, AudioStreamID i_
     AudioStreamBasicDescription *p_format_list = NULL;
     int                         i = 0, i_formats = 0;
     bool                  b_return = false;
- 
+
     /* Retrieve all the stream formats supported by each output stream */
     err = AudioStreamGetPropertyInfo( i_stream_id, 0,
                                       kAudioStreamPropertyPhysicalFormats,
@@ -1146,12 +1146,12 @@ static int AudioStreamSupportsDigital( aout_instance_t *p_aout, AudioStreamID i_
         msg_Err( p_aout, "could not get number of streamformats: [%4.4s]", (char *)&err );
         return false;
     }
- 
+
     i_formats = i_param_size / sizeof( AudioStreamBasicDescription );
     p_format_list = (AudioStreamBasicDescription *)malloc( i_param_size );
     if( p_format_list == NULL )
         return false;
- 
+
     err = AudioStreamGetProperty( i_stream_id, 0,
                                       kAudioStreamPropertyPhysicalFormats,
                                       &i_param_size, p_format_list );
@@ -1166,14 +1166,14 @@ static int AudioStreamSupportsDigital( aout_instance_t *p_aout, AudioStreamID i_
     for( i = 0; i < i_formats; i++ )
     {
         msg_Dbg( p_aout, STREAM_FORMAT_MSG( "supported format: ", p_format_list[i] ) );
- 
+
         if( p_format_list[i].mFormatID == 'IAC3' ||
                   p_format_list[i].mFormatID == kAudioFormat60958AC3 )
         {
             b_return = true;
         }
     }
- 
+
     free( p_format_list );
     return b_return;
 }
@@ -1188,7 +1188,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str
     int i;
 
     struct { vlc_mutex_t lock; vlc_cond_t cond; } w;
- 
+
     msg_Dbg( p_aout, STREAM_FORMAT_MSG( "setting stream format: ", change_format ) );
 
     /* Condition because SetProperty is asynchronious */
@@ -1247,7 +1247,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str
         }
         /* We need to check again */
     }
- 
+
     /* Removing the property listener */
     err = AudioStreamRemovePropertyListener( i_stream_id, 0,
                                             kAudioStreamPropertyPhysicalFormat,
@@ -1257,12 +1257,12 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str
         msg_Err( p_aout, "AudioStreamRemovePropertyListener failed: [%4.4s]", (char *)&err );
         return false;
     }
- 
+
     /* Destroy the lock and condition */
     vlc_mutex_unlock( &w.lock );
     vlc_mutex_destroy( &w.lock );
     vlc_cond_destroy( &w.cond );
- 
+
     return true;
 }
 
@@ -1320,11 +1320,11 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout,
         p_sys->i_read_bytes += i_mData_bytes;
         current_date += (mtime_t) ( (mtime_t) 1000000 / p_aout->output.output.i_rate ) *
                         ( i_mData_bytes / 4 / aout_FormatNbChannels( &p_aout->output.output )  ); // 4 is fl32 specific
- 
+
         if( p_sys->i_read_bytes >= p_sys->i_total_bytes )
             p_sys->i_read_bytes = p_sys->i_total_bytes = 0;
     }
- 
+
     while( i_mData_bytes < ioData->mBuffers[0].mDataByteSize )
     {
         /* We don't have enough data yet */
@@ -1334,7 +1334,7 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout,
         if( p_buffer != NULL )
         {
             uint32_t i_second_mData_bytes = __MIN( p_buffer->i_buffer, ioData->mBuffers[0].mDataByteSize - i_mData_bytes );
- 
+
             vlc_memcpy( (uint8_t *)ioData->mBuffers[0].mData + i_mData_bytes,
                         p_buffer->p_buffer, i_second_mData_bytes );
             i_mData_bytes += i_second_mData_bytes;
@@ -1403,7 +1403,7 @@ static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice,
     {
         if( (int)BUFFER.mDataByteSize != (int)p_buffer->i_buffer)
             msg_Warn( p_aout, "bytesize: %d nb_bytes: %d", (int)BUFFER.mDataByteSize, (int)p_buffer->i_buffer );
- 
+
         /* move data into output data buffer */
         vlc_memcpy( BUFFER.mData, p_buffer->p_buffer, p_buffer->i_buffer );
         aout_BufferFree( p_buffer );
@@ -1454,7 +1454,7 @@ static OSStatus StreamListener( AudioStreamID inStream,
 
     VLC_UNUSED(inStream);
     VLC_UNUSED(inChannel);
- 
+
     switch( inPropertyID )
     {
         case kAudioStreamPropertyPhysicalFormat: