Mercurial > mplayer.hg

comparison gui/interface.c @ 34052:9f19a87d2062

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove gui() instruction GUI_SET_FILE. Move the preparation part to GUI_PREPARE and the part resetting variable guiInfo.sh_video to GUI_END_FILE.
author ib
date Tue, 27 Sep 2011 14:15:42 +0000
parents 5daa51a194ed
children 19e2b5682587
comparison
equal deleted inserted replaced
34051:1be07d02d453 34052:9f19a87d2062
342 } 342 }
343 343
344 uiState(); 344 uiState();
345 break; 345 break;
346 346
347 case GUI_SET_FILE: 347 case GUI_HANDLE_EVENTS:
348 348 if (!guiInfo.Playing || !guiInfo.VideoWindow)
349 // if ( guiInfo.Playing == 1 && guiInfo.NewPlay == GUI_FILE_NEW ) 349 wsHandleEvents();
350 gtkEventHandling();
351 break;
352
353 case GUI_RUN_COMMAND:
354
355 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] GUI_RUN_COMMAND: %d\n", (int)data);
356
357 switch ((int)data) {
358 case MP_CMD_VO_FULLSCREEN:
359 uiEventHandling(evFullScreen, 0);
360 break;
361
362 case MP_CMD_PLAY_TREE_STEP:
363 uiEventHandling(evNext, 0);
364 break;
365
366 case -MP_CMD_PLAY_TREE_STEP:
367 uiEventHandling(evPrev, 0);
368 break;
369
370 case MP_CMD_STOP:
371 uiEventHandling(evStop, 0);
372 break;
373
374 case MP_CMD_QUIT:
375 uiEventHandling(evExit, 0);
376 break;
377 }
378
379 break;
380
381 case GUI_PREPARE:
382
383 wsVisibleMouse(&guiApp.subWindow, wsHideMouseCursor);
384
350 if (guiInfo.NewPlay == GUI_FILE_NEW) { 385 if (guiInfo.NewPlay == GUI_FILE_NEW) {
351 dvd_title = 0; 386 dvd_title = 0;
352 audio_id = -1; 387 audio_id = -1;
353 video_id = -1; 388 video_id = -1;
354 dvdsub_id = -1; 389 dvdsub_id = -1;
356 391
357 stream_cache_size = -1; 392 stream_cache_size = -1;
358 autosync = 0; 393 autosync = 0;
359 force_fps = 0; 394 force_fps = 0;
360 } 395 }
361
362 guiInfo.sh_video = NULL;
363 wsPostRedisplay(&guiApp.subWindow);
364
365 break;
366
367 case GUI_HANDLE_EVENTS:
368 if (!guiInfo.Playing || !guiInfo.VideoWindow)
369 wsHandleEvents();
370 gtkEventHandling();
371 break;
372
373 case GUI_RUN_COMMAND:
374
375 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] GUI_RUN_COMMAND: %d\n", (int)data);
376
377 switch ((int)data) {
378 case MP_CMD_VO_FULLSCREEN:
379 uiEventHandling(evFullScreen, 0);
380 break;
381
382 case MP_CMD_PLAY_TREE_STEP:
383 uiEventHandling(evNext, 0);
384 break;
385
386 case -MP_CMD_PLAY_TREE_STEP:
387 uiEventHandling(evPrev, 0);
388 break;
389
390 case MP_CMD_STOP:
391 uiEventHandling(evStop, 0);
392 break;
393
394 case MP_CMD_QUIT:
395 uiEventHandling(evExit, 0);
396 break;
397 }
398
399 break;
400
401 case GUI_PREPARE:
402
403 gui(GUI_SET_FILE, 0);
404
405 wsVisibleMouse(&guiApp.subWindow, wsHideMouseCursor);
406 396
407 switch (guiInfo.StreamType) { 397 switch (guiInfo.StreamType) {
408 case STREAMTYPE_PLAYLIST: 398 case STREAMTYPE_PLAYLIST:
409 break; 399 break;
410 400
765 755
766 case GUI_END_FILE: 756 case GUI_END_FILE:
767 757
768 uiEventHandling(evRedraw, 1); 758 uiEventHandling(evRedraw, 1);
769 759
760 guiInfo.sh_video = NULL;
761
770 if (!uiGotoTheNext && guiInfo.Playing) { 762 if (!uiGotoTheNext && guiInfo.Playing) {
771 uiGotoTheNext = 1; 763 uiGotoTheNext = 1;
772 break; 764 break;
773 } 765 }
774 766