videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

access: remove vlc_access_* API

This commit is contained in:
Rémi Denis-Courmont 2016-07-21 22:17:29 +03:00
parent 94b7183f51
commit 0ba43cc513
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/vlc_access.h
View File

@ -56,24 +56,6 @@
*/
VLC_API access_t *vlc_access_NewMRL(vlc_object_t *obj, const char *mrl);
#define vlc_access_Delete vlc_stream_Delete
/**
* Sets the read byte offset.
*/
#define vlc_access_Seek vlc_stream_Seek
/**
* Checks if end-of-stream is reached.
*/
#define vlc_access_Eof vlc_stream_Eof
#define vlc_access_Read vlc_stream_ReadPartial
#define vlc_access_Block vlc_stream_ReadBlock
#define access_vaControl vlc_stream_vaControl
#define access_Control vlc_stream_Control
#define access_GetSize stream_GetSize
/**
* \defgroup access_helper Access Helpers
* @{

8
modules/meta_engine/taglib.cpp
View File

@ -169,7 +169,7 @@ public:
~VlcIostream()
{
vlc_access_Delete( m_demux );
vlc_stream_Delete( m_demux );
}
FileName name() const
@ -180,7 +180,7 @@ public:
ByteVector readBlock(ulong length)
{
ByteVector res(length, 0);
int i_read = vlc_access_Read( m_demux, res.data(), length);
int i_read = vlc_stream_ReadPartial( m_demux, res.data(), length);
if (i_read < 0)
return ByteVector::null;;
res.resize(i_read);
@ -227,7 +227,7 @@ public:
default:
break;
}
vlc_access_Seek( m_demux, pos + offset );
vlc_stream_Seek( m_demux, pos + offset );
m_previousPos = pos + offset;
}
@ -244,7 +244,7 @@ public:
long length()
{
uint64_t i_size;
if (access_GetSize( m_demux, &i_size ) != VLC_SUCCESS)
if (vlc_stream_GetSize( m_demux, &i_size ) != VLC_SUCCESS)
return -1;
return i_size;
}