Commit e4ba64d2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove access_t

parent f5261f8e
......@@ -8,9 +8,9 @@ match a specific expected behavior:
=== pf_readdir prototype
int (*pf_readdir)( access_t *p_access, input_item_node_t *p_node );
int (*pf_readdir)( stream_t *p_access, input_item_node_t *p_node );
* p_access: This is a pointer to the access_t object that you are
* p_access: This is a pointer to the stream_t object that you are
calling pf_readdir on. It CANNOT be NULL.
* p_node: A pointer on an input_item_node_t that you must provide and be
responsible for. In particular, you have the responsibility to free it
......
......@@ -40,7 +40,7 @@
*
* In case of redirection, the access open function should clean up (as in
* normal failure case), store the heap-allocated redirection URL in
* access_t.psz_url, and return this value.
* stream_t.psz_url, and return this value.
*/
#define VLC_ACCESS_REDIRECT VLC_ETIMEOUT
......@@ -54,7 +54,7 @@
* \param mrl media resource location to read
* \return a new access object on success, NULL on failure
*/
VLC_API access_t *vlc_access_NewMRL(vlc_object_t *obj, const char *mrl);
VLC_API stream_t *vlc_access_NewMRL(vlc_object_t *obj, const char *mrl);
/**
* \defgroup access_helper Access Helpers
......@@ -64,7 +64,7 @@ VLC_API access_t *vlc_access_NewMRL(vlc_object_t *obj, const char *mrl);
/**
* Default pf_control callback for directory accesses.
*/
VLC_API int access_vaDirectoryControlHelper( access_t *p_access, int i_query, va_list args );
VLC_API int access_vaDirectoryControlHelper( stream_t *p_access, int i_query, va_list args );
#define ACCESS_SET_CALLBACKS( read, block, control, seek ) \
do { \
......@@ -97,7 +97,7 @@ struct access_fsdir
* \param p_node node that will be used to add items
*/
VLC_API void access_fsdir_init(struct access_fsdir *p_fsdir,
access_t *p_access, input_item_node_t *p_node);
stream_t *p_access, input_item_node_t *p_node);
/**
* Finish adding items to the node
......
......@@ -212,7 +212,6 @@ typedef struct config_category_t config_category_t;
typedef struct input_thread_t input_thread_t;
typedef struct input_item_t input_item_t;
typedef struct input_item_node_t input_item_node_t;
typedef struct stream_t access_t;
typedef struct access_sys_t access_sys_t;
typedef struct stream_t stream_t;
typedef struct stream_sys_t stream_sys_t;
......
......@@ -54,9 +54,9 @@ vlc_module_end()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static ssize_t Read(access_t *, void *, size_t);
static int Seek(access_t *, uint64_t);
static int Control(access_t *, int, va_list);
static ssize_t Read(stream_t *, void *, size_t);
static int Seek(stream_t *, uint64_t);
static int Control(stream_t *, int, va_list);
struct access_sys_t
{
......@@ -67,7 +67,7 @@ struct access_sys_t
/* */
static int Open(vlc_object_t *object)
{
access_t *access = (access_t *)object;
stream_t *access = (stream_t *)object;
input_thread_t *input = access->p_input;
if (!input)
......@@ -101,14 +101,14 @@ static int Open(vlc_object_t *object)
/* */
static void Close(vlc_object_t *object)
{
access_t *access = (access_t *)object;
stream_t *access = (stream_t *)object;
access_sys_t *sys = access->p_sys;
vlc_input_attachment_Delete(sys->attachment);
}
/* */
static ssize_t Read(access_t *access, void *buffer, size_t size)
static ssize_t Read(stream_t *access, void *buffer, size_t size)
{
access_sys_t *sys = access->p_sys;
input_attachment_t *a = sys->attachment;
......@@ -123,7 +123,7 @@ static ssize_t Read(access_t *access, void *buffer, size_t size)
}
/* */
static int Seek(access_t *access, uint64_t position)
static int Seek(stream_t *access, uint64_t position)
{
access_sys_t *sys = access->p_sys;
input_attachment_t *a = sys->attachment;
......@@ -136,7 +136,7 @@ static int Seek(access_t *access, uint64_t position)
}
/* */
static int Control(access_t *access, int query, va_list args)
static int Control(stream_t *access, int query, va_list args)
{
access_sys_t *sys = access->p_sys;
......
......@@ -48,9 +48,9 @@ vlc_module_end()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static ssize_t Read (access_t *, void *, size_t);
static int Seek (access_t *, uint64_t);
static int Control(access_t *, int, va_list);
static ssize_t Read (stream_t *, void *, size_t);
static int Seek (stream_t *, uint64_t);
static int Control(stream_t *, int, va_list);
static ssize_t Write(sout_access_out_t *, block_t *);
static int OutControl(sout_access_out_t *, int, va_list);
static int OutSeek (sout_access_out_t *, off_t);
......@@ -82,7 +82,7 @@ struct sout_access_out_sys_t {
int OpenAvio(vlc_object_t *object)
{
access_t *access = (access_t*)object;
stream_t *access = (stream_t*)object;
access_sys_t *sys = vlc_malloc(object, sizeof(*sys));
if (!sys)
return VLC_ENOMEM;
......@@ -197,7 +197,7 @@ int OutOpenAvio(vlc_object_t *object)
void CloseAvio(vlc_object_t *object)
{
access_t *access = (access_t*)object;
stream_t *access = (stream_t*)object;
access_sys_t *sys = access->p_sys;
avio_close(sys->context);
......@@ -211,7 +211,7 @@ void OutCloseAvio(vlc_object_t *object)
avio_close(sys->context);
}
static ssize_t Read(access_t *access, void *data, size_t size)
static ssize_t Read(stream_t *access, void *data, size_t size)
{
access_sys_t *sys = access->p_sys;
......@@ -255,7 +255,7 @@ error:
return i_write;
}
static int Seek(access_t *access, uint64_t position)
static int Seek(stream_t *access, uint64_t position)
{
access_sys_t *sys = access->p_sys;
int ret;
......@@ -305,7 +305,7 @@ static int OutControl(sout_access_out_t *p_access, int i_query, va_list args)
return VLC_SUCCESS;
}
static int Control(access_t *access, int query, va_list args)
static int Control(stream_t *access, int query, va_list args)
{
access_sys_t *sys = access->p_sys;
bool *b;
......
......@@ -401,7 +401,7 @@ error:
}
#endif /* HAVE_LIBCDDB */
static void AccessGetMeta(access_t *access, vlc_meta_t *meta)
static void AccessGetMeta(stream_t *access, vlc_meta_t *meta)
{
access_sys_t *sys = access->p_sys;
const char *str;
......@@ -466,7 +466,7 @@ static void AccessGetMeta(access_t *access, vlc_meta_t *meta)
#endif
}
static int ReadDir(access_t *access, input_item_node_t *node)
static int ReadDir(stream_t *access, input_item_node_t *node)
{
access_sys_t *sys = access->p_sys;
......@@ -594,7 +594,7 @@ static int ReadDir(access_t *access, input_item_node_t *node)
return VLC_SUCCESS;
}
static int AccessControl(access_t *access, int query, va_list args)
static int AccessControl(stream_t *access, int query, va_list args)
{
if (query == STREAM_GET_META)
{
......@@ -606,7 +606,7 @@ static int AccessControl(access_t *access, int query, va_list args)
static int AccessOpen(vlc_object_t *obj)
{
access_t *access = (access_t *)obj;
stream_t *access = (stream_t *)obj;
unsigned track;
vcddev_t *dev = DiscOpen(obj, access->psz_location, access->psz_filepath,
......@@ -676,7 +676,7 @@ error:
static void AccessClose(vlc_object_t *obj)
{
access_t *access = (access_t *)obj;
stream_t *access = (stream_t *)obj;
access_sys_t *sys = access->p_sys;
for (int i = 0; i < sys->cdtextc; i++)
......
......@@ -37,7 +37,7 @@ struct access_entry
struct access_sys_t
{
access_t *access;
stream_t *access;
struct access_entry *next;
struct access_entry *first;
bool can_seek;
......@@ -48,10 +48,10 @@ struct access_sys_t
int64_t caching;
};
static access_t *GetAccess(access_t *access)
static stream_t *GetAccess(stream_t *access)
{
access_sys_t *sys = access->p_sys;
access_t *a = sys->access;
stream_t *a = sys->access;
if (a != NULL)
{
......@@ -74,9 +74,9 @@ static access_t *GetAccess(access_t *access)
return a;
}
static ssize_t Read(access_t *access, void *buf, size_t len)
static ssize_t Read(stream_t *access, void *buf, size_t len)
{
access_t *a = GetAccess(access);
stream_t *a = GetAccess(access);
if (a == NULL)
return 0;
......@@ -89,9 +89,9 @@ static ssize_t Read(access_t *access, void *buf, size_t len)
return vlc_stream_ReadPartial(a, buf, len);
}
static block_t *Block(access_t *access, bool *restrict eof)
static block_t *Block(stream_t *access, bool *restrict eof)
{
access_t *a = GetAccess(access);
stream_t *a = GetAccess(access);
if (a == NULL)
{
*eof = true;
......@@ -101,7 +101,7 @@ static block_t *Block(access_t *access, bool *restrict eof)
return vlc_stream_ReadBlock(a);
}
static int Seek(access_t *access, uint64_t position)
static int Seek(stream_t *access, uint64_t position)
{
access_sys_t *sys = access->p_sys;
......@@ -115,7 +115,7 @@ static int Seek(access_t *access, uint64_t position)
for (uint64_t offset = 0;;)
{
access_t *a = GetAccess(access);
stream_t *a = GetAccess(access);
if (a == NULL)
break;
......@@ -143,7 +143,7 @@ static int Seek(access_t *access, uint64_t position)
return VLC_EGENERIC;
}
static int Control(access_t *access, int query, va_list args)
static int Control(stream_t *access, int query, va_list args)
{
access_sys_t *sys = access->p_sys;
......@@ -182,7 +182,7 @@ static int Control(access_t *access, int query, va_list args)
static int Open(vlc_object_t *obj)
{
access_t *access = (access_t *)obj;
stream_t *access = (stream_t *)obj;
char *list = var_CreateGetNonEmptyString(access, "concat-list");
if (list == NULL)
......@@ -218,7 +218,7 @@ static int Open(vlc_object_t *obj)
if (unlikely(e == NULL))
break;
access_t *a = vlc_access_NewMRL(obj, mrl);
stream_t *a = vlc_access_NewMRL(obj, mrl);
if (a == NULL)
{
msg_Err(access, "cannot concatenate location %s", mrl);
......@@ -285,7 +285,7 @@ static int Open(vlc_object_t *obj)
static void Close(vlc_object_t *obj)
{
access_t *access = (access_t *)obj;
stream_t *access = (stream_t *)obj;
access_sys_t *sys = access->p_sys;
if (sys->access != NULL)
......
......@@ -51,7 +51,7 @@ struct access_sys_t
/*****************************************************************************
* DirInit: Init the directory access with a directory stream
*****************************************************************************/
int DirInit (access_t *access, DIR *dir)
int DirInit (stream_t *access, DIR *dir)
{
access_sys_t *sys = vlc_malloc(VLC_OBJECT(access), sizeof (*sys));
if (unlikely(sys == NULL))
......@@ -85,7 +85,7 @@ error:
*****************************************************************************/
int DirOpen (vlc_object_t *obj)
{
access_t *access = (access_t *)obj;
stream_t *access = (stream_t *)obj;
if (access->psz_filepath == NULL)
return VLC_EGENERIC;
......@@ -102,14 +102,14 @@ int DirOpen (vlc_object_t *obj)
*****************************************************************************/
void DirClose(vlc_object_t *obj)
{
access_t *access = (access_t *)obj;
stream_t *access = (stream_t *)obj;
access_sys_t *sys = access->p_sys;
free(sys->base_uri);
closedir(sys->dir);
}
int DirRead (access_t *access, input_item_node_t *node)
int DirRead (stream_t *access, input_item_node_t *node)
{
access_sys_t *sys = access->p_sys;
const char *entry;
......
......@@ -60,8 +60,8 @@
/*****************************************************************************
* Access: local prototypes
*****************************************************************************/
static block_t *ReadCompressed( access_t *, bool * );
static int AccessControl ( access_t *, int, va_list );
static block_t *ReadCompressed( stream_t *, bool * );
static int AccessControl ( stream_t *, int, va_list );
static int Demux ( demux_t * );
static int DemuxControl( demux_t *, int, va_list );
......@@ -781,7 +781,7 @@ static int DemuxOpen( vlc_object_t *p_this )
*****************************************************************************/
static int AccessOpen( vlc_object_t *p_this )
{
access_t *p_access = (access_t*)p_this;
stream_t *p_access = (stream_t*)p_this;
access_sys_t *p_sys;
p_access->p_sys = p_sys = (access_sys_t*)calloc( 1, sizeof( access_sys_t ) );
......@@ -839,7 +839,7 @@ static void CommonClose( vlc_object_t *p_this, access_sys_t *p_sys )
*****************************************************************************/
static void AccessClose( vlc_object_t *p_this )
{
access_t *p_access = (access_t *)p_this;
stream_t *p_access = (stream_t *)p_this;
access_sys_t *p_sys = (access_sys_t *)p_access->p_sys;
ComContext ctx( COINIT_MULTITHREADED );
......@@ -1759,7 +1759,7 @@ static size_t EnumDeviceCaps( vlc_object_t *p_this, IBaseFilter *p_filter,
/*****************************************************************************
* ReadCompressed: reads compressed (MPEG/DV) data from the device.
*****************************************************************************/
static block_t *ReadCompressed( access_t *p_access, bool *eof )
static block_t *ReadCompressed( stream_t *p_access, bool *eof )
{
ComContext ctx( COINIT_MULTITHREADED );
......@@ -1908,7 +1908,7 @@ static int Demux( demux_t *p_demux )
/*****************************************************************************
* AccessControl:
*****************************************************************************/
static int AccessControl( access_t *p_access, int i_query, va_list args )
static int AccessControl( stream_t *p_access, int i_query, va_list args )
{
access_sys_t *sys = (access_sys_t *)p_access->p_sys;
bool *pb_bool;
......
......@@ -90,15 +90,15 @@ vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static ssize_t Read( access_t *, void *, size_t );
static int Seek( access_t *, uint64_t );
static int Control( access_t *, int, va_list );
static int BrowserInit( access_t *p_access );
static int get_address( access_t *p_access );
static int login( access_t *p_access );
static bool get_path( access_t *p_access );
static int add_item( access_t *p_access, struct access_fsdir *p_fsdir,
static ssize_t Read( stream_t *, void *, size_t );
static int Seek( stream_t *, uint64_t );
static int Control( stream_t *, int, va_list );
static int BrowserInit( stream_t *p_access );
static int get_address( stream_t *p_access );
static int login( stream_t *p_access );
static bool get_path( stream_t *p_access );
static int add_item( stream_t *p_access, struct access_fsdir *p_fsdir,
const char *psz_name, int i_type );
struct access_sys_t
......@@ -123,7 +123,7 @@ struct access_sys_t
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
access_t *p_access = (access_t*)p_this;
stream_t *p_access = (stream_t*)p_this;
access_sys_t *p_sys;
smb_stat st;
......@@ -196,7 +196,7 @@ static int Open( vlc_object_t *p_this )
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
access_t *p_access = (access_t*)p_this;
stream_t *p_access = (stream_t*)p_this;
access_sys_t *p_sys = p_access->p_sys;
if( p_sys->p_ns )
......@@ -216,7 +216,7 @@ static void Close( vlc_object_t *p_this )
*****************************************************************************/
/* Returns VLC_EGENERIC if it wasn't able to get an ip address to connect to */
static int get_address( access_t *p_access )
static int get_address( stream_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
......@@ -267,7 +267,7 @@ static int get_address( access_t *p_access )
return VLC_SUCCESS;
}
static int smb_connect( access_t *p_access, const char *psz_login,
static int smb_connect( stream_t *p_access, const char *psz_login,
const char *psz_password, const char *psz_domain)
{
access_sys_t *p_sys = p_access->p_sys;
......@@ -295,7 +295,7 @@ static int smb_connect( access_t *p_access, const char *psz_login,
return VLC_EGENERIC;
}
static bool smb_has_invalid_creds( access_t *p_access )
static bool smb_has_invalid_creds( stream_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
uint32_t i_nt_status = smb_session_get_nt_status( p_sys->p_session );
......@@ -305,7 +305,7 @@ static bool smb_has_invalid_creds( access_t *p_access )
/* Performs login with existing credentials and ask the user for new ones on
failure */
static int login( access_t *p_access )
static int login( stream_t *p_access )
{
int i_ret = VLC_EGENERIC;
access_sys_t *p_sys = p_access->p_sys;
......@@ -389,7 +389,7 @@ static void backslash_path( char *psz_path )
}
/* Get the share and filepath from uri (also replace all / by \ in url.psz_path) */
static bool get_path( access_t *p_access )
static bool get_path( stream_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
char *iter;
......@@ -437,7 +437,7 @@ static bool get_path( access_t *p_access )
/*****************************************************************************
* Seek: try to go at the right place
*****************************************************************************/
static int Seek( access_t *p_access, uint64_t i_pos )
static int Seek( stream_t *p_access, uint64_t i_pos )
{
access_sys_t *p_sys = p_access->p_sys;
......@@ -455,7 +455,7 @@ static int Seek( access_t *p_access, uint64_t i_pos )
/*****************************************************************************
* Read:
*****************************************************************************/
static ssize_t Read( access_t *p_access, void *p_buffer, size_t i_len )
static ssize_t Read( stream_t *p_access, void *p_buffer, size_t i_len )
{
access_sys_t *p_sys = p_access->p_sys;
int i_read;
......@@ -473,7 +473,7 @@ static ssize_t Read( access_t *p_access, void *p_buffer, size_t i_len )
/*****************************************************************************
* Control:
*****************************************************************************/
static int Control( access_t *p_access, int i_query, va_list args )
static int Control( stream_t *p_access, int i_query, va_list args )
{
access_sys_t *p_sys = p_access->p_sys;
......@@ -511,7 +511,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
return VLC_SUCCESS;
}
static int add_item( access_t *p_access, struct access_fsdir *p_fsdir,
static int add_item( stream_t *p_access, struct access_fsdir *p_fsdir,
const char *psz_name, int i_type )
{
char *psz_uri;
......@@ -532,7 +532,7 @@ static int add_item( access_t *p_access, struct access_fsdir *p_fsdir,
return access_fsdir_additem( p_fsdir, psz_uri, psz_name, i_type, ITEM_NET );
}
static int BrowseShare( access_t *p_access, input_item_node_t *p_node )
static int BrowseShare( stream_t *p_access, input_item_node_t *p_node )
{
access_sys_t *p_sys = p_access->p_sys;
smb_share_list shares;
......@@ -563,7 +563,7 @@ static int BrowseShare( access_t *p_access, input_item_node_t *p_node )
return i_ret;
}
static int BrowseDirectory( access_t *p_access, input_item_node_t *p_node )
static int BrowseDirectory( stream_t *p_access, input_item_node_t *p_node )
{
access_sys_t *p_sys = p_access->p_sys;
smb_stat_list files;
......@@ -614,7 +614,7 @@ static int BrowseDirectory( access_t *p_access, input_item_node_t *p_node )
return i_ret;
}
static int BrowserInit( access_t *p_access )
static int BrowserInit( stream_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
......
......@@ -431,8 +431,8 @@ struct access_sys_t
tuner_setup_t pf_setup;
};
static block_t *Read (access_t *, bool *);
static int Control (access_t *, int, va_list);
static block_t *Read (stream_t *, bool *);
static int Control (stream_t *, int, va_list);
static dtv_delivery_t GuessSystem (const char *, dvb_device_t *);
static dtv_delivery_t GetDeliveryByScheme(const char *psz_scheme);
static int Tune (vlc_object_t *, dvb_device_t *, tuner_setup_t, uint64_t);
......@@ -442,7 +442,7 @@ tuner_setup_t dtv_get_delivery_tuner_setup( dtv_delivery_t d );
static int Open (vlc_object_t *obj)
{
access_t *access = (access_t *)obj;
stream_t *access = (stream_t *)obj;
access_sys_t *sys = malloc (sizeof (*sys));
if (unlikely(sys == NULL))
return VLC_ENOMEM;
......@@ -492,14 +492,14 @@ error:
static void Close (vlc_object_t *obj)
{
access_t *access = (access_t *)obj;
stream_t *access = (stream_t *)obj;
access_sys_t *sys = access->p_sys;
dvb_close (sys->dev);
free (sys);
}
static block_t *Read (access_t *access, bool *restrict eof)
static block_t *Read (stream_t *access, bool *restrict eof)
{
#define BUFSIZE (20*188)
block_t *block = block_Alloc (BUFSIZE);
......@@ -522,7 +522,7 @@ static block_t *Read (access_t *access, bool *restrict eof)
return block;
}
static int Control (access_t *access, int query, va_list args)
static int Control (stream_t *access, int query, va_list args)
{
access_sys_t *sys = access->p_sys;
dvb_device_t *dev = sys->dev;
......
......@@ -50,8 +50,8 @@
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
static block_t *Block( access_t *, bool * );
static int Control( access_t *, int, va_list );
static block_t *Block( stream_t *, bool * );
static int Control( stream_t *, int, va_list );
vlc_module_begin ()
set_description( N_("Digital Video (Firewire/ieee1394) input") )
......@@ -66,7 +66,7 @@ vlc_module_end ()
typedef struct
{
vlc_thread_t thread;
access_t *p_access;
stream_t *p_access;
vlc_mutex_t lock;
block_t *p_frame;
block_t **pp_last;
......@@ -80,17 +80,17 @@ Raw1394Handler(raw1394handle_t, unsigned char *,
unsigned char, unsigned char, unsigned int,
unsigned int);
static int Raw1394GetNumPorts( access_t *p_access );
static raw1394handle_t Raw1394Open( access_t *, int );
static int Raw1394GetNumPorts( stream_t *p_access );
static raw1394handle_t Raw1394Open( stream_t *, int );
static void Raw1394Close( raw1394handle_t );
static int DiscoverAVC( access_t *, int *, uint64_t );
static raw1394handle_t AVCOpen( access_t *, int );
static void AVCClose( access_t * );
static int DiscoverAVC( stream_t *, int *, uint64_t );
static raw1394handle_t AVCOpen( stream_t *, int );
static void AVCClose( stream_t * );
static int AVCResetHandler( raw1394handle_t, unsigned int );
static int AVCPlay( access_t *, int );
static int AVCPause( access_t *, int );
static int AVCStop( access_t *, int );
static int AVCPlay( stream_t *, int );
static int AVCPause( stream_t *, int );
static int AVCStop( stream_t *, int );
struct access_sys_t
{
......@@ -118,7 +118,7 @@ struct access_sys_t
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
access_t *p_access = (access_t*)p_this;
stream_t *p_access = (stream_t*)p_this;
access_sys_t *p_sys;
struct raw1394_portinfo port_inf[ 16 ];
......@@ -227,7 +227,7 @@ static int Open( vlc_object_t *p_this )
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
access_t *p_access = (access_t*)p_this;
stream_t *p_access = (stream_t*)p_this;
access_sys_t *p_sys = p_access->p_sys;
if( p_sys->p_ev )
......@@ -264,7 +264,7 @@ static void Close( vlc_object_t *p_this )
/*****************************************************************************
* Control:
*****************************************************************************/
static int Control( access_t *p_access, int i_query, va_list args )
static int Control( stream_t *p_access, int i_query, va_list args )
{
access_sys_t *sys = p_access->p_sys;
......@@ -298,7 +298,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
return VLC_SUCCESS;
}
static block_t *Block( access_t *p_access, bool *restrict eof )
static block_t *Block( stream_t *p_access, bool *restrict eof )
{
access_sys_t *p_sys = p_access->p_sys;
block_t *p_block = NULL;
......@@ -324,7 +324,7 @@ static void Raw1394EventThreadCleanup( void *obj )
static void* Raw1394EventThread( void *obj )
{
event_thread_t *p_ev = (event_thread_t *)obj;
access_t *p_access = (access_t *) p_ev->p_access;
stream_t *p_access = (stream_t *) p_ev->p_access;
access_sys_t *p_sys = (access_sys_t *) p_access->p_sys;
int result = 0;
int canc = vlc_savecancel();
......@@ -360,13 +360,13 @@ Raw1394Handler(raw1394handle_t handle, unsigned char *data,
unsigned char tag, unsigned char sy, unsigned int cycle,
unsigned int dropped)
{
access_t *p_access = NULL;
stream_t *p_access = NULL;
access_sys_t *p_sys = NULL;
block_t *p_block = NULL;
VLC_UNUSED(channel); VLC_UNUSED(tag);
VLC_UNUSED(sy); VLC_UNUSED(cycle); VLC_UNUSED(dropped);
p_access = (access_t *) raw1394_get_userdata( handle );
p_access = (stream_t *) raw1394_get_userdata( handle );
if( !p_access ) return 0;
p_sys = p_access->p_sys;
......@@ -441,7 +441,7 @@ Raw1394Handler(raw1394handle_t handle, unsigned char *data,
* Copyright by Arne Schirmacher <dvgrab@schirmacher.de>
* Dan Dennedy <dan@dennedy.org> and others
*/
static int Raw1394GetNumPorts( access_t *p_access )
static int Raw1394GetNumPorts( stream_t *p_access )
{
int n_ports;
struct raw1394_portinfo pinf[ 16 ];
......@@ -467,7 +467,7 @@ static int Raw1394GetNumPorts( access_t *p_access )
return n_ports;
}
static raw1394handle_t Raw1394Open( access_t *p_access, int port )
static raw1394handle_t Raw1394Open( stream_t *p_access, int port )
{
int n_ports;
struct raw1394_portinfo pinf[ 16 ];
......@@ -506,7 +506,7 @@ static void Raw1394Close( raw1394handle_t handle )
raw1394_destroy_handle( handle );
}
static int DiscoverAVC( access_t *p_access, int* port, uint64_t guid )
static int DiscoverAVC( stream_t *p_access, int* port, uint64_t guid )
{
rom1394_directory rom_dir;
raw1394handle_t handle = NULL;
......@@ -565,7 +565,7 @@ static int DiscoverAVC( access_t *p_access, int* port, uint64_t guid )
/*
* Handle AVC commands
*/
static raw1394handle_t AVCOpen( access_t *p_access, int port )
static raw1394handle_t AVCOpen( stream_t *p_access, int port )
{
access_sys_t *p_sys = p_access->p_sys;
struct raw1394_portinfo pinf[ 16 ];
......@@ -586,7 +586,7 @@ static raw1394handle_t AVCOpen( access_t *p_access, int port )
return p_sys->p_avc1394;
}