# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_access.h>
-#include "vlc_playlist.h"
#include "vlc_strings.h"
+#include "vlc_input.h"
#include <vlc_network.h>
#include "vlc_url.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-int E_(MMSHOpen) ( access_t * );
-void E_(MMSHClose) ( access_t * );
+int MMSHOpen ( access_t * );
+void MMSHClose ( access_t * );
static ssize_t Read( access_t *, uint8_t *, size_t );
static ssize_t ReadRedirect( access_t *, uint8_t *, size_t );
/****************************************************************************
* Open: connect to ftp server and ask for file
****************************************************************************/
-int E_(MMSHOpen)( access_t *p_access )
+int MMSHOpen( access_t *p_access )
{
access_sys_t *p_sys;
char *psz_location = NULL;
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.b_eof = false;
p_access->info.i_title = 0;
p_access->info.i_seekpoint = 0;
p_sys->i_start= 0;
/* Handle proxy */
- p_sys->b_proxy = VLC_FALSE;
+ p_sys->b_proxy = false;
memset( &p_sys->proxy, 0, sizeof(p_sys->proxy) );
/* Check proxy */
if( *psz_proxy )
{
- p_sys->b_proxy = VLC_TRUE;
+ p_sys->b_proxy = true;
vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 );
}
#ifdef HAVE_GETENV
char *psz_proxy = getenv( "http_proxy" );
if( psz_proxy && *psz_proxy )
{
- p_sys->b_proxy = VLC_TRUE;
+ p_sys->b_proxy = true;
vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 );
}
}
/* Handle redirection */
if( psz_location && *psz_location )
{
- playlist_t * p_playlist = pl_Yield( p_access );
msg_Dbg( p_access, "redirection to %s", psz_location );
+ input_thread_t * p_input = vlc_object_find( p_access, VLC_OBJECT_INPUT, FIND_PARENT );
+ input_item_t * p_new_loc;
/** \bug we do not autodelete here */
- playlist_Add( p_playlist, psz_location, psz_location,
- PLAYLIST_INSERT | PLAYLIST_GO, PLAYLIST_END, VLC_TRUE,
- VLC_FALSE );
- vlc_object_release( p_playlist );
+ p_new_loc = input_ItemNew( p_access, psz_location, psz_location );
+ input_ItemAddSubItem( input_GetItem( p_input ), p_new_loc );
+ vlc_object_release( p_input );
free( psz_location );
/*****************************************************************************
* Close: free unused data structures
*****************************************************************************/
-void E_( MMSHClose )( access_t *p_access )
+void MMSHClose ( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
Stop( p_access );
- if( p_sys->p_header )
- free( p_sys->p_header );
+ free( p_sys->p_header );
vlc_UrlClean( &p_sys->proxy );
vlc_UrlClean( &p_sys->url );
static int Control( access_t *p_access, int i_query, va_list args )
{
access_sys_t *p_sys = p_access->p_sys;
- vlc_bool_t *pb_bool;
+ bool *pb_bool;
+ bool b_bool;
int *pi_int;
int64_t *pi_64;
int i_int;
{
/* */
case ACCESS_CAN_SEEK:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+ pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = !p_sys->b_broadcast;
break;
case ACCESS_CAN_FASTSEEK:
- case ACCESS_CAN_PAUSE:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
- *pb_bool = VLC_FALSE;
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = false;
break;
+ case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
- *pb_bool = VLC_TRUE;
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = true;
break;
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t)var_GetInteger( p_access, "mms-caching" ) * I64C(1000);
+ *pi_64 = (int64_t)var_GetInteger( p_access, "mms-caching" ) * INT64_C(1000);
break;
case ACCESS_GET_PRIVATE_ID_STATE:
i_int = (int)va_arg( args, int );
- pb_bool = (vlc_bool_t *)va_arg( args, vlc_bool_t * );
+ pb_bool = (bool *)va_arg( args, bool * );
if( (i_int < 0) || (i_int > 127) )
return VLC_EGENERIC;
- *pb_bool = p_sys->asfh.stream[i_int].i_selected ? VLC_TRUE : VLC_FALSE;
+ *pb_bool = p_sys->asfh.stream[i_int].i_selected ? true : false;
break;
/* */
case ACCESS_SET_PAUSE_STATE:
+ b_bool = (bool)va_arg( args, int );
+ if( b_bool )
+ Stop( p_access );
+ else
+ Seek( p_access, p_access->info.i_pos );
+ break;
+
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
off_t i_offset;
off_t i_packet;
- msg_Dbg( p_access, "seeking to "I64Fd, i_pos );
+ msg_Dbg( p_access, "seeking to %"PRId64, i_pos );
i_packet = ( i_pos - p_sys->i_header ) / p_sys->asfh.i_min_data_packet_size;
i_offset = ( i_pos - p_sys->i_header ) % p_sys->asfh.i_min_data_packet_size;
Stop( p_access );
Start( p_access, i_packet * p_sys->asfh.i_min_data_packet_size );
- while( !p_access->b_die )
+ while( vlc_object_alive (p_access) )
{
- msg_Warn( p_access, "GetPacket 1" );
if( GetPacket( p_access, &ck ) )
break;
}
p_access->info.i_pos = i_pos;
- p_access->info.b_eof = VLC_FALSE;
+ p_access->info.b_eof = false;
p_sys->i_packet_used += i_offset;
return VLC_SUCCESS;
else
{
chunk_t ck;
- msg_Warn( p_access, "GetPacket 2" );
if( GetPacket( p_access, &ck ) )
{
int i_ret = -1;
}
if( i_ret )
{
- p_access->info.b_eof = VLC_TRUE;
+ p_access->info.b_eof = true;
return 0;
}
}
if( p_sys->i_header <= 0 )
return VLC_EGENERIC;
- E_( asf_HeaderParse )( &p_sys->asfh,
+ asf_HeaderParse ( &p_sys->asfh,
p_sys->p_header, p_sys->i_header );
- msg_Dbg( p_access, "packet count="I64Fd" packet size=%d",
+ msg_Dbg( p_access, "packet count=%"PRId64" packet size=%d",
p_sys->asfh.i_data_packets_count,
p_sys->asfh.i_min_data_packet_size );
- E_( asf_StreamSelect)( &p_sys->asfh,
+ asf_StreamSelect( &p_sys->asfh,
var_CreateGetInteger( p_access, "mms-maxbitrate" ),
var_CreateGetInteger( p_access, "mms-all" ),
var_CreateGetInteger( p_access, "audio" ),
char *buf;
char *b64;
- asprintf( &buf, "%s:%s", p_sys->proxy.psz_username,
- p_sys->proxy.psz_password ? p_sys->proxy.psz_password : "" );
+ if( asprintf( &buf, "%s:%s", p_sys->proxy.psz_username,
+ p_sys->proxy.psz_password ? p_sys->proxy.psz_password : "" ) == -1 )
+ return VLC_ENOMEM;
b64 = vlc_b64_encode( buf );
free( buf );
int i_code;
/* Reinit context */
- p_sys->b_broadcast = VLC_TRUE;
+ p_sys->b_broadcast = true;
p_sys->i_request_context = 1;
p_sys->i_packet_sequence = 0;
p_sys->i_packet_used = 0;
p_sys->i_packet_length = 0;
p_sys->p_packet = NULL;
- E_( GenerateGuid )( &p_sys->guid );
+ GenerateGuid ( &p_sys->guid );
if( OpenConnection( p_access ) )
return VLC_EGENERIC;
if( strstr( p, "broadcast" ) )
{
msg_Dbg( p_access, "stream type = broadcast" );
- p_sys->b_broadcast = VLC_TRUE;
+ p_sys->b_broadcast = true;
}
else if( strstr( p, "seekable" ) )
{
msg_Dbg( p_access, "stream type = seekable" );
- p_sys->b_broadcast = VLC_FALSE;
+ p_sys->b_broadcast = false;
}
else
{
msg_Warn( p_access, "unknow stream types (%s)", p );
- p_sys->b_broadcast = VLC_FALSE;
+ p_sys->b_broadcast = false;
}
}
}
*
* TODO : stream bitrates properties(optional)
* and bitrate mutual exclusion(optional) */
- E_( asf_HeaderParse )( &p_sys->asfh,
+ asf_HeaderParse ( &p_sys->asfh,
p_sys->p_header, p_sys->i_header );
- msg_Dbg( p_access, "packet count="I64Fd" packet size=%d",
+ msg_Dbg( p_access, "packet count=%"PRId64" packet size=%d",
p_sys->asfh.i_data_packets_count,
p_sys->asfh.i_min_data_packet_size );
- E_( asf_StreamSelect)( &p_sys->asfh,
+ asf_StreamSelect( &p_sys->asfh,
var_CreateGetInteger( p_access, "mms-maxbitrate" ),
var_CreateGetInteger( p_access, "mms-all" ),
var_CreateGetInteger( p_access, "audio" ),
/* Read the asf header */
p_sys->i_header = 0;
- if( p_sys->p_header )
- free( p_sys->p_header );
+ free( p_sys->p_header );
p_sys->p_header = NULL;
for( ;; )
{
* (4 bytes), decode and then read up to 8 additional bytes to get the
* entire header.
*/
- if( net_Read( p_access, p_sys->fd, NULL, p_sys->buffer, 4, VLC_TRUE ) < 4 )
+ if( net_Read( p_access, p_sys->fd, NULL, p_sys->buffer, 4, true ) < 4 )
{
msg_Err( p_access, "cannot read data 2" );
return VLC_EGENERIC;
if( restsize > 8 )
restsize = 8;
- if( net_Read( p_access, p_sys->fd, NULL, p_sys->buffer + 4, restsize, VLC_TRUE ) < restsize )
+ if( net_Read( p_access, p_sys->fd, NULL, p_sys->buffer + 4, restsize, true ) < restsize )
{
msg_Err( p_access, "cannot read data 3" );
return VLC_EGENERIC;
if( (p_ck->i_data > 0) &&
(net_Read( p_access, p_sys->fd, NULL, &p_sys->buffer[12],
- p_ck->i_data, VLC_TRUE ) < p_ck->i_data) )
+ p_ck->i_data, true ) < p_ck->i_data) )
{
msg_Err( p_access, "cannot read data 4" );
return VLC_EGENERIC;