mplayer.hg: mplayer.c comparison

comparison mplayer.c @ 5511:7a24a067f0af

vo_config_count now counts calls to vo->config()

author	arpi
date	Sun, 07 Apr 2002 02:12:15 +0000
parents	d0d029fda134
children	25c43bd75e4c

comparison

equal deleted inserted replaced

-:f2c4cace6450
+:7a24a067f0af
 }
 if(mask&INITED_VO){
 inited_flags&=~INITED_VO;
 current_module="uninit_vo";
-video_out->uninit(); video_out=NULL;
+video_out->uninit();
+video_out=NULL;
 }
 if(mask&INITED_AO){
 inited_flags&=~INITED_AO;
 current_module="uninit_ao";
 if(!sh_video)
 goto main;
 current_module="preinit_libvo";
+vo_config_count=0;
 if((video_out->preinit(vo_subdevice))!=0){
 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Error opening/initializing the selected video_out (-vo) device!\n");
 goto goto_next_file; // exit_player(MSGTR_Exit_error);
 }
 sh_video->video_out=video_out;
 vdecode_time=video_time_usage-vdecode_time;
 //------------------------ frame decoded. --------------------
 //------------------------ add OSD to frame contents ---------
 current_module="draw_osd";
-video_out->draw_osd();
+if(vo_config_count) video_out->draw_osd();
 current_module="av_sync";
 sh_video->timer+=frame_time;
 time_frame+=frame_time;  // for nosound
 	  }
 }
 #ifdef HAVE_NEW_GUI
 if(use_gui) guiEventHandling();
 #endif
-video_out->check_events(); // check events AST
+if(vo_config_count) video_out->check_events(); // check events AST
 } else {
 // It's time to sleep...
 current_module="sleep";
 time_frame-=GetRelativeTime(); // reset timer
 }
 }
 current_module="flip_page";
-	video_out->check_events();
+	if(vo_config_count) video_out->check_events();
 if(blit_frame){
 	   unsigned int t2=GetTimer();
 	   double tt;
 	   float j;
 #define	FRAME_LAG_WARN	0.2
 		/* printf ("PANIC: too fast frame (%.3f)!\n", j); */
 	   else if (j > frame_time + frame_time * FRAME_LAG_WARN)
 		too_slow_frame_cnt++;
 		/* printf ("PANIC: too slow frame (%.3f)!\n", j); */
-	   video_out->flip_page();
+	   if(vo_config_count) video_out->flip_page();
 	   t2=GetTimer()-t2;
 	   tt = t2*0.000001f;
 	   vout_time_usage+=tt;
 	}
 //        usec_sleep(50000); // test only!
 	fflush(stdout);
 }
 #ifdef HAVE_NEW_GUI
 if(use_gui) guiGetEvent( guiCEvent,(char *)guiSetPause );
 #endif
-if (video_out && sh_video)
+if (video_out && sh_video && vo_config_count)
 	 video_out->control(VOCTRL_PAUSE, NULL);
 if (audio_out && sh_audio)
 audio_out->pause();	// pause audio, keep data if possible
 #ifdef HAVE_LIRC
 lirc_mp_getinput()<=0 &&
 #endif
 (use_stdin || getch2(20)<=0) && mplayer_get_key()<=0){
 #endif /* HAVE_NEW_INPUT */
-	     if(sh_video && video_out) video_out->check_events();
+	     if(sh_video && video_out && vo_config_count) video_out->check_events();
 #ifdef HAVE_NEW_GUI
 if(use_gui){
 		guiEventHandling();
 		if(guiIntfStruct.Playing!=2 || (rel_seek_secs || abs_seek_pos)) break;
 }
 }
 #endif /* HAVE_NEW_INPUT */
 osd_function=OSD_PLAY;
 if (audio_out && sh_audio)
 audio_out->resume();	// resume audio
-if (video_out && sh_video)
+if (video_out && sh_video && vo_config_count)
 video_out->control(VOCTRL_RESUME, NULL);	// resume video
 (void)GetRelativeTime();	// keep TF around FT in next cycle
 #ifdef HAVE_NEW_GUI
 if (use_gui) guiGetEvent( guiCEvent,(char *)guiSetPlay );
 #endif
 	break;
 #else
 /* User wants to have screen shot */
 case 'S':
 case 's':
-		video_out->control(VOCTRL_SCREENSHOT, NULL);
+		if(vo_config_count) video_out->control(VOCTRL_SCREENSHOT, NULL);
 		break;
 // Contrast:
 case '1':
 case '2':
 if(c=='2'){
 tv_step_chanlist(tv_handler);
 break;
 #endif
 case 'f':
-	video_out->control(VOCTRL_FULLSCREEN, 0);
+	if(vo_config_count) video_out->control(VOCTRL_FULLSCREEN, 0);
 break;
 }
 } // keyboard event handler
 #else /* HAVE_NEW_INPUT */
 {
 #ifdef HAVE_NEW_GUI
 if ( use_gui ) guiGetEvent( guiIEvent,(char *)MP_CMD_GUI_FULLSCREEN );
 else
 #endif
-	if(video_out) video_out->control(VOCTRL_FULLSCREEN, 0);
+	if(video_out && vo_config_count) video_out->control(VOCTRL_FULLSCREEN, 0);
 } break;
 case MP_CMD_SUB_POS:
 {
 int v;
 	v = cmd->args[0].v.i;
 }
 fflush(stdout);
 if(sh_video){
 	 current_module="seek_video_reset";
-video_out->control(VOCTRL_RESET,NULL);
+if(vo_config_count) video_out->control(VOCTRL_RESET,NULL);
 }
 if(sh_audio){
 current_module="seek_audio_reset";
 audio_out->reset(); // stop audio, throwing away buffered data
 static vo_mpegpes_t *pkg=&packet;
 packet.timestamp=sh_video->timer*90000.0;
 packet.id=0x20; /* Subpic */
 while((packet.size=ds_get_packet_sub(d_dvdsub,&packet.data))>0){
 mp_msg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: len=%d  v_pts=%5.3f  s_pts=%5.3f  \n",packet.size,d_video->pts,d_dvdsub->pts);
-video_out->draw_frame(&pkg);
+if(vo_config_count) video_out->draw_frame(&pkg);
 }
 }else if(vo_spudec){
 unsigned char* packet=NULL;
 int len;
 current_module="spudec";

Mercurial > mplayer.hg

comparison mplayer.c @ 5511:7a24a067f0af