[Mplayer-cvslog] CVS: main mplayer.c,1.149,1.150

[GEREOFFY]

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

Modified Files:
	mplayer.c 
Log Message:
some cleanup, old unused stuff removed

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -r1.149 -r1.150
*** mplayer.c	2001/06/05 00:58:51	1.149
--- mplayer.c	2001/06/05 01:14:38	1.150
***************
*** 60,71 ****
  
  
! #ifdef USE_XMMP_AUDIO
! #include "libxmm/xmmp.h"
! #include "libxmm/libxmm.h"
! XMM xmm;
! XMM_PluginSound *pSound=NULL;
! #endif
! 
! extern int vo_screenwidth;
  
  extern char* win32_codec_name;  // must be set before calling DrvOpen() !!!
--- 60,64 ----
  
  
! //extern int vo_screenwidth;
  
  extern char* win32_codec_name;  // must be set before calling DrvOpen() !!!
***************
*** 101,106 ****
  void find_sub(subtitle* subtitles,int key);
  
- int osd_level=2;
- 
  //**************************************************************************//
  //             Config file
--- 94,97 ----
***************
*** 140,146 ****
  static int max_framesize=0;
  
- //static int dbg_es_sent=0;
- //static int dbg_es_rcvd=0;
- 
  //static int show_packets=0;
  
--- 131,134 ----
***************
*** 155,180 ****
  #include "stheader.h"
  
- #if 0
- 
- typedef struct {
-   // file:
- //  MainAVIHeader avih;
- //  unsigned int movi_start;
- //  unsigned int movi_end;
-   // index:
-   AVIINDEXENTRY* idx;
-   int idx_size;
-   int idx_pos;
-   int idx_pos_a;
-   int idx_pos_v;
-   int idx_offset;  // ennyit kell hozzaadni az index offset ertekekhez
-   // video:
-   unsigned int bitrate;
- } avi_header_t;
- 
- avi_header_t avi_header;
- 
- #endif
- 
  int avi_bitrate=0;
  
--- 143,146 ----
***************
*** 205,218 ****
  }
  
- 
- //#include "demux_avi.c"
- //#include "demux_mpg.c"
- 
  demux_stream_t *d_audio=NULL;
  demux_stream_t *d_video=NULL;
  demux_stream_t *d_dvdsub=NULL;
  
! sh_audio_t *sh_audio=NULL;//&sh_audio_i;
! sh_video_t *sh_video=NULL;//&sh_video_i;
  
  char* encode_name=NULL;
--- 171,180 ----
  }
  
  demux_stream_t *d_audio=NULL;
  demux_stream_t *d_video=NULL;
  demux_stream_t *d_dvdsub=NULL;
  
! sh_audio_t *sh_audio=NULL;
! sh_video_t *sh_video=NULL;
  
  char* encode_name=NULL;
***************
*** 220,224 ****
  int encode_bitrate=0;
  
! extern int asf_packetsize;
  
  extern float avi_audio_pts;
--- 182,186 ----
  int encode_bitrate=0;
  
! extern int asf_packetsize; // for seeking
  
  extern float avi_audio_pts;
***************
*** 236,243 ****
  #include "parse_es.c"
  
! extern int num_elementary_packets100;
  extern int num_elementary_packets101;
  
! extern picture_t *picture;
  
  static const int frameratecode2framerate[16] = {
--- 198,205 ----
  #include "parse_es.c"
  
! extern int num_elementary_packets100; // for MPEG-ES fileformat detection
  extern int num_elementary_packets101;
  
! extern picture_t *picture;	// exported from libmpeg2/decode.c
  
  static const int frameratecode2framerate[16] = {
***************
*** 290,304 ****
  //**************************************************************************//
  
- // AVI file header reader/parser/writer:
- //#include "aviheader.c"
- //#include "aviwrite.c"
- 
- // ASF headers:
- //#include "asfheader.c"
- //#include "demux_asf.c"
- 
- // DLL codecs init routines
- //#include "dll_init.c"
- 
  // Common FIFO functions, and keyboard/event FIFO code
  #include "fifo.c"
--- 252,255 ----
***************
*** 343,353 ****
       getch2_disable();
    video_out->uninit();
- #ifdef USE_XMMP_AUDIO
-   if(verbose) printf("XMM: closing audio driver...\n");
-   if(pSound){
-     pSound->Exit( pSound );
-     xmm_Exit( &xmm );
-   }
- #endif
    if(encode_name) avi_fixate();
  #ifdef HAVE_LIRC
--- 294,297 ----
***************
*** 393,396 ****
--- 337,341 ----
  
  // options:
+ int osd_level=2;
  int divx_quality=0;
  char *seek_to_sec=NULL;
***************
*** 1925,1929 ****
          (v_frame>0.5)?(100.0*audio_time_usage/(double)v_frame):0
          ,drop_frame_cnt
- //        dbg_es_sent-dbg_es_rcvd 
          );
          fflush(stdout);
--- 1870,1873 ----
***************
*** 1945,1949 ****
          (v_frame>0.5)?(int)(100.0*vout_time_usage/(double)v_frame):0,
          (v_frame>0.5)?(100.0*audio_time_usage/(double)v_frame):0
- //        dbg_es_sent-dbg_es_rcvd
          );
  
--- 1889,1892 ----


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