]> git.sesse.net Git - vlc/commitdiff
Cosmetics (vout).
authorLaurent Aimar <fenrir@videolan.org>
Tue, 11 May 2010 17:37:04 +0000 (19:37 +0200)
committerLaurent Aimar <fenrir@videolan.org>
Wed, 12 May 2010 18:19:51 +0000 (20:19 +0200)
src/video_output/control.c
src/video_output/control.h

index bff7a4e2d89cd0b9fabe2e2b7df789ff4b787065..583be5492a3cc6b8670acceef5a8920d62a696ad 100644 (file)
@@ -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;
     }
index 168b5e78ad7c2ae37aedeabe48a23ce621c09f16..0586f4cdf96c475a12cad588bba8797506b2b0f5 100644 (file)
@@ -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 */