Remove the unused manager from block_t

diff --git a/include/vlc_block.h b/include/vlc_block.h
index b0c06dc5fac4732f9a40178049edd5720e4a6e8d..1e155ca9524a31ac1dc856c50da9458587a6998e 100644 (file)
--- a/include/vlc_block.h
+++ b/include/vlc_block.h
@@ -100,10 +100,6 @@ struct block_t
      */
     void        (*pf_release)   ( block_t * );
 
-    /* It's an object that should be valid as long as the block_t is valid */
-    /* It should become a true block manager to reduce malloc/free */
-    vlc_object_t    *p_manager;
-
     /* Following fields are private, user should never touch it */
     /* XXX never touch that OK !!! the first that access that will
      * have Subversion account removed ;) XXX */
@@ -126,13 +122,13 @@ struct block_t
  *      and decrease are supported). Use it as it is optimised.
  * - block_Duplicate : create a copy of a block.
  ****************************************************************************/
-#define block_New( a, b ) __block_New( VLC_OBJECT(a), b )
+#define block_New( a, b ) __block_New( NULL, b )
 VLC_EXPORT( block_t *,  __block_New,        ( vlc_object_t *, size_t ) );
 VLC_EXPORT( block_t *, block_Realloc,       ( block_t *, ssize_t i_pre, size_t i_body ) );
 
 static inline block_t *block_Duplicate( block_t *p_block )
 {
-    block_t *p_dup = block_New( p_block->p_manager, p_block->i_buffer );
+    block_t *p_dup = block_New( NULL, p_block->i_buffer );
     if( p_dup == NULL )
         return NULL;
 
@@ -231,7 +227,7 @@ static inline block_t *block_ChainGather( block_t *p_list )
         i_length += b->i_length;
     }
 
-    g = block_New( p_list->p_manager, i_total );
+    g = block_New( NULL, i_total );
     block_ChainExtract( p_list, g->p_buffer, g->i_buffer );
 
     g->i_flags = p_list->i_flags;

diff --git a/modules/access/screen/win32.c b/modules/access/screen/win32.c
index a3e5699ffd9e3e05e9ab8c4c8383e23908e95e86..bf3125af3960eaf3c3f152881f14c391b5b7033e 100644 (file)
--- a/modules/access/screen/win32.c
+++ b/modules/access/screen/win32.c
@@ -214,7 +214,6 @@ static block_t *CaptureBlockNew( demux_t *p_demux )
     p_block->i_buffer       = i_buffer;
     p_block->p_buffer       = p_buffer;
     p_block->pf_release     = CaptureBlockRelease;
-    p_block->p_manager      = VLC_OBJECT( p_demux->p_libvlc );
     p_block->p_sys->hbmp    = hbmp;
 
     return p_block;

diff --git a/src/misc/block.c b/src/misc/block.c
index 5bcdda3495c50525519cd425cf1a233c84d22263..c854ec124c0ad242ba4a30009a9e8e9c2ffe3ac3 100644 (file)
--- a/src/misc/block.c
+++ b/src/misc/block.c
@@ -76,7 +76,6 @@ block_t *__block_New( vlc_object_t *p_obj, size_t i_size )
     p_block->pf_release     = BlockRelease;
 
     /* Is ok, as no comunication between p_vlc */
-    p_block->p_manager      = VLC_OBJECT( p_obj->p_libvlc );
     p_block->p_sys          = p_sys;
 
     return p_block;
@@ -123,7 +122,7 @@ block_t *block_Realloc( block_t *p_block, ssize_t i_prebody, size_t i_body )
 
     if( i_body > 0 || i_prebody > 0 )
     {
-        block_t *p_rea = block_New( p_block->p_manager, i_buffer_size );
+        block_t *p_rea = block_New( NULL, i_buffer_size );
 
         if( p_rea )
         {