From 7ccf4830263c1d7eaaf42a50dd7a602a6b6e8a31 Mon Sep 17 00:00:00 2001 From: albeu Date: Wed, 22 Mar 2006 00:19:02 +0000 Subject: Add the new property API and implement a couple properties. Move the volume and mute command to the command to property bridge. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17912 b3059339-0415-0410-9bf9-f77b7e298cf2 --- input/input.c | 6 ++++-- input/input.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'input') diff --git a/input/input.c b/input/input.c index 4fd0dfe8d0..efbc06f895 100644 --- a/input/input.c +++ b/input/input.c @@ -66,9 +66,9 @@ static mp_cmd_t mp_cmds[] = { { MP_CMD_SUB_STEP, "sub_step",1, { { MP_CMD_ARG_INT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { MP_CMD_OSD, "osd",0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } }, { MP_CMD_OSD_SHOW_TEXT, "osd_show_text", 1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, - { MP_CMD_VOLUME, "volume", 1, { { MP_CMD_ARG_INT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, + { MP_CMD_VOLUME, "volume", 1, { { MP_CMD_ARG_FLOAT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { MP_CMD_MIXER_USEMASTER, "use_master", 0, { {-1,{0}} } }, - { MP_CMD_MUTE, "mute", 0, { {-1,{0}} } }, + { MP_CMD_MUTE, "mute", 0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } }, { MP_CMD_CONTRAST, "contrast",1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { MP_CMD_GAMMA, "gamma", 1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { MP_CMD_BRIGHTNESS, "brightness",1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, @@ -144,6 +144,8 @@ static mp_cmd_t mp_cmds[] = { { MP_CMD_GET_VO_FULLSCREEN, "get_vo_fullscreen", 0, { {-1,{0}} } }, { MP_CMD_GET_SUB_VISIBILITY, "get_sub_visibility", 0, { {-1,{0}} } }, { MP_CMD_KEYDOWN_EVENTS, "key_down_event", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, + { MP_CMD_SET_PROPERTY, "set_property", 2, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, + { MP_CMD_GET_PROPERTY, "get_property", 1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, { 0, NULL, 0, {} } }; diff --git a/input/input.h b/input/input.h index 006c3ea991..378bc17624 100644 --- a/input/input.h +++ b/input/input.h @@ -69,6 +69,8 @@ #define MP_CMD_SUB_REMOVE 65 #define MP_CMD_KEYDOWN_EVENTS 66 #define MP_CMD_VO_BORDER 67 +#define MP_CMD_SET_PROPERTY 68 +#define MP_CMD_GET_PROPERTY 69 #define MP_CMD_GUI_EVENTS 5000 #define MP_CMD_GUI_LOADFILE 5001 -- cgit v1.2.3