From 6e9cbdc10448203e7c8b2de41447442fcc9f7bae Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 13 May 2009 02:58:57 +0000 Subject: whitespace cosmetics: Remove all trailing whitespace. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libaf/af.c | 86 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'libaf/af.c') diff --git a/libaf/af.c b/libaf/af.c index 987b7e548f..86b00a3e09 100644 --- a/libaf/af.c +++ b/libaf/af.c @@ -51,7 +51,7 @@ extern af_info_t af_info_scaletempo; extern af_info_t af_info_stats; extern af_info_t af_info_bs2b; -static af_info_t* filter_list[]={ +static af_info_t* filter_list[]={ &af_info_dummy, &af_info_delay, &af_info_channels, @@ -88,7 +88,7 @@ static af_info_t* filter_list[]={ #ifdef CONFIG_LIBBS2B &af_info_bs2b, #endif - NULL + NULL }; // CPU speed @@ -106,13 +106,13 @@ static af_info_t* af_find(char*name) } mp_msg(MSGT_AFILTER, MSGL_ERR, "Couldn't find audio filter '%s'\n",name); return NULL; -} +} /* Find filter in the dynamic filter list using it's name This function is used for finding already initialized filters */ af_instance_t* af_get(af_stream_t* s, char* name) { - af_instance_t* af=s->first; + af_instance_t* af=s->first; // Find the filter while(af != NULL){ if(!strcmp(af->info->name,name)) @@ -134,7 +134,7 @@ static af_instance_t* af_create(af_stream_t* s, const char* name_with_cmd) if (!name || !new) { mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Could not allocate memory\n"); goto err_out; - } + } memset(new,0,sizeof(af_instance_t)); // Check for commandline parameters @@ -148,29 +148,29 @@ static af_instance_t* af_create(af_stream_t* s, const char* name_with_cmd) non-reentrant */ if(new->info->flags & AF_FLAGS_NOT_REENTRANT){ if(af_get(s,name)){ - mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] There can only be one instance of" - " the filter '%s' in each stream\n",name); + mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] There can only be one instance of" + " the filter '%s' in each stream\n",name); goto err_out; } } - + mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Adding filter %s \n",name); - + // Initialize the new filter - if(AF_OK == new->info->open(new) && + if(AF_OK == new->info->open(new) && AF_ERROR < new->control(new,AF_CONTROL_POST_CREATE,&s->cfg)){ if(cmdline){ if(AF_ERROR>=new->control(new,AF_CONTROL_COMMAND_LINE,cmdline)) goto err_out; } free(name); - return new; + return new; } - + err_out: free(new); mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Couldn't create or open audio filter '%s'\n", - name); + name); free(name); return NULL; } @@ -228,8 +228,8 @@ void af_remove(af_stream_t* s, af_instance_t* af) { if(!af) return; - // Print friendly message - mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Removing filter %s \n",af->info->name); + // Print friendly message + mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Removing filter %s \n",af->info->name); // Notify filter before changing anything af->control(af,AF_CONTROL_PRE_DESTROY,0); @@ -244,7 +244,7 @@ void af_remove(af_stream_t* s, af_instance_t* af) else s->last=af->prev; - // Uninitialize af and free memory + // Uninitialize af and free memory af->uninit(af); free(af); } @@ -260,21 +260,21 @@ static int af_reinit(af_stream_t* s, af_instance_t* af) // Check if there are any filters left in the list if(NULL == af){ - if(!(af=af_append(s,s->first,"dummy"))) - return AF_UNKNOWN; + if(!(af=af_append(s,s->first,"dummy"))) + return AF_UNKNOWN; else return AF_ERROR; } - // Check if this is the first filter - if(!af->prev) + // Check if this is the first filter + if(!af->prev) memcpy(&in,&(s->input),sizeof(af_data_t)); else memcpy(&in,af->prev->data,sizeof(af_data_t)); // Reset just in case... in.audio=NULL; in.len=0; - + rv = af->control(af,AF_CONTROL_REINIT,&in); switch(rv){ case AF_OK: @@ -293,7 +293,7 @@ static int af_reinit(af_stream_t* s, af_instance_t* af) if(AF_OK != (rv = new->control(new,AF_CONTROL_CHANNELS,&in.nch))) return rv; // Initialize channels filter - if(!new->prev) + if(!new->prev) memcpy(&in,&(s->input),sizeof(af_data_t)); else memcpy(&in,new->prev->data,sizeof(af_data_t)); @@ -310,7 +310,7 @@ static int af_reinit(af_stream_t* s, af_instance_t* af) if(AF_OK != (rv = new->control(new,AF_CONTROL_FORMAT_FMT,&in.format))) return rv; // Initialize format filter - if(!new->prev) + if(!new->prev) memcpy(&in,&(s->input),sizeof(af_data_t)); else memcpy(&in,new->prev->data,sizeof(af_data_t)); @@ -318,7 +318,7 @@ static int af_reinit(af_stream_t* s, af_instance_t* af) return rv; } if(!new){ // Should _never_ happen - mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Unable to correct audio format. " + mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Unable to correct audio format. " "This error should never uccur, please send bugreport.\n"); return AF_ERROR; } @@ -344,7 +344,7 @@ static int af_reinit(af_stream_t* s, af_instance_t* af) break; } default: - mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Reinitialization did not work, audio" + mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Reinitialization did not work, audio" " filter '%s' returned error code %i\n",af->info->name,rv); return AF_ERROR; } @@ -387,8 +387,8 @@ int af_init(af_stream_t* s) if(!s->first){ // Add all filters in the list (if there are any) if(!s->cfg.list){ // To make automatic format conversion work - if(!af_append(s,s->first,"dummy")) - return -1; + if(!af_append(s,s->first,"dummy")) + return -1; } else{ while(s->cfg.list[i]){ @@ -398,7 +398,7 @@ int af_init(af_stream_t* s) } } - // Init filters + // Init filters if(AF_OK != af_reinit(s,s->first)) return -1; @@ -426,7 +426,7 @@ int af_init(af_stream_t* s) af = af_append(s,s->first,resampler); else af = af_prepend(s,s->first,resampler); - } + } else{ if(!strcmp(s->last->info->name,"format")) af = af_prepend(s,s->last,resampler); @@ -452,8 +452,8 @@ int af_init(af_stream_t* s) } if(AF_OK != af_reinit(s,af)) return -1; - } - + } + // Check number of output channels fix if not OK // If needed always inserted last -> easy to screw up other filters if(s->output.nch && s->last->data->nch!=s->output.nch){ @@ -467,7 +467,7 @@ int af_init(af_stream_t* s) if(AF_OK != af_reinit(s,af)) return -1; } - + // Check output format fix if not OK if(s->output.format != AF_FORMAT_UNKNOWN && s->last->data->format != s->output.format){ @@ -491,11 +491,11 @@ int af_init(af_stream_t* s) s->output.format = s->last->data->format; if (!s->output.nch) s->output.nch = s->last->data->nch; if (!s->output.rate) s->output.rate = s->last->data->rate; - if((s->last->data->format != s->output.format) || - (s->last->data->nch != s->output.nch) || + if((s->last->data->format != s->output.format) || + (s->last->data->nch != s->output.nch) || (s->last->data->rate != s->output.rate)) { - // Something is stuffed audio out will not work - mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Unable to setup filter system can not" + // Something is stuffed audio out will not work + mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Unable to setup filter system can not" " meet sound-card demands, please send bugreport. \n"); af_uninit(s); return -1; @@ -532,8 +532,8 @@ af_instance_t* af_add(af_stream_t* s, char* name){ // Filter data chunk through the filters in the list af_data_t* af_play(af_stream_t* s, af_data_t* data) { - af_instance_t* af=s->first; - // Iterate through all filters + af_instance_t* af=s->first; + // Iterate through all filters do{ if (data->len <= 0) break; data=af->play(af,data); @@ -555,7 +555,7 @@ int af_lencalc(double mul, af_data_t* d) // Calculate average ratio of filter output size to input size double af_calc_filter_multiplier(af_stream_t* s) { - af_instance_t* af=s->first; + af_instance_t* af=s->first; double mul = 1; // Iterate through all filters and calculate total multiplication factor do{ @@ -569,9 +569,9 @@ double af_calc_filter_multiplier(af_stream_t* s) /* Calculate the total delay [bytes output] caused by the filters */ double af_calc_delay(af_stream_t* s) { - af_instance_t* af=s->first; + af_instance_t* af=s->first; register double delay = 0.0; - // Iterate through all filters + // Iterate through all filters while(af){ delay += af->delay; delay *= af->mul; @@ -586,10 +586,10 @@ int af_resize_local_buffer(af_instance_t* af, af_data_t* data) { // Calculate new length register int len = af_lencalc(af->mul,data); - mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Reallocating memory in module %s, " + mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Reallocating memory in module %s, " "old len = %i, new len = %i\n",af->info->name,af->data->len,len); // If there is a buffer free it - if(af->data->audio) + if(af->data->audio) free(af->data->audio); // Create new buffer and check that it is OK af->data->audio = malloc(len); -- cgit v1.2.3