Commit 7f010462 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* fix the getlength. It needs to be after the SETUP, so that liveMedia can...

* fix the getlength. It needs to be after the SETUP, so that liveMedia can correct Windows Media Servers.
parent 32cdd8cb
...@@ -351,17 +351,17 @@ static int Open ( vlc_object_t *p_this ) ...@@ -351,17 +351,17 @@ static int Open ( vlc_object_t *p_this )
goto error; 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 ) if( ( i_return = SessionsSetup( p_demux ) ) != VLC_SUCCESS )
{ {
msg_Err( p_demux, "Nothing to play for rtsp://%s", p_sys->psz_path ); msg_Err( p_demux, "Nothing to play for rtsp://%s", p_sys->psz_path );
goto error; 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 ) if( ( i_return = Play( p_demux ) ) != VLC_SUCCESS )
goto error; goto error;
...@@ -1244,17 +1244,17 @@ static int RollOverTcp( demux_t *p_demux ) ...@@ -1244,17 +1244,17 @@ static int RollOverTcp( demux_t *p_demux )
goto error; 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 ) if( ( i_return = SessionsSetup( p_demux ) ) != VLC_SUCCESS )
{ {
msg_Err( p_demux, "Nothing to play for rtsp://%s", p_sys->psz_path ); msg_Err( p_demux, "Nothing to play for rtsp://%s", p_sys->psz_path );
goto error; 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 ) if( ( i_return = Play( p_demux ) ) != VLC_SUCCESS )
goto error; goto error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment