comparison mplayer.c @ 33611:6aa251adfba0

Rename guiGetEvent type guiCEvent guiSetState. Type guiCEvent sets the state and should be named so.
author ib
date Wed, 22 Jun 2011 11:48:31 +0000
parents c111d9e9cfb0
children 79743a5cf4f0
comparison
equal deleted inserted replaced
33610:b374c74a5f17 33611:6aa251adfba0
2535 mp_msg(MSGT_CPLAYER, MSGL_STATUS, "\n"MSGTR_Paused "\r"); 2535 mp_msg(MSGT_CPLAYER, MSGL_STATUS, "\n"MSGTR_Paused "\r");
2536 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_PAUSED\n"); 2536 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_PAUSED\n");
2537 } 2537 }
2538 #ifdef CONFIG_GUI 2538 #ifdef CONFIG_GUI
2539 if (use_gui) 2539 if (use_gui)
2540 guiGetEvent(guiCEvent, (char *)guiSetPause); 2540 guiGetEvent(guiSetState, (char *)guiSetPause);
2541 #endif 2541 #endif
2542 if (mpctx->video_out && mpctx->sh_video && vo_config_count) 2542 if (mpctx->video_out && mpctx->sh_video && vo_config_count)
2543 mpctx->video_out->control(VOCTRL_PAUSE, NULL); 2543 mpctx->video_out->control(VOCTRL_PAUSE, NULL);
2544 2544
2545 if (mpctx->audio_out && mpctx->sh_audio) 2545 if (mpctx->audio_out && mpctx->sh_audio)
2602 #ifdef CONFIG_GUI 2602 #ifdef CONFIG_GUI
2603 if (use_gui) { 2603 if (use_gui) {
2604 if (guiInfo.Playing == guiSetStop) 2604 if (guiInfo.Playing == guiSetStop)
2605 mpctx->eof = 1; 2605 mpctx->eof = 1;
2606 else 2606 else
2607 guiGetEvent(guiCEvent, (char *)guiSetPlay); 2607 guiGetEvent(guiSetState, (char *)guiSetPlay);
2608 } 2608 }
2609 #endif 2609 #endif
2610 } 2610 }
2611 2611
2612 static void edl_loadfile(void) 2612 static void edl_loadfile(void)
3050 3050
3051 #ifdef CONFIG_GUI 3051 #ifdef CONFIG_GUI
3052 if (use_gui) { 3052 if (use_gui) {
3053 guiInit(); 3053 guiInit();
3054 guiGetEvent(guiSetContext, mpctx); 3054 guiGetEvent(guiSetContext, mpctx);
3055 guiGetEvent(guiCEvent, (char *)((gui_no_filename) ? 0 : 1)); 3055 guiGetEvent(guiSetState, (char *)((gui_no_filename) ? 0 : 1));
3056 } 3056 }
3057 #endif 3057 #endif
3058 3058
3059 // ******************* Now, let's see the per-file stuff ******************** 3059 // ******************* Now, let's see the per-file stuff ********************
3060 3060