comparison mplayer.c @ 4974:5da7b1522a9f

small bug fixed and workarounds :(

4973:544c1dae591c

#ifdef HAVE_NEW_GUI
  if(use_gui){
       guiInit( argc,argv,envp );
       inited_flags|=INITED_GUI;
       guiGetEvent( guiCEvent,(gui_no_filename) ? 0 : 1 );
  }
#endif

play_next_file:

#ifdef USE_DVDREAD 
     if ( guiIntfStruct.DVDChanged ) 
      {
       guiIntfStruct.DVDChanged=0;
       guiGetEvent( guiCEvent,guiSetPlay );
       filename="/dev/dvd";
       goto play_dvd;
      }
#endif

#endif
      if ( guiIntfStruct.FilenameChanged || !filename )
       {
        play_tree_t * entry = play_tree_new();
        play_tree_add_file( entry,guiIntfStruct.Filename );
        if ( playtree )
	 {
          play_tree_free_list( playtree->child,1 );
          play_tree_set_child( playtree,entry );
	 }
          else
           {
	    fprintf( stderr,"[mplayer] new playtree created.\n" );
            if ( !playtree ) playtree=play_tree_new();
            play_tree_set_child( playtree,entry );
           }

        if(playtree->child)
	 {
	  playtree_iter = play_tree_iter_new(playtree->child,mconfig);
	  if(playtree_iter)
	   {
	    if(play_tree_iter_step(playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY)
	     {
	      play_tree_iter_free(playtree_iter);
	      playtree_iter = NULL;
	     }
	    filename = play_tree_iter_get_file(playtree_iter,1);
	   }
         }
   	guiIntfStruct.FilenameChanged=0;
       }
    }
#endif

    if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, filename);

      if(!quiet) {
	mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\n------ PAUSED -------\r");
	fflush(stdout);
      }
#ifdef HAVE_NEW_GUI
      if(use_gui) guiGetEvent( guiCEvent,guiSetPause );
#endif
      if (video_out && sh_video)
	 video_out->control(VOCTRL_PAUSE, NULL);

      if (audio_out && sh_audio)

        audio_out->resume();	// resume audio
      if (video_out && sh_video)
        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,guiSetPlay );
#endif
  }


    if(!force_redraw) break;

   in RAM and kernel+other_tasks eat 0% of CPU. */
    mp_msg(MSGT_CPLAYER,MSGL_INFO,"TOTAL BENCHMARK: from %u frames should be dropped: %u at least\n"
	    ,our_n_frames,bench_dropped_frames);
}

if(eof == PT_NEXT_ENTRY || eof == PT_PREV_ENTRY) {
  eof = eof == PT_NEXT_ENTRY ? 1 : -1;
  if(play_tree_iter_step(playtree_iter,eof,0) == PLAY_TREE_ITER_ENTRY) {
    uninit_player(INITED_ALL-(INITED_GUI+INITED_LIRC+INITED_INPUT+INITED_VO));
    eof = 1;

}

uninit_player(INITED_VO);

if(eof == 0) eof = 1;

#ifdef HAVE_NEW_GUI
      if(use_gui) 
       {
#ifdef USE_DVDREAD
        if ( !guiIntfStruct.DVDChanged ) 
#endif
	mplStop();
       }	
#endif

while(playtree_iter != NULL) {
  filename = play_tree_iter_get_file(playtree_iter,eof);
  if(filename == NULL) {
    if( play_tree_iter_step(playtree_iter,eof,0) != PLAY_TREE_ITER_ENTRY) {

4974:5da7b1522a9f

#ifdef HAVE_NEW_GUI
  if(use_gui){
       guiInit( argc,argv,envp );
       inited_flags|=INITED_GUI;
       guiGetEvent( guiCEvent,(char *)((gui_no_filename) ? 0 : 1) );
  }
#endif

play_next_file:

#ifdef USE_DVDREAD 
     if ( guiIntfStruct.DVDChanged ) 
      {
       guiIntfStruct.DVDChanged=0;
       guiGetEvent( guiCEvent,(char *)guiSetPlay );
       filename="/dev/dvd";
       goto play_dvd;
      }
#endif

#endif
      if ( guiIntfStruct.FilenameChanged || !filename )
       {
        play_tree_t * entry = play_tree_new();
        play_tree_add_file( entry,guiIntfStruct.Filename );
        if ( playtree ) play_tree_free_list( playtree->child,1 );
         else playtree=play_tree_new();
        play_tree_set_child( playtree,entry );
        if(playtree)
	 {
	  playtree_iter = play_tree_iter_new(playtree,mconfig);
	  if(playtree_iter)
	   {
	    if(play_tree_iter_step(playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY)
	     {
	      play_tree_iter_free(playtree_iter);
	      playtree_iter = NULL;
	     }
	    filename = play_tree_iter_get_file(playtree_iter,1);
	   }
         }
//	filename=playtree->child->files[0]; 
   	guiIntfStruct.FilenameChanged=0;
       } 
    }
#endif

    if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, filename);

      if(!quiet) {
	mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\n------ PAUSED -------\r");
	fflush(stdout);
      }
#ifdef HAVE_NEW_GUI
      if(use_gui) guiGetEvent( guiCEvent,(char *)guiSetPause );
#endif
      if (video_out && sh_video)
	 video_out->control(VOCTRL_PAUSE, NULL);

      if (audio_out && sh_audio)

        audio_out->resume();	// resume audio
      if (video_out && sh_video)
        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
  }


    if(!force_redraw) break;

   in RAM and kernel+other_tasks eat 0% of CPU. */
    mp_msg(MSGT_CPLAYER,MSGL_INFO,"TOTAL BENCHMARK: from %u frames should be dropped: %u at least\n"
	    ,our_n_frames,bench_dropped_frames);
}

#ifdef HAVE_NEW_GUI
 if( use_gui ) 
  {
#ifdef USE_DVDREAD
   if ( !guiIntfStruct.DVDChanged ) 
#endif
   mplStop();
#warning workaround for kiba playtree with gui ... if i dont play the prev/next file, then playtree sig6 (assert)
   eof=0;
  }	
#endif

if(eof == PT_NEXT_ENTRY || eof == PT_PREV_ENTRY) {
  eof = eof == PT_NEXT_ENTRY ? 1 : -1;
  if(play_tree_iter_step(playtree_iter,eof,0) == PLAY_TREE_ITER_ENTRY) {
    uninit_player(INITED_ALL-(INITED_GUI+INITED_LIRC+INITED_INPUT+INITED_VO));
    eof = 1;

}

uninit_player(INITED_VO);

if(eof == 0) eof = 1;

while(playtree_iter != NULL) {
  filename = play_tree_iter_get_file(playtree_iter,eof);
  if(filename == NULL) {
    if( play_tree_iter_step(playtree_iter,eof,0) != PLAY_TREE_ITER_ENTRY) {