Segregate vout window types

[vlc] / modules / codec / zvbi.c

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index e716f90f1a9ea80675c6f8fdaf052caf2f13fc61..c9d7e29049d8ce183da3cf78362bd303e1c0bad2 100644 (file)
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -79,23 +79,23 @@ static const char *const ppsz_pos_descriptions[] =
 { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
   N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
 
-vlc_module_begin();
-    set_description( N_("VBI and Teletext decoder") );
-    set_shortname( N_("VBI & Teletext") );
-    set_capability( "decoder", 51 );
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_SCODEC );
-    set_callbacks( Open, Close );
+vlc_module_begin ()
+    set_description( N_("VBI and Teletext decoder") )
+    set_shortname( N_("VBI & Teletext") )
+    set_capability( "decoder", 51 )
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_SCODEC )
+    set_callbacks( Open, Close )
 
     add_integer( "vbi-page", 100, NULL,
-                 PAGE_TEXT, PAGE_LONGTEXT, false );
+                 PAGE_TEXT, PAGE_LONGTEXT, false )
     add_bool( "vbi-opaque", true, NULL,
-                 OPAQUE_TEXT, OPAQUE_LONGTEXT, false );
-    add_integer( "vbi-position", 4, NULL, POS_TEXT, POS_LONGTEXT, false );
+                 OPAQUE_TEXT, OPAQUE_LONGTEXT, false )
+    add_integer( "vbi-position", 4, NULL, POS_TEXT, POS_LONGTEXT, false )
         change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
     add_bool( "vbi-text", false, NULL,
-              TELX_TEXT, TELX_LONGTEXT, false );
-vlc_module_end();
+              TELX_TEXT, TELX_LONGTEXT, false )
+vlc_module_end ()
 
 /****************************************************************************
  * Local structures
@@ -441,7 +441,7 @@ error:
     vbi_unref_page( &p_page );
     if( p_spu != NULL )
     {
-        p_dec->pf_spu_buffer_del( p_dec, p_spu );
+        decoder_DeleteSubpicture( p_dec, p_spu );
         p_spu = NULL;
     }
 
@@ -459,7 +459,7 @@ static subpicture_t *Subpicture( decoder_t *p_dec, video_format_t *p_fmt,
 
     /* If there is a page or sub to render, then we do that here */
     /* Create the subpicture unit */
-    p_spu = p_dec->pf_spu_buffer_new( p_dec );
+    p_spu = decoder_NewSubpicture( p_dec );
     if( !p_spu )
     {
         msg_Warn( p_dec, "can't get spu buffer" );
@@ -487,7 +487,7 @@ static subpicture_t *Subpicture( decoder_t *p_dec, video_format_t *p_fmt,
     if( p_spu->p_region == NULL )
     {
         msg_Err( p_dec, "cannot allocate SPU region" );
-        p_dec->pf_spu_buffer_del( p_dec, p_spu );
+        decoder_DeleteSubpicture( p_dec, p_spu );
         return NULL;
     }