]> git.sesse.net Git - vlc/commitdiff
* sgimb.c: set the kasenna option correctly
authorDerk-Jan Hartman <hartman@videolan.org>
Tue, 16 Nov 2004 12:02:42 +0000 (12:02 +0000)
committerDerk-Jan Hartman <hartman@videolan.org>
Tue, 16 Nov 2004 12:02:42 +0000 (12:02 +0000)
  fix the playlist autodelete

modules/demux/livedotcom.cpp
modules/demux/sgimb.c

index a4662e30ea2117eaf8d31332bd3e24bdad621d2e..26117ad09a6e48134b151fac8f0c49cb95dc60de 100644 (file)
@@ -242,7 +242,6 @@ static int  Open ( vlc_object_t *p_this )
         psz_url = (char*)malloc( strlen( p_demux->psz_path ) + 8 );
         sprintf( psz_url, "rtsp://%s", p_demux->psz_path );
 
-        /* Add kasenna option */
         psz_options = p_sys->rtsp->sendOptionsCmd( psz_url );
         if( psz_options )
             delete [] psz_options;
index 263a36303abbbd299d4edf9f5d59e575196a2253..02ea755ef92660acaae4c56958f5c54249fa6956 100644 (file)
@@ -279,7 +279,7 @@ static int ParseLine ( demux_t *p_demux, char *psz_line )
     else if( !strncasecmp( psz_bol, "sgiFormatName=", sizeof("sgiFormatName=") - 1 ) )
     {
         psz_bol += sizeof("sgiFormatName=") - 1;
-        if( !strcasestr( psz_bol, "MPEG-4") ) /*not mpeg4 */
+        if( strcasestr( psz_bol, "MPEG-4") == NULL ) /*not mpeg4 found in string */
             p_sys->b_rtsp_kasenna = VLC_TRUE;
     }
     else if( !strncasecmp( psz_bol, "sgiMulticastAddress=", sizeof("sgiMulticastAddress=") - 1 ) )
@@ -346,8 +346,8 @@ static int Demux ( demux_t *p_demux )
         return -1;
     }
 
-    p_playlist->pp_items[p_playlist->i_index]->b_autodeletion = VLC_TRUE;
-    i_position = p_playlist->i_index + 1;
+    p_playlist->status.p_item->i_flags = PLAYLIST_DEL_FLAG;
+    i_position = -1;  /* FIXME p_playlist->i_index + 1; */
 
     while( ( psz_line = stream_ReadLine( p_demux->s ) ) )
     {