From 7f01046284c11de3393f7ac801e8ae97d3617a40 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Sat, 12 Aug 2006 14:24:54 +0000 Subject: [PATCH] * fix the getlength. It needs to be after the SETUP, so that liveMedia can correct Windows Media Servers. --- modules/demux/live555.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp index 07bd7b00e1..3be874be48 100644 --- a/modules/demux/live555.cpp +++ b/modules/demux/live555.cpp @@ -351,17 +351,17 @@ static int Open ( vlc_object_t *p_this ) goto error; } - /* Retrieve the duration if possible */ - p_sys->i_length = (int64_t)( p_sys->ms->playEndTime() * 1000000.0 ); - if( p_sys->i_length < 0 ) - p_sys->i_length = -1; - if( ( i_return = SessionsSetup( p_demux ) ) != VLC_SUCCESS ) { msg_Err( p_demux, "Nothing to play for rtsp://%s", p_sys->psz_path ); goto error; } - + + /* Retrieve the duration if possible */ + p_sys->i_length = (int64_t)( p_sys->ms->playEndTime() * 1000000.0 ); + if( p_sys->i_length < 0 ) + p_sys->i_length = -1; + if( ( i_return = Play( p_demux ) ) != VLC_SUCCESS ) goto error; @@ -1243,18 +1243,18 @@ static int RollOverTcp( demux_t *p_demux ) p_sys->env->getResultMsg() ); goto error; } - - /* Retrieve the duration if possible */ - p_sys->i_length = (int64_t)( p_sys->ms->playEndTime() * 1000000.0 ); - if( p_sys->i_length < 0 ) - p_sys->i_length = -1; if( ( i_return = SessionsSetup( p_demux ) ) != VLC_SUCCESS ) { msg_Err( p_demux, "Nothing to play for rtsp://%s", p_sys->psz_path ); goto error; } - + + /* Retrieve the duration if possible */ + p_sys->i_length = (int64_t)( p_sys->ms->playEndTime() * 1000000.0 ); + if( p_sys->i_length < 0 ) + p_sys->i_length = -1; + if( ( i_return = Play( p_demux ) ) != VLC_SUCCESS ) goto error; -- 2.39.2