Commit eb04ab94 authored by Felix Paul Kühne's avatar Felix Paul Kühne

* livedotcom.cpp: transform a blocking msg_err to a more descriptive msg_warn.

    Please revert if this breaks something I didn't know about.
* real.c: minor clean up
parent 8d276c51
/***************************************************************************** /*****************************************************************************
* livedotcom.cpp : LIVE555 Streaming Media support. * livedotcom.cpp : LIVE555 Streaming Media support.
***************************************************************************** *****************************************************************************
* Copyright (C) 2003-2005 the VideoLAN team * Copyright (C) 2003-2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
...@@ -301,10 +301,10 @@ static int Open ( vlc_object_t *p_this ) ...@@ -301,10 +301,10 @@ static int Open ( vlc_object_t *p_this )
i_http_port = var_CreateGetInteger( p_demux, "rtsp-http-port" ); i_http_port = var_CreateGetInteger( p_demux, "rtsp-http-port" );
if( ( p_sys->rtsp = RTSPClient::createNew(*p_sys->env, 1/*verbose*/, if( ( p_sys->rtsp = RTSPClient::createNew(*p_sys->env, 1/*verbose*/,
"VLC Media Player", i_http_port ) ) == NULL ) "VLC media player", i_http_port ) ) == NULL )
#else #else
if( ( p_sys->rtsp = RTSPClient::createNew(*p_sys->env, 1/*verbose*/, if( ( p_sys->rtsp = RTSPClient::createNew(*p_sys->env, 1/*verbose*/,
"VLC Media Player" ) ) == NULL ) "VLC media player" ) ) == NULL )
#endif #endif
{ {
msg_Err( p_demux, "RTSPClient::createNew failed (%s)", msg_Err( p_demux, "RTSPClient::createNew failed (%s)",
...@@ -440,7 +440,8 @@ static int Open ( vlc_object_t *p_this ) ...@@ -440,7 +440,8 @@ static int Open ( vlc_object_t *p_this )
/* The PLAY */ /* The PLAY */
if( !p_sys->rtsp->playMediaSession( *p_sys->ms ) ) if( !p_sys->rtsp->playMediaSession( *p_sys->ms ) )
{ {
msg_Err( p_demux, "PLAY failed %s", p_sys->env->getResultMsg() ); //msg_Err( p_demux, "PLAY failed %s", p_sys->env->getResultMsg() );
msg_Warn( p_demux, "RTSP-stream doesn't have any timing info" );
delete iter; delete iter;
goto error; goto error;
} }
...@@ -998,7 +999,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -998,7 +999,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
{ {
if( !p_sys->rtsp->playMediaSession( *p_sys->ms, time ) ) if( !p_sys->rtsp->playMediaSession( *p_sys->ms, time ) )
{ {
msg_Err( p_demux, "PLAY failed %s", p_sys->env->getResultMsg() ); msg_Err( p_demux, "PLAY failed %s",
p_sys->env->getResultMsg() );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
p_sys->i_start = (mtime_t)(f * (double)p_sys->i_length); p_sys->i_start = (mtime_t)(f * (double)p_sys->i_length);
...@@ -1099,7 +1101,7 @@ static int RollOverTcp( demux_t *p_demux ) ...@@ -1099,7 +1101,7 @@ static int RollOverTcp( demux_t *p_demux )
/* Reopen rtsp client */ /* Reopen rtsp client */
if( ( p_sys->rtsp = RTSPClient::createNew(*p_sys->env, 1/*verbose*/, if( ( p_sys->rtsp = RTSPClient::createNew(*p_sys->env, 1/*verbose*/,
"VLC Media Player" ) ) == NULL ) "VLC media player" ) ) == NULL )
{ {
msg_Err( p_demux, "RTSPClient::createNew failed (%s)", msg_Err( p_demux, "RTSPClient::createNew failed (%s)",
p_sys->env->getResultMsg() ); p_sys->env->getResultMsg() );
......
/***************************************************************************** /*****************************************************************************
* real.c: Real demuxer. * real.c: Real demuxer.
***************************************************************************** *****************************************************************************
* Copyright (C) 2004 the VideoLAN team * Copyright (C) 2004, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
...@@ -593,11 +593,14 @@ static int Demux( demux_t *p_demux ) ...@@ -593,11 +593,14 @@ static int Demux( demux_t *p_demux )
static int Control( demux_t *p_demux, int i_query, va_list args ) static int Control( demux_t *p_demux, int i_query, va_list args )
{ {
demux_sys_t *p_sys = p_demux->p_sys; demux_sys_t *p_sys = p_demux->p_sys;
#if 0
double f, *pf; double f, *pf;
int64_t i64, *pi64; int64_t i64, *pi64;
#endif
switch( i_query ) switch( i_query )
{ {
#if 0
case DEMUX_GET_POSITION: case DEMUX_GET_POSITION:
pf = (double*) va_arg( args, double* ); pf = (double*) va_arg( args, double* );
i64 = stream_Size( p_demux->s ); i64 = stream_Size( p_demux->s );
...@@ -618,7 +621,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -618,7 +621,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
return stream_Seek( p_demux->s, (int64_t)(i64 * f) ); return stream_Seek( p_demux->s, (int64_t)(i64 * f) );
#if 0
case DEMUX_GET_TIME: case DEMUX_GET_TIME:
pi64 = (int64_t*)va_arg( args, int64_t * ); pi64 = (int64_t*)va_arg( args, int64_t * );
if( p_sys->i_mux_rate > 0 ) if( p_sys->i_mux_rate > 0 )
...@@ -643,7 +645,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -643,7 +645,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_GET_META: case DEMUX_GET_META:
{ {
vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** ); vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
vlc_meta_t *meta;
*pp_meta = p_sys->p_meta; *pp_meta = p_sys->p_meta;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
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