Commit 25174a7d authored by Laurent Aimar's avatar Laurent Aimar

Revert "Used vout_control_Push for vout_RegisterSubpictureChannel."

This reverts commit 38ed2e8e.
It is not complete.
parent a0d319ba
...@@ -41,7 +41,6 @@ enum { ...@@ -41,7 +41,6 @@ enum {
#endif #endif
VOUT_CONTROL_SUBPICTURE, /* subpicture */ VOUT_CONTROL_SUBPICTURE, /* subpicture */
VOUT_CONTROL_FLUSH_SUBPICTURE, /* integer */ VOUT_CONTROL_FLUSH_SUBPICTURE, /* integer */
VOUT_CONTROL_REGISTER_SUBPICTURE, /* integer_ptr */
VOUT_CONTROL_OSD_TITLE, /* string */ VOUT_CONTROL_OSD_TITLE, /* string */
VOUT_CONTROL_CHANGE_FILTERS, /* string */ VOUT_CONTROL_CHANGE_FILTERS, /* string */
VOUT_CONTROL_CHANGE_SUB_FILTERS, /* string */ VOUT_CONTROL_CHANGE_SUB_FILTERS, /* string */
...@@ -71,7 +70,6 @@ typedef struct { ...@@ -71,7 +70,6 @@ typedef struct {
mtime_t *time_ptr; mtime_t *time_ptr;
char *string; char *string;
int integer; int integer;
int *integer_ptr;
struct { struct {
int a; int a;
int b; int b;
......
...@@ -356,16 +356,7 @@ void vout_PutSubpicture( vout_thread_t *vout, subpicture_t *subpic ) ...@@ -356,16 +356,7 @@ void vout_PutSubpicture( vout_thread_t *vout, subpicture_t *subpic )
} }
int vout_RegisterSubpictureChannel( vout_thread_t *vout ) int vout_RegisterSubpictureChannel( vout_thread_t *vout )
{ {
int channel = SPU_DEFAULT_CHANNEL; return spu_RegisterChannel(vout->p->p_spu);
vout_control_cmd_t cmd;
vout_control_cmd_Init(&cmd, VOUT_CONTROL_REGISTER_SUBPICTURE);
cmd.u.integer_ptr = &channel;
vout_control_Push(&vout->p->control, &cmd);
vout_control_WaitEmpty(&vout->p->control);
return channel;
} }
void vout_FlushSubpictureChannel( vout_thread_t *vout, int channel ) void vout_FlushSubpictureChannel( vout_thread_t *vout, int channel )
{ {
...@@ -768,11 +759,6 @@ static void ThreadDisplaySubpicture(vout_thread_t *vout, ...@@ -768,11 +759,6 @@ static void ThreadDisplaySubpicture(vout_thread_t *vout,
spu_DisplaySubpicture(vout->p->p_spu, subpicture); spu_DisplaySubpicture(vout->p->p_spu, subpicture);
} }
static void ThreadRegisterSubpicture(vout_thread_t *vout, int *channel)
{
*channel = spu_RegisterChannel(vout->p->p_spu);
}
static void ThreadFlushSubpicture(vout_thread_t *vout, int channel) static void ThreadFlushSubpicture(vout_thread_t *vout, int channel)
{ {
spu_ClearChannel(vout->p->p_spu, channel); spu_ClearChannel(vout->p->p_spu, channel);
...@@ -1136,9 +1122,6 @@ static void *Thread(void *object) ...@@ -1136,9 +1122,6 @@ static void *Thread(void *object)
case VOUT_CONTROL_FLUSH_SUBPICTURE: case VOUT_CONTROL_FLUSH_SUBPICTURE:
ThreadFlushSubpicture(vout, cmd.u.integer); ThreadFlushSubpicture(vout, cmd.u.integer);
break; break;
case VOUT_CONTROL_REGISTER_SUBPICTURE:
ThreadRegisterSubpicture(vout, cmd.u.integer_ptr);
break;
case VOUT_CONTROL_OSD_TITLE: case VOUT_CONTROL_OSD_TITLE:
ThreadDisplayOsdTitle(vout, cmd.u.string); ThreadDisplayOsdTitle(vout, cmd.u.string);
break; 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