videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

access: Rename access2 to access as access is no longer existing.

pull/2/head
Pierre d'Herbemont 19 years ago
parent
57bbabb5e7
commit
f94a2f9c4a
32 changed files with 96 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      include/vlc_access.h
  2. 2
      modules/access/bda/bda.c
  3. 2
      modules/access/cdda.c
  4. 2
      modules/access/cdda/cdda.c
  5. 2
      modules/access/directory.c
  6. 2
      modules/access/dshow/dshow.cpp
  7. 2
      modules/access/dv.c
  8. 2
      modules/access/dvb/access.c
  9. 2
      modules/access/eyetv.m
  10. 2
      modules/access/file.c
  11. 2
      modules/access/ftp.c
  12. 2
      modules/access/gnomevfs.c
  13. 2
      modules/access/http.c
  14. 2
      modules/access/mmap.c
  15. 2
      modules/access/mms/mms.c
  16. 2
      modules/access/pvr.c
  17. 2
      modules/access/rtmp/access.c
  18. 2
      modules/access/rtsp/access.c
  19. 2
      modules/access/smb.c
  20. 2
      modules/access/tcp.c
  21. 2
      modules/access/udp.c
  22. 10
      modules/access/v4l2/v4l2.c
  23. 2
      modules/access/vcd/vcd.c
  24. 2
      modules/access/vcdx/vcd.c
  25. 2
      modules/access_filter/dump.c
  26. 6
      modules/access_filter/timeshift.c
  27. 2
      modules/misc/dummy/dummy.c
  28. 24
      src/input/access.c
  29. 36
      src/input/input.c
  30. 8
      src/input/input_internal.h
  31. 50
      src/input/stream.c
  32. 2
      src/libvlc-module.c

8
include/vlc_access.h
View File

@ -117,20 +117,20 @@ struct access_t
access_sys_t *p_sys;
};
static inline int access2_vaControl( access_t *p_access, int i_query, va_list args )
static inline int access_vaControl( access_t *p_access, int i_query, va_list args )
{
if( !p_access ) return VLC_EGENERIC;
assert( p_access->pf_control );
return p_access->pf_control( p_access, i_query, args );
}
static inline int access2_Control( access_t *p_access, int i_query, ... )
static inline int access_Control( access_t *p_access, int i_query, ... )
{
va_list args;
int i_result;
va_start( args, i_query );
i_result = access2_vaControl( p_access, i_query, args );
i_result = access_vaControl( p_access, i_query, args );
va_end( args );
return i_result;
}
@ -138,7 +138,7 @@ static inline int access2_Control( access_t *p_access, int i_query, ... )
static inline char *access_GetContentType( access_t *p_access )
{
char *res;
if( access2_Control( p_access, ACCESS_GET_CONTENT_TYPE, &res ) )
if( access_Control( p_access, ACCESS_GET_CONTENT_TYPE, &res ) )
return NULL;
return res;
}

2
modules/access/bda/bda.c
View File

@ -249,7 +249,7 @@ vlc_module_begin();
true );
change_integer_list( i_hierarchy_list, ppsz_hierarchy_text, 0 );
set_capability( "access2", 0 );
set_capability( "access", 0 );
add_shortcut( "dvb" ); /* Generic name */
add_shortcut( "dvb-s" ); /* Satellite */

2
modules/access/cdda.c
View File

