Mercurial > mplayer.hg

comparison input/input.c @ 27391:1d2faa1020fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename a bunch of miscellaneous preprocessor directives. Switch them from a HAVE_ to a CONFIG_ prefix.
author diego
date Thu, 07 Aug 2008 08:58:07 +0000
parents ac03760f7fcc
children 6a7cdd00599f
comparison
equal deleted inserted replaced
27390:9d95dc936e66 27391:1d2faa1020fb
27 #include "m_option.h" 27 #include "m_option.h"
28 #include "get_path.h" 28 #include "get_path.h"
29 29
30 #include "joystick.h" 30 #include "joystick.h"
31 31
32 #ifdef HAVE_LIRC 32 #ifdef CONFIG_LIRC
33 #include "lirc.h" 33 #include "lirc.h"
34 #endif 34 #endif
35 35
36 #ifdef HAVE_LIRCC 36 #ifdef CONFIG_LIRCC
37 #include <lirc/lircc.h> 37 #include <lirc/lircc.h>
38 #endif 38 #endif
39 39
40 #include "ar.h" 40 #include "ar.h"
41 41
424 #ifdef CONFIG_TV_TELETEXT 424 #ifdef CONFIG_TV_TELETEXT
425 { { 'X', 0 }, "step_property teletext_mode 1" }, 425 { { 'X', 0 }, "step_property teletext_mode 1" },
426 { { 'W', 0 }, "step_property teletext_page 1" }, 426 { { 'W', 0 }, "step_property teletext_page 1" },
427 { { 'Q', 0 }, "step_property teletext_page -1" }, 427 { { 'Q', 0 }, "step_property teletext_page -1" },
428 #endif 428 #endif
429 #ifdef HAVE_JOYSTICK 429 #ifdef CONFIG_JOYSTICK
430 { { JOY_AXIS0_PLUS, 0 }, "seek 10" }, 430 { { JOY_AXIS0_PLUS, 0 }, "seek 10" },
431 { { JOY_AXIS0_MINUS, 0 }, "seek -10" }, 431 { { JOY_AXIS0_MINUS, 0 }, "seek -10" },
432 { { JOY_AXIS1_MINUS, 0 }, "seek 60" }, 432 { { JOY_AXIS1_MINUS, 0 }, "seek 60" },
433 { { JOY_AXIS1_PLUS, 0 }, "seek -60" }, 433 { { JOY_AXIS1_PLUS, 0 }, "seek -60" },
434 { { JOY_BTN0, 0 }, "pause" }, 434 { { JOY_BTN0, 0 }, "pause" },
1731 // free file if it was allocated by get_path() 1731 // free file if it was allocated by get_path()
1732 if( file != config_file) 1732 if( file != config_file)
1733 free(file); 1733 free(file);
1734 } 1734 }
1735 1735
1736 #ifdef HAVE_JOYSTICK 1736 #ifdef CONFIG_JOYSTICK
1737 if(use_joystick) { 1737 if(use_joystick) {
1738 int fd = mp_input_joystick_init(js_dev); 1738 int fd = mp_input_joystick_init(js_dev);
1739 if(fd < 0) 1739 if(fd < 0)
1740 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantInitJoystick); 1740 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantInitJoystick);
1741 else 1741 else
1742 mp_input_add_key_fd(fd,1,mp_input_joystick_read,(mp_close_func_t)close); 1742 mp_input_add_key_fd(fd,1,mp_input_joystick_read,(mp_close_func_t)close);
1743 } 1743 }
1744 #endif 1744 #endif
1745 1745
1746 #ifdef HAVE_LIRC 1746 #ifdef CONFIG_LIRC
1747 if(use_lirc) { 1747 if(use_lirc) {
1748 int fd = mp_input_lirc_init(); 1748 int fd = mp_input_lirc_init();
1749 if(fd > 0) 1749 if(fd > 0)
1750 mp_input_add_cmd_fd(fd,0,mp_input_lirc_read,mp_input_lirc_close); 1750 mp_input_add_cmd_fd(fd,0,mp_input_lirc_read,mp_input_lirc_close);
1751 } 1751 }
1752 #endif 1752 #endif
1753 1753
1754 #ifdef HAVE_LIRCC 1754 #ifdef CONFIG_LIRCC
1755 if(use_lircc) { 1755 if(use_lircc) {
1756 int fd = lircc_init("mplayer", NULL); 1756 int fd = lircc_init("mplayer", NULL);
1757 if(fd >= 0) 1757 if(fd >= 0)
1758 mp_input_add_cmd_fd(fd,1,NULL,(mp_close_func_t)lircc_cleanup); 1758 mp_input_add_cmd_fd(fd,1,NULL,(mp_close_func_t)lircc_cleanup);
1759 } 1759 }