* Preamble
*****************************************************************************/
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_access.h>
+#include <vlc_interface.h>
-#include "network.h"
+#include <vlc_network.h>
#include "rtsp.h"
#include "real.h"
#define CACHING_TEXT N_("Caching value (ms)")
#define CACHING_LONGTEXT N_( \
- "Allows you to modify the default caching value for RTSP streams. This " \
- "value should be set in millisecond units." )
+ "Caching value for RTSP streams. This " \
+ "value should be set in milliseconds." )
vlc_module_begin();
set_description( _("Real RTSP") );
set_callbacks( Open, Close );
add_shortcut( "realrtsp" );
add_shortcut( "rtsp" );
+ add_shortcut( "pnm" );
vlc_module_end();
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"),
+ _("VLC could not connect to \"%s:%d\"."), psz_server, i_port );
return VLC_EGENERIC;
}
char *psz_server = 0;
int i_result;
- if( !p_access->b_force ) return VLC_EGENERIC;
+ 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;
msg_Err( p_access, "rtsp session can not be established" );
+ intf_UserFatal( p_access, VLC_FALSE, _("Session failed"),
+ _("The requested RTSP session could not be established.") );
goto error;
}
p_sys->p_header = block_New( p_access, 4096 );
p_sys->p_header->i_buffer =
- rmff_dump_header( h, p_sys->p_header->p_buffer, 1024 );
+ rmff_dump_header( h, (char *)p_sys->p_header->p_buffer, 1024 );
rmff_free_header( h );
}
else
{
- msg_Dbg( p_access, "only real/helix rtsp servers supported for now" );
+ msg_Warn( p_access, "only real/helix rtsp servers supported for now" );
goto error;
}