block_FifoNew: remove un-needed parameter

diff --git a/include/vlc_block.h b/include/vlc_block.h
index fda20ce6434cf440ba271a54156dcd921b2a76d4..780c44f736cc5a392cd13a99c78b570f99b00062 100644 (file)
--- a/include/vlc_block.h
+++ b/include/vlc_block.h
@@ -271,8 +271,7 @@ static inline block_t *block_ChainGather( block_t *p_list )
  *   (this is used to wakeup a thread when there is no data to queue)
  ****************************************************************************/
 
-#define block_FifoNew( a ) __block_FifoNew( VLC_OBJECT(a) )
-VLC_EXPORT( block_fifo_t *, __block_FifoNew,    ( vlc_object_t * ) );
+VLC_EXPORT( block_fifo_t *, block_FifoNew,      ( void ) );
 VLC_EXPORT( void,           block_FifoRelease,  ( block_fifo_t * ) );
 VLC_EXPORT( void,           block_FifoEmpty,    ( block_fifo_t * ) );
 VLC_EXPORT( size_t,         block_FifoPut,      ( block_fifo_t *, block_t * ) );

diff --git a/modules/access/rtmp/access.c b/modules/access/rtmp/access.c
index 0182f8f067f98edc19edb704836441ec6ae951d6..9ae019ed3161eb35753b0f0995791d06437ee414 100644 (file)
--- a/modules/access/rtmp/access.c
+++ b/modules/access/rtmp/access.c
@@ -146,8 +146,8 @@ static int Open( vlc_object_t *p_this )
     vlc_object_attach( p_sys->p_thread, p_access );
     p_sys->p_thread->b_die = 0;
     p_sys->p_thread->b_error= 0;
-    p_sys->p_thread->p_fifo_media = block_FifoNew( p_access );
-    p_sys->p_thread->p_empty_blocks = block_FifoNew( p_access );
+    p_sys->p_thread->p_fifo_media = block_FifoNew();
+    p_sys->p_thread->p_empty_blocks = block_FifoNew();
     p_sys->p_thread->has_audio = 0;
     p_sys->p_thread->has_video = 0;
     p_sys->p_thread->metadata_received = 0;

diff --git a/modules/access_filter/timeshift.c b/modules/access_filter/timeshift.c
index e2540176b61c28c666db0bd872d5e076525f4d82..fea0c1db3ca731d19ca259d3a381c8fc36ae08fd 100644 (file)
--- a/modules/access_filter/timeshift.c
+++ b/modules/access_filter/timeshift.c
@@ -161,7 +161,7 @@ static int Open( vlc_object_t *p_this )
     p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
 
     /* */
-    p_sys->p_fifo = block_FifoNew( p_access );
+    p_sys->p_fifo = block_FifoNew();
     p_sys->i_write_size = 0;
     p_sys->i_files = 0;
     p_sys->i_data = 0;

diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c
index 0ef2828532e445ca30ba832328e841c021b328a9..82960a294a7a0185d2a7723b6b325cdca8969c5c 100644 (file)
--- a/modules/access_output/udp.c
+++ b/modules/access_output/udp.c
@@ -221,8 +221,8 @@ static int Open( vlc_object_t *p_this )
     p_sys->p_thread->p_sout = p_access->p_sout;
     p_sys->p_thread->b_die  = 0;
     p_sys->p_thread->b_error= 0;
-    p_sys->p_thread->p_fifo = block_FifoNew( p_access );
-    p_sys->p_thread->p_empty_blocks = block_FifoNew( p_access );
+    p_sys->p_thread->p_fifo = block_FifoNew();
+    p_sys->p_thread->p_empty_blocks = block_FifoNew();
 
     i_handle = net_ConnectDgram( p_this, psz_dst_addr, i_dst_port, -1,
                                  IPPROTO_UDP );

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index 27bf61830e50da6362ec8dca25f2da9dc028514c..1b9fad3229fcc3f241a5697d7f7b95df9000cd38 100644 (file)
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -297,7 +297,7 @@ static int Open( vlc_object_t *p_this )
     p_vod->pf_media_add_es = MediaAddES;
     p_vod->pf_media_del_es = MediaDelES;
 
