Do not include vlc_modules.h in vlc_common.h

[vlc] / src / audio_output / filters.c

diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index ad064b048aea3e933ddd101ee7a1a12d88f5b2fa..b5ceb86b96b23a9be9c26466a2524308e9f1d31a 100644 (file)
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -32,6 +32,7 @@
 
 #include <vlc_common.h>
 #include <vlc_dialog.h>
+#include <vlc_modules.h>
 
 #include <vlc_aout.h>
 #include <vlc_filter.h>
@@ -68,10 +69,9 @@ static filter_t * FindFilter( aout_instance_t * p_aout,
     p_filter->fmt_out.i_codec = p_output_format->i_format;
     p_filter->pf_audio_buffer_new = aout_FilterBufferNew;
 
-    p_filter->p_module = module_need( p_filter, "audio filter2", NULL, false );
+    p_filter->p_module = module_need( p_filter, "audio filter", NULL, false );
     if ( p_filter->p_module == NULL )
     {
-        vlc_object_detach( p_filter );
         vlc_object_release( p_filter );
         return NULL;
     }
@@ -134,7 +134,6 @@ static int SplitConversion( const audio_sample_format_t * p_input_format,
 static void ReleaseFilter( filter_t * p_filter )
 {
     module_unneed( p_filter, p_filter->p_module );
-    vlc_object_detach( p_filter );
     vlc_object_release( p_filter );
 }
 
@@ -188,7 +187,9 @@ int aout_FiltersCreatePipeline( aout_instance_t * p_aout,
     if ( !i_nb_conversions )
     {
         /* There was only one conversion to do, and we already failed. */
-        msg_Err( p_aout, "couldn't find a filter for the conversion" );
+        msg_Err( p_aout, "couldn't find a filter for the conversion "
+                "%4.4s -> %4.4s",
+                &p_input_format->i_format, &p_output_format->i_format );
         return -1;
     }
 
@@ -288,7 +289,6 @@ void aout_FiltersDestroyPipeline( aout_instance_t * p_aout,
 
         module_unneed( p_filter, p_filter->p_module );
         free( p_filter->p_owner );
-        vlc_object_detach( p_filter );
         vlc_object_release( p_filter );
     }
 }