@ -68,7 +68,7 @@ static void Close( vlc_object_t * );
vlc_module_begin();
set_shortname( _("Audio CD"));
set_description( _("Audio CD input") );
set_capability( "access2", 10 );
set_capability( "access", 10 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
set_callbacks( Open, Close );

2
modules/access/cdda/cdda.c
View File

@ -111,7 +111,7 @@ static const char *psz_paranoia_list_text[] = { N_("none"), N_("overlap"),
vlc_module_begin();
add_usage_hint( N_("cddax://[device-or-file][@[T]track]") );
set_description( _("Compact Disc Digital Audio (CD-DA) input") );
set_capability( "access2", 10 /* compare with priority of cdda */ );
set_capability( "access", 10 /* compare with priority of cdda */ );
set_shortname( _("Audio Compact Disc"));
set_callbacks( CDDAOpen, CDDAClose );
add_shortcut( "cddax" );

2
modules/access/directory.c
View File

@ -94,7 +94,7 @@ vlc_module_begin();
set_shortname( _("Directory" ) );
set_subcategory( SUBCAT_INPUT_ACCESS );
set_description( _("Standard filesystem directory input") );
set_capability( "access2", 55 );
set_capability( "access", 55 );
add_shortcut( "directory" );
add_shortcut( "dir" );
add_shortcut( "file" );

2
modules/access/dshow/dshow.cpp
View File

@ -229,7 +229,7 @@ vlc_module_begin();
add_submodule();
set_description( _("DirectShow input") );
set_capability( "access2", 0 );
set_capability( "access", 0 );
set_callbacks( AccessOpen, AccessClose );
vlc_module_end();

2
modules/access/dv.c
View File

@ -78,7 +78,7 @@ vlc_module_begin();
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "dv-caching", 60000 / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true );
set_capability( "access2", 0 );
set_capability( "access", 0 );
add_shortcut( "dv" );
add_shortcut( "dv1394" );
add_shortcut( "raw1394" );

2
modules/access/dvb/access.c
View File

@ -256,7 +256,7 @@ vlc_module_begin();
true );
#endif
set_capability( "access2", 0 );
set_capability( "access", 0 );
add_shortcut( "dvb" ); /* Generic name */
add_shortcut( "dvb-s" ); /* Satellite */

2
modules/access/eyetv.m
View File

@ -63,7 +63,7 @@ vlc_module_begin();
add_integer( "eyetv-channel", 0, NULL,
CHANNEL_TEXT, CHANNEL_LONGTEXT, false );
set_capability( "access2", 0 );
set_capability( "access", 0 );
add_shortcut( "eyetv" );
set_callbacks( Open, Close );
vlc_module_end();

2
modules/access/file.c
View File

@ -92,7 +92,7 @@ vlc_module_begin();
set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true );
add_obsolete_string( "file-cat" );
set_capability( "access2", 50 );
set_capability( "access", 50 );
add_shortcut( "file" );
add_shortcut( "stream" );
add_shortcut( "kfir" );

2
modules/access/ftp.c
View File

@ -70,7 +70,7 @@ static void OutClose( vlc_object_t * );
vlc_module_begin();
set_shortname( "FTP" );
set_description( _("FTP input") );
set_capability( "access2", 0 );
set_capability( "access", 0 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "ftp-caching", 2 * DEFAULT_PTS_DELAY / 1000, NULL,

2
modules/access/gnomevfs.c
View File

@ -54,7 +54,7 @@ vlc_module_begin();
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "gnomevfs-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true );
set_capability( "access2", 10 );
set_capability( "access", 10 );
add_shortcut( "gnomevfs" );
set_callbacks( Open, Close );
vlc_module_end();

2
modules/access/http.c
View File

@ -85,7 +85,7 @@ static void Close( vlc_object_t * );
vlc_module_begin();
set_description( _("HTTP input") );
set_capability( "access2", 0 );
set_capability( "access", 0 );
set_shortname( _( "HTTP(S)" ) );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );

2
modules/access/mmap.c
View File

@ -54,7 +54,7 @@ vlc_module_begin();
set_description (_("Memory-mapped file input"));
set_category (CAT_INPUT);
set_subcategory (SUBCAT_INPUT_ACCESS);
set_capability ("access2", 52);
set_capability ("access", 52);
add_shortcut ("file");
set_callbacks (Open, Close);

2
modules/access/mms/mms.c
View File

@ -71,7 +71,7 @@ static void Close( vlc_object_t * );
vlc_module_begin();
set_shortname( "MMS" );
set_description( _("Microsoft Media Server (MMS) input") );
set_capability( "access2", -1 );
set_capability( "access", -1 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );

2
modules/access/pvr.c
View File

