Commit afdfd513 authored by Sam Hocevar's avatar Sam Hocevar

* ./plugins/mad/mad_adec.c, ./plugins/mad/mad_libmad.c: use intf_WarnMsg for

    debug messages instead of intf_ErrMsg.
parent 630692cc
...@@ -106,7 +106,7 @@ static int decoder_Run ( decoder_config_t * p_config ) ...@@ -106,7 +106,7 @@ static int decoder_Run ( decoder_config_t * p_config )
{ {
mad_adec_thread_t * p_mad_adec; mad_adec_thread_t * p_mad_adec;
intf_ErrMsg( "mad_adec debug: mad_adec thread launched, initializing" ); intf_WarnMsg( 4, "mad_adec debug: mad_adec thread launched, initializing" );
/* Allocate the memory needed to store the thread's structure */ /* Allocate the memory needed to store the thread's structure */
p_mad_adec = (mad_adec_thread_t *) malloc(sizeof(mad_adec_thread_t)); p_mad_adec = (mad_adec_thread_t *) malloc(sizeof(mad_adec_thread_t));
...@@ -175,17 +175,17 @@ static int InitThread( mad_adec_thread_t * p_mad_adec ) ...@@ -175,17 +175,17 @@ static int InitThread( mad_adec_thread_t * p_mad_adec )
if ( strncmp(psz_downscale,"fast",4)==0 ) if ( strncmp(psz_downscale,"fast",4)==0 )
{ {
p_mad_adec->audio_scaling = FAST_SCALING; p_mad_adec->audio_scaling = FAST_SCALING;
intf_ErrMsg( "mad_adec debug: downscale fast selected" ); intf_WarnMsg( 4, "mad_adec debug: downscale fast selected" );
} }
else if ( strncmp(psz_downscale,"mpg321",7)==0 ) else if ( strncmp(psz_downscale,"mpg321",7)==0 )
{ {
p_mad_adec->audio_scaling = MPG321_SCALING; p_mad_adec->audio_scaling = MPG321_SCALING;
intf_ErrMsg( "mad_adec debug: downscale mpg321 selected" ); intf_WarnMsg( 4, "mad_adec debug: downscale mpg321 selected" );
} }
else else
{ {
p_mad_adec->audio_scaling = FAST_SCALING; p_mad_adec->audio_scaling = FAST_SCALING;
intf_ErrMsg( "mad_adec debug: downscale default fast selected" ); intf_WarnMsg( 4, "mad_adec debug: downscale default fast selected" );
} }
if (psz_downscale) free(psz_downscale); if (psz_downscale) free(psz_downscale);
...@@ -234,7 +234,7 @@ static int InitThread( mad_adec_thread_t * p_mad_adec ) ...@@ -234,7 +234,7 @@ static int InitThread( mad_adec_thread_t * p_mad_adec )
vlc_mutex_unlock( &p_fifo->data_lock ); vlc_mutex_unlock( &p_fifo->data_lock );
p_mad_adec->p_data = p_fifo->p_first->p_first; p_mad_adec->p_data = p_fifo->p_first->p_first;
intf_ErrMsg("mad_adec debug: mad decoder thread %p initialized", p_mad_adec); intf_WarnMsg( 4, "mad_adec debug: mad decoder thread %p initialized", p_mad_adec);
return( 0 ); return( 0 );
} }
...@@ -244,7 +244,7 @@ static int InitThread( mad_adec_thread_t * p_mad_adec ) ...@@ -244,7 +244,7 @@ static int InitThread( mad_adec_thread_t * p_mad_adec )
*****************************************************************************/ *****************************************************************************/
static void EndThread (mad_adec_thread_t * p_mad_adec) static void EndThread (mad_adec_thread_t * p_mad_adec)
{ {
intf_ErrMsg ("mad_adec debug: destroying mad decoder thread %p", p_mad_adec); intf_WarnMsg( 4, "mad_adec debug: destroying mad decoder thread %p", p_mad_adec);
/* If the audio output fifo was created, we destroy it */ /* If the audio output fifo was created, we destroy it */
if (p_mad_adec->p_aout_fifo != NULL) if (p_mad_adec->p_aout_fifo != NULL)
...@@ -264,6 +264,6 @@ static void EndThread (mad_adec_thread_t * p_mad_adec) ...@@ -264,6 +264,6 @@ static void EndThread (mad_adec_thread_t * p_mad_adec)
free( p_mad_adec->libmad_decoder ); free( p_mad_adec->libmad_decoder );
free( p_mad_adec ); free( p_mad_adec );
intf_ErrMsg ("mad_adec debug: mad decoder thread %p destroyed", p_mad_adec); intf_WarnMsg( 4, "mad_adec debug: mad decoder thread %p destroyed", p_mad_adec);
} }
...@@ -302,7 +302,7 @@ enum mad_flow libmad_output(void *data, struct mad_header const *p_libmad_header ...@@ -302,7 +302,7 @@ enum mad_flow libmad_output(void *data, struct mad_header const *p_libmad_header
return( -1 ); return( -1 );
} }
intf_ErrMsg("mad_adec debug: in libmad_output aout fifo created"); intf_WarnMsg( 4, "mad_adec debug: in libmad_output aout fifo created");
} }
if (p_mad_adec->p_aout_fifo->i_rate != p_libmad_pcm->samplerate) if (p_mad_adec->p_aout_fifo->i_rate != p_libmad_pcm->samplerate)
...@@ -375,7 +375,7 @@ enum mad_flow libmad_output(void *data, struct mad_header const *p_libmad_header ...@@ -375,7 +375,7 @@ enum mad_flow libmad_output(void *data, struct mad_header const *p_libmad_header
/* DEBUG */ /* DEBUG */
/* /*
if (p_libmad_pcm->channels == 1) { if (p_libmad_pcm->channels == 1) {
intf_ErrMsg( "mad debug: libmad_output channels [%d]", p_libmad_pcm->channels); intf_WarnMsg( 4, "mad debug: libmad_output channels [%d]", p_libmad_pcm->channels);
} }
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment