From 89d2f5be6c27b7a934fb1775d00da706adf36de9 Mon Sep 17 00:00:00 2001 From: gabucino Date: Tue, 12 Aug 2003 13:22:35 +0000 Subject: reverse of accidently twice commited patch (non-unified patch suxx) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10581 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/tech/slave.txt | 8 -------- input/input.c | 4 ---- input/input.h | 4 ---- mplayer.c | 16 ---------------- 4 files changed, 32 deletions(-) diff --git a/DOCS/tech/slave.txt b/DOCS/tech/slave.txt index 0dd6183c69..a75cb3f125 100644 --- a/DOCS/tech/slave.txt +++ b/DOCS/tech/slave.txt @@ -88,13 +88,5 @@ tv_set_hue [-100:100] Set tv tuner hue. tv_set_saturation [-100:100] Set tv tuner saturation. -tv_set_brightness [-100:100] - Set tv tuner brightness. -tv_set_contrast [-100:100] - Set tv tuner contrast. -tv_set_hue [-100:100] - Set tv tuner hue. -tv_set_saturation [-100:100] - Set tv tuner saturation. gui_[loadsubtitle|about|play|stop] GUI actions diff --git a/input/input.c b/input/input.c index f07a81622f..c8bb838079 100644 --- a/input/input.c +++ b/input/input.c @@ -91,10 +91,6 @@ static mp_cmd_t mp_cmds[] = { { MP_CMD_TV_SET_CONTRAST, "tv_set_contrast", 1, { { MP_CMD_ARG_INT ,{0}}, {-1,{0}} }}, { MP_CMD_TV_SET_HUE, "tv_set_hue", 1, { { MP_CMD_ARG_INT ,{0}}, {-1,{0}} }}, { MP_CMD_TV_SET_SATURATION, "tv_set_saturation", 1, { { MP_CMD_ARG_INT ,{0}}, {-1,{0}} }}, - { MP_CMD_TV_SET_BRIGHTNESS, "tv_set_brightness", 1, { { MP_CMD_ARG_INT ,{0}}, {-1,{0}} }}, - { MP_CMD_TV_SET_CONTRAST, "tv_set_contrast", 1, { { MP_CMD_ARG_INT ,{0}}, {-1,{0}} }}, - { MP_CMD_TV_SET_HUE, "tv_set_hue", 1, { { MP_CMD_ARG_INT ,{0}}, {-1,{0}} }}, - { MP_CMD_TV_SET_SATURATION, "tv_set_saturation", 1, { { MP_CMD_ARG_INT ,{0}}, {-1,{0}} }}, #endif { MP_CMD_VO_FULLSCREEN, "vo_fullscreen", 0, { {-1,{0}} } }, { MP_CMD_SCREENSHOT, "screenshot", 0, { {-1,{0}} } }, diff --git a/input/input.h b/input/input.h index 1950bf0b7b..95ee5ae76f 100644 --- a/input/input.h +++ b/input/input.h @@ -49,10 +49,6 @@ #define MP_CMD_TV_SET_CONTRAST 45 #define MP_CMD_TV_SET_HUE 46 #define MP_CMD_TV_SET_SATURATION 47 -#define MP_CMD_TV_SET_BRIGHTNESS 44 -#define MP_CMD_TV_SET_CONTRAST 45 -#define MP_CMD_TV_SET_HUE 46 -#define MP_CMD_TV_SET_SATURATION 47 #define MP_CMD_GUI_EVENTS 5000 #define MP_CMD_GUI_LOADFILE 5001 diff --git a/mplayer.c b/mplayer.c index e00cb3337e..dad0c9bbe0 100644 --- a/mplayer.c +++ b/mplayer.c @@ -2793,22 +2793,6 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) 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_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; -- cgit v1.2.3