/*****************************************************************************
* Preamble
*****************************************************************************/
+#define _GNU_SOURCE
+#include <vlc/vlc.h>
+
+#include <string.h>
#include <stdlib.h>
-#include <vlc/vlc.h>
#include <vlc/input.h>
#include "vlc_interaction.h"
#include "vlc_playlist.h"
#include "vlc_meta.h"
#include "network.h"
+#include "vlc_url.h"
#include "vlc_tls.h"
/*****************************************************************************
#define PROXY_TEXT N_("HTTP proxy")
#define PROXY_LONGTEXT N_( \
- "You can specify an HTTP proxy to use. It must be of the form " \
+ "HTTP proxy to be usesd It must be of the form " \
"http://[user[:pass]@]myproxy.mydomain:myport/ ; " \
"if empty, the http_proxy environment variable will be tried." )
#define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \
- "Allows you to modify the default caching value for http streams. This " \
- "value should be set in millisecond units." )
+ "Caching value for HTTP streams. This " \
+ "value should be set in milliseconds." )
#define AGENT_TEXT N_("HTTP user agent")
-#define AGENT_LONGTEXT N_("Allows you to modify the user agent that will be " \
+#define AGENT_LONGTEXT N_("User agent that will be " \
"used for the connection.")
#define RECONNECT_TEXT N_("Auto re-connect")
-#define RECONNECT_LONGTEXT N_("Will automatically attempt a re-connection " \
- "in case it was untimely closed.")
+#define RECONNECT_LONGTEXT N_( \
+ "Automatically try to reconnect to the stream in case of a sudden " \
+ "disconnect." )
+/// \bug missing space before you should
#define CONTINUOUS_TEXT N_("Continuous stream")
-#define CONTINUOUS_LONGTEXT N_("This allows you to read a file that is " \
+#define CONTINUOUS_LONGTEXT N_("Read a file that is " \
"being constantly updated (for example, a JPG file on a server)." \
"You should not globally enable this option as it will break all other " \
"types of HTTP streams." )
char *psz, *p;
/* Set up p_access */
- p_access->pf_read = Read;
- p_access->pf_block = NULL;
- p_access->pf_control = Control;
- p_access->pf_seek = Seek;
- p_access->info.i_update = 0;
- p_access->info.i_size = 0;
- p_access->info.i_pos = 0;
- p_access->info.b_eof = VLC_FALSE;
- p_access->info.i_title = 0;
- p_access->info.i_seekpoint = 0;
- p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
- memset( p_sys, 0, sizeof( access_sys_t ) );
+ STANDARD_READ_ACCESS_INIT;
p_sys->fd = -1;
p_sys->b_proxy = VLC_FALSE;
p_sys->i_version = 1;
if( Connect( p_access, 0 ) )
{
/* Retry with http 1.0 */
+ msg_Dbg( p_access, "switching to HTTP version 1.0" );
p_sys->i_version = 0;
+ p_sys->b_seekable = VLC_FALSE;
if( p_access->b_die ||
Connect( p_access, 0 ) )
{
char *psz_login = NULL; char *psz_password = NULL;
int i_ret;
- msg_Dbg( p_access, "Authentication failed" );
- i_ret = intf_UserLoginPassword( p_access, "HTTP authentication",
- "Please enter a valid login and password.", &psz_login, &psz_password );
+ msg_Dbg( p_access, "authentication failed" );
+ i_ret = intf_UserLoginPassword( p_access, _("HTTP authentication"),
+ _("Please enter a valid login name and a password."),
+ &psz_login, &psz_password );
if( i_ret == DIALOG_OK_YES )
{
msg_Dbg( p_access, "retrying with user=%s, pwd=%s",
goto error;
}
- p_playlist = vlc_object_find( p_access, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( !p_playlist )
- {
- msg_Err( p_access, "redirection failed: can't find playlist" );
- goto error;
- }
+ /* Change the URI */
+ p_playlist = pl_Yield( p_access );
+ PL_LOCK;
- /* Change the uri */
- vlc_mutex_lock( &p_playlist->object_lock );
- p_input_item = &p_playlist->status.p_item->input;
+ p_input_item = p_playlist->status.p_item->p_input;
vlc_mutex_lock( &p_input_item->lock );
free( p_input_item->psz_uri );
free( p_access->psz_path );
p_input_item->psz_uri = strdup( p_sys->psz_location );
p_access->psz_path = strdup( p_sys->psz_location );
vlc_mutex_unlock( &p_input_item->lock );
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
+
+ PL_UNLOCK;
+ pl_Release( p_access );
/* Clean up current Open() run */
vlc_UrlClean( &p_sys->url );
if( p_sys->b_mms )
{
- msg_Dbg( p_access, "This is actually a live mms server, BAIL" );
+ msg_Dbg( p_access, "this is actually a live mms server, BAIL" );
goto error;
}
/* Grrrr! detect ultravox server and force NSV demuxer */
p_access->psz_demux = strdup( "nsv" );
}
+ else if( p_sys->psz_mime &&
+ !strncasecmp( p_sys->psz_mime, "application/xspf+xml", 20 ) &&
+ ( memchr( " ;\t", p_sys->psz_mime[20], 4 ) != NULL ) )
+ p_access->psz_demux = strdup( "xspf-open" );
if( p_sys->b_reconnect ) msg_Dbg( p_access, "auto re-connect enabled" );
/* read the chunk header */
if( psz == NULL )
{
+ /* fatal error - end of file */
msg_Dbg( p_access, "failed reading chunk-header line" );
- return -1;
+ return 0;
}
p_sys->i_chunk = strtoll( psz, NULL, 16 );
free( psz );
p += strlen( "StreamTitle=" );
if( *p == '\'' || *p == '"' )
{
- char *psz = strchr( &p[1], p[0] );
+ char closing[] = { p[0], ';', '\0' };
+ char *psz = strstr( &p[1], closing );
if( !psz )
psz = strchr( &p[1], ';' );
vlc_bool_t *pb_bool;
int *pi_int;
int64_t *pi_64;
- vlc_meta_t **pp_meta;
+ vlc_meta_t *p_meta;
switch( i_query )
{
break;
case ACCESS_GET_META:
- pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
- *pp_meta = vlc_meta_New();
+ p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
if( p_sys->psz_icy_name )
- vlc_meta_Add( *pp_meta, VLC_META_TITLE,
- p_sys->psz_icy_name );
+ vlc_meta_SetTitle( p_meta, p_sys->psz_icy_name );
if( p_sys->psz_icy_genre )
- vlc_meta_Add( *pp_meta, VLC_META_GENRE,
- p_sys->psz_icy_genre );
+ vlc_meta_SetGenre( p_meta, p_sys->psz_icy_genre );
if( p_sys->psz_icy_title )
- vlc_meta_Add( *pp_meta, VLC_META_NOW_PLAYING,
- p_sys->psz_icy_title );
+ vlc_meta_SetNowPlaying( p_meta, p_sys->psz_icy_title );
break;
case ACCESS_GET_TITLE_INFO:
net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Icy-MetaData: 1\r\n" );
- if( p_sys->b_continuous && p_sys->i_version == 1 )
+ if( p_sys->b_continuous )
{
net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs,
- "Connection: keep-alive\r\n" );
+ "Connection: Keep-Alive\r\n" );
}
- else
+ else if( p_sys->i_version == 1 )
{
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
+ net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs,
"Connection: Close\r\n");
- p_sys->b_continuous = VLC_FALSE;
}
if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "\r\n" ) < 0 )
projects / vlc / blobdiff