-    p_sys->p_fifo_cmd = block_FifoNew( p_vod );
+    p_sys->p_fifo_cmd = block_FifoNew();
     if( vlc_thread_create( p_vod, "rtsp vod thread", CommandThread,
                            VLC_THREAD_PRIORITY_LOW, false ) )
     {

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index b0f6dd0ee0d76d6201076fa8570e16d820c4cfdd..f0aae26a193f70f6562c0e3f99f166e0a0b2894f 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -1162,7 +1162,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
                                  p_sys->psz_destination,
                                  p_sys->i_ttl, id->i_port, id->i_port + 1 );
 
-    id->p_fifo = block_FifoNew( p_stream );
+    id->p_fifo = block_FifoNew();
     if( vlc_thread_create( id, "RTP send thread", ThreadSend,
                            VLC_THREAD_PRIORITY_HIGHEST, false ) )
         goto error;

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 5eaa1b3abe695c6e257d676d18041370d819c190..24d0e61394d3fd7456e82a1a1bc764034fbf4fcc 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -483,7 +483,7 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
     p_dec->p_owner->p_packetizer = NULL;
 
     /* decoder fifo */
-    if( ( p_dec->p_owner->p_fifo = block_FifoNew( p_dec ) ) == NULL )
+    if( ( p_dec->p_owner->p_fifo = block_FifoNew() ) == NULL )
     {
         msg_Err( p_dec, "out of memory" );
         return NULL;

diff --git a/src/input/demux.c b/src/input/demux.c
index 6116346c1c80a07ce8950539ce3f067b14adc1c2..8b17db8c6f189918f5482becdb10760e22e9a6d0 100644 (file)
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -337,7 +337,7 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux,
     p_sys->psz_name = strdup( psz_demux );
 
     /* decoder fifo */
-    if( ( p_sys->p_fifo = block_FifoNew( s ) ) == NULL )
+    if( ( p_sys->p_fifo = block_FifoNew() ) == NULL )
     {
         msg_Err( s, "out of memory" );
         vlc_object_release( s );

diff --git a/src/libvlc.sym b/src/libvlc.sym
index 014ecb94ae34fbe02e59b488ff10bf8e63f83c48..dc445b482c63fc9a91c124e34608cc4b626cd5ad 100644 (file)
--- a/src/libvlc.sym
+++ b/src/libvlc.sym
@@ -35,7 +35,7 @@ block_Alloc
 block_FifoCount
 block_FifoEmpty
 block_FifoGet
-__block_FifoNew
+block_FifoNew
 block_FifoPut
 block_FifoRelease
 block_FifoShow

diff --git a/src/misc/block.c b/src/misc/block.c
index 7e94ec9419f682d2fc4fe3ed4afee25ad7b37aed..a6e5dff3a539829f72b650979633cdccc5d143de 100644 (file)
--- a/src/misc/block.c
+++ b/src/misc/block.c
@@ -243,14 +243,14 @@ struct block_fifo_t
     bool          b_force_wake;
 };
 
-block_fifo_t *__block_FifoNew( vlc_object_t *p_obj )
+block_fifo_t *block_FifoNew( void )
 {
-    block_fifo_t *p_fifo;
+    block_fifo_t *p_fifo = malloc( sizeof( block_fifo_t ) );
+    if( !p_fifo )
+        return NULL;
 
-    p_fifo = malloc( sizeof( block_fifo_t ) );
-    if( !p_fifo ) return NULL;
-    vlc_mutex_init( p_obj, &p_fifo->lock );
-    vlc_cond_init( p_obj, &p_fifo->wait );
+    vlc_mutex_init( NULL, &p_fifo->lock );
+    vlc_cond_init( NULL, &p_fifo->wait );
     p_fifo->p_first = NULL;
     p_fifo->pp_last = &p_fifo->p_first;
     p_fifo->i_depth = p_fifo->i_size = 0;

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index 8f4a76a1b7f29dae12c53a7f783e8a3893788a92..dbfbd7d61ad260cb952ca9ffefbe8e33f2065d13 100644 (file)
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -530,7 +530,7 @@ sout_input_t *sout_MuxAddStream( sout_mux_t *p_mux, es_format_t *p_fmt )
     }
     p_input->p_sout = p_mux->p_sout;
     p_input->p_fmt  = p_fmt;
-    p_input->p_fifo = block_FifoNew( p_mux->p_sout );
+    p_input->p_fifo = block_FifoNew();
     p_input->p_sys  = NULL;
 
     TAB_APPEND( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input );