[vlc-commits] stream: remove stream_CustomNew()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Jul 20 20:28:47 2016 +0300| [9e8c9e95cf5d698f86ad8d64f0a58cf20ea0b11a] | committer: Rémi Denis-Courmont

stream: remove stream_CustomNew()

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

 include/vlc_stream.h                             |    5 +----
 modules/demux/adaptive/plumbing/SourceStream.cpp |    2 +-
 src/input/stream.c                               |    8 --------
 src/input/stream.h                               |    1 -
 src/libvlccore.sym                               |    2 +-
 5 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index a2dda0f..34aebf0 100644
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -257,10 +257,7 @@ VLC_API block_t * stream_Block( stream_t *s, size_t );
 VLC_API char * stream_ReadLine( stream_t * );
 VLC_API int stream_ReadDir( stream_t *, input_item_node_t * );
 
-/**
- * Low level custom stream creation.
- */
-VLC_API stream_t *stream_CustomNew(vlc_object_t *, void (*)(stream_t *));
+VLC_API stream_t *stream_CommonNew(vlc_object_t *, void (*)(stream_t *));
 
 /**
  * Get the size of the stream.
diff --git a/modules/demux/adaptive/plumbing/SourceStream.cpp b/modules/demux/adaptive/plumbing/SourceStream.cpp
index 98f9b71..f41d7a0 100644
--- a/modules/demux/adaptive/plumbing/SourceStream.cpp
+++ b/modules/demux/adaptive/plumbing/SourceStream.cpp
@@ -54,7 +54,7 @@ void ChunksSourceStream::Reset()
 
 stream_t * ChunksSourceStream::makeStream()
 {
-    stream_t *p_stream = stream_CustomNew( p_obj, delete_Callback );
+    stream_t *p_stream = stream_CommonNew( p_obj, delete_Callback );
     if(p_stream)
     {
         p_stream->pf_control = control_Callback;
diff --git a/src/input/stream.c b/src/input/stream.c
index f5de439..fe454fa 100644
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -59,14 +59,6 @@ typedef struct stream_priv_t
 } stream_priv_t;
 
 /**
- * Allocates a custom VLC stream object
- */
-stream_t *stream_CustomNew(vlc_object_t *parent, void (*destroy)(stream_t *))
-{
-    return stream_CommonNew(parent, destroy);
-}
-
-/**
  * Allocates a VLC stream object
  */
 stream_t *stream_CommonNew(vlc_object_t *parent, void (*destroy)(stream_t *))
diff --git a/src/input/stream.h b/src/input/stream.h
index fa15f87..6be7763 100644
--- a/src/input/stream.h
+++ b/src/input/stream.h
@@ -29,7 +29,6 @@
 #include <vlc_stream.h>
 
 /* */
-stream_t *stream_CommonNew( vlc_object_t *, void (*destroy)(stream_t *) );
 void stream_CommonDelete( stream_t *s );
 
 /**
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index d877e12..c5477d4 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -402,8 +402,8 @@ spu_Render
 spu_RegisterChannel
 spu_ClearChannel
 stream_Block
+stream_CommonNew
 stream_Control
-stream_CustomNew
 stream_Delete
 stream_Eof
 stream_FilterNew