* Copyright (C) 2008 the VideoLAN team
* $Id$
*
- * Author: Søren Bøg <avacore@videolan.org>
+ * Author: Soren Bog <avacore@videolan.org>
* Jean-Paul Saman <jpsaman@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_arrays.h>
#include <vlc_vout.h>
#include <vlc_filter.h>
p_ovl->i_x = p_ovl->i_y = 0;
p_ovl->i_alpha = 0xFF;
- p_ovl->b_active = VLC_FALSE;
+ p_ovl->b_active = false;
vout_InitFormat( &p_ovl->format, VLC_FOURCC( '\0','\0','\0','\0') , 0, 0,
VOUT_ASPECT_FACTOR );
memcpy( &p_ovl->fontstyle, &default_text_style, sizeof(struct text_style_t) );
int32_t i_vis = 0;
if( parse_digit( &psz_command, &i_vis ) == VLC_EGENERIC )
return VLC_EGENERIC;
- p_params->b_visible = (i_vis == 1) ? VLC_TRUE : VLC_FALSE;
+ p_params->b_visible = (i_vis == 1) ? true : false;
}
return VLC_SUCCESS;
}
if( (size_t)p_params->i_width > i_size )
{
msg_Err( p_filter,
- "Insufficient data in shared memory. need %d, got %d",
+ "Insufficient data in shared memory. need %d, got %zu",
p_params->i_width, i_size );
return VLC_EGENERIC;
}
if( i_neededsize > i_size )
{
msg_Err( p_filter,
- "Insufficient data in shared memory. need %d, got %d",
+ "Insufficient data in shared memory. need %zu, got %zu",
i_neededsize, i_size );
p_ovl->data.p_pic->pf_release( p_ovl->data.p_pic );
free( p_ovl->data.p_pic );
i_line < (size_t)p_ovl->data.p_pic->p[i_plane].i_visible_lines;
++i_line )
{
- p_filter->p_libvlc->pf_memcpy( p_out, p_in,
- p_ovl->data.p_pic->p[i_plane].i_visible_pitch );
+ vlc_memcpy( p_out, p_in,
+ p_ovl->data.p_pic->p[i_plane].i_visible_pitch );
p_out += p_ovl->data.p_pic->p[i_plane].i_pitch;
p_in += p_ovl->data.p_pic->p[i_plane].i_visible_pitch;
}
{
VLC_UNUSED(p_results);
filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys;
- p_sys->b_updated = VLC_TRUE;
+ p_sys->b_updated = true;
return ListRemove( &p_sys->overlays, p_params->i_id );
}
VLC_UNUSED(p_results);
filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys;
QueueTransfer( &p_sys->pending, &p_sys->atomic );
- p_sys->b_atomic = VLC_FALSE;
+ p_sys->b_atomic = false;
return VLC_SUCCESS;
}
if( p_ovl == NULL )
return VLC_EGENERIC;
- p_results->b_visible = ( p_ovl->b_active == VLC_TRUE ) ? 1 : 0;
+ p_results->b_visible = ( p_ovl->b_active == true ) ? 1 : 0;
return VLC_SUCCESS;
}
if( p_ovl == NULL )
return VLC_EGENERIC;
- p_ovl->b_active = p_params->b_visible;// ? VLC_FALSE : VLC_TRUE;
- p_sys->b_updated = VLC_TRUE;
+ p_ovl->b_active = p_params->b_visible;// ? false : true;
+ p_sys->b_updated = true;
return VLC_SUCCESS;
}
VLC_UNUSED(p_params);
VLC_UNUSED(p_results);
- p_sys->b_atomic = VLC_TRUE;
+ p_sys->b_atomic = true;
return VLC_SUCCESS;
}
static commanddesc_t p_commands[] =
{
{ .psz_command = "DataSharedMem",
- .b_atomic = VLC_TRUE,
+ .b_atomic = true,
.pf_parser = parser_DataSharedMem,
.pf_execute = exec_DataSharedMem,
.pf_unparse = unparse_default,
},
{ .psz_command = "DeleteImage",
- .b_atomic = VLC_TRUE,
+ .b_atomic = true,
.pf_parser = parser_Id,
.pf_execute = exec_DeleteImage,
.pf_unparse = unparse_default,
},
{ .psz_command = "EndAtomic",
- .b_atomic = VLC_FALSE,
+ .b_atomic = false,
.pf_parser = parser_None,
.pf_execute = exec_EndAtomic,
.pf_unparse = unparse_default,
},
{ .psz_command = "GenImage",
- .b_atomic = VLC_FALSE,
+ .b_atomic = false,
.pf_parser = parser_None,
.pf_execute = exec_GenImage,
.pf_unparse = unparse_GenImage,
},
{ .psz_command = "GetAlpha",
- .b_atomic = VLC_FALSE,
+ .b_atomic = false,
.pf_parser = parser_Id,
.pf_execute = exec_GetAlpha,
.pf_unparse = unparse_GetAlpha,
},
{ .psz_command = "GetPosition",
- .b_atomic = VLC_FALSE,
+ .b_atomic = false,
.pf_parser = parser_Id,
.pf_execute = exec_GetPosition,
.pf_unparse = unparse_GetPosition,
},
{ .psz_command = "GetTextAlpha",
- .b_atomic = VLC_FALSE,
+ .b_atomic = false,
.pf_parser = parser_Id,
.pf_execute = exec_GetTextAlpha,
.pf_unparse = unparse_GetTextAlpha,
},
{ .psz_command = "GetTextColor",
- .b_atomic = VLC_FALSE,
+ .b_atomic = false,
.pf_parser = parser_Id,
.pf_execute = exec_GetTextColor,
.pf_unparse = unparse_GetTextColor,
},
{ .psz_command = "GetTextSize",
- .b_atomic = VLC_TRUE,
+ .b_atomic = true,
.pf_parser = parser_Id,
.pf_execute = exec_GetTextSize,
.pf_unparse = unparse_GetTextSize,
},
{ .psz_command = "GetVisibility",
- .b_atomic = VLC_FALSE,
+ .b_atomic = false,
.pf_parser = parser_Id,
.pf_execute = exec_GetVisibility,
.pf_unparse = unparse_GetVisibility,
},
{ .psz_command = "SetAlpha",
- .b_atomic = VLC_TRUE,
+ .b_atomic = true,
.pf_parser = parser_SetAlpha,
.pf_execute = exec_SetAlpha,
.pf_unparse = unparse_default,
},
{ .psz_command = "SetPosition",
- .b_atomic = VLC_TRUE,
+ .b_atomic = true,
.pf_parser = parser_SetPosition,
.pf_execute = exec_SetPosition,
.pf_unparse = unparse_default,
},
{ .psz_command = "SetTextAlpha",
- .b_atomic = VLC_TRUE,
+ .b_atomic = true,
.pf_parser = parser_SetTextAlpha,
.pf_execute = exec_SetTextAlpha,
.pf_unparse = unparse_default,
},
{ .psz_command = "SetTextColor",
- .b_atomic = VLC_TRUE,
+ .b_atomic = true,
.pf_parser = parser_SetTextColor,
.pf_execute = exec_SetTextColor,
.pf_unparse = unparse_default,
},
{ .psz_command = "SetTextSize",
- .b_atomic = VLC_TRUE,
+ .b_atomic = true,
.pf_parser = parser_SetTextSize,
.pf_execute = exec_SetTextSize,
.pf_unparse = unparse_default,
},
{ .psz_command = "SetVisibility",
- .b_atomic = VLC_TRUE,
+ .b_atomic = true,
.pf_parser = parser_SetVisibility,
.pf_execute = exec_SetVisibility,
.pf_unparse = unparse_default,
},
{ .psz_command = "StartAtomic",
- .b_atomic = VLC_TRUE,
+ .b_atomic = true,
.pf_parser = parser_None,
.pf_execute = exec_StartAtomic,
.pf_unparse = unparse_default,
p_sys->pp_commands[i_index]->pf_unparse = p_commands[i_index].pf_unparse;
}
- msg_Dbg( p_filter, "%d commands are available", p_sys->i_commands );
+ msg_Dbg( p_filter, "%zu commands are available", p_sys->i_commands );
for( size_t i_index = 0; i_index < p_sys->i_commands; i_index++ )
msg_Dbg( p_filter, " %s", p_sys->pp_commands[i_index]->psz_command );
}