[vlc-devel] commit: Simplify libvlc_media_player_is_playing(). Should really be inline. (JP Dinger )

git version control git at videolan.org
Wed Mar 18 17:49:39 CET 2009


vlc | branch: master | JP Dinger <jpd at m2x.nl> | Tue Mar 17 14:11:58 2009 +0100| [d6b67211aacbdf45627f5b267ebe0dcf5edb146d] | committer: Rémi Denis-Courmont 

Simplify libvlc_media_player_is_playing(). Should really be inline.

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d6b67211aacbdf45627f5b267ebe0dcf5edb146d
---

 src/control/media_player.c |   19 +------------------
 1 files changed, 1 insertions(+), 18 deletions(-)

diff --git a/src/control/media_player.c b/src/control/media_player.c
index 6ae4b41..4b63d1b 100644
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -673,25 +673,8 @@ void libvlc_media_player_pause( libvlc_media_player_t *p_mi,
 int libvlc_media_player_is_playing( libvlc_media_player_t *p_mi,
                                      libvlc_exception_t *p_e )
 {
-    input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi, p_e );
-
-    if( !p_input_thread )
-    {
-        /* We do return the right value, no need to throw an exception */
-        if( libvlc_exception_raised( p_e ) )
-            libvlc_exception_clear( p_e );
-        return 0;
-    }
-
     libvlc_state_t state = libvlc_media_player_get_state( p_mi, p_e );
-
-    vlc_object_release( p_input_thread );
-
-    if( state == libvlc_Playing )
-    {
-        return 1;
-    }
-    return 0;
+    return libvlc_Playing == state;
 }
 
 




More information about the vlc-devel mailing list