Commit e7211c9a authored by Rafaël Carré's avatar Rafaël Carré

dynamic overlay: prefix some functions with do_

The symbols clash with libthreadutil of upnp
parent dbedba79
...@@ -106,7 +106,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -106,7 +106,7 @@ static int Create( vlc_object_t *p_this )
QueueInit( &p_sys->atomic ); QueueInit( &p_sys->atomic );
QueueInit( &p_sys->pending ); QueueInit( &p_sys->pending );
QueueInit( &p_sys->processed ); QueueInit( &p_sys->processed );
ListInit( &p_sys->overlays ); do_ListInit( &p_sys->overlays );
p_sys->i_inputfd = -1; p_sys->i_inputfd = -1;
p_sys->i_outputfd = -1; p_sys->i_outputfd = -1;
...@@ -146,7 +146,7 @@ static void Destroy( vlc_object_t *p_this ) ...@@ -146,7 +146,7 @@ static void Destroy( vlc_object_t *p_this )
QueueDestroy( &p_sys->atomic ); QueueDestroy( &p_sys->atomic );
QueueDestroy( &p_sys->pending ); QueueDestroy( &p_sys->pending );
QueueDestroy( &p_sys->processed ); QueueDestroy( &p_sys->processed );
ListDestroy( &p_sys->overlays ); do_ListDestroy( &p_sys->overlays );
UnregisterCommand( p_filter ); UnregisterCommand( p_filter );
var_DelCallback( p_filter, "overlay-input", AdjustCallback, p_sys ); var_DelCallback( p_filter, "overlay-input", AdjustCallback, p_sys );
......
...@@ -153,8 +153,8 @@ typedef struct list_t ...@@ -153,8 +153,8 @@ typedef struct list_t
overlay_t **pp_head, **pp_tail; overlay_t **pp_head, **pp_tail;
} list_t; } list_t;
int ListInit( list_t *p_list ); int do_ListInit( list_t *p_list );
int ListDestroy( list_t *p_list ); int do_ListDestroy( list_t *p_list );
ssize_t ListAdd( list_t *p_list, overlay_t *p_new ); ssize_t ListAdd( list_t *p_list, overlay_t *p_new );
int ListRemove( list_t *p_list, size_t i_idx ); int ListRemove( list_t *p_list, size_t i_idx );
overlay_t *ListGet( list_t *p_list, size_t i_idx ); overlay_t *ListGet( list_t *p_list, size_t i_idx );
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
* list_t: Command queue * list_t: Command queue
*****************************************************************************/ *****************************************************************************/
int ListInit( list_t *p_list ) int do_ListInit( list_t *p_list )
{ {
p_list->pp_head = calloc( 16, sizeof( overlay_t * ) ); p_list->pp_head = calloc( 16, sizeof( overlay_t * ) );
if( p_list->pp_head == NULL ) if( p_list->pp_head == NULL )
...@@ -46,7 +46,7 @@ int ListInit( list_t *p_list ) ...@@ -46,7 +46,7 @@ int ListInit( list_t *p_list )
return VLC_SUCCESS; return VLC_SUCCESS;
} }
int ListDestroy( list_t *p_list ) int do_ListDestroy( list_t *p_list )
{ {
for( overlay_t **pp_cur = p_list->pp_head; for( overlay_t **pp_cur = p_list->pp_head;
pp_cur < p_list->pp_tail; pp_cur < p_list->pp_tail;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment