comparison mplayer.c @ 22286:a7e5b99ac083

Fix GUI compilation
author uau
date Wed, 21 Feb 2007 19:14:49 +0000
parents 5d12a6e96930
children da8ba4c0fc57
comparison
equal deleted inserted replaced
22285:5d12a6e96930 22286:a7e5b99ac083
384 void *mpctx_get_video_out(MPContext *mpctx) 384 void *mpctx_get_video_out(MPContext *mpctx)
385 { 385 {
386 return mpctx->video_out; 386 return mpctx->video_out;
387 } 387 }
388 388
389 void *mpctx_get_audio_out(MPContext *mpctx)
390 {
391 return mpctx->video_out;
392 }
393
389 void *mpctx_get_playtree_iter(MPContext *mpctx) 394 void *mpctx_get_playtree_iter(MPContext *mpctx)
390 { 395 {
391 return mpctx->playtree_iter; 396 return mpctx->playtree_iter;
397 }
398
399 void *mpctx_get_mixer(MPContext *mpctx)
400 {
401 return &mpctx->mixer;
402 }
403
404 void *mpctx_get_global_sub_size(MPContext *mpctx)
405 {
406 return mpctx->global_sub_size;
392 } 407 }
393 408
394 static int is_valid_metadata_type (metadata_t type) { 409 static int is_valid_metadata_type (metadata_t type) {
395 switch (type) 410 switch (type)
396 { 411 {
2544 #endif 2559 #endif
2545 2560
2546 #ifdef HAVE_NEW_GUI 2561 #ifdef HAVE_NEW_GUI
2547 if(use_gui){ 2562 if(use_gui){
2548 guiInit(); 2563 guiInit();
2564 guiGetEvent(guiSetContext, mpctx);
2549 inited_flags|=INITED_GUI; 2565 inited_flags|=INITED_GUI;
2550 guiGetEvent( guiCEvent,(char *)((gui_no_filename) ? 0 : 1) ); 2566 guiGetEvent( guiCEvent,(char *)((gui_no_filename) ? 0 : 1) );
2551 } 2567 }
2552 #endif 2568 #endif
2553 2569