Changeset 3fe7ae53925a9543d188baa1ed9909e64904ac78

Timestamp:

06/20/08 23:26:48 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1213997208 +0300

git-parent:

[dcd84049bf607c196397d999c18dab32fa65b1e6]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1213997208 +0300

Message:

When the underlying access dies, suicide the stream

Files:

• src/input/stream.c (modified) (4 diffs)

src/input/stream.c

@@ -1873 +1873 @@
-    {
-        i_read = p_access->pf_read( p_access, p_read, i_read );
+        if( p_access->b_die )
+            vlc_object_kill( s );
-        if( p_input )
-        {
@@ -1888 +1890 @@
-    i_read = p_sys->p_list_access->pf_read( p_sys->p_list_access, p_read,
-                                            i_read );
+    if( p_access->b_die )
+        vlc_object_kill( s );
-
-    /* If we reached an EOF then switch to the next stream in the list */
@@ -1939 +1943 @@
-    {
-        p_block = p_access->pf_block( p_access );
+        if( p_access->b_die )
+            vlc_object_kill( s );
-        if( pb_eof ) *pb_eof = p_access->info.b_eof;
-        if( p_input && p_block && libvlc_stats (p_access) )
@@ -1954 +1960 @@
-
-    p_block = p_sys->p_list_access->pf_block( p_access );
+    if( p_access->b_die )
+        vlc_object_kill( s );
-    b_eof = p_sys->p_list_access->info.b_eof;
-    if( pb_eof ) *pb_eof = b_eof;