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

[vlc] / modules / video_filter / clone.c

diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c
index d64e7ec4a33db014cdbac928ddc9e5e8ebdf125f..5a37d9a2b7dc34245a0f738d6396dbdaa90c8b22 100644 (file)
--- a/modules/video_filter/clone.c
+++ b/modules/video_filter/clone.c
@@ -24,11 +24,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
-#include <vlc/vout.h>
+#include <vlc_vout.h>
 
 #include "filter_common.h"
 
@@ -60,20 +62,26 @@ static int  SendEvents( vlc_object_t *, char const *,
 #define VOUTLIST_LONGTEXT N_("You can use specific video output modules " \
         "for the clones. Use a comma-separated list of modules." )
 
+#define CFG_PREFIX "clone-"
+
 vlc_module_begin();
     set_description( _("Clone video filter") );
     set_capability( "video filter", 0 );
-    set_shortname( N_("Clone" ));
+    set_shortname( _("Clone" ));
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
 
-    add_integer( "clone-count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, VLC_FALSE );
-    add_string ( "clone-vout-list", NULL, NULL, VOUTLIST_TEXT, VOUTLIST_LONGTEXT, VLC_TRUE );
+    add_integer( CFG_PREFIX "count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, VLC_FALSE );
+    add_string ( CFG_PREFIX "vout-list", NULL, NULL, VOUTLIST_TEXT, VOUTLIST_LONGTEXT, VLC_TRUE );
 
     add_shortcut( "clone" );
     set_callbacks( Create, Destroy );
 vlc_module_end();
 
+static const char *ppsz_filter_options[] = {
+    "count", "vout-list", NULL
+};
+
 /*****************************************************************************
  * vout_sys_t: Clone video output method descriptor
  *****************************************************************************
@@ -130,7 +138,11 @@ static int Create( vlc_object_t *p_this )
     p_vout->pf_display = NULL;
     p_vout->pf_control = Control;
 
-    psz_clonelist = config_GetPsz( p_vout, "clone-vout-list" );
+    config_ChainParse( p_vout, CFG_PREFIX, ppsz_filter_options,
+                       p_vout->p_cfg );
+
+    psz_clonelist = var_CreateGetNonEmptyString( p_vout,
+                                                 CFG_PREFIX "vout-list" );
     if( psz_clonelist )
     {
         int i_dummy;
@@ -178,7 +190,8 @@ static int Create( vlc_object_t *p_this )
     {
         /* No list was specified. We will use the default vout, and get
          * the number of clones from clone-count */
-        p_vout->p_sys->i_clones = config_GetInt( p_vout, "clone-count" );
+        p_vout->p_sys->i_clones =
+            var_CreateGetInteger( p_vout, CFG_PREFIX "count" );
         p_vout->p_sys->ppsz_vout_list = NULL;
     }
 
@@ -206,9 +219,10 @@ static int Init( vout_thread_t *p_vout )
     int   i_index, i_vout;
     picture_t *p_pic;
     char *psz_default_vout;
-    video_format_t fmt = {0};
+    video_format_t fmt;
 
     I_OUTPUTPICTURES = 0;
+    memset( &fmt, 0, sizeof(video_format_t) );
 
     /* Initialize the output structure */
     p_vout->output.i_chroma = p_vout->render.i_chroma;
@@ -226,7 +240,7 @@ static int Init( vout_thread_t *p_vout )
 
     for( i_vout = 0; i_vout < p_vout->p_sys->i_clones; i_vout++ )
     {
-        if( p_vout->p_sys->ppsz_vout_list == NULL 
+        if( p_vout->p_sys->ppsz_vout_list == NULL
             || ( !strncmp( p_vout->p_sys->ppsz_vout_list[i_vout],
                            "default", 8 ) ) )
         {
@@ -343,7 +357,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
             if( i_in_pitch == i_copy_pitch
                  && i_out_pitch == i_copy_pitch )
             {
-                p_vout->p_vlc->pf_memcpy( p_out, p_in, i_in_pitch
+                p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_in_pitch
                                      * p_outpic->p[i_plane].i_visible_lines );
             }
             else
@@ -353,7 +367,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
 
                 while( p_in < p_in_end )
                 {
-                    p_vout->p_vlc->pf_memcpy( p_out, p_in, i_copy_pitch );
+                    p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch );
                     p_in += i_in_pitch;
                     p_out += i_out_pitch;
                 }