p_widget = 0;
/* Create and initialize a subpicture */
- p_subpic = vout_CreateSubPicture( p_vout, i_channel, MEMORY_SUBPICTURE );
+ p_subpic = spu_CreateSubpicture( p_vout->p_spu );
if( p_subpic == NULL )
{
return NULL;
}
+ p_subpic->i_channel = i_channel;
p_subpic->pf_render = Render;
p_subpic->pf_destroy = FreeWidget;
p_subpic->i_start = i_now;
if( p_widget == NULL )
{
FreeWidget( p_subpic );
- vout_DestroySubPicture( p_vout, p_subpic );
+ spu_DestroySubpicture( p_vout->p_spu, p_subpic );
return NULL;
}
p_subpic->p_sys = p_widget;
if( p_widget->p_pic == NULL )
{
FreeWidget( p_subpic );
- vout_DestroySubPicture( p_vout, p_subpic );
+ spu_DestroySubpicture( p_vout->p_spu, p_subpic );
return;
}
memset( p_widget->p_pic, 0, p_widget->i_width * p_widget->i_height );
if( i_type == OSD_HOR_SLIDER )
{
int i_x_pos = ( p_widget->i_width - 2 ) * i_position / 100;
- int i_y_pos = p_widget->i_height / 2;
DrawRect( p_vout, p_subpic, i_x_pos - 1, 2, i_x_pos + 1,
p_widget->i_height - 3, STYLE_FILLED );
DrawRect( p_vout, p_subpic, 0, 0, p_widget->i_width - 1,
p_widget->i_height - 1, STYLE_EMPTY );
}
- vout_DisplaySubPicture( p_vout, p_subpic );
+ spu_DisplaySubpicture( p_vout->p_spu, p_subpic );
vlc_object_release( p_vout );
return;
if( p_widget->p_pic == NULL )
{
FreeWidget( p_subpic );
- vout_DestroySubPicture( p_vout, p_subpic );
+ spu_DestroySubpicture( p_vout->p_spu, p_subpic );
return;
}
memset( p_widget->p_pic, 0, p_widget->i_width * p_widget->i_height );
}
}
- vout_DisplaySubPicture( p_vout, p_subpic );
+ spu_DisplaySubpicture( p_vout->p_spu, p_subpic );
vlc_object_release( p_vout );
return;