X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmediacontrol_core.c;h=489b15fff925c981cacb17d6c553c01f1bd8ec61;hb=7228b1b132936ab5d7744a804f89b0155f56bc3c;hp=e6af12fe734a25fa891f9e973dcd9956e1dfa47e;hpb=a6d927b07acefa4eb7cc2b936e1d76d7416aee98;p=vlc

diff --git a/src/control/mediacontrol_core.c b/src/control/mediacontrol_core.c
index e6af12fe73..489b15fff9 100644
--- a/src/control/mediacontrol_core.c
+++ b/src/control/mediacontrol_core.c
@@ -189,8 +189,7 @@ mediacontrol_start( mediacontrol_Instance *self,
     mediacontrol_exception_init( exception );
     libvlc_exception_init( &ex );
 
-    p_media = libvlc_media_player_get_media( self->p_media_player, &ex );
-    HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+    p_media = libvlc_media_player_get_media( self->p_media_player );
 
     if ( ! p_media )
     {
@@ -221,8 +220,7 @@ mediacontrol_start( mediacontrol_Instance *self,
             HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
         }
 
-        libvlc_media_player_set_media( self->p_media_player, p_media, &ex );
-        HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+        libvlc_media_player_set_media( self->p_media_player, p_media );
 
         libvlc_media_player_play( self->p_media_player, &ex );
         HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
@@ -261,8 +259,7 @@ mediacontrol_stop( mediacontrol_Instance *self,
 
     mediacontrol_exception_init( exception );
     libvlc_exception_init( &ex );
-    libvlc_media_player_stop( self->p_media_player, &ex );
-    HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+    libvlc_media_player_stop( self->p_media_player );
 }
 
 /**************************************************************************
@@ -283,8 +280,7 @@ mediacontrol_set_mrl( mediacontrol_Instance *self,
     p_media = libvlc_media_new( self->p_instance, psz_file, &ex );
     HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
 
-    libvlc_media_player_set_media( self->p_media_player, p_media, &ex );
-    HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+    libvlc_media_player_set_media( self->p_media_player, p_media );
 }
 
 char *
@@ -297,8 +293,7 @@ mediacontrol_get_mrl( mediacontrol_Instance *self,
     mediacontrol_exception_init( exception );
     libvlc_exception_init( &ex );
 
-    p_media = libvlc_media_player_get_media( self->p_media_player, &ex );
-    HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
+    p_media = libvlc_media_player_get_media( self->p_media_player );
 
     if ( ! p_media )
     {
@@ -338,15 +333,7 @@ mediacontrol_get_stream_information( mediacontrol_Instance *self,
         return NULL;
     }
 
-    p_media = libvlc_media_player_get_media( self->p_media_player, &ex );
-    if( libvlc_exception_raised( &ex ) )
-    {
-        free( retval );
-        RAISE( mediacontrol_InternalException, libvlc_errmsg( ) );
-        libvlc_exception_clear( &ex );
-        return NULL;
-    }
-
+    p_media = libvlc_media_player_get_media( self->p_media_player );
     if( ! p_media )
     {
         /* No p_media defined */
@@ -359,15 +346,7 @@ mediacontrol_get_stream_information( mediacontrol_Instance *self,
     {
         libvlc_state_t state;
 
-        state = libvlc_media_player_get_state( self->p_media_player, &ex );
-        if( libvlc_exception_raised( &ex ) )
-        {
-            free( retval );
-            RAISE( mediacontrol_InternalException, libvlc_errmsg() );
-            libvlc_exception_clear( &ex );
-            return NULL;
-        }
-
+        state = libvlc_media_player_get_state( self->p_media_player );
         switch( state )
         {
         case libvlc_NothingSpecial: