]> git.sesse.net Git - vlc/blobdiff - src/control/mediacontrol_audio_video.c
playlist: Make sure we don't pl_Release(p_playlist).
[vlc] / src / control / mediacontrol_audio_video.c
index e5bd503a976171ac2dc898e1cd4532f2638f22d5..047f05fe4898b04c25d4713d53ca00d870fa4099 100644 (file)
@@ -76,7 +76,7 @@ mediacontrol_snapshot( mediacontrol_Instance *self,
     {
         RAISE_NULL( mediacontrol_InternalException, "No video output" );
     }
-    p_cache = vlc_object_create( p_input, VLC_OBJECT_GENERIC );
+    p_cache = vlc_object_create( p_input, sizeof( vlc_object_t ) );
     if( p_cache == NULL )
     {
         vlc_object_release( p_vout );
@@ -149,6 +149,7 @@ int mediacontrol_showtext( vout_thread_t *p_vout, int i_channel,
 
     p_spu->p_region->psz_text = strdup( psz_string );
     p_spu->p_region->i_align = i_flags & SUBPICTURE_ALIGN_MASK;
+    p_spu->p_region->p_style = p_style;
     p_spu->i_start = i_start;
     p_spu->i_stop = i_stop;
     p_spu->b_ephemer = false;
@@ -269,7 +270,7 @@ mediacontrol_sound_set_volume( mediacontrol_Instance *self,
     HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
 }
 
-bool mediacontrol_set_visual( mediacontrol_Instance *self,
+int mediacontrol_set_visual( mediacontrol_Instance *self,
                                     WINDOWHANDLE visual_id,
                                     mediacontrol_Exception *exception )
 {
@@ -278,7 +279,7 @@ bool mediacontrol_set_visual( mediacontrol_Instance *self,
     mediacontrol_exception_init( exception );
     libvlc_exception_init( &ex );
 
-    libvlc_media_player_set_drawable( self->p_media_player, visual_id, &ex );
+    libvlc_media_player_set_drawable( self->p_media_player, (libvlc_drawable_t)visual_id, &ex );
     HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
     return true;
 }