Some more demux and access code factorization

[vlc] / modules / access / cdda.c

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index d71d5c410295f6449aaec138fcdf248c556c7eee..2e34463aa55323c55eda172c9124e33af9fdbd9d 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -174,18 +174,7 @@ static int Open( vlc_object_t *p_this )
     free( psz_name );
 
     /* Set up p_access */
-    p_access->pf_read = NULL;
-    p_access->pf_block = Block;
-    p_access->pf_control = Control;
-    p_access->pf_seek = Seek;
-    p_access->info.i_update = 0;
-    p_access->info.i_size = 0;
-    p_access->info.i_pos = 0;
-    p_access->info.b_eof = VLC_FALSE;
-    p_access->info.i_title = 0;
-    p_access->info.i_seekpoint = 0;
-    p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
-    memset( p_sys, 0, sizeof( access_sys_t ) );
+    STANDARD_BLOCK_ACCESS_INIT
     p_sys->vcddev = vcddev;
 
     /* We only do separate items if the whole disc is requested -