summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-03 17:58:17 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-03 17:58:17 +0000
commitdc9a81d1a9c3448ce576b314d51655a5e0f35b8a (patch)
treeeb33ffa09eae09d869f6d921b92c34ee460666a0
parent6996ef47c5203d8ea3fb584c295d5b134d2b7e6d (diff)
downloadmpv-dc9a81d1a9c3448ce576b314d51655a5e0f35b8a.tar.bz2
mpv-dc9a81d1a9c3448ce576b314d51655a5e0f35b8a.tar.xz
dvdnav event added, queue size 10->100, added void* event arg type - dvdnav patch by Kees Cook <mplayer@outflux.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5474 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--input/input.c3
-rw-r--r--input/input.h4
2 files changed, 6 insertions, 1 deletions
diff --git a/input/input.c b/input/input.c
index 37a3872b0e..f3dae38813 100644
--- a/input/input.c
+++ b/input/input.c
@@ -78,6 +78,7 @@ static mp_cmd_t mp_cmds[] = {
#ifdef USE_DVDNAV
{ MP_CMD_DVDNAV, "dvdnav", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
+ { MP_CMD_DVDNAV_EVENT, "dvdnav_event", 1, { { MP_CMD_ARG_VOID, {0}}, {-1, {0}} } },
#endif
{ 0, NULL, 0, {} }
@@ -257,7 +258,7 @@ static mp_cmd_bind_t def_cmd_binds[] = {
#define MP_FD_GOT_CMD (1<<3)
#define MP_FD_NO_SELECT (1<<4)
-#define CMD_QUEUE_SIZE 10
+#define CMD_QUEUE_SIZE 100
typedef struct mp_input_fd {
int fd;
diff --git a/input/input.h b/input/input.h
index 5e254f9887..4c59a5fda0 100644
--- a/input/input.h
+++ b/input/input.h
@@ -37,6 +37,8 @@
#define MP_CMD_GUI_FULLSCREEN 5008
#define MP_CMD_GUI_SKINBROWSER 5009
+#define MP_CMD_DVDNAV_EVENT 6000
+
#define MP_CMD_DVDNAV_UP 1
#define MP_CMD_DVDNAV_DOWN 2
#define MP_CMD_DVDNAV_LEFT 3
@@ -48,6 +50,7 @@
#define MP_CMD_ARG_INT 0
#define MP_CMD_ARG_FLOAT 1
#define MP_CMD_ARG_STRING 2
+#define MP_CMD_ARG_VOID 3
#ifndef MP_CMD_MAX_ARGS
#define MP_CMD_MAX_ARGS 10
@@ -77,6 +80,7 @@ typedef union mp_cmd_arg_value {
int i;
float f;
char* s;
+ void* v;
} mp_cmd_arg_value_t;
typedef struct mp_cmd_arg {