More warning fixes

[vlc] / include / vlc_filter.h

diff --git a/include/vlc_filter.h b/include/vlc_filter.h
index 3e58c9ca3ae60e5ec23a7876acf3e70c86df1f10..bb651a69b1e2006386792ae3e9c44fe0a84700e7 100644 (file)
--- a/include/vlc_filter.h
+++ b/include/vlc_filter.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * vlc_codec.h: codec related structures
+ * vlc_filter.h: filter related structures
  *****************************************************************************
- * Copyright (C) 1999-2003 VideoLAN
+ * Copyright (C) 1999-2003 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifndef _VLC_FILTER_H
 #define _VLC_FILTER_H 1
@@ -37,6 +37,12 @@ typedef struct filter_owner_sys_t filter_owner_sys_t;
  *
  * @{
  */
+
+/*
+ * BIG FAT WARNING : the code relies in the first 4 members of filter_t
+ * and decoder_t to be the same, so if you have anything to add, do it
+ * at the end of the structure.
+ */
 struct filter_t
 {
     VLC_COMMON_MEMBERS
@@ -51,6 +57,9 @@ struct filter_t
     /* Output format of filter */
     es_format_t         fmt_out;
 
+    /* Filter configuration */
+    config_chain_t *    p_cfg;
+
     picture_t *         ( * pf_video_filter ) ( filter_t *, picture_t * );
     block_t *           ( * pf_audio_filter ) ( filter_t *, block_t * );
     void                ( * pf_video_blend )  ( filter_t *, picture_t *,
@@ -58,8 +67,7 @@ struct filter_t
                                                 int, int, int );
 
     subpicture_t *      ( *pf_sub_filter ) ( filter_t *, mtime_t );
-    /* pf_render_string maps to RenderText in freetype.c */
-    subpicture_region_t *( *pf_render_string ) ( filter_t *, subpicture_t *, subpicture_region_t * );
+    int                 ( *pf_render_text ) ( filter_t *, subpicture_region_t *, subpicture_region_t * );
 
     /*
      * Buffers allocation