libvlc enhanced:

* video height/width retrieval
* input playing status check

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index d3ffa42d21a926a8862a00691dbf676128eb90c0..18027f671838fbcbcb65b04a51d1f274e9597975 100644 (file)
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -265,10 +265,11 @@ libvlc_input_t *libvlc_playlist_get_input( libvlc_instance_t *,
 void libvlc_input_free( libvlc_input_t * );
 
 /// \bug This might go away ... to be replaced by a broader system
-vlc_int64_t libvlc_input_get_length( libvlc_input_t *, libvlc_exception_t *);
-vlc_int64_t libvlc_input_get_time( libvlc_input_t *, libvlc_exception_t *);
-float libvlc_input_get_position( libvlc_input_t *, libvlc_exception_t *);
-vlc_bool_t libvlc_input_will_play( libvlc_input_t *, libvlc_exception_t *);
+vlc_int64_t libvlc_input_get_length     ( libvlc_input_t *, libvlc_exception_t *);
+vlc_int64_t libvlc_input_get_time       ( libvlc_input_t *, libvlc_exception_t *);
+float       libvlc_input_get_position   ( libvlc_input_t *, libvlc_exception_t *);
+vlc_bool_t  libvlc_input_will_play      ( libvlc_input_t *, libvlc_exception_t *);
+vlc_bool_t  libvlc_input_has_vout       ( libvlc_input_t *, libvlc_exception_t *);
 
 /** @} */
 

diff --git a/src/control/input.c b/src/control/input.c
index ea4e698af2b60e228c4d87063f2170d7610417ac..eb3ebd555fba7881b2f50be2994d735848204551 100644 (file)
--- a/src/control/input.c
+++ b/src/control/input.c
@@ -116,9 +116,7 @@ float libvlc_input_get_position( libvlc_input_t *p_input,
 vlc_bool_t libvlc_input_will_play( libvlc_input_t *p_input,
                                    libvlc_exception_t *p_exception) 
 {
-    
     input_thread_t *p_input_thread;
-    vlc_value_t val;
 
     if( !p_input )
     {
@@ -141,3 +139,17 @@ vlc_bool_t libvlc_input_will_play( libvlc_input_t *p_input,
 
     return VLC_FALSE;
 }
+
+vlc_bool_t libvlc_input_has_vout( libvlc_input_t *p_input,
+                                  libvlc_exception_t *p_e )
+{
+    vout_thread_t *p_vout = GetVout( p_input, p_e );
+
+    /* GetVout will raise the exception for us */
+    if( !p_vout )
+    {
+        return VLC_FALSE;
+    }
+
+    return VLC_TRUE;
+}

diff --git a/src/control/video.c b/src/control/video.c
index 0f09c6ab3ab3bd54c1a2a431b86560f62bac5bdc..4aae65b8efbd69a10c237ece450e2e34a0367ee6 100644 (file)
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -27,7 +27,7 @@
 #include <vlc/vout.h>
 #include <vlc/intf.h>
 
-static vout_thread_t *GetVout( libvlc_input_t *p_input,
+vout_thread_t *GetVout( libvlc_input_t *p_input,
                                libvlc_exception_t *p_exception )
 {
     input_thread_t *p_input_thread;