control/media_descriptor.c: Expose event_manager().

[vlc] / src / control / mediacontrol_audio_video.c

diff --git a/src/control/mediacontrol_audio_video.c b/src/control/mediacontrol_audio_video.c
index 584f5049efe9bb234ae4af07971ff50f1b2d64fa..0ff7c31c443ae5cbbebeb93c5a9be0329aab2ed4 100644 (file)
--- a/src/control/mediacontrol_audio_video.c
+++ b/src/control/mediacontrol_audio_video.c
@@ -84,16 +84,17 @@ mediacontrol_snapshot( mediacontrol_Instance *self,
     vlc_object_release( p_vout );
 
     p_snapshot = ( snapshot_t* ) p_cache->p_private;
+    vlc_mutex_unlock( &p_cache->object_lock );
     vlc_object_destroy( p_cache );
 
     if( p_snapshot )
     {
-        p_pic = _mediacontrol_createRGBPicture( p_snapshot->i_width,
-                                                p_snapshot->i_height,
-                                                VLC_FOURCC( 'p','n','g',' ' ),
-                                                p_snapshot->date,
-                                                p_snapshot->p_data,
-                                                p_snapshot->i_datasize );
+        p_pic = private_mediacontrol_createRGBPicture( p_snapshot->i_width,
+                                                      p_snapshot->i_height,
+                                                      VLC_FOURCC( 'p','n','g',' ' ),
+                                                      p_snapshot->date,
+                                                      p_snapshot->p_data,
+                                                      p_snapshot->i_datasize );
         if( !p_pic )
         {
             free( p_snapshot->p_data );
@@ -146,6 +147,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->i_start = i_start;
     p_spu->i_stop = i_stop;
     p_spu->b_ephemer = VLC_FALSE;
@@ -153,7 +155,7 @@ int mediacontrol_showtext( vout_thread_t *p_vout, int i_channel,
 
     p_spu->i_x = i_hmargin;
     p_spu->i_y = i_vmargin;
-    p_spu->i_flags = i_flags;
+    p_spu->i_flags = i_flags & ~SUBPICTURE_ALIGN_MASK;
     p_spu->i_channel = i_channel;
 
     spu_DisplaySubpicture( p_vout->p_spu, p_spu );
@@ -192,7 +194,7 @@ mediacontrol_display_text( mediacontrol_Instance *self,
         mtime_t i_duration = 0;
         mtime_t i_now = mdate();
 
-        i_duration = 1000 * mediacontrol_unit_convert(
+        i_duration = 1000 * private_mediacontrol_unit_convert(
                                                 self->p_playlist->p_input,
                                                 end->key,
                                                 mediacontrol_MediaTime,
@@ -217,11 +219,11 @@ mediacontrol_display_text( mediacontrol_Instance *self,
         /* i_now = input_ClockGetTS( p_input, NULL, 0 ); */
         i_now = mdate();
 
-        i_debut = mediacontrol_position2microsecond( p_input,
+        i_debut = private_mediacontrol_position2microsecond( p_input,
                                             ( mediacontrol_Position* ) begin );
         i_debut += i_now;
 
-        i_fin = mediacontrol_position2microsecond( p_input,
+        i_fin = private_mediacontrol_position2microsecond( p_input,
                                           ( mediacontrol_Position * ) end );
         i_fin += i_now;
 
@@ -293,7 +295,7 @@ mediacontrol_get_rate( mediacontrol_Instance *self,
     HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
 
     i_ret = libvlc_media_instance_get_rate( p_mi, &ex );
-    libvlc_media_instance_destroy_and_detach( p_mi );
+    libvlc_media_instance_release( p_mi );
     HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
 
     return i_ret / 10;
@@ -314,7 +316,7 @@ mediacontrol_set_rate( mediacontrol_Instance *self,
     HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
 
     libvlc_media_instance_set_rate( p_mi, rate * 10, &ex );
-    libvlc_media_instance_destroy_and_detach( p_mi );
+    libvlc_media_instance_release( p_mi );
     HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
 }
 
@@ -333,7 +335,7 @@ mediacontrol_get_fullscreen( mediacontrol_Instance *self,
     HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
 
     i_ret = libvlc_get_fullscreen( p_mi, &ex );
-    libvlc_media_instance_destroy_and_detach( p_mi );
+    libvlc_media_instance_release( p_mi );
     HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
 
     return i_ret;
@@ -354,6 +356,6 @@ mediacontrol_set_fullscreen( mediacontrol_Instance *self,
     HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
 
     libvlc_set_fullscreen( p_mi, b_fullscreen, &ex );
-    libvlc_media_instance_destroy_and_detach( p_mi );
+    libvlc_media_instance_release( p_mi );
     HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
 }