@ -128,7 +128,7 @@ vlc_module_begin();
set_description( _("IVTV MPEG Encoding cards input") );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
set_capability( "access2", 0 );
set_capability( "access", 0 );
add_shortcut( "pvr" );
add_integer( "pvr-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,

2
modules/access/rtmp/access.c
View File

@ -56,7 +56,7 @@ vlc_module_begin();
add_integer( "rtmp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
CACHING_LONGTEXT, true );
set_capability( "access2", 10 );
set_capability( "access", 10 );
set_callbacks( Open, Close );
add_shortcut( "rtmp" );
vlc_module_end();

2
modules/access/rtsp/access.c
View File

@ -54,7 +54,7 @@ vlc_module_begin();
set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "realrtsp-caching", 3000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, true );
set_capability( "access2", 10 );
set_capability( "access", 10 );
set_callbacks( Open, Close );
add_shortcut( "realrtsp" );
add_shortcut( "rtsp" );

2
modules/access/smb.c
View File

@ -77,7 +77,7 @@ static void Close( vlc_object_t * );
vlc_module_begin();
set_shortname( "SMB" );
set_description( _("SMB input") );
set_capability( "access2", 0 );
set_capability( "access", 0 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "smb-caching", 2 * DEFAULT_PTS_DELAY / 1000, NULL,

2
modules/access/tcp.c
View File

@ -54,7 +54,7 @@ vlc_module_begin();
add_integer( "tcp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
CACHING_LONGTEXT, true );
set_capability( "access2", 0 );
set_capability( "access", 0 );
add_shortcut( "tcp" );
set_callbacks( Open, Close );
vlc_module_end();

2
modules/access/udp.c
View File

@ -83,7 +83,7 @@ vlc_module_begin();
add_integer( "rtp-late", 100, NULL, RTP_LATE_TEXT, RTP_LATE_LONGTEXT, true );
add_obsolete_bool( "udp-auto-mtu" );
set_capability( "access2", 0 );
set_capability( "access", 0 );
add_shortcut( "udp" );
add_shortcut( "udpstream" );
add_shortcut( "udp4" );

10
modules/access/v4l2/v4l2.c
View File

@ -379,7 +379,7 @@ vlc_module_begin();
add_submodule();
add_shortcut( "v4l2c" );
set_description( _("Video4Linux2 Compressed A/V") );
set_capability( "access2", 0 );
set_capability( "access", 0 );
/* use these when open as access_demux fails; VLC will use another demux */
set_callbacks( AccessOpen, AccessClose );
@ -1165,7 +1165,7 @@ static void CommonClose( vlc_object_t *p_this, demux_sys_t *p_sys )
}
/*****************************************************************************
* AccessOpen: opens v4l2 device, access2 callback
* AccessOpen: opens v4l2 device, access callback
*****************************************************************************
*
* url: <video device>::::
@ -1247,7 +1247,7 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
}
/*****************************************************************************
* AccessControl: access2 callback
* AccessControl: access callback
*****************************************************************************/
static int AccessControl( access_t *p_access, int i_query, va_list args )
{
@ -1306,7 +1306,7 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
}
/*****************************************************************************
* AccessRead: access2 callback
* AccessRead: access callback
******************************************************************************/
static ssize_t AccessRead( access_t * p_access, uint8_t * p_buffer, size_t i_len )
{
@ -2047,7 +2047,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
}
if( i == ARRAY_SIZE( p_chroma_fallbacks ) )
{
msg_Warn( p_demux, "Could not select any of the default chromas; attempting to open as MPEG encoder card (access2)" );
msg_Warn( p_demux, "Could not select any of the default chromas; attempting to open as MPEG encoder card (access)" );
goto open_failed;
}
}

2
modules/access/vcd/vcd.c
View File

@ -49,7 +49,7 @@ static void Close( vlc_object_t * );
vlc_module_begin();
set_shortname( _("VCD"));
set_description( _("VCD input") );
set_capability( "access2", 60 );
set_capability( "access", 60 );
set_callbacks( Open, Close );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );

