Changeset 00b95848260cd44f140a05da8aa5baf13580e2d3 for modules/demux

Timestamp:

05/07/08 13:55:16 (5 months ago)

Author:

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

git-committer:

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

git-parent:

[d10dffca3516b7650fa79c94947bfd18ac6a6fa0]

git-author:

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

Message:

modules: use vlc_object_alive()

Files:

• modules/demux/asf/asf.c (modified) (1 diff)
• modules/demux/avi/avi.c (modified) (5 diffs)
• modules/demux/live555.cpp (modified) (4 diffs)
• modules/demux/mkv.cpp (modified) (2 diffs)
• modules/demux/nsv.c (modified) (1 diff)
• modules/demux/nuv.c (modified) (3 diffs)
• modules/demux/ps.c (modified) (2 diffs)
• modules/demux/pva.c (modified) (1 diff)
• modules/demux/rtp.c (modified) (1 diff)
• modules/demux/ts.c (modified) (3 diffs)

modules/demux/asf/asf.c

@@ -151 +151 @@
-        int i_result;
-
-p_demux->b_die
+!vlc_object_alive (p_demux)
-            break;
-#if 0

modules/demux/avi/avi.c

@@ -978 +978 @@
-                    if( !(++i_loop_count % 1024) )
-                    {
-p_demux->b_die
+!vlc_object_alive (p_demux)
-                        msleep( 10000 );
-
@@ -1596 +1596 @@
-    for( ;; )
-    {
-p_demux->b_die
+!vlc_object_alive (p_demux)
-
-        if( AVI_PacketGetHeader( p_demux, &avi_pk ) )
@@ -1616 +1616 @@
-            if( !(++i_loop_count % 1024) )
-            {
-p_demux->b_die
+!vlc_object_alive (p_demux)
-                msleep( 10000 );
-
@@ -2099 +2099 @@
-        if( !(++i_count % 1024) )
-        {
-p_demux->b_die
+!vlc_object_alive (p_demux)
-
-            msleep( 10000 );
@@ -2395 +2395 @@
-        avi_packet_t pk;
-
-p_demux->b_die
+!vlc_object_alive (p_demux)
-        {
-            return;

modules/demux/live555.cpp

@@ -324 +324 @@
-                                      i_sdp_max - i_sdp - 1 );
-
-p_demux->b_die
+!vlc_object_alive (p_demux)
-            {
-                free( p_sdp );
@@ -508 +508 @@
-createnew:
-    i_lefttries--;
-p_demux->b_die
+!vlc_object_alive (p_demux)
-    {
-        free( psz_user );
@@ -670 +670 @@
-        live_track_t *tk;
-
-p_demux->b_die
+!vlc_object_alive (p_demux)
-        {
-            delete iter;
@@ -1797 +1797 @@
-
-    /* Avoid lock */
-!p_timeout->b_die
+vlc_object_alive (p_timeout)
-    {
-        if( p_timeout->i_remain <= 0 )

modules/demux/mkv.cpp

@@ -2797 +2797 @@
-
-    /* main loop */
-!p_ev->b_die
+vlc_object_alive (p_ev)
-    {
-        if ( !p_sys->b_pci_packet_set )
@@ -3055 +3055 @@
-
-        /* VOUT part */
-p_vout->b_die
+!vlc_object_alive (p_vout)
-        {
-            var_DelCallback( p_vout, "mouse-moved", EventMouse, p_ev );

modules/demux/nsv.c

@@ -388 +388 @@
-    int      i_peek;
-
-!p_demux->b_die
+vlc_object_alive (p_demux)
-    {
-        if( ( i_peek = stream_Peek( p_demux->s, &p_peek, 1024 ) ) < 8 )

modules/demux/nuv.c

@@ -336 +336 @@
-    for( ;; )
-    {
-p_demux->b_die
+!vlc_object_alive (p_demux)
-            return -1;
-
@@ -443 +443 @@
-            }
-
-!p_demux->b_die
+vlc_object_alive (p_demux)
-            {
-                frame_header_t fh;
@@ -483 +483 @@
-            p_sys->i_pcr = -1;
-
-!p_demux->b_die
+vlc_object_alive (p_demux)
-            {
-                frame_header_t fh;

modules/demux/ps.c

@@ -244 +244 @@
-        i = 0;
-        i_current_pos = stream_Tell( p_demux->s );
-!p_demux->b_die
+vlc_object_alive (p_demux)
-
-        /* Check end */
@@ -251 +251 @@
-        stream_Seek( p_demux->s, i_size - i_end );
-
-!p_demux->b_die
+vlc_object_alive (p_demux)
-        if( i_current_pos >= 0 ) stream_Seek( p_demux->s, i_current_pos );
-    }

modules/demux/pva.c

@@ -345 +345 @@
-    int      i_peek;
-
-!p_demux->b_die
+vlc_object_alive (p_demux)
-    {
-        if( ( i_peek = stream_Peek( p_demux->s, &p_peek, 1024 ) ) < 8 )

modules/demux/rtp.c

@@ -373 +373 @@
-                                block->p_buffer, block->i_buffer, false);
-        if (((len <= 0) && fd_dead (fd))
-demux->b_die
+!vlc_object_alive (demux)
-        {
-            block_Release (block);

modules/demux/ts.c

@@ -942 +942 @@
-        {
-            msg_Warn( p_demux, "lost sync" );
-!p_demux->b_die
+vlc_object_alive (p_demux)
-            {
-                i_pos++;
@@ -948 +948 @@
-                    break;
-            }
-!p_demux->b_die
+vlc_object_alive (p_demux)
-                msg_Warn( p_demux, "sync found" );
-        }
@@ -1053 +1053 @@
-            block_Release( p_pkt );
-
-!p_demux->b_die
+vlc_object_alive (p_demux)
-            {
-                const uint8_t *p_peek;