From dc6d14fb1b20e86cc24c6fbe5ce239566e5d588e Mon Sep 17 00:00:00 2001 From: ben Date: Sun, 18 May 2008 11:53:00 +0000 Subject: Add support for AppleIR Remote as an input under Linux systems. This requires Linux 2.6 with evdev and appleir drivers. The keymapping is done to mimics the one that was done for MacOSX. WARNING: Most distributions do not seems to bother and only let root access to the device. Modify udev rules accordingly if you want regular user to be able to use the remote. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26795 b3059339-0415-0410-9bf9-f77b7e298cf2 --- input/input.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'input/input.c') diff --git a/input/input.c b/input/input.c index c43afbfa4f..da879cc6a7 100644 --- a/input/input.c +++ b/input/input.c @@ -569,6 +569,7 @@ static char* config_file = "input.conf"; static int use_ar = 1; static char* js_dev = NULL; +static char* ar_dev = NULL; static char* in_file = NULL; static int in_file_fd = -1; @@ -579,6 +580,7 @@ static int mp_input_print_cmd_list(m_option_t* cfg); // Our command line options static m_option_t input_conf[] = { { "conf", &config_file, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL }, + { "ar-dev", &ar_dev, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL }, { "ar-delay", &ar_delay, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL }, { "ar-rate", &ar_rate, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL }, { "keylist", mp_input_print_key_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL }, @@ -1760,6 +1762,16 @@ mp_input_init(int use_gui) { } #endif +#ifdef HAVE_APPLE_IR + if(use_ar) { + int fd = mp_input_appleir_init(ar_dev); + if(fd < 0) + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantInitAppleRemote); + else + mp_input_add_key_fd(fd,1,mp_input_appleir_read,(mp_close_func_t)close); + } +#endif + if(in_file) { struct stat st; if(stat(in_file,&st)) -- cgit v1.2.3 From 974d4fadad59e30c60931d38bc50a560af4da7b2 Mon Sep 17 00:00:00 2001 From: ben Date: Sun, 18 May 2008 11:56:20 +0000 Subject: Do not enable AppleIR by default. The amount of computers capable of using it is too low in the field to enable it by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26797 b3059339-0415-0410-9bf9-f77b7e298cf2 --- input/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'input/input.c') diff --git a/input/input.c b/input/input.c index da879cc6a7..d86ec04a3e 100644 --- a/input/input.c +++ b/input/input.c @@ -566,7 +566,7 @@ static int use_joystick = 1, use_lirc = 1, use_lircc = 1; static char* config_file = "input.conf"; /* Apple Remote */ -static int use_ar = 1; +static int use_ar = 0; static char* js_dev = NULL; static char* ar_dev = NULL; -- cgit v1.2.3 From 561e9503aaa6b4592965a02bb32c5b831fc4f51e Mon Sep 17 00:00:00 2001 From: ben Date: Sun, 18 May 2008 12:11:17 +0000 Subject: Keep AppleIR enabled by default on MacOSX but have it disable on Linux. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26799 b3059339-0415-0410-9bf9-f77b7e298cf2 --- input/input.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'input/input.c') diff --git a/input/input.c b/input/input.c index d86ec04a3e..1bbf908728 100644 --- a/input/input.c +++ b/input/input.c @@ -566,7 +566,11 @@ static int use_joystick = 1, use_lirc = 1, use_lircc = 1; static char* config_file = "input.conf"; /* Apple Remote */ +#ifdef HAVE_APPLE_REMOTE +static int use_ar = 1; +#elif HAVE_APPLE_IR static int use_ar = 0; +#endif static char* js_dev = NULL; static char* ar_dev = NULL; -- cgit v1.2.3 From 9171b9dbe69cf6231a2a9a7c1e845ddedd431e03 Mon Sep 17 00:00:00 2001 From: ben Date: Sun, 18 May 2008 18:11:05 +0000 Subject: fix compilation of input.c if neither macosx/linux apple remote code is compiled in git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26829 b3059339-0415-0410-9bf9-f77b7e298cf2 --- input/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'input/input.c') diff --git a/input/input.c b/input/input.c index 1bbf908728..9f388f347b 100644 --- a/input/input.c +++ b/input/input.c @@ -568,7 +568,7 @@ static char* config_file = "input.conf"; /* Apple Remote */ #ifdef HAVE_APPLE_REMOTE static int use_ar = 1; -#elif HAVE_APPLE_IR +#else static int use_ar = 0; #endif -- cgit v1.2.3 From bc212e3500ef776f849a9ee6c04dfaa4994c62f6 Mon Sep 17 00:00:00 2001 From: ben Date: Tue, 27 May 2008 18:39:57 +0000 Subject: Add a slave command to stop stream playback. Mostly useful when used with -idle mode. Patch by Mathieu Schroeter ( mathieu dot schroeter at gamesover dot ch ) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26909 b3059339-0415-0410-9bf9-f77b7e298cf2 --- input/input.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'input/input.c') diff --git a/input/input.c b/input/input.c index 9f388f347b..6fab4c1219 100644 --- a/input/input.c +++ b/input/input.c @@ -64,6 +64,7 @@ static const mp_cmd_t mp_cmds[] = { { MP_CMD_SPEED_MULT, "speed_mult", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } }, { MP_CMD_SPEED_SET, "speed_set", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } }, { MP_CMD_QUIT, "quit", 0, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, + { MP_CMD_STOP, "stop", 0, { {-1,{0}} } }, { MP_CMD_PAUSE, "pause", 0, { {-1,{0}} } }, { MP_CMD_FRAME_STEP, "frame_step", 0, { {-1,{0}} } }, { MP_CMD_PLAY_TREE_STEP, "pt_step",1, { { MP_CMD_ARG_INT ,{0}}, { MP_CMD_ARG_INT ,{0}}, {-1,{0}} } }, @@ -473,6 +474,7 @@ static const mp_cmd_bind_t def_cmd_binds[] = { { { '!', 0 }, "seek_chapter -1" }, { { '@', 0 }, "seek_chapter 1" }, { { 'A', 0 }, "switch_angle 1" }, + { { 'U', 0 }, "stop" }, { { 0 }, NULL } }; -- cgit v1.2.3