Commit 68e3372b authored by Laurent Aimar's avatar Laurent Aimar

Used Used vout_control_Push for vout_FlushSubpictureChannel .

parent b0ffce5e
......@@ -40,6 +40,7 @@ enum {
VOUT_CONTROL_STOP,
#endif
VOUT_CONTROL_SUBPICTURE, /* subpicture */
VOUT_CONTROL_FLUSH_SUBPICTURE, /* integer */
VOUT_CONTROL_OSD_TITLE, /* string */
VOUT_CONTROL_CHANGE_FILTERS, /* string */
VOUT_CONTROL_CHANGE_SUB_FILTERS, /* string */
......
......@@ -361,7 +361,8 @@ int vout_RegisterSubpictureChannel( vout_thread_t *vout )
}
void vout_FlushSubpictureChannel( vout_thread_t *vout, int channel )
{
spu_ClearChannel(vout->p->p_spu, channel);
vout_control_PushInteger(&vout->p->control, VOUT_CONTROL_FLUSH_SUBPICTURE,
channel);
}
/* vout_Control* are usable by anyone at anytime */
......@@ -758,6 +759,12 @@ static void ThreadDisplaySubpicture(vout_thread_t *vout,
{
spu_DisplaySubpicture(vout->p->p_spu, subpicture);
}
static void ThreadFlushSubpicture(vout_thread_t *vout, int channel)
{
spu_ClearChannel(vout->p->p_spu, channel);
}
static void ThreadDisplayOsdTitle(vout_thread_t *vout, const char *string)
{
if (!vout->p->title.show)
......@@ -1113,6 +1120,9 @@ static void *Thread(void *object)
ThreadDisplaySubpicture(vout, cmd.u.subpicture);
cmd.u.subpicture = NULL;
break;
case VOUT_CONTROL_FLUSH_SUBPICTURE:
ThreadFlushSubpicture(vout, cmd.u.integer);
break;
case VOUT_CONTROL_OSD_TITLE:
ThreadDisplayOsdTitle(vout, cmd.u.string);
break;
......
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