MKV USF subtitles support and other Subtitles improvements.

[vlc] / modules / misc / dummy / renderer.c

diff --git a/modules/misc/dummy/renderer.c b/modules/misc/dummy/renderer.c
index a1f0a395068e07c5459e7f9635a12fed172bcb4e..b6e89ec20dc87338d253dac675ced339f2fab0b5 100644 (file)
--- a/modules/misc/dummy/renderer.c
+++ b/modules/misc/dummy/renderer.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * renderer.c : dummy text rendering functions
  *****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
+ * Copyright (C) 2000, 2001 the VideoLAN team
  * $Id$
  *
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,24 +18,29 @@
  *
  * 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.
  *****************************************************************************/
 
 #include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include "vlc_block.h"
-#include "vlc_filter.h"
+#include <vlc_vout.h>
+#include <vlc_block.h>
+#include <vlc_filter.h>
 
-static subpicture_t *RenderText( filter_t *, block_t * );
+#include "dummy.h"
+
+static int RenderText( filter_t *, subpicture_region_t *,
+                       subpicture_region_t * );
 
 int E_(OpenRenderer)( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
-    p_filter->pf_render_string = RenderText;
+    p_filter->pf_render_text = RenderText;
+    p_filter->pf_render_html = NULL;
     return VLC_SUCCESS;
 }
 
-static subpicture_t *RenderText( filter_t *p_filter, block_t *p_block )
+static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
+                       subpicture_region_t *p_region_in )
 {
-    return NULL;
+    return VLC_EGENERIC;
 }