Hide (+minor changes) block_fifo_t layout

diff --git a/include/vlc_block.h b/include/vlc_block.h
index 7954b483f7511005a7ec8443747bb2062ee75b6c..8c09f9436eff68d645d551e1d2e2caaed3a0febd 100644 (file)
--- a/include/vlc_block.h
+++ b/include/vlc_block.h
@@ -252,8 +252,6 @@ static inline block_t *block_ChainGather( block_t *p_list )
 /****************************************************************************
  * Fifos of blocks.
  ****************************************************************************
- * Avoid touching block_fifo_t unless you really know what you are doing.
- * ( Some race conditions has to be correctly handled, like in win32 ;)
  * - block_FifoNew : create and init a new fifo
  * - block_FifoRelease : destroy a fifo and free all blocks in it.
  * - block_FifoEmpty : free all blocks in a fifo
@@ -265,16 +263,6 @@ static inline block_t *block_ChainGather( block_t *p_list )
  * - block_FifoCount : how many packets are waiting in the fifo
  * - block_FifoSize : how many cumulated bytes are waiting in the fifo
  ****************************************************************************/
-struct block_fifo_t
-{
-    vlc_mutex_t         lock;                         /* fifo data lock */
-    vlc_cond_t          wait;         /* fifo data conditional variable */
-
-    int                 i_depth;
-    block_t             *p_first;
-    block_t             **pp_last;
-    int                 i_size;
-};
 
 #define block_FifoNew( a ) __block_FifoNew( VLC_OBJECT(a) )
 VLC_EXPORT( block_fifo_t *, __block_FifoNew,    ( vlc_object_t * ) );

diff --git a/src/misc/block.c b/src/misc/block.c
index 9bc03c6178f54c09760be685e38c9ac7e7a0e601..cbfd5e9cb7cae069d030a2d7fa51fac09ba6ed72 100644 (file)
--- a/src/misc/block.c
+++ b/src/misc/block.c
@@ -155,18 +155,16 @@ static void BlockRelease( block_t *p_block )
 /*****************************************************************************
  * block_fifo_t management
  *****************************************************************************/
-#if 0
 struct block_fifo_t
 {
     vlc_mutex_t         lock;                         /* fifo data lock */
     vlc_cond_t          wait;         /* fifo data conditional variable */
 
-    int                 i_depth;
+    size_t              i_depth;
     block_t             *p_first;
     block_t             **pp_last;
-    int                 i_size;
+    size_t              i_size;
 };
-#endif
 
 block_fifo_t *__block_FifoNew( vlc_object_t *p_obj )
 {