2
modules/access/vcdx/vcd.c
View File

@ -102,7 +102,7 @@ vlc_module_begin();
add_shortcut( "vcdx" );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
set_capability( "access2", 55 /* slightly lower than vcd */ );
set_capability( "access", 55 /* slightly lower than vcd */ );
set_callbacks( VCDOpen, VCDClose );
/* Configuration options */

2
modules/access_filter/dump.c
View File

@ -91,7 +91,7 @@ static int Open (vlc_object_t *obj)
if (!var_CreateGetBool (access, "dump-force"))
{
bool b;
if ((access2_Control (src, ACCESS_CAN_FASTSEEK, &b) == 0) && b)
if ((access_Control (src, ACCESS_CAN_FASTSEEK, &b) == 0) && b)
{
msg_Dbg (obj, "dump filter useless");
return VLC_EGENERIC;

6
modules/access_filter/timeshift.c
View File

@ -137,14 +137,14 @@ static int Open( vlc_object_t *p_this )
else
{
/* Only work with not pace controled access */
if( access2_Control( p_src, ACCESS_CAN_CONTROL_PACE, &b_bool ) ||
if( access_Control( p_src, ACCESS_CAN_CONTROL_PACE, &b_bool ) ||
b_bool )
{
msg_Dbg( p_src, "ACCESS_CAN_CONTROL_PACE: timeshift useless" );
return VLC_EGENERIC;
}
/* Refuse access that can be paused */
if( access2_Control( p_src, ACCESS_CAN_PAUSE, &b_bool ) || b_bool )
if( access_Control( p_src, ACCESS_CAN_PAUSE, &b_bool ) || b_bool )
{
msg_Dbg( p_src, "ACCESS_CAN_PAUSE: timeshift useless" );
return VLC_EGENERIC;
@ -550,7 +550,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
/* Forward everything else to the source access */
default:
return access2_vaControl( p_access->p_source, i_query, args );
return access_vaControl( p_access->p_source, i_query, args );
}
return VLC_SUCCESS;
}

2
modules/misc/dummy/dummy.c
View File

@ -69,7 +69,7 @@ vlc_module_begin();
#endif
add_submodule();
set_description( _("Dummy access function") );
set_capability( "access2", 0 );
set_capability( "access", 0 );
set_callbacks( E_(OpenAccess), NULL );
add_submodule();
set_description( _("Dummy demux function") );

24
src/input/access.c
View File

@ -30,9 +30,9 @@
#include "input_internal.h"
/*****************************************************************************
* access2_InternalNew:
* access_InternalNew:
*****************************************************************************/
static access_t *access2_InternalNew( vlc_object_t *p_obj, const char *psz_access,
static access_t *access_InternalNew( vlc_object_t *p_obj, const char *psz_access,
const char *psz_demux, const char *psz_path,
access_t *p_source )
{
@ -75,7 +75,7 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, const char *psz_acces
vlc_object_attach( p_access, p_obj );
p_access->p_module =
module_Need( p_access, p_source ? "access_filter" : "access2",
module_Need( p_access, p_source ? "access_filter" : "access",
psz_access, true );
if( p_access->p_module == NULL )
@ -93,29 +93,29 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, const char *psz_acces
}
/*****************************************************************************
* access2_New:
* access_New:
*****************************************************************************/
access_t *__access2_New( vlc_object_t *p_obj, const char *psz_access,
access_t *__access_New( vlc_object_t *p_obj, const char *psz_access,
const char *psz_demux, const char *psz_path )
{
return access2_InternalNew( p_obj, psz_access, psz_demux,
return access_InternalNew( p_obj, psz_access, psz_demux,
psz_path, NULL );
}
/*****************************************************************************
* access2_FilterNew:
* access_FilterNew:
*****************************************************************************/
access_t *access2_FilterNew( access_t *p_source, const char *psz_access_filter )
access_t *access_FilterNew( access_t *p_source, const char *psz_access_filter )
{
return access2_InternalNew( VLC_OBJECT(p_source), psz_access_filter,
return access_InternalNew( VLC_OBJECT(p_source), psz_access_filter,
p_source->psz_demux, p_source->psz_path,
p_source );
}
/*****************************************************************************
* access2_Delete:
* access_Delete:
*****************************************************************************/
void access2_Delete( access_t *p_access )
void access_Delete( access_t *p_access )
{
module_Unneed( p_access, p_access->p_module );
vlc_object_detach( p_access );
@ -126,7 +126,7 @@ void access2_Delete( access_t *p_access )
if( p_access->p_source )
{
access2_Delete( p_access->p_source );
access_Delete( p_access->p_source );
}
vlc_object_release( p_access );

36
src/input/input.c
View File

@ -1180,7 +1180,7 @@ static int Init( input_thread_t * p_input )
if( !p_input->b_preparsing )
{
if( p_input->p->input.p_access )
access2_Control( p_input->p->input.p_access, ACCESS_GET_META,
access_Control( p_input->p->input.p_access, ACCESS_GET_META,
p_meta );
/* Get meta data from slave input */
@ -1189,7 +1189,7 @@ static int Init( input_thread_t * p_input )
DemuxMeta( p_input, p_meta, p_input->p->slave[i]->p_demux );
if( p_input->p->slave[i]->p_access )
{
access2_Control( p_input->p->slave[i]->p_access,
access_Control( p_input->p->slave[i]->p_access,
ACCESS_GET_META, p_meta );
}
}
@ -1618,7 +1618,7 @@ static bool Control( input_thread_t *p_input, int i_type,
{
int i_ret;
if( p_input->p->input.p_access )
i_ret = access2_Control( p_input->p->input.p_access,
i_ret = access_Control( p_input->p->input.p_access,
ACCESS_SET_PAUSE_STATE, false );
else
i_ret = demux_Control( p_input->p->input.p_demux,
@ -1649,7 +1649,7 @@ static bool Control( input_thread_t *p_input, int i_type,
{
int i_ret;
if( p_input->p->input.p_access )
i_ret = access2_Control( p_input->p->input.p_access,
i_ret = access_Control( p_input->p->input.p_access,
ACCESS_SET_PAUSE_STATE, true );
else
i_ret = demux_Control( p_input->p->input.p_demux,
@ -1863,7 +1863,7 @@ static bool Control( input_thread_t *p_input, int i_type,
{
input_EsOutChangePosition( p_input->p->p_es_out );
access2_Control( p_access, ACCESS_SET_TITLE, i_title );
access_Control( p_access, ACCESS_SET_TITLE, i_title );
stream_AccessReset( p_input->p->input.p_stream );
}
}
@ -1939,7 +1939,7 @@ static bool Control( input_thread_t *p_input, int i_type,
{
input_EsOutChangePosition( p_input->p->p_es_out );
access2_Control( p_access, ACCESS_SET_SEEKPOINT,
access_Control( p_access, ACCESS_SET_SEEKPOINT,
i_seekpoint );
stream_AccessReset( p_input->p->input.p_stream );
}
@ -1980,7 +1980,7 @@ static bool Control( input_thread_t *p_input, int i_type,
/* Get meta (access and demux) */
p_meta = vlc_meta_New();
access2_Control( slave->p_access, ACCESS_GET_META,
access_Control( slave->p_access, ACCESS_GET_META,
p_meta );
demux_Control( slave->p_demux, DEMUX_GET_META, p_meta );
InputUpdateMeta( p_input, p_meta );
@ -2089,7 +2089,7 @@ static int UpdateFromAccess( input_thread_t *p_input )
{
/* TODO maybe multi - access ? */
vlc_meta_t *p_meta = vlc_meta_New();
access2_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta );
access_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta );
InputUpdateMeta( p_input, p_meta );
var_SetInteger( pl_Get( p_input ), "item-change", p_input->p->input.p_item->i_id );
p_access->info.i_update &= ~INPUT_UPDATE_META;
@ -2300,7 +2300,7 @@ static int InputSourceInit( input_thread_t *p_input,
input_ChangeState( p_input, OPENING_S );
/* Now try a real access */
in->p_access = access2_New( p_input, psz_access, psz_demux, psz_path );
in->p_access = access_New( p_input, psz_access, psz_demux, psz_path );
/* Access failed, URL encoded ? */
if( in->p_access == NULL && strchr( psz_path, '%' ) )
@ -2310,7 +2310,7 @@ static int InputSourceInit( input_thread_t *p_input,
msg_Dbg( p_input, "retrying with access `%s' demux `%s' path `%s'",
psz_access, psz_demux, psz_path );
in->p_access = access2_New( p_input,
in->p_access = access_New( p_input,
psz_access, psz_demux, psz_path );
}
if( in->p_access == NULL )
@ -2334,7 +2334,7 @@ static int InputSourceInit( input_thread_t *p_input,
if( end )
*end++ = '\0';
in->p_access = access2_FilterNew( in->p_access, psz );
in->p_access = access_FilterNew( in->p_access, psz );
if( in->p_access == NULL )
{
in->p_access = p_access;
@ -2349,12 +2349,12 @@ static int InputSourceInit( input_thread_t *p_input,
/* Get infos from access */
if( !p_input->b_preparsing )
{
access2_Control( in->p_access,
access_Control( in->p_access,
ACCESS_GET_PTS_DELAY, &i_pts_delay );
p_input->i_pts_delay = __MAX( p_input->i_pts_delay, i_pts_delay );
in->b_title_demux = false;
if( access2_Control( in->p_access, ACCESS_GET_TITLE_INFO,
if( access_Control( in->p_access, ACCESS_GET_TITLE_INFO,
&in->title, &in->i_title,
&in->i_title_offset, &in->i_seekpoint_offset ) )
@ -2362,15 +2362,15 @@ static int InputSourceInit( input_thread_t *p_input,
in->i_title = 0;
in->title = NULL;
}
access2_Control( in->p_access, ACCESS_CAN_CONTROL_PACE,
access_Control( in->p_access, ACCESS_CAN_CONTROL_PACE,
&in->b_can_pace_control );
in->b_can_rate_control = in->b_can_pace_control;
in->b_rescale_ts = true;
access2_Control( in->p_access, ACCESS_CAN_PAUSE,
access_Control( in->p_access, ACCESS_CAN_PAUSE,
&in->b_can_pause );
var_SetBool( p_input, "can-pause", in->b_can_pause );
access2_Control( in->p_access, ACCESS_CAN_SEEK,
access_Control( in->p_access, ACCESS_CAN_SEEK,
&val.b_bool );
var_Set( p_input, "seekable", val );
}
@ -2476,7 +2476,7 @@ error:
stream_Delete( in->p_stream );
if( in->p_access )
access2_Delete( in->p_access );
access_Delete( in->p_access );
return VLC_EGENERIC;
}
@ -2495,7 +2495,7 @@ static void InputSourceClean( input_source_t *in )
stream_Delete( in->p_stream );
if( in->p_access )
access2_Delete( in->p_access );
access_Delete( in->p_access );
if( in->i_title > 0 )
{

8
src/input/input_internal.h
View File

@ -397,12 +397,12 @@ static inline void input_ChangeState( input_thread_t *p_input, int state )
/* Access */
#define access2_New( a, b, c, d ) __access2_New(VLC_OBJECT(a), b, c, d )
access_t * __access2_New( vlc_object_t *p_obj, const char *psz_access,
#define access_New( a, b, c, d ) __access_New(VLC_OBJECT(a), b, c, d )
access_t * __access_New( vlc_object_t *p_obj, const char *psz_access,
const char *psz_demux, const char *psz_path );
access_t * access2_FilterNew( access_t *p_source,
access_t * access_FilterNew( access_t *p_source,
const char *psz_access_filter );
void access2_Delete( access_t * );
void access_Delete( access_t * );
/* Demuxer */
#include <vlc_demux.h>

50
src/input/stream.c
View File

@ -206,7 +206,7 @@ stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url )
MRLSplit( psz_dup, &psz_access, &psz_demux, &psz_path );
/* Now try a real access */
p_access = access2_New( p_parent, psz_access, psz_demux, psz_path );
p_access = access_New( p_parent, psz_access, psz_demux, psz_path );
if( p_access == NULL )
{
@ -216,7 +216,7 @@ stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url )
if( !( p_res = stream_AccessNew( p_access, true ) ) )
{
access2_Delete( p_access );
access_Delete( p_access );
return NULL;
}
@ -258,7 +258,7 @@ stream_t *stream_AccessNew( access_t *p_access, bool b_quick )
p_sys->i_pos = p_access->info.i_pos;
/* Stats */
access2_Control( p_access, ACCESS_CAN_FASTSEEK, &p_sys->stat.b_fastseek );
access_Control( p_access, ACCESS_CAN_FASTSEEK, &p_sys->stat.b_fastseek );
p_sys->stat.i_bytes = 0;
p_sys->stat.i_read_time = 0;
p_sys->stat.i_read_count = 0;
@ -304,7 +304,7 @@ stream_t *stream_AccessNew( access_t *p_access, bool b_quick )
psz_name = strdup( psz_name );
if( psz_name )
{
access_t *p_tmp = access2_New( p_access, p_access->psz_access,
access_t *p_tmp = access_New( p_access, p_access->psz_access,
"", psz_name );
if( !p_tmp )
@ -327,7 +327,7 @@ stream_t *stream_AccessNew( access_t *p_access, bool b_quick )
p_entry->psz_path = psz_name;
TAB_APPEND( p_sys->i_list, p_sys->list, p_entry );
access2_Delete( p_tmp );
access_Delete( p_tmp );
}
psz_name = psz_parser;
@ -380,7 +380,7 @@ stream_t *stream_AccessNew( access_t *p_access, bool b_quick )
goto error;
}
p_sys->stream.i_used = 0;
access2_Control( p_access, ACCESS_GET_MTU,
access_Control( p_access, ACCESS_GET_MTU,
&p_sys->stream.i_read_size );
if( p_sys->stream.i_read_size <= 0 )
p_sys->stream.i_read_size = STREAM_READ_ATONCE;
@ -442,7 +442,7 @@ static void AStreamDestroy( stream_t *s )
free( p_sys->p_peek );
if( p_sys->p_list_access && p_sys->p_list_access != p_sys->p_access )
access2_Delete( p_sys->p_list_access );
access_Delete( p_sys->p_list_access );
while( p_sys->i_list-- )
{
@ -460,7 +460,7 @@ static void UStreamDestroy( stream_t *s )
access_t *p_access = (access_t*)vlc_object_find( s, VLC_OBJECT_ACCESS, FIND_PARENT );
AStreamDestroy( s );
vlc_object_release( p_access );
access2_Delete( p_access );
access_Delete( p_access );
}
/****************************************************************************
@ -556,12 +556,12 @@ static int AStreamControl( stream_t *s, int i_query, va_list args )
case STREAM_CAN_SEEK:
p_bool = (bool*)va_arg( args, bool * );
access2_Control( p_access, ACCESS_CAN_SEEK, p_bool );
access_Control( p_access, ACCESS_CAN_SEEK, p_bool );
break;
case STREAM_CAN_FASTSEEK:
p_bool = (bool*)va_arg( args, bool * );
access2_Control( p_access, ACCESS_CAN_FASTSEEK, p_bool );
access_Control( p_access, ACCESS_CAN_FASTSEEK, p_bool );
break;
case STREAM_GET_POSITION:
@ -589,10 +589,10 @@ static int AStreamControl( stream_t *s, int i_query, va_list args )
"DON'T USE STREAM_CONTROL_ACCESS !!!" );
return VLC_EGENERIC;
}
return access2_vaControl( p_access, i_int, args );
return access_vaControl( p_access, i_int, args );
case STREAM_GET_CONTENT_TYPE:
return access2_Control( p_access, ACCESS_GET_CONTENT_TYPE,
return access_Control( p_access, ACCESS_GET_CONTENT_TYPE,
va_arg( args, char ** ) );
default:
@ -700,7 +700,7 @@ static int AStreamReadBlock( stream_t *s, void *p_read, int i_read )
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
bool b_aseek;
access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
if( b_aseek )
return AStreamSeekBlock( s, p_sys->i_pos + i_read ) ? 0 : i_read;
}
@ -840,7 +840,7 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos )
if( i_offset < 0 )
{
bool b_aseek;
access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
if( !b_aseek )
{
@ -854,8 +854,8 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos )
{
bool b_aseek, b_aseekfast;
access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
access2_Control( p_access, ACCESS_CAN_FASTSEEK, &b_aseekfast );
access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
access_Control( p_access, ACCESS_CAN_FASTSEEK, &b_aseekfast );
if( !b_aseek )
{
@ -1026,7 +1026,7 @@ static int AStreamReadStream( stream_t *s, void *p_read, int i_read )
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
bool b_aseek;
access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
if( b_aseek )
return AStreamSeekStream( s, p_sys->i_pos + i_read ) ? 0 : i_read;
}
@ -1187,7 +1187,7 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos )
return VLC_SUCCESS;
}
access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
if( !b_aseek )
{
/* We can't do nothing */
@ -1228,7 +1228,7 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos )
}
}
access2_Control( p_access, ACCESS_CAN_SEEK, &b_afastseek );
access_Control( p_access, ACCESS_CAN_SEEK, &b_afastseek );
/* FIXME compute seek cost (instead of static 'stupid' value) */
i_maxth = __MIN( p_sys->stream.i_read_size, STREAM_READ_ATONCE / 2 );
if( !b_afastseek )
@ -1709,12 +1709,12 @@ static int AReadStream( stream_t *s, void *p_read, int i_read )
msg_Dbg( s, "opening input `%s'", psz_name );
p_list_access = access2_New( s, p_access->psz_access, "", psz_name );
p_list_access = access_New( s, p_access->psz_access, "", psz_name );
if( !p_list_access ) return 0;
if( p_sys->p_list_access != p_access )
access2_Delete( p_sys->p_list_access );
access_Delete( p_sys->p_list_access );
p_sys->p_list_access = p_list_access;
@ -1777,12 +1777,12 @@ static block_t *AReadBlock( stream_t *s, bool *pb_eof )
msg_Dbg( s, "opening input `%s'", psz_name );
p_list_access = access2_New( s, p_access->psz_access, "", psz_name );
p_list_access = access_New( s, p_access->psz_access, "", psz_name );
if( !p_list_access ) return 0;
if( p_sys->p_list_access != p_access )
access2_Delete( p_sys->p_list_access );
access_Delete( p_sys->p_list_access );
p_sys->p_list_access = p_list_access;
@ -1832,7 +1832,7 @@ static int ASeek( stream_t *s, int64_t i_pos )
if( i != p_sys->i_list_index && i != 0 )
{
p_list_access =
access2_New( s, p_access->psz_access, "", psz_name );
access_New( s, p_access->psz_access, "", psz_name );
}
else if( i != p_sys->i_list_index )
{
@ -1842,7 +1842,7 @@ static int ASeek( stream_t *s, int64_t i_pos )
if( p_list_access )
{
if( p_sys->p_list_access != p_access )
access2_Delete( p_sys->p_list_access );
access_Delete( p_sys->p_list_access );
p_sys->p_list_access = p_list_access;
}

2
src/libvlc-module.c
View File

@ -1701,7 +1701,7 @@ vlc_module_begin();
set_subcategory( SUBCAT_INPUT_ACCESS );
add_category_hint( N_("Input"), INPUT_CAT_LONGTEXT , false );
add_module( "access", "access2", NULL, NULL, ACCESS_TEXT,
add_module( "access", "access", NULL, NULL, ACCESS_TEXT,
ACCESS_LONGTEXT, true );
set_subcategory( SUBCAT_INPUT_ACCESS_FILTER );

Write Preview
Loading…
Cancel
Save