<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html><head></head><body><div style="font-size: 12pt; font-family: Calibri,sans-serif;"><div>I would leave the macro as it is for non-dir accesses. It is an Evil Unsafe Macro anyway.</div><div><br></div><div>In any case, do not break the build between two patches please.</div><div><br></div><div>-- </div><div>Rémi Denis-Courmont</div><div>Sent from my NVIDIA Tegra-powered device</div><br><div id="htc_header">----- Reply message -----<br>De : "Julien 'Lta' BALLET" <elthariel@gmail.com><br>Pour : <vlc-devel@videolan.org><br>Cc : "Julien 'Lta' BALLET" <contact@lta.io><br>Objet : [vlc-devel] [PATCH 02/10] Update ACCESS_SET_CALLBACKS call to match new parameter count<br>Date : lun., juin 16, 2014 15:41</div></div><br><pre style="word-wrap: break-word; white-space: pre-wrap;">From: Julien 'Lta' BALLET <contact@lta.io>
---
modules/access/dv.c | 2 +-
modules/access/eyetv.m | 2 +-
modules/access/tcp.c | 2 +-
modules/access/udp.c | 2 +-
modules/access/zip/zipaccess.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/access/dv.c b/modules/access/dv.c
index f7792b8..8fb2f90 100644
--- a/modules/access/dv.c
+++ b/modules/access/dv.c
@@ -125,7 +125,7 @@ static int Open( vlc_object_t *p_this )
/* Set up p_access */
access_InitFields( p_access );
- ACCESS_SET_CALLBACKS( NULL, Block, Control, NULL );
+ ACCESS_SET_CALLBACKS( NULL, Block, NULL, Control, NULL );
p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
if( !p_sys )
diff --git a/modules/access/eyetv.m b/modules/access/eyetv.m
index e6010f3..19f916f 100644
--- a/modules/access/eyetv.m
+++ b/modules/access/eyetv.m
@@ -151,7 +151,7 @@ static int Open(vlc_object_t *p_this)
/* Init p_access */
access_InitFields(p_access);
- ACCESS_SET_CALLBACKS(NULL, BlockRead, Control, NULL);
+ ACCESS_SET_CALLBACKS(NULL, BlockRead, NULL, Control, NULL);
p_sys = p_access->p_sys = calloc(1, sizeof(access_sys_t));
if (!p_sys)
return VLC_ENOMEM;
diff --git a/modules/access/tcp.c b/modules/access/tcp.c
index 3fbf7f2..fdae10c 100644
--- a/modules/access/tcp.c
+++ b/modules/access/tcp.c
@@ -95,7 +95,7 @@ static int Open( vlc_object_t *p_this )
/* Init p_access */
access_InitFields( p_access );
- ACCESS_SET_CALLBACKS( Read, NULL, Control, NULL );
+ ACCESS_SET_CALLBACKS( Read, NULL, NULL, Control, NULL );
p_sys = p_access->p_sys = calloc( 1, sizeof( access_sys_t ) );
if( !p_sys )
{
diff --git a/modules/access/udp.c b/modules/access/udp.c
index 3c18cb8..7bc32c6 100644
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -104,7 +104,7 @@ static int Open( vlc_object_t *p_this )
/* Set up p_access */
access_InitFields( p_access );
- ACCESS_SET_CALLBACKS( NULL, BlockUDP, Control, NULL );
+ ACCESS_SET_CALLBACKS( NULL, BlockUDP, NULL, Control, NULL );
/* Parse psz_name syntax :
* [serveraddr[:serverport]][@[bindaddr]:[bindport]] */
diff --git a/modules/access/zip/zipaccess.c b/modules/access/zip/zipaccess.c
index 2f2b4dc..bc6afc8 100644
--- a/modules/access/zip/zipaccess.c
+++ b/modules/access/zip/zipaccess.c
@@ -169,7 +169,7 @@ int AccessOpen( vlc_object_t *p_this )
goto exit;
/* Set callback */
- ACCESS_SET_CALLBACKS( AccessRead, NULL, AccessControl, AccessSeek );
+ ACCESS_SET_CALLBACKS( AccessRead, NULL, NULL, AccessControl, AccessSeek );
p_access->info.i_pos = 0;
p_access->info.b_eof = false;
--
1.9.3
_______________________________________________
vlc-devel mailing list
To unsubscribe or modify your subscription options:
<a href="https://mailman.videolan.org/listinfo/vlc-devel">https://mailman.videolan.org/listinfo/vlc-devel</a>
</pre></body></html>