comparison mplayer.c @ 1790:f34087fa1469

stop fix, fileselector worx

1789:8bbfd587166b

      if(filename) strcpy( mplShMem->Filename,filename );
      mplShMem->Playing= (gui_no_filename) ? 0 : 1;
      while(mplShMem->Playing!=1){
	usleep(20000);
	wsHandleEvents();mplTimerHandler(0); // handle GUI timer events
      }
    }
#endif

    if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,"Playing %s\n", filename);

          int len=((demuxer->movi_end-demuxer->movi_start));
	  int pos=(demuxer->file_format==DEMUXER_TYPE_AVI)?demuxer->filepos:d_video->pos;
	  mplShMem->Position=(len<=0)?0:((float)(pos-demuxer->movi_start) / len * 100.0f);
	}
	mplShMem->TimeSec=d_video->pts; 
	printf("mplShMem->Playing=%d  \n",mplShMem->Playing);
	if(mplShMem->Playing==0) break; // STOP
	if(mplShMem->Playing==2) osd_function=OSD_PAUSE;
      }
#endif

mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d  \n",eof);

}


if(curr_filename+1<num_filenames){
    // partial uninit:

  // restore terminal:
   getch2_disable();

  if(audio_out) audio_out->uninit();
//  if(encode_name) avi_fixate();
}

goto_next_file:  // don't jump here after ao/vo/getch initialization!
    ++curr_filename;
if(curr_filename<num_filenames){

  current_module="uninit_vcodec";
  if(sh_video) uninit_video(sh_video);

  current_module="free_demuxer";

1790:f34087fa1469

      if(filename) strcpy( mplShMem->Filename,filename );
      mplShMem->Playing= (gui_no_filename) ? 0 : 1;
      while(mplShMem->Playing!=1){
	usleep(20000);
	wsHandleEvents();mplTimerHandler(0); // handle GUI timer events
      }
      if(gui_no_filename){
        filename=mplShMem->Filename;
      }
    }
#endif

    if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,"Playing %s\n", filename);

          int len=((demuxer->movi_end-demuxer->movi_start));
	  int pos=(demuxer->file_format==DEMUXER_TYPE_AVI)?demuxer->filepos:d_video->pos;
	  mplShMem->Position=(len<=0)?0:((float)(pos-demuxer->movi_start) / len * 100.0f);
	}
	mplShMem->TimeSec=d_video->pts; 
//	printf("mplShMem->Playing=%d  \n",mplShMem->Playing);
	if(mplShMem->Playing==0) break; // STOP
	if(mplShMem->Playing==2) osd_function=OSD_PAUSE;
      }
#endif

mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d  \n",eof);

}


if(curr_filename+1<num_filenames || use_gui){
    // partial uninit:

  // restore terminal:
   getch2_disable();

  if(audio_out) audio_out->uninit();
//  if(encode_name) avi_fixate();
}

goto_next_file:  // don't jump here after ao/vo/getch initialization!
if(use_gui || ++curr_filename<num_filenames){

  current_module="uninit_vcodec";
  if(sh_video) uninit_video(sh_video);

  current_module="free_demuxer";