[Toxine-cvs] CVS: toxine/src commands.c,1.80,1.81 xine_commands.c,1.53,1.54 xine_commands.h,1.31,1.3
Brought to you by:
f1rmb
Menu
▾
▴
[Toxine-cvs] CVS: toxine/src commands.c,1.80,1.81 xine_commands.c,1.53,1.54 xine_commands.h,1.31,1.32
|
From: Daniel Caujolle-B. <f1...@us...> - 2004-07-19 20:45:43
|
Update of /cvsroot/toxine/toxine/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17444/src Modified Files: commands.c xine_commands.c xine_commands.h Log Message: add newest vdr xine's events support Index: commands.c =================================================================== RCS file: /cvsroot/toxine/toxine/src/commands.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- commands.c 19 Jul 2004 17:19:22 -0000 1.80 +++ commands.c 19 Jul 2004 20:45:33 -0000 1.81 @@ -97,9 +97,41 @@ { "PVR_REALTIME" , XINE_EVENT_PVR_REALTIME }, { "PVR_PAUSE" , XINE_EVENT_PVR_PAUSE }, { "SET_MPEG_DATA" , XINE_EVENT_SET_MPEG_DATA }, + { "VDR_RED" , XINE_EVENT_VDR_RED }, + { "VDR_GREEN" , XINE_EVENT_VDR_GREEN }, + { "VDR_YELLOW" , XINE_EVENT_VDR_YELLOW }, + { "VDR_BLUE" , XINE_EVENT_VDR_BLUE }, + { "VDR_PLAY" , XINE_EVENT_VDR_PLAY }, + { "VDR_PAUSE" , XINE_EVENT_VDR_PAUSE }, + { "VDR_STOP" , XINE_EVENT_VDR_STOP }, + { "VDR_RECORD" , XINE_EVENT_VDR_RECORD }, + { "VDR_FASTFWD" , XINE_EVENT_VDR_FASTFWD }, + { "VDR_FASTREW" , XINE_EVENT_VDR_FASTREW }, + { "VDR_POWER" , XINE_EVENT_VDR_POWER }, + { "VDR_CHANNELPLUS" , XINE_EVENT_VDR_CHANNELPLUS }, + { "VDR_CHANNELMINUS" , XINE_EVENT_VDR_CHANNELMINUS }, + { "VDR_SCHEDULE" , XINE_EVENT_VDR_SCHEDULE }, + { "VDR_CHANNELS" , XINE_EVENT_VDR_CHANNELS }, + { "VDR_TIMERS" , XINE_EVENT_VDR_TIMERS }, + { "VDR_RECORDINGS" , XINE_EVENT_VDR_RECORDINGS }, + { "VDR_SETUP" , XINE_EVENT_VDR_SETUP }, + { "VDR_COMMANDS" , XINE_EVENT_VDR_COMMANDS }, + { "VDR_BACK" , XINE_EVENT_VDR_BACK }, + { "VDR_USER1" , XINE_EVENT_VDR_USER1 }, + { "VDR_USER2" , XINE_EVENT_VDR_USER2 }, + { "VDR_USER3" , XINE_EVENT_VDR_USER3 }, + { "VDR_USER4" , XINE_EVENT_VDR_USER4 }, + { "VDR_USER5" , XINE_EVENT_VDR_USER5 }, + { "VDR_USER6" , XINE_EVENT_VDR_USER6 }, + { "VDR_USER7" , XINE_EVENT_VDR_USER7 }, + { "VDR_USER8" , XINE_EVENT_VDR_USER8 }, + { "VDR_USER9" , XINE_EVENT_VDR_USER9 }, + { "VDR_VOLPLUS" , XINE_EVENT_VDR_VOLPLUS }, + { "VDR_VOLMINUS" , XINE_EVENT_VDR_VOLMINUS }, + { "VDR_MUTE" , XINE_EVENT_VDR_MUTE }, /* Following aren't xine's events, just hack */ - { "FOREVER" , XINE_EVENT_SET_MPEG_DATA + 1 }, - { "NOTHING" , XINE_EVENT_SET_MPEG_DATA + 1 }, + { "FOREVER" , XINE_EVENT_VDR_MUTE + 1 }, + { "NOTHING" , XINE_EVENT_VDR_MUTE + 1 }, { NULL , 0 } }; @@ -406,7 +438,15 @@ " INPUT_NUMBER_7 | INPUT_NUMBER_8 | INPUT_NUMBER_9 |\n" " INPUT_NUMBER_10_ADD | SET_V4L2 | PVR_SAVE |\n" " PVR_REPORT_NAME | PVR_REALTIME | PVR_PAUSE |\n" - " SET_MPEG_DATA | FOREVER | NOTHING]>\n" + " SET_MPEG_DATA | VDR_RED | VDR_GREEN | VDR_YELLOW |\n" + " VDR_BLUE | VDR_PLAY | VDR_PAUSE | VDR_STOP | VDR_RECORD |\n" + " VDR_FASTFWD | VDR_FASTREW | VDR_POWER | VDR_CHANNELPLUS \n" + " VDR_CHANNELMINUS | VDR_SCHEDULE | VDR_CHANNELS |\n" + " VDR_TIMERS | VDR_RECORDINGS | VDR_SETUP | VDR_COMMANDS |\n" + " VDR_BACK | VDR_USER1 | VDR_USER2 | VDR_USER3 | VDR_USER4 |\n" + " VDR_USER5 | VDR_USER6 | VDR_USER7 | VDR_USER8 |\n" + " VDR_USER9 | VDR_VOLPLUS | VDR_VOLMINUS | VDR_MUTE |\n" + " FOREVER | NOTHING]>\n" "waitfor status <[PLAY | STOP | QUIT | PAUSE | SLOW_4 | SLOW_2 | NORMAL |\n" " FAST_2 | FAST_4]>" }, Index: xine_commands.c =================================================================== RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- xine_commands.c 19 Jul 2004 09:00:47 -0000 1.53 +++ xine_commands.c 19 Jul 2004 20:45:33 -0000 1.54 @@ -123,6 +123,38 @@ { "XINE_EVENT_PVR_REALTIME" , XINE_EVENT_PVR_REALTIME }, { "XINE_EVENT_PVR_PAUSE" , XINE_EVENT_PVR_PAUSE }, { "XINE_EVENT_SET_MPEG_DATA" , XINE_EVENT_SET_MPEG_DATA }, + { "XINE_EVENT_VDR_RED" , XINE_EVENT_VDR_RED }, + { "XINE_EVENT_VDR_GREEN" , XINE_EVENT_VDR_GREEN }, + { "XINE_EVENT_VDR_YELLOW" , XINE_EVENT_VDR_YELLOW }, + { "XINE_EVENT_VDR_BLUE" , XINE_EVENT_VDR_BLUE }, + { "XINE_EVENT_VDR_PLAY" , XINE_EVENT_VDR_PLAY }, + { "XINE_EVENT_VDR_PAUSE" , XINE_EVENT_VDR_PAUSE }, + { "XINE_EVENT_VDR_STOP" , XINE_EVENT_VDR_STOP }, + { "XINE_EVENT_VDR_RECORD" , XINE_EVENT_VDR_RECORD }, + { "XINE_EVENT_VDR_FASTFWD" , XINE_EVENT_VDR_FASTFWD }, + { "XINE_EVENT_VDR_FASTREW" , XINE_EVENT_VDR_FASTREW }, + { "XINE_EVENT_VDR_POWER" , XINE_EVENT_VDR_POWER }, + { "XINE_EVENT_VDR_CHANNELPLUS" , XINE_EVENT_VDR_CHANNELPLUS }, + { "XINE_EVENT_VDR_CHANNELMINUS" , XINE_EVENT_VDR_CHANNELMINUS }, + { "XINE_EVENT_VDR_SCHEDULE" , XINE_EVENT_VDR_SCHEDULE }, + { "XINE_EVENT_VDR_CHANNELS" , XINE_EVENT_VDR_CHANNELS }, + { "XINE_EVENT_VDR_TIMERS" , XINE_EVENT_VDR_TIMERS }, + { "XINE_EVENT_VDR_RECORDINGS" , XINE_EVENT_VDR_RECORDINGS }, + { "XINE_EVENT_VDR_SETUP" , XINE_EVENT_VDR_SETUP }, + { "XINE_EVENT_VDR_COMMANDS" , XINE_EVENT_VDR_COMMANDS }, + { "XINE_EVENT_VDR_BACK" , XINE_EVENT_VDR_BACK }, + { "XINE_EVENT_VDR_USER1" , XINE_EVENT_VDR_USER1 }, + { "XINE_EVENT_VDR_USER2" , XINE_EVENT_VDR_USER2 }, + { "XINE_EVENT_VDR_USER3" , XINE_EVENT_VDR_USER3 }, + { "XINE_EVENT_VDR_USER4" , XINE_EVENT_VDR_USER4 }, + { "XINE_EVENT_VDR_USER5" , XINE_EVENT_VDR_USER5 }, + { "XINE_EVENT_VDR_USER6" , XINE_EVENT_VDR_USER6 }, + { "XINE_EVENT_VDR_USER7" , XINE_EVENT_VDR_USER7 }, + { "XINE_EVENT_VDR_USER8" , XINE_EVENT_VDR_USER8 }, + { "XINE_EVENT_VDR_USER9" , XINE_EVENT_VDR_USER9 }, + { "XINE_EVENT_VDR_VOLPLUS" , XINE_EVENT_VDR_VOLPLUS }, + { "XINE_EVENT_VDR_VOLMINUS" , XINE_EVENT_VDR_VOLMINUS }, + { "XINE_EVENT_VDR_MUTE" , XINE_EVENT_VDR_MUTE }, { NULL , 0 } }; Index: xine_commands.h =================================================================== RCS file: /cvsroot/toxine/toxine/src/xine_commands.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- xine_commands.h 12 Jun 2004 23:52:41 -0000 1.31 +++ xine_commands.h 19 Jul 2004 20:45:34 -0000 1.32 @@ -396,7 +396,17 @@ " XINE_EVENT_INPUT_NUMBER_7 | XINE_EVENT_INPUT_NUMBER_8 | XINE_EVENT_INPUT_NUMBER_9 |\n" \ " XINE_EVENT_INPUT_NUMBER_10_ADD | XINE_EVENT_SET_V4L2 | XINE_EVENT_PVR_SAVE |\n" \ " XINE_EVENT_PVR_REPORT_NAME | XINE_EVENT_PVR_REALTIME | XINE_EVENT_PVR_PAUSE |\n" \ - " XINE_EVENT_SET_MPEG_DATA]" \ + " XINE_EVENT_SET_MPEG_DATA | XINE_EVENT_VDR_RED | XINE_EVENT_VDR_GREEN |\n" \ + " XINE_EVENT_VDR_YELLOW | XINE_EVENT_VDR_BLUE | XINE_EVENT_VDR_PLAY |\n" \ + " XINE_EVENT_VDR_PAUSE | XINE_EVENT_VDR_STOP | XINE_EVENT_VDR_RECORD |\n" \ + " XINE_EVENT_VDR_FASTFWD | XINE_EVENT_VDR_FASTREW | XINE_EVENT_VDR_POWER |\n" \ + " XINE_EVENT_VDR_CHANNELPLUS | XINE_EVENT_VDR_CHANNELMINUS | XINE_EVENT_VDR_SCHEDULE |\n" \ + " XINE_EVENT_VDR_CHANNELS | XINE_EVENT_VDR_TIMERS | XINE_EVENT_VDR_RECORDINGS |\n" \ + " XINE_EVENT_VDR_SETUP | XINE_EVENT_VDR_COMMANDS | XINE_EVENT_VDR_BACK |\n" \ + " XINE_EVENT_VDR_USER1 | XINE_EVENT_VDR_USER2 | XINE_EVENT_VDR_USER3 |\n" \ + " XINE_EVENT_VDR_USER4 | XINE_EVENT_VDR_USER5 | XINE_EVENT_VDR_USER6 |\n" \ + " XINE_EVENT_VDR_USER7 | XINE_EVENT_VDR_USER8 | XINE_EVENT_VDR_USER9 |\n" \ + " XINE_EVENT_VDR_VOLPLUS | XINE_EVENT_VDR_VOLMINUS | XINE_EVENT_VDR_MUTE]" \ }, \ { "xine_config_get_first_entry", NO_ARGS, _xine_config_get_first_entry, \ "Get first entry in xine config object.", \ |
