[Mplayer-cvslog] CVS: main mplayer.c,1.13,1.14

[GEREOFFY]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv23400

Modified Files:
	mplayer.c 
Log Message:
code cleanup around codecctrl

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** mplayer.c	2001/03/15 23:21:40	1.13
--- mplayer.c	2001/03/16 00:05:52	1.14
***************
*** 1,6 ****
--- 1,10 ----
  // AVI & MPEG Player    v0.11   (C) 2000-2001. by A'rpi/ESP-team
  
+ // Enable ALSA emulation (using 32kB audio buffer) - timer testing only
  //#define SIMULATE_ALSA
  
+ // Define, if you want to run libmpeg2 in a new process (using codec-ctrl)
+ //#define HAVE_CODECCTRL
+ 
  #ifdef USE_XMMP_AUDIO
  #define OUTBURST 4096
***************
*** 146,149 ****
--- 150,158 ----
  #include "parse_es.c"
  
+ static const int frameratecode2framerate[16] = {
+    0, 24000*10000/1001, 24*10000,25*10000, 30000*10000/1001, 30*10000,50*10000,60000*10000/1001,
+   60*10000, 0,0,0,0,0,0,0
+ };
+ 
  //**************************************************************************//
  //             Audio codecs:
***************
*** 230,235 ****
--- 239,249 ----
  #include "dll_init.c"
  
+ // Common FIFO functions, and keyboard/event FIFO code
+ #include "fifo.c"
+ 
  // MPEG video codec process controller:
+ #ifdef HAVE_CODECCTRL
  #include "codecctrl.c"
+ #endif
  
  //**************************************************************************//
***************
*** 244,247 ****
--- 258,262 ----
    // restore terminal:
    getch2_disable();
+ #ifdef HAVE_CODECCTRL
    if(child_pid){
      // MPEG
***************
*** 257,261 ****
        if(videobuffer) shmem_free(videobuffer);
      DEBUG_SIG { printf("Exiting...\n");DEBUG_SIGNALS_SLEEP}
!   } else {
    	// AVI
  	video_out->uninit();
--- 272,278 ----
        if(videobuffer) shmem_free(videobuffer);
      DEBUG_SIG { printf("Exiting...\n");DEBUG_SIGNALS_SLEEP}
!   } else
! #endif
!   {
    	// AVI
  	video_out->uninit();
***************
*** 1775,1780 ****
--- 1792,1799 ----
      case 'g': grab_frames=2;break;
      // restart codec
+ #ifdef HAVE_CODECCTRL
      case 'k': kill(codec_pid,SIGKILL);break;
  //    case 'k': kill(child_pid,SIGKILL);break;
+ #endif
      // pause
      case 'p':


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog