[vlc-commits] access: remove vlc_access_* API

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul 21 22:17:29 2016 +0300| [0ba43cc5130c4a7d9e74a66337680ce7261aa48e] | committer: Rémi Denis-Courmont

access: remove vlc_access_* API

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0ba43cc5130c4a7d9e74a66337680ce7261aa48e
---

 include/vlc_access.h           |   18 ------------------
 modules/meta_engine/taglib.cpp |    8 ++++----
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/include/vlc_access.h b/include/vlc_access.h
index f3574ef..1fc6e5f 100644
--- a/include/vlc_access.h
+++ b/include/vlc_access.h
@@ -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
  * @{
diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 4b8c067..08815de 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -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;
     }