From 02135001b44afc5446228228055c9ce7f29df5be Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 3 Aug 2008 15:21:40 +0000 Subject: Change a bunch of video/audio-output-specific preprocessor directives from a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2 --- input/input.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'input') diff --git a/input/input.c b/input/input.c index addf7ed83c..9b37e9ca6c 100644 --- a/input/input.c +++ b/input/input.c @@ -138,7 +138,7 @@ static const mp_cmd_t mp_cmds[] = { { MP_CMD_TV_SET_SATURATION, "tv_set_saturation", 1, { { MP_CMD_ARG_INT ,{0}}, { MP_CMD_ARG_INT,{1} }, {-1,{0}} }}, #endif { MP_CMD_SUB_FORCED_ONLY, "forced_subs_only", 0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } }, -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN { MP_CMD_DVB_SET_CHANNEL, "dvb_set_channel", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}}}}, #endif { MP_CMD_SWITCH_RATIO, "switch_ratio", 0, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } }, @@ -154,7 +154,7 @@ static const mp_cmd_t mp_cmds[] = { { MP_CMD_LOADLIST, "loadlist", 1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { MP_CMD_RUN, "run", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } }, { MP_CMD_VF_CHANGE_RECTANGLE, "change_rectangle", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}}}}, -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT { MP_CMD_TV_TELETEXT_ADD_DEC, "teletext_add_dec", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } }, { MP_CMD_TV_TELETEXT_GO_LINK, "teletext_go_link", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, #endif @@ -421,7 +421,7 @@ static const mp_cmd_bind_t def_cmd_binds[] = { { { 'n', 0 }, "tv_step_norm" }, { { 'u', 0 }, "tv_step_chanlist" }, #endif -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT { { 'X', 0 }, "step_property teletext_mode 1" }, { { 'W', 0 }, "step_property teletext_page 1" }, { { 'Q', 0 }, "step_property teletext_page -1" }, -- cgit v1.2.3 From 473e2824cba09c93e9afb40a127ad5f07704c7ae Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 6 Aug 2008 07:42:26 +0000 Subject: Rename all preprocessor directives related to Apple / Mac OS X. Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2 --- input/input.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'input') diff --git a/input/input.c b/input/input.c index 9b37e9ca6c..bca690f392 100644 --- a/input/input.c +++ b/input/input.c @@ -436,7 +436,7 @@ static const mp_cmd_bind_t def_cmd_binds[] = { { { JOY_BTN2, 0 }, "volume 1"}, { { JOY_BTN3, 0 }, "volume -1"}, #endif -#ifdef HAVE_APPLE_REMOTE +#ifdef CONFIG_APPLE_REMOTE { { AR_PLAY, 0}, "pause" }, { { AR_PLAY_HOLD, 0}, "quit" }, { { AR_NEXT, 0 }, "seek 30" }, @@ -568,7 +568,7 @@ static int use_joystick = 1, use_lirc = 1, use_lircc = 1; static char* config_file = "input.conf"; /* Apple Remote */ -#ifdef HAVE_APPLE_REMOTE +#ifdef CONFIG_APPLE_REMOTE static int use_ar = 1; #else static int use_ar = 0; @@ -1759,7 +1759,7 @@ mp_input_init(int use_gui) { } #endif -#ifdef HAVE_APPLE_REMOTE +#ifdef CONFIG_APPLE_REMOTE if(use_ar) { if(mp_input_ar_init() < 0) mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantInitAppleRemote); @@ -1768,7 +1768,7 @@ mp_input_init(int use_gui) { } #endif -#ifdef HAVE_APPLE_IR +#ifdef CONFIG_APPLE_IR if(use_ar) { int fd = mp_input_appleir_init(ar_dev); if(fd < 0) -- cgit v1.2.3 From 141e81cce4fb780a1e2f791c79c1664956401af7 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 7 Aug 2008 08:58:07 +0000 Subject: Rename a bunch of miscellaneous preprocessor directives. Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2 --- input/input.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'input') diff --git a/input/input.c b/input/input.c index bca690f392..0a9b571f0e 100644 --- a/input/input.c +++ b/input/input.c @@ -29,11 +29,11 @@ #include "joystick.h" -#ifdef HAVE_LIRC +#ifdef CONFIG_LIRC #include "lirc.h" #endif -#ifdef HAVE_LIRCC +#ifdef CONFIG_LIRCC #include #endif @@ -426,7 +426,7 @@ static const mp_cmd_bind_t def_cmd_binds[] = { { { 'W', 0 }, "step_property teletext_page 1" }, { { 'Q', 0 }, "step_property teletext_page -1" }, #endif -#ifdef HAVE_JOYSTICK +#ifdef CONFIG_JOYSTICK { { JOY_AXIS0_PLUS, 0 }, "seek 10" }, { { JOY_AXIS0_MINUS, 0 }, "seek -10" }, { { JOY_AXIS1_MINUS, 0 }, "seek 60" }, @@ -1733,7 +1733,7 @@ mp_input_init(int use_gui) { free(file); } -#ifdef HAVE_JOYSTICK +#ifdef CONFIG_JOYSTICK if(use_joystick) { int fd = mp_input_joystick_init(js_dev); if(fd < 0) @@ -1743,7 +1743,7 @@ mp_input_init(int use_gui) { } #endif -#ifdef HAVE_LIRC +#ifdef CONFIG_LIRC if(use_lirc) { int fd = mp_input_lirc_init(); if(fd > 0) @@ -1751,7 +1751,7 @@ mp_input_init(int use_gui) { } #endif -#ifdef HAVE_LIRCC +#ifdef CONFIG_LIRCC if(use_lircc) { int fd = lircc_init("mplayer", NULL); if(fd >= 0) -- cgit v1.2.3