/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* free() */
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_osd.h>
#include <vlc_vout.h>
#include <vlc_filter.h>
int i_x2, int i_y2, short fill )
{
int x, y;
- uint8_t *p_a = p_subpic->p_region->picture.A_PIXELS;
- int i_pitch = p_subpic->p_region->picture.Y_PITCH;
+ uint8_t *p_a = p_subpic->p_region->p_picture->A_PIXELS;
+ int i_pitch = p_subpic->p_region->p_picture->Y_PITCH;
if( fill == STYLE_FILLED )
{
int i_x2, int i_y2, short fill )
{
int x, y, i_mid, h;
- uint8_t *p_a = p_subpic->p_region->picture.A_PIXELS;
- int i_pitch = p_subpic->p_region->picture.Y_PITCH;
+ uint8_t *p_a = p_subpic->p_region->p_picture->A_PIXELS;
+ int i_pitch = p_subpic->p_region->p_picture->Y_PITCH;
i_mid = i_y1 + ( ( i_y2 - i_y1 ) >> 1 );
fmt.i_width = fmt.i_visible_width = i_width;
fmt.i_height = fmt.i_visible_height = i_height;
fmt.i_x_offset = fmt.i_y_offset = 0;
- p_subpic->p_region = p_subpic->pf_create_region( VLC_OBJECT(p_spu), &fmt );
+ p_subpic->p_region = subpicture_region_New( &fmt );
if( !p_subpic->p_region )
{
msg_Err( p_spu, "cannot allocate SPU region" );
p_subpic->p_region->i_x = i_x;
p_subpic->p_region->i_y = i_y;
- p_y = p_subpic->p_region->picture.Y_PIXELS;
- p_u = p_subpic->p_region->picture.U_PIXELS;
- p_v = p_subpic->p_region->picture.V_PIXELS;
- p_a = p_subpic->p_region->picture.A_PIXELS;
- i_pitch = p_subpic->p_region->picture.Y_PITCH;
+ p_y = p_subpic->p_region->p_picture->Y_PIXELS;
+ p_u = p_subpic->p_region->p_picture->U_PIXELS;
+ p_v = p_subpic->p_region->p_picture->V_PIXELS;
+ p_a = p_subpic->p_region->p_picture->A_PIXELS;
+ i_pitch = p_subpic->p_region->p_picture->Y_PITCH;
/* Initialize the region pixels (only the alpha will be changed later) */
memset( p_y, 0xff, i_pitch * p_subpic->p_region->fmt.i_height );
p_subpic->i_channel = i_channel;
p_subpic->i_start = i_now;
p_subpic->i_stop = i_now + 1200000;
- p_subpic->b_ephemer = VLC_TRUE;
- p_subpic->b_fade = VLC_TRUE;
+ p_subpic->b_ephemer = true;
+ p_subpic->b_fade = true;
return p_subpic;
}
STYLE_FILLED );
if( i_type == OSD_MUTE_ICON )
{
- uint8_t *p_a = p_subpic->p_region->picture.A_PIXELS;
- int i_pitch = p_subpic->p_region->picture.Y_PITCH;
+ uint8_t *p_a = p_subpic->p_region->p_picture->A_PIXELS;
+ int i_pitch = p_subpic->p_region->p_picture->Y_PITCH;
int i;
for( i = 1; i < i_pitch; i++ )
{