Changeset 57980f409c3aa8df7a61ef42d489b5b4323f21ac

Timestamp:

05/06/06 20:23:56 (2 years ago)

Author:

Filippo Carone <littlejohn@videolan.org>

git-committer:

Filippo Carone <littlejohn@videolan.org> 1149531836 +0000

git-parent:

[65c56bb9d8ba7b0789d16407b81836af0bcd367a]

git-author:

Filippo Carone <littlejohn@videolan.org> 1149531836 +0000

Message:

libvlc input and video update:
* video.c: added 1 release object in GetVout?
* input.c: added libvlc_get_input_thread helper

Files:

• src/control/input.c (modified) (5 diffs)
• src/control/video.c (modified) (1 diff)

src/control/input.c

@@ -33 +33 @@
-}
-
+/*
+ * Retrieve the input thread. Be sure to release the object
+ * once you are done with it.
+ */
+input_thread_t *libvlc_get_input_thread( libvlc_input_t *p_input,
+                                         libvlc_exception_t *p_e ) 
+{
+    input_thread_t *p_input_thread;
+
+    if( !p_input )
+    {
+        libvlc_exception_raise( p_e, "Input is NULL" );
+        return -1;
+    }
+
+    p_input_thread = (input_thread_t*)vlc_object_get(
+                                 p_input->p_instance->p_vlc,
+                                 p_input->i_input_id );
+    if( !p_input_thread )
+    {
+        libvlc_exception_raise( p_e, "Input does not exist" );
+        return NULL;
+    }
+
+    return p_input_thread;
+}
+
+    
+
-/**************************************************************************
- * Getters for stream information
@@ -42 +71 @@
-    vlc_value_t val;
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
-    var_Get( p_input_thread, "length", &val );
-    vlc_object_release( p_input_thread );
@@ -68 +88 @@
-    vlc_value_t val;
-
-    if( !p_input )
-    {
-        libvlc_exception_raise( p_exception, "Input is NULL" );
-        return -1;
-    }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    var_Get( p_input_thread , "time", &val );
-    vlc_object_release( p_input_thread );
@@ -94 +106 @@
-    vlc_value_t val;
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
-        return -1.0;
-
+
-    var_Get( p_input_thread, "position", &val );
-    vlc_object_release( p_input_thread );
@@ -119 +122 @@
-    input_thread_t *p_input_thread;
-
-if( !p_input )
-
-    libvlc_exception_raise( p_exception, "Input is NULL" );
+p_input_thread = libvlc_get_input_thread ( p_input, p_exception);
+
+if ( libvlc_exception_raised( p_exception ) )
-        return VLC_FALSE;
-    }
-
-    p_input_thread = (input_thread_t*)vlc_object_get(
-                            p_input->p_instance->p_vlc,
-                            p_input->i_input_id );
-
-    if( !p_input_thread )
-    {
-        libvlc_exception_raise( p_exception, "Input does not exist" );
-        return VLC_FALSE;
-    }
-
-    if ( !p_input_thread->b_die && !p_input_thread->b_dead ) 

src/control/video.c

@@ -52 +52 @@
-    if( !p_vout )
-    {
+        vlc_object_release( p_input_thread );
-        libvlc_exception_raise( p_exception, "No active video output" );
-        return NULL;
-    }
+    vlc_object_release( p_input_thread );
+    
-    return p_vout;
-}