Dead inline

[vlc] / src / control / mediacontrol_audio_video.c

diff --git a/src/control/mediacontrol_audio_video.c b/src/control/mediacontrol_audio_video.c
index cb28ccfacbe8fae680e1282d0cae041ce7e3b37b..5b70613872a21a9fe22fbe16a65bcd822cd768fb 100644 (file)
--- a/src/control/mediacontrol_audio_video.c
+++ b/src/control/mediacontrol_audio_video.c
@@ -39,19 +39,12 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 
-#include <errno.h>                                                 /* ENOMEM */
 #include <stdio.h>
-#include <ctype.h>
 
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#    include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#    include <sys/types.h>
-#endif
+#include <sys/types.h>
 
 mediacontrol_RGBPicture *
 mediacontrol_snapshot( mediacontrol_Instance *self,
@@ -67,7 +60,7 @@ mediacontrol_snapshot( mediacontrol_Instance *self,
     libvlc_exception_init( &ex );
     mediacontrol_exception_init( exception );
 
-    p_input = libvlc_get_input_thread( self->p_media_player, &ex );
+    p_input = libvlc_get_input_thread( self->p_media_player );
     if( ! p_input )
     {
         RAISE_NULL( mediacontrol_InternalException, "No input" );
@@ -85,6 +78,7 @@ mediacontrol_snapshot( mediacontrol_Instance *self,
 
     if( vout_GetSnapshot( p_vout, &p_image, NULL, &fmt, "png", 500*1000 ) )
     {
+        vlc_object_release( p_vout );
         RAISE_NULL( mediacontrol_InternalException, "Snapshot exception" );
         return NULL;
     }
@@ -109,6 +103,8 @@ mediacontrol_snapshot( mediacontrol_Instance *self,
 
     if( !p_pic )
         RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
+
+    vlc_object_release( p_vout );
     return p_pic;
 }
 
@@ -118,7 +114,7 @@ int mediacontrol_showtext( 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 )
 {
-    return osd_ShowTextAbsolute( p_vout->p_spu, i_channel,
+    return osd_ShowTextAbsolute( vout_GetSpu( p_vout ), i_channel,
                                  psz_string, p_style,
                                  i_flags, i_hmargin, i_vmargin,
                                  i_start, i_stop );
@@ -144,12 +140,15 @@ mediacontrol_display_text( mediacontrol_Instance *self,
         RAISE_VOID( mediacontrol_InternalException, "Empty text" );
     }
 
-    p_input = libvlc_get_input_thread( self->p_media_player, &ex );
+    p_input = libvlc_get_input_thread( self->p_media_player );
     if( ! p_input )
     {
         RAISE_VOID( mediacontrol_InternalException, "No input" );
     }
     p_vout = input_GetVout( p_input );
+    /*FIXME: take care of the next fixme that can use p_input */
+    vlc_object_release( p_input );
+
     if( ! p_vout )
     {
         RAISE_VOID( mediacontrol_InternalException, "No video output" );
@@ -200,14 +199,12 @@ unsigned short
 mediacontrol_sound_get_volume( mediacontrol_Instance *self,
                                mediacontrol_Exception *exception )
 {
-    libvlc_exception_t ex;
     int i_ret = 0;
 
     mediacontrol_exception_init( exception );
-    libvlc_exception_init( &ex );
 
-    i_ret = libvlc_audio_get_volume( self->p_instance, &ex );
-    HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
+    //i_ret = libvlc_audio_get_volume( self->p_instance );
+#warning FIXME: unimplented
     /* FIXME: Normalize in [0..100] */
     return (unsigned short)i_ret;
 }
@@ -218,26 +215,22 @@ mediacontrol_sound_set_volume( mediacontrol_Instance *self,
                                mediacontrol_Exception *exception )
 {
     /* FIXME: Normalize in [0..100] */
-    libvlc_exception_t ex;
-
     mediacontrol_exception_init( exception );
-    libvlc_exception_init( &ex );
 
-    libvlc_audio_set_volume( self->p_instance, volume, &ex );
-    HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+    //libvlc_audio_set_volume( self->p_instance, volume );
+#warning FIXME: unimplented
 }
 
 int mediacontrol_set_visual( mediacontrol_Instance *self,
                                     WINDOWHANDLE visual_id,
                                     mediacontrol_Exception *exception )
 {
-    libvlc_exception_t ex;
-
     mediacontrol_exception_init( exception );
-    libvlc_exception_init( &ex );
-
-    libvlc_media_player_set_drawable( self->p_media_player, (libvlc_drawable_t)visual_id, &ex );
-    HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
+#ifdef WIN32
+    libvlc_media_player_set_hwnd( self->p_media_player, visual_id );
+#else
+    libvlc_media_player_set_xwindow( self->p_media_player, visual_id );
+#endif
     return true;
 }
 
@@ -245,16 +238,12 @@ int
 mediacontrol_get_rate( mediacontrol_Instance *self,
                mediacontrol_Exception *exception )
 {
-    libvlc_exception_t ex;
     int i_ret;
 
     mediacontrol_exception_init( exception );
-    libvlc_exception_init( &ex );
+    i_ret = libvlc_media_player_get_rate( self->p_media_player );
 
-    i_ret = libvlc_media_player_get_rate( self->p_media_player, &ex );
-    HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
-
-    return i_ret / 10;
+    return (i_ret >= 0) ? (i_ret / 10) : -1;
 }
 
 void
@@ -262,13 +251,9 @@ mediacontrol_set_rate( mediacontrol_Instance *self,
                const int rate,
                mediacontrol_Exception *exception )
 {
-    libvlc_exception_t ex;
-
     mediacontrol_exception_init( exception );
-    libvlc_exception_init( &ex );
 
-    libvlc_media_player_set_rate( self->p_media_player, rate * 10, &ex );
-    HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+    libvlc_media_player_set_rate( self->p_media_player, rate * 10 );
 }
 
 int