[vlc-commits] commit: Revert "Used vout_control_Push for vout_RegisterSubpictureChannel." (Laurent Aimar )

[git at videolan.org]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue May 25 23:44:59 2010 +0200| [25174a7dd002e752c668ddeb6692ef0b5e9f1c20] | committer: Laurent Aimar 

Revert "Used vout_control_Push for vout_RegisterSubpictureChannel."

This reverts commit 38ed2e8ef37df763e187c1dca6b6a6c1da4887c4.
It is not complete.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=25174a7dd002e752c668ddeb6692ef0b5e9f1c20
---

 src/video_output/control.h      |    2 --
 src/video_output/video_output.c |   19 +------------------
 2 files changed, 1 insertions(+), 20 deletions(-)

diff --git a/src/video_output/control.h b/src/video_output/control.h
index fc265e1..4654736 100644
--- a/src/video_output/control.h
+++ b/src/video_output/control.h
@@ -41,7 +41,6 @@ enum {
 #endif
     VOUT_CONTROL_SUBPICTURE,            /* subpicture */
     VOUT_CONTROL_FLUSH_SUBPICTURE,      /* integer */
-    VOUT_CONTROL_REGISTER_SUBPICTURE,   /* integer_ptr */
     VOUT_CONTROL_OSD_TITLE,             /* string */
     VOUT_CONTROL_CHANGE_FILTERS,        /* string */
     VOUT_CONTROL_CHANGE_SUB_FILTERS,    /* string */
@@ -71,7 +70,6 @@ typedef struct {
         mtime_t *time_ptr;
         char    *string;
         int     integer;
-        int     *integer_ptr;
         struct {
             int a;
             int b;
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index aab5e0c..aa359ed 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -356,16 +356,7 @@ void vout_PutSubpicture( vout_thread_t *vout, subpicture_t *subpic )
 }
 int vout_RegisterSubpictureChannel( vout_thread_t *vout )
 {
-    int channel = SPU_DEFAULT_CHANNEL;
-
-    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;
+    return spu_RegisterChannel(vout->p->p_spu);
 }
 void vout_FlushSubpictureChannel( vout_thread_t *vout, int channel )
 {
@@ -768,11 +759,6 @@ static void ThreadDisplaySubpicture(vout_thread_t *vout,
     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)
 {
     spu_ClearChannel(vout->p->p_spu, channel);
@@ -1136,9 +1122,6 @@ static void *Thread(void *object)
             case VOUT_CONTROL_FLUSH_SUBPICTURE:
                 ThreadFlushSubpicture(vout, cmd.u.integer);
                 break;
-            case VOUT_CONTROL_REGISTER_SUBPICTURE:
-                ThreadRegisterSubpicture(vout, cmd.u.integer_ptr);
-                break;
             case VOUT_CONTROL_OSD_TITLE:
                 ThreadDisplayOsdTitle(vout, cmd.u.string);
                 break;