Removes trailing spaces. Removes tabs.

[vlc] / src / control / mediacontrol_audio_video.c

diff --git a/src/control/mediacontrol_audio_video.c b/src/control/mediacontrol_audio_video.c
index a92cc497fe27221a5c2bd846c800b2860067bec9..f43ec8a624ee34498f2d57e8a71e220ab21e6884 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 );
@@ -193,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,
@@ -218,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;
 
@@ -281,7 +282,7 @@ vlc_bool_t mediacontrol_set_visual( mediacontrol_Instance *self,
 
 int
 mediacontrol_get_rate( mediacontrol_Instance *self,
-                      mediacontrol_Exception *exception )
+               mediacontrol_Exception *exception )
 {
     libvlc_exception_t ex;
     libvlc_media_instance_t* p_mi;
@@ -294,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;
@@ -302,8 +303,8 @@ mediacontrol_get_rate( mediacontrol_Instance *self,
 
 void
 mediacontrol_set_rate( mediacontrol_Instance *self,
-                      const int rate,
-                      mediacontrol_Exception *exception )
+               const int rate,
+               mediacontrol_Exception *exception )
 {
     libvlc_exception_t ex;
     libvlc_media_instance_t* p_mi;
@@ -315,13 +316,13 @@ 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 );
 }
 
 int
 mediacontrol_get_fullscreen( mediacontrol_Instance *self,
-                            mediacontrol_Exception *exception )
+                 mediacontrol_Exception *exception )
 {
     libvlc_exception_t ex;
     libvlc_media_instance_t* p_mi;
@@ -334,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;
@@ -342,8 +343,8 @@ mediacontrol_get_fullscreen( mediacontrol_Instance *self,
 
 void
 mediacontrol_set_fullscreen( mediacontrol_Instance *self,
-                            const int b_fullscreen,
-                            mediacontrol_Exception *exception )
+                 const int b_fullscreen,
+                 mediacontrol_Exception *exception )
 {
     libvlc_exception_t ex;
     libvlc_media_instance_t* p_mi;
@@ -355,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 );
 }