p_demux->p_sys->i_sid = 0;
p_demux->p_sys->b_rtsp_kasenna = false;
p_demux->p_sys->b_concert = false;
-
+
return VLC_SUCCESS;
}
}
input_item_t *p_child = NULL;
char *psz_line;
- INIT_PLAYLIST_STUFF;
+ input_item_t *p_current_input = GetCurrentItem(p_demux);
while( ( psz_line = stream_ReadLine( p_demux->s ) ) )
{
p_child = input_item_NewWithType( VLC_OBJECT(p_demux), p_sys->psz_uri,
p_sys->psz_name ? p_sys->psz_name : p_sys->psz_uri,
0, NULL, 0, p_sys->i_duration, ITEM_TYPE_NET );
-
+
if( !p_child )
{
msg_Err( p_demux, "A valid playlistitem could not be created" );
}
}
if( !p_sys->psz_mcast_ip )
- {
- char *psz_option;
- if( asprintf( &psz_option, "rtsp-caching=5000" ) != -1 )
- {
- input_item_AddOption( p_child, psz_option, VLC_INPUT_OPTION_TRUSTED );
- free( psz_option );
- }
- }
+ input_item_AddOption( p_child, "rtsp-caching=5000", VLC_INPUT_OPTION_TRUSTED );
if( !p_sys->psz_mcast_ip && p_sys->b_rtsp_kasenna )
- {
- char *psz_option;
- if( asprintf( &psz_option, "rtsp-kasenna" ) != -1 )
- {
- input_item_AddOption( p_child, psz_option, VLC_INPUT_OPTION_TRUSTED );
- free( psz_option );
- }
- }
+ input_item_AddOption( p_child, "rtsp-kasenna", VLC_INPUT_OPTION_TRUSTED );
- input_item_AddSubItem( p_current_input, p_child );
+ input_item_PostSubItem( p_current_input, p_child );
vlc_gc_decref( p_child );
- HANDLE_PLAY_AND_RELEASE
+ vlc_gc_decref(p_current_input);
return 0; /* Needed for correct operation of go back */
}