/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_access.h>
#include <vlc_interface.h>
if( p_sys->fd < 0 )
{
msg_Err( p_access, "cannot connect to %s:%d", psz_server, i_port );
- intf_UserFatal( p_access, VLC_FALSE, _("Connection failed"),
+ intf_UserFatal( p_access, VLC_FALSE, _("Connection failed"),
_("VLC could not connect to \"%s:%d\"."), psz_server, i_port );
return VLC_EGENERIC;
}
if( psz ) strncpy( (char *)p_buffer, psz, i_buffer );
else *p_buffer = 0;
- if( psz ) free( psz );
+ free( psz );
return 0;
}
char *psz_server = 0;
int i_result;
+ if( !p_access->psz_access || (
+ strncmp( p_access->psz_access, "rtsp", 4 ) &&
+ strncmp( p_access->psz_access, "pnm", 3 ) &&
+ strncmp( p_access->psz_access, "realrtsp", 8 ) ))
+ {
+ return VLC_EGENERIC;
+ }
+
p_access->pf_read = NULL;
p_access->pf_block = BlockRead;
p_access->pf_seek = Seek;
msg_Err( p_access, "rtsp session can not be established" );
- intf_UserFatal( p_access, VLC_FALSE, _("Session failed"),
+ intf_UserFatal( p_access, VLC_FALSE, _("Session failed"),
_("The requested RTSP session could not be established.") );
goto error;
}
var_Create( p_access, "realrtsp-caching",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
- if( psz_server ) free( psz_server );
+ free( psz_server );
return VLC_SUCCESS;
error:
- if( psz_server ) free( psz_server );
+ free( psz_server );
Close( p_this );
return VLC_EGENERIC;
}
access_sys_t *p_sys = p_access->p_sys;
if( p_sys->p_rtsp ) rtsp_close( p_sys->p_rtsp );
- if( p_sys->p_rtsp ) free( p_sys->p_rtsp );
+ free( p_sys->p_rtsp );
free( p_sys );
}
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_META:
+ case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default: