X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Ffilters.c;h=5a2ffad6cb18c93c95f80a1fab60968b60e65343;hb=cb02b264b58150bf45d0f68019ac32c02d2b5f1e;hp=9878911075c2b9128f57b03baff680b89a7ebc0b;hpb=cc3bd152f5d2166087b9e19b962e3ace06bd12ea;p=vlc

diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index 9878911075..5a2ffad6cb 100644
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -24,7 +24,11 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #ifdef HAVE_ALLOCA_H
@@ -54,11 +58,11 @@ static aout_filter_t * FindFilter( aout_instance_t * p_aout,
     if ( p_filter->p_module == NULL )
     {
         vlc_object_detach( p_filter );
-        vlc_object_destroy( p_filter );
+        vlc_object_release( p_filter );
         return NULL;
     }
 
-    p_filter->b_continuity = VLC_FALSE;
+    p_filter->b_continuity = false;
 
     return p_filter;
 }
@@ -76,10 +80,10 @@ static int SplitConversion( const audio_sample_format_t * p_input_format,
                             const audio_sample_format_t * p_output_format,
                             audio_sample_format_t * p_middle_format )
 {
-    vlc_bool_t b_format =
+    bool b_format =
              (p_input_format->i_format != p_output_format->i_format);
-    vlc_bool_t b_rate = (p_input_format->i_rate != p_output_format->i_rate);
-    vlc_bool_t b_channels =
+    bool b_rate = (p_input_format->i_rate != p_output_format->i_rate);
+    bool b_channels =
         (p_input_format->i_physical_channels
           != p_output_format->i_physical_channels)
      || (p_input_format->i_original_channels
@@ -118,7 +122,7 @@ static void ReleaseFilter( aout_filter_t * p_filter )
 {
     module_Unneed( p_filter, p_filter->p_module );
     vlc_object_detach( p_filter );
-    vlc_object_destroy( p_filter );
+    vlc_object_release( p_filter );
 }
 
 /*****************************************************************************
@@ -148,7 +152,7 @@ int aout_FiltersCreatePipeline( aout_instance_t * p_aout,
     if( *pi_nb_filters + 1 > AOUT_MAX_FILTERS )
     {
         msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
-        intf_UserFatal( p_aout, VLC_FALSE, _("Audio filtering failed"), 
+        intf_UserFatal( p_aout, false, _("Audio filtering failed"),
                         _("The maximum number of filters (%d) was reached."),
                         AOUT_MAX_FILTERS );
         return -1;
@@ -195,7 +199,7 @@ int aout_FiltersCreatePipeline( aout_instance_t * p_aout,
     {
         ReleaseFilter( pp_filters[0] );
         msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
-        intf_UserFatal( p_aout, VLC_FALSE, _("Audio filtering failed"), 
+        intf_UserFatal( p_aout, false, _("Audio filtering failed"),
                         _("The maximum number of filters (%d) was reached."),
                         AOUT_MAX_FILTERS );
         return -1;
@@ -218,7 +222,7 @@ int aout_FiltersCreatePipeline( aout_instance_t * p_aout,
         {
             ReleaseFilter( pp_filters[0] );
             msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
-            intf_UserFatal( p_aout, VLC_FALSE, _("Audio filtering failed"), 
+            intf_UserFatal( p_aout, false, _("Audio filtering failed"),
                             _("The maximum number of filters (%d) was reached."),
                             AOUT_MAX_FILTERS );
             return -1;
@@ -269,7 +273,7 @@ void aout_FiltersDestroyPipeline( aout_instance_t * p_aout,
     {
         module_Unneed( pp_filters[i], pp_filters[i]->p_module );
         vlc_object_detach( pp_filters[i] );
-        vlc_object_destroy( pp_filters[i] );
+        vlc_object_release( pp_filters[i] );
     }
 }
 
@@ -339,10 +343,7 @@ void aout_FiltersPlay( aout_instance_t * p_aout,
             * 1000000 / p_filter->input.i_rate,
             *pp_input_buffer, p_output_buffer );
         if ( p_output_buffer == NULL )
-        {
-            msg_Err( p_aout, "out of memory" );
             return;
-        }
         /* Please note that p_output_buffer->i_nb_samples & i_nb_bytes
          * shall be set by the filter plug-in. */