[Toxine-cvs] CVS: toxine/src commands.c,1.55,1.56 xine_commands.c,1.40,1.41 xine_commands.h,1.25,1.2
Brought to you by:
f1rmb
From: Daniel Caujolle-B. <f1...@us...> - 2003-10-16 22:16:43
|
Update of /cvsroot/toxine/toxine/src In directory sc8-pr-cvs1:/tmp/cvs-serv25006 Modified Files: commands.c xine_commands.c xine_commands.h Log Message: update EVENT_* Index: commands.c =================================================================== RCS file: /cvsroot/toxine/toxine/src/commands.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- commands.c 15 Oct 2003 14:44:52 -0000 1.55 +++ commands.c 16 Oct 2003 22:16:35 -0000 1.56 @@ -50,7 +50,7 @@ char *name; uint32_t event; } event_struct[] = { - { "PLAYBACK_FINISHED" , XINE_EVENT_UI_PLAYBACK_FINISHED }, + { "UI_PLAYBACK_FINISHED", XINE_EVENT_UI_PLAYBACK_FINISHED }, { "UI_CHANNELS_CHANGED" , XINE_EVENT_UI_CHANNELS_CHANGED }, { "UI_SET_TITLE" , XINE_EVENT_UI_SET_TITLE }, { "UI_MESSAGE" , XINE_EVENT_UI_MESSAGE }, @@ -58,22 +58,10 @@ { "AUDIO_LEVEL" , XINE_EVENT_AUDIO_LEVEL }, { "QUIT" , XINE_EVENT_QUIT }, { "PROGRESS" , XINE_EVENT_PROGRESS }, - /* + { "MRL_REFERENCE" , XINE_EVENT_MRL_REFERENCE }, + { "UI_NUM_BUTTONS" , XINE_EVENT_UI_NUM_BUTTONS }, { "SPU_BUTTON" , XINE_EVENT_SPU_BUTTON }, - { "SPU_CLUT" , XINE_EVENT_SPU_CLUT }, - { "UI_CHANNELS_CHANGED" , XINE_EVENT_UI_CHANNELS_CHANGED }, - { "UI_SET_TITLE" , XINE_EVENT_UI_SET_TITLE }, - { "PLAYBACK_FINISHED" , XINE_EVENT_PLAYBACK_FINISHED }, - { "BRANCHED" , XINE_EVENT_BRANCHED }, - { "NEED_NEXT_MRL" , XINE_EVENT_NEED_NEXT_MRL }, - { "SPU_FORCEDISPLAY" , XINE_EVENT_SPU_FORCEDISPLAY }, - { "FRAME_CHANGE" , XINE_EVENT_FRAME_CHANGE }, - { "CLOSED_CAPTION" , XINE_EVENT_CLOSED_CAPTION }, - { "ASPECT_CHANGE" , XINE_EVENT_ASPECT_CHANGE }, - { "OUTPUT_VIDEO" , XINE_EVENT_OUTPUT_VIDEO }, - { "OUTPUT_NO_VIDEO" , XINE_EVENT_OUTPUT_NO_VIDEO }, - { "UI_MESSAGE" , XINE_EVENT_UI_MESSAGE }, - */ + { "DROPPED_FRAMES" , XINE_EVENT_DROPPED_FRAMES }, { "INPUT_MOUSE_BUTTON" , XINE_EVENT_INPUT_MOUSE_BUTTON }, { "INPUT_MOUSE_MOVE" , XINE_EVENT_INPUT_MOUSE_MOVE }, { "INPUT_MENU1" , XINE_EVENT_INPUT_MENU1 }, @@ -104,9 +92,15 @@ { "INPUT_NUMBER_8" , XINE_EVENT_INPUT_NUMBER_8 }, { "INPUT_NUMBER_9" , XINE_EVENT_INPUT_NUMBER_9 }, { "INPUT_NUMBER_10_ADD" , XINE_EVENT_INPUT_NUMBER_10_ADD }, + { "SET_V4L2" , XINE_EVENT_SET_V4L2 }, + { "PVR_SAVE" , XINE_EVENT_PVR_SAVE }, + { "PVR_REPORT_NAME" , XINE_EVENT_PVR_REPORT_NAME }, + { "PVR_REALTIME" , XINE_EVENT_PVR_REALTIME }, + { "PVR_PAUSE" , XINE_EVENT_PVR_PAUSE }, + { "SET_MPEG_DATA" , XINE_EVENT_SET_MPEG_DATA }, /* Following aren't xine's events, just hack */ - { "FOREVER" , XINE_EVENT_INPUT_NUMBER_10_ADD + 1 }, - { "NOTHING" , XINE_EVENT_INPUT_NUMBER_10_ADD + 1 }, + { "FOREVER" , XINE_EVENT_SET_MPEG_DATA + 1 }, + { "NOTHING" , XINE_EVENT_SET_MPEG_DATA + 1 }, { NULL , 0 } }; @@ -394,19 +388,21 @@ }, { "waitfor", REQUIRE_ARGS, do_waitfor, "Wait for an event.", - "waitfor <[MOUSE_BUTTON | MOUSE_MOVE | SPU_BUTTON | SPU_CLUT |\n" - " UI_CHANNELS_CHANGED | UI_SET_TITLE | INPUT_MENU1 |\n" - " INPUT_MENU2 | INPUT_MENU3 | INPUT_UP | INPUT_DOWN |\n" - " INPUT_LEFT | INPUT_RIGHT | INPUT_SELECT | PLAYBACK_FINISHED |\n" - " BRANCHED | NEED_NEXT_MRL | INPUT_NEXT | INPUT_PREVIOUS |\n" - " INPUT_ANGLE_NEXT | INPUT_ANGLE_PREVIOUS | SPU_FORCEDISPLAY |\n" - " FRAME_CHANGE | CLOSED_CAPTION | INPUT_BUTTON_FORCE |\n" - " INPUT_MENU4 | INPUT_MENU5 | INPUT_MENU6 | INPUT_MENU7 |\n" - " INPUT_NUMBER_0 | INPUT_NUMBER_1 | INPUT_NUMBER_2 |\n" - " INPUT_NUMBER_3 | INPUT_NUMBER_4 | INPUT_NUMBER_5 |\n" - " INPUT_NUMBER_6 | INPUT_NUMBER_7 | INPUT_NUMBER_8 |\n" - " INPUT_NUMBER_9 | INPUT_NUMBER_10_ADD | ASPECT_CHANGE |\n" - " OUTPUT_VIDEO | OUTPUT_NO_VIDEO | UI_MESSAGE | FOREVER | NOTHING]>\n" + "waitfor <[UI_PLAYBACK_FINISHED | UI_CHANNELS_CHANGED | UI_SET_TITLE |\n" + " UI_MESSAGE | FRAME_FORMAT_CHANGE | AUDIO_LEVEL | QUIT |\n" + " PROGRESS | MRL_REFERENCE | UI_NUM_BUTTONS | SPU_BUTTON |\n" + " DROPPED_FRAMES | INPUT_MOUSE_BUTTON | INPUT_MOUSE_MOVE |\n" + " INPUT_MENU1 | INPUT_MENU2 | INPUT_MENU3 | INPUT_MENU4 |\n" + " INPUT_MENU5 | INPUT_MENU6 | INPUT_MENU7 | INPUT_UP |\n" + " INPUT_DOWN | INPUT_LEFT | INPUT_RIGHT | INPUT_SELECT |\n" + " INPUT_NEXT | INPUT_PREVIOUS | INPUT_ANGLE_NEXT |\n" + " INPUT_ANGLE_PREVIOUS | INPUT_BUTTON_FORCE | INPUT_NUMBER_0 |\n" + " INPUT_NUMBER_1 | INPUT_NUMBER_2 | INPUT_NUMBER_3 |\n" + " INPUT_NUMBER_4 | INPUT_NUMBER_5 | INPUT_NUMBER_6 |\n" + " 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" "waitfor status <[PLAY | STOP | QUIT | PAUSE | SLOW_4 | SLOW_2 | NORMAL |\n" " FAST_2 | FAST_4]>" }, @@ -504,6 +500,8 @@ */ void toxine_event_listener(void *data, const xine_event_t *event) { toxine_t *tox = (toxine_t *) data; + int i; + char *event_name = NULL; pthread_mutex_lock(&tox->event.mutex); tox->event.last.type = event->type; @@ -514,169 +512,20 @@ finished_cb(tox); tox->ignore_finished = 0; break; - - /* - case XINE_EVENT_NEED_NEXT_MRL: { - xine_next_mrl_event_t *uevent = (xine_next_mrl_event_t *)event; - - uevent->handled = 1; - uevent->mrl = toxine_get_next_mrl(tox); - } - break; - - case XINE_EVENT_BRANCHED: - toxine_branched(tox); + default: break; - */ - } -#warning FIXME -#if 0 + pinfo("Get xine event:\n"); poutalign(); - - switch(tox->event.last.type) { - case XINE_EVENT_MOUSE_BUTTON: - pout("XINE_EVENT_MOUSE_BUTTON"); - break; - case XINE_EVENT_MOUSE_MOVE: - pout("XINE_EVENT_MOUSE_MOVE"); - break; - case XINE_EVENT_SPU_BUTTON: - pout("XINE_EVENT_SPU_BUTTON"); - break; - case XINE_EVENT_SPU_CLUT: - pout("XINE_EVENT_SPU_CLUT"); - break; - case XINE_EVENT_UI_CHANNELS_CHANGED: - pout("XINE_EVENT_UI_CHANNELS_CHANGED"); - break; - case XINE_EVENT_UI_SET_TITLE: - pout("XINE_EVENT_UI_SET_TITLE"); - break; - case XINE_EVENT_INPUT_MENU1: - pout("XINE_EVENT_INPUT_MENU1"); - break; - case XINE_EVENT_INPUT_MENU2: - pout("XINE_EVENT_INPUT_MENU2"); - break; - case XINE_EVENT_INPUT_MENU3: - pout("XINE_EVENT_INPUT_MENU3"); - break; - case XINE_EVENT_INPUT_UP: - pout("XINE_EVENT_INPUT_UP"); - break; - case XINE_EVENT_INPUT_DOWN: - pout("XINE_EVENT_INPUT_DOWN"); - break; - case XINE_EVENT_INPUT_LEFT: - pout("XINE_EVENT_INPUT_LEFT"); - break; - case XINE_EVENT_INPUT_RIGHT: - pout("XINE_EVENT_INPUT_RIGHT"); - break; - case XINE_EVENT_INPUT_SELECT: - pout("XINE_EVENT_INPUT_SELECT"); - break; - case XINE_EVENT_PLAYBACK_FINISHED: - pout("XINE_EVENT_PLAYBACK_FINISHED"); - break; - case XINE_EVENT_BRANCHED: - pout("XINE_EVENT_BRANCHED"); - break; - case XINE_EVENT_NEED_NEXT_MRL: - pout("XINE_EVENT_NEED_NEXT_MRL"); - break; - case XINE_EVENT_INPUT_NEXT: - pout("XINE_EVENT_INPUT_NEXT"); - break; - case XINE_EVENT_INPUT_PREVIOUS: - pout("XINE_EVENT_INPUT_PREVIOUS"); - break; - case XINE_EVENT_INPUT_ANGLE_NEXT: - pout("XINE_EVENT_INPUT_ANGLE_NEXT"); - break; - case XINE_EVENT_INPUT_ANGLE_PREVIOUS: - pout("XINE_EVENT_INPUT_ANGLE_PREVIOUS"); - break; - case XINE_EVENT_SPU_FORCEDISPLAY: - pout("XINE_EVENT_SPU_FORCEDISPLAY"); - break; - case XINE_EVENT_FRAME_CHANGE: - pout("XINE_EVENT_FRAME_CHANGE"); - break; - case XINE_EVENT_CLOSED_CAPTION: - pout("XINE_EVENT_CLOSED_CAPTION"); - break; - case XINE_EVENT_INPUT_BUTTON_FORCE: - pout("XINE_EVENT_INPUT_BUTTON_FORCE"); - break; - case XINE_EVENT_INPUT_MENU4: - pout("XINE_EVENT_INPUT_MENU4"); - break; - case XINE_EVENT_INPUT_MENU5: - pout("XINE_EVENT_INPUT_MENU5"); - break; - case XINE_EVENT_INPUT_MENU6: - pout("XINE_EVENT_INPUT_MENU6"); - break; - case XINE_EVENT_INPUT_MENU7: - pout("XINE_EVENT_INPUT_MENU7"); - break; - case XINE_EVENT_INPUT_NUMBER_0: - pout("XINE_EVENT_INPUT_NUMBER_0"); - break; - case XINE_EVENT_INPUT_NUMBER_1: - pout("XINE_EVENT_INPUT_NUMBER_1"); - break; - case XINE_EVENT_INPUT_NUMBER_2: - pout("XINE_EVENT_INPUT_NUMBER_2"); - break; - case XINE_EVENT_INPUT_NUMBER_3: - pout("XINE_EVENT_INPUT_NUMBER_3"); - break; - case XINE_EVENT_INPUT_NUMBER_4: - pout("XINE_EVENT_INPUT_NUMBER_4"); - break; - case XINE_EVENT_INPUT_NUMBER_5: - pout("XINE_EVENT_INPUT_NUMBER_5"); - break; - case XINE_EVENT_INPUT_NUMBER_6: - pout("XINE_EVENT_INPUT_NUMBER_6"); - break; - case XINE_EVENT_INPUT_NUMBER_7: - pout("XINE_EVENT_INPUT_NUMBER_7"); - break; - case XINE_EVENT_INPUT_NUMBER_8: - pout("XINE_EVENT_INPUT_NUMBER_8"); - break; - case XINE_EVENT_INPUT_NUMBER_9: - pout("XINE_EVENT_INPUT_NUMBER_9"); - break; - case XINE_EVENT_INPUT_NUMBER_10_ADD: - pout("XINE_EVENT_INPUT_NUMBER_10_ADD"); - break; - case XINE_EVENT_ASPECT_CHANGE: - pout("XINE_EVENT_ASPECT_CHANGE"); - break; - case XINE_EVENT_OUTPUT_VIDEO: - pout("XINE_EVENT_OUTPUT_VIDEO"); - break; - case XINE_EVENT_OUTPUT_NO_VIDEO: - pout("XINE_EVENT_OUTPUT_NO_VIDEO"); - break; - case XINE_EVENT_UI_MESSAGE: - pout("XINE_EVENT_UI_MESSAGE"); - break; - case XINE_EVENT_AUDIO_LEVEL: - pout("XINE_EVENT_AUDIO_LEVEL"); - break; - default: - pout("UNKNOWN EVENT"); - break; + for(i = 0; event_struct[i].name != NULL; i++) { + if(event_struct[i].event == tox->event.last.type) { + event_name = event_struct[i].name; + break; + } } + pout("%s", (event_name) ? event_name : "UNKNOWN EVENT"); pinfo("\n"); -#endif if(tox->video.cur_plugin && tox->video.cur_plugin->receive_xine_event) tox->video.cur_plugin->receive_xine_event(tox, event); Index: xine_commands.c =================================================================== RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- xine_commands.c 15 Oct 2003 14:44:52 -0000 1.40 +++ xine_commands.c 16 Oct 2003 22:16:36 -0000 1.41 @@ -97,6 +97,18 @@ char *name; int type; } event_types[] = { + { "XINE_EVENT_UI_PLAYBACK_FINISHED", XINE_EVENT_UI_PLAYBACK_FINISHED }, + { "XINE_EVENT_UI_CHANNELS_CHANGED" , XINE_EVENT_UI_CHANNELS_CHANGED }, + { "XINE_EVENT_UI_SET_TITLE" , XINE_EVENT_UI_SET_TITLE }, + { "XINE_EVENT_UI_MESSAGE" , XINE_EVENT_UI_MESSAGE }, + { "XINE_EVENT_FRAME_FORMAT_CHANGE" , XINE_EVENT_FRAME_FORMAT_CHANGE }, + { "XINE_EVENT_AUDIO_LEVEL" , XINE_EVENT_AUDIO_LEVEL }, + { "XINE_EVENT_QUIT" , XINE_EVENT_QUIT }, + { "XINE_EVENT_PROGRESS" , XINE_EVENT_PROGRESS }, + { "XINE_EVENT_MRL_REFERENCE" , XINE_EVENT_MRL_REFERENCE }, + { "XINE_EVENT_UI_NUM_BUTTONS" , XINE_EVENT_UI_NUM_BUTTONS }, + { "XINE_EVENT_SPU_BUTTON" , XINE_EVENT_SPU_BUTTON }, + { "XINE_EVENT_DROPPED_FRAMES" , XINE_EVENT_DROPPED_FRAMES }, { "XINE_EVENT_INPUT_MOUSE_BUTTON" , XINE_EVENT_INPUT_MOUSE_BUTTON }, { "XINE_EVENT_INPUT_MOUSE_MOVE" , XINE_EVENT_INPUT_MOUSE_MOVE }, { "XINE_EVENT_INPUT_MENU1" , XINE_EVENT_INPUT_MENU1 }, @@ -127,6 +139,12 @@ { "XINE_EVENT_INPUT_NUMBER_8" , XINE_EVENT_INPUT_NUMBER_8 }, { "XINE_EVENT_INPUT_NUMBER_9" , XINE_EVENT_INPUT_NUMBER_9 }, { "XINE_EVENT_INPUT_NUMBER_10_ADD" , XINE_EVENT_INPUT_NUMBER_10_ADD }, + { "XINE_EVENT_SET_V4L2" , XINE_EVENT_SET_V4L2 }, + { "XINE_EVENT_PVR_SAVE" , XINE_EVENT_PVR_SAVE }, + { "XINE_EVENT_PVR_REPORT_NAME" , XINE_EVENT_PVR_REPORT_NAME }, + { "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 }, { NULL , 0 } }; Index: xine_commands.h =================================================================== RCS file: /cvsroot/toxine/toxine/src/xine_commands.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- xine_commands.h 22 May 2003 20:50:34 -0000 1.25 +++ xine_commands.h 16 Oct 2003 22:16:36 -0000 1.26 @@ -355,25 +355,24 @@ "Send an event to the engine.", \ "xine_event_send <event>\n" \ " - event can be:\n" \ - " [XINE_EVENT_MOUSE_BUTTON | XINE_EVENT_MOUSE_MOVE | XINE_EVENT_SPU_BUTTON |\n" \ - " XINE_EVENT_SPU_CLUT | XINE_EVENT_UI_CHANNELS_CHANGED |\n" \ - " XINE_EVENT_UI_SET_TITLE | XINE_EVENT_INPUT_MENU1 | XINE_EVENT_INPUT_MENU2 |\n" \ - " XINE_EVENT_INPUT_MENU3 | XINE_EVENT_INPUT_UP | XINE_EVENT_INPUT_DOWN |\n" \ - " XINE_EVENT_INPUT_LEFT | XINE_EVENT_INPUT_RIGHT | XINE_EVENT_INPUT_SELECT |\n" \ - " XINE_EVENT_PLAYBACK_FINISHED | XINE_EVENT_BRANCHED |\n" \ - " XINE_EVENT_NEED_NEXT_MRL | XINE_EVENT_INPUT_NEXT |\n" \ - " XINE_EVENT_INPUT_PREVIOUS | XINE_EVENT_INPUT_ANGLE_NEXT |\n" \ - " XINE_EVENT_INPUT_ANGLE_PREVIOUS | XINE_EVENT_SPU_FORCEDISPLAY |\n" \ - " XINE_EVENT_FRAME_CHANGE | XINE_EVENT_CLOSED_CAPTION |\n" \ - " XINE_EVENT_INPUT_BUTTON_FORCE | XINE_EVENT_INPUT_MENU4 |\n" \ - " XINE_EVENT_INPUT_MENU5 | XINE_EVENT_INPUT_MENU6 | XINE_EVENT_INPUT_MENU7 |\n" \ - " XINE_EVENT_INPUT_NUMBER_0 | XINE_EVENT_INPUT_NUMBER_1 |\n" \ - " XINE_EVENT_INPUT_NUMBER_2 | XINE_EVENT_INPUT_NUMBER_3 |\n" \ - " XINE_EVENT_INPUT_NUMBER_4 | XINE_EVENT_INPUT_NUMBER_5 |\n" \ - " XINE_EVENT_INPUT_NUMBER_6 | XINE_EVENT_INPUT_NUMBER_7 |\n" \ - " XINE_EVENT_INPUT_NUMBER_8 | XINE_EVENT_INPUT_NUMBER_9 |\n" \ - " XINE_EVENT_INPUT_NUMBER_10_ADD | XINE_EVENT_ASPECT_CHANGE |\n" \ - " XINE_EVENT_OUTPUT_VIDEO | XINE_EVENT_OUTPUT_NO_VIDEO]" \ + " [XINE_EVENT_UI_PLAYBACK_FINISHED | XINE_EVENT_UI_CHANNELS_CHANGED |\n" \ + " XINE_EVENT_UI_SET_TITLE | XINE_EVENT_UI_MESSAGE | XINE_EVENT_FRAME_FORMAT_CHANGE |\n" \ + " XINE_EVENT_AUDIO_LEVEL | XINE_EVENT_QUIT | XINE_EVENT_PROGRESS |\n" \ + " XINE_EVENT_MRL_REFERENCE | XINE_EVENT_UI_NUM_BUTTONS | XINE_EVENT_SPU_BUTTON |\n" \ + " XINE_EVENT_DROPPED_FRAMES | XINE_EVENT_INPUT_MOUSE_BUTTON |\n" \ + " XINE_EVENT_INPUT_MOUSE_MOVE | XINE_EVENT_INPUT_MENU1 | XINE_EVENT_INPUT_MENU2 |\n" \ + " XINE_EVENT_INPUT_MENU3 | XINE_EVENT_INPUT_MENU4 | XINE_EVENT_INPUT_MENU5 |\n" \ + " XINE_EVENT_INPUT_MENU6 | XINE_EVENT_INPUT_MENU7 | XINE_EVENT_INPUT_UP |\n" \ + " XINE_EVENT_INPUT_DOWN | XINE_EVENT_INPUT_LEFT | XINE_EVENT_INPUT_RIGHT |\n" \ + " XINE_EVENT_INPUT_SELECT | XINE_EVENT_INPUT_NEXT | XINE_EVENT_INPUT_PREVIOUS |\n" \ + " XINE_EVENT_INPUT_ANGLE_NEXT | XINE_EVENT_INPUT_ANGLE_PREVIOUS |\n" \ + " XINE_EVENT_INPUT_BUTTON_FORCE | XINE_EVENT_INPUT_NUMBER_0 | \n" \ + " XINE_EVENT_INPUT_NUMBER_1 | XINE_EVENT_INPUT_NUMBER_2 | XINE_EVENT_INPUT_NUMBER_3 |\n" \ + " XINE_EVENT_INPUT_NUMBER_4 | XINE_EVENT_INPUT_NUMBER_5 | XINE_EVENT_INPUT_NUMBER_6 |\n" \ + " 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_config_get_first_entry", NO_ARGS, _xine_config_get_first_entry, \ "Get first entry in xine config object.", \ |