[MPlayer-cvslog] CVS: main mplayer.c,1.932,1.933

[Alban Bedel CVS]

CVS change done by Alban Bedel CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv11949

Modified Files:
	mplayer.c 
Log Message:
Handle the tv color control commands with the properties.


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.932
retrieving revision 1.933
diff -u -r1.932 -r1.933
--- mplayer.c	22 Apr 2006 14:30:20 -0000	1.932
+++ mplayer.c	22 Apr 2006 19:29:01 -0000	1.933
@@ -2155,7 +2155,12 @@
     { "sub_delay", MP_CMD_SUB_DELAY, 0, 0, OSD_MSG_SUB_DELAY, MSGTR_SubDelayStatus },
     { "sub_visibility", MP_CMD_SUB_VISIBILITY, 1, 0, -1, MSGTR_SubVisibleStatus },
     { "sub_forced_only", MP_CMD_SUB_FORCED_ONLY, 1, 0, -1, MSGTR_SubForcedOnlyStatus },
-
+#ifdef USE_TV
+    { "tv_brightness", MP_CMD_TV_SET_BRIGHTNESS, 0, OSD_BRIGHTNESS, -1, MSGTR_Brightness },
+    { "tv_hue", MP_CMD_TV_SET_HUE, 0, OSD_HUE, -1, MSGTR_Hue },
+    { "tv_saturation", MP_CMD_TV_SET_SATURATION, 0, OSD_SATURATION, -1, MSGTR_Saturation },
+    { "tv_contrast", MP_CMD_TV_SET_CONTRAST, 0, OSD_CONTRAST, -1, MSGTR_Contrast },
+#endif
     { NULL, 0, 0, 0, -1, NULL }
 };
 
@@ -4274,22 +4279,6 @@
       if (file_format == DEMUXER_TYPE_TV)
         tv_set_norm((tvi_handle_t*)(demuxer->priv), cmd->args[0].v.s);
     } break;
-    case MP_CMD_TV_SET_BRIGHTNESS :  {
-      if (file_format == DEMUXER_TYPE_TV)
-        tv_set_color_options((tvi_handle_t*)(demuxer->priv), TV_COLOR_BRIGHTNESS, cmd->args[0].v.i);
-    } break;
-    case MP_CMD_TV_SET_HUE :  {
-      if (file_format == DEMUXER_TYPE_TV)
-        tv_set_color_options((tvi_handle_t*)(demuxer->priv), TV_COLOR_HUE, cmd->args[0].v.i);
-    } break;
-    case MP_CMD_TV_SET_SATURATION :  {
-      if (file_format == DEMUXER_TYPE_TV)
-        tv_set_color_options((tvi_handle_t*)(demuxer->priv), TV_COLOR_SATURATION, cmd->args[0].v.i);
-    } break;
-    case MP_CMD_TV_SET_CONTRAST :  {
-      if (file_format == DEMUXER_TYPE_TV)
-        tv_set_color_options((tvi_handle_t*)(demuxer->priv), TV_COLOR_CONTRAST, cmd->args[0].v.i);
-    } break;
     case MP_CMD_TV_STEP_CHANNEL :  {
       if (file_format == DEMUXER_TYPE_TV) {
 	int v = cmd->args[0].v.i;