Don't include config.h from the headers - refs #297.

[vlc] / modules / visualization / visual / visual.c

diff --git a/modules/visualization/visual/visual.c b/modules/visualization/visual/visual.c
index cc2cdae67663ee8d166ef71445074f57086419c8..477c329be5816313de1719f2c27b1a958f15e355 100644 (file)
--- a/modules/visualization/visual/visual.c
+++ b/modules/visualization/visual/visual.c
@@ -24,11 +24,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include "audio_output.h"
-#include "aout_internal.h"
+#include <vlc_vout.h>
+#include <vlc_aout.h>
 
 #include "visual.h"
 
@@ -64,15 +66,15 @@
 
 #define PEAKS_TEXT N_( "Enable peaks" )
 #define PEAKS_LONGTEXT N_( \
-        "This will draw \"peaks\" in the spectrum analyzer" )
+        "Draw \"peaks\" in the spectrum analyzer." )
 
 #define ORIG_TEXT N_( "Enable original graphic spectrum" )
 #define ORIG_LONGTEXT N_( \
-        "This enabled the \"flat\" spectrum analyzer in the spectrometer" )
+        "Enable the \"flat\" spectrum analyzer in the spectrometer." )
 
 #define BANDS_TEXT N_( "Enable bands" )
 #define BANDS_LONGTEXT N_( \
-        "This draws bands in the spectrometer." )
+        "Draw bands in the spectrometer." )
 
 #define BASE_TEXT N_( "Enable base" )
 #define BASE_LONGTEXT N_( \
@@ -88,7 +90,7 @@
 
 #define PEAK_HEIGHT_TEXT N_( "Peak height" )
 #define PEAK_HEIGHT_LONGTEXT N_( \
-        "This is the total pixel height of the peak items." )
+        "Total pixel height of the peak items." )
 
 #define PEAK_WIDTH_TEXT N_( "Peak extra width" )
 #define PEAK_WIDTH_LONGTEXT N_( \
@@ -100,7 +102,7 @@
 
 #define STARS_TEXT N_( "Number of stars" )
 #define STARS_LONGTEXT N_( \
-        "This defines the number of stars to draw with random effect." )
+        "Number of stars to draw with random effect." )
 
 static int  Open         ( vlc_object_t * );
 static void Close        ( vlc_object_t * );
@@ -166,7 +168,7 @@ static int FilterCallback( vlc_object_t *, char const *,
                            vlc_value_t, vlc_value_t, void * );
 static struct
 {
-    char *psz_name;
+    const char *psz_name;
     int  (*pf_run)( visual_effect_t *, aout_instance_t *,
                     aout_buffer_t *, picture_t *);
 } pf_effect_run[]=
@@ -188,7 +190,8 @@ static int Open( vlc_object_t *p_this )
     vlc_value_t        val;
 
     char *psz_effects, *psz_parser;
-    video_format_t fmt = {0};
+    video_format_t fmt;
+
 
     if( ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2') &&
           p_filter->input.i_format != VLC_FOURCC('f','i','3','2') ) )
@@ -302,6 +305,8 @@ static int Open( vlc_object_t *p_this )
     }
 
     /* Open the video output */
+    memset( &fmt, 0, sizeof(video_format_t) );
+
     fmt.i_width = fmt.i_visible_width = p_sys->i_width;
     fmt.i_height = fmt.i_visible_height = p_sys->i_height;
     fmt.i_chroma = VLC_FOURCC('I','4','2','0');