Changeset 23942f1f36db6ab5ed4272da903c054336bed5ee

Timestamp:

06/25/07 20:06:52 (1 year ago)

Author:

Damien Fouilleul <damienf@videolan.org>

git-committer:

Damien Fouilleul <damienf@videolan.org> 1182794812 +0000

git-parent:

[4f2cfd119c634d9e0564734ad1c5ae4e1bdd2420]

git-author:

Damien Fouilleul <damienf@videolan.org> 1182794812 +0000

Message:

- libvlc APIs: bug fixing, and please note that exception argument is OPTIONAL (can be null), do not use exception to control API flow unless you created your own

Files:

• src/control/event.c (modified) (2 diffs)
• src/control/media_instance.c (modified) (4 diffs)
• src/control/playlist.c (modified) (1 diff)

src/control/event.c

@@ -90 +90 @@
-static input_thread_t * get_input(libvlc_instance_t * p_instance)
-{
-    libvlc_exception_t p_e_unused; /* FIXME: error checking here */
-    libvlc_media_instance_t * p_mi;
-    input_thread_t * p_input;
-
-&p_e_unused
+NULL
-
-    if( !p_mi )
-        return NULL;
-
-&p_e_unused
-
-destroy
+NULL
+
+release
-
-    return p_input;
@@ -119 +118 @@
-    struct libvlc_callback_entry_list_t *p_listitem;
-    input_thread_t * p_input = get_input( p_instance );
+
+    if( !p_input )
+        return;
-
-    vlc_mutex_lock( &p_instance->instance_lock );

src/control/media_instance.c

@@ -139 +139 @@
-    libvlc_media_instance_t * p_mi;
-
+    if( !p_input )
+    {
+        libvlc_exception_raise( p_e, "invalid input thread" );
+        return NULL;
+    }
+
-    p_mi = malloc( sizeof(libvlc_media_instance_t) );
-    p_mi->p_md = libvlc_media_descriptor_new_from_input_item(
@@ -144 +150 @@
-                    p_input->p->input.p_item, p_e );
-
-libvlc_exception_raised( p_e )
+!p_mi->p_md
-    {
-        free( p_mi );
@@ -267 +273 @@
-        p_input_thread = libvlc_get_input_thread( p_mi, p_e );
-
-libvlc_exception_raised( p_e )
+!p_input_thread
-            return;
-
@@ -301 +307 @@
-    p_input_thread = libvlc_get_input_thread( p_mi, p_e );
-
-libvlc_exception_raised( p_e )
+!p_input_thread
-        return;
-

src/control/playlist.c

@@ -220 +220 @@
-
-    vlc_mutex_lock( &PL->object_lock );
-
-
+
+
+
+
+
+
+
+
+
-    vlc_mutex_unlock( &PL->object_lock );
-
-    return p_mi;
-}
+