Unload interface plugin in StopThread rather than destroy

[vlc] / src / video_output / video_text.c

diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c
index bb77890cfa73e037929d642037de5b2c09a32373..d0e7a0ac3c7ca4e8faea8c94bf2f1891c5a2aa94 100644 (file)
--- a/src/video_output/video_text.c
+++ b/src/video_output/video_text.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_block.h>
 #include <vlc_filter.h>
@@ -73,14 +73,24 @@ int vout_ShowTextAbsolute( vout_thread_t *p_vout, int i_channel,
                            int i_flags, int i_hmargin, int i_vmargin,
                            mtime_t i_start, mtime_t i_stop )
 {
+    (void)p_style;
     subpicture_t *p_spu;
     video_format_t fmt;
     /* (void)p_style; FIXME: <-- why ask for this if it's unused?!? */
 
     if( !psz_string ) return VLC_EGENERIC;
 
-    p_spu = spu_CreateSubpicture( p_vout->p_spu );
-    if( !p_spu ) return VLC_EGENERIC;
+    p_spu = subpicture_New();
+    if( !p_spu )
+        return VLC_EGENERIC;
+
+    p_spu->i_channel = i_channel;
+    p_spu->i_start = i_start;
+    p_spu->i_stop = i_stop;
+    p_spu->b_ephemer = true;
+    p_spu->b_absolute = false;
+    p_spu->b_fade = true;
+
 
     /* Create a new subpicture region */
     memset( &fmt, 0, sizeof(video_format_t) );
@@ -88,26 +98,18 @@ int vout_ShowTextAbsolute( vout_thread_t *p_vout, int i_channel,
     fmt.i_aspect = 0;
     fmt.i_width = fmt.i_height = 0;
     fmt.i_x_offset = fmt.i_y_offset = 0;
-    p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_vout), &fmt );
+    p_spu->p_region = subpicture_region_New( &fmt );
     if( !p_spu->p_region )
     {
         msg_Err( p_vout, "cannot allocate SPU region" );
-        spu_DestroySubpicture( p_vout->p_spu, p_spu );
+        subpicture_Delete( p_spu );
         return VLC_EGENERIC;
     }
 
     p_spu->p_region->psz_text = strdup( psz_string );
     p_spu->p_region->i_align = i_flags & SUBPICTURE_ALIGN_MASK;
-    p_spu->i_start = i_start;
-    p_spu->i_stop = i_stop;
-    p_spu->b_ephemer = true;
-    p_spu->b_absolute = false;
-    p_spu->b_fade = true;
-
-    p_spu->i_x = i_hmargin;
-    p_spu->i_y = i_vmargin;
-    p_spu->i_flags = i_flags & ~SUBPICTURE_ALIGN_MASK;
-    p_spu->i_channel = i_channel;
+    p_spu->p_region->i_x = i_hmargin;
+    p_spu->p_region->i_y = i_vmargin;
 
     spu_DisplaySubpicture( p_vout->p_spu, p_spu );
 
@@ -126,7 +128,7 @@ void __vout_OSDMessage( vlc_object_t *p_caller, int i_channel,
                         const char *psz_format, ... )
 {
     vout_thread_t *p_vout;
-    char *psz_string;
+    char *psz_string = NULL;
     va_list args;
 
     if( !config_GetInt( p_caller, "osd" ) ) return;
@@ -135,17 +137,17 @@ void __vout_OSDMessage( vlc_object_t *p_caller, int i_channel,
     if( p_vout )
     {
         va_start( args, psz_format );
-        vasprintf( &psz_string, psz_format, args );
-
-        vout_ShowTextRelative( p_vout, i_channel, psz_string, NULL,
-                               OSD_ALIGN_TOP|OSD_ALIGN_RIGHT,
-                               30 + p_vout->fmt_in.i_width
-                                  - p_vout->fmt_in.i_visible_width
-                                  - p_vout->fmt_in.i_x_offset,
-                               20 + p_vout->fmt_in.i_y_offset, 1000000 );
-
+        if( vasprintf( &psz_string, psz_format, args ) != -1 )
+        {
+            vout_ShowTextRelative( p_vout, i_channel, psz_string, NULL,
+                                   OSD_ALIGN_TOP|OSD_ALIGN_RIGHT,
+                                   30 + p_vout->fmt_in.i_width
+                                      - p_vout->fmt_in.i_visible_width
+                                      - p_vout->fmt_in.i_x_offset,
+                                   20 + p_vout->fmt_in.i_y_offset, 1000000 );
+            free( psz_string );
+        }
         vlc_object_release( p_vout );
-        free( psz_string );
         va_end( args );
     }
 }