[vlc-commits] commit: Cosmetics (vout). (Laurent Aimar )

[git at videolan.org]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue May 11 19:37:04 2010 +0200| [ea3a73d0fd36e0a2c51bcbc1d798a01a785b6550] | committer: Laurent Aimar 

Cosmetics (vout).

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

 src/video_output/control.c |   12 ------------
 src/video_output/control.h |   10 ----------
 2 files changed, 0 insertions(+), 22 deletions(-)

diff --git a/src/video_output/control.c b/src/video_output/control.c
index bff7a4e..583be54 100644
--- a/src/video_output/control.c
+++ b/src/video_output/control.c
@@ -38,22 +38,10 @@ void vout_control_cmd_Init(vout_control_cmd_t *cmd, int type)
 void vout_control_cmd_Clean(vout_control_cmd_t *cmd)
 {
     switch (cmd->type) {
-    //case VOUT_CONTROL_OSD_MESSAGE:
     case VOUT_CONTROL_OSD_TITLE:
     case VOUT_CONTROL_CHANGE_FILTERS:
         free(cmd->u.string);
         break;
-#if 0
-    case VOUT_CONTROL_OSD_TEXT:
-        free(cmd->text.string);
-        if (cmd->text.style)
-            text_style_Delete(cmd->text.style);
-        break;
-    case VOUT_CONTROL_OSD_SUBPICTURE:
-        if (cmd->subpicture)
-            subpicture_Delete(cmd->subpicture);
-        break;
-#endif
     default:
         break;
     }
diff --git a/src/video_output/control.h b/src/video_output/control.h
index 168b5e7..0586f4c 100644
--- a/src/video_output/control.h
+++ b/src/video_output/control.h
@@ -37,16 +37,6 @@ enum {
     /* */
     VOUT_CONTROL_START,
     VOUT_CONTROL_STOP,
-
-    /* Controls */
-
-
-    /* OSD */
-    VOUT_CONTROL_OSD_MESSAGE,
-    VOUT_CONTROL_OSD_TEXT,
-    VOUT_CONTROL_OSD_SLIDER,
-    VOUT_CONTROL_OSD_ICON,
-    VOUT_CONTROL_OSD_SUBPICTURE,
 #endif
     VOUT_CONTROL_OSD_TITLE,             /* string */
     VOUT_CONTROL_CHANGE_FILTERS,        